diff --git a/CMakeTestFiles/TestICGLinkedLibs.cpp b/CMakeTestFiles/TestICGLinkedLibs.cpp
index 33ce68915..ebd5928db 100644
--- a/CMakeTestFiles/TestICGLinkedLibs.cpp
+++ b/CMakeTestFiles/TestICGLinkedLibs.cpp
@@ -1,22 +1,22 @@
-// `llvm/Support/Host.h` is deprecated in favour of `llvm/TargetParser/Host.h` since clang 17
-#if LIBCLANG_MAJOR > 16
-#include "llvm/TargetParser/Host.h"
+//	`llvm/Support/Host.h`	is	deprecated	in	favour	of	`llvm/TargetParser/Host.h`	since	clang	17
+#if	LIBCLANG_MAJOR	>	16
+#include	"llvm/TargetParser/Host.h"
 #else
-#include "llvm/Support/Host.h"
+#include	"llvm/Support/Host.h"
 #endif
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/raw_ostream.h"
+#include	"llvm/Support/CommandLine.h"
+#include	"llvm/Support/raw_ostream.h"
 
-#include "clang/Basic/Builtins.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Parse/ParseAST.h"
+#include	"clang/Basic/Builtins.h"
+#include	"clang/Frontend/CompilerInstance.h"
+#include	"clang/Basic/TargetOptions.h"
+#include	"clang/Basic/TargetInfo.h"
+#include	"clang/Basic/FileManager.h"
+#include	"clang/Lex/Preprocessor.h"
+#include	"clang/Lex/PreprocessorOptions.h"
+#include	"clang/Basic/Diagnostic.h"
+#include	"clang/Parse/ParseAST.h"
 
-int main() {
-	return 0;
+int	main()	{
+	return	0;
 }
\ No newline at end of file
diff --git a/test/SIM_anon_enum/models/starter.cpp b/test/SIM_anon_enum/models/starter.cpp
index 60da96a38..fcbb9187a 100644
--- a/test/SIM_anon_enum/models/starter.cpp
+++ b/test/SIM_anon_enum/models/starter.cpp
@@ -1,5 +1,5 @@
-#include "starter.h"
+#include	"starter.h"
 
-Starter::Starter() {
+Starter::Starter()	{
 
 }
diff --git a/test/SIM_checkpoint_data_recording/models/Foo.cpp b/test/SIM_checkpoint_data_recording/models/Foo.cpp
index 53e0e3f85..638e6c4bd 100644
--- a/test/SIM_checkpoint_data_recording/models/Foo.cpp
+++ b/test/SIM_checkpoint_data_recording/models/Foo.cpp
@@ -1 +1 @@
-#include "Foo.hh"
+#include	"Foo.hh"
diff --git a/test/SIM_delete_default_constructor/models/empty.cpp b/test/SIM_delete_default_constructor/models/empty.cpp
index 6d9fb2d39..fe0e6d3dc 100644
--- a/test/SIM_delete_default_constructor/models/empty.cpp
+++ b/test/SIM_delete_default_constructor/models/empty.cpp
@@ -1 +1 @@
-#include "empty.h"
+#include	"empty.h"
diff --git a/test/SIM_delete_default_constructor/models/starter.cpp b/test/SIM_delete_default_constructor/models/starter.cpp
index b8761d13d..ccc6ccf62 100644
--- a/test/SIM_delete_default_constructor/models/starter.cpp
+++ b/test/SIM_delete_default_constructor/models/starter.cpp
@@ -1,6 +1,6 @@
-#include "starter.h"
+#include	"starter.h"
 
-Starter::Starter(int foo) {
-  
+Starter::Starter(int	foo)	{
+		
 }
 
diff --git a/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp b/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
index 44ac37f63..d6c94ca6c 100644
--- a/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
+++ b/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
@@ -1,32 +1,32 @@
-#ifndef TRICK_ICG
-#include <Python.h>
+#ifndef	TRICK_ICG
+#include	<Python.h>
 #endif
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "InputProcessSimObject/include/InputProcessSimObject.hh"
+#include	"InputProcessSimObject/include/InputProcessSimObject.hh"
 
-Trick::InputProcessSimObject::InputProcessSimObject(std::string in_function) {
+Trick::InputProcessSimObject::InputProcessSimObject(std::string	in_function)	{
 
-    python_call_function = in_function ;
-    return_value = 0 ;
+				python_call_function	=	in_function	;
+				return_value	=	0	;
 
 }
 
-int Trick::InputProcessSimObject::call_function( Trick::JobData * curr_job ) {
+int	Trick::InputProcessSimObject::call_function(	Trick::JobData	*	curr_job	)	{
 
-    std::stringstream ss ;
+				std::stringstream	ss	;
 
-    ss << python_call_function << "(" << curr_job->id << ")" ;
-    PyRun_SimpleString(ss.str().c_str()) ;
+				ss	<<	python_call_function	<<	"("	<<	curr_job->id	<<	")"	;
+				PyRun_SimpleString(ss.str().c_str())	;
 
-    return( return_value ) ;
+				return(	return_value	)	;
 }
 
-double Trick::InputProcessSimObject::call_function_double( Trick::JobData * curr_job ) {
+double	Trick::InputProcessSimObject::call_function_double(	Trick::JobData	*	curr_job	)	{
 
-    (void)curr_job ;
-    return(0.0) ;
+				(void)curr_job	;
+				return(0.0)	;
 
 }
 
diff --git a/test/SIM_exclusion_mechanisms/models/ExtLibDir.cpp b/test/SIM_exclusion_mechanisms/models/ExtLibDir.cpp
index 02086a788..dae2c0b49 100644
--- a/test/SIM_exclusion_mechanisms/models/ExtLibDir.cpp
+++ b/test/SIM_exclusion_mechanisms/models/ExtLibDir.cpp
@@ -1 +1 @@
-This file should be excluded from the build. Is is meant to cause a compiler error if Trick tries to build it.
+This	file	should	be	excluded	from	the	build.	Is	is	meant	to	cause	a	compiler	error	if	Trick	tries	to	build	it.
diff --git a/test/SIM_exclusion_mechanisms/models/Foo.cpp b/test/SIM_exclusion_mechanisms/models/Foo.cpp
index 222ffaa3f..29218f4c3 100644
--- a/test/SIM_exclusion_mechanisms/models/Foo.cpp
+++ b/test/SIM_exclusion_mechanisms/models/Foo.cpp
@@ -1,2 +1,2 @@
-// @trick_link_dependency{ExtLibDir.cpp}
-// @trick_link_dependency{ext_lib_dir/ExtLibDir.cpp}
+//	@trick_link_dependency{ExtLibDir.cpp}
+//	@trick_link_dependency{ext_lib_dir/ExtLibDir.cpp}
diff --git a/test/SIM_exclusion_mechanisms/models/ext_lib_dir/ExtLibDir.cpp b/test/SIM_exclusion_mechanisms/models/ext_lib_dir/ExtLibDir.cpp
index 02086a788..dae2c0b49 100644
--- a/test/SIM_exclusion_mechanisms/models/ext_lib_dir/ExtLibDir.cpp
+++ b/test/SIM_exclusion_mechanisms/models/ext_lib_dir/ExtLibDir.cpp
@@ -1 +1 @@
-This file should be excluded from the build. Is is meant to cause a compiler error if Trick tries to build it.
+This	file	should	be	excluded	from	the	build.	Is	is	meant	to	cause	a	compiler	error	if	Trick	tries	to	build	it.
diff --git a/test/SIM_exclusion_mechanisms/models/symlinks/exclude_link_path/real/ext_lib_dir/ExtLibDir.cpp b/test/SIM_exclusion_mechanisms/models/symlinks/exclude_link_path/real/ext_lib_dir/ExtLibDir.cpp
index 02086a788..dae2c0b49 100644
--- a/test/SIM_exclusion_mechanisms/models/symlinks/exclude_link_path/real/ext_lib_dir/ExtLibDir.cpp
+++ b/test/SIM_exclusion_mechanisms/models/symlinks/exclude_link_path/real/ext_lib_dir/ExtLibDir.cpp
@@ -1 +1 @@
-This file should be excluded from the build. Is is meant to cause a compiler error if Trick tries to build it.
+This	file	should	be	excluded	from	the	build.	Is	is	meant	to	cause	a	compiler	error	if	Trick	tries	to	build	it.
diff --git a/test/SIM_exclusion_mechanisms/models/symlinks/exclude_real_path/real/ext_lib_dir/ExtLibDir.cpp b/test/SIM_exclusion_mechanisms/models/symlinks/exclude_real_path/real/ext_lib_dir/ExtLibDir.cpp
index 02086a788..dae2c0b49 100644
--- a/test/SIM_exclusion_mechanisms/models/symlinks/exclude_real_path/real/ext_lib_dir/ExtLibDir.cpp
+++ b/test/SIM_exclusion_mechanisms/models/symlinks/exclude_real_path/real/ext_lib_dir/ExtLibDir.cpp
@@ -1 +1 @@
-This file should be excluded from the build. Is is meant to cause a compiler error if Trick tries to build it.
+This	file	should	be	excluded	from	the	build.	Is	is	meant	to	cause	a	compiler	error	if	Trick	tries	to	build	it.
diff --git a/test/SIM_exec_set_time_tic_value/models/ttvtest.cpp b/test/SIM_exec_set_time_tic_value/models/ttvtest.cpp
index cf516ba24..3d6d4b83f 100644
--- a/test/SIM_exec_set_time_tic_value/models/ttvtest.cpp
+++ b/test/SIM_exec_set_time_tic_value/models/ttvtest.cpp
@@ -1,21 +1,21 @@
-#include <cstdio>
-#include "ttvtest.h"
-int TTVTest::scheduled() {
-  //message_publish(MSG_NORMAL, "Hello World!\n");
-  return 0;
+#include	<cstdio>
+#include	"ttvtest.h"
+int	TTVTest::scheduled()	{
+		//message_publish(MSG_NORMAL,	"Hello	World!\n");
+		return	0;
 }
 
-int TTVTest::scheduled2() {
-  //message_publish(MSG_NORMAL, "Hello World!\n");
-  return 0;
+int	TTVTest::scheduled2()	{
+		//message_publish(MSG_NORMAL,	"Hello	World!\n");
+		return	0;
 }
 
-int TTVTest::scheduled3() {
-  //message_publish(MSG_NORMAL, "Hello World!\n");
-  return 0;
+int	TTVTest::scheduled3()	{
+		//message_publish(MSG_NORMAL,	"Hello	World!\n");
+		return	0;
 }
 
-int TTVTest::scheduled4() {
-  //message_publish(MSG_NORMAL, "Hello World!\n");
-  return 0;
+int	TTVTest::scheduled4()	{
+		//message_publish(MSG_NORMAL,	"Hello	World!\n");
+		return	0;
 }
\ No newline at end of file
diff --git a/test/SIM_isystem/models/my_code/Foo.cpp b/test/SIM_isystem/models/my_code/Foo.cpp
index c70664dbe..e75fdb5e3 100644
--- a/test/SIM_isystem/models/my_code/Foo.cpp
+++ b/test/SIM_isystem/models/my_code/Foo.cpp
@@ -1,3 +1,3 @@
-// @trick_link_dependency{Warning.cpp}
+//	@trick_link_dependency{Warning.cpp}
 
-#include "Warning.hh"
+#include	"Warning.hh"
diff --git a/test/SIM_isystem/models/third_party/Warning.cpp b/test/SIM_isystem/models/third_party/Warning.cpp
index 87a489338..f865cff91 100644
--- a/test/SIM_isystem/models/third_party/Warning.cpp
+++ b/test/SIM_isystem/models/third_party/Warning.cpp
@@ -1 +1 @@
-#include <Warning.hh>
+#include	<Warning.hh>
diff --git a/test/SIM_job_class_order/models/starter.cpp b/test/SIM_job_class_order/models/starter.cpp
index ff7b51cb1..1d6a7f64f 100644
--- a/test/SIM_job_class_order/models/starter.cpp
+++ b/test/SIM_job_class_order/models/starter.cpp
@@ -1,76 +1,76 @@
-#include "starter.h"
-#include <iostream>
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
+#include	"starter.h"
+#include	<iostream>
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
 
-void Starter::sched () {
-    sched_calls++;
+void	Starter::sched	()	{
+				sched_calls++;
 }
 
-void Starter::custom () {
-    custom_calls++;
+void	Starter::custom	()	{
+				custom_calls++;
 }
 
-void Starter::top () {
-    top_calls++;
+void	Starter::top	()	{
+				top_calls++;
 }
 
-void Starter::automatic () {
+void	Starter::automatic	()	{
 
-    Trick::JobData * thisJob = exec_get_curr_job() ;
-    thisJob->set_next_call_time(exec_get_time_tics() + exec_get_time_tic_value());
-    automatic_calls++;
+				Trick::JobData	*	thisJob	=	exec_get_curr_job()	;
+				thisJob->set_next_call_time(exec_get_time_tics()	+	exec_get_time_tic_value());
+				automatic_calls++;
 }
 
-void Starter::automatic_last () {
+void	Starter::automatic_last	()	{
 
-    Trick::JobData * thisJob = exec_get_curr_job() ;
-    thisJob->set_next_call_time(exec_get_time_tics() + exec_get_time_tic_value());
+				Trick::JobData	*	thisJob	=	exec_get_curr_job()	;
+				thisJob->set_next_call_time(exec_get_time_tics()	+	exec_get_time_tic_value());
 
-    automatic_last_calls++;
+				automatic_last_calls++;
 }
 
-void Starter::end() {
-    end_calls++;
+void	Starter::end()	{
+				end_calls++;
 }
 
-void Starter::deriv() {    
-    deriv_calls++;
+void	Starter::deriv()	{				
+				deriv_calls++;
 }
 
-int Starter::integ() {    
-    integ_calls++;
+int	Starter::integ()	{				
+				integ_calls++;
 
-    return 0;
+				return	0;
 }
 
-void Starter::test_calls() {
-    if (top_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "top_of_frame job never called");
-    }
+void	Starter::test_calls()	{
+				if	(top_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"top_of_frame	job	never	called");
+				}
 
-    if (custom_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "custom job never called");
-    }
+				if	(custom_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"custom	job	never	called");
+				}
 
-    if (sched_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "scheduled job never called");
-    }
+				if	(sched_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"scheduled	job	never	called");
+				}
 
-    if (automatic_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "automatic job never called");
-    }
+				if	(automatic_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"automatic	job	never	called");
+				}
 
-    if (automatic_last_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "automatic_last job never called");
-    }
+				if	(automatic_last_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"automatic_last	job	never	called");
+				}
 
-    if (deriv_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "derivative job never called");
-    }
+				if	(deriv_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"derivative	job	never	called");
+				}
 
-    if (integ_calls == 0) {
-        exec_terminate_with_return(1, __FILE__, __LINE__, "integration job never called");
-    }
+				if	(integ_calls	==	0)	{
+								exec_terminate_with_return(1,	__FILE__,	__LINE__,	"integration	job	never	called");
+				}
 
 }
diff --git a/test/SIM_leaks/models/Leaker/Leaker.cpp b/test/SIM_leaks/models/Leaker/Leaker.cpp
index 0308e7e4e..b8c65fbcb 100644
--- a/test/SIM_leaks/models/Leaker/Leaker.cpp
+++ b/test/SIM_leaks/models/Leaker/Leaker.cpp
@@ -1,37 +1,37 @@
-#include <vector>
-#include <stdlib.h>
-#include <string.h>
+#include	<vector>
+#include	<stdlib.h>
+#include	<string.h>
 
-/* Model include files. */
-#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
+/*	Model	include	files.	*/
+#include	"sim_services/MemoryManager/include/memorymanager_c_intf.h"
 
-std::vector< int > dv ;
+std::vector<	int	>	dv	;
 
-     /* ENTRY POINT */
-int Leaker() {
+					/*	ENTRY	POINT	*/
+int	Leaker()	{
 
-   int * i_malloc = (int *)malloc( sizeof(int) ) ;
+			int	*	i_malloc	=	(int	*)malloc(	sizeof(int)	)	;
 
-   int * i_calloc = (int *)calloc( 1 , sizeof(int) ) ;
+			int	*	i_calloc	=	(int	*)calloc(	1	,	sizeof(int)	)	;
 
-#if 0
-   int * i_realloc = NULL ;
-   i_realloc = (int *)realloc( i_realloc, sizeof(int) ) ;
+#if	0
+			int	*	i_realloc	=	NULL	;
+			i_realloc	=	(int	*)realloc(	i_realloc,	sizeof(int)	)	;
 #endif
 
-   int * i_new = new int ;
+			int	*	i_new	=	new	int	;
 
-   int * ia_new = new int[10] ;
+			int	*	ia_new	=	new	int[10]	;
 
-   char * str = strdup("hello") ;
+			char	*	str	=	strdup("hello")	;
 
-   int ii ;
-   for ( ii = 0 ; ii < 100 ; ii++ ) {
-       dv.push_back(ii) ;
-   }
+			int	ii	;
+			for	(	ii	=	0	;	ii	<	100	;	ii++	)	{
+							dv.push_back(ii)	;
+			}
 
-   /* RETURN */
-   return( 0 );
+			/*	RETURN	*/
+			return(	0	);
 
 }
 
diff --git a/test/SIM_parse_s_define/models/Classes.cpp b/test/SIM_parse_s_define/models/Classes.cpp
index f1dbbb826..229fc1934 100644
--- a/test/SIM_parse_s_define/models/Classes.cpp
+++ b/test/SIM_parse_s_define/models/Classes.cpp
@@ -1 +1 @@
-void foo() {};
+void	foo()	{};
diff --git a/test/SIM_segments/models/SegmentedExecutive/src/ExampleSegments.cpp b/test/SIM_segments/models/SegmentedExecutive/src/ExampleSegments.cpp
index 8fcc74b56..e592a9a69 100644
--- a/test/SIM_segments/models/SegmentedExecutive/src/ExampleSegments.cpp
+++ b/test/SIM_segments/models/SegmentedExecutive/src/ExampleSegments.cpp
@@ -1,35 +1,35 @@
 
-#include <iostream>
-#include "SegmentedExecutive/include/ExampleSegments.hh"
+#include	<iostream>
+#include	"SegmentedExecutive/include/ExampleSegments.hh"
 
-SegmentA::SegmentA( std::string in_segment_name ,
-                std::string enter_job_class_str ,
-                std::string exit_job_class_str ,
-                Trick::IntegLoopScheduler & in_integ_sched ) :
- Trick::Segment(in_segment_name , enter_job_class_str , exit_job_class_str) ,
- integ_sched(in_integ_sched) { } ;
+SegmentA::SegmentA(	std::string	in_segment_name	,
+																std::string	enter_job_class_str	,
+																std::string	exit_job_class_str	,
+																Trick::IntegLoopScheduler	&	in_integ_sched	)	:
+	Trick::Segment(in_segment_name	,	enter_job_class_str	,	exit_job_class_str)	,
+	integ_sched(in_integ_sched)	{	}	;
 
-/* This custom enter routine changes the integrator and integrator cycle rate */
-int SegmentA::enter( std::string next_segment ) {
-    std::cout << "Switching integrators in segment A!" << std::endl ;
-    integ_sched.getIntegrator(Runge_Kutta_2 , 4) ;
-    integ_sched.set_integ_cycle(0.01) ;
-    return Trick::Segment::exit(next_segment) ;
+/*	This	custom	enter	routine	changes	the	integrator	and	integrator	cycle	rate	*/
+int	SegmentA::enter(	std::string	next_segment	)	{
+				std::cout	<<	"Switching	integrators	in	segment	A!"	<<	std::endl	;
+				integ_sched.getIntegrator(Runge_Kutta_2	,	4)	;
+				integ_sched.set_integ_cycle(0.01)	;
+				return	Trick::Segment::exit(next_segment)	;
 }
 
-/* -------------------------------------------------------------------- */
+/*	--------------------------------------------------------------------	*/
 
-SegmentB::SegmentB( std::string in_segment_name ,
-                std::string enter_job_class_str ,
-                std::string exit_job_class_str ,
-                Trick::IntegLoopScheduler & in_integ_sched ) :
- Trick::Segment(in_segment_name , enter_job_class_str , exit_job_class_str) ,
- integ_sched(in_integ_sched) { } ;
+SegmentB::SegmentB(	std::string	in_segment_name	,
+																std::string	enter_job_class_str	,
+																std::string	exit_job_class_str	,
+																Trick::IntegLoopScheduler	&	in_integ_sched	)	:
+	Trick::Segment(in_segment_name	,	enter_job_class_str	,	exit_job_class_str)	,
+	integ_sched(in_integ_sched)	{	}	;
 
-/* This custom enter routine changes the integrator and integrator cycle rate */
-int SegmentB::enter( std::string next_segment ) {
-    std::cout << "Switching integrators in segment B!" << std::endl ;
-    integ_sched.getIntegrator(Runge_Kutta_4 , 4) ;
-    integ_sched.set_integ_cycle(0.1) ;
-    return Trick::Segment::exit(next_segment) ;
+/*	This	custom	enter	routine	changes	the	integrator	and	integrator	cycle	rate	*/
+int	SegmentB::enter(	std::string	next_segment	)	{
+				std::cout	<<	"Switching	integrators	in	segment	B!"	<<	std::endl	;
+				integ_sched.getIntegrator(Runge_Kutta_4	,	4)	;
+				integ_sched.set_integ_cycle(0.1)	;
+				return	Trick::Segment::exit(next_segment)	;
 }
diff --git a/test/SIM_segments/models/SegmentedExecutive/src/Segment.cpp b/test/SIM_segments/models/SegmentedExecutive/src/Segment.cpp
index ddbaf56a1..d7a797ef0 100644
--- a/test/SIM_segments/models/SegmentedExecutive/src/Segment.cpp
+++ b/test/SIM_segments/models/SegmentedExecutive/src/Segment.cpp
@@ -1,45 +1,45 @@
 
-#include "SegmentedExecutive/include/Segment.hh"
+#include	"SegmentedExecutive/include/Segment.hh"
 
-Trick::Segment::Segment( std::string in_name ) : segment_name(in_name) {} ;
+Trick::Segment::Segment(	std::string	in_name	)	:	segment_name(in_name)	{}	;
 
-Trick::Segment::Segment( std::string in_name ,
- std::string enter_job_class_str ,
- std::string exit_job_class_str ) :
-  segment_name(in_name) {
-    set_enter_job_class_name(enter_job_class_str) ;
-    set_exit_job_class_name(exit_job_class_str) ;
-} ;
+Trick::Segment::Segment(	std::string	in_name	,
+	std::string	enter_job_class_str	,
+	std::string	exit_job_class_str	)	:
+		segment_name(in_name)	{
+				set_enter_job_class_name(enter_job_class_str)	;
+				set_exit_job_class_name(exit_job_class_str)	;
+}	;
 
-std::string Trick::Segment::get_segment_name() {
-    return segment_name ;
+std::string	Trick::Segment::get_segment_name()	{
+				return	segment_name	;
 }
 
-void Trick::Segment::set_segment_name(std::string in_segment_name) {
-    segment_name = in_segment_name ;
+void	Trick::Segment::set_segment_name(std::string	in_segment_name)	{
+				segment_name	=	in_segment_name	;
 }
 
-void Trick::Segment::set_enter_job_class_name(std::string job_class_name) {
-    enter_job_class_name = job_class_name ;
-    job_queues[enter_job_class_name] = &enter_jobs ;
+void	Trick::Segment::set_enter_job_class_name(std::string	job_class_name)	{
+				enter_job_class_name	=	job_class_name	;
+				job_queues[enter_job_class_name]	=	&enter_jobs	;
 }
 
-void Trick::Segment::set_exit_job_class_name(std::string job_class_name) {
-    exit_job_class_name = job_class_name ;
-    job_queues[exit_job_class_name] = &exit_jobs ;
+void	Trick::Segment::set_exit_job_class_name(std::string	job_class_name)	{
+				exit_job_class_name	=	job_class_name	;
+				job_queues[exit_job_class_name]	=	&exit_jobs	;
 }
 
-// Call the enter_jobs when entering this segment.
-int Trick::Segment::enter( std::string prev_segment __attribute__((unused)) ) {
-    return enter_jobs.execute_all_jobs() ;
+//	Call	the	enter_jobs	when	entering	this	segment.
+int	Trick::Segment::enter(	std::string	prev_segment	__attribute__((unused))	)	{
+				return	enter_jobs.execute_all_jobs()	;
 }
 
-// Call the exit_jobs when exiting this segment.
-int Trick::Segment::exit( std::string next_segment __attribute__((unused)) ) {
-    return exit_jobs.execute_all_jobs() ;
+//	Call	the	exit_jobs	when	exiting	this	segment.
+int	Trick::Segment::exit(	std::string	next_segment	__attribute__((unused))	)	{
+				return	exit_jobs.execute_all_jobs()	;
 }
 
-std::map < std::string , Trick::ScheduledJobQueue * > & Trick::Segment::get_job_queues() {
-    return job_queues ;
+std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>	&	Trick::Segment::get_job_queues()	{
+				return	job_queues	;
 }
 
diff --git a/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp b/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp
index 5f2177050..7d0069f45 100644
--- a/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp
+++ b/test/SIM_segments/models/SegmentedExecutive/src/SegmentedExecutive.cpp
@@ -1,256 +1,256 @@
 
-#include <iostream>
-#include <algorithm>
-#include <stdio.h>
-#include <sys/stat.h>
+#include	<iostream>
+#include	<algorithm>
+#include	<stdio.h>
+#include	<sys/stat.h>
 
-#include "SegmentedExecutive.hh"
-#include "sim_services/Message/include/message_proto.h"
-#include "sim_services/CommandLineArguments/include/command_line_protos.h"
+#include	"SegmentedExecutive.hh"
+#include	"sim_services/Message/include/message_proto.h"
+#include	"sim_services/CommandLineArguments/include/command_line_protos.h"
 
-Trick::SegmentedExecutive * the_phe = NULL ;
+Trick::SegmentedExecutive	*	the_phe	=	NULL	;
 
-Trick::SegmentedExecutive::SegmentedExecutive() : curr_segment(NULL) {
-    // Set the global the_phe pointer for use in C bound access functions
-    the_phe = this ;
+Trick::SegmentedExecutive::SegmentedExecutive()	:	curr_segment(NULL)	{
+				//	Set	the	global	the_phe	pointer	for	use	in	C	bound	access	functions
+				the_phe	=	this	;
 }
 
-int Trick::SegmentedExecutive::add_segment( Trick::Segment * ps ) {
+int	Trick::SegmentedExecutive::add_segment(	Trick::Segment	*	ps	)	{
 
-    // Gets the job class to job queue map for this segment and adds the job classes to the executive.
-    std::map < std::string , Trick::ScheduledJobQueue * >::iterator it ;
-    for ( it = ps->get_job_queues().begin() ; it != ps->get_job_queues().end() ; ++it ) {
-        class_map[(*it).first] = num_classes ;
-        class_to_queue[num_classes++] = (*it).second ;
-    }
+				//	Gets	the	job	class	to	job	queue	map	for	this	segment	and	adds	the	job	classes	to	the	executive.
+				std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>::iterator	it	;
+				for	(	it	=	ps->get_job_queues().begin()	;	it	!=	ps->get_job_queues().end()	;	++it	)	{
+								class_map[(*it).first]	=	num_classes	;
+								class_to_queue[num_classes++]	=	(*it).second	;
+				}
 
-    // Store the segment information in a map keyed by the segment name
-    segment_map[ps->get_segment_name()] = ps ;
+				//	Store	the	segment	information	in	a	map	keyed	by	the	segment	name
+				segment_map[ps->get_segment_name()]	=	ps	;
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
-  Finds all jobs that have 1 or more job tags that are a segment string.
-  Those jobs are saved to a set.
+		Finds	all	jobs	that	have	1	or	more	job	tags	that	are	a	segment	string.
+		Those	jobs	are	saved	to	a	set.
 */
-int Trick::SegmentedExecutive::gather_segmented_jobs() {
-    Trick::JobData * job ;
-    unsigned int ii ;
-    std::map < std::string , Trick::Segment * >::iterator mit ;
-    std::set< std::string > segment_tags ;
-
-    for ( mit = segment_map.begin() ; mit != segment_map.end() ; ++mit ) {
-        segment_tags.insert((*mit).first) ;
-    }
-
-    // all_jobs_vector is defined in the Trick::Executive.
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        job = all_jobs_vector[ii] ;
-        /* Find the set intersection between the known segments and the current job tags. */
-        std::set< std::string > intersect ;
-        std::set_intersection( segment_tags.begin() , segment_tags.end() , job->tags_begin() , job->tags_end() ,
-              std::inserter( intersect, intersect.begin() ) ) ;
-        /* If the set intersection is not empty we have a segment.  Add this job to our set of segmented jobs. */
-        if ( ! intersect.empty() ) {
-            all_segmented_jobs.insert(job) ;
-        }
-    }
-
-    return 0 ;
+int	Trick::SegmentedExecutive::gather_segmented_jobs()	{
+				Trick::JobData	*	job	;
+				unsigned	int	ii	;
+				std::map	<	std::string	,	Trick::Segment	*	>::iterator	mit	;
+				std::set<	std::string	>	segment_tags	;
+
+				for	(	mit	=	segment_map.begin()	;	mit	!=	segment_map.end()	;	++mit	)	{
+								segment_tags.insert((*mit).first)	;
+				}
+
+				//	all_jobs_vector	is	defined	in	the	Trick::Executive.
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								job	=	all_jobs_vector[ii]	;
+								/*	Find	the	set	intersection	between	the	known	segments	and	the	current	job	tags.	*/
+								std::set<	std::string	>	intersect	;
+								std::set_intersection(	segment_tags.begin()	,	segment_tags.end()	,	job->tags_begin()	,	job->tags_end()	,
+														std::inserter(	intersect,	intersect.begin()	)	)	;
+								/*	If	the	set	intersection	is	not	empty	we	have	a	segment.		Add	this	job	to	our	set	of	segmented	jobs.	*/
+								if	(	!	intersect.empty()	)	{
+												all_segmented_jobs.insert(job)	;
+								}
+				}
+
+				return	0	;
 }
 
 /**
 @details
-Tests if the incoming segment string is a valid segment name.
-If the name is valid, save the next segment for the next call of segment_switch
+Tests	if	the	incoming	segment	string	is	a	valid	segment	name.
+If	the	name	is	valid,	save	the	next	segment	for	the	next	call	of	segment_switch
 */
-int Trick::SegmentedExecutive::segment_set( std::string in_segment ) {
-    // Check to see if this segment string exists.
-    if ( segment_map.find(in_segment) != segment_map.end() ) {
-        next_segment_str = in_segment ;
-    } else {
-        message_publish( MSG_ERROR , "Bad Segment Name: %s\n" , in_segment.c_str() ) ;
-        return -1 ;
-    }
-    return 0 ;
+int	Trick::SegmentedExecutive::segment_set(	std::string	in_segment	)	{
+				//	Check	to	see	if	this	segment	string	exists.
+				if	(	segment_map.find(in_segment)	!=	segment_map.end()	)	{
+								next_segment_str	=	in_segment	;
+				}	else	{
+								message_publish(	MSG_ERROR	,	"Bad	Segment	Name:	%s\n"	,	in_segment.c_str()	)	;
+								return	-1	;
+				}
+				return	0	;
 }
 
 /**
 @details
-Performs segment switch.
--# If there is a segment change
-    -# If a current segment is set.
-        -# Call the currrent segment exit routine
-        -# Call the next segment enter routine
-    -# else
-        -# Call the next segment enter routine with an empty string as the current segment
-    -# Turn on/off all segmented jobs.
-    -# Set the current segment to the next segment.
+Performs	segment	switch.
+-#	If	there	is	a	segment	change
+				-#	If	a	current	segment	is	set.
+								-#	Call	the	currrent	segment	exit	routine
+								-#	Call	the	next	segment	enter	routine
+				-#	else
+								-#	Call	the	next	segment	enter	routine	with	an	empty	string	as	the	current	segment
+				-#	Turn	on/off	all	segmented	jobs.
+				-#	Set	the	current	segment	to	the	next	segment.
 */
-int Trick::SegmentedExecutive::segment_switch() {
-
-    Trick::Segment * next_segment = segment_map[next_segment_str] ;
-
-    // Only do something if the next_segment is not equal to the current segment.
-    if ( curr_segment != next_segment ) {
-        if ( curr_segment != NULL ) {
-            // Perform current segment exit routine.
-            if ( curr_segment->get_segment_name().compare(next_segment_str) ) {
-                message_publish( MSG_INFO , "Switching from segment %s to %s\n" ,
-                 curr_segment->get_segment_name().c_str() , next_segment_str.c_str() ) ;
-                curr_segment->exit( next_segment_str ) ;
-            }
-            // Perform next segment enter routines
-            next_segment->enter( curr_segment->get_segment_name() ) ;
-        } else {
-            // If curr_segment is NULL, then this is the initial segment set.
-            // No need to exit current segment.
-            message_publish( MSG_INFO , "Setting initial segment to %s\n" , next_segment_str.c_str() ) ;
-            // Enter the next segment with the prev_segment set as an empty string.
-            next_segment->enter( std::string("") ) ;
-        }
-
-        // Set the jobs to on/off according to segment
-        segment_set_jobs_onoff() ;
-        curr_segment = next_segment ;
-    }
-
-    return 0 ;
+int	Trick::SegmentedExecutive::segment_switch()	{
+
+				Trick::Segment	*	next_segment	=	segment_map[next_segment_str]	;
+
+				//	Only	do	something	if	the	next_segment	is	not	equal	to	the	current	segment.
+				if	(	curr_segment	!=	next_segment	)	{
+								if	(	curr_segment	!=	NULL	)	{
+												//	Perform	current	segment	exit	routine.
+												if	(	curr_segment->get_segment_name().compare(next_segment_str)	)	{
+																message_publish(	MSG_INFO	,	"Switching	from	segment	%s	to	%s\n"	,
+																	curr_segment->get_segment_name().c_str()	,	next_segment_str.c_str()	)	;
+																curr_segment->exit(	next_segment_str	)	;
+												}
+												//	Perform	next	segment	enter	routines
+												next_segment->enter(	curr_segment->get_segment_name()	)	;
+								}	else	{
+												//	If	curr_segment	is	NULL,	then	this	is	the	initial	segment	set.
+												//	No	need	to	exit	current	segment.
+												message_publish(	MSG_INFO	,	"Setting	initial	segment	to	%s\n"	,	next_segment_str.c_str()	)	;
+												//	Enter	the	next	segment	with	the	prev_segment	set	as	an	empty	string.
+												next_segment->enter(	std::string("")	)	;
+								}
+
+								//	Set	the	jobs	to	on/off	according	to	segment
+								segment_set_jobs_onoff()	;
+								curr_segment	=	next_segment	;
+				}
+
+				return	0	;
 }
 
 /**
 @details
-Traverses all jobs that have been marked as having a segment tag.
-If the job contains the next segment tag, enable the job, else disable it.
+Traverses	all	jobs	that	have	been	marked	as	having	a	segment	tag.
+If	the	job	contains	the	next	segment	tag,	enable	the	job,	else	disable	it.
 */
-int Trick::SegmentedExecutive::segment_set_jobs_onoff() {
-    Trick::JobData * job ;
-    std::set < Trick::JobData * >::iterator it ;
-
-    for ( it = all_segmented_jobs.begin() ; it != all_segmented_jobs.end() ; ++it ) {
-        job = *it ;
-        // Test to see if the next segment is present in the job tags.
-        // Set the disabled flag to the negation of the tag's presence
-        job->disabled = !(job->tags.count(next_segment_str)) ;
-        message_publish(MSG_NORMAL, "segment set job %s to %s\n" , job->name.c_str() , job->disabled ? "disabled" : "enabled" ) ;
-    }
-
-    return 0 ;
+int	Trick::SegmentedExecutive::segment_set_jobs_onoff()	{
+				Trick::JobData	*	job	;
+				std::set	<	Trick::JobData	*	>::iterator	it	;
+
+				for	(	it	=	all_segmented_jobs.begin()	;	it	!=	all_segmented_jobs.end()	;	++it	)	{
+								job	=	*it	;
+								//	Test	to	see	if	the	next	segment	is	present	in	the	job	tags.
+								//	Set	the	disabled	flag	to	the	negation	of	the	tag's	presence
+								job->disabled	=	!(job->tags.count(next_segment_str))	;
+								message_publish(MSG_NORMAL,	"segment	set	job	%s	to	%s\n"	,	job->name.c_str()	,	job->disabled	?	"disabled"	:	"enabled"	)	;
+				}
+
+				return	0	;
 }
 
-/* The following routines add the segmented jobs to the S_job_execution file and
-   instruments the segmented jobs just like ant other job.
+/*	The	following	routines	add	the	segmented	jobs	to	the	S_job_execution	file	and
+			instruments	the	segmented	jobs	just	like	ant	other	job.
 */
 
-int Trick::SegmentedExecutive::write_s_job_execution(FILE *fp) {
+int	Trick::SegmentedExecutive::write_s_job_execution(FILE	*fp)	{
 
-    char buf[1024];
-    std::string output_dir ;
+				char	buf[1024];
+				std::string	output_dir	;
 
-    // call the base Executive function
-    Trick::Executive::write_s_job_execution(fp) ;
+				//	call	the	base	Executive	function
+				Trick::Executive::write_s_job_execution(fp)	;
 
-    /* Get full path to S_job_execution */
-    output_dir = command_line_args_get_output_dir() ;
-    snprintf(buf, sizeof(buf), "%s/S_job_execution", output_dir.c_str());
+				/*	Get	full	path	to	S_job_execution	*/
+				output_dir	=	command_line_args_get_output_dir()	;
+				snprintf(buf,	sizeof(buf),	"%s/S_job_execution",	output_dir.c_str());
 
-    /* Reopen the S_job_execution file.  If it fails, it's not a fatal error, return 0. */
-    if ((fp = fopen(buf, "a")) == NULL) {
-        return (0) ;
-    }
+				/*	Reopen	the	S_job_execution	file.		If	it	fails,	it's	not	a	fatal	error,	return	0.	*/
+				if	((fp	=	fopen(buf,	"a"))	==	NULL)	{
+								return	(0)	;
+				}
 
-    fprintf(fp, "Segment Jobs:\n") ;
+				fprintf(fp,	"Segment	Jobs:\n")	;
 
-    std::map < std::string , Trick::Segment * >::iterator pmit ;
-    for ( pmit = segment_map.begin() ; pmit != segment_map.end() ; ++pmit ) {
-        Trick::Segment * pb = (*pmit).second ;
-        std::map < std::string , Trick::ScheduledJobQueue * >::iterator jqit ;
-        for ( jqit = pb->get_job_queues().begin() ; jqit != pb->get_job_queues().end() ; ++jqit ) {
-            (*jqit).second->write_non_sched_queue(fp) ;
-        }
-    }
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fclose(fp) ;
+				std::map	<	std::string	,	Trick::Segment	*	>::iterator	pmit	;
+				for	(	pmit	=	segment_map.begin()	;	pmit	!=	segment_map.end()	;	++pmit	)	{
+								Trick::Segment	*	pb	=	(*pmit).second	;
+								std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>::iterator	jqit	;
+								for	(	jqit	=	pb->get_job_queues().begin()	;	jqit	!=	pb->get_job_queues().end()	;	++jqit	)	{
+												(*jqit).second->write_non_sched_queue(fp)	;
+								}
+				}
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fclose(fp)	;
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::SegmentedExecutive::instrument_job_before( Trick::JobData * instrument_job ) {
+int	Trick::SegmentedExecutive::instrument_job_before(	Trick::JobData	*	instrument_job	)	{
 
-    unsigned int count = 0 ;
+				unsigned	int	count	=	0	;
 
-    if ( instrument_job != NULL ) {
-        //call the base Executive instrument job
-        count = Trick::Executive::instrument_job_before( instrument_job ) ;
+				if	(	instrument_job	!=	NULL	)	{
+								//call	the	base	Executive	instrument	job
+								count	=	Trick::Executive::instrument_job_before(	instrument_job	)	;
 
-        //go through all of the segmented jobs and instrument them.
-        std::map < std::string , Trick::Segment * >::iterator pmit ;
-        for ( pmit = segment_map.begin() ; pmit != segment_map.end() ; ++pmit ) {
-            Trick::Segment * pb = (*pmit).second ;
-            std::map < std::string , Trick::ScheduledJobQueue * >::iterator jqit ;
-            for ( jqit = pb->get_job_queues().begin() ; jqit != pb->get_job_queues().end() ; ++jqit ) {
-                (*jqit).second->instrument_before(instrument_job) ;
-            }
-        }
-    }
+								//go	through	all	of	the	segmented	jobs	and	instrument	them.
+								std::map	<	std::string	,	Trick::Segment	*	>::iterator	pmit	;
+								for	(	pmit	=	segment_map.begin()	;	pmit	!=	segment_map.end()	;	++pmit	)	{
+												Trick::Segment	*	pb	=	(*pmit).second	;
+												std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>::iterator	jqit	;
+												for	(	jqit	=	pb->get_job_queues().begin()	;	jqit	!=	pb->get_job_queues().end()	;	++jqit	)	{
+																(*jqit).second->instrument_before(instrument_job)	;
+												}
+								}
+				}
 
-    return count ;
+				return	count	;
 }
 
-int Trick::SegmentedExecutive::instrument_job_after( Trick::JobData * instrument_job ) {
-
-    unsigned int count = 0 ;
-
-    if ( instrument_job != NULL ) {
-        //call the base Executive instrument job
-        count = Trick::Executive::instrument_job_after( instrument_job ) ;
-
-        //go through all of the segmented jobs and instrument them.
-        std::map < std::string , Trick::Segment * >::iterator pmit ;
-        for ( pmit = segment_map.begin() ; pmit != segment_map.end() ; ++pmit ) {
-            Trick::Segment * pb = (*pmit).second ;
-            std::map < std::string , Trick::ScheduledJobQueue * >::iterator jqit ;
-            for ( jqit = pb->get_job_queues().begin() ; jqit != pb->get_job_queues().end() ; ++jqit ) {
-                (*jqit).second->instrument_after(instrument_job) ;
-            }
-        }
-    }
-    return count ;
+int	Trick::SegmentedExecutive::instrument_job_after(	Trick::JobData	*	instrument_job	)	{
+
+				unsigned	int	count	=	0	;
+
+				if	(	instrument_job	!=	NULL	)	{
+								//call	the	base	Executive	instrument	job
+								count	=	Trick::Executive::instrument_job_after(	instrument_job	)	;
+
+								//go	through	all	of	the	segmented	jobs	and	instrument	them.
+								std::map	<	std::string	,	Trick::Segment	*	>::iterator	pmit	;
+								for	(	pmit	=	segment_map.begin()	;	pmit	!=	segment_map.end()	;	++pmit	)	{
+												Trick::Segment	*	pb	=	(*pmit).second	;
+												std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>::iterator	jqit	;
+												for	(	jqit	=	pb->get_job_queues().begin()	;	jqit	!=	pb->get_job_queues().end()	;	++jqit	)	{
+																(*jqit).second->instrument_after(instrument_job)	;
+												}
+								}
+				}
+				return	count	;
 }
 
-int Trick::SegmentedExecutive::instrument_job_remove(std::string in_job) {
+int	Trick::SegmentedExecutive::instrument_job_remove(std::string	in_job)	{
 
-    //call the base Executive instrument job
-    Trick::Executive::instrument_job_remove( in_job ) ;
+				//call	the	base	Executive	instrument	job
+				Trick::Executive::instrument_job_remove(	in_job	)	;
 
-    std::map < std::string , Trick::Segment * >::iterator pmit ;
-    for ( pmit = segment_map.begin() ; pmit != segment_map.end() ; ++pmit ) {
-        Trick::Segment * pb = (*pmit).second ;
-        std::map < std::string , Trick::ScheduledJobQueue * >::iterator jqit ;
-        for ( jqit = pb->get_job_queues().begin() ; jqit != pb->get_job_queues().end() ; ++jqit ) {
-            (*jqit).second->instrument_remove(in_job) ;
-        }
-    }
-    return 0 ;
+				std::map	<	std::string	,	Trick::Segment	*	>::iterator	pmit	;
+				for	(	pmit	=	segment_map.begin()	;	pmit	!=	segment_map.end()	;	++pmit	)	{
+								Trick::Segment	*	pb	=	(*pmit).second	;
+								std::map	<	std::string	,	Trick::ScheduledJobQueue	*	>::iterator	jqit	;
+								for	(	jqit	=	pb->get_job_queues().begin()	;	jqit	!=	pb->get_job_queues().end()	;	++jqit	)	{
+												(*jqit).second->instrument_remove(in_job)	;
+								}
+				}
+				return	0	;
 }
 
-// This function proides the shortcut access to set the segment in python
-// trick.phexec_segment_set("string_segment")
-extern "C" int exec_segment_set( std::string in_segment ) {
-    if ( the_phe != NULL ) {
-        return the_phe->segment_set(in_segment) ;
-    }
-    return -1 ;
+//	This	function	proides	the	shortcut	access	to	set	the	segment	in	python
+//	trick.phexec_segment_set("string_segment")
+extern	"C"	int	exec_segment_set(	std::string	in_segment	)	{
+				if	(	the_phe	!=	NULL	)	{
+								return	the_phe->segment_set(in_segment)	;
+				}
+				return	-1	;
 }
 
-// This function proides the shortcut access to set the segment switching in python
-// trick.phexec_segment_switch()
-extern "C" int exec_segment_switch() {
-    if ( the_phe != NULL ) {
-        return the_phe->segment_switch() ;
-    }
-    return -1 ;
+//	This	function	proides	the	shortcut	access	to	set	the	segment	switching	in	python
+//	trick.phexec_segment_switch()
+extern	"C"	int	exec_segment_switch()	{
+				if	(	the_phe	!=	NULL	)	{
+								return	the_phe->segment_switch()	;
+				}
+				return	-1	;
 }
 
diff --git a/test/SIM_stls/models/STLCheckpoint.cpp b/test/SIM_stls/models/STLCheckpoint.cpp
index 1e9839dc9..2c8453054 100644
--- a/test/SIM_stls/models/STLCheckpoint.cpp
+++ b/test/SIM_stls/models/STLCheckpoint.cpp
@@ -1,763 +1,763 @@
 
-#include "sim_services/Message/include/message_proto.h"
-#include "STLCheckpoint.hh"
-#include "trick/memorymanager_c_intf.h"
-#include <iostream>
-#include <vector>
-#include "sim_services/UnitTest/include/trick_tests.h"
-/* These 2 constructors add different data to an STLCheckpoint. */
-
-STLCheckpoint::STLCheckpoint() {
-    return ;
+#include	"sim_services/Message/include/message_proto.h"
+#include	"STLCheckpoint.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	<iostream>
+#include	<vector>
+#include	"sim_services/UnitTest/include/trick_tests.h"
+/*	These	2	constructors	add	different	data	to	an	STLCheckpoint.	*/
+
+STLCheckpoint::STLCheckpoint()	{
+				return	;
 }
 
-template <typename T>
-void compare_data_structures_with_top(T a, T b, std::string test_name) {
-    const char *test_suite = "STLCheckpoint";
+template	<typename	T>
+void	compare_data_structures_with_top(T	a,	T	b,	std::string	test_name)	{
+				const	char	*test_suite	=	"STLCheckpoint";
 
-    TRICK_EXPECT_EQ(a.size(), b.size(), test_suite, test_name.c_str());
-    while (!a.empty()) {
-        TRICK_EXPECT_EQ(a.top(), b.top(), test_suite, test_name.c_str());
-        a.pop();
-        b.pop();
-    }
+				TRICK_EXPECT_EQ(a.size(),	b.size(),	test_suite,	test_name.c_str());
+				while	(!a.empty())	{
+								TRICK_EXPECT_EQ(a.top(),	b.top(),	test_suite,	test_name.c_str());
+								a.pop();
+								b.pop();
+				}
 }
 
-int STLCheckpoint::addData() {
-    dataJobRun = true;
-    vector_vector_double = std::vector< std::vector< double > >(4, std::vector<double>(3));
-    vector_vector_vector_double = std::vector< std::vector< std::vector< double > > >(5, std::vector<std::vector<double> >(4, std::vector<double>(3)));
-
-    std::cout << "Adding hardcoded data to sim" << std::endl;
-
-    double_map[44.4] = 444.4 ;
-    double_map[55.5] = 555.5 ;
-    double_map[66.6] = 666.6 ;
-
-    string_key_map[std::string("four")] = 4 ;
-    string_key_map[std::string("five")] = 5 ;
-    string_key_map[std::string("six")] = 6 ;
-
-    string_data_map[7] = std::string("seiben") ;
-    string_data_map[8] = std::string("acht") ;
-    string_data_map[9] = std::string("neun") ;
-
-    std::vector< int > v ;
-    v.push_back(2) ;
-    v.push_back(4) ;
-    v.push_back(6) ;
-    v.push_back(8) ;
-    map_int_vector_int[1] = v ;
-
-    std::pair< int , int > p ;
-    p.first = 24 ;
-    p.second = 30 ;
-    gcd[p] = 6 ;
-
-    p.first = 50 ;
-    p.second = 60 ;
-    std::pair< int , int > q ;
-    q.first = 70 ;
-    q.second = 80 ;
-    map_pair_pair[p] = q ;
-
-    p.first = 3 ;
-    p.second = 5 ;
-    v.clear() ;
-    v.push_back(15) ;
-    v.push_back(30) ;
-    v.push_back(45) ;
-    v.push_back(60) ;
-    common_multiples.insert(std::pair< std::pair< int, int >, std::vector< int > >(p,v)) ;
-
-    p.first = 3 ;
-    p.second = 7 ;
-    v.clear() ;
-    v.push_back(21) ;
-    v.push_back(42) ;
-    v.push_back(84) ;
-    v.push_back(168) ;
-    common_multiples.insert(std::pair< std::pair< int, int >, std::vector< int > >(p,v)) ;
-
-    string_map[std::string("sister")] = std::string("Lisa") ;
-    string_map[std::string("dog")] = std::string("Santa's Little Helper") ;
-
-    int_multimap.insert(std::pair<int, int>(44,444)) ;
-    int_multimap.insert(std::pair<int, int>(55,555)) ;
-    int_multimap.insert(std::pair<int, int>(66,666)) ;
-    int_multimap.insert(std::pair<int, int>(44,4444)) ;
-    int_multimap.insert(std::pair<int, int>(55,5555)) ;
-    int_multimap.insert(std::pair<int, int>(66,6666)) ;
-
-    string_key_multimap.insert(std::pair<std::string, int>("four", 4)) ;
-    string_key_multimap.insert(std::pair<std::string, int>("five", 5)) ;
-    string_key_multimap.insert(std::pair<std::string, int>("six", 6)) ;
-    string_key_multimap.insert(std::pair<std::string, int>("four", 44)) ;
-    string_key_multimap.insert(std::pair<std::string, int>("five",  55)) ;
-    string_key_multimap.insert(std::pair<std::string, int>("six", 66)) ;
-
-    string_data_multimap.insert(std::pair<int, std::string>(7, "seiben")) ;
-    string_data_multimap.insert(std::pair<int, std::string>(8, "acht")) ;
-    string_data_multimap.insert(std::pair<int, std::string>(9, "neun")) ;
-    string_data_multimap.insert(std::pair<int, std::string>(7, "seven")) ;
-    string_data_multimap.insert(std::pair<int, std::string>(8, "eight")) ;
-    string_data_multimap.insert(std::pair<int, std::string>(9, "nine")) ;
-
-    string_multimap.insert(std::pair<std::string, std::string>("sister","Lisa")) ;
-    string_multimap.insert(std::pair<std::string, std::string>("dog","Santa's Little Helper")) ;
-    string_multimap.insert(std::pair<std::string, std::string>("sister","Meg")) ;
-    string_multimap.insert(std::pair<std::string, std::string>("dog","Brian")) ;
-
-    double_vector.push_back(4.0) ;
-    double_vector.push_back(5.0) ;
-    double_vector.push_back(6.0) ;
-
-    string_vector.push_back("It") ;
-    string_vector.push_back("has") ;
-    string_vector.push_back("the") ;
-    string_vector.push_back("Wi-Fies") ;
-
-    short_list.push_back(400) ;
-    short_list.push_back(401) ;
-    short_list.push_back(402) ;
-
-    string_list.push_back("I") ;
-    string_list.push_back("don't") ;
-    string_list.push_back("care") ;
-
-    float_deque.push_back(98.7) ;
-    float_deque.push_back(65.4) ;
-    float_deque.push_back(32.1) ;
-
-    string_deque.push_back("Welcome") ;
-    string_deque.push_back("to") ;
-    string_deque.push_back("PhoneMart") ;
-
-    int_set.insert(8000) ;
-    int_set.insert(4000) ;
-    int_set.insert(2000) ;
-    int_set.insert(1000) ;
-
-    string_set.insert("efg") ;
-    string_set.insert("abc") ;
-    string_set.insert("def") ;
-
-    for (int j = 0; j < 5; j++) {
-        std::vector<int> temp;
-        for (int i = j; i < 10; i++) {
-            temp.push_back(i);
-        }
-        vector_set.insert(temp);
-    }
-
-    pair_set.emplace("One", 1);
-    pair_set.emplace("Two", 2);
-    pair_set.emplace("Three", 3);
-
-    std::map<short,double> m;
-    m[5] = 500.5;
-    m[1] = 100.1;
-    std::map<short,double> m2;
-    m2[5] = 5000.5;
-    m2[1] = 1000.1; 
-
-    nested_map_set.insert(m);
-    nested_map_set.insert(m2);
-
-    for (int j = 0; j < 5; j++) {
-        std::vector<int> temp;
-        for (int i = j; i < 10; i++) {
-            temp.push_back(i);
-        }
-        vector_queue.push(temp);
-    }
-
-
-    long_multiset.insert(8000) ;
-    long_multiset.insert(4000) ;
-    long_multiset.insert(4000) ;
-    long_multiset.insert(2000) ;
-    long_multiset.insert(1000) ;
-
-    string_multiset.insert("efg") ;
-    string_multiset.insert("abc") ;
-    string_multiset.insert("def") ;
-    string_multiset.insert("efg") ;
-    string_multiset.insert("abc") ;
-    string_multiset.insert("def") ;
-
-    pair_multiset.emplace(5, 5);
-    pair_multiset.emplace(5, 5);
-    pair_multiset.emplace(5, 4);
-    pair_multiset.emplace(4, 4);
-
-    vec_multiset.emplace(std::vector<int>({1,2,3,4}));
-    vec_multiset.emplace(std::vector<int>({1,2,3,4}));
-    vec_multiset.emplace(std::vector<int>({1,2,3,4,5}));
-
-
-    uint_stack.push(1) ;
-    uint_stack.push(2) ;
-    uint_stack.push(3) ;
-    uint_stack.push(4) ;
-
-    string_stack.push("I") ;
-    string_stack.push("want the one") ;
-    string_stack.push("with the bigger") ;
-    string_stack.push("Gee Bees") ;
-
-    std::vector<int> temp_v1 = {1, 2, 3, 4};
-    std::vector<int> temp_v2 = {5, 6, 7, 8};
-    stack_vector_int.push(temp_v1) ;
-    stack_vector_int.push(temp_v2) ;
-
-    int_queue.push(1) ;
-    int_queue.push(2) ;
-    int_queue.push(3) ;
-    int_queue.push(4) ;
-
-    string_queue.push("I") ;
-    string_queue.push("want") ;
-    string_queue.push("an") ;
-    string_queue.push("iPhone 4") ;
-
-    int_priority_queue.push(3) ;
-    int_priority_queue.push(2) ;
-    int_priority_queue.push(4) ;
-    int_priority_queue.push(1) ;
-
-    string_priority_queue.push("I") ;
-    string_priority_queue.push("want") ;
-    string_priority_queue.push("an") ;
-    string_priority_queue.push("iPhone 4") ;
-
-    queue_vector_int.push(temp_v1) ;
-    queue_vector_int.push(temp_v2) ;
-
-    priority_queue_vector_int.push(temp_v1) ;
-    priority_queue_vector_int.push(temp_v2) ;
-
-    int_pair.first = 10 ;
-    int_pair.second = 20 ;
-
-    string_first_pair.first = "string first" ;
-    string_first_pair.second = 25 ;
-
-    string_second_pair.first = 25 ;
-    string_second_pair.second = "string second" ;
-
-    string_pair.first = "pair first string" ;
-    string_pair.second = "pair second string" ;
-
-    int_pair_int_int.first = 200 ;
-    p.first = 10 ;
-    p.second = 20 ;
-    int_pair_int_int.second = p ;
-
-    p.first = 15 ;
-    p.second = 12 ;
-    pair_int_int_int.first = p ;
-    pair_int_int_int.second = 180 ;
-
-    pair_pair_pair.first.first = 51 ;
-    pair_pair_pair.first.second = 52 ;
-    pair_pair_pair.second.first = 53 ;
-    pair_pair_pair.second.second = 54 ;
-
-    int_vec_pair.first = 5;
-    int_vec_pair.second.push_back(5);
-    int_vec_pair.second.push_back(10);
-    int_vec_pair.second.push_back(15);
-    int_vec_pair.second.push_back(20);
-
-    vec_int_pair.second = 5;
-    vec_int_pair.first.push_back(5);
-    vec_int_pair.first.push_back(10);
-    vec_int_pair.first.push_back(15);
-    vec_int_pair.first.push_back(20);
-
-    vec_vec_pair.first.push_back(5);
-    vec_vec_pair.first.push_back(10);
-    vec_vec_pair.first.push_back(15);
-    vec_vec_pair.first.push_back(20);
-    vec_vec_pair.second.push_back(5);
-    vec_vec_pair.second.push_back(10);
-    vec_vec_pair.second.push_back(15);
-    vec_vec_pair.second.push_back(20);
-
-    vector_vector_double[0][0] = 100 ;
-    vector_vector_double[0][1] = 101 ;
-    vector_vector_double[0][2] = 102 ;
-    vector_vector_double[1][0] = 103 ;
-    vector_vector_double[1][1] = 104 ;
-    vector_vector_double[1][2] = 105 ;
-    vector_vector_double[2][0] = 106 ;
-    vector_vector_double[2][1] = 107 ;
-    vector_vector_double[2][2] = 108 ;
-    vector_vector_double[3][0] = 109 ;
-    vector_vector_double[3][1] = 110 ;
-    vector_vector_double[3][2] = 111 ;
-
-    vector_vector_vector_double[0][0][0] = 0 ;
-    vector_vector_vector_double[0][0][1] = 1 ;
-    vector_vector_vector_double[0][0][2] = 2 ;
-    vector_vector_vector_double[0][1][0] = 3 ;
-    vector_vector_vector_double[0][1][1] = 4 ;
-    vector_vector_vector_double[0][1][2] = 5 ;
-    vector_vector_vector_double[0][2][0] = 6 ;
-    vector_vector_vector_double[0][2][1] = 7 ;
-    vector_vector_vector_double[0][2][2] = 8 ;
-    vector_vector_vector_double[0][3][0] = 9 ;
-    vector_vector_vector_double[0][3][1] = 10 ;
-    vector_vector_vector_double[0][3][2] = 11 ;
-
-    vector_vector_vector_double[1][0][0] = 1000 ;
-    vector_vector_vector_double[1][0][1] = 1001 ;
-    vector_vector_vector_double[1][0][2] = 1002 ;
-    vector_vector_vector_double[1][1][0] = 1003 ;
-    vector_vector_vector_double[1][1][1] = 1004 ;
-    vector_vector_vector_double[1][1][2] = 1005 ;
-    vector_vector_vector_double[1][2][0] = 1006 ;
-    vector_vector_vector_double[1][2][1] = 1007 ;
-    vector_vector_vector_double[1][2][2] = 1008 ;
-    vector_vector_vector_double[1][3][0] = 1009 ;
-    vector_vector_vector_double[1][3][1] = 1010 ;
-    vector_vector_vector_double[1][3][2] = 1011 ;
-
-    vector_vector_vector_double[2][0][0] = 2000 ;
-    vector_vector_vector_double[2][0][1] = 2001 ;
-    vector_vector_vector_double[2][0][2] = 2002 ;
-    vector_vector_vector_double[2][1][0] = 2003 ;
-    vector_vector_vector_double[2][1][1] = 2004 ;
-    vector_vector_vector_double[2][1][2] = 2005 ;
-    vector_vector_vector_double[2][2][0] = 2006 ;
-    vector_vector_vector_double[2][2][1] = 2007 ;
-    vector_vector_vector_double[2][2][2] = 2008 ;
-    vector_vector_vector_double[2][3][0] = 2009 ;
-    vector_vector_vector_double[2][3][1] = 2010 ;
-    vector_vector_vector_double[2][3][2] = 2011 ;
-
-    vector_vector_vector_double[3][0][0] = 3000 ;
-    vector_vector_vector_double[3][0][1] = 3001 ;
-    vector_vector_vector_double[3][0][2] = 3002 ;
-    vector_vector_vector_double[3][1][0] = 3003 ;
-    vector_vector_vector_double[3][1][1] = 3004 ;
-    vector_vector_vector_double[3][1][2] = 3005 ;
-    vector_vector_vector_double[3][2][0] = 3006 ;
-    vector_vector_vector_double[3][2][1] = 3007 ;
-    vector_vector_vector_double[3][2][2] = 3008 ;
-    vector_vector_vector_double[3][3][0] = 3009 ;
-    vector_vector_vector_double[3][3][1] = 3010 ;
-    vector_vector_vector_double[3][3][2] = 3011 ;
-
-    vector_vector_vector_double[4][0][0] = 4000 ;
-    vector_vector_vector_double[4][0][1] = 4001 ;
-    vector_vector_vector_double[4][0][2] = 4002 ;
-    vector_vector_vector_double[4][1][0] = 4003 ;
-    vector_vector_vector_double[4][1][1] = 4004 ;
-    vector_vector_vector_double[4][1][2] = 4005 ;
-    vector_vector_vector_double[4][2][0] = 4006 ;
-    vector_vector_vector_double[4][2][1] = 4007 ;
-    vector_vector_vector_double[4][2][2] = 4008 ;
-    vector_vector_vector_double[4][3][0] = 4009 ;
-    vector_vector_vector_double[4][3][1] = 4010 ;
-    vector_vector_vector_double[4][3][2] = 4011 ;
-
-    for (int i = 0; i < 10; i++) {
-        UserClass temp;
-        for (int j = 0; j < 5; j++) {
-            temp.a[j] = i+j;
-        }
-        temp.b = 8888888888;
-        temp.c = "Here is a test string";
-
-        // We'll just make a pointer to the same stuff 
-
-        UserClass * user_class_ptr = (UserClass *) TMM_declare_var_s("UserClass");
-        for (int j = 0; j < 5; j++) {
-            user_class_ptr->a[j] = i+j;
-        }
-        user_class_ptr->b = 8888888888;
-        user_class_ptr->c = "Here is a test string";
-
-        temp.d = user_class_ptr;
-
-        vec_user_simple.emplace_back(temp);
-    }
-
-    for (int i = 0; i < 10; i++) {
-        SimpleWrapper temp_wrapper;
-        temp_wrapper.a = 888;
-        for (int j = i; j < i+10; j++) {
-            temp_wrapper.vec.push_back(j);
-        }
-        vec_user_defined.emplace_back(temp_wrapper);
-    }
-
-    for (int i = 0; i < 10; i++) {
-        SimpleWrapper * temp_wrapper = (SimpleWrapper *) TMM_declare_var_s("SimpleWrapper");
-        temp_wrapper->a = 888;
-        for (int j = i; j < i+10; j++) {
-            temp_wrapper->vec.push_back(j);
-        }
-        vec_user_defined_ptr.push_back(temp_wrapper);
-    }
-
-    return 0;
+int	STLCheckpoint::addData()	{
+				dataJobRun	=	true;
+				vector_vector_double	=	std::vector<	std::vector<	double	>	>(4,	std::vector<double>(3));
+				vector_vector_vector_double	=	std::vector<	std::vector<	std::vector<	double	>	>	>(5,	std::vector<std::vector<double>	>(4,	std::vector<double>(3)));
+
+				std::cout	<<	"Adding	hardcoded	data	to	sim"	<<	std::endl;
+
+				double_map[44.4]	=	444.4	;
+				double_map[55.5]	=	555.5	;
+				double_map[66.6]	=	666.6	;
+
+				string_key_map[std::string("four")]	=	4	;
+				string_key_map[std::string("five")]	=	5	;
+				string_key_map[std::string("six")]	=	6	;
+
+				string_data_map[7]	=	std::string("seiben")	;
+				string_data_map[8]	=	std::string("acht")	;
+				string_data_map[9]	=	std::string("neun")	;
+
+				std::vector<	int	>	v	;
+				v.push_back(2)	;
+				v.push_back(4)	;
+				v.push_back(6)	;
+				v.push_back(8)	;
+				map_int_vector_int[1]	=	v	;
+
+				std::pair<	int	,	int	>	p	;
+				p.first	=	24	;
+				p.second	=	30	;
+				gcd[p]	=	6	;
+
+				p.first	=	50	;
+				p.second	=	60	;
+				std::pair<	int	,	int	>	q	;
+				q.first	=	70	;
+				q.second	=	80	;
+				map_pair_pair[p]	=	q	;
+
+				p.first	=	3	;
+				p.second	=	5	;
+				v.clear()	;
+				v.push_back(15)	;
+				v.push_back(30)	;
+				v.push_back(45)	;
+				v.push_back(60)	;
+				common_multiples.insert(std::pair<	std::pair<	int,	int	>,	std::vector<	int	>	>(p,v))	;
+
+				p.first	=	3	;
+				p.second	=	7	;
+				v.clear()	;
+				v.push_back(21)	;
+				v.push_back(42)	;
+				v.push_back(84)	;
+				v.push_back(168)	;
+				common_multiples.insert(std::pair<	std::pair<	int,	int	>,	std::vector<	int	>	>(p,v))	;
+
+				string_map[std::string("sister")]	=	std::string("Lisa")	;
+				string_map[std::string("dog")]	=	std::string("Santa's	Little	Helper")	;
+
+				int_multimap.insert(std::pair<int,	int>(44,444))	;
+				int_multimap.insert(std::pair<int,	int>(55,555))	;
+				int_multimap.insert(std::pair<int,	int>(66,666))	;
+				int_multimap.insert(std::pair<int,	int>(44,4444))	;
+				int_multimap.insert(std::pair<int,	int>(55,5555))	;
+				int_multimap.insert(std::pair<int,	int>(66,6666))	;
+
+				string_key_multimap.insert(std::pair<std::string,	int>("four",	4))	;
+				string_key_multimap.insert(std::pair<std::string,	int>("five",	5))	;
+				string_key_multimap.insert(std::pair<std::string,	int>("six",	6))	;
+				string_key_multimap.insert(std::pair<std::string,	int>("four",	44))	;
+				string_key_multimap.insert(std::pair<std::string,	int>("five",		55))	;
+				string_key_multimap.insert(std::pair<std::string,	int>("six",	66))	;
+
+				string_data_multimap.insert(std::pair<int,	std::string>(7,	"seiben"))	;
+				string_data_multimap.insert(std::pair<int,	std::string>(8,	"acht"))	;
+				string_data_multimap.insert(std::pair<int,	std::string>(9,	"neun"))	;
+				string_data_multimap.insert(std::pair<int,	std::string>(7,	"seven"))	;
+				string_data_multimap.insert(std::pair<int,	std::string>(8,	"eight"))	;
+				string_data_multimap.insert(std::pair<int,	std::string>(9,	"nine"))	;
+
+				string_multimap.insert(std::pair<std::string,	std::string>("sister","Lisa"))	;
+				string_multimap.insert(std::pair<std::string,	std::string>("dog","Santa's	Little	Helper"))	;
+				string_multimap.insert(std::pair<std::string,	std::string>("sister","Meg"))	;
+				string_multimap.insert(std::pair<std::string,	std::string>("dog","Brian"))	;
+
+				double_vector.push_back(4.0)	;
+				double_vector.push_back(5.0)	;
+				double_vector.push_back(6.0)	;
+
+				string_vector.push_back("It")	;
+				string_vector.push_back("has")	;
+				string_vector.push_back("the")	;
+				string_vector.push_back("Wi-Fies")	;
+
+				short_list.push_back(400)	;
+				short_list.push_back(401)	;
+				short_list.push_back(402)	;
+
+				string_list.push_back("I")	;
+				string_list.push_back("don't")	;
+				string_list.push_back("care")	;
+
+				float_deque.push_back(98.7)	;
+				float_deque.push_back(65.4)	;
+				float_deque.push_back(32.1)	;
+
+				string_deque.push_back("Welcome")	;
+				string_deque.push_back("to")	;
+				string_deque.push_back("PhoneMart")	;
+
+				int_set.insert(8000)	;
+				int_set.insert(4000)	;
+				int_set.insert(2000)	;
+				int_set.insert(1000)	;
+
+				string_set.insert("efg")	;
+				string_set.insert("abc")	;
+				string_set.insert("def")	;
+
+				for	(int	j	=	0;	j	<	5;	j++)	{
+								std::vector<int>	temp;
+								for	(int	i	=	j;	i	<	10;	i++)	{
+												temp.push_back(i);
+								}
+								vector_set.insert(temp);
+				}
+
+				pair_set.emplace("One",	1);
+				pair_set.emplace("Two",	2);
+				pair_set.emplace("Three",	3);
+
+				std::map<short,double>	m;
+				m[5]	=	500.5;
+				m[1]	=	100.1;
+				std::map<short,double>	m2;
+				m2[5]	=	5000.5;
+				m2[1]	=	1000.1;	
+
+				nested_map_set.insert(m);
+				nested_map_set.insert(m2);
+
+				for	(int	j	=	0;	j	<	5;	j++)	{
+								std::vector<int>	temp;
+								for	(int	i	=	j;	i	<	10;	i++)	{
+												temp.push_back(i);
+								}
+								vector_queue.push(temp);
+				}
+
+
+				long_multiset.insert(8000)	;
+				long_multiset.insert(4000)	;
+				long_multiset.insert(4000)	;
+				long_multiset.insert(2000)	;
+				long_multiset.insert(1000)	;
+
+				string_multiset.insert("efg")	;
+				string_multiset.insert("abc")	;
+				string_multiset.insert("def")	;
+				string_multiset.insert("efg")	;
+				string_multiset.insert("abc")	;
+				string_multiset.insert("def")	;
+
+				pair_multiset.emplace(5,	5);
+				pair_multiset.emplace(5,	5);
+				pair_multiset.emplace(5,	4);
+				pair_multiset.emplace(4,	4);
+
+				vec_multiset.emplace(std::vector<int>({1,2,3,4}));
+				vec_multiset.emplace(std::vector<int>({1,2,3,4}));
+				vec_multiset.emplace(std::vector<int>({1,2,3,4,5}));
+
+
+				uint_stack.push(1)	;
+				uint_stack.push(2)	;
+				uint_stack.push(3)	;
+				uint_stack.push(4)	;
+
+				string_stack.push("I")	;
+				string_stack.push("want	the	one")	;
+				string_stack.push("with	the	bigger")	;
+				string_stack.push("Gee	Bees")	;
+
+				std::vector<int>	temp_v1	=	{1,	2,	3,	4};
+				std::vector<int>	temp_v2	=	{5,	6,	7,	8};
+				stack_vector_int.push(temp_v1)	;
+				stack_vector_int.push(temp_v2)	;
+
+				int_queue.push(1)	;
+				int_queue.push(2)	;
+				int_queue.push(3)	;
+				int_queue.push(4)	;
+
+				string_queue.push("I")	;
+				string_queue.push("want")	;
+				string_queue.push("an")	;
+				string_queue.push("iPhone	4")	;
+
+				int_priority_queue.push(3)	;
+				int_priority_queue.push(2)	;
+				int_priority_queue.push(4)	;
+				int_priority_queue.push(1)	;
+
+				string_priority_queue.push("I")	;
+				string_priority_queue.push("want")	;
+				string_priority_queue.push("an")	;
+				string_priority_queue.push("iPhone	4")	;
+
+				queue_vector_int.push(temp_v1)	;
+				queue_vector_int.push(temp_v2)	;
+
+				priority_queue_vector_int.push(temp_v1)	;
+				priority_queue_vector_int.push(temp_v2)	;
+
+				int_pair.first	=	10	;
+				int_pair.second	=	20	;
+
+				string_first_pair.first	=	"string	first"	;
+				string_first_pair.second	=	25	;
+
+				string_second_pair.first	=	25	;
+				string_second_pair.second	=	"string	second"	;
+
+				string_pair.first	=	"pair	first	string"	;
+				string_pair.second	=	"pair	second	string"	;
+
+				int_pair_int_int.first	=	200	;
+				p.first	=	10	;
+				p.second	=	20	;
+				int_pair_int_int.second	=	p	;
+
+				p.first	=	15	;
+				p.second	=	12	;
+				pair_int_int_int.first	=	p	;
+				pair_int_int_int.second	=	180	;
+
+				pair_pair_pair.first.first	=	51	;
+				pair_pair_pair.first.second	=	52	;
+				pair_pair_pair.second.first	=	53	;
+				pair_pair_pair.second.second	=	54	;
+
+				int_vec_pair.first	=	5;
+				int_vec_pair.second.push_back(5);
+				int_vec_pair.second.push_back(10);
+				int_vec_pair.second.push_back(15);
+				int_vec_pair.second.push_back(20);
+
+				vec_int_pair.second	=	5;
+				vec_int_pair.first.push_back(5);
+				vec_int_pair.first.push_back(10);
+				vec_int_pair.first.push_back(15);
+				vec_int_pair.first.push_back(20);
+
+				vec_vec_pair.first.push_back(5);
+				vec_vec_pair.first.push_back(10);
+				vec_vec_pair.first.push_back(15);
+				vec_vec_pair.first.push_back(20);
+				vec_vec_pair.second.push_back(5);
+				vec_vec_pair.second.push_back(10);
+				vec_vec_pair.second.push_back(15);
+				vec_vec_pair.second.push_back(20);
+
+				vector_vector_double[0][0]	=	100	;
+				vector_vector_double[0][1]	=	101	;
+				vector_vector_double[0][2]	=	102	;
+				vector_vector_double[1][0]	=	103	;
+				vector_vector_double[1][1]	=	104	;
+				vector_vector_double[1][2]	=	105	;
+				vector_vector_double[2][0]	=	106	;
+				vector_vector_double[2][1]	=	107	;
+				vector_vector_double[2][2]	=	108	;
+				vector_vector_double[3][0]	=	109	;
+				vector_vector_double[3][1]	=	110	;
+				vector_vector_double[3][2]	=	111	;
+
+				vector_vector_vector_double[0][0][0]	=	0	;
+				vector_vector_vector_double[0][0][1]	=	1	;
+				vector_vector_vector_double[0][0][2]	=	2	;
+				vector_vector_vector_double[0][1][0]	=	3	;
+				vector_vector_vector_double[0][1][1]	=	4	;
+				vector_vector_vector_double[0][1][2]	=	5	;
+				vector_vector_vector_double[0][2][0]	=	6	;
+				vector_vector_vector_double[0][2][1]	=	7	;
+				vector_vector_vector_double[0][2][2]	=	8	;
+				vector_vector_vector_double[0][3][0]	=	9	;
+				vector_vector_vector_double[0][3][1]	=	10	;
+				vector_vector_vector_double[0][3][2]	=	11	;
+
+				vector_vector_vector_double[1][0][0]	=	1000	;
+				vector_vector_vector_double[1][0][1]	=	1001	;
+				vector_vector_vector_double[1][0][2]	=	1002	;
+				vector_vector_vector_double[1][1][0]	=	1003	;
+				vector_vector_vector_double[1][1][1]	=	1004	;
+				vector_vector_vector_double[1][1][2]	=	1005	;
+				vector_vector_vector_double[1][2][0]	=	1006	;
+				vector_vector_vector_double[1][2][1]	=	1007	;
+				vector_vector_vector_double[1][2][2]	=	1008	;
+				vector_vector_vector_double[1][3][0]	=	1009	;
+				vector_vector_vector_double[1][3][1]	=	1010	;
+				vector_vector_vector_double[1][3][2]	=	1011	;
+
+				vector_vector_vector_double[2][0][0]	=	2000	;
+				vector_vector_vector_double[2][0][1]	=	2001	;
+				vector_vector_vector_double[2][0][2]	=	2002	;
+				vector_vector_vector_double[2][1][0]	=	2003	;
+				vector_vector_vector_double[2][1][1]	=	2004	;
+				vector_vector_vector_double[2][1][2]	=	2005	;
+				vector_vector_vector_double[2][2][0]	=	2006	;
+				vector_vector_vector_double[2][2][1]	=	2007	;
+				vector_vector_vector_double[2][2][2]	=	2008	;
+				vector_vector_vector_double[2][3][0]	=	2009	;
+				vector_vector_vector_double[2][3][1]	=	2010	;
+				vector_vector_vector_double[2][3][2]	=	2011	;
+
+				vector_vector_vector_double[3][0][0]	=	3000	;
+				vector_vector_vector_double[3][0][1]	=	3001	;
+				vector_vector_vector_double[3][0][2]	=	3002	;
+				vector_vector_vector_double[3][1][0]	=	3003	;
+				vector_vector_vector_double[3][1][1]	=	3004	;
+				vector_vector_vector_double[3][1][2]	=	3005	;
+				vector_vector_vector_double[3][2][0]	=	3006	;
+				vector_vector_vector_double[3][2][1]	=	3007	;
+				vector_vector_vector_double[3][2][2]	=	3008	;
+				vector_vector_vector_double[3][3][0]	=	3009	;
+				vector_vector_vector_double[3][3][1]	=	3010	;
+				vector_vector_vector_double[3][3][2]	=	3011	;
+
+				vector_vector_vector_double[4][0][0]	=	4000	;
+				vector_vector_vector_double[4][0][1]	=	4001	;
+				vector_vector_vector_double[4][0][2]	=	4002	;
+				vector_vector_vector_double[4][1][0]	=	4003	;
+				vector_vector_vector_double[4][1][1]	=	4004	;
+				vector_vector_vector_double[4][1][2]	=	4005	;
+				vector_vector_vector_double[4][2][0]	=	4006	;
+				vector_vector_vector_double[4][2][1]	=	4007	;
+				vector_vector_vector_double[4][2][2]	=	4008	;
+				vector_vector_vector_double[4][3][0]	=	4009	;
+				vector_vector_vector_double[4][3][1]	=	4010	;
+				vector_vector_vector_double[4][3][2]	=	4011	;
+
+				for	(int	i	=	0;	i	<	10;	i++)	{
+								UserClass	temp;
+								for	(int	j	=	0;	j	<	5;	j++)	{
+												temp.a[j]	=	i+j;
+								}
+								temp.b	=	8888888888;
+								temp.c	=	"Here	is	a	test	string";
+
+								//	We'll	just	make	a	pointer	to	the	same	stuff	
+
+								UserClass	*	user_class_ptr	=	(UserClass	*)	TMM_declare_var_s("UserClass");
+								for	(int	j	=	0;	j	<	5;	j++)	{
+												user_class_ptr->a[j]	=	i+j;
+								}
+								user_class_ptr->b	=	8888888888;
+								user_class_ptr->c	=	"Here	is	a	test	string";
+
+								temp.d	=	user_class_ptr;
+
+								vec_user_simple.emplace_back(temp);
+				}
+
+				for	(int	i	=	0;	i	<	10;	i++)	{
+								SimpleWrapper	temp_wrapper;
+								temp_wrapper.a	=	888;
+								for	(int	j	=	i;	j	<	i+10;	j++)	{
+												temp_wrapper.vec.push_back(j);
+								}
+								vec_user_defined.emplace_back(temp_wrapper);
+				}
+
+				for	(int	i	=	0;	i	<	10;	i++)	{
+								SimpleWrapper	*	temp_wrapper	=	(SimpleWrapper	*)	TMM_declare_var_s("SimpleWrapper");
+								temp_wrapper->a	=	888;
+								for	(int	j	=	i;	j	<	i+10;	j++)	{
+												temp_wrapper->vec.push_back(j);
+								}
+								vec_user_defined_ptr.push_back(temp_wrapper);
+				}
+
+				return	0;
 }
 
-int STLCheckpoint::print() {
-    message_publish(1,"Quack!\n") ;
-    message_publish(1, "Double vector size: %d", double_vector.size() );
-    message_publish(1,"double_vector: %f %f %f\n", double_vector[0], double_vector[1], double_vector[2]) ;
-    message_publish(1,"vector_vector_double[1]: %f %f %f\n",
-    vector_vector_double[1][0], vector_vector_double[1][1], vector_vector_double[1][2]) ;
-    message_publish(1,"vector_vector_vector_double[4][2]: %f %f %f\n",
-    vector_vector_vector_double[4][2][0], vector_vector_vector_double[4][2][1], vector_vector_vector_double[4][2][2]) ;
-    message_publish(1,"string_vector[0]: %s\n", string_vector[0].c_str()) ;
-    message_publish(1,"map_int_vector_int[1][1] = %d\n", map_int_vector_int[1][1]) ;
-    message_publish(1,"gcd = %d\n", gcd[std::pair<int, int >(24,30)]) ;
-    message_publish(1,"common_multiples = %d\n", common_multiples[std::pair<int, int >(3,5)][1]) ;
-    message_publish(1,"common_multiples = %d\n", common_multiples[std::pair<int, int >(3,5)][1]) ;
-    message_publish(1,"int_pair_int_int.second.second = %d\n", int_pair_int_int.second.second) ;
-    message_publish(1,"pair_int_int_int.first.second = %d\n", pair_int_int_int.first.second) ;
-    message_publish(1,"pair_pair_pair.second.first = %d\n", pair_pair_pair.second.first) ;
-    message_publish(1,"int_queue.front = %d\n", int_queue.front()) ;
-    message_publish(1,"int_priority_queue.top = %d\n", int_priority_queue.top()) ;
-    message_publish(1,"uint_stack.top = %d\n", uint_stack.top()) ;
-    message_publish(1,"queue_vector_int.front()[3] = %d\n", queue_vector_int.front()[3]) ;
-    message_publish(1,"priority_queue_vector_int.top()[2] = %d\n", priority_queue_vector_int.top()[2]) ;
-    message_publish(1,"stack_vector_int.top()[1] = %d\n", stack_vector_int.top()[1]) ;
-    return 0 ;
+int	STLCheckpoint::print()	{
+				message_publish(1,"Quack!\n")	;
+				message_publish(1,	"Double	vector	size:	%d",	double_vector.size()	);
+				message_publish(1,"double_vector:	%f	%f	%f\n",	double_vector[0],	double_vector[1],	double_vector[2])	;
+				message_publish(1,"vector_vector_double[1]:	%f	%f	%f\n",
+				vector_vector_double[1][0],	vector_vector_double[1][1],	vector_vector_double[1][2])	;
+				message_publish(1,"vector_vector_vector_double[4][2]:	%f	%f	%f\n",
+				vector_vector_vector_double[4][2][0],	vector_vector_vector_double[4][2][1],	vector_vector_vector_double[4][2][2])	;
+				message_publish(1,"string_vector[0]:	%s\n",	string_vector[0].c_str())	;
+				message_publish(1,"map_int_vector_int[1][1]	=	%d\n",	map_int_vector_int[1][1])	;
+				message_publish(1,"gcd	=	%d\n",	gcd[std::pair<int,	int	>(24,30)])	;
+				message_publish(1,"common_multiples	=	%d\n",	common_multiples[std::pair<int,	int	>(3,5)][1])	;
+				message_publish(1,"common_multiples	=	%d\n",	common_multiples[std::pair<int,	int	>(3,5)][1])	;
+				message_publish(1,"int_pair_int_int.second.second	=	%d\n",	int_pair_int_int.second.second)	;
+				message_publish(1,"pair_int_int_int.first.second	=	%d\n",	pair_int_int_int.first.second)	;
+				message_publish(1,"pair_pair_pair.second.first	=	%d\n",	pair_pair_pair.second.first)	;
+				message_publish(1,"int_queue.front	=	%d\n",	int_queue.front())	;
+				message_publish(1,"int_priority_queue.top	=	%d\n",	int_priority_queue.top())	;
+				message_publish(1,"uint_stack.top	=	%d\n",	uint_stack.top())	;
+				message_publish(1,"queue_vector_int.front()[3]	=	%d\n",	queue_vector_int.front()[3])	;
+				message_publish(1,"priority_queue_vector_int.top()[2]	=	%d\n",	priority_queue_vector_int.top()[2])	;
+				message_publish(1,"stack_vector_int.top()[1]	=	%d\n",	stack_vector_int.top()[1])	;
+				return	0	;
 }
 
-int STLCheckpoint::test() {
-    std::cout << "Running test jobs" << std::endl;
-    const char *test_suite = "STLCheckpoint";
-
-    TRICK_EXPECT_EQ( double_vector.size(), 3, test_suite, "double_vector size");
-    TRICK_EXPECT_EQ( double_vector[0], 4, test_suite, "double_vector[0]");
-    TRICK_EXPECT_EQ( double_vector[1], 5, test_suite, "double_vector[1]");
-    TRICK_EXPECT_EQ( double_vector[2], 6, test_suite, "double_vector[2]");
-    TRICK_EXPECT_EQ( vector_vector_double[1][0], 103, test_suite, "vector_vector_double[1][0]");
-    TRICK_EXPECT_EQ( vector_vector_double[1][1], 104, test_suite, "vector_vector_double[1][1]");
-    TRICK_EXPECT_EQ( vector_vector_double[1][2], 105, test_suite, "vector_vector_double[1][2]");
-    TRICK_EXPECT_EQ( vector_vector_vector_double[4][2][0], 4006, test_suite, "vector_vector_vector_double[4][2][0]");
-    TRICK_EXPECT_EQ( vector_vector_vector_double[4][2][1], 4007, test_suite, "vector_vector_vector_double[4][2][1]");
-    TRICK_EXPECT_EQ( vector_vector_vector_double[4][2][2], 4008, test_suite, "vector_vector_vector_double[4][2][2]");
-    TRICK_EXPECT_EQ( string_vector[0], std::string("It"), test_suite, "string_vector");
-
-    TRICK_EXPECT_EQ( double_map[44.4], 444.4, test_suite, "double_map[44.4]" );
-
-    TRICK_EXPECT_EQ( string_data_map[7], std::string("seiben"), test_suite, "string_data_map[7]" );
-    TRICK_EXPECT_EQ( string_data_map[9], std::string("neun") , test_suite, "string_data_map[9]");
-
-    std::vector< int > v ;
-    v.push_back(2) ;
-    v.push_back(4) ;
-    v.push_back(6) ;
-    v.push_back(8) ;
-    TRICK_EXPECT_EQ( map_int_vector_int[1], v, test_suite, "map_int_vector_int[1]");
-
-    std::pair< int , int > p ;
-    p.first = 24 ;
-    p.second = 30 ;
-    TRICK_EXPECT_EQ(gcd[p], 6, test_suite, "gcd[p]" );
-
-    p.first = 50 ;
-    p.second = 60 ;
-    std::pair< int , int > q ;
-    q.first = 70 ;
-    q.second = 80 ;
-    TRICK_EXPECT_EQ( map_pair_pair[p], q, test_suite, "map_pair_pair[p]" );
-
-    p.first = 3 ;
-    p.second = 5 ;
-    v.clear() ;
-    v.push_back(15) ;
-    v.push_back(30) ;
-    v.push_back(45) ;
-    v.push_back(60) ;
-    TRICK_EXPECT_EQ( common_multiples[p], v, test_suite, "common_multiples" );
-
-    p.first = 3 ;
-    p.second = 7 ;
-    v.clear() ;
-    v.push_back(21) ;
-    v.push_back(42) ;
-    v.push_back(84) ;
-    v.push_back(168) ;
-    TRICK_EXPECT_EQ( common_multiples[p], v, test_suite, "common_multiples" );
-
-
-    TRICK_EXPECT_EQ( string_map["sister"], "Lisa", test_suite, "string_map[sister]" );
-    TRICK_EXPECT_EQ( string_map["dog"], "Santa's Little Helper", test_suite, "string_map[dog]" );
-
-    
-    // The easiest way to test the multimaps is to just rebuild copies and compare
-    std::multimap<int, int> int_multimap_copy;
-    int_multimap_copy.insert(std::pair<int, int>(44,444)) ;
-    int_multimap_copy.insert(std::pair<int, int>(55,555)) ;
-    int_multimap_copy.insert(std::pair<int, int>(66,666)) ;
-    int_multimap_copy.insert(std::pair<int, int>(44,4444)) ;
-    int_multimap_copy.insert(std::pair<int, int>(55,5555)) ;
-    int_multimap_copy.insert(std::pair<int, int>(66,6666)) ;
-    TRICK_EXPECT_EQ(int_multimap, int_multimap_copy , test_suite, "int_multimap");
-
-    int_multimap_copy.insert(std::pair<int, int>(66,66666)) ;
-    TRICK_EXPECT_NE(int_multimap, int_multimap_copy , test_suite, "int_multimap_fail");
-
-    std::multimap<std::string, int> string_key_multimap_copy;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("four", 4)) ;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("five", 5)) ;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("six", 6)) ;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("four", 44)) ;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("five",  55)) ;
-    string_key_multimap_copy.insert(std::pair<std::string, int>("six", 66)) ;
-    TRICK_EXPECT_EQ(string_key_multimap, string_key_multimap_copy , test_suite, "string_key_multimap");
-
-    std::multimap<int, std::string> string_data_multimap_copy;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(7, "seiben")) ;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(8, "acht")) ;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(9, "neun")) ;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(7, "seven")) ;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(8, "eight")) ;
-    string_data_multimap_copy.insert(std::pair<int, std::string>(9, "nine")) ;
-    TRICK_EXPECT_EQ(string_data_multimap, string_data_multimap_copy , test_suite, "string_data_multimap");
-
-    std::multimap<std::string, std::string> string_multimap_copy;
-    string_multimap_copy.insert(std::pair<std::string, std::string>("sister","Lisa")) ;
-    string_multimap_copy.insert(std::pair<std::string, std::string>("dog","Santa's Little Helper")) ;
-    string_multimap_copy.insert(std::pair<std::string, std::string>("sister","Meg")) ;
-    string_multimap_copy.insert(std::pair<std::string, std::string>("dog","Brian")) ;
-    TRICK_EXPECT_EQ(string_multimap, string_multimap_copy , test_suite, "string_multimap");
-
-
-    // TODO: fix this case
-    // TRICK_EXPECT_EQ(vec_user_defined.size(), 10, test_suite, "vec_user_defined");
-    // for (int i = 0; i < vec_user_defined.size(); i++) {
-    //     TRICK_EXPECT_EQ(vec_user_defined[i].vec.size(), 10, test_suite, "vec_user_defined");
-    //     TRICK_EXPECT_EQ(vec_user_defined[i].a, 888, test_suite, "vec_user_defined");
-    //     for (int j = i; j < i+vec_user_defined[i].vec.size(); j++) {
-    //         TRICK_EXPECT_EQ(vec_user_defined[i].vec[j-i], j, test_suite, "vec_user_defined");
-    //     }
-    // }
-
-    TRICK_EXPECT_EQ(vec_user_defined_ptr.size(), 10, test_suite, "vec_user_defined_ptr");
-    for (int i = 0; i < vec_user_defined_ptr.size(); i++) {
-        TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->vec.size(), 10, test_suite, "vec_user_defined_ptr");
-        TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->a, 888, test_suite, "vec_user_defined_ptr");
-        std::vector<int> test_vec;
-        for (int j = i; j < i+vec_user_defined_ptr[i]->vec.size(); j++) {
-            test_vec.push_back(j);
-        }
-        TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->vec, test_vec, test_suite, "vec_user_defined_ptr");
-    }
-
-
-    std::vector<std::string> string_vector_copy = {"It", "has", "the", "Wi-Fies"};
-    TRICK_EXPECT_EQ(string_vector, string_vector_copy, test_suite, "string_vector");
-
-    std::list<short> short_list_copy = {400, 401, 402};
-    int list_index = 0;
-    TRICK_EXPECT_EQ(short_list, short_list_copy, test_suite, "short_list");
-
-    std::list<std::string> string_list_copy = {"I", "don't", "care"};
-    TRICK_EXPECT_EQ(string_list, string_list_copy, test_suite, "string_list");
-
-    std::deque<float> float_deque_copy = {98.7, 65.4, 32.1};
-    TRICK_EXPECT_EQ(float_deque, float_deque_copy, test_suite, "float_deque");
-
-    std::deque<std::string> string_deque_copy = {"Welcome", "to", "PhoneMart"};
-    TRICK_EXPECT_EQ(string_deque, string_deque_copy, test_suite, "string_deque");
-
-    std::set<int> int_set_copy = {8000, 4000, 2000, 1000};
-    TRICK_EXPECT_EQ(int_set, int_set_copy, test_suite, "int_set");
-
-    std::set<std::string> string_set_copy = {"efg", "abc", "def"};
-    TRICK_EXPECT_EQ(string_set, string_set_copy, test_suite, "string_set");
-
-    std::set<std::vector<int>> vector_set_copy;
-    for (int j = 0; j < 5; j++) {
-        std::vector<int> temp;
-        for (int i = j; i < 10; i++) {
-            temp.push_back(i);
-        }
-        vector_set_copy.insert(temp);
-    }
-    TRICK_EXPECT_EQ(vector_set, vector_set_copy, test_suite, "vector_set");
-
-    std::set<std::pair<std::string, int>> pair_set_copy;
-    pair_set_copy.emplace("One", 1);
-    pair_set_copy.emplace("Two", 2);
-    pair_set_copy.emplace("Three", 3);
-    TRICK_EXPECT_EQ(pair_set, pair_set_copy, test_suite, "pair_set");
-
-    std::set<std::map<short,double>> nested_map_set_copy;
-    std::map<short,double> m;
-    m[5] = 500.5;
-    m[1] = 100.1;
-    std::map<short,double> m2;
-    m2[5] = 5000.5;
-    m2[1] = 1000.1; 
-    nested_map_set_copy.insert(m);
-    nested_map_set_copy.insert(m2);
-    TRICK_EXPECT_EQ(nested_map_set, nested_map_set_copy, test_suite, "nested_map_set");
-
-    std::queue<std::vector<int>> vector_queue_copy;
-    for (int j = 0; j < 5; j++) {
-        std::vector<int> temp;
-        for (int i = j; i < 10; i++) {
-            temp.push_back(i);
-        }
-        vector_queue_copy.push(temp);
-    }
-    TRICK_EXPECT_EQ(vector_queue, vector_queue_copy, test_suite, "vector_queue");
-
-    std::multiset<long> long_multiset_copy = {8000, 4000, 4000, 2000, 1000};
-    TRICK_EXPECT_EQ(long_multiset, long_multiset_copy, test_suite, "long_multiset");
-
-    std::multiset<std::string> string_multiset_copy = {"efg", "abc", "def", "efg", "abc", "def"};
-    TRICK_EXPECT_EQ(string_multiset, string_multiset_copy, test_suite, "string_multiset");
-
-    std::multiset<std::pair<int,int>> pair_multiset_copy;
-    pair_multiset_copy.emplace(5, 5);
-    pair_multiset_copy.emplace(5, 5);
-    pair_multiset_copy.emplace(5, 4);
-    pair_multiset_copy.emplace(4, 4);
-    TRICK_EXPECT_EQ(pair_multiset, pair_multiset_copy, test_suite, "pair_multiset");
-
-    std::multiset<std::vector<int>> vec_multiset_copy;
-    vec_multiset_copy.emplace(std::vector<int>({1,2,3,4}));
-    vec_multiset_copy.emplace(std::vector<int>({1,2,3,4}));
-    vec_multiset_copy.emplace(std::vector<int>({1,2,3,4,5}));
-    TRICK_EXPECT_EQ(vec_multiset, vec_multiset_copy, test_suite, "vec_multiset");
-
-    std::stack<unsigned int> uint_stack_copy;
-    uint_stack_copy.push(1) ;
-    uint_stack_copy.push(2) ;
-    uint_stack_copy.push(3) ;
-    uint_stack_copy.push(4) ;
-    TRICK_EXPECT_EQ(uint_stack, uint_stack_copy, test_suite, "uint_stack");
-
-    std::stack<std::string> string_stack_copy;
-    string_stack_copy.push("I") ;
-    string_stack_copy.push("want the one") ;
-    string_stack_copy.push("with the bigger") ;
-    string_stack_copy.push("Gee Bees") ;
-    TRICK_EXPECT_EQ(string_stack, string_stack_copy, test_suite, "string_stack");
-
-    std::stack<std::vector<int>> stack_vector_int_copy;
-    std::vector<int> temp_v1 = {1, 2, 3, 4};
-    std::vector<int> temp_v2 = {5, 6, 7, 8};
-    stack_vector_int_copy.emplace(temp_v1) ;
-    stack_vector_int_copy.emplace(temp_v2) ;
-    TRICK_EXPECT_EQ(stack_vector_int, stack_vector_int_copy, test_suite, "stack_vector_int");
-
-    std::queue<int> int_queue_copy;
-    int_queue_copy.push(1) ;
-    int_queue_copy.push(2) ;
-    int_queue_copy.push(3) ;
-    int_queue_copy.push(4) ;
-    TRICK_EXPECT_EQ(int_queue, int_queue_copy, test_suite, "int_queue");
-
-    std::queue<std::string> string_queue_copy;
-    string_queue_copy.push("I") ;
-    string_queue_copy.push("want") ;
-    string_queue_copy.push("an") ;
-    string_queue_copy.push("iPhone 4") ;
-    TRICK_EXPECT_EQ(string_queue, string_queue_copy, test_suite, "string_queue");
-
-    // Why doesn't priority_queue have the == operator but literally everything else does >:(
-    std::priority_queue<int> int_priority_queue_copy;
-    int_priority_queue_copy.push(3) ;
-    int_priority_queue_copy.push(2) ;
-    int_priority_queue_copy.push(4) ;
-    int_priority_queue_copy.push(1) ;
-    compare_data_structures_with_top(int_priority_queue_copy, int_priority_queue, "int_priority_queue");
-
-    std::priority_queue<std::string> string_priority_queue_copy;
-    string_priority_queue_copy.push("I") ;
-    string_priority_queue_copy.push("want") ;
-    string_priority_queue_copy.push("an") ;
-    string_priority_queue_copy.push("iPhone 4") ;
-    compare_data_structures_with_top(string_priority_queue_copy, string_priority_queue, "string_priority_queue");
-
-    std::queue<std::vector<int>> queue_vector_int_copy;
-    queue_vector_int_copy.emplace(temp_v1) ;
-    queue_vector_int_copy.emplace(temp_v2) ;
-    TRICK_EXPECT_EQ(queue_vector_int, queue_vector_int_copy, test_suite, "queue_vector_int");
-
-    std::priority_queue<std::vector<int>> priority_queue_vector_int_copy;
-    priority_queue_vector_int_copy.emplace(temp_v1) ;
-    priority_queue_vector_int_copy.emplace(temp_v2) ;
-    compare_data_structures_with_top(priority_queue_vector_int_copy, priority_queue_vector_int, "priority_queue_vector_int");
-
-    std::pair<int,int> int_pair_copy(10,20);
-    TRICK_EXPECT_EQ(int_pair, int_pair_copy, test_suite, "int_pair");
-
-    std::pair< std::string , int > string_first_pair_copy ("string first", 25);
-    TRICK_EXPECT_EQ(string_first_pair, string_first_pair_copy, test_suite, "string_first_pair");
-
-    std::pair< int , std::string > string_second_pair_copy (25, "string second");
-    TRICK_EXPECT_EQ(string_second_pair_copy, string_second_pair, test_suite, "string_second_pair");
-
-    std::pair< std::string , std::string > string_pair_copy ("pair first string", "pair second string");
-    TRICK_EXPECT_EQ(string_pair_copy, string_pair, test_suite, "string_pair");
-
-
-    std::pair< int , std::pair< int, int > > int_pair_int_int_copy;
-    int_pair_int_int_copy.first = 200 ;
-    p.first = 10 ;
-    p.second = 20 ;
-    int_pair_int_int_copy.second = p ;
-    TRICK_EXPECT_EQ(int_pair_int_int_copy, int_pair_int_int, test_suite, "int_pair_int_int");
-
-    std::pair< std::pair< int, int > , int > pair_int_int_int_copy;
-    p.first = 15 ;
-    p.second = 12 ;
-    pair_int_int_int_copy.first = p ;
-    pair_int_int_int_copy.second = 180 ;
-    TRICK_EXPECT_EQ(pair_int_int_int_copy, pair_int_int_int, test_suite, "pair_int_int_int");
-
-    std::pair< std::pair< int, int > , std::pair< int, int > > pair_pair_pair_copy ;
-    pair_pair_pair_copy.first.first = 51 ;
-    pair_pair_pair_copy.first.second = 52 ;
-    pair_pair_pair_copy.second.first = 53 ;
-    pair_pair_pair_copy.second.second = 54 ;
-    TRICK_EXPECT_EQ(pair_pair_pair_copy, pair_pair_pair, test_suite, "pair_pair_pair");
-
-    // Check all the int/vec combo pairs together, for laziness
-    TRICK_EXPECT_EQ(int_vec_pair.first, 5, test_suite, "int_vec_pair.first");
-    TRICK_EXPECT_EQ(vec_int_pair.second, 5, test_suite, "vec_int_pair.second");
-
-    TRICK_EXPECT_EQ(int_vec_pair.second.size(), 4, test_suite, "int_vec_pair.second.size");
-    TRICK_EXPECT_EQ(vec_int_pair.first.size(), 4, test_suite, "vec_int_pair.first.size");
-    TRICK_EXPECT_EQ(vec_vec_pair.first.size(), 4, test_suite, "vec_vec_pair.first.size");
-    TRICK_EXPECT_EQ(vec_vec_pair.second.size(), 4, test_suite, "vec_vec_pair.second.size");
-
-    for (int i = 0; i < int_vec_pair.second.size(); i++) {
-        TRICK_EXPECT_EQ(int_vec_pair.second[i], (i+1)*5, test_suite, "int_vec_pair.second elems");
-        TRICK_EXPECT_EQ(vec_int_pair.first[i], (i+1)*5, test_suite, "vec_int_pair.first elems");
-        TRICK_EXPECT_EQ(vec_vec_pair.first[i], (i+1)*5, test_suite, "vec_vec_pair.first elems");
-        TRICK_EXPECT_EQ(vec_vec_pair.second[i], (i+1)*5, test_suite, "vec_vec_pair.second elems");
-
-    }
-
-
-    TRICK_EXPECT_EQ(vec_user_simple.size(), 10, test_suite, "vec_user_simple")
-    for (int i = 0; i < 10; i++) {
-        for (int j = 0; j < 5; j++) {
-            TRICK_EXPECT_EQ(vec_user_simple[i].a[j], i+j, test_suite, "vec_user_simple");
-            TRICK_EXPECT_EQ(vec_user_simple[i].d->a[j], i+j, test_suite, "vec_user_simple");
-        }
-
-        TRICK_EXPECT_EQ(vec_user_simple[i].b, 8888888888, test_suite, "vec_user_simple");
-        TRICK_EXPECT_EQ(vec_user_simple[i].d->b, 8888888888, test_suite, "vec_user_simple");
-
-        TRICK_EXPECT_EQ(vec_user_simple[i].c, "Here is a test string", test_suite, "vec_user_simple");
-        TRICK_EXPECT_EQ(vec_user_simple[i].d->c, "Here is a test string", test_suite, "vec_user_simple");
-    }
-
-    
+int	STLCheckpoint::test()	{
+				std::cout	<<	"Running	test	jobs"	<<	std::endl;
+				const	char	*test_suite	=	"STLCheckpoint";
+
+				TRICK_EXPECT_EQ(	double_vector.size(),	3,	test_suite,	"double_vector	size");
+				TRICK_EXPECT_EQ(	double_vector[0],	4,	test_suite,	"double_vector[0]");
+				TRICK_EXPECT_EQ(	double_vector[1],	5,	test_suite,	"double_vector[1]");
+				TRICK_EXPECT_EQ(	double_vector[2],	6,	test_suite,	"double_vector[2]");
+				TRICK_EXPECT_EQ(	vector_vector_double[1][0],	103,	test_suite,	"vector_vector_double[1][0]");
+				TRICK_EXPECT_EQ(	vector_vector_double[1][1],	104,	test_suite,	"vector_vector_double[1][1]");
+				TRICK_EXPECT_EQ(	vector_vector_double[1][2],	105,	test_suite,	"vector_vector_double[1][2]");
+				TRICK_EXPECT_EQ(	vector_vector_vector_double[4][2][0],	4006,	test_suite,	"vector_vector_vector_double[4][2][0]");
+				TRICK_EXPECT_EQ(	vector_vector_vector_double[4][2][1],	4007,	test_suite,	"vector_vector_vector_double[4][2][1]");
+				TRICK_EXPECT_EQ(	vector_vector_vector_double[4][2][2],	4008,	test_suite,	"vector_vector_vector_double[4][2][2]");
+				TRICK_EXPECT_EQ(	string_vector[0],	std::string("It"),	test_suite,	"string_vector");
+
+				TRICK_EXPECT_EQ(	double_map[44.4],	444.4,	test_suite,	"double_map[44.4]"	);
+
+				TRICK_EXPECT_EQ(	string_data_map[7],	std::string("seiben"),	test_suite,	"string_data_map[7]"	);
+				TRICK_EXPECT_EQ(	string_data_map[9],	std::string("neun")	,	test_suite,	"string_data_map[9]");
+
+				std::vector<	int	>	v	;
+				v.push_back(2)	;
+				v.push_back(4)	;
+				v.push_back(6)	;
+				v.push_back(8)	;
+				TRICK_EXPECT_EQ(	map_int_vector_int[1],	v,	test_suite,	"map_int_vector_int[1]");
+
+				std::pair<	int	,	int	>	p	;
+				p.first	=	24	;
+				p.second	=	30	;
+				TRICK_EXPECT_EQ(gcd[p],	6,	test_suite,	"gcd[p]"	);
+
+				p.first	=	50	;
+				p.second	=	60	;
+				std::pair<	int	,	int	>	q	;
+				q.first	=	70	;
+				q.second	=	80	;
+				TRICK_EXPECT_EQ(	map_pair_pair[p],	q,	test_suite,	"map_pair_pair[p]"	);
+
+				p.first	=	3	;
+				p.second	=	5	;
+				v.clear()	;
+				v.push_back(15)	;
+				v.push_back(30)	;
+				v.push_back(45)	;
+				v.push_back(60)	;
+				TRICK_EXPECT_EQ(	common_multiples[p],	v,	test_suite,	"common_multiples"	);
+
+				p.first	=	3	;
+				p.second	=	7	;
+				v.clear()	;
+				v.push_back(21)	;
+				v.push_back(42)	;
+				v.push_back(84)	;
+				v.push_back(168)	;
+				TRICK_EXPECT_EQ(	common_multiples[p],	v,	test_suite,	"common_multiples"	);
+
+
+				TRICK_EXPECT_EQ(	string_map["sister"],	"Lisa",	test_suite,	"string_map[sister]"	);
+				TRICK_EXPECT_EQ(	string_map["dog"],	"Santa's	Little	Helper",	test_suite,	"string_map[dog]"	);
+
+				
+				//	The	easiest	way	to	test	the	multimaps	is	to	just	rebuild	copies	and	compare
+				std::multimap<int,	int>	int_multimap_copy;
+				int_multimap_copy.insert(std::pair<int,	int>(44,444))	;
+				int_multimap_copy.insert(std::pair<int,	int>(55,555))	;
+				int_multimap_copy.insert(std::pair<int,	int>(66,666))	;
+				int_multimap_copy.insert(std::pair<int,	int>(44,4444))	;
+				int_multimap_copy.insert(std::pair<int,	int>(55,5555))	;
+				int_multimap_copy.insert(std::pair<int,	int>(66,6666))	;
+				TRICK_EXPECT_EQ(int_multimap,	int_multimap_copy	,	test_suite,	"int_multimap");
+
+				int_multimap_copy.insert(std::pair<int,	int>(66,66666))	;
+				TRICK_EXPECT_NE(int_multimap,	int_multimap_copy	,	test_suite,	"int_multimap_fail");
+
+				std::multimap<std::string,	int>	string_key_multimap_copy;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("four",	4))	;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("five",	5))	;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("six",	6))	;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("four",	44))	;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("five",		55))	;
+				string_key_multimap_copy.insert(std::pair<std::string,	int>("six",	66))	;
+				TRICK_EXPECT_EQ(string_key_multimap,	string_key_multimap_copy	,	test_suite,	"string_key_multimap");
+
+				std::multimap<int,	std::string>	string_data_multimap_copy;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(7,	"seiben"))	;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(8,	"acht"))	;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(9,	"neun"))	;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(7,	"seven"))	;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(8,	"eight"))	;
+				string_data_multimap_copy.insert(std::pair<int,	std::string>(9,	"nine"))	;
+				TRICK_EXPECT_EQ(string_data_multimap,	string_data_multimap_copy	,	test_suite,	"string_data_multimap");
+
+				std::multimap<std::string,	std::string>	string_multimap_copy;
+				string_multimap_copy.insert(std::pair<std::string,	std::string>("sister","Lisa"))	;
+				string_multimap_copy.insert(std::pair<std::string,	std::string>("dog","Santa's	Little	Helper"))	;
+				string_multimap_copy.insert(std::pair<std::string,	std::string>("sister","Meg"))	;
+				string_multimap_copy.insert(std::pair<std::string,	std::string>("dog","Brian"))	;
+				TRICK_EXPECT_EQ(string_multimap,	string_multimap_copy	,	test_suite,	"string_multimap");
+
+
+				//	TODO:	fix	this	case
+				//	TRICK_EXPECT_EQ(vec_user_defined.size(),	10,	test_suite,	"vec_user_defined");
+				//	for	(int	i	=	0;	i	<	vec_user_defined.size();	i++)	{
+				//					TRICK_EXPECT_EQ(vec_user_defined[i].vec.size(),	10,	test_suite,	"vec_user_defined");
+				//					TRICK_EXPECT_EQ(vec_user_defined[i].a,	888,	test_suite,	"vec_user_defined");
+				//					for	(int	j	=	i;	j	<	i+vec_user_defined[i].vec.size();	j++)	{
+				//									TRICK_EXPECT_EQ(vec_user_defined[i].vec[j-i],	j,	test_suite,	"vec_user_defined");
+				//					}
+				//	}
+
+				TRICK_EXPECT_EQ(vec_user_defined_ptr.size(),	10,	test_suite,	"vec_user_defined_ptr");
+				for	(int	i	=	0;	i	<	vec_user_defined_ptr.size();	i++)	{
+								TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->vec.size(),	10,	test_suite,	"vec_user_defined_ptr");
+								TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->a,	888,	test_suite,	"vec_user_defined_ptr");
+								std::vector<int>	test_vec;
+								for	(int	j	=	i;	j	<	i+vec_user_defined_ptr[i]->vec.size();	j++)	{
+												test_vec.push_back(j);
+								}
+								TRICK_EXPECT_EQ(vec_user_defined_ptr[i]->vec,	test_vec,	test_suite,	"vec_user_defined_ptr");
+				}
+
+
+				std::vector<std::string>	string_vector_copy	=	{"It",	"has",	"the",	"Wi-Fies"};
+				TRICK_EXPECT_EQ(string_vector,	string_vector_copy,	test_suite,	"string_vector");
+
+				std::list<short>	short_list_copy	=	{400,	401,	402};
+				int	list_index	=	0;
+				TRICK_EXPECT_EQ(short_list,	short_list_copy,	test_suite,	"short_list");
+
+				std::list<std::string>	string_list_copy	=	{"I",	"don't",	"care"};
+				TRICK_EXPECT_EQ(string_list,	string_list_copy,	test_suite,	"string_list");
+
+				std::deque<float>	float_deque_copy	=	{98.7,	65.4,	32.1};
+				TRICK_EXPECT_EQ(float_deque,	float_deque_copy,	test_suite,	"float_deque");
+
+				std::deque<std::string>	string_deque_copy	=	{"Welcome",	"to",	"PhoneMart"};
+				TRICK_EXPECT_EQ(string_deque,	string_deque_copy,	test_suite,	"string_deque");
+
+				std::set<int>	int_set_copy	=	{8000,	4000,	2000,	1000};
+				TRICK_EXPECT_EQ(int_set,	int_set_copy,	test_suite,	"int_set");
+
+				std::set<std::string>	string_set_copy	=	{"efg",	"abc",	"def"};
+				TRICK_EXPECT_EQ(string_set,	string_set_copy,	test_suite,	"string_set");
+
+				std::set<std::vector<int>>	vector_set_copy;
+				for	(int	j	=	0;	j	<	5;	j++)	{
+								std::vector<int>	temp;
+								for	(int	i	=	j;	i	<	10;	i++)	{
+												temp.push_back(i);
+								}
+								vector_set_copy.insert(temp);
+				}
+				TRICK_EXPECT_EQ(vector_set,	vector_set_copy,	test_suite,	"vector_set");
+
+				std::set<std::pair<std::string,	int>>	pair_set_copy;
+				pair_set_copy.emplace("One",	1);
+				pair_set_copy.emplace("Two",	2);
+				pair_set_copy.emplace("Three",	3);
+				TRICK_EXPECT_EQ(pair_set,	pair_set_copy,	test_suite,	"pair_set");
+
+				std::set<std::map<short,double>>	nested_map_set_copy;
+				std::map<short,double>	m;
+				m[5]	=	500.5;
+				m[1]	=	100.1;
+				std::map<short,double>	m2;
+				m2[5]	=	5000.5;
+				m2[1]	=	1000.1;	
+				nested_map_set_copy.insert(m);
+				nested_map_set_copy.insert(m2);
+				TRICK_EXPECT_EQ(nested_map_set,	nested_map_set_copy,	test_suite,	"nested_map_set");
+
+				std::queue<std::vector<int>>	vector_queue_copy;
+				for	(int	j	=	0;	j	<	5;	j++)	{
+								std::vector<int>	temp;
+								for	(int	i	=	j;	i	<	10;	i++)	{
+												temp.push_back(i);
+								}
+								vector_queue_copy.push(temp);
+				}
+				TRICK_EXPECT_EQ(vector_queue,	vector_queue_copy,	test_suite,	"vector_queue");
+
+				std::multiset<long>	long_multiset_copy	=	{8000,	4000,	4000,	2000,	1000};
+				TRICK_EXPECT_EQ(long_multiset,	long_multiset_copy,	test_suite,	"long_multiset");
+
+				std::multiset<std::string>	string_multiset_copy	=	{"efg",	"abc",	"def",	"efg",	"abc",	"def"};
+				TRICK_EXPECT_EQ(string_multiset,	string_multiset_copy,	test_suite,	"string_multiset");
+
+				std::multiset<std::pair<int,int>>	pair_multiset_copy;
+				pair_multiset_copy.emplace(5,	5);
+				pair_multiset_copy.emplace(5,	5);
+				pair_multiset_copy.emplace(5,	4);
+				pair_multiset_copy.emplace(4,	4);
+				TRICK_EXPECT_EQ(pair_multiset,	pair_multiset_copy,	test_suite,	"pair_multiset");
+
+				std::multiset<std::vector<int>>	vec_multiset_copy;
+				vec_multiset_copy.emplace(std::vector<int>({1,2,3,4}));
+				vec_multiset_copy.emplace(std::vector<int>({1,2,3,4}));
+				vec_multiset_copy.emplace(std::vector<int>({1,2,3,4,5}));
+				TRICK_EXPECT_EQ(vec_multiset,	vec_multiset_copy,	test_suite,	"vec_multiset");
+
+				std::stack<unsigned	int>	uint_stack_copy;
+				uint_stack_copy.push(1)	;
+				uint_stack_copy.push(2)	;
+				uint_stack_copy.push(3)	;
+				uint_stack_copy.push(4)	;
+				TRICK_EXPECT_EQ(uint_stack,	uint_stack_copy,	test_suite,	"uint_stack");
+
+				std::stack<std::string>	string_stack_copy;
+				string_stack_copy.push("I")	;
+				string_stack_copy.push("want	the	one")	;
+				string_stack_copy.push("with	the	bigger")	;
+				string_stack_copy.push("Gee	Bees")	;
+				TRICK_EXPECT_EQ(string_stack,	string_stack_copy,	test_suite,	"string_stack");
+
+				std::stack<std::vector<int>>	stack_vector_int_copy;
+				std::vector<int>	temp_v1	=	{1,	2,	3,	4};
+				std::vector<int>	temp_v2	=	{5,	6,	7,	8};
+				stack_vector_int_copy.emplace(temp_v1)	;
+				stack_vector_int_copy.emplace(temp_v2)	;
+				TRICK_EXPECT_EQ(stack_vector_int,	stack_vector_int_copy,	test_suite,	"stack_vector_int");
+
+				std::queue<int>	int_queue_copy;
+				int_queue_copy.push(1)	;
+				int_queue_copy.push(2)	;
+				int_queue_copy.push(3)	;
+				int_queue_copy.push(4)	;
+				TRICK_EXPECT_EQ(int_queue,	int_queue_copy,	test_suite,	"int_queue");
+
+				std::queue<std::string>	string_queue_copy;
+				string_queue_copy.push("I")	;
+				string_queue_copy.push("want")	;
+				string_queue_copy.push("an")	;
+				string_queue_copy.push("iPhone	4")	;
+				TRICK_EXPECT_EQ(string_queue,	string_queue_copy,	test_suite,	"string_queue");
+
+				//	Why	doesn't	priority_queue	have	the	==	operator	but	literally	everything	else	does	>:(
+				std::priority_queue<int>	int_priority_queue_copy;
+				int_priority_queue_copy.push(3)	;
+				int_priority_queue_copy.push(2)	;
+				int_priority_queue_copy.push(4)	;
+				int_priority_queue_copy.push(1)	;
+				compare_data_structures_with_top(int_priority_queue_copy,	int_priority_queue,	"int_priority_queue");
+
+				std::priority_queue<std::string>	string_priority_queue_copy;
+				string_priority_queue_copy.push("I")	;
+				string_priority_queue_copy.push("want")	;
+				string_priority_queue_copy.push("an")	;
+				string_priority_queue_copy.push("iPhone	4")	;
+				compare_data_structures_with_top(string_priority_queue_copy,	string_priority_queue,	"string_priority_queue");
+
+				std::queue<std::vector<int>>	queue_vector_int_copy;
+				queue_vector_int_copy.emplace(temp_v1)	;
+				queue_vector_int_copy.emplace(temp_v2)	;
+				TRICK_EXPECT_EQ(queue_vector_int,	queue_vector_int_copy,	test_suite,	"queue_vector_int");
+
+				std::priority_queue<std::vector<int>>	priority_queue_vector_int_copy;
+				priority_queue_vector_int_copy.emplace(temp_v1)	;
+				priority_queue_vector_int_copy.emplace(temp_v2)	;
+				compare_data_structures_with_top(priority_queue_vector_int_copy,	priority_queue_vector_int,	"priority_queue_vector_int");
+
+				std::pair<int,int>	int_pair_copy(10,20);
+				TRICK_EXPECT_EQ(int_pair,	int_pair_copy,	test_suite,	"int_pair");
+
+				std::pair<	std::string	,	int	>	string_first_pair_copy	("string	first",	25);
+				TRICK_EXPECT_EQ(string_first_pair,	string_first_pair_copy,	test_suite,	"string_first_pair");
+
+				std::pair<	int	,	std::string	>	string_second_pair_copy	(25,	"string	second");
+				TRICK_EXPECT_EQ(string_second_pair_copy,	string_second_pair,	test_suite,	"string_second_pair");
+
+				std::pair<	std::string	,	std::string	>	string_pair_copy	("pair	first	string",	"pair	second	string");
+				TRICK_EXPECT_EQ(string_pair_copy,	string_pair,	test_suite,	"string_pair");
+
+
+				std::pair<	int	,	std::pair<	int,	int	>	>	int_pair_int_int_copy;
+				int_pair_int_int_copy.first	=	200	;
+				p.first	=	10	;
+				p.second	=	20	;
+				int_pair_int_int_copy.second	=	p	;
+				TRICK_EXPECT_EQ(int_pair_int_int_copy,	int_pair_int_int,	test_suite,	"int_pair_int_int");
+
+				std::pair<	std::pair<	int,	int	>	,	int	>	pair_int_int_int_copy;
+				p.first	=	15	;
+				p.second	=	12	;
+				pair_int_int_int_copy.first	=	p	;
+				pair_int_int_int_copy.second	=	180	;
+				TRICK_EXPECT_EQ(pair_int_int_int_copy,	pair_int_int_int,	test_suite,	"pair_int_int_int");
+
+				std::pair<	std::pair<	int,	int	>	,	std::pair<	int,	int	>	>	pair_pair_pair_copy	;
+				pair_pair_pair_copy.first.first	=	51	;
+				pair_pair_pair_copy.first.second	=	52	;
+				pair_pair_pair_copy.second.first	=	53	;
+				pair_pair_pair_copy.second.second	=	54	;
+				TRICK_EXPECT_EQ(pair_pair_pair_copy,	pair_pair_pair,	test_suite,	"pair_pair_pair");
+
+				//	Check	all	the	int/vec	combo	pairs	together,	for	laziness
+				TRICK_EXPECT_EQ(int_vec_pair.first,	5,	test_suite,	"int_vec_pair.first");
+				TRICK_EXPECT_EQ(vec_int_pair.second,	5,	test_suite,	"vec_int_pair.second");
+
+				TRICK_EXPECT_EQ(int_vec_pair.second.size(),	4,	test_suite,	"int_vec_pair.second.size");
+				TRICK_EXPECT_EQ(vec_int_pair.first.size(),	4,	test_suite,	"vec_int_pair.first.size");
+				TRICK_EXPECT_EQ(vec_vec_pair.first.size(),	4,	test_suite,	"vec_vec_pair.first.size");
+				TRICK_EXPECT_EQ(vec_vec_pair.second.size(),	4,	test_suite,	"vec_vec_pair.second.size");
+
+				for	(int	i	=	0;	i	<	int_vec_pair.second.size();	i++)	{
+								TRICK_EXPECT_EQ(int_vec_pair.second[i],	(i+1)*5,	test_suite,	"int_vec_pair.second	elems");
+								TRICK_EXPECT_EQ(vec_int_pair.first[i],	(i+1)*5,	test_suite,	"vec_int_pair.first	elems");
+								TRICK_EXPECT_EQ(vec_vec_pair.first[i],	(i+1)*5,	test_suite,	"vec_vec_pair.first	elems");
+								TRICK_EXPECT_EQ(vec_vec_pair.second[i],	(i+1)*5,	test_suite,	"vec_vec_pair.second	elems");
+
+				}
+
+
+				TRICK_EXPECT_EQ(vec_user_simple.size(),	10,	test_suite,	"vec_user_simple")
+				for	(int	i	=	0;	i	<	10;	i++)	{
+								for	(int	j	=	0;	j	<	5;	j++)	{
+												TRICK_EXPECT_EQ(vec_user_simple[i].a[j],	i+j,	test_suite,	"vec_user_simple");
+												TRICK_EXPECT_EQ(vec_user_simple[i].d->a[j],	i+j,	test_suite,	"vec_user_simple");
+								}
+
+								TRICK_EXPECT_EQ(vec_user_simple[i].b,	8888888888,	test_suite,	"vec_user_simple");
+								TRICK_EXPECT_EQ(vec_user_simple[i].d->b,	8888888888,	test_suite,	"vec_user_simple");
+
+								TRICK_EXPECT_EQ(vec_user_simple[i].c,	"Here	is	a	test	string",	test_suite,	"vec_user_simple");
+								TRICK_EXPECT_EQ(vec_user_simple[i].d->c,	"Here	is	a	test	string",	test_suite,	"vec_user_simple");
+				}
+
+				
 }
diff --git a/test/SIM_target_specific_variables/models/many/a.cpp b/test/SIM_target_specific_variables/models/many/a.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/many/a.cpp
+++ b/test/SIM_target_specific_variables/models/many/a.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/many/b.cpp b/test/SIM_target_specific_variables/models/many/b.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/many/b.cpp
+++ b/test/SIM_target_specific_variables/models/many/b.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/many/c.cpp b/test/SIM_target_specific_variables/models/many/c.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/many/c.cpp
+++ b/test/SIM_target_specific_variables/models/many/c.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/nested/x.cpp b/test/SIM_target_specific_variables/models/nested/x.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/nested/x.cpp
+++ b/test/SIM_target_specific_variables/models/nested/x.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/nested/y/y.cpp b/test/SIM_target_specific_variables/models/nested/y/y.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/nested/y/y.cpp
+++ b/test/SIM_target_specific_variables/models/nested/y/y.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/nested/z/z.cpp b/test/SIM_target_specific_variables/models/nested/z/z.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/nested/z/z.cpp
+++ b/test/SIM_target_specific_variables/models/nested/z/z.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_target_specific_variables/models/one/1.cpp b/test/SIM_target_specific_variables/models/one/1.cpp
index b23abf618..6b61dd292 100644
--- a/test/SIM_target_specific_variables/models/one/1.cpp
+++ b/test/SIM_target_specific_variables/models/one/1.cpp
@@ -1 +1 @@
-/* /* */
+/*	/*	*/
diff --git a/test/SIM_test_dr/models/dr/src/DR.cpp b/test/SIM_test_dr/models/dr/src/DR.cpp
index 0a68d7264..aa7adbacd 100644
--- a/test/SIM_test_dr/models/dr/src/DR.cpp
+++ b/test/SIM_test_dr/models/dr/src/DR.cpp
@@ -1,14 +1,14 @@
-/******************************TRICK HEADER*************************************
-PURPOSE:                     ( Test data record )
-REFERENCE:                   ( None )
-ASSUMPTIONS AND LIMITATIONS: ( None )
-CLASS:                       ( scheduled )
-LIBRARY DEPENDENCY:          ( DR.o )
-PROGRAMMERS:                 ( (Lindsay Landry) (L3) (7-22-2013) )
+/******************************TRICK	HEADER*************************************
+PURPOSE:																					(	Test	data	record	)
+REFERENCE:																			(	None	)
+ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+CLASS:																							(	scheduled	)
+LIBRARY	DEPENDENCY:										(	DR.o	)
+PROGRAMMERS:																	(	(Lindsay	Landry)	(L3)	(7-22-2013)	)
 *******************************************************************************/
-#include <iostream>
-#include "../include/DR.hh"
+#include	<iostream>
+#include	"../include/DR.hh"
 
-DRTypes::DRTypes() {}
-DRTypes::~DRTypes() {}
+DRTypes::DRTypes()	{}
+DRTypes::~DRTypes()	{}
 
diff --git a/test/SIM_test_dr/models/dr/src/DR_default_data.cpp b/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
index 38ac316be..5e655b951 100644
--- a/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
+++ b/test/SIM_test_dr/models/dr/src/DR_default_data.cpp
@@ -1,104 +1,104 @@
-/******************************TRICK HEADER*************************************
-PURPOSE:                     ( Test data record )
-REFERENCE:                   ( None )
-ASSUMPTIONS AND LIMITATIONS: ( None )
-CLASS:                       ( scheduled )
-LIBRARY DEPENDENCY:          ( DR.o )
-PROGRAMMERS:                 ( (Lindsay Landry) (L3) (7-22-2013) )
+/******************************TRICK	HEADER*************************************
+PURPOSE:																					(	Test	data	record	)
+REFERENCE:																			(	None	)
+ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+CLASS:																							(	scheduled	)
+LIBRARY	DEPENDENCY:										(	DR.o	)
+PROGRAMMERS:																	(	(Lindsay	Landry)	(L3)	(7-22-2013)	)
 *******************************************************************************/
-#include "../include/DR.hh"
+#include	"../include/DR.hh"
 
 
-int DRTypes::init() {
+int	DRTypes::init()	{
 
-	a = 'a';			//char
-	b = 'b';			//unsigned char
-	c = -1234;			//short
-	d = 1234;			//unsigned short
-	e = -123456;		//int
-	f = 123456;			//unsigned int
-	g = -1234567;		//long
-	h = 123456789;		//unsigned long
-	i = 1234.5678;		//float
-	j = -1234.567890;	//double
-	k = -12345678912345;//long long
-	l = 12345678912345; //unsigned long
-	m = false;			//boolean
-	n = THREE;			//enumerated type
-	o = "3 May. Bistritz.—Left Munich at 8:35 P. M., on 1st May, arriving at Vienna early next morning; should have arrived at 6:46, but train was an hour late. Buda-Pesth seems a wonderful place, from the glimpse which I got of it from the train and the little I could walk through the streets. I feared to go very far from the station, as we had arrived late and would start as near the correct time as possible. The impression I had was that we were leaving the West and entering the East; the most western of splendid bridges over the Danube, which is here of noble width and depth, took us among the traditions of Turkish rule.";
-	p = "We left in pretty good time, and came after nightfall to Klausenburgh. Here I stopped for the night at the Hotel Royale. I had for dinner, or rather supper, a chicken done up some way with red pepper, which was very good but thirsty. (Mem., get recipe for Mina.) I asked the waiter, and he said it was called “paprika hendl,” and that, as it was a national dish, I should be able to get it anywhere along the Carpathians. I found my smattering of German very useful here; indeed, I don't know how I should be able to get on without it.";
-	for (int i = 0; i < 5; i++) {
-		q[i] = i;
+	a	=	'a';			//char
+	b	=	'b';			//unsigned	char
+	c	=	-1234;			//short
+	d	=	1234;			//unsigned	short
+	e	=	-123456;		//int
+	f	=	123456;			//unsigned	int
+	g	=	-1234567;		//long
+	h	=	123456789;		//unsigned	long
+	i	=	1234.5678;		//float
+	j	=	-1234.567890;	//double
+	k	=	-12345678912345;//long	long
+	l	=	12345678912345;	//unsigned	long
+	m	=	false;			//boolean
+	n	=	THREE;			//enumerated	type
+	o	=	"3	May.	Bistritz.—Left	Munich	at	8:35	P.	M.,	on	1st	May,	arriving	at	Vienna	early	next	morning;	should	have	arrived	at	6:46,	but	train	was	an	hour	late.	Buda-Pesth	seems	a	wonderful	place,	from	the	glimpse	which	I	got	of	it	from	the	train	and	the	little	I	could	walk	through	the	streets.	I	feared	to	go	very	far	from	the	station,	as	we	had	arrived	late	and	would	start	as	near	the	correct	time	as	possible.	The	impression	I	had	was	that	we	were	leaving	the	West	and	entering	the	East;	the	most	western	of	splendid	bridges	over	the	Danube,	which	is	here	of	noble	width	and	depth,	took	us	among	the	traditions	of	Turkish	rule.";
+	p	=	"We	left	in	pretty	good	time,	and	came	after	nightfall	to	Klausenburgh.	Here	I	stopped	for	the	night	at	the	Hotel	Royale.	I	had	for	dinner,	or	rather	supper,	a	chicken	done	up	some	way	with	red	pepper,	which	was	very	good	but	thirsty.	(Mem.,	get	recipe	for	Mina.)	I	asked	the	waiter,	and	he	said	it	was	called	“paprika	hendl,”	and	that,	as	it	was	a	national	dish,	I	should	be	able	to	get	it	anywhere	along	the	Carpathians.	I	found	my	smattering	of	German	very	useful	here;	indeed,	I	don't	know	how	I	should	be	able	to	get	on	without	it.";
+	for	(int	i	=	0;	i	<	5;	i++)	{
+		q[i]	=	i;
 	}
-	r[0][0] = 10;
-	r[0][1] = 20;
-	r[1][0] = 30;
-	r[1][1] = 40;
+	r[0][0]	=	10;
+	r[0][1]	=	20;
+	r[1][0]	=	30;
+	r[1][1]	=	40;
 
 /*============================================================================
-	 								Bitfields
-  ============================================================================
+										Bitfields
+		============================================================================
 	UNSIGNED
-	var1: Larger value than will fit
-	var2: Min value
-	var3: Middle value
-	var4: Max value
+	var1:	Larger	value	than	will	fit
+	var2:	Min	value
+	var3:	Middle	value
+	var4:	Max	value
 */
 
-	/* Unsigned Int */
-	//14 5 12 1
- 	uintB.var1 = (1 << 14) + (1 << 14/2);
-    uintB.var2 = 0;
-    uintB.var3 = (1 << 12/2) - 1;
-    uintB.var4 = (1 << 1) - 1;
+	/*	Unsigned	Int	*/
+	//14	5	12	1
+		uintB.var1	=	(1	<<	14)	+	(1	<<	14/2);
+				uintB.var2	=	0;
+				uintB.var3	=	(1	<<	12/2)	-	1;
+				uintB.var4	=	(1	<<	1)	-	1;
 
-	/* Unsigned Char */
-	// 3 2 2 1
-	ucharB.var1 = (1 << 3) + (1 << 3/2);
-    ucharB.var2 = 0;
-    ucharB.var3 = (1 << 2/2) - 1;
-    ucharB.var4 = (1 << 1) - 1;
+	/*	Unsigned	Char	*/
+	//	3	2	2	1
+	ucharB.var1	=	(1	<<	3)	+	(1	<<	3/2);
+				ucharB.var2	=	0;
+				ucharB.var3	=	(1	<<	2/2)	-	1;
+				ucharB.var4	=	(1	<<	1)	-	1;
 
-	/* Unsigned Short */
-	// 4 2 9 1
-    ushortB.var1 = (1 << 4) + (1 << 4/2);
-    ushortB.var2 = 0;
-    ushortB.var3 = (1 << 9/2) - 1;
-    ushortB.var4 = (1 << 1) - 1;
+	/*	Unsigned	Short	*/
+	//	4	2	9	1
+				ushortB.var1	=	(1	<<	4)	+	(1	<<	4/2);
+				ushortB.var2	=	0;
+				ushortB.var3	=	(1	<<	9/2)	-	1;
+				ushortB.var4	=	(1	<<	1)	-	1;
 
 /*	SIGNED
-	var1: Max positive value
-	var2: Max negative value
-	var3: Zero
-	var4: Too large value -> negative
+	var1:	Max	positive	value
+	var2:	Max	negative	value
+	var3:	Zero
+	var4:	Too	large	value	->	negative
 */
-	/* Int */
-	// 7 16 3 6
-    intB.var1 = (1 << (7 - 1)) - 1;
-    intB.var2 = -(1 << (16 - 1));
-    intB.var3 = 0;
-    intB.var4 = (1 << (6 - 1)) + (1 << 6/2);;
+	/*	Int	*/
+	//	7	16	3	6
+				intB.var1	=	(1	<<	(7	-	1))	-	1;
+				intB.var2	=	-(1	<<	(16	-	1));
+				intB.var3	=	0;
+				intB.var4	=	(1	<<	(6	-	1))	+	(1	<<	6/2);;
 
-	/* Char */
-	// 2 2 2 2
-    charB.var1 = (1 << (2 - 1)) - 1;
-    charB.var2 = -(1 << (2 - 1));
-    charB.var3 = 0;
-    charB.var4 = (1 << (2 - 1)) + (1 << 2/2);;
+	/*	Char	*/
+	//	2	2	2	2
+				charB.var1	=	(1	<<	(2	-	1))	-	1;
+				charB.var2	=	-(1	<<	(2	-	1));
+				charB.var3	=	0;
+				charB.var4	=	(1	<<	(2	-	1))	+	(1	<<	2/2);;
 
-	/* Short */
-	// 8 1 2 5
-    shortB.var1 = (1 << (8 - 1)) - 1;
-    shortB.var2 = -(1 << (1 - 1));
-    shortB.var3 = 0;
-    shortB.var4 = (1 << (5 - 1)) + (1 << 5/2);;
+	/*	Short	*/
+	//	8	1	2	5
+				shortB.var1	=	(1	<<	(8	-	1))	-	1;
+				shortB.var2	=	-(1	<<	(1	-	1));
+				shortB.var3	=	0;
+				shortB.var4	=	(1	<<	(5	-	1))	+	(1	<<	5/2);;
 
-	/* Mixed Types */
-	// 3 8 9 12
-    mixB.var1 = (1 << (3 - 1)) - 1;
-    mixB.var2 = -(1 << (8 - 1));
-    mixB.var3 = 0;
-    mixB.var4 = (1 << (12 - 1)) + (1 << 12/2);;
+	/*	Mixed	Types	*/
+	//	3	8	9	12
+				mixB.var1	=	(1	<<	(3	-	1))	-	1;
+				mixB.var2	=	-(1	<<	(8	-	1));
+				mixB.var3	=	0;
+				mixB.var4	=	(1	<<	(12	-	1))	+	(1	<<	12/2);;
 
-	return (0);
+	return	(0);
 }
diff --git a/test/SIM_test_ip/models/test_ip/src/ClassOfEverything.cpp b/test/SIM_test_ip/models/test_ip/src/ClassOfEverything.cpp
index cfd352e1b..cbb4c2944 100644
--- a/test/SIM_test_ip/models/test_ip/src/ClassOfEverything.cpp
+++ b/test/SIM_test_ip/models/test_ip/src/ClassOfEverything.cpp
@@ -1,21 +1,21 @@
 
-#include "test_ip/include/ClassOfEverything.hh"
+#include	"test_ip/include/ClassOfEverything.hh"
 
-double ClassOfEverything::sdaa[3][3] ;
-const double ClassOfEverything::scd = 1.2345 ;
-const double ClassOfEverything::csd = 6.7890 ;
-const double ClassOfEverything::sdc = 9.8765 ;
+double	ClassOfEverything::sdaa[3][3]	;
+const	double	ClassOfEverything::scd	=	1.2345	;
+const	double	ClassOfEverything::csd	=	6.7890	;
+const	double	ClassOfEverything::sdc	=	9.8765	;
 
-ClassOfEverything::ClassOfEverything() : cir(i), icr(i) {
+ClassOfEverything::ClassOfEverything()	:	cir(i),	icr(i)	{
 
-    unsigned int ii ;
+				unsigned	int	ii	;
 
-    ep = NULL ;
-    epp = NULL ;
+				ep	=	NULL	;
+				epp	=	NULL	;
 
-    for ( ii = 0 ; ii < 4 ; ii++ ) {
-        eap[ii] = NULL ;
-    }
+				for	(	ii	=	0	;	ii	<	4	;	ii++	)	{
+								eap[ii]	=	NULL	;
+				}
 
 }
 
diff --git a/test/SIM_test_output_dir/models/starter.cpp b/test/SIM_test_output_dir/models/starter.cpp
index 30809e266..c2f10c748 100644
--- a/test/SIM_test_output_dir/models/starter.cpp
+++ b/test/SIM_test_output_dir/models/starter.cpp
@@ -1,66 +1,66 @@
-#include <cstdio>
-#include "starter.h"
-#include "trick/integrator_c_intf.h"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/mm_macros.hh"
+#include	<cstdio>
+#include	"starter.h"
+#include	"trick/integrator_c_intf.h"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/mm_macros.hh"
 
-Starter::Starter() {
+Starter::Starter()	{
 
 }
 
-int Starter::default_data() {
-  // Allocate a dynamic object
-  DynamicObj * obj = new DynamicObj() ;
-  obj->a = 5;
-  obj->b = "Hello world!";
-  obj->c = (double *) malloc (sizeof(double) * 3);
-  obj->c[0] = 0.0;
-  obj->c[1] = 1.0;
-  obj->c[2] = 2.0;
+int	Starter::default_data()	{
+		//	Allocate	a	dynamic	object
+		DynamicObj	*	obj	=	new	DynamicObj()	;
+		obj->a	=	5;
+		obj->b	=	"Hello	world!";
+		obj->c	=	(double	*)	malloc	(sizeof(double)	*	3);
+		obj->c[0]	=	0.0;
+		obj->c[1]	=	1.0;
+		obj->c[2]	=	2.0;
 
-  TMM_declare_ext_var(obj, TRICK_STRUCTURED,"DynamicObj", 0, "DynamicObj_alloc", 0, NULL) ;
+		TMM_declare_ext_var(obj,	TRICK_STRUCTURED,"DynamicObj",	0,	"DynamicObj_alloc",	0,	NULL)	;
 
-  return 0;
+		return	0;
 }
 
-int Starter::init() {
-  return 0;
+int	Starter::init()	{
+		return	0;
 }
 
 
-int Starter::scheduled() {
-  message_publish(MSG_NORMAL, "Hello World!\n");
-  return 0;
+int	Starter::scheduled()	{
+		message_publish(MSG_NORMAL,	"Hello	World!\n");
+		return	0;
 }
-int Starter::deriv() {
-  return 0;
+int	Starter::deriv()	{
+		return	0;
 }
 
-int Starter::integ() {
+int	Starter::integ()	{
 
-  int ipass;
-  load_state( 
-    NULL /* list is NULL terminated */
-  );
+		int	ipass;
+		load_state(	
+				NULL	/*	list	is	NULL	terminated	*/
+		);
 
-   /* LOAD THE POSITION AND VELOCITY STATE DERIVATIVES */
-  load_deriv(
-    NULL /* list is NULL terminated */
-  );
+			/*	LOAD	THE	POSITION	AND	VELOCITY	STATE	DERIVATIVES	*/
+		load_deriv(
+				NULL	/*	list	is	NULL	terminated	*/
+		);
 
-   /* Call the Trick integrate service */
-   ipass = integrate();
+			/*	Call	the	Trick	integrate	service	*/
+			ipass	=	integrate();
 
-   /* unload new state */
-  unload_state(
-    NULL /* list is NULL terminated */
-  );
+			/*	unload	new	state	*/
+		unload_state(
+				NULL	/*	list	is	NULL	terminated	*/
+		);
 
-  /* returns 0 if integerate() was successful */
-  return ipass;
+		/*	returns	0	if	integerate()	was	successful	*/
+		return	ipass;
 }
 
-int Starter::shutdown() {
-  return 0;
+int	Starter::shutdown()	{
+		return	0;
 }
diff --git a/test/SIM_test_varserv/models/test_client/test_client.cpp b/test/SIM_test_varserv/models/test_client/test_client.cpp
index fc36f7134..6430c1e1b 100644
--- a/test/SIM_test_varserv/models/test_client/test_client.cpp
+++ b/test/SIM_test_varserv/models/test_client/test_client.cpp
@@ -1,1565 +1,1565 @@
-#include "test_client.hh"
-#include "trick/var_binary_parser.hh"
-#include <math.h>
-
-
-class VariableServerUDPTest : public ::testing::Test {
-    protected:
-        VariableServerUDPTest() {
-            socket_status = socket.init("localhost", 48000, SOCK_DGRAM);
-
-            if (socket_status == 0) {
-                std::stringstream request;
-                request << "trick.var_set_client_tag(\"UDP_VSTest";
-                request << numSession++;
-                request << "\") \n";
-
-                socket << request.str();
-            }
-        }
-        ~VariableServerUDPTest() {
-            socket.close();
-        }
-
-        Socket socket;
-        int socket_status;
-        
-        static int numSession;
+#include	"test_client.hh"
+#include	"trick/var_binary_parser.hh"
+#include	<math.h>
+
+
+class	VariableServerUDPTest	:	public	::testing::Test	{
+				protected:
+								VariableServerUDPTest()	{
+												socket_status	=	socket.init("localhost",	48000,	SOCK_DGRAM);
+
+												if	(socket_status	==	0)	{
+																std::stringstream	request;
+																request	<<	"trick.var_set_client_tag(\"UDP_VSTest";
+																request	<<	numSession++;
+																request	<<	"\")	\n";
+
+																socket	<<	request.str();
+												}
+								}
+								~VariableServerUDPTest()	{
+												socket.close();
+								}
+
+								Socket	socket;
+								int	socket_status;
+								
+								static	int	numSession;
 };
 
-class VariableServerTestAltListener : public ::testing::Test {
-    protected:
-        VariableServerTestAltListener() {
-            socket_status = socket.init("localhost", 49000);
-
-            if (socket_status == 0) {
-                std::stringstream request;
-                request << "trick.var_set_client_tag(\"altListener_VSTest";
-                request << numSession++;
-                request << "\") \n";
-
-                socket << request.str();
-            }
-        }
-        ~VariableServerTestAltListener() {
-            socket << "trick.var_exit()\n";
-            socket.close();
-        }
-
-        Socket socket;
-        int socket_status;
-        
-        static int numSession;
+class	VariableServerTestAltListener	:	public	::testing::Test	{
+				protected:
+								VariableServerTestAltListener()	{
+												socket_status	=	socket.init("localhost",	49000);
+
+												if	(socket_status	==	0)	{
+																std::stringstream	request;
+																request	<<	"trick.var_set_client_tag(\"altListener_VSTest";
+																request	<<	numSession++;
+																request	<<	"\")	\n";
+
+																socket	<<	request.str();
+												}
+								}
+								~VariableServerTestAltListener()	{
+												socket	<<	"trick.var_exit()\n";
+												socket.close();
+								}
+
+								Socket	socket;
+								int	socket_status;
+								
+								static	int	numSession;
 };
 
-int VariableServerTest::numSession = 0;
-int VariableServerUDPTest::numSession = 0;
-int VariableServerTestAltListener::numSession = 0;
-
-#ifndef __APPLE__
-class VariableServerTestMulticast : public ::testing::Test {
-    protected:
-        VariableServerTestMulticast() {
-            socket_status = socket.init("", 47000, SOCK_DGRAM);
-            socket_status = multicast_listener.init_multicast("224.10.10.10", 47000);
-
-            if (socket_status == 0) {
-                std::stringstream request;
-                request << "trick.var_set_client_tag(\"multicast_VSTest";
-                request << numSession++;
-                request << "\") \n";
-
-                socket << request.str();
-            }
-        }
-        ~VariableServerTestMulticast() {
-            socket.close();
-            multicast_listener.close();
-        }
-
-        Socket socket;
-        Socket multicast_listener;
-
-        int socket_status;
-        
-        static int numSession;
+int	VariableServerTest::numSession	=	0;
+int	VariableServerUDPTest::numSession	=	0;
+int	VariableServerTestAltListener::numSession	=	0;
+
+#ifndef	__APPLE__
+class	VariableServerTestMulticast	:	public	::testing::Test	{
+				protected:
+								VariableServerTestMulticast()	{
+												socket_status	=	socket.init("",	47000,	SOCK_DGRAM);
+												socket_status	=	multicast_listener.init_multicast("224.10.10.10",	47000);
+
+												if	(socket_status	==	0)	{
+																std::stringstream	request;
+																request	<<	"trick.var_set_client_tag(\"multicast_VSTest";
+																request	<<	numSession++;
+																request	<<	"\")	\n";
+
+																socket	<<	request.str();
+												}
+								}
+								~VariableServerTestMulticast()	{
+												socket.close();
+												multicast_listener.close();
+								}
+
+								Socket	socket;
+								Socket	multicast_listener;
+
+								int	socket_status;
+								
+								static	int	numSession;
 };
-int VariableServerTestMulticast::numSession = 0;
+int	VariableServerTestMulticast::numSession	=	0;
 #endif
 
 /**********************************************************/
-/*           Helpful constants and functions              */
+/*											Helpful	constants	and	functions														*/
 /**********************************************************/
 
 
-const int MODE_RUN = 5;
-const int MODE_FREEZE = 1;
-
-int strcmp_IgnoringWhiteSpace(std::string s1_str, std::string s2_str) {
-    const char * s1 = s1_str.c_str();
-    const char * s2 = s2_str.c_str();
-
-    int i1 = 0;
-    int i2 = 0;
-
-    while (1) {
-        while ( !isgraph( s1[i1] ) && s1[i1] != '\0') { i1++; }
-        while ( !isgraph( s2[i2] ) && s2[i2] != '\0') { i2++; }
-        if ( s1[i1] == '\0' && s2[i2] == '\0') { return 0; }
-        if ( s1[i1] != s2[i2]) {
-            if (s1[i1] < s2[i2]) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        i1++; i2++;
-    }
+const	int	MODE_RUN	=	5;
+const	int	MODE_FREEZE	=	1;
+
+int	strcmp_IgnoringWhiteSpace(std::string	s1_str,	std::string	s2_str)	{
+				const	char	*	s1	=	s1_str.c_str();
+				const	char	*	s2	=	s2_str.c_str();
+
+				int	i1	=	0;
+				int	i2	=	0;
+
+				while	(1)	{
+								while	(	!isgraph(	s1[i1]	)	&&	s1[i1]	!=	'\0')	{	i1++;	}
+								while	(	!isgraph(	s2[i2]	)	&&	s2[i2]	!=	'\0')	{	i2++;	}
+								if	(	s1[i1]	==	'\0'	&&	s2[i2]	==	'\0')	{	return	0;	}
+								if	(	s1[i1]	!=	s2[i2])	{
+												if	(s1[i1]	<	s2[i2])	{
+																return	-1;
+												}	else	{
+																return	1;
+												}
+								}
+								i1++;	i2++;
+				}
 }
 
-void spin (Socket& socket, int wait_cycles = 5) {
-    for (int i = 0; i < wait_cycles; i++) 
-        socket.receive();
+void	spin	(Socket&	socket,	int	wait_cycles	=	5)	{
+				for	(int	i	=	0;	i	<	wait_cycles;	i++)	
+								socket.receive();
 }
 
-void wait_for_mode_change (Socket& socket, int expected_mode, int max_wait_iterations = 10) {
-    int iteration = 0;
-    std::string mode_reply;
-    std::string expected_reply = "5\t" + std::to_string(expected_mode) + "\n";
-    while (iteration++ < max_wait_iterations) {
-        socket << "trick.var_send_once(\"trick_sys.sched.mode\")\n";
-        socket >> mode_reply;
-        if (mode_reply == expected_reply)
-            break;
-    }
+void	wait_for_mode_change	(Socket&	socket,	int	expected_mode,	int	max_wait_iterations	=	10)	{
+				int	iteration	=	0;
+				std::string	mode_reply;
+				std::string	expected_reply	=	"5\t"	+	std::to_string(expected_mode)	+	"\n";
+				while	(iteration++	<	max_wait_iterations)	{
+								socket	<<	"trick.var_send_once(\"trick_sys.sched.mode\")\n";
+								socket	>>	mode_reply;
+								if	(mode_reply	==	expected_reply)
+												break;
+				}
 }
 
-void dump_checkpoint (Socket& socket, const std::string& checkpoint_name) {
-    socket << "trick.var_pause()\ntrick.exec_freeze()\n";
-    wait_for_mode_change(socket, MODE_FREEZE);
+void	dump_checkpoint	(Socket&	socket,	const	std::string&	checkpoint_name)	{
+				socket	<<	"trick.var_pause()\ntrick.exec_freeze()\n";
+				wait_for_mode_change(socket,	MODE_FREEZE);
 
-    std::string checkpoint_cmd = "trick.checkpoint(\"" + checkpoint_name + "\")\n";
-    socket << checkpoint_cmd;
+				std::string	checkpoint_cmd	=	"trick.checkpoint(\""	+	checkpoint_name	+	"\")\n";
+				socket	<<	checkpoint_cmd;
 
-    socket << "trick.exec_run()\n";
-    wait_for_mode_change(socket, MODE_RUN);
-    socket << "trick.var_unpause()\n";
+				socket	<<	"trick.exec_run()\n";
+				wait_for_mode_change(socket,	MODE_RUN);
+				socket	<<	"trick.var_unpause()\n";
 }
 
-void load_checkpoint (Socket& socket, const std::string& checkpoint_name) {
-    socket << "trick.var_pause()\ntrick.exec_freeze()\n";
-    wait_for_mode_change(socket, MODE_FREEZE);
+void	load_checkpoint	(Socket&	socket,	const	std::string&	checkpoint_name)	{
+				socket	<<	"trick.var_pause()\ntrick.exec_freeze()\n";
+				wait_for_mode_change(socket,	MODE_FREEZE);
 
-    std::string checkpoint_cmd = "trick.load_checkpoint(\"" + checkpoint_name + "\")\n";
-    socket << checkpoint_cmd;
-    sleep(5);
+				std::string	checkpoint_cmd	=	"trick.load_checkpoint(\""	+	checkpoint_name	+	"\")\n";
+				socket	<<	checkpoint_cmd;
+				sleep(5);
 
-    socket << "trick.exec_run()\n";
-    wait_for_mode_change(socket, MODE_RUN);
-    socket << "trick.var_unpause()\n";
+				socket	<<	"trick.exec_run()\n";
+				wait_for_mode_change(socket,	MODE_RUN);
+				socket	<<	"trick.var_unpause()\n";
 }
 
 /*****************************************/
-/*           Multicast Test              */
+/*											Multicast	Test														*/
 /*****************************************/
 
-#ifndef __APPLE__
+#ifndef	__APPLE__
 
-TEST_F (VariableServerTestMulticast, Strings) {
- if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTestMulticast,	Strings)	{
+	if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    socket << "trick.var_send_once(\"vsx.vst.o\")\n";
-    std::string expected("5\tYou will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.");
+				std::string	reply;
+				socket	<<	"trick.var_send_once(\"vsx.vst.o\")\n";
+				std::string	expected("5\tYou	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.");
 
-    multicast_listener >> reply; 
+				multicast_listener	>>	reply;	
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    expected = std::string("5\tI am already far north of London, and as I walk in the streets of Petersburgh, I feel a cold northern breeze play upon my cheeks, which braces my nerves and fills me with delight. Do you understand this feeling?");
-    socket << "trick.var_send_once(\"vsx.vst.p\")\n";
+				expected	=	std::string("5\tI	am	already	far	north	of	London,	and	as	I	walk	in	the	streets	of	Petersburgh,	I	feel	a	cold	northern	breeze	play	upon	my	cheeks,	which	braces	my	nerves	and	fills	me	with	delight.	Do	you	understand	this	feeling?");
+				socket	<<	"trick.var_send_once(\"vsx.vst.p\")\n";
 
-    multicast_listener >> reply; 
+				multicast_listener	>>	reply;	
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
 
-TEST_F (VariableServerTestMulticast, AddRemove) {
-     if (socket_status != 0) {
-        FAIL();
-    }
-
-    std::string reply;
-    std::string expected;
-
-    int max_tries = 3;
-    int tries = 0;
-
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    multicast_listener >> reply;
-    expected = std::string("0  -1234");
-    
-    tries = 0;
-    while (strcmp_IgnoringWhiteSpace(reply, expected) != 0 && tries++ < max_tries) {
-        multicast_listener >> reply;
-    }
-
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Expected: " << expected << "\tAcutal: " << reply;
-
-    multicast_listener >> reply;
-    tries = 0;
-    while (strcmp_IgnoringWhiteSpace(reply, expected) != 0 && tries++ < max_tries) {
-        multicast_listener >> reply;
-    }
-
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Expected: " << expected << "\tAcutal: " << reply;
-
-    socket << "trick.var_add(\"vsx.vst.m\")\n";
-    multicast_listener >> reply;
-    expected = std::string("0  -1234 1");
-    tries = 0;
-    while (strcmp_IgnoringWhiteSpace(reply, expected) != 0 && tries++ < max_tries) {
-        multicast_listener >> reply;
-    }
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Expected: " << expected << "\tAcutal: " << reply;
-
-    socket << "trick.var_remove(\"vsx.vst.m\")\n";
-    multicast_listener >> reply;
-    expected = std::string("0  -1234");
-    tries = 0;
-    while (strcmp_IgnoringWhiteSpace(reply, expected) != 0 && tries++ < max_tries) {
-        multicast_listener >> reply;
-    }
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Expected: " << expected << "\tAcutal: " << reply;
-
-    socket << "trick.var_add(\"vsx.vst.n\")\n";
-    multicast_listener >> reply;
-    expected = std::string("0  -1234    0,1,2,3,4");
-    tries = 0;
-    while (strcmp_IgnoringWhiteSpace(reply, expected) != 0 && tries++ < max_tries) {
-        multicast_listener >> reply;
-    }
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Expected: " << expected << "\tAcutal: " << reply;
-
-    socket << "trick.var_exit()\n";
+TEST_F	(VariableServerTestMulticast,	AddRemove)	{
+					if	(socket_status	!=	0)	{
+								FAIL();
+				}
+
+				std::string	reply;
+				std::string	expected;
+
+				int	max_tries	=	3;
+				int	tries	=	0;
+
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				multicast_listener	>>	reply;
+				expected	=	std::string("0		-1234");
+				
+				tries	=	0;
+				while	(strcmp_IgnoringWhiteSpace(reply,	expected)	!=	0	&&	tries++	<	max_tries)	{
+								multicast_listener	>>	reply;
+				}
+
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Expected:	"	<<	expected	<<	"\tAcutal:	"	<<	reply;
+
+				multicast_listener	>>	reply;
+				tries	=	0;
+				while	(strcmp_IgnoringWhiteSpace(reply,	expected)	!=	0	&&	tries++	<	max_tries)	{
+								multicast_listener	>>	reply;
+				}
+
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Expected:	"	<<	expected	<<	"\tAcutal:	"	<<	reply;
+
+				socket	<<	"trick.var_add(\"vsx.vst.m\")\n";
+				multicast_listener	>>	reply;
+				expected	=	std::string("0		-1234	1");
+				tries	=	0;
+				while	(strcmp_IgnoringWhiteSpace(reply,	expected)	!=	0	&&	tries++	<	max_tries)	{
+								multicast_listener	>>	reply;
+				}
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Expected:	"	<<	expected	<<	"\tAcutal:	"	<<	reply;
+
+				socket	<<	"trick.var_remove(\"vsx.vst.m\")\n";
+				multicast_listener	>>	reply;
+				expected	=	std::string("0		-1234");
+				tries	=	0;
+				while	(strcmp_IgnoringWhiteSpace(reply,	expected)	!=	0	&&	tries++	<	max_tries)	{
+								multicast_listener	>>	reply;
+				}
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Expected:	"	<<	expected	<<	"\tAcutal:	"	<<	reply;
+
+				socket	<<	"trick.var_add(\"vsx.vst.n\")\n";
+				multicast_listener	>>	reply;
+				expected	=	std::string("0		-1234				0,1,2,3,4");
+				tries	=	0;
+				while	(strcmp_IgnoringWhiteSpace(reply,	expected)	!=	0	&&	tries++	<	max_tries)	{
+								multicast_listener	>>	reply;
+				}
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Expected:	"	<<	expected	<<	"\tAcutal:	"	<<	reply;
+
+				socket	<<	"trick.var_exit()\n";
 }
 
 #endif
 
 /************************************/
-/*           UDP Tests              */
+/*											UDP	Tests														*/
 /************************************/
 
 
-TEST_F (VariableServerUDPTest, Strings) {
- if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerUDPTest,	Strings)	{
+	if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    socket << "trick.var_send_once(\"vsx.vst.o\")\n";
-    socket >> reply;
-    std::string expected("5\tYou will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.");
+				std::string	reply;
+				socket	<<	"trick.var_send_once(\"vsx.vst.o\")\n";
+				socket	>>	reply;
+				std::string	expected("5\tYou	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
 
-    expected = std::string("5\tI am already far north of London, and as I walk in the streets of Petersburgh, I feel a cold northern breeze play upon my cheeks, which braces my nerves and fills me with delight. Do you understand this feeling?");
-    socket << "trick.var_send_once(\"vsx.vst.p\")\n";
+				expected	=	std::string("5\tI	am	already	far	north	of	London,	and	as	I	walk	in	the	streets	of	Petersburgh,	I	feel	a	cold	northern	breeze	play	upon	my	cheeks,	which	braces	my	nerves	and	fills	me	with	delight.	Do	you	understand	this	feeling?");
+				socket	<<	"trick.var_send_once(\"vsx.vst.p\")\n";
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
 
-TEST_F (VariableServerUDPTest, AddRemove) {
-     if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerUDPTest,	AddRemove)	{
+					if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234 1");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234	1");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_remove(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_remove(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.n\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234    0,1,2,3,4");
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.n\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234				0,1,2,3,4");
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_exit()\n";
+				socket	<<	"trick.var_exit()\n";
 }
 
 /*********************************************/
-/*           Alt Listener Tests              */
+/*											Alt	Listener	Tests														*/
 /*********************************************/
 
-TEST_F (VariableServerTestAltListener, Strings) {
- if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTestAltListener,	Strings)	{
+	if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    socket << "trick.var_send_once(\"vsx.vst.o\")\n";
-    socket >> reply;
-    std::string expected("5\tYou will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.");
+				std::string	reply;
+				socket	<<	"trick.var_send_once(\"vsx.vst.o\")\n";
+				socket	>>	reply;
+				std::string	expected("5\tYou	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
 
-    expected = std::string("5\tI am already far north of London, and as I walk in the streets of Petersburgh, I feel a cold northern breeze play upon my cheeks, which braces my nerves and fills me with delight. Do you understand this feeling?");
-    socket << "trick.var_send_once(\"vsx.vst.p\")\n";
+				expected	=	std::string("5\tI	am	already	far	north	of	London,	and	as	I	walk	in	the	streets	of	Petersburgh,	I	feel	a	cold	northern	breeze	play	upon	my	cheeks,	which	braces	my	nerves	and	fills	me	with	delight.	Do	you	understand	this	feeling?");
+				socket	<<	"trick.var_send_once(\"vsx.vst.p\")\n";
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
-TEST_F (VariableServerTestAltListener, AddRemove) {
-     if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTestAltListener,	AddRemove)	{
+					if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234 1");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234	1");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_remove(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_remove(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.n\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234    0,1,2,3,4");
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.n\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234				0,1,2,3,4");
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
 
-TEST_F (VariableServerTestAltListener, RestartAndSet) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTestAltListener,	RestartAndSet)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\n");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 
-    dump_checkpoint(socket, "reload_file.ckpnt");
+				dump_checkpoint(socket,	"reload_file.ckpnt");
 
-    socket << "trick.var_add(\"vsx.vst.e\",\"m\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\t-123456 {m}\n");
+				socket	<<	"trick.var_add(\"vsx.vst.e\",\"m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t-123456	{m}\n");
 
-    socket << "trick.var_set(\"vsx.vst.c\", 5)\n";
-    socket >> reply;
-    expected = std::string("0\t5\t-123456 {m}\n");
+				socket	<<	"trick.var_set(\"vsx.vst.c\",	5)\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t5\t-123456	{m}\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 
-    load_checkpoint(socket, "RUN_test/reload_file.ckpnt");
+				load_checkpoint(socket,	"RUN_test/reload_file.ckpnt");
 
-    socket >> reply;
-    expected = std::string("0\t-1234\t-123456 {m}\n");
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t-123456	{m}\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 }
 
 /*********************************************/
-/*           Normal case tests               */
+/*											Normal	case	tests															*/
 /*********************************************/
 
-TEST_F (VariableServerTest, Strings) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	Strings)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    socket << "trick.var_send_once(\"vsx.vst.o\")\n";
-    socket >> reply;
-    std::string expected("5\tYou will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.");
+				std::string	reply;
+				socket	<<	"trick.var_send_once(\"vsx.vst.o\")\n";
+				socket	>>	reply;
+				std::string	expected("5\tYou	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
 
-    expected = std::string("5\tI am already far north of London, and as I walk in the streets of Petersburgh, I feel a cold northern breeze play upon my cheeks, which braces my nerves and fills me with delight. Do you understand this feeling?");
-    socket << "trick.var_send_once(\"vsx.vst.p\")\n";
+				expected	=	std::string("5\tI	am	already	far	north	of	London,	and	as	I	walk	in	the	streets	of	Petersburgh,	I	feel	a	cold	northern	breeze	play	upon	my	cheeks,	which	braces	my	nerves	and	fills	me	with	delight.	Do	you	understand	this	feeling?");
+				socket	<<	"trick.var_send_once(\"vsx.vst.p\")\n";
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    // TODO: Does wchar actually work?
-    // expected = std::string("5\tThis breeze, which has travelled from the regions towards which I am advancing, gives me a foretaste of those icy climes. Inspirited by this wind of promise, my daydreams become more fervent and vivid.");
-    // socket << "trick.var_send_once(\"vsx.vst.q\")\n";
+				//	TODO:	Does	wchar	actually	work?
+				//	expected	=	std::string("5\tThis	breeze,	which	has	travelled	from	the	regions	towards	which	I	am	advancing,	gives	me	a	foretaste	of	those	icy	climes.	Inspirited	by	this	wind	of	promise,	my	daydreams	become	more	fervent	and	vivid.");
+				//	socket	<<	"trick.var_send_once(\"vsx.vst.q\")\n";
 
-    // socket >> reply;
+				//	socket	>>	reply;
 
-    // std::cout << "\tExpected: " << expected << "\n\tActual: " << reply << std::endl;
+				//	std::cout	<<	"\tExpected:	"	<<	expected	<<	"\n\tActual:	"	<<	reply	<<	std::endl;
 
-    // EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				//	EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
-TEST_F (VariableServerTest, NoExtraTab) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	NoExtraTab)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\n");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\n");
 
-    EXPECT_STREQ(reply.c_str(), expected.c_str());
+				EXPECT_STREQ(reply.c_str(),	expected.c_str());
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_STREQ(reply.c_str(), expected.c_str());
+				EXPECT_STREQ(reply.c_str(),	expected.c_str());
 
-    socket << "trick.var_add(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\t1\n");
-    
-    EXPECT_STREQ(reply.c_str(), expected.c_str());
+				socket	<<	"trick.var_add(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t1\n");
+				
+				EXPECT_STREQ(reply.c_str(),	expected.c_str());
 
-    socket << "trick.var_remove(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\n");
+				socket	<<	"trick.var_remove(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\n");
 
-    socket << "trick.var_add(\"vsx.vst.n\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\t0,1,2,3,4\n");
-    
-    EXPECT_STREQ(reply.c_str(), expected.c_str());
+				socket	<<	"trick.var_add(\"vsx.vst.n\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t0,1,2,3,4\n");
+				
+				EXPECT_STREQ(reply.c_str(),	expected.c_str());
 }
 
-TEST_F (VariableServerTest, AddRemove) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	AddRemove)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket >> reply;
+				socket	>>	reply;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234 1");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234	1");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_remove(\"vsx.vst.m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
-    
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_remove(\"vsx.vst.m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
+				
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.n\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234    0,1,2,3,4");
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				socket	<<	"trick.var_add(\"vsx.vst.n\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234				0,1,2,3,4");
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
-TEST_F (VariableServerTest, BadRefResponse) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	BadRefResponse)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    std::cerr << "The purpose of this test is to cause an error. Error messages are expected." << std::endl;
+				std::cerr	<<	"The	purpose	of	this	test	is	to	cause	an	error.	Error	messages	are	expected."	<<	std::endl;
 
-    socket << "trick.var_send_once(\"vsx.vst.no_such_variable\")\n";
-    socket >> reply;
-    expected = std::string("5   BAD_REF");
+				socket	<<	"trick.var_send_once(\"vsx.vst.no_such_variable\")\n";
+				socket	>>	reply;
+				expected	=	std::string("5			BAD_REF");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
 
-TEST_F (VariableServerTest, Units) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	Units)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    std::cerr << "The purpose of this test is to cause an error. Error messages are expected." << std::endl;
-    socket << "trick.var_add(\"vsx.vst.c\")\ntrick.var_units(\"vsx.vst.c\",\"g\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234");
+				std::cerr	<<	"The	purpose	of	this	test	is	to	cause	an	error.	Error	messages	are	expected."	<<	std::endl;
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\ntrick.var_units(\"vsx.vst.c\",\"g\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_add(\"vsx.vst.e\",\"m\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234  -123456 {m}");
+				socket	<<	"trick.var_add(\"vsx.vst.e\",\"m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234		-123456	{m}");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_units(\"vsx.vst.e\",\"ft\")\n";
-    socket >> reply;
-    expected = std::string("0  -1234  -405039 {ft}");
+				socket	<<	"trick.var_units(\"vsx.vst.e\",\"ft\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0		-1234		-405039	{ft}");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
-TEST_F (VariableServerTest, dump_info) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
+TEST_F	(VariableServerTest,	dump_info)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
 
-    std::string command = "trick.var_server_list_connections()\n";
-    socket << command;
-    sleep(1);
+				std::string	command	=	"trick.var_server_list_connections()\n";
+				socket	<<	command;
+				sleep(1);
 }
 
 
-TEST_F (VariableServerTest, SendOnce) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendOnce)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_send_once(\"vsx.vst.e\")\n";
-    socket >> reply;
-    expected = std::string("5  -123456");
+				socket	<<	"trick.var_send_once(\"vsx.vst.e\")\n";
+				socket	>>	reply;
+				expected	=	std::string("5		-123456");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    // Check that nothing is sent cyclically
-    EXPECT_EQ(socket.check_for_message_availible(), false);
+				//	Check	that	nothing	is	sent	cyclically
+				EXPECT_EQ(socket.check_for_message_availible(),	false);
 
-    socket << "trick.var_send_once(\"vsx.vst.n[0], vsx.vst.n[1], vsx.vst.n[2],\", 3)\n";
-    socket >> reply;
-    expected = std::string("5   0   1   2");
+				socket	<<	"trick.var_send_once(\"vsx.vst.n[0],	vsx.vst.n[1],	vsx.vst.n[2],\",	3)\n";
+				socket	>>	reply;
+				expected	=	std::string("5			0			1			2");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    std::cerr << "The purpose of this test is to cause an error. Error messages are expected." << std::endl;
-    socket << "trick.var_send_once(\"vsx.vst.n[0], vsx.vst.n[1], vsx.vst.n[2],\", 4)\n";
+				std::cerr	<<	"The	purpose	of	this	test	is	to	cause	an	error.	Error	messages	are	expected."	<<	std::endl;
+				socket	<<	"trick.var_send_once(\"vsx.vst.n[0],	vsx.vst.n[1],	vsx.vst.n[2],\",	4)\n";
 
-    // Wrong number of variables, should not send a response but should see an error message from the Trick side
-    EXPECT_EQ(socket.check_for_message_availible(), false);
+				//	Wrong	number	of	variables,	should	not	send	a	response	but	should	see	an	error	message	from	the	Trick	side
+				EXPECT_EQ(socket.check_for_message_availible(),	false);
 }
 
-TEST_F (VariableServerTest, Exists) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	Exists)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_exists(\"vsx.vst.e\")\n";
-    socket >> reply;
-    expected = std::string("1  1");
+				socket	<<	"trick.var_exists(\"vsx.vst.e\")\n";
+				socket	>>	reply;
+				expected	=	std::string("1		1");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
 
-    socket << "trick.var_exists(\"vsx.vst.z\")\n";
-    socket >> reply;
-    expected = std::string("1  0");
+				socket	<<	"trick.var_exists(\"vsx.vst.z\")\n";
+				socket	>>	reply;
+				expected	=	std::string("1		0");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    socket << "trick.var_binary()\n";
+				socket	<<	"trick.var_binary()\n";
 
-    std::vector<unsigned char> actual_bytes;
-    std::vector<unsigned char> expected_bytes;
-    socket << "trick.var_exists(\"vsx.vst.e\")\n";
-    actual_bytes = socket.receive_bytes();
-    expected_bytes = {0x01, 0x00, 0x00, 0x00, 0x01};
+				std::vector<unsigned	char>	actual_bytes;
+				std::vector<unsigned	char>	expected_bytes;
+				socket	<<	"trick.var_exists(\"vsx.vst.e\")\n";
+				actual_bytes	=	socket.receive_bytes();
+				expected_bytes	=	{0x01,	0x00,	0x00,	0x00,	0x01};
 
-    EXPECT_EQ(expected_bytes, actual_bytes);
+				EXPECT_EQ(expected_bytes,	actual_bytes);
 
 
-    socket << "trick.var_exists(\"vsx.vst.z\")\n";
-    actual_bytes = socket.receive_bytes();
-    expected_bytes = {0x01, 0x00, 0x00, 0x00, 0x00};
+				socket	<<	"trick.var_exists(\"vsx.vst.z\")\n";
+				actual_bytes	=	socket.receive_bytes();
+				expected_bytes	=	{0x01,	0x00,	0x00,	0x00,	0x00};
 
-    EXPECT_EQ(expected_bytes, actual_bytes);
+				EXPECT_EQ(expected_bytes,	actual_bytes);
 
 }
 
-TEST_F (VariableServerTest, ListSize) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	ListSize)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.a\")\ntrick.var_add(\"vsx.vst.b\")\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.d\")\ntrick.var_pause()\n";
-    socket << "trick.var_send_list_size()\n";
+				socket	<<	"trick.var_add(\"vsx.vst.a\")\ntrick.var_add(\"vsx.vst.b\")\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.d\")\ntrick.var_pause()\n";
+				socket	<<	"trick.var_send_list_size()\n";
 
-    socket >> reply;
-    expected = "3   4";
+				socket	>>	reply;
+				expected	=	"3			4";
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Reply: " << reply << "\tExpected: " << expected;
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Reply:	"	<<	reply	<<	"\tExpected:	"	<<	expected;
 
-    // Adding a variable to the list more than once is allowed
-    socket << "trick.var_add(\"vsx.vst.a\")\n";
-    socket << "trick.var_send_list_size()\n";
+				//	Adding	a	variable	to	the	list	more	than	once	is	allowed
+				socket	<<	"trick.var_add(\"vsx.vst.a\")\n";
+				socket	<<	"trick.var_send_list_size()\n";
 
-    socket >> reply;
-    expected = "3   5";
+				socket	>>	reply;
+				expected	=	"3			5";
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0) << "Reply: " << reply << "\tExpected: " << expected;
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0)	<<	"Reply:	"	<<	reply	<<	"\tExpected:	"	<<	expected;
 
-    socket << "trick.var_add(\"vsx.vst.e\")\ntrick.var_binary()\ntrick.var_send_list_size()\n";
+				socket	<<	"trick.var_add(\"vsx.vst.e\")\ntrick.var_binary()\ntrick.var_send_list_size()\n";
 
-    std::vector<unsigned char> actual_bytes;
-    std::vector<unsigned char> expected_bytes;
-    actual_bytes = socket.receive_bytes();
-    expected_bytes = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00};
+				std::vector<unsigned	char>	actual_bytes;
+				std::vector<unsigned	char>	expected_bytes;
+				actual_bytes	=	socket.receive_bytes();
+				expected_bytes	=	{0x03,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x00,	0x06,	0x00,	0x00,	0x00};
 
-    EXPECT_EQ(expected_bytes, actual_bytes);
+				EXPECT_EQ(expected_bytes,	actual_bytes);
 }
 
 
-TEST_F (VariableServerTest, bitfields) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	bitfields)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.var_send_once(\"vsx.vst.my_bitfield.var1,vsx.vst.my_bitfield.var2,vsx.vst.my_bitfield.var3,vsx.vst.my_bitfield.var4\", 4)\n";
-    std::string reply_str;
-    socket >> reply_str;
+				socket	<<	"trick.var_send_once(\"vsx.vst.my_bitfield.var1,vsx.vst.my_bitfield.var2,vsx.vst.my_bitfield.var3,vsx.vst.my_bitfield.var4\",	4)\n";
+				std::string	reply_str;
+				socket	>>	reply_str;
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply_str, "5 3 -128 0 2112"), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply_str,	"5	3	-128	0	2112"),	0);
 
-    socket << "trick.var_binary()\ntrick.var_send_once(\"vsx.vst.my_bitfield.var1,vsx.vst.my_bitfield.var2,vsx.vst.my_bitfield.var3,vsx.vst.my_bitfield.var4\", 4)\n";
+				socket	<<	"trick.var_binary()\ntrick.var_send_once(\"vsx.vst.my_bitfield.var1,vsx.vst.my_bitfield.var2,vsx.vst.my_bitfield.var3,vsx.vst.my_bitfield.var4\",	4)\n";
 
-    std::vector<unsigned char> reply = socket.receive_bytes();
+				std::vector<unsigned	char>	reply	=	socket.receive_bytes();
 
-    ParsedBinaryMessage message;
-    try {
-        message.parse(reply);
-    } catch (const MalformedMessageException& ex) { 
-        FAIL() << "Parser threw an exception: " << ex.what();
-    }
+				ParsedBinaryMessage	message;
+				try	{
+								message.parse(reply);
+				}	catch	(const	MalformedMessageException&	ex)	{	
+								FAIL()	<<	"Parser	threw	an	exception:	"	<<	ex.what();
+				}
 
-    for (int i = 0; i < message.getNumVars(); i++) {
-        EXPECT_TRUE(message.variables[i].getType() == 12 || message.variables[i].getType() == 13);
-    }
+				for	(int	i	=	0;	i	<	message.getNumVars();	i++)	{
+								EXPECT_TRUE(message.variables[i].getType()	==	12	||	message.variables[i].getType()	==	13);
+				}
 }
 
-TEST_F (VariableServerTest, transmit_file) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	transmit_file)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.send_file(\"file_to_send.txt\")\n";
+				socket	<<	"trick.send_file(\"file_to_send.txt\")\n";
 
-    std::stringstream file_contents;
+				std::stringstream	file_contents;
 
-    while (socket.check_for_message_availible()) {
-        socket >> file_contents;
-    }
+				while	(socket.check_for_message_availible())	{
+								socket	>>	file_contents;
+				}
 
-    std::ifstream actual_file("file_to_send.txt");
-    std::string expected_contents;
-    getline(actual_file, expected_contents);
+				std::ifstream	actual_file("file_to_send.txt");
+				std::string	expected_contents;
+				getline(actual_file,	expected_contents);
 
-    std::string expected_header = "2\t" + std::to_string(expected_contents.size());
+				std::string	expected_header	=	"2\t"	+	std::to_string(expected_contents.size());
 
-    std::string test_line;
+				std::string	test_line;
 
-    std::getline(file_contents, test_line);
-    EXPECT_EQ(test_line, expected_header);
+				std::getline(file_contents,	test_line);
+				EXPECT_EQ(test_line,	expected_header);
 
-    std::getline(file_contents, test_line);
-    EXPECT_EQ(test_line, expected_contents);
+				std::getline(file_contents,	test_line);
+				EXPECT_EQ(test_line,	expected_contents);
 }
 
 
-TEST_F (VariableServerTest, SendSieResource) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendSieResource)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.send_sie_resource()\n";
+				socket	<<	"trick.send_sie_resource()\n";
 
-    std::stringstream received_file;
+				std::stringstream	received_file;
 
-    while (socket.check_for_message_availible()) {
-        socket >> received_file;
-    }
+				while	(socket.check_for_message_availible())	{
+								socket	>>	received_file;
+				}
 
-    std::string first_line;
-    std::getline(received_file, first_line);
+				std::string	first_line;
+				std::getline(received_file,	first_line);
 
-    // We're not gonna bother comparing the contents
-    // Just check to see that the message type is correct
-    ASSERT_EQ(first_line.at(0), '2');
+				//	We're	not	gonna	bother	comparing	the	contents
+				//	Just	check	to	see	that	the	message	type	is	correct
+				ASSERT_EQ(first_line.at(0),	'2');
 }
 
-TEST_F (VariableServerTest, SendSieClass) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendSieClass)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.send_sie_class()\n";
+				socket	<<	"trick.send_sie_class()\n";
 
-    std::stringstream received_file;
-    std::string file_temp;
+				std::stringstream	received_file;
+				std::string	file_temp;
 
-    while (socket.check_for_message_availible()) {
-        socket >> file_temp;
-        received_file << file_temp;
-    }
+				while	(socket.check_for_message_availible())	{
+								socket	>>	file_temp;
+								received_file	<<	file_temp;
+				}
 
-    std::string first_line;
-    std::getline(received_file, first_line);
+				std::string	first_line;
+				std::getline(received_file,	first_line);
 
-    // We're not gonna bother comparing the contents
-    // Just check to see that the message type is correct
-    ASSERT_EQ(first_line.at(0), '2');
+				//	We're	not	gonna	bother	comparing	the	contents
+				//	Just	check	to	see	that	the	message	type	is	correct
+				ASSERT_EQ(first_line.at(0),	'2');
 }
 
-TEST_F (VariableServerTest, SendSieEnum) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendSieEnum)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.send_sie_enum()\n";
+				socket	<<	"trick.send_sie_enum()\n";
 
-    std::stringstream received_file;
-    std::string file_temp;
+				std::stringstream	received_file;
+				std::string	file_temp;
 
-    while (socket.check_for_message_availible()) {
-        socket >> file_temp;
-        received_file << file_temp;
-    }
+				while	(socket.check_for_message_availible())	{
+								socket	>>	file_temp;
+								received_file	<<	file_temp;
+				}
 
-    std::string first_line;
-    std::getline(received_file, first_line);
+				std::string	first_line;
+				std::getline(received_file,	first_line);
 
-    // We're not gonna bother comparing the contents
-    // Just check to see that the message type is correct
-    ASSERT_EQ(first_line.at(0), '2');
+				//	We're	not	gonna	bother	comparing	the	contents
+				//	Just	check	to	see	that	the	message	type	is	correct
+				ASSERT_EQ(first_line.at(0),	'2');
 }
 
 
-TEST_F (VariableServerTest, SendSieClassTopLevelObjects) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendSieClassTopLevelObjects)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.send_sie_top_level_objects()\n";
+				socket	<<	"trick.send_sie_top_level_objects()\n";
 
-    std::stringstream received_file;
-    std::string file_temp;
+				std::stringstream	received_file;
+				std::string	file_temp;
 
-    while (socket.check_for_message_availible()) {
-        socket >> file_temp;
-        received_file << file_temp;
-    }
+				while	(socket.check_for_message_availible())	{
+								socket	>>	file_temp;
+								received_file	<<	file_temp;
+				}
 
-    std::string first_line;
-    std::getline(received_file, first_line);
+				std::string	first_line;
+				std::getline(received_file,	first_line);
 
-    // We're not gonna bother comparing the contents
-    // Just check to see that the message type is correct
-    ASSERT_EQ(first_line.at(0), '2');
+				//	We're	not	gonna	bother	comparing	the	contents
+				//	Just	check	to	see	that	the	message	type	is	correct
+				ASSERT_EQ(first_line.at(0),	'2');
 }
 
-TEST_F (VariableServerTest, RestartAndSet) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	RestartAndSet)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\n");
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 
-    dump_checkpoint(socket, "reload_file.ckpnt");
+				dump_checkpoint(socket,	"reload_file.ckpnt");
 
-    socket << "trick.var_add(\"vsx.vst.e\",\"m\")\n";
-    socket >> reply;
-    expected = std::string("0\t-1234\t-123456 {m}\n");
+				socket	<<	"trick.var_add(\"vsx.vst.e\",\"m\")\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t-123456	{m}\n");
 
-    socket << "trick.var_set(\"vsx.vst.c\", 5)\n";
-    socket >> reply;
-    expected = std::string("0\t5\t-123456 {m}\n");
+				socket	<<	"trick.var_set(\"vsx.vst.c\",	5)\n";
+				socket	>>	reply;
+				expected	=	std::string("0\t5\t-123456	{m}\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 
-    load_checkpoint(socket, "RUN_test/reload_file.ckpnt");
+				load_checkpoint(socket,	"RUN_test/reload_file.ckpnt");
 
-    socket >> reply;
-    expected = std::string("0\t-1234\t-123456 {m}\n");
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t-123456	{m}\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 }
 
-TEST_F (VariableServerTest, Cycle) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-
-    double cycle = 1.0;
-    int num_cycles = 5;
-
-    // Challenge: no loops allowed
-    // I've been reading about lamdbas and when you have a hammer........
-
-    // Test: compare the differences in the returned sim time, make sure the difference 
-    // between them are equal to var_cycle
-    // In copy mode VS_COPY_SCHEDULED and write mode VS_WRITE_WHEN_COPY, we should see exactly the correct copy rate
-    // Use a very small tolerance to compensate for floating point error
-
-    auto parse_message_for_sim_time = [](const std::string& message) {
-        // For this case the message will be
-        // 0\t<time> {s}\t
-        // We only care about <time>
-        std::stringstream message_stream(message);
-        std::string token;
-        std::getline(message_stream, token, '\t');
-        std::getline(message_stream, token, ' ');
-        return std::stod(token);
-    };
-
-    // Tail recursion, just for fun
-    std::function<void(int, double)> compare_cycle = [&] (int n_cycles, double last_sim_time) {
-        if (n_cycles <= 0)
-            return;
-
-        double sim_time = parse_message_for_sim_time(socket.receive());
-        EXPECT_FEQ((sim_time - last_sim_time), cycle) << "Expected cycle: " << cycle << " Measured cycle: " << (sim_time - last_sim_time);
-        compare_cycle(n_cycles-1, sim_time);
-    };
-
-    auto run_cycle_test = [&] () {
-        std::string command = "trick.var_cycle(" + std::to_string(cycle) + ")\n";
-        socket << command;
-        // Give it a cycle to update
-        socket.receive();
-        socket.receive();
-        double sim_time = parse_message_for_sim_time(socket.receive());
-        compare_cycle(num_cycles, sim_time);
-    };
-
-    std::string command = "trick.var_set_copy_mode(1)\ntrick.var_set_write_mode(1)\ntrick.var_add(\"time\")\n";
-    socket << command;
-
-    cycle = 0.1;
-    num_cycles = 5;
-    run_cycle_test();
-
-    cycle = 0.5;
-    run_cycle_test();
-
-    cycle = 3.0;
-    num_cycles = 3;
-    run_cycle_test();
+TEST_F	(VariableServerTest,	Cycle)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+
+				double	cycle	=	1.0;
+				int	num_cycles	=	5;
+
+				//	Challenge:	no	loops	allowed
+				//	I've	been	reading	about	lamdbas	and	when	you	have	a	hammer........
+
+				//	Test:	compare	the	differences	in	the	returned	sim	time,	make	sure	the	difference	
+				//	between	them	are	equal	to	var_cycle
+				//	In	copy	mode	VS_COPY_SCHEDULED	and	write	mode	VS_WRITE_WHEN_COPY,	we	should	see	exactly	the	correct	copy	rate
+				//	Use	a	very	small	tolerance	to	compensate	for	floating	point	error
+
+				auto	parse_message_for_sim_time	=	[](const	std::string&	message)	{
+								//	For	this	case	the	message	will	be
+								//	0\t<time>	{s}\t
+								//	We	only	care	about	<time>
+								std::stringstream	message_stream(message);
+								std::string	token;
+								std::getline(message_stream,	token,	'\t');
+								std::getline(message_stream,	token,	'	');
+								return	std::stod(token);
+				};
+
+				//	Tail	recursion,	just	for	fun
+				std::function<void(int,	double)>	compare_cycle	=	[&]	(int	n_cycles,	double	last_sim_time)	{
+								if	(n_cycles	<=	0)
+												return;
+
+								double	sim_time	=	parse_message_for_sim_time(socket.receive());
+								EXPECT_FEQ((sim_time	-	last_sim_time),	cycle)	<<	"Expected	cycle:	"	<<	cycle	<<	"	Measured	cycle:	"	<<	(sim_time	-	last_sim_time);
+								compare_cycle(n_cycles-1,	sim_time);
+				};
+
+				auto	run_cycle_test	=	[&]	()	{
+								std::string	command	=	"trick.var_cycle("	+	std::to_string(cycle)	+	")\n";
+								socket	<<	command;
+								//	Give	it	a	cycle	to	update
+								socket.receive();
+								socket.receive();
+								double	sim_time	=	parse_message_for_sim_time(socket.receive());
+								compare_cycle(num_cycles,	sim_time);
+				};
+
+				std::string	command	=	"trick.var_set_copy_mode(1)\ntrick.var_set_write_mode(1)\ntrick.var_add(\"time\")\n";
+				socket	<<	command;
+
+				cycle	=	0.1;
+				num_cycles	=	5;
+				run_cycle_test();
+
+				cycle	=	0.5;
+				run_cycle_test();
+
+				cycle	=	3.0;
+				num_cycles	=	3;
+				run_cycle_test();
 }
 
 
-TEST_F (VariableServerTest, Pause) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-    
-    std::string reply;
-    std::string expected;
+TEST_F	(VariableServerTest,	Pause)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+				
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.f\")\ntrick.var_add(\"vsx.vst.i\")\ntrick.var_pause()\n";
+				socket	<<	"trick.var_add(\"vsx.vst.f\")\ntrick.var_add(\"vsx.vst.i\")\ntrick.var_pause()\n";
 
-    // Make sure it's paused
-    EXPECT_EQ(socket.check_for_message_availible(), false);
+				//	Make	sure	it's	paused
+				EXPECT_EQ(socket.check_for_message_availible(),	false);
 
-    socket << "trick.var_send()\n";
-    socket >> reply;
-    expected = std::string("0  123456  1234.5677");
+				socket	<<	"trick.var_send()\n";
+				socket	>>	reply;
+				expected	=	std::string("0		123456		1234.5677");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 
-    // Make sure it doesn't send cyclically
-    EXPECT_EQ(socket.check_for_message_availible(), false);
+				//	Make	sure	it	doesn't	send	cyclically
+				EXPECT_EQ(socket.check_for_message_availible(),	false);
 
-    socket << "trick.var_unpause()\n";
-    socket >> reply;
-    expected = std::string("0  123456  1234.5677");
+				socket	<<	"trick.var_unpause()\n";
+				socket	>>	reply;
+				expected	=	std::string("0		123456		1234.5677");
 
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply, expected), 0);
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(reply,	expected),	0);
 }
 
-#ifndef __APPLE__
-
-TEST_F (VariableServerTest, Multicast) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-
-    socket << "trick.var_server_set_user_tag(\"VSTestServer\")\n";
-
-    Socket multicast_socket;
-    if (multicast_socket.init_multicast("224.3.14.15", 9265) != 0) {
-        FAIL() << "Multicast Socket failed to initialize.";
-    }
-
-    int max_multicast_tries = 10000;
-    int tries = 0;
-    bool found = false;
-
-    char expected_hostname[80];
-    gethostname(expected_hostname, 80);
-    int expected_port = 40000;
-    
-    // get expected username
-    struct passwd *passp = getpwuid(getuid()) ;
-    char * expected_username;
-    if ( passp == NULL ) {
-        expected_username = strdup("unknown") ;
-    } else {
-        expected_username = strdup(passp->pw_name) ;
-    }
-    
-    // Don't care about PID, just check that it's > 0
-    char * expected_sim_dir = "trick/test/SIM_test_varserv";    // Compare against the end of the string for this one
-    // Don't care about cmdline name
-    char * expected_input_file = "RUN_test/unit_test.py";
-    // Don't care about trick_version
-    char * expected_tag = "VSTestServer";
-
-    // Variables to be populated by the multicast message
-    char actual_hostname[80];
-    unsigned short actual_port = 0;
-    char actual_username[80];
-    int actual_pid = 0;
-    char actual_sim_dir[80];
-    char actual_cmdline_name[80];
-    char actual_input_file[80];
-    char actual_trick_version[80];
-    char actual_tag[80];
-    unsigned short actual_duplicate_port = 0;
-
-    while (!found && tries++ < max_multicast_tries) {
-        std::string broadcast_data = multicast_socket.receive();
-        sscanf(broadcast_data.c_str(), "%s\t%hu\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%hu\n" , actual_hostname, &actual_port ,
-             actual_username , &actual_pid , actual_sim_dir , actual_cmdline_name ,
-             actual_input_file , actual_trick_version , actual_tag, &actual_duplicate_port) ;
-        
-        if (strcmp(actual_hostname, expected_hostname) == 0 && strcmp(expected_tag, actual_tag) == 0) {
-            found = true;
-            EXPECT_STREQ(actual_hostname, expected_hostname);
-            EXPECT_EQ(actual_port, expected_port);
-            EXPECT_STREQ(actual_username, expected_username);
-            EXPECT_GT(actual_pid, 0);
-            std::string expected_sim_dir_str(expected_sim_dir);
-            std::string actual_sim_dir_str(actual_sim_dir);
-            std::string end_of_actual = actual_sim_dir_str.substr(actual_sim_dir_str.length() - expected_sim_dir_str.length(), actual_sim_dir_str.length());        
-            EXPECT_EQ(expected_sim_dir_str, end_of_actual);
-            EXPECT_STREQ(actual_input_file, expected_input_file);
-            EXPECT_STREQ(actual_tag, expected_tag);
-            EXPECT_EQ(actual_duplicate_port, expected_port);
-        }
-    }
-
-    if (!found)
-        FAIL() << "Multicast message never received";
+#ifndef	__APPLE__
+
+TEST_F	(VariableServerTest,	Multicast)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+
+				socket	<<	"trick.var_server_set_user_tag(\"VSTestServer\")\n";
+
+				Socket	multicast_socket;
+				if	(multicast_socket.init_multicast("224.3.14.15",	9265)	!=	0)	{
+								FAIL()	<<	"Multicast	Socket	failed	to	initialize.";
+				}
+
+				int	max_multicast_tries	=	10000;
+				int	tries	=	0;
+				bool	found	=	false;
+
+				char	expected_hostname[80];
+				gethostname(expected_hostname,	80);
+				int	expected_port	=	40000;
+				
+				//	get	expected	username
+				struct	passwd	*passp	=	getpwuid(getuid())	;
+				char	*	expected_username;
+				if	(	passp	==	NULL	)	{
+								expected_username	=	strdup("unknown")	;
+				}	else	{
+								expected_username	=	strdup(passp->pw_name)	;
+				}
+				
+				//	Don't	care	about	PID,	just	check	that	it's	>	0
+				char	*	expected_sim_dir	=	"trick/test/SIM_test_varserv";				//	Compare	against	the	end	of	the	string	for	this	one
+				//	Don't	care	about	cmdline	name
+				char	*	expected_input_file	=	"RUN_test/unit_test.py";
+				//	Don't	care	about	trick_version
+				char	*	expected_tag	=	"VSTestServer";
+
+				//	Variables	to	be	populated	by	the	multicast	message
+				char	actual_hostname[80];
+				unsigned	short	actual_port	=	0;
+				char	actual_username[80];
+				int	actual_pid	=	0;
+				char	actual_sim_dir[80];
+				char	actual_cmdline_name[80];
+				char	actual_input_file[80];
+				char	actual_trick_version[80];
+				char	actual_tag[80];
+				unsigned	short	actual_duplicate_port	=	0;
+
+				while	(!found	&&	tries++	<	max_multicast_tries)	{
+								std::string	broadcast_data	=	multicast_socket.receive();
+								sscanf(broadcast_data.c_str(),	"%s\t%hu\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%hu\n"	,	actual_hostname,	&actual_port	,
+													actual_username	,	&actual_pid	,	actual_sim_dir	,	actual_cmdline_name	,
+													actual_input_file	,	actual_trick_version	,	actual_tag,	&actual_duplicate_port)	;
+								
+								if	(strcmp(actual_hostname,	expected_hostname)	==	0	&&	strcmp(expected_tag,	actual_tag)	==	0)	{
+												found	=	true;
+												EXPECT_STREQ(actual_hostname,	expected_hostname);
+												EXPECT_EQ(actual_port,	expected_port);
+												EXPECT_STREQ(actual_username,	expected_username);
+												EXPECT_GT(actual_pid,	0);
+												std::string	expected_sim_dir_str(expected_sim_dir);
+												std::string	actual_sim_dir_str(actual_sim_dir);
+												std::string	end_of_actual	=	actual_sim_dir_str.substr(actual_sim_dir_str.length()	-	expected_sim_dir_str.length(),	actual_sim_dir_str.length());								
+												EXPECT_EQ(expected_sim_dir_str,	end_of_actual);
+												EXPECT_STREQ(actual_input_file,	expected_input_file);
+												EXPECT_STREQ(actual_tag,	expected_tag);
+												EXPECT_EQ(actual_duplicate_port,	expected_port);
+								}
+				}
+
+				if	(!found)
+								FAIL()	<<	"Multicast	message	never	received";
 }
 
 #endif
 
-TEST_F (VariableServerTest, Freeze) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-    
-    std::string reply;
-    std::string expected;
-    int mode;
-    long long frame_count;
-    long long freeze_frame_count;
-
-    // lambda capture by refence is neat
-    auto parse_message_for_sim_mode_and_frames = [&](const std::string& message) {
-        // For this case the message will be
-        // 0\t<mode>\t<frame_count>\t<freeze_frame_count>\t
-        // Sets the local variables to new values
-        std::stringstream message_stream(message);
-        std::string token;
-        std::getline(message_stream, token, '\t');
-        std::getline(message_stream, token, '\t');
-        mode = std::stoi(token);
-        std::getline(message_stream, token, '\t');
-        frame_count = std::stoll(token);
-        std::getline(message_stream, token, '\t');
-        freeze_frame_count = std::stoll(token);
-    };
-
-    auto wait_for_mode_change = [&] (int expected_mode, int max_wait_iterations = 10) {
-        int iteration = 0;
-        while (iteration++ < max_wait_iterations && mode != expected_mode) {
-            parse_message_for_sim_mode_and_frames(socket.receive());
-        }
-    };
-
-    // Send the sim mode, frame_count, freeze_frame_count, and sim_time
-    socket << "trick.var_add(\"trick_sys.sched.mode\")\ntrick.var_add(\"trick_sys.sched.frame_count\")\ntrick.var_add(\"trick_sys.sched.freeze_frame_count\")\n";
-    parse_message_for_sim_mode_and_frames(socket.receive());
-
-    // Sim mode should be MODE_RUN == 5
-    EXPECT_EQ(mode, MODE_RUN);
-
-    // Set to Freeze mode
-    socket << "trick.exec_freeze()\n";
-
-    // The mode takes a little bit of time to change
-    wait_for_mode_change(MODE_FREEZE);
-
-    // Sim mode should be MODE_FREEZE == 1
-    ASSERT_EQ(mode, MODE_FREEZE);
-
-    // Set to back to run mode
-    socket << "trick.exec_run()\n";
-
-    // The mode takes a little bit of time to change
-    wait_for_mode_change(MODE_RUN);
-
-    // Sim mode should be MODE_RUN
-    ASSERT_EQ(mode, MODE_RUN);
-
-    // Test VS_COPY_SCHEDULED - should see 1 message per frame
-    socket << "trick.var_set_copy_mode(1)\n";
-
-
-    // Change back to freeze mode
-    // Set to Freeze mode
-    socket << "trick.exec_freeze()\n";
-
-    // The mode takes a little bit of time to change
-    wait_for_mode_change(MODE_FREEZE);
-
-    // Sim mode should be MODE_FREEZE == 1
-    ASSERT_EQ(mode, MODE_FREEZE);
-
-    // Test VS_COPY_SCHEDULED - should see 1 message per frame
-    socket << "trick.var_set_copy_mode(1)\n";
-    parse_message_for_sim_mode_and_frames(socket.receive());
-    int num_tests = 5;
-    int prev_frame = 0;
-    for (int i = 0; i < num_tests; i++) {
-        prev_frame = freeze_frame_count;
-        parse_message_for_sim_mode_and_frames(socket.receive());
-        EXPECT_EQ(freeze_frame_count - prev_frame, 1);
-    }
-
-
-    // Test VS_COPY_TOP_OF_FRAME, along with freeze frame multiplier and offset
-    socket << "trick.var_set_copy_mode(2)\ntrick.var_set_freeze_frame_multiple(3)\ntrick.var_set_freeze_frame_offset(1)\n";
-    parse_message_for_sim_mode_and_frames(socket.receive());
-    for (int i = 0; i < num_tests; i++) {
-        prev_frame = freeze_frame_count;
-        parse_message_for_sim_mode_and_frames(socket.receive());
-        EXPECT_EQ(freeze_frame_count % 3, 1);
-        EXPECT_EQ(freeze_frame_count - prev_frame, 3);
-    }
-    
-    // Set the mode back to run or the next tests will get confused
-    socket << "trick.exec_run()\n";
-    socket << "trick.var_set_copy_mode(0)\n";
-
-    // Wait for the mode to actually change
-    wait_for_mode_change(MODE_RUN);
-
-    ASSERT_EQ(mode, MODE_RUN);
+TEST_F	(VariableServerTest,	Freeze)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+				
+				std::string	reply;
+				std::string	expected;
+				int	mode;
+				long	long	frame_count;
+				long	long	freeze_frame_count;
+
+				//	lambda	capture	by	refence	is	neat
+				auto	parse_message_for_sim_mode_and_frames	=	[&](const	std::string&	message)	{
+								//	For	this	case	the	message	will	be
+								//	0\t<mode>\t<frame_count>\t<freeze_frame_count>\t
+								//	Sets	the	local	variables	to	new	values
+								std::stringstream	message_stream(message);
+								std::string	token;
+								std::getline(message_stream,	token,	'\t');
+								std::getline(message_stream,	token,	'\t');
+								mode	=	std::stoi(token);
+								std::getline(message_stream,	token,	'\t');
+								frame_count	=	std::stoll(token);
+								std::getline(message_stream,	token,	'\t');
+								freeze_frame_count	=	std::stoll(token);
+				};
+
+				auto	wait_for_mode_change	=	[&]	(int	expected_mode,	int	max_wait_iterations	=	10)	{
+								int	iteration	=	0;
+								while	(iteration++	<	max_wait_iterations	&&	mode	!=	expected_mode)	{
+												parse_message_for_sim_mode_and_frames(socket.receive());
+								}
+				};
+
+				//	Send	the	sim	mode,	frame_count,	freeze_frame_count,	and	sim_time
+				socket	<<	"trick.var_add(\"trick_sys.sched.mode\")\ntrick.var_add(\"trick_sys.sched.frame_count\")\ntrick.var_add(\"trick_sys.sched.freeze_frame_count\")\n";
+				parse_message_for_sim_mode_and_frames(socket.receive());
+
+				//	Sim	mode	should	be	MODE_RUN	==	5
+				EXPECT_EQ(mode,	MODE_RUN);
+
+				//	Set	to	Freeze	mode
+				socket	<<	"trick.exec_freeze()\n";
+
+				//	The	mode	takes	a	little	bit	of	time	to	change
+				wait_for_mode_change(MODE_FREEZE);
+
+				//	Sim	mode	should	be	MODE_FREEZE	==	1
+				ASSERT_EQ(mode,	MODE_FREEZE);
+
+				//	Set	to	back	to	run	mode
+				socket	<<	"trick.exec_run()\n";
+
+				//	The	mode	takes	a	little	bit	of	time	to	change
+				wait_for_mode_change(MODE_RUN);
+
+				//	Sim	mode	should	be	MODE_RUN
+				ASSERT_EQ(mode,	MODE_RUN);
+
+				//	Test	VS_COPY_SCHEDULED	-	should	see	1	message	per	frame
+				socket	<<	"trick.var_set_copy_mode(1)\n";
+
+
+				//	Change	back	to	freeze	mode
+				//	Set	to	Freeze	mode
+				socket	<<	"trick.exec_freeze()\n";
+
+				//	The	mode	takes	a	little	bit	of	time	to	change
+				wait_for_mode_change(MODE_FREEZE);
+
+				//	Sim	mode	should	be	MODE_FREEZE	==	1
+				ASSERT_EQ(mode,	MODE_FREEZE);
+
+				//	Test	VS_COPY_SCHEDULED	-	should	see	1	message	per	frame
+				socket	<<	"trick.var_set_copy_mode(1)\n";
+				parse_message_for_sim_mode_and_frames(socket.receive());
+				int	num_tests	=	5;
+				int	prev_frame	=	0;
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{
+								prev_frame	=	freeze_frame_count;
+								parse_message_for_sim_mode_and_frames(socket.receive());
+								EXPECT_EQ(freeze_frame_count	-	prev_frame,	1);
+				}
+
+
+				//	Test	VS_COPY_TOP_OF_FRAME,	along	with	freeze	frame	multiplier	and	offset
+				socket	<<	"trick.var_set_copy_mode(2)\ntrick.var_set_freeze_frame_multiple(3)\ntrick.var_set_freeze_frame_offset(1)\n";
+				parse_message_for_sim_mode_and_frames(socket.receive());
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{
+								prev_frame	=	freeze_frame_count;
+								parse_message_for_sim_mode_and_frames(socket.receive());
+								EXPECT_EQ(freeze_frame_count	%	3,	1);
+								EXPECT_EQ(freeze_frame_count	-	prev_frame,	3);
+				}
+				
+				//	Set	the	mode	back	to	run	or	the	next	tests	will	get	confused
+				socket	<<	"trick.exec_run()\n";
+				socket	<<	"trick.var_set_copy_mode(0)\n";
+
+				//	Wait	for	the	mode	to	actually	change
+				wait_for_mode_change(MODE_RUN);
+
+				ASSERT_EQ(mode,	MODE_RUN);
 }
 
-TEST_F (VariableServerTest, CopyAndWriteModes) {
-    if (socket_status != 0) {
-        FAIL();
-    }
-
-    std::string reply;
-    std::string expected;
-
-    int num_tests = 5;
-    double sim_time;
-    int frame_count;
-    std::string vars;
-    std::string command;
-    std::string test_vars_command = "trick.var_add(\"time\")\ntrick.var_add(\"trick_sys.sched.frame_count\")\n";
-
-    double expected_cycle = 0.5;
-    command = "trick.var_cycle(" + std::to_string(expected_cycle) + ")\n";
-    socket << command;
-
-    auto parse_message = [&](const std::string& message) {
-        // For this case the message will be
-        // 0\t<sim_time> {s}\t<frame_count>\t<other variables>\n
-        // Sets the local variables to new values
-        std::stringstream message_stream(message);
-        std::string token;
-        std::getline(message_stream, token, '\t');
-        std::getline(message_stream, token, ' ');
-        sim_time = std::stod(token);
-        std::getline(message_stream, token, '\t');
-        std::getline(message_stream, token, '\t');
-        frame_count = std::stoll(token);
-        std::getline(message_stream, token, '\n');
-        vars = token;
-    };
-
-    // Check that every combination of modes is functional
-    // Check that reasonable times and frames are returned as well
-    // Default is VS_COPY_ASYNC=0 and VS_WRITE_ASYNC=0
-    // This mode doesn't give us any guarantees about frame or cycle consistency, so we can't test it
-    // Just make sure it works
-
-    command = test_vars_command + "trick.var_add(\"vsx.vst.a\")\ntrick.var_add(\"vsx.vst.b\")\n";
-    socket << command;
-    parse_message(socket.receive());
-
-    expected = "97 98";
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-
-    // Clear out anything else that's been sent
-    socket << "trick.var_pause()\n";
-    socket.clear_buffered_data();
-
-    // Copy mode 1 (VS_COPY_SCHEDULED) write mode 0 (VS_WRITE_ASYNC)
-    command = "trick.var_clear()\n" + test_vars_command + "trick.var_sync(1)\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.d\")\ntrick.var_unpause()\n";
-    socket << command;
-
-    // With copy mode VS_COPY_SCHEDULED and write mode VS_WRITE_ASYNC, the first reply will be all 0 since the main time to copy has not occurred yet.
-    // Is this what we want? Maybe we should have more strict communication on whether the data has been staged so the first message isn't incorrect
-
-    spin(socket);
-
-    expected = "-1234 1234";
-    parse_message(socket.receive());
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-
-
-    // Test that we see a difference of exactly expected_cycle (with a tolerance for floating point issues)
-    int prev_frame = 0;
-    double prev_time = 0;
-    for (int i = 0; i < num_tests; i++) {  
-        prev_time = sim_time;
-        parse_message(socket.receive());
-        EXPECT_LT(fmod(sim_time - prev_time, expected_cycle), DOUBLE_TOL);
-        EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-    }
-
-    // Clear out anything else that's been sent
-    socket << "trick.var_pause()\n";
-    socket.clear_buffered_data();
-
-
-    // Copy mode 1 (VS_COPY_SCHEDULED) write mode 1 (VS_WRITE_WHEN_COPIED)
-    command = "trick.var_clear()\n" + test_vars_command + "trick.var_set_write_mode(1)\ntrick.var_add(\"vsx.vst.e\")\ntrick.var_add(\"vsx.vst.f\")\ntrick.var_unpause()\n";
-    socket << command;
-
-    spin(socket);
-
-    parse_message(socket.receive());
-    expected = "-123456 123456";
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-
-    // Test that we still see a difference of exactly expected_cycle (with a tolerance for floating point issues)
-    prev_frame = 0;
-    prev_time = 0;
-    for (int i = 0; i < num_tests; i++) {  
-        prev_time = sim_time;
-        parse_message(socket.receive());
-        EXPECT_LT(fmod(sim_time - prev_time, expected_cycle), DOUBLE_TOL);
-        EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-    }
-
-    // Clear out anything else that's been sent
-    socket << "trick.var_pause()\n";
-    socket.clear_buffered_data();
-
-
-    // Copy mode 2 (VS_COPY_TOP_OF_FRAME) write mode 0 (VS_WRITE_ASYNC)
-    // Test frame_multiple and frame_offset as well, with stupid values
-    int frame_multiple = 13*5;
-    int frame_offset = 7;
-    command = "trick.var_clear()\n" + test_vars_command + "trick.var_set_copy_mode(2)\ntrick.var_set_write_mode(0)\ntrick.var_set_frame_multiple(" + std::to_string(frame_multiple) + ")\ntrick.var_set_frame_offset(" + std::to_string(frame_offset) + ")\ntrick.var_add(\"vsx.vst.g\")\ntrick.var_add(\"vsx.vst.h\")\ntrick.var_unpause()\n";
-    socket << command;
-
-    // Same issue as copy mode 1 write mode 0
-    spin(socket);
-    parse_message(socket.receive());
-    expected = "-1234567 123456789";
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-
-    // Test that we see a difference in frame_count of exactly frame_multiple with an offset of frame_offset
-    prev_frame = 0;
-    for (int i = 0; i < num_tests; i++) {  
-        prev_frame = frame_count;
-        parse_message(socket.receive());
-        EXPECT_EQ(frame_count - prev_frame, frame_multiple);
-        EXPECT_EQ(frame_count % frame_multiple, frame_offset);
-        EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-    }
-
-    // Clear out anything else that's been sent
-    socket << "trick.var_pause()\n";
-    socket.clear_buffered_data();
-
-
-    // Copy mode 2 (VS_COPY_TOP_OF_FRAME) write mode 1 (VS_WRITE_WHEN_COPIED)
-    frame_multiple = 17*5;
-    frame_offset = 11;
-    command = "trick.var_clear()\n" + test_vars_command + "trick.var_set_copy_mode(2)\ntrick.var_set_write_mode(1)\ntrick.var_set_frame_multiple(" + std::to_string(frame_multiple) + ")\ntrick.var_set_frame_offset(" + std::to_string(frame_offset) + ")\ntrick.var_add(\"vsx.vst.i\")\ntrick.var_add(\"vsx.vst.j\")\ntrick.var_unpause()\n";
-    socket << command;
-
-    spin(socket);
-
-    expected = "1234.5677 -1234.56789";
-    parse_message(socket.receive());
-    EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-
-    // Test that we see a difference in frame_count of exactly frame_multiple with an offset of frame_offset
-    prev_frame = 0;
-    for (int i = 0; i < num_tests; i++) {  
-        prev_frame = frame_count;
-        parse_message(socket.receive());
-        EXPECT_EQ(frame_count - prev_frame, frame_multiple);
-        EXPECT_EQ(frame_count % frame_multiple, frame_offset);
-        EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars, expected), 0) << "Received: " << vars << " Expected: " << expected;
-    }
-
-    // Clear out anything else that's been sent
-    socket << "trick.var_pause()\n";
-    socket.clear_buffered_data();
+TEST_F	(VariableServerTest,	CopyAndWriteModes)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
+
+				std::string	reply;
+				std::string	expected;
+
+				int	num_tests	=	5;
+				double	sim_time;
+				int	frame_count;
+				std::string	vars;
+				std::string	command;
+				std::string	test_vars_command	=	"trick.var_add(\"time\")\ntrick.var_add(\"trick_sys.sched.frame_count\")\n";
+
+				double	expected_cycle	=	0.5;
+				command	=	"trick.var_cycle("	+	std::to_string(expected_cycle)	+	")\n";
+				socket	<<	command;
+
+				auto	parse_message	=	[&](const	std::string&	message)	{
+								//	For	this	case	the	message	will	be
+								//	0\t<sim_time>	{s}\t<frame_count>\t<other	variables>\n
+								//	Sets	the	local	variables	to	new	values
+								std::stringstream	message_stream(message);
+								std::string	token;
+								std::getline(message_stream,	token,	'\t');
+								std::getline(message_stream,	token,	'	');
+								sim_time	=	std::stod(token);
+								std::getline(message_stream,	token,	'\t');
+								std::getline(message_stream,	token,	'\t');
+								frame_count	=	std::stoll(token);
+								std::getline(message_stream,	token,	'\n');
+								vars	=	token;
+				};
+
+				//	Check	that	every	combination	of	modes	is	functional
+				//	Check	that	reasonable	times	and	frames	are	returned	as	well
+				//	Default	is	VS_COPY_ASYNC=0	and	VS_WRITE_ASYNC=0
+				//	This	mode	doesn't	give	us	any	guarantees	about	frame	or	cycle	consistency,	so	we	can't	test	it
+				//	Just	make	sure	it	works
+
+				command	=	test_vars_command	+	"trick.var_add(\"vsx.vst.a\")\ntrick.var_add(\"vsx.vst.b\")\n";
+				socket	<<	command;
+				parse_message(socket.receive());
+
+				expected	=	"97	98";
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+
+				//	Clear	out	anything	else	that's	been	sent
+				socket	<<	"trick.var_pause()\n";
+				socket.clear_buffered_data();
+
+				//	Copy	mode	1	(VS_COPY_SCHEDULED)	write	mode	0	(VS_WRITE_ASYNC)
+				command	=	"trick.var_clear()\n"	+	test_vars_command	+	"trick.var_sync(1)\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.d\")\ntrick.var_unpause()\n";
+				socket	<<	command;
+
+				//	With	copy	mode	VS_COPY_SCHEDULED	and	write	mode	VS_WRITE_ASYNC,	the	first	reply	will	be	all	0	since	the	main	time	to	copy	has	not	occurred	yet.
+				//	Is	this	what	we	want?	Maybe	we	should	have	more	strict	communication	on	whether	the	data	has	been	staged	so	the	first	message	isn't	incorrect
+
+				spin(socket);
+
+				expected	=	"-1234	1234";
+				parse_message(socket.receive());
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+
+
+				//	Test	that	we	see	a	difference	of	exactly	expected_cycle	(with	a	tolerance	for	floating	point	issues)
+				int	prev_frame	=	0;
+				double	prev_time	=	0;
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{		
+								prev_time	=	sim_time;
+								parse_message(socket.receive());
+								EXPECT_LT(fmod(sim_time	-	prev_time,	expected_cycle),	DOUBLE_TOL);
+								EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+				}
+
+				//	Clear	out	anything	else	that's	been	sent
+				socket	<<	"trick.var_pause()\n";
+				socket.clear_buffered_data();
+
+
+				//	Copy	mode	1	(VS_COPY_SCHEDULED)	write	mode	1	(VS_WRITE_WHEN_COPIED)
+				command	=	"trick.var_clear()\n"	+	test_vars_command	+	"trick.var_set_write_mode(1)\ntrick.var_add(\"vsx.vst.e\")\ntrick.var_add(\"vsx.vst.f\")\ntrick.var_unpause()\n";
+				socket	<<	command;
+
+				spin(socket);
+
+				parse_message(socket.receive());
+				expected	=	"-123456	123456";
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+
+				//	Test	that	we	still	see	a	difference	of	exactly	expected_cycle	(with	a	tolerance	for	floating	point	issues)
+				prev_frame	=	0;
+				prev_time	=	0;
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{		
+								prev_time	=	sim_time;
+								parse_message(socket.receive());
+								EXPECT_LT(fmod(sim_time	-	prev_time,	expected_cycle),	DOUBLE_TOL);
+								EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+				}
+
+				//	Clear	out	anything	else	that's	been	sent
+				socket	<<	"trick.var_pause()\n";
+				socket.clear_buffered_data();
+
+
+				//	Copy	mode	2	(VS_COPY_TOP_OF_FRAME)	write	mode	0	(VS_WRITE_ASYNC)
+				//	Test	frame_multiple	and	frame_offset	as	well,	with	stupid	values
+				int	frame_multiple	=	13*5;
+				int	frame_offset	=	7;
+				command	=	"trick.var_clear()\n"	+	test_vars_command	+	"trick.var_set_copy_mode(2)\ntrick.var_set_write_mode(0)\ntrick.var_set_frame_multiple("	+	std::to_string(frame_multiple)	+	")\ntrick.var_set_frame_offset("	+	std::to_string(frame_offset)	+	")\ntrick.var_add(\"vsx.vst.g\")\ntrick.var_add(\"vsx.vst.h\")\ntrick.var_unpause()\n";
+				socket	<<	command;
+
+				//	Same	issue	as	copy	mode	1	write	mode	0
+				spin(socket);
+				parse_message(socket.receive());
+				expected	=	"-1234567	123456789";
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+
+				//	Test	that	we	see	a	difference	in	frame_count	of	exactly	frame_multiple	with	an	offset	of	frame_offset
+				prev_frame	=	0;
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{		
+								prev_frame	=	frame_count;
+								parse_message(socket.receive());
+								EXPECT_EQ(frame_count	-	prev_frame,	frame_multiple);
+								EXPECT_EQ(frame_count	%	frame_multiple,	frame_offset);
+								EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+				}
+
+				//	Clear	out	anything	else	that's	been	sent
+				socket	<<	"trick.var_pause()\n";
+				socket.clear_buffered_data();
+
+
+				//	Copy	mode	2	(VS_COPY_TOP_OF_FRAME)	write	mode	1	(VS_WRITE_WHEN_COPIED)
+				frame_multiple	=	17*5;
+				frame_offset	=	11;
+				command	=	"trick.var_clear()\n"	+	test_vars_command	+	"trick.var_set_copy_mode(2)\ntrick.var_set_write_mode(1)\ntrick.var_set_frame_multiple("	+	std::to_string(frame_multiple)	+	")\ntrick.var_set_frame_offset("	+	std::to_string(frame_offset)	+	")\ntrick.var_add(\"vsx.vst.i\")\ntrick.var_add(\"vsx.vst.j\")\ntrick.var_unpause()\n";
+				socket	<<	command;
+
+				spin(socket);
+
+				expected	=	"1234.5677	-1234.56789";
+				parse_message(socket.receive());
+				EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+
+				//	Test	that	we	see	a	difference	in	frame_count	of	exactly	frame_multiple	with	an	offset	of	frame_offset
+				prev_frame	=	0;
+				for	(int	i	=	0;	i	<	num_tests;	i++)	{		
+								prev_frame	=	frame_count;
+								parse_message(socket.receive());
+								EXPECT_EQ(frame_count	-	prev_frame,	frame_multiple);
+								EXPECT_EQ(frame_count	%	frame_multiple,	frame_offset);
+								EXPECT_EQ(strcmp_IgnoringWhiteSpace(vars,	expected),	0)	<<	"Received:	"	<<	vars	<<	"	Expected:	"	<<	expected;
+				}
+
+				//	Clear	out	anything	else	that's	been	sent
+				socket	<<	"trick.var_pause()\n";
+				socket.clear_buffered_data();
 }
 
-TEST_F (VariableServerTest, var_set) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	var_set)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string reply;
-    std::string expected;
+				std::string	reply;
+				std::string	expected;
 
-    socket << "trick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.blocked_from_output\")\ntrick.var_add(\"vsx.vst.blocked_from_input\")\n";
+				socket	<<	"trick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.blocked_from_output\")\ntrick.var_add(\"vsx.vst.blocked_from_input\")\n";
 
-    socket >> reply;
-    expected = std::string("0\t-1234\t0\t500\n");
+				socket	>>	reply;
+				expected	=	std::string("0\t-1234\t0\t500\n");
 
-    EXPECT_EQ(reply, expected);
+				EXPECT_EQ(reply,	expected);
 
-    socket << "trick.var_set(\"vsx.vst.blocked_from_input\", 0)\n";
-    socket << "trick.var_set(\"vsx.vst.blocked_from_output\", 0)\n";
+				socket	<<	"trick.var_set(\"vsx.vst.blocked_from_input\",	0)\n";
+				socket	<<	"trick.var_set(\"vsx.vst.blocked_from_output\",	0)\n";
 
 
 }
 
-bool getCompleteBinaryMessage(ParsedBinaryMessage& message, Socket& socket, bool print = false) {
-    static const int max_retries = 5;
-
-    int tries = 0;
-    bool parse_success = false;
-    std::vector<unsigned char> reply;
-
-    // Try parsing until message received is correct
-    // May take a cycle or 2 to update properly
-    while (!parse_success && tries++ < max_retries) {
-        try {
-            reply = socket.receive_bytes();
-            message.parse(reply);
-            parse_success = true;
-        } catch (const MalformedMessageException& ex) { 
-            std::cout << "Attempt " << tries << " failed with exception " << ex.what() << std::endl;;
-        }
-    }
-
-    if (print) {
-        std::cout << "Message: ";
-        for (unsigned char byte : reply) {
-            std::cout << "0x" << std::setw(2) << std::setfill('0') << std::hex << (int)byte << ", ";
-        }
-        std::cout << std::endl;
-    }
-
-    return parse_success;
+bool	getCompleteBinaryMessage(ParsedBinaryMessage&	message,	Socket&	socket,	bool	print	=	false)	{
+				static	const	int	max_retries	=	5;
+
+				int	tries	=	0;
+				bool	parse_success	=	false;
+				std::vector<unsigned	char>	reply;
+
+				//	Try	parsing	until	message	received	is	correct
+				//	May	take	a	cycle	or	2	to	update	properly
+				while	(!parse_success	&&	tries++	<	max_retries)	{
+								try	{
+												reply	=	socket.receive_bytes();
+												message.parse(reply);
+												parse_success	=	true;
+								}	catch	(const	MalformedMessageException&	ex)	{	
+												std::cout	<<	"Attempt	"	<<	tries	<<	"	failed	with	exception	"	<<	ex.what()	<<	std::endl;;
+								}
+				}
+
+				if	(print)	{
+								std::cout	<<	"Message:	";
+								for	(unsigned	char	byte	:	reply)	{
+												std::cout	<<	"0x"	<<	std::setw(2)	<<	std::setfill('0')	<<	std::hex	<<	(int)byte	<<	",	";
+								}
+								std::cout	<<	std::endl;
+				}
+
+				return	parse_success;
 }
 
-TEST_F (VariableServerTest, send_stdio) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	send_stdio)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.var_set_send_stdio(True)\n";
-    socket << "sys.stdout.write(\"This message should redirect to varserver\")\n";
+				socket	<<	"trick.var_set_send_stdio(True)\n";
+				socket	<<	"sys.stdout.write(\"This	message	should	redirect	to	varserver\")\n";
 
-    std::string message;
-    socket >> message;
+				std::string	message;
+				socket	>>	message;
 
-    std::stringstream message_stream(message);
-    std::string token;
+				std::stringstream	message_stream(message);
+				std::string	token;
 
-    int message_type;
-    int stream_num;
-    int text_size;
-    std::string text;
+				int	message_type;
+				int	stream_num;
+				int	text_size;
+				std::string	text;
 
-    message_stream >> message_type;
-    message_stream >> stream_num;
-    std::getline(message_stream, token, '\n');
-    text_size = stoi(token);
-    std::getline(message_stream, text);
+				message_stream	>>	message_type;
+				message_stream	>>	stream_num;
+				std::getline(message_stream,	token,	'\n');
+				text_size	=	stoi(token);
+				std::getline(message_stream,	text);
 
-    if (text.size() != text_size) {
-        socket >> text;
-    }
-    
-    EXPECT_EQ (message_type, 4);
-    EXPECT_EQ (stream_num, 1);
-    EXPECT_EQ (text_size, 41);
+				if	(text.size()	!=	text_size)	{
+								socket	>>	text;
+				}
+				
+				EXPECT_EQ	(message_type,	4);
+				EXPECT_EQ	(stream_num,	1);
+				EXPECT_EQ	(text_size,	41);
 
-    EXPECT_EQ(text, std::string("This message should redirect to varserver"));
+				EXPECT_EQ(text,	std::string("This	message	should	redirect	to	varserver"));
 }
 
 
-TEST_F (VariableServerTest, Binary) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	Binary)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    socket << "trick.var_binary()\ntrick.var_add(\"vsx.vst.n\")\n";
-    ParsedBinaryMessage message_n;
+				socket	<<	"trick.var_binary()\ntrick.var_add(\"vsx.vst.n\")\n";
+				ParsedBinaryMessage	message_n;
 
-    if (!getCompleteBinaryMessage(message_n, socket)) {
-        FAIL() << "Parser was not able to interpret the message.";
-    }
+				if	(!getCompleteBinaryMessage(message_n,	socket))	{
+								FAIL()	<<	"Parser	was	not	able	to	interpret	the	message.";
+				}
 
-    Var arr_var = message_n.getVariable("vsx.vst.n");
-    EXPECT_EQ(arr_var.getArraySize(), 5);
-    std::vector<unsigned char> raw_arr = arr_var.getRawBytes();
-    std::vector<int> values;
-    for (unsigned int i = 0; i < raw_arr.size(); i += 4) {
-        int val = 0;
-        for (unsigned int j = i; j < i+4; j++) {
-            val |= raw_arr[j] << j*8;
-        }
-        values.push_back(val);
-    }
+				Var	arr_var	=	message_n.getVariable("vsx.vst.n");
+				EXPECT_EQ(arr_var.getArraySize(),	5);
+				std::vector<unsigned	char>	raw_arr	=	arr_var.getRawBytes();
+				std::vector<int>	values;
+				for	(unsigned	int	i	=	0;	i	<	raw_arr.size();	i	+=	4)	{
+								int	val	=	0;
+								for	(unsigned	int	j	=	i;	j	<	i+4;	j++)	{
+												val	|=	raw_arr[j]	<<	j*8;
+								}
+								values.push_back(val);
+				}
 
-    std::vector<int> expected_arr = {0, 1, 2, 3, 4};
-    EXPECT_EQ(values, expected_arr);
+				std::vector<int>	expected_arr	=	{0,	1,	2,	3,	4};
+				EXPECT_EQ(values,	expected_arr);
 
 
-    std::vector<unsigned char> reply;
-    socket << "trick.var_clear()\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.k\")\ntrick.var_add(\"vsx.vst.o\")\ntrick.var_add(\"vsx.vst.m\")\n";
+				std::vector<unsigned	char>	reply;
+				socket	<<	"trick.var_clear()\ntrick.var_add(\"vsx.vst.c\")\ntrick.var_add(\"vsx.vst.k\")\ntrick.var_add(\"vsx.vst.o\")\ntrick.var_add(\"vsx.vst.m\")\n";
 
-    ParsedBinaryMessage message;
+				ParsedBinaryMessage	message;
 
-    if (!getCompleteBinaryMessage(message, socket)) {
-        FAIL() << "Parser was not able to interpret the message.";
-    }
+				if	(!getCompleteBinaryMessage(message,	socket))	{
+								FAIL()	<<	"Parser	was	not	able	to	interpret	the	message.";
+				}
 
-    EXPECT_EQ(message.getMessageType(), 0);
-    ASSERT_EQ(message.getNumVars(), 4);
+				EXPECT_EQ(message.getMessageType(),	0);
+				ASSERT_EQ(message.getNumVars(),	4);
 
-    EXPECT_EQ(strcmp(message.variables[0].getName().c_str(), "vsx.vst.c"), 0);
-    EXPECT_EQ(message.variables[0].getType(), TRICK_SHORT);
-    EXPECT_EQ(message.variables[0].getValue<short>(), -1234);
+				EXPECT_EQ(strcmp(message.variables[0].getName().c_str(),	"vsx.vst.c"),	0);
+				EXPECT_EQ(message.variables[0].getType(),	TRICK_SHORT);
+				EXPECT_EQ(message.variables[0].getValue<short>(),	-1234);
 
 
-    EXPECT_EQ(strcmp(message.variables[1].getName().c_str(), "vsx.vst.k"), 0);
-    EXPECT_EQ(message.variables[1].getType(), TRICK_LONG_LONG);
-    EXPECT_EQ(message.variables[1].getValue<long long>(), -12345678912345);
+				EXPECT_EQ(strcmp(message.variables[1].getName().c_str(),	"vsx.vst.k"),	0);
+				EXPECT_EQ(message.variables[1].getType(),	TRICK_LONG_LONG);
+				EXPECT_EQ(message.variables[1].getValue<long	long>(),	-12345678912345);
 
-    EXPECT_EQ(strcmp(message.variables[2].getName().c_str(), "vsx.vst.o"), 0);
-    EXPECT_EQ(message.variables[2].getType(), TRICK_STRING);
-    std::string actual = message.variables[2].getValue<std::string>();
-    std::string expected = "You will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.\0";
-    EXPECT_EQ(actual.substr(0, actual.size()-1), expected);
+				EXPECT_EQ(strcmp(message.variables[2].getName().c_str(),	"vsx.vst.o"),	0);
+				EXPECT_EQ(message.variables[2].getType(),	TRICK_STRING);
+				std::string	actual	=	message.variables[2].getValue<std::string>();
+				std::string	expected	=	"You	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.\0";
+				EXPECT_EQ(actual.substr(0,	actual.size()-1),	expected);
 
-    Var variable = message.getVariable("vsx.vst.m");
-    EXPECT_EQ(strcmp(variable.getName().c_str(), "vsx.vst.m"), 0);
-    EXPECT_EQ(variable.getType(), TRICK_BOOLEAN);
-    EXPECT_EQ(variable.getValue<bool>(), true);
+				Var	variable	=	message.getVariable("vsx.vst.m");
+				EXPECT_EQ(strcmp(variable.getName().c_str(),	"vsx.vst.m"),	0);
+				EXPECT_EQ(variable.getType(),	TRICK_BOOLEAN);
+				EXPECT_EQ(variable.getValue<bool>(),	true);
 
-    // Switch to nonames
-    socket << "trick.var_binary_nonames()\n";
+				//	Switch	to	nonames
+				socket	<<	"trick.var_binary_nonames()\n";
 
-    ParsedBinaryMessage noname_message(false, true);
-    if (!getCompleteBinaryMessage(noname_message, socket)) {
-        FAIL() << "Parser was not able to interpret the message.";
-    }
+				ParsedBinaryMessage	noname_message(false,	true);
+				if	(!getCompleteBinaryMessage(noname_message,	socket))	{
+								FAIL()	<<	"Parser	was	not	able	to	interpret	the	message.";
+				}
 
-    EXPECT_EQ(noname_message.getMessageType(), 0);
-    ASSERT_EQ(noname_message.getNumVars(), 4);
+				EXPECT_EQ(noname_message.getMessageType(),	0);
+				ASSERT_EQ(noname_message.getNumVars(),	4);
 
-    EXPECT_EQ(strcmp(noname_message.variables[0].getName().c_str(), "<no name>"), 0);
-    EXPECT_EQ(noname_message.variables[0].getType(), TRICK_SHORT);
-    EXPECT_EQ(noname_message.variables[0].getValue<short>(), -1234);
+				EXPECT_EQ(strcmp(noname_message.variables[0].getName().c_str(),	"<no	name>"),	0);
+				EXPECT_EQ(noname_message.variables[0].getType(),	TRICK_SHORT);
+				EXPECT_EQ(noname_message.variables[0].getValue<short>(),	-1234);
 
-    EXPECT_EQ(strcmp(noname_message.variables[1].getName().c_str(), "<no name>"), 0);
-    EXPECT_EQ(noname_message.variables[1].getType(), TRICK_LONG_LONG);
-    EXPECT_EQ(noname_message.variables[1].getValue<long long>(), -12345678912345);
+				EXPECT_EQ(strcmp(noname_message.variables[1].getName().c_str(),	"<no	name>"),	0);
+				EXPECT_EQ(noname_message.variables[1].getType(),	TRICK_LONG_LONG);
+				EXPECT_EQ(noname_message.variables[1].getValue<long	long>(),	-12345678912345);
 
-    EXPECT_EQ(strcmp(noname_message.variables[2].getName().c_str(), "<no name>"), 0);
-    EXPECT_EQ(noname_message.variables[2].getType(), TRICK_STRING);
-    actual = noname_message.variables[2].getValue<std::string>();
-    EXPECT_EQ(actual.substr(0, actual.size()-1), expected);
+				EXPECT_EQ(strcmp(noname_message.variables[2].getName().c_str(),	"<no	name>"),	0);
+				EXPECT_EQ(noname_message.variables[2].getType(),	TRICK_STRING);
+				actual	=	noname_message.variables[2].getValue<std::string>();
+				EXPECT_EQ(actual.substr(0,	actual.size()-1),	expected);
 
-    Var variable_noname = noname_message.getVariable(3);
-    EXPECT_EQ(strcmp(variable_noname.getName().c_str(), "<no name>"), 0);
-    EXPECT_EQ(variable_noname.getType(), TRICK_BOOLEAN);
-    EXPECT_EQ(variable_noname.getValue<bool>(), true);
+				Var	variable_noname	=	noname_message.getVariable(3);
+				EXPECT_EQ(strcmp(variable_noname.getName().c_str(),	"<no	name>"),	0);
+				EXPECT_EQ(variable_noname.getType(),	TRICK_BOOLEAN);
+				EXPECT_EQ(variable_noname.getValue<bool>(),	true);
 }
 
-TEST_F (VariableServerTest, BinaryByteswap) {
+TEST_F	(VariableServerTest,	BinaryByteswap)	{
 
-    std::vector<unsigned char> reply;
-    socket << "trick.var_binary()\ntrick.var_byteswap(False)\ntrick.var_add(\"vsx.vst.f\")\ntrick.var_add(\"vsx.vst.j\")\n";
+				std::vector<unsigned	char>	reply;
+				socket	<<	"trick.var_binary()\ntrick.var_byteswap(False)\ntrick.var_add(\"vsx.vst.f\")\ntrick.var_add(\"vsx.vst.j\")\n";
 
-    socket.receive_bytes();
-    reply = socket.receive_bytes();
+				socket.receive_bytes();
+				reply	=	socket.receive_bytes();
 
-    // Test byteswap
+				//	Test	byteswap
 
-    // std::cout << "Message: ";
-    // for (unsigned char byte : reply) {
-    //     std::cout << "0x" << std::setw(2) << std::setfill('0') << std::hex << (int)byte << " ";
-    // }
-    // std::cout << std::endl;
+				//	std::cout	<<	"Message:	";
+				//	for	(unsigned	char	byte	:	reply)	{
+				//					std::cout	<<	"0x"	<<	std::setw(2)	<<	std::setfill('0')	<<	std::hex	<<	(int)byte	<<	"	";
+				//	}
+				//	std::cout	<<	std::endl;
 
-    ParsedBinaryMessage message;
+				ParsedBinaryMessage	message;
 
-    try {
-        message.parse(reply);
-    } catch (const MalformedMessageException& ex) { 
-        FAIL() << "Parser threw an exception: " << ex.what();
-    }
+				try	{
+								message.parse(reply);
+				}	catch	(const	MalformedMessageException&	ex)	{	
+								FAIL()	<<	"Parser	threw	an	exception:	"	<<	ex.what();
+				}
 
-    EXPECT_EQ(message.getMessageType(), 0);
-    ASSERT_EQ(message.getNumVars(), 2);
+				EXPECT_EQ(message.getMessageType(),	0);
+				ASSERT_EQ(message.getNumVars(),	2);
 
-    EXPECT_EQ(strcmp(message.variables[0].getName().c_str(), "vsx.vst.f"), 0);
-    EXPECT_EQ(message.variables[0].getType(), TRICK_UNSIGNED_INTEGER);
-    EXPECT_EQ(message.variables[0].getValue<unsigned int>(), 123456);
+				EXPECT_EQ(strcmp(message.variables[0].getName().c_str(),	"vsx.vst.f"),	0);
+				EXPECT_EQ(message.variables[0].getType(),	TRICK_UNSIGNED_INTEGER);
+				EXPECT_EQ(message.variables[0].getValue<unsigned	int>(),	123456);
 
-    EXPECT_EQ(strcmp(message.variables[1].getName().c_str(), "vsx.vst.j"), 0);
-    EXPECT_EQ(message.variables[1].getType(), TRICK_DOUBLE);
-    EXPECT_EQ(message.variables[1].getValue<double>(), -1234.567890);
+				EXPECT_EQ(strcmp(message.variables[1].getName().c_str(),	"vsx.vst.j"),	0);
+				EXPECT_EQ(message.variables[1].getType(),	TRICK_DOUBLE);
+				EXPECT_EQ(message.variables[1].getValue<double>(),	-1234.567890);
 
-    socket << "trick.var_byteswap(True)\n";
+				socket	<<	"trick.var_byteswap(True)\n";
 
-    socket.receive_bytes();
-    reply = socket.receive_bytes();
+				socket.receive_bytes();
+				reply	=	socket.receive_bytes();
 
-    // std::cout << "Message: ";
-    // for (unsigned char byte : reply) {
-    //     std::cout << "0x" << std::setw(2) << std::setfill('0') << std::hex << (int)byte << " ";
-    // }
-    // std::cout << std::endl;
+				//	std::cout	<<	"Message:	";
+				//	for	(unsigned	char	byte	:	reply)	{
+				//					std::cout	<<	"0x"	<<	std::setw(2)	<<	std::setfill('0')	<<	std::hex	<<	(int)byte	<<	"	";
+				//	}
+				//	std::cout	<<	std::endl;
 
-    ParsedBinaryMessage byteswap_message(true, false);
+				ParsedBinaryMessage	byteswap_message(true,	false);
 
-    try {
-        byteswap_message.parse(reply);
-    } catch (const MalformedMessageException& ex) { 
-        FAIL() << "Parser threw an exception: " << ex.what();
-    }
+				try	{
+								byteswap_message.parse(reply);
+				}	catch	(const	MalformedMessageException&	ex)	{	
+								FAIL()	<<	"Parser	threw	an	exception:	"	<<	ex.what();
+				}
 
-    EXPECT_EQ(byteswap_message.getMessageType(), 0);
-    ASSERT_EQ(byteswap_message.getNumVars(), 2);
+				EXPECT_EQ(byteswap_message.getMessageType(),	0);
+				ASSERT_EQ(byteswap_message.getNumVars(),	2);
 
-    EXPECT_EQ(strcmp(byteswap_message.variables[0].getName().c_str(), "vsx.vst.f"), 0);
-    EXPECT_EQ(byteswap_message.variables[0].getType(), TRICK_UNSIGNED_INTEGER);
-    EXPECT_EQ(byteswap_message.variables[0].getValue<unsigned int>(), 123456);
+				EXPECT_EQ(strcmp(byteswap_message.variables[0].getName().c_str(),	"vsx.vst.f"),	0);
+				EXPECT_EQ(byteswap_message.variables[0].getType(),	TRICK_UNSIGNED_INTEGER);
+				EXPECT_EQ(byteswap_message.variables[0].getValue<unsigned	int>(),	123456);
 
-    EXPECT_EQ(strcmp(byteswap_message.variables[1].getName().c_str(), "vsx.vst.j"), 0);
-    EXPECT_EQ(byteswap_message.variables[1].getType(), TRICK_DOUBLE);
-    EXPECT_EQ(byteswap_message.variables[1].getValue<double>(), -1234.567890);
+				EXPECT_EQ(strcmp(byteswap_message.variables[1].getName().c_str(),	"vsx.vst.j"),	0);
+				EXPECT_EQ(byteswap_message.variables[1].getType(),	TRICK_DOUBLE);
+				EXPECT_EQ(byteswap_message.variables[1].getValue<double>(),	-1234.567890);
 }
 
 
-int main(int argc, char **argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    int result = RUN_ALL_TESTS();
-
-    Socket socket;
-    socket.init("localhost", 40000);
-    
-    if (result == 0) {
-        // Success
-        std::cout << "Exiting peacefully!" << std::endl;
-        socket << "vsx.vst.success() \n";
-    } else {
-        // Failure
-        std::cout << "Exiting with failure!" << std::endl;
-        socket << "vsx.vst.fail() \n";
-    }
-    socket << "trick.stop() \n";
-
-    return result;
+int	main(int	argc,	char	**argv)	{
+				::testing::InitGoogleTest(&argc,	argv);
+				int	result	=	RUN_ALL_TESTS();
+
+				Socket	socket;
+				socket.init("localhost",	40000);
+				
+				if	(result	==	0)	{
+								//	Success
+								std::cout	<<	"Exiting	peacefully!"	<<	std::endl;
+								socket	<<	"vsx.vst.success()	\n";
+				}	else	{
+								//	Failure
+								std::cout	<<	"Exiting	with	failure!"	<<	std::endl;
+								socket	<<	"vsx.vst.fail()	\n";
+				}
+				socket	<<	"trick.stop()	\n";
+
+				return	result;
 }
\ No newline at end of file
diff --git a/test/SIM_test_varserv/models/test_client/test_client_err1.cpp b/test/SIM_test_varserv/models/test_client/test_client_err1.cpp
index 8d4e5d183..ce3add20f 100644
--- a/test/SIM_test_varserv/models/test_client/test_client_err1.cpp
+++ b/test/SIM_test_varserv/models/test_client/test_client_err1.cpp
@@ -1,13 +1,13 @@
-#include "test_client.hh"
+#include	"test_client.hh"
 
-int VariableServerTest::numSession = 0;
+int	VariableServerTest::numSession	=	0;
 
 
-TEST_F (VariableServerTest, SendExecutiveException) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendExecutiveException)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string command = "trick.exec_terminate_with_return(1, \"" + std::string(__FILE__) + "\", " + std::to_string(__LINE__) + ", \"Error termination for testing\")\n";
-    socket << command;
+				std::string	command	=	"trick.exec_terminate_with_return(1,	\""	+	std::string(__FILE__)	+	"\",	"	+	std::to_string(__LINE__)	+	",	\"Error	termination	for	testing\")\n";
+				socket	<<	command;
 }
diff --git a/test/SIM_test_varserv/models/test_client/test_client_err2.cpp b/test/SIM_test_varserv/models/test_client/test_client_err2.cpp
index f32af43d0..ba33f544e 100644
--- a/test/SIM_test_varserv/models/test_client/test_client_err2.cpp
+++ b/test/SIM_test_varserv/models/test_client/test_client_err2.cpp
@@ -1,13 +1,13 @@
-#include "test_client.hh"
+#include	"test_client.hh"
 
-int VariableServerTest::numSession = 0;
+int	VariableServerTest::numSession	=	0;
 
 
-TEST_F (VariableServerTest, SendStdException) {
-    if (socket_status != 0) {
-        FAIL();
-    }
+TEST_F	(VariableServerTest,	SendStdException)	{
+				if	(socket_status	!=	0)	{
+								FAIL();
+				}
 
-    std::string command = "vsx.vst.throw_exception()\n";
-    socket << command;
+				std::string	command	=	"vsx.vst.throw_exception()\n";
+				socket	<<	command;
 }
diff --git a/test/SIM_test_varserv/models/varserv/src/VS.cpp b/test/SIM_test_varserv/models/varserv/src/VS.cpp
index 54a4fbc11..8979c5c75 100644
--- a/test/SIM_test_varserv/models/varserv/src/VS.cpp
+++ b/test/SIM_test_varserv/models/varserv/src/VS.cpp
@@ -1,90 +1,90 @@
-/******************************TRICK HEADER*************************************
-PURPOSE:                     ( Test variable server )
-REFERENCE:                   ( None )
-ASSUMPTIONS AND LIMITATIONS: ( None )
-CLASS:                       ( scheduled )
-LIBRARY DEPENDENCY:          ( VS.o )
-PROGRAMMERS:                 ( (Lindsay Landry) (L3) (9-12-2013) 
-								(Jackie Deans) (CACI) (11-30-2022) )
+/******************************TRICK	HEADER*************************************
+PURPOSE:																					(	Test	variable	server	)
+REFERENCE:																			(	None	)
+ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+CLASS:																							(	scheduled	)
+LIBRARY	DEPENDENCY:										(	VS.o	)
+PROGRAMMERS:																	(	(Lindsay	Landry)	(L3)	(9-12-2013)	
+								(Jackie	Deans)	(CACI)	(11-30-2022)	)
 *******************************************************************************/
-#include <iostream>
-#include <stdexcept>
-#include <limits>
-
-#include "../include/VS.hh"
-#include "trick/exec_proto.h"
-
-VSTest::VSTest() {}
-VSTest::~VSTest() {}
-
-int VSTest::default_vars() {
-
-	a = 'a';            //char
-	b = 'b';            //unsigned char
-	c = -1234;          //short
-	d = 1234;           //unsigned short
-	e = -123456;        //int
-	f = 123456;         //unsigned int
-	g = -1234567;       //long
-	h = 123456789;      //unsigned long
-	i = 1234.5678;      //float
-	j = -1234.567890;   //double
-	k = -12345678912345;//long long
-	l = 12345678912345; //unsigned long
-	m = true;          //boolean
-	for (int i = 0; i < 5; i++) {
-		n[i] = i;
+#include	<iostream>
+#include	<stdexcept>
+#include	<limits>
+
+#include	"../include/VS.hh"
+#include	"trick/exec_proto.h"
+
+VSTest::VSTest()	{}
+VSTest::~VSTest()	{}
+
+int	VSTest::default_vars()	{
+
+	a	=	'a';												//char
+	b	=	'b';												//unsigned	char
+	c	=	-1234;										//short
+	d	=	1234;											//unsigned	short
+	e	=	-123456;								//int
+	f	=	123456;									//unsigned	int
+	g	=	-1234567;							//long
+	h	=	123456789;						//unsigned	long
+	i	=	1234.5678;						//float
+	j	=	-1234.567890;			//double
+	k	=	-12345678912345;//long	long
+	l	=	12345678912345;	//unsigned	long
+	m	=	true;										//boolean
+	for	(int	i	=	0;	i	<	5;	i++)	{
+		n[i]	=	i;
 	}
-	o = std::string("You will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking.");
-	p = "I am already far north of London, and as I walk in the streets of Petersburgh, I feel a cold northern breeze play upon my cheeks, which braces my nerves and fills me with delight. Do you understand this feeling?";
-	q = L"This breeze, which has travelled from the regions towards which I am advancing, gives me a foretaste of those icy climes. Inspirited by this wind of promise, my daydreams become more fervent and vivid.";
+	o	=	std::string("You	will	rejoice	to	hear	that	no	disaster	has	accompanied	the	commencement	of	an	enterprise	which	you	have	regarded	with	such	evil	forebodings.	I	arrived	here	yesterday,	and	my	first	task	is	to	assure	my	dear	sister	of	my	welfare	and	increasing	confidence	in	the	success	of	my	undertaking.");
+	p	=	"I	am	already	far	north	of	London,	and	as	I	walk	in	the	streets	of	Petersburgh,	I	feel	a	cold	northern	breeze	play	upon	my	cheeks,	which	braces	my	nerves	and	fills	me	with	delight.	Do	you	understand	this	feeling?";
+	q	=	L"This	breeze,	which	has	travelled	from	the	regions	towards	which	I	am	advancing,	gives	me	a	foretaste	of	those	icy	climes.	Inspirited	by	this	wind	of	promise,	my	daydreams	become	more	fervent	and	vivid.";
 
-	for (int i = 0; i < 4000; i++) {
-		large_arr[i] = i;
+	for	(int	i	=	0;	i	<	4000;	i++)	{
+		large_arr[i]	=	i;
 	}
 
-	/* Mixed Types */
-	// 3,-128,0,2112
-    my_bitfield.var1 = (1 << (3 - 1)) - 1;
-    my_bitfield.var2 = -(1 << (8 - 1));
-    my_bitfield.var3 = 0;
-    my_bitfield.var4 = (1 << (12 - 1)) + (1 << 12/2);;
+	/*	Mixed	Types	*/
+	//	3,-128,0,2112
+				my_bitfield.var1	=	(1	<<	(3	-	1))	-	1;
+				my_bitfield.var2	=	-(1	<<	(8	-	1));
+				my_bitfield.var3	=	0;
+				my_bitfield.var4	=	(1	<<	(12	-	1))	+	(1	<<	12/2);;
 
 
-	blocked_from_input = 500;
-	blocked_from_output = 1000;
+	blocked_from_input	=	500;
+	blocked_from_output	=	1000;
 
-	return 0;
+	return	0;
 }
 
-int VSTest::init() {
-	status = 2; 
-	return (0);
+int	VSTest::init()	{
+	status	=	2;	
+	return	(0);
 }
 
-int VSTest::fail() {
-    status = 1; 
-	return 0;
+int	VSTest::fail()	{
+				status	=	1;	
+	return	0;
 }
 
-int VSTest::success() {
-    status = 0;
-	return 0; 
+int	VSTest::success()	{
+				status	=	0;
+	return	0;	
 }
 
-void VSTest::throw_exception() {
-	throw std::logic_error("Pretend an error has occured for testing");
+void	VSTest::throw_exception()	{
+	throw	std::logic_error("Pretend	an	error	has	occured	for	testing");
 }
 
-int VSTest::shutdown() {
-	std::cout << "Shutting down with status: " << status << " Message: " << status_messages[status] << std::endl;
+int	VSTest::shutdown()	{
+	std::cout	<<	"Shutting	down	with	status:	"	<<	status	<<	"	Message:	"	<<	status_messages[status]	<<	std::endl;
 
-	// Check that the blocked_from_input variable hasnt changed
-	if (blocked_from_input != 500 || blocked_from_output != 0) {
-		status = 1;
+	//	Check	that	the	blocked_from_input	variable	hasnt	changed
+	if	(blocked_from_input	!=	500	||	blocked_from_output	!=	0)	{
+		status	=	1;
 	}
 
-    exec_terminate_with_return( status , __FILE__ , __LINE__ , status_messages[status] ) ;
+				exec_terminate_with_return(	status	,	__FILE__	,	__LINE__	,	status_messages[status]	)	;
 	
 	return(0);
 }
\ No newline at end of file
diff --git a/test/SIM_threads/models/threads/src/Thread1.cpp b/test/SIM_threads/models/threads/src/Thread1.cpp
index 29cd80d04..a407fc87b 100644
--- a/test/SIM_threads/models/threads/src/Thread1.cpp
+++ b/test/SIM_threads/models/threads/src/Thread1.cpp
@@ -1,16 +1,16 @@
 /*****************************************************************************
 PURPOSE:
-    (Multi-Threading)
+				(Multi-Threading)
 *****************************************************************************/
 
-#include <iostream>
-#include "../include/Thread1.h"
-#include "sim_services/Clock/include/clock_proto.h"
+#include	<iostream>
+#include	"../include/Thread1.h"
+#include	"sim_services/Clock/include/clock_proto.h"
 
-Thread1::Thread1(int in_usec) : m_iBusyUSecs(in_usec)
+Thread1::Thread1(int	in_usec)	:	m_iBusyUSecs(in_usec)
 {
-    m_bBusy = false;
-    m_iCount = 0;
+				m_bBusy	=	false;
+				m_iCount	=	0;
 }
 
 Thread1::~Thread1()
@@ -18,20 +18,20 @@ Thread1::~Thread1()
 
 }
 
-int Thread1::Step()
+int	Thread1::Step()
 {
-    long long start_time , current_time ;
+				long	long	start_time	,	current_time	;
 
-    start_time = clock_wall_time() ;
-    if(m_bBusy)
-    {
-        current_time = clock_wall_time() ;
-        while(current_time - start_time < m_iBusyUSecs ) // Busy loop
-        {
-            current_time = clock_wall_time() ;
-        }
-    }
-    m_iCount += 1;
-    return 0;
+				start_time	=	clock_wall_time()	;
+				if(m_bBusy)
+				{
+								current_time	=	clock_wall_time()	;
+								while(current_time	-	start_time	<	m_iBusyUSecs	)	//	Busy	loop
+								{
+												current_time	=	clock_wall_time()	;
+								}
+				}
+				m_iCount	+=	1;
+				return	0;
 }
 
diff --git a/test/SIM_threads/models/threads/src/Thread2.cpp b/test/SIM_threads/models/threads/src/Thread2.cpp
index 23b21ba97..0eb1722a4 100644
--- a/test/SIM_threads/models/threads/src/Thread2.cpp
+++ b/test/SIM_threads/models/threads/src/Thread2.cpp
@@ -1,18 +1,18 @@
 /*****************************************************************************
 PURPOSE:
-    (Multi-Threading)
+				(Multi-Threading)
 *****************************************************************************/
 
-#include <iostream>
-#include <unistd.h>
-#include "../include/Thread2.h"
-#include "sim_services/Clock/include/GetTimeOfDayClock.hh"
+#include	<iostream>
+#include	<unistd.h>
+#include	"../include/Thread2.h"
+#include	"sim_services/Clock/include/GetTimeOfDayClock.hh"
 
 Thread2::Thread2()
 {
-    m_bBusy = false;
-    m_iBusyNSecs = 48000000;
-    m_iCount = 0;
+				m_bBusy	=	false;
+				m_iBusyNSecs	=	48000000;
+				m_iCount	=	0;
 }
 
 Thread2::~Thread2()
@@ -20,50 +20,50 @@ Thread2::~Thread2()
 
 }
 
-int Thread2::Step()
+int	Thread2::Step()
 {
-    STRUCT_TIME tp;
+				STRUCT_TIME	tp;
 
-    /*if(m_bSleep)
-    {
-        struct timespec reg, rem;
-        reg.tv_sec = m_iSleepSecs;
-        reg.tv_nsec = m_iSleepNSecs;
-        nanosleep(&reg,&rem);
-    }*/
-    bool bCont = true;
-    struct timespec ts_Start,ts_Current,ts_Difference;
-    //clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-//    GETTIME(CLOCK_THREAD_CPUTIME_ID, &tp);
-    GETTIME(&tp);
-    ts_Start.tv_sec  = tp.tv_sec;
-    ts_Start.tv_nsec = FRACTION_SECOND * 1000;
-    if(m_bBusy)
-    {
-        while(bCont) // Busy loop
-        {
-            //clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Current);
-//            GETTIME(CLOCK_THREAD_CPUTIME_ID, &tp);
-            GETTIME(&tp);
-            ts_Current.tv_sec  = tp.tv_sec;
-            ts_Current.tv_nsec = FRACTION_SECOND * 1000;
-            if ((ts_Current.tv_nsec-ts_Start.tv_nsec)<0)
-            {
-                ts_Difference.tv_sec = ts_Current.tv_sec-ts_Start.tv_sec-1;
-                ts_Difference.tv_nsec = 1000000000+ts_Current.tv_nsec-ts_Start.tv_nsec;
-            }
-            else
-            {
-                ts_Difference.tv_sec = ts_Current.tv_sec-ts_Start.tv_sec;
-                ts_Difference.tv_nsec = ts_Current.tv_nsec-ts_Start.tv_nsec;
-            }
-            if(ts_Difference.tv_nsec >= m_iBusyNSecs)
-            {
-                bCont = false;
-            }
-        }
-    }
-    m_iCount += 2;
-    return 0;
+				/*if(m_bSleep)
+				{
+								struct	timespec	reg,	rem;
+								reg.tv_sec	=	m_iSleepSecs;
+								reg.tv_nsec	=	m_iSleepNSecs;
+								nanosleep(&reg,&rem);
+				}*/
+				bool	bCont	=	true;
+				struct	timespec	ts_Start,ts_Current,ts_Difference;
+				//clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+//				GETTIME(CLOCK_THREAD_CPUTIME_ID,	&tp);
+				GETTIME(&tp);
+				ts_Start.tv_sec		=	tp.tv_sec;
+				ts_Start.tv_nsec	=	FRACTION_SECOND	*	1000;
+				if(m_bBusy)
+				{
+								while(bCont)	//	Busy	loop
+								{
+												//clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Current);
+//												GETTIME(CLOCK_THREAD_CPUTIME_ID,	&tp);
+												GETTIME(&tp);
+												ts_Current.tv_sec		=	tp.tv_sec;
+												ts_Current.tv_nsec	=	FRACTION_SECOND	*	1000;
+												if	((ts_Current.tv_nsec-ts_Start.tv_nsec)<0)
+												{
+																ts_Difference.tv_sec	=	ts_Current.tv_sec-ts_Start.tv_sec-1;
+																ts_Difference.tv_nsec	=	1000000000+ts_Current.tv_nsec-ts_Start.tv_nsec;
+												}
+												else
+												{
+																ts_Difference.tv_sec	=	ts_Current.tv_sec-ts_Start.tv_sec;
+																ts_Difference.tv_nsec	=	ts_Current.tv_nsec-ts_Start.tv_nsec;
+												}
+												if(ts_Difference.tv_nsec	>=	m_iBusyNSecs)
+												{
+																bCont	=	false;
+												}
+								}
+				}
+				m_iCount	+=	2;
+				return	0;
 }
 
diff --git a/test/SIM_threads/models/threads/src/Thread3.cpp b/test/SIM_threads/models/threads/src/Thread3.cpp
index b1556a8de..f7aca905c 100644
--- a/test/SIM_threads/models/threads/src/Thread3.cpp
+++ b/test/SIM_threads/models/threads/src/Thread3.cpp
@@ -1,17 +1,17 @@
 /*****************************************************************************
 PURPOSE:
-    (Multi-Threading)
+				(Multi-Threading)
 *****************************************************************************/
 
-#include <iostream>
-#include "../include/Thread3.h"
-#include "sim_services/Clock/include/GetTimeOfDayClock.hh"
+#include	<iostream>
+#include	"../include/Thread3.h"
+#include	"sim_services/Clock/include/GetTimeOfDayClock.hh"
 
 Thread3::Thread3()
 {
-    m_bBusy = false;;
-    m_iBusyNSecs = 96000000;
-    m_iCount = 0;
+				m_bBusy	=	false;;
+				m_iBusyNSecs	=	96000000;
+				m_iCount	=	0;
 }
 
 Thread3::~Thread3()
@@ -19,48 +19,48 @@ Thread3::~Thread3()
 
 }
 
-int Thread3::Step()
+int	Thread3::Step()
 {
-    STRUCT_TIME tp;
+				STRUCT_TIME	tp;
 
-    /*if(m_bSleep)
-    {
-        struct timespec reg, rem;
-        reg.tv_sec = m_iSleepSecs;
-        reg.tv_nsec = m_iSleepNSecs;
-        nanosleep(&reg,&rem);
-    }*/
-    bool bCont = true;
-    struct timespec ts_Start,ts_Current,ts_Difference;
-    //clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-    GETTIME(&tp);
-    ts_Start.tv_sec  = tp.tv_sec;
-    ts_Start.tv_nsec = FRACTION_SECOND * 1000;
-    if(m_bBusy)
-    {
-        while(bCont) // Busy loop
-        {
-            //clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Current);
-            GETTIME(&tp);
-            ts_Current.tv_sec  = tp.tv_sec;
-            ts_Current.tv_nsec = FRACTION_SECOND * 1000;
-            if ((ts_Current.tv_nsec-ts_Start.tv_nsec)<0)
-            {
-                ts_Difference.tv_sec = ts_Current.tv_sec-ts_Start.tv_sec-1;
-                ts_Difference.tv_nsec = 1000000000+ts_Current.tv_nsec-ts_Start.tv_nsec;
-            }
-            else
-            {
-                ts_Difference.tv_sec = ts_Current.tv_sec-ts_Start.tv_sec;
-                ts_Difference.tv_nsec = ts_Current.tv_nsec-ts_Start.tv_nsec;
-            }
-            if(ts_Difference.tv_nsec >= m_iBusyNSecs)
-            {
-                bCont = false;
-            }
-        }
-    }
-    m_iCount += 4;
-    return 0;
+				/*if(m_bSleep)
+				{
+								struct	timespec	reg,	rem;
+								reg.tv_sec	=	m_iSleepSecs;
+								reg.tv_nsec	=	m_iSleepNSecs;
+								nanosleep(&reg,&rem);
+				}*/
+				bool	bCont	=	true;
+				struct	timespec	ts_Start,ts_Current,ts_Difference;
+				//clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+				GETTIME(&tp);
+				ts_Start.tv_sec		=	tp.tv_sec;
+				ts_Start.tv_nsec	=	FRACTION_SECOND	*	1000;
+				if(m_bBusy)
+				{
+								while(bCont)	//	Busy	loop
+								{
+												//clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Current);
+												GETTIME(&tp);
+												ts_Current.tv_sec		=	tp.tv_sec;
+												ts_Current.tv_nsec	=	FRACTION_SECOND	*	1000;
+												if	((ts_Current.tv_nsec-ts_Start.tv_nsec)<0)
+												{
+																ts_Difference.tv_sec	=	ts_Current.tv_sec-ts_Start.tv_sec-1;
+																ts_Difference.tv_nsec	=	1000000000+ts_Current.tv_nsec-ts_Start.tv_nsec;
+												}
+												else
+												{
+																ts_Difference.tv_sec	=	ts_Current.tv_sec-ts_Start.tv_sec;
+																ts_Difference.tv_nsec	=	ts_Current.tv_nsec-ts_Start.tv_nsec;
+												}
+												if(ts_Difference.tv_nsec	>=	m_iBusyNSecs)
+												{
+																bCont	=	false;
+												}
+								}
+				}
+				m_iCount	+=	4;
+				return	0;
 }
 
diff --git a/trick_sims/Cannon/models/httpMethods/TimeSession.cpp b/trick_sims/Cannon/models/httpMethods/TimeSession.cpp
index 8d11d423d..53e220ecb 100644
--- a/trick_sims/Cannon/models/httpMethods/TimeSession.cpp
+++ b/trick_sims/Cannon/models/httpMethods/TimeSession.cpp
@@ -1,56 +1,56 @@
-#include <stdio.h>
-#include <time.h>
-#include <iostream>
-#include "TimeSession.hh"
-#include <cstring>
-
-// CONSTRUCTOR
-TimeSession::TimeSession( struct mg_connection *nc ) : WebSocketSession(nc) {
-    time(&now);
+#include	<stdio.h>
+#include	<time.h>
+#include	<iostream>
+#include	"TimeSession.hh"
+#include	<cstring>
+
+//	CONSTRUCTOR
+TimeSession::TimeSession(	struct	mg_connection	*nc	)	:	WebSocketSession(nc)	{
+				time(&now);
 }
 
-// DESTRUCTOR
-TimeSession::~TimeSession() {}
+//	DESTRUCTOR
+TimeSession::~TimeSession()	{}
 
-void TimeSession::marshallData() {
-    time(&now);
+void	TimeSession::marshallData()	{
+				time(&now);
 }
 
-void TimeSession::sendMessage() {
-
-    char message[1024];
-    struct tm *theTime;
-    if (zone == TimeSession::LOCAL) {
-        theTime = localtime(&now);
-    } else {
-        theTime = gmtime(&now);
-    }
-    int hours   = theTime->tm_hour;
-    int minutes = theTime->tm_min;
-    int seconds = theTime->tm_sec;
-    int day     = theTime->tm_mday;
-    int month   = theTime->tm_mon + 1;
-    int year    = theTime->tm_year + 1900;
-
-    snprintf(message, sizeof(message), "Time: %02d:%02d:%02d Date: %02d/%02d/%d\n", hours, minutes, seconds, month, day, year);
-    mg_websocket_write(connection, MG_WEBSOCKET_OPCODE_TEXT, message, strlen(message));
+void	TimeSession::sendMessage()	{
+
+				char	message[1024];
+				struct	tm	*theTime;
+				if	(zone	==	TimeSession::LOCAL)	{
+								theTime	=	localtime(&now);
+				}	else	{
+								theTime	=	gmtime(&now);
+				}
+				int	hours			=	theTime->tm_hour;
+				int	minutes	=	theTime->tm_min;
+				int	seconds	=	theTime->tm_sec;
+				int	day					=	theTime->tm_mday;
+				int	month			=	theTime->tm_mon	+	1;
+				int	year				=	theTime->tm_year	+	1900;
+
+				snprintf(message,	sizeof(message),	"Time:	%02d:%02d:%02d	Date:	%02d/%02d/%d\n",	hours,	minutes,	seconds,	month,	day,	year);
+				mg_websocket_write(connection,	MG_WEBSOCKET_OPCODE_TEXT,	message,	strlen(message));
 }
 
-int TimeSession::handleMessage(const std::string& client_msg) {
+int	TimeSession::handleMessage(const	std::string&	client_msg)	{
 
-   if (client_msg.compare("GMT") == 0) {
-       zone = TimeSession::GMT;
-   } else if (client_msg.compare("LOCAL") == 0) {
-       zone = TimeSession::LOCAL;
-   } else {
-      std::cerr << "ERROR: Unknown command \"" << client_msg << "\"." << std::endl;
-   }
-   return 0;
+			if	(client_msg.compare("GMT")	==	0)	{
+							zone	=	TimeSession::GMT;
+			}	else	if	(client_msg.compare("LOCAL")	==	0)	{
+							zone	=	TimeSession::LOCAL;
+			}	else	{
+						std::cerr	<<	"ERROR:	Unknown	command	\""	<<	client_msg	<<	"\"."	<<	std::endl;
+			}
+			return	0;
 }
 
-// WebSocketSessionMaker function for a TimeSession.
-WebSocketSession* makeTimeSession( struct mg_connection *nc ) {
-    std::cerr << "DEBUG: Creating new TimeSession." << std::endl;
-    return new TimeSession(nc);
+//	WebSocketSessionMaker	function	for	a	TimeSession.
+WebSocketSession*	makeTimeSession(	struct	mg_connection	*nc	)	{
+				std::cerr	<<	"DEBUG:	Creating	new	TimeSession."	<<	std::endl;
+				return	new	TimeSession(nc);
 }
 
diff --git a/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp b/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp
index da32fea03..58b969847 100644
--- a/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp
+++ b/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp
@@ -1,83 +1,83 @@
 
-#include <ode/ode.h>
-#include <drawstuff/drawstuff.h>
+#include	<ode/ode.h>
+#include	<drawstuff/drawstuff.h>
 
-#include "Ball.hh"
-#include "trick/memorymanager_c_intf.h"
+#include	"Ball.hh"
+#include	"trick/memorymanager_c_intf.h"
 
-Ball::Ball() {}
+Ball::Ball()	{}
 
-int Ball::init() {
-    dInitODE ();
-    world = dWorldCreate ();
-    space = dHashSpaceCreate (0);
-    dWorldSetGravity (world,0,0,-9.81);
-    dWorldSetCFM (world,1e-5);
-    dCreatePlane (space,0,0,1,0);
-    contactgroup = dJointGroupCreate (0);
+int	Ball::init()	{
+				dInitODE	();
+				world	=	dWorldCreate	();
+				space	=	dHashSpaceCreate	(0);
+				dWorldSetGravity	(world,0,0,-9.81);
+				dWorldSetCFM	(world,1e-5);
+				dCreatePlane	(space,0,0,1,0);
+				contactgroup	=	dJointGroupCreate	(0);
 
-    body = dBodyCreate (world);
-    geom = dCreateSphere (space,0.5);
-    dMassSetSphere (&m,1,0.5);
-    dBodySetMass (body,&m);
-    dGeomSetBody (geom,body);
-    // set initial position
-    dBodySetPosition (body,0,0,3);
+				body	=	dBodyCreate	(world);
+				geom	=	dCreateSphere	(space,0.5);
+				dMassSetSphere	(&m,1,0.5);
+				dBodySetMass	(body,&m);
+				dGeomSetBody	(geom,body);
+				//	set	initial	position
+				dBodySetPosition	(body,0,0,3);
 
-    pos = (dReal *)dGeomGetPosition(geom) ;
-    TMM_declare_ext_var_1d( pos , "float" , 3) ;
+				pos	=	(dReal	*)dGeomGetPosition(geom)	;
+				TMM_declare_ext_var_1d(	pos	,	"float"	,	3)	;
 
-    add_object() ;
+				add_object()	;
 
-    return 0 ;
+				return	0	;
 }
 
-int Ball::step( double time_step) {
-    // find collisions and add contact joints
-    dSpaceCollide (space,this,&Ball::nearCallback);
-    // step the simulation
-    //dWorldQuickStep (world,time_step);
-    dWorldStep (world,time_step);
-    // remove all contact joints
-    dJointGroupEmpty (contactgroup);
-    return 0 ;
+int	Ball::step(	double	time_step)	{
+				//	find	collisions	and	add	contact	joints
+				dSpaceCollide	(space,this,&Ball::nearCallback);
+				//	step	the	simulation
+				//dWorldQuickStep	(world,time_step);
+				dWorldStep	(world,time_step);
+				//	remove	all	contact	joints
+				dJointGroupEmpty	(contactgroup);
+				return	0	;
 }
 
-int Ball::shutdown() {
-    // clean up
-    dJointGroupDestroy (contactgroup);
-    dSpaceDestroy (space);
-    dWorldDestroy (world);
-    dCloseODE();
-    return 0 ;
+int	Ball::shutdown()	{
+				//	clean	up
+				dJointGroupDestroy	(contactgroup);
+				dSpaceDestroy	(space);
+				dWorldDestroy	(world);
+				dCloseODE();
+				return	0	;
 }
 
-int Ball::draw() {
-    dsDrawSphere (dGeomGetPosition(geom),dGeomGetRotation(geom),dGeomSphereGetRadius(geom));
-    return 0 ;
+int	Ball::draw()	{
+				dsDrawSphere	(dGeomGetPosition(geom),dGeomGetRotation(geom),dGeomSphereGetRadius(geom));
+				return	0	;
 }
 
-// this is called by dSpaceCollide when two objects in space are
-// potentially colliding.
-void Ball::nearCallback (void * void_ball, dGeomID o1, dGeomID o2) {
+//	this	is	called	by	dSpaceCollide	when	two	objects	in	space	are
+//	potentially	colliding.
+void	Ball::nearCallback	(void	*	void_ball,	dGeomID	o1,	dGeomID	o2)	{
 
-    Ball * bp = (Ball *)void_ball ;
+				Ball	*	bp	=	(Ball	*)void_ball	;
 
-    dBodyID b1 = dGeomGetBody(o1);
-    dBodyID b2 = dGeomGetBody(o2);
-    dContact contact;
-    contact.surface.mode = dContactBounce | dContactSoftCFM;
-    // friction parameter
-    contact.surface.mu = dInfinity;
-    // bounce is the amount of "bouncyness".
-    contact.surface.bounce = 0.999;
-    // bounce_vel is the minimum incoming velocity to cause a bounce
-    contact.surface.bounce_vel = 0.1;
-    // constraint force mixing parameter
-    contact.surface.soft_cfm = 0.001;
-    if (int numc = dCollide (o1,o2,1,&contact.geom,sizeof(dContact))) {
-        dJointID c = dJointCreateContact (bp->world,bp->contactgroup,&contact);
-        dJointAttach (c,b1,b2);
-    }
+				dBodyID	b1	=	dGeomGetBody(o1);
+				dBodyID	b2	=	dGeomGetBody(o2);
+				dContact	contact;
+				contact.surface.mode	=	dContactBounce	|	dContactSoftCFM;
+				//	friction	parameter
+				contact.surface.mu	=	dInfinity;
+				//	bounce	is	the	amount	of	"bouncyness".
+				contact.surface.bounce	=	0.999;
+				//	bounce_vel	is	the	minimum	incoming	velocity	to	cause	a	bounce
+				contact.surface.bounce_vel	=	0.1;
+				//	constraint	force	mixing	parameter
+				contact.surface.soft_cfm	=	0.001;
+				if	(int	numc	=	dCollide	(o1,o2,1,&contact.geom,sizeof(dContact)))	{
+								dJointID	c	=	dJointCreateContact	(bp->world,bp->contactgroup,&contact);
+								dJointAttach	(c,b1,b2);
+				}
 }
 
diff --git a/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp b/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp
index e3cb9c598..3e7041118 100644
--- a/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp
+++ b/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp
@@ -1,217 +1,217 @@
 
-#include <ode/ode.h>
-#include <drawstuff/drawstuff.h>
-
-#include "Buggy.hh"
-#include "trick/memorymanager_c_intf.h"
-
-Buggy::Buggy() :
- gravity(-0.5),
- chassis_length(0.7),
- chassis_width(0.5),
- chassis_height(0.2),
- chassis_mass(1.0),
- wheel_radius(.18),
- wheel_width(0.02),
- wheel_mass(0.2),
- start_z(0.5)
- {}
-
-int Buggy::init() {
-
-    dMass m;
-    int i ;
-
-    dInitODE2(0);
-    world = dWorldCreate ();
-    space = dHashSpaceCreate (0);
-    contactgroup = dJointGroupCreate(0);
-
-    dWorldSetGravity (world,0,0,gravity);
-
-    ground = dCreatePlane (space,0,0,1,0);
-
-    // chassis body
-    body[0] = dBodyCreate (world);
-    dBodySetPosition (body[0],0,0,start_z);
-    dMassSetBox (&m,1,chassis_length,chassis_width,chassis_height);
-    dMassAdjust (&m,chassis_mass);
-    dBodySetMass (body[0],&m);
-    box[0] = dCreateBox (0,chassis_length,chassis_width,chassis_height);
-    dGeomSetBody (box[0],body[0]);
-
-    buggy_body_pos = (dReal *)dGeomGetPosition(box[0]) ;
-    TMM_declare_ext_var_1d( buggy_body_pos , "float" , 3) ;
-
-    // wheel bodies
-    for (i=1; i<=3; i++) {
-        body[i] = dBodyCreate (world);
-        dQuaternion q;
-        dQFromAxisAndAngle (q,1,0,0,M_PI*0.5);
-        dBodySetQuaternion (body[i],q);
-        dMassSetSphere (&m,1,wheel_radius);
-        dMassAdjust (&m,wheel_mass);
-        dBodySetMass (body[i],&m);
-        sphere[i-1] = dCreateSphere (0,wheel_radius);
-        dGeomSetBody (sphere[i-1],body[i]);
-    }
-    dBodySetPosition (body[1],0.5*chassis_length,0,start_z-chassis_height*0.5);
-    dBodySetPosition (body[2],-0.5*chassis_length, chassis_width*0.5,start_z-chassis_height*0.5);
-    dBodySetPosition (body[3],-0.5*chassis_length,-chassis_width*0.5,start_z-chassis_height*0.5);
-
-    // front and back wheel hinges
-    for (i=0; i<3; i++) {
-        joint[i] = dJointCreateHinge2 (world,0);
-        dJointAttach (joint[i],body[0],body[i+1]);
-        const dReal *a = dBodyGetPosition (body[i+1]);
-        dJointSetHinge2Anchor (joint[i],a[0],a[1],a[2]);
-        dJointSetHinge2Axis1 (joint[i],0,0,1);
-        dJointSetHinge2Axis2 (joint[i],0,1,0);
-    }
-
-    // set joint suspension
-    for (i=0; i<3; i++) {
-        dJointSetHinge2Param (joint[i],dParamSuspensionERP,0.4);
-        dJointSetHinge2Param (joint[i],dParamSuspensionCFM,0.8);
-    }
-
-    // lock back wheels along the steering axis
-    for (i=1; i<3; i++) {
-        // set stops to make sure wheels always stay in alignment
-        dJointSetHinge2Param (joint[i],dParamLoStop,0);
-        dJointSetHinge2Param (joint[i],dParamHiStop,0);
-    }
-
-    // create car space and add it to the top level space
-    car_space = dSimpleSpaceCreate (space);
-    dSpaceSetCleanup (car_space,0);
-    dSpaceAdd (car_space,box[0]);
-    dSpaceAdd (car_space,sphere[0]);
-    dSpaceAdd (car_space,sphere[1]);
-    dSpaceAdd (car_space,sphere[2]);
-
-    // environment
-    ground_box = dCreateBox (space,2,1.5,1);
-    dMatrix3 R;
-    dRFromAxisAndAngle (R,0,1,0,-0.15);
-    dGeomSetPosition (ground_box,2,0,-0.34);
-    dGeomSetRotation (ground_box,R);
-
-    // Add this object to DrawStuff
-    add_object() ;
-    return 0 ;
+#include	<ode/ode.h>
+#include	<drawstuff/drawstuff.h>
+
+#include	"Buggy.hh"
+#include	"trick/memorymanager_c_intf.h"
+
+Buggy::Buggy()	:
+	gravity(-0.5),
+	chassis_length(0.7),
+	chassis_width(0.5),
+	chassis_height(0.2),
+	chassis_mass(1.0),
+	wheel_radius(.18),
+	wheel_width(0.02),
+	wheel_mass(0.2),
+	start_z(0.5)
+	{}
+
+int	Buggy::init()	{
+
+				dMass	m;
+				int	i	;
+
+				dInitODE2(0);
+				world	=	dWorldCreate	();
+				space	=	dHashSpaceCreate	(0);
+				contactgroup	=	dJointGroupCreate(0);
+
+				dWorldSetGravity	(world,0,0,gravity);
+
+				ground	=	dCreatePlane	(space,0,0,1,0);
+
+				//	chassis	body
+				body[0]	=	dBodyCreate	(world);
+				dBodySetPosition	(body[0],0,0,start_z);
+				dMassSetBox	(&m,1,chassis_length,chassis_width,chassis_height);
+				dMassAdjust	(&m,chassis_mass);
+				dBodySetMass	(body[0],&m);
+				box[0]	=	dCreateBox	(0,chassis_length,chassis_width,chassis_height);
+				dGeomSetBody	(box[0],body[0]);
+
+				buggy_body_pos	=	(dReal	*)dGeomGetPosition(box[0])	;
+				TMM_declare_ext_var_1d(	buggy_body_pos	,	"float"	,	3)	;
+
+				//	wheel	bodies
+				for	(i=1;	i<=3;	i++)	{
+								body[i]	=	dBodyCreate	(world);
+								dQuaternion	q;
+								dQFromAxisAndAngle	(q,1,0,0,M_PI*0.5);
+								dBodySetQuaternion	(body[i],q);
+								dMassSetSphere	(&m,1,wheel_radius);
+								dMassAdjust	(&m,wheel_mass);
+								dBodySetMass	(body[i],&m);
+								sphere[i-1]	=	dCreateSphere	(0,wheel_radius);
+								dGeomSetBody	(sphere[i-1],body[i]);
+				}
+				dBodySetPosition	(body[1],0.5*chassis_length,0,start_z-chassis_height*0.5);
+				dBodySetPosition	(body[2],-0.5*chassis_length,	chassis_width*0.5,start_z-chassis_height*0.5);
+				dBodySetPosition	(body[3],-0.5*chassis_length,-chassis_width*0.5,start_z-chassis_height*0.5);
+
+				//	front	and	back	wheel	hinges
+				for	(i=0;	i<3;	i++)	{
+								joint[i]	=	dJointCreateHinge2	(world,0);
+								dJointAttach	(joint[i],body[0],body[i+1]);
+								const	dReal	*a	=	dBodyGetPosition	(body[i+1]);
+								dJointSetHinge2Anchor	(joint[i],a[0],a[1],a[2]);
+								dJointSetHinge2Axis1	(joint[i],0,0,1);
+								dJointSetHinge2Axis2	(joint[i],0,1,0);
+				}
+
+				//	set	joint	suspension
+				for	(i=0;	i<3;	i++)	{
+								dJointSetHinge2Param	(joint[i],dParamSuspensionERP,0.4);
+								dJointSetHinge2Param	(joint[i],dParamSuspensionCFM,0.8);
+				}
+
+				//	lock	back	wheels	along	the	steering	axis
+				for	(i=1;	i<3;	i++)	{
+								//	set	stops	to	make	sure	wheels	always	stay	in	alignment
+								dJointSetHinge2Param	(joint[i],dParamLoStop,0);
+								dJointSetHinge2Param	(joint[i],dParamHiStop,0);
+				}
+
+				//	create	car	space	and	add	it	to	the	top	level	space
+				car_space	=	dSimpleSpaceCreate	(space);
+				dSpaceSetCleanup	(car_space,0);
+				dSpaceAdd	(car_space,box[0]);
+				dSpaceAdd	(car_space,sphere[0]);
+				dSpaceAdd	(car_space,sphere[1]);
+				dSpaceAdd	(car_space,sphere[2]);
+
+				//	environment
+				ground_box	=	dCreateBox	(space,2,1.5,1);
+				dMatrix3	R;
+				dRFromAxisAndAngle	(R,0,1,0,-0.15);
+				dGeomSetPosition	(ground_box,2,0,-0.34);
+				dGeomSetRotation	(ground_box,R);
+
+				//	Add	this	object	to	DrawStuff
+				add_object()	;
+				return	0	;
 }
 
-int Buggy::step(double time_step) {
-    dJointSetHinge2Param (joint[0],dParamVel2,-speed);
-    dJointSetHinge2Param (joint[0],dParamFMax2,0.1);
+int	Buggy::step(double	time_step)	{
+				dJointSetHinge2Param	(joint[0],dParamVel2,-speed);
+				dJointSetHinge2Param	(joint[0],dParamFMax2,0.1);
 
-    // steering
-    dReal v = steer - dJointGetHinge2Angle1 (joint[0]);
-    if (v > 0.1) v = 0.1;
-    if (v < -0.1) v = -0.1;
-    v *= 10.0;
-    dJointSetHinge2Param (joint[0],dParamVel,v);
-    dJointSetHinge2Param (joint[0],dParamFMax,0.2);
-    dJointSetHinge2Param (joint[0],dParamLoStop,-0.75);
-    dJointSetHinge2Param (joint[0],dParamHiStop,0.75);
-    dJointSetHinge2Param (joint[0],dParamFudgeFactor,0.1);
+				//	steering
+				dReal	v	=	steer	-	dJointGetHinge2Angle1	(joint[0]);
+				if	(v	>	0.1)	v	=	0.1;
+				if	(v	<	-0.1)	v	=	-0.1;
+				v	*=	10.0;
+				dJointSetHinge2Param	(joint[0],dParamVel,v);
+				dJointSetHinge2Param	(joint[0],dParamFMax,0.2);
+				dJointSetHinge2Param	(joint[0],dParamLoStop,-0.75);
+				dJointSetHinge2Param	(joint[0],dParamHiStop,0.75);
+				dJointSetHinge2Param	(joint[0],dParamFudgeFactor,0.1);
 
-    dSpaceCollide (space,this,&Buggy::nearCallback);
-    dWorldStep (world,time_step);
+				dSpaceCollide	(space,this,&Buggy::nearCallback);
+				dWorldStep	(world,time_step);
 
-    // remove all contact joints
-    dJointGroupEmpty (contactgroup);
+				//	remove	all	contact	joints
+				dJointGroupEmpty	(contactgroup);
 
-    return 0 ;
+				return	0	;
 }
 
-int Buggy::shutdown() {
-    dGeomDestroy (box[0]);
-    dGeomDestroy (sphere[0]);
-    dGeomDestroy (sphere[1]);
-    dGeomDestroy (sphere[2]);
-    dJointGroupDestroy (contactgroup);
-    dSpaceDestroy (space);
-    dWorldDestroy (world);
-    dCloseODE();
-
-    return 0 ;
+int	Buggy::shutdown()	{
+				dGeomDestroy	(box[0]);
+				dGeomDestroy	(sphere[0]);
+				dGeomDestroy	(sphere[1]);
+				dGeomDestroy	(sphere[2]);
+				dJointGroupDestroy	(contactgroup);
+				dSpaceDestroy	(space);
+				dWorldDestroy	(world);
+				dCloseODE();
+
+				return	0	;
 }
 
-int Buggy::draw() {
-    int i ;
+int	Buggy::draw()	{
+				int	i	;
 
-    dsSetColor (0,1,1);
-    dsSetTexture (DS_WOOD);
-    dReal sides[3] = {chassis_length,chassis_width,chassis_height};
-    dsDrawBox (dBodyGetPosition(body[0]),dBodyGetRotation(body[0]),sides);
-    dsSetColor (1,1,1);
-    for (i=1; i<=3; i++) {
-        dsDrawCylinder (dBodyGetPosition(body[i]), dBodyGetRotation(body[i]),wheel_width,wheel_radius);
-    }
+				dsSetColor	(0,1,1);
+				dsSetTexture	(DS_WOOD);
+				dReal	sides[3]	=	{chassis_length,chassis_width,chassis_height};
+				dsDrawBox	(dBodyGetPosition(body[0]),dBodyGetRotation(body[0]),sides);
+				dsSetColor	(1,1,1);
+				for	(i=1;	i<=3;	i++)	{
+								dsDrawCylinder	(dBodyGetPosition(body[i]),	dBodyGetRotation(body[i]),wheel_width,wheel_radius);
+				}
 
-    dVector3 ss;
-    dGeomBoxGetLengths (ground_box,ss);
-    dsDrawBox (dGeomGetPosition(ground_box),dGeomGetRotation(ground_box),ss);
+				dVector3	ss;
+				dGeomBoxGetLengths	(ground_box,ss);
+				dsDrawBox	(dGeomGetPosition(ground_box),dGeomGetRotation(ground_box),ss);
 
-    return 0 ;
+				return	0	;
 }
 
-void Buggy::command( int cmd ) {
-    switch (cmd) {
-        case 'a': case 'A':
-            speed += 0.3;
-            break;
-        case 'z': case 'Z':
-            speed -= 0.3;
-            break;
-        case ',':
-            steer -= 0.5;
-            break;
-        case '.':
-            steer += 0.5;
-            break;
-        case ' ':
-            speed = 0;
-            steer = 0;
-            break;
-        case '1': {
-            FILE *f = fopen ("state.dif","wt");
-            if (f) {
-              dWorldExportDIF (world,f,"");
-              fclose (f);
-            }
-        }
-    }
+void	Buggy::command(	int	cmd	)	{
+				switch	(cmd)	{
+								case	'a':	case	'A':
+												speed	+=	0.3;
+												break;
+								case	'z':	case	'Z':
+												speed	-=	0.3;
+												break;
+								case	',':
+												steer	-=	0.5;
+												break;
+								case	'.':
+												steer	+=	0.5;
+												break;
+								case	'	':
+												speed	=	0;
+												steer	=	0;
+												break;
+								case	'1':	{
+												FILE	*f	=	fopen	("state.dif","wt");
+												if	(f)	{
+														dWorldExportDIF	(world,f,"");
+														fclose	(f);
+												}
+								}
+				}
 }
 
-// this is called by dSpaceCollide when two objects in space are
-// potentially colliding.
-void Buggy::nearCallback (void * void_buggy , dGeomID o1, dGeomID o2) {
-
-    int i,n;
-    Buggy * bp = (Buggy *)void_buggy ;
-
-    // only collide things with the ground
-    int g1 = (o1 == bp->ground || o1 == bp->ground_box);
-    int g2 = (o2 == bp->ground || o2 == bp->ground_box);
-    if (!(g1 ^ g2)) return;
-
-    const int N = 10;
-    dContact contact[N];
-    n = dCollide (o1,o2,N,&contact[0].geom,sizeof(dContact));
-    if (n > 0) {
-        for (i=0; i<n; i++) {
-            contact[i].surface.mode = dContactSlip1 | dContactSlip2 |
-              dContactSoftERP | dContactSoftCFM | dContactApprox1;
-            contact[i].surface.mu = dInfinity;
-            contact[i].surface.slip1 = 0.1;
-            contact[i].surface.slip2 = 0.1;
-            contact[i].surface.soft_erp = 0.5;
-            contact[i].surface.soft_cfm = 0.3;
-            dJointID c = dJointCreateContact (bp->world,bp->contactgroup,&contact[i]);
-            dJointAttach (c, dGeomGetBody(contact[i].geom.g1), dGeomGetBody(contact[i].geom.g2));
-      }
-  }
+//	this	is	called	by	dSpaceCollide	when	two	objects	in	space	are
+//	potentially	colliding.
+void	Buggy::nearCallback	(void	*	void_buggy	,	dGeomID	o1,	dGeomID	o2)	{
+
+				int	i,n;
+				Buggy	*	bp	=	(Buggy	*)void_buggy	;
+
+				//	only	collide	things	with	the	ground
+				int	g1	=	(o1	==	bp->ground	||	o1	==	bp->ground_box);
+				int	g2	=	(o2	==	bp->ground	||	o2	==	bp->ground_box);
+				if	(!(g1	^	g2))	return;
+
+				const	int	N	=	10;
+				dContact	contact[N];
+				n	=	dCollide	(o1,o2,N,&contact[0].geom,sizeof(dContact));
+				if	(n	>	0)	{
+								for	(i=0;	i<n;	i++)	{
+												contact[i].surface.mode	=	dContactSlip1	|	dContactSlip2	|
+														dContactSoftERP	|	dContactSoftCFM	|	dContactApprox1;
+												contact[i].surface.mu	=	dInfinity;
+												contact[i].surface.slip1	=	0.1;
+												contact[i].surface.slip2	=	0.1;
+												contact[i].surface.soft_erp	=	0.5;
+												contact[i].surface.soft_cfm	=	0.3;
+												dJointID	c	=	dJointCreateContact	(bp->world,bp->contactgroup,&contact[i]);
+												dJointAttach	(c,	dGeomGetBody(contact[i].geom.g1),	dGeomGetBody(contact[i].geom.g2));
+						}
+		}
 }
diff --git a/trick_sims/ODE/models/DrawStuff/DrawStuff.cpp b/trick_sims/ODE/models/DrawStuff/DrawStuff.cpp
index ad335ed25..54de7d20e 100644
--- a/trick_sims/ODE/models/DrawStuff/DrawStuff.cpp
+++ b/trick_sims/ODE/models/DrawStuff/DrawStuff.cpp
@@ -1,55 +1,55 @@
 
-#include <string.h>
-#include <unistd.h>
-#include "DrawStuff.hh"
+#include	<string.h>
+#include	<unistd.h>
+#include	"DrawStuff.hh"
 
-std::vector<DrawStuffObject *> DrawStuff::objects ;
+std::vector<DrawStuffObject	*>	DrawStuff::objects	;
 
-void DrawStuff::start() {
-    static float xyz[3] = {2.0f,-2.0f,1.7600f};
-    static float hpr[3] = {140.000f,-17.0000f,0.0000f};
-    dsSetViewpoint (xyz,hpr);
+void	DrawStuff::start()	{
+				static	float	xyz[3]	=	{2.0f,-2.0f,1.7600f};
+				static	float	hpr[3]	=	{140.000f,-17.0000f,0.0000f};
+				dsSetViewpoint	(xyz,hpr);
 }
 
-void DrawStuff::step(int) {
-    std::vector<DrawStuffObject *>::iterator it ;
-    for( it = objects.begin() ; it != objects.end() ; ++it ) {
-        (*it)->draw() ;
-    }
+void	DrawStuff::step(int)	{
+				std::vector<DrawStuffObject	*>::iterator	it	;
+				for(	it	=	objects.begin()	;	it	!=	objects.end()	;	++it	)	{
+								(*it)->draw()	;
+				}
 }
 
-void DrawStuff::command(int cmd) {
-    std::vector<DrawStuffObject *>::iterator it ;
-    for( it = objects.begin() ; it != objects.end() ; ++it ) {
-        (*it)->command(cmd) ;
-    }
+void	DrawStuff::command(int	cmd)	{
+				std::vector<DrawStuffObject	*>::iterator	it	;
+				for(	it	=	objects.begin()	;	it	!=	objects.end()	;	++it	)	{
+								(*it)->command(cmd)	;
+				}
 }
 
-DrawStuff::DrawStuff() :
- fn(),
- window_width(1024),
- window_height(768)
+DrawStuff::DrawStuff()	:
+	fn(),
+	window_width(1024),
+	window_height(768)
 {
-    fn.version = DS_VERSION;
-    fn.path_to_textures = "/users/alin/ode-0.14/drawstuff/textures";
+				fn.version	=	DS_VERSION;
+				fn.path_to_textures	=	"/users/alin/ode-0.14/drawstuff/textures";
 
-    fn.start = &DrawStuff::start ;
-    fn.step = &DrawStuff::step ;
-    fn.command = &DrawStuff::command ;
+				fn.start	=	&DrawStuff::start	;
+				fn.step	=	&DrawStuff::step	;
+				fn.command	=	&DrawStuff::command	;
 }
 
-int DrawStuff::draw() {
-    dsSimulationLoop(0 , NULL, window_width, window_height, &fn) ;
-    return 0 ;
+int	DrawStuff::draw()	{
+				dsSimulationLoop(0	,	NULL,	window_width,	window_height,	&fn)	;
+				return	0	;
 }
 
-int DrawStuff::shutdown() {
-    dsStop() ;
-    // wait a second to allow time for the loop to exit.  Yeah, it's unscientific.
-    sleep(1) ;
-    return 0 ;
+int	DrawStuff::shutdown()	{
+				dsStop()	;
+				//	wait	a	second	to	allow	time	for	the	loop	to	exit.		Yeah,	it's	unscientific.
+				sleep(1)	;
+				return	0	;
 }
 
-void DrawStuff::add_object( DrawStuffObject * dso ) {
-    objects.push_back(dso) ;
+void	DrawStuff::add_object(	DrawStuffObject	*	dso	)	{
+				objects.push_back(dso)	;
 }
diff --git a/trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp b/trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp
index ecbea9e38..43eebfdf2 100644
--- a/trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp
+++ b/trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp
@@ -1,12 +1,12 @@
 
-#include "DrawStuffObject.hh"
-#include "DrawStuff.hh"
+#include	"DrawStuffObject.hh"
+#include	"DrawStuff.hh"
 
-DrawStuffObject::~DrawStuffObject() {}
+DrawStuffObject::~DrawStuffObject()	{}
 
-void DrawStuffObject::add_object() {
-    DrawStuff::add_object(this) ;
+void	DrawStuffObject::add_object()	{
+				DrawStuff::add_object(this)	;
 }
 
-void DrawStuffObject::command(int) {
+void	DrawStuffObject::command(int)	{
 }
diff --git a/trick_sims/ROS/models/ros_comm/ros_framework.cpp b/trick_sims/ROS/models/ros_comm/ros_framework.cpp
index b125dff7a..52df655f4 100644
--- a/trick_sims/ROS/models/ros_comm/ros_framework.cpp
+++ b/trick_sims/ROS/models/ros_comm/ros_framework.cpp
@@ -1,18 +1,18 @@
 
-#include "ros/ros.h"
-#include "trick/command_line_protos.h"
-#include "ros_framework.hh"
+#include	"ros/ros.h"
+#include	"trick/command_line_protos.h"
+#include	"ros_framework.hh"
 
-RosFramework::RosFramework(std::string app_name) {
-    int argc = command_line_args_get_argc() ;
-    char **argv = command_line_args_get_argv() ;
-    ros::init(argc, argv, app_name.c_str(), ros::init_options::NoSigintHandler) ;
+RosFramework::RosFramework(std::string	app_name)	{
+				int	argc	=	command_line_args_get_argc()	;
+				char	**argv	=	command_line_args_get_argv()	;
+				ros::init(argc,	argv,	app_name.c_str(),	ros::init_options::NoSigintHandler)	;
 }
 
-RosFramework::~RosFramework() {}
+RosFramework::~RosFramework()	{}
 
-int RosFramework::shutdown() {
-    ros::shutdown() ;
-    return 0 ;
+int	RosFramework::shutdown()	{
+				ros::shutdown()	;
+				return	0	;
 }
 
diff --git a/trick_sims/ROS/models/ros_comm/ros_publish.cpp b/trick_sims/ROS/models/ros_comm/ros_publish.cpp
index 01e3be6c7..de88e04d5 100644
--- a/trick_sims/ROS/models/ros_comm/ros_publish.cpp
+++ b/trick_sims/ROS/models/ros_comm/ros_publish.cpp
@@ -1,34 +1,34 @@
 
-#include "std_msgs/String.h"
-#include "trick/exec_proto.h"
-#include "ros_publish.hh"
+#include	"std_msgs/String.h"
+#include	"trick/exec_proto.h"
+#include	"ros_publish.hh"
 
-#include "Num.h"
+#include	"Num.h"
 
-RosPublish::RosPublish() : count(0) {}
+RosPublish::RosPublish()	:	count(0)	{}
 
-int RosPublish::init() {
-    msg_pub = n.advertise<trick_msgs::Num>("num_chatter", 1000) ;
-    return 0 ;
+int	RosPublish::init()	{
+				msg_pub	=	n.advertise<trick_msgs::Num>("num_chatter",	1000)	;
+				return	0	;
 }
 
-int RosPublish::publish() {
-    if ( ros::ok() ) {
-        trick_msgs::Num tn ;
-        tn.first_name = "Hakeem" ;
-        tn.last_name = "Olajuwon" ;
-        tn.date = "March 29, 1990" ;
-        tn.points = 18 ;
-        tn.rebounds = 16 ;
-        tn.blocks = 11 ;
-        tn.assists = 10 ;
-        std::cout << tn << std::endl ;
-        msg_pub.publish(tn) ;
+int	RosPublish::publish()	{
+				if	(	ros::ok()	)	{
+								trick_msgs::Num	tn	;
+								tn.first_name	=	"Hakeem"	;
+								tn.last_name	=	"Olajuwon"	;
+								tn.date	=	"March	29,	1990"	;
+								tn.points	=	18	;
+								tn.rebounds	=	16	;
+								tn.blocks	=	11	;
+								tn.assists	=	10	;
+								std::cout	<<	tn	<<	std::endl	;
+								msg_pub.publish(tn)	;
 
-        ros::spinOnce() ;
-    } else {
-        exec_terminate(__FILE__, "ros not ok") ;
-    }
-    return 0 ;
+								ros::spinOnce()	;
+				}	else	{
+								exec_terminate(__FILE__,	"ros	not	ok")	;
+				}
+				return	0	;
 }
 
diff --git a/trick_sims/ROS/models/ros_comm/ros_subscribe.cpp b/trick_sims/ROS/models/ros_comm/ros_subscribe.cpp
index b896fab8e..3f5e05f8b 100644
--- a/trick_sims/ROS/models/ros_comm/ros_subscribe.cpp
+++ b/trick_sims/ROS/models/ros_comm/ros_subscribe.cpp
@@ -1,21 +1,21 @@
 
-#include "std_msgs/String.h"
-#include "ros_subscribe.hh"
-#include "Num.h"
+#include	"std_msgs/String.h"
+#include	"ros_subscribe.hh"
+#include	"Num.h"
 
-void numchatterCallback(const trick_msgs::Num::ConstPtr& msg) {
-  std::cout << *msg << std::endl ;
+void	numchatterCallback(const	trick_msgs::Num::ConstPtr&	msg)	{
+		std::cout	<<	*msg	<<	std::endl	;
 }
 
-RosSubscribe::RosSubscribe() {}
+RosSubscribe::RosSubscribe()	{}
 
-int RosSubscribe::init() {
-    sub = n.subscribe("num_chatter", 1000, numchatterCallback) ;
-    return 0 ;
+int	RosSubscribe::init()	{
+				sub	=	n.subscribe("num_chatter",	1000,	numchatterCallback)	;
+				return	0	;
 }
 
-int RosSubscribe::process() {
-    ros::spin() ;
-    return 0 ;
+int	RosSubscribe::process()	{
+				ros::spin()	;
+				return	0	;
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/RUN_cpp_input/input.cpp b/trick_sims/SIM_Ball++_L1/RUN_cpp_input/input.cpp
index e43c0f8cd..c4417a817 100644
--- a/trick_sims/SIM_Ball++_L1/RUN_cpp_input/input.cpp
+++ b/trick_sims/SIM_Ball++_L1/RUN_cpp_input/input.cpp
@@ -1,94 +1,94 @@
 /*
- To use this as an input file include this file on the command line.
- S_main_${TRICK_HOST_CPU}.exe RUN_<dir>/input.cpp
- Trick will compile and link this file at simulation runtime.  The
- run_me function will automatically be executed during the
- input_processor phase of initialization.
+	To	use	this	as	an	input	file	include	this	file	on	the	command	line.
+	S_main_${TRICK_HOST_CPU}.exe	RUN_<dir>/input.cpp
+	Trick	will	compile	and	link	this	file	at	simulation	runtime.		The
+	run_me	function	will	automatically	be	executed	during	the
+	input_processor	phase	of	initialization.
 */
 
-// need access to private/protected things? uncomment these.
-//#define private public
-//#define protected public
+//	need	access	to	private/protected	things?	uncomment	these.
+//#define	private	public
+//#define	protected	public
 
-#include "../S_source.hh"
-#include "trick/CheckPointRestart_c_intf.hh"
-#include "trick/realtimesync_proto.h"
-#include "trick/external_application_c_intf.h"
+#include	"../S_source.hh"
+#include	"trick/CheckPointRestart_c_intf.hh"
+#include	"trick/realtimesync_proto.h"
+#include	"trick/external_application_c_intf.h"
 
-extern "C" int run_event_1() {
-    message_publish(1, "event 1 fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_1()	{
+				message_publish(1,	"event	1	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_2() {
-    message_publish(1, "event 2 fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_2()	{
+				message_publish(1,	"event	2	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_3() {
-    message_publish(1, "event 3 fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_3()	{
+				message_publish(1,	"event	3	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_4() {
-    message_publish(1, "event 4 fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_4()	{
+				message_publish(1,	"event	4	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_before() {
-    message_publish(1, "event before fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_before()	{
+				message_publish(1,	"event	before	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_before2() {
-    message_publish(1, "event before2 fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_before2()	{
+				message_publish(1,	"event	before2	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int run_event_after() {
-    message_publish(1, "event after fired!\n") ;
-    return 0 ;
+extern	"C"	int	run_event_after()	{
+				message_publish(1,	"event	after	fired!\n")	;
+				return	0	;
 }
 
-extern "C" int remove_events() {
-    event_manager_remove_event(event_manager_get_event("event_3")) ;
-    event_manager_remove_event(event_manager_get_event("event_before")) ;
-    event_manager_remove_event(event_manager_get_event("event_after")) ;
-    return 0 ;
+extern	"C"	int	remove_events()	{
+				event_manager_remove_event(event_manager_get_event("event_3"))	;
+				event_manager_remove_event(event_manager_get_event("event_before"))	;
+				event_manager_remove_event(event_manager_get_event("event_after"))	;
+				return	0	;
 }
 
-extern "C" int run_me() {
+extern	"C"	int	run_me()	{
 
-    // modify variables within sim_objects.
-    ball.obj.state.input.position[0] = 6.0 ;
-    ball.obj.state.input.position[1] = 6.0 ;
+				//	modify	variables	within	sim_objects.
+				ball.obj.state.input.position[0]	=	6.0	;
+				ball.obj.state.input.position[1]	=	6.0	;
 
-    checkpoint_pre_init(true) ;
+				checkpoint_pre_init(true)	;
 
-    // add read events
-    jit_add_read( 90.0 , "run_event_1" ) ;
-    jit_add_read( 80.0 , "run_event_2" ) ;
+				//	add	read	events
+				jit_add_read(	90.0	,	"run_event_1"	)	;
+				jit_add_read(	80.0	,	"run_event_2"	)	;
 
-    // add cyclic event
-    jit_add_event( "run_event_3" , "event_3" , 100.0 ) ;
+				//	add	cyclic	event
+				jit_add_event(	"run_event_3"	,	"event_3"	,	100.0	)	;
 
-    // events tied to jobs
-    jit_add_event_before( "run_event_before", "event_before", "ball.obj.state_print" ) ;
-    jit_add_event_after( "run_event_after", "event_after", "ball.obj.state_print" ) ;
+				//	events	tied	to	jobs
+				jit_add_event_before(	"run_event_before",	"event_before",	"ball.obj.state_print"	)	;
+				jit_add_event_after(	"run_event_after",	"event_after",	"ball.obj.state_print"	)	;
 
-    // add a read event that removes all other events.
-    jit_add_read( 150.0 , "remove_events" ) ;
+				//	add	a	read	event	that	removes	all	other	events.
+				jit_add_read(	150.0	,	"remove_events"	)	;
 
-    jit_add_read( 190.0 , "hidden_event" ) ;
+				jit_add_read(	190.0	,	"hidden_event"	)	;
 
-    exec_set_terminate_time(200.0) ;
+				exec_set_terminate_time(200.0)	;
 
 /*
-    real_time_enable() ;
-    trick_real_time.itimer.enable() ;
-    sim_control_panel_set_enabled(true) ;
+				real_time_enable()	;
+				trick_real_time.itimer.enable()	;
+				sim_control_panel_set_enabled(true)	;
 */
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/Ball.cpp b/trick_sims/SIM_Ball++_L1/models/Ball.cpp
index 063d672a2..ec85e02d9 100644
--- a/trick_sims/SIM_Ball++_L1/models/Ball.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/Ball.cpp
@@ -1,46 +1,46 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::Ball ball object constructor.)
+				(Ball::Ball	ball	object	constructor.)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (X-axis is horizontal and positive to the right)
-     (Y-axis is vertical and positive up)
-     (resulting force is 'collect'ed in the S_define file))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(X-axis	is	horizontal	and	positive	to	the	right)
+					(Y-axis	is	vertical	and	positive	up)
+					(resulting	force	is	'collect'ed	in	the	S_define	file))
 CLASS:
-    (N/A)
-LIBRARY DEPENDENCY:
-    ((Ball.o))
+				(N/A)
+LIBRARY	DEPENDENCY:
+				((Ball.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <iostream>
+/*	System	include	files.	*/
+#include	<iostream>
 
-/* Model include files. */
-#include "Ball.hh"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
 
-// Default consructor.
-Ball::Ball() /* RETURN: -- None. */
+//	Default	consructor.
+Ball::Ball()	/*	RETURN:	--	None.	*/
 {
 
-   // Print out constructor message.
-   //cout << "In Ball constructor." << endl;
+			//	Print	out	constructor	message.
+			//cout	<<	"In	Ball	constructor."	<<	endl;
 
 }
 
-// Destructor.
-Ball::~Ball() /* RETURN: -- None. */
+//	Destructor.
+Ball::~Ball()	/*	RETURN:	--	None.	*/
 {
 
-   // Print out constructor message.
-   //cout << "In Ball destructor." << endl;
+			//	Print	out	constructor	message.
+			//cout	<<	"In	Ball	destructor."	<<	endl;
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallForce.cpp b/trick_sims/SIM_Ball++_L1/models/BallForce.cpp
index 6def5b424..8eaae34d4 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallForce.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallForce.cpp
@@ -1,18 +1,18 @@
 
-#include "BallForce.hh"
+#include	"BallForce.hh"
 
-BallForceInput::BallForceInput() {
+BallForceInput::BallForceInput()	{
 
-    origin[0] = 0.0 ;
-    origin[1] = 2.0 ;
-    force = 8.0 ;
+				origin[0]	=	0.0	;
+				origin[1]	=	2.0	;
+				force	=	8.0	;
 
 }
 
-BallForceOutput::BallForceOutput() {
+BallForceOutput::BallForceOutput()	{
 
-    force[0] = 0.0 ;
-    force[1] = 0.0 ;
+				force[0]	=	0.0	;
+				force[1]	=	0.0	;
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp b/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp
index 52a31e6f5..0132fdaaa 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp
@@ -1,64 +1,64 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::force_field performs the following:
-        - computes a relative vector from the ball to the force field origin
-        - computes the unit vector in the direction of this relative vector
-        - scales the unit vector by the magnitude of the constant force field)
+				(Ball::force_field	performs	the	following:
+								-	computes	a	relative	vector	from	the	ball	to	the	force	field	origin
+								-	computes	the	unit	vector	in	the	direction	of	this	relative	vector
+								-	scales	the	unit	vector	by	the	magnitude	of	the	constant	force	field)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (X-axis is horizontal and positive to the right)
-     (Y-axis is vertical and positive up)
-     (resulting force is 'collect'ed in the S_define file))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(X-axis	is	horizontal	and	positive	to	the	right)
+					(Y-axis	is	vertical	and	positive	up)
+					(resulting	force	is	'collect'ed	in	the	S_define	file))
 CLASS:
-    (derivative)
-LIBRARY DEPENDENCY:
-    ((BallForceField.o))
+				(derivative)
+LIBRARY	DEPENDENCY:
+				((BallForceField.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <math.h>
+/*	System	include	files.	*/
+#include	<math.h>
 
-/* Model include files. */
-#include "Ball.hh"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
 
-/* ENTRY POINT */
-int Ball::force_field() /* RETURN: -- Always return zero. */
+/*	ENTRY	POINT	*/
+int	Ball::force_field()	/*	RETURN:	--	Always	return	zero.	*/
 {
 
-   /* LOCAL VARIABLE DECLARATIONS */
-   double mag;
-   double rel_pos[2];
-   double unit[2];
+			/*	LOCAL	VARIABLE	DECLARATIONS	*/
+			double	mag;
+			double	rel_pos[2];
+			double	unit[2];
 
-   /* GET SHORTHAND NOTATION FOR DATA STRUCTURES */
-   BallForceInput  * force_in  = &(this->force.input);
-   BallForceOutput * force_out = &(this->force.output);
-   double * ball_pos = this->state.output.position;
+			/*	GET	SHORTHAND	NOTATION	FOR	DATA	STRUCTURES	*/
+			BallForceInput		*	force_in		=	&(this->force.input);
+			BallForceOutput	*	force_out	=	&(this->force.output);
+			double	*	ball_pos	=	this->state.output.position;
 
-   /* GET RELATIVE VECTOR FROM BALL TO FORCE ORIGIN */
-   rel_pos[0] = force_in->origin[0] - ball_pos[0];
-   rel_pos[1] = force_in->origin[1] - ball_pos[1];
+			/*	GET	RELATIVE	VECTOR	FROM	BALL	TO	FORCE	ORIGIN	*/
+			rel_pos[0]	=	force_in->origin[0]	-	ball_pos[0];
+			rel_pos[1]	=	force_in->origin[1]	-	ball_pos[1];
 
-   /* GET UNIT VECTOR AND POSITION MAGNITUDE FROM BALL TO FORCE ORIGIN */
-   /* Note sigularity when ball position = force origin. */
-   mag = sqrt( rel_pos[0]*rel_pos[0] + rel_pos[1]*rel_pos[1] );
-   unit[0] = rel_pos[0] / mag;
-   unit[1] = rel_pos[1] / mag;
+			/*	GET	UNIT	VECTOR	AND	POSITION	MAGNITUDE	FROM	BALL	TO	FORCE	ORIGIN	*/
+			/*	Note	sigularity	when	ball	position	=	force	origin.	*/
+			mag	=	sqrt(	rel_pos[0]*rel_pos[0]	+	rel_pos[1]*rel_pos[1]	);
+			unit[0]	=	rel_pos[0]	/	mag;
+			unit[1]	=	rel_pos[1]	/	mag;
 
-   /* COMPUTE EXTERNAL FORCE ON BALL IN THE DIRECTION OF THE UNIT VECTOR */
-   force_out->force[0] = force_in->force * unit[0];
-   force_out->force[1] = force_in->force * unit[1];
+			/*	COMPUTE	EXTERNAL	FORCE	ON	BALL	IN	THE	DIRECTION	OF	THE	UNIT	VECTOR	*/
+			force_out->force[0]	=	force_in->force	*	unit[0];
+			force_out->force[1]	=	force_in->force	*	unit[1];
 
-   /* RETURN */
-   return(0);
+			/*	RETURN	*/
+			return(0);
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp b/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp
index 524b93fef..070ec7c90 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp
@@ -1,43 +1,43 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::force_field performs the following:
-        - computes a relative vector from the ball to the force field origin
-        - computes the unit vector in the direction of this relative vector
-        - scales the unit vector by the magnitude of the constant force field)
+				(Ball::force_field	performs	the	following:
+								-	computes	a	relative	vector	from	the	ball	to	the	force	field	origin
+								-	computes	the	unit	vector	in	the	direction	of	this	relative	vector
+								-	scales	the	unit	vector	by	the	magnitude	of	the	constant	force	field)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (X-axis is horizontal and positive to the right)
-     (Y-axis is vertical and positive up)
-     (resulting force is 'collect'ed in the S_define file))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(X-axis	is	horizontal	and	positive	to	the	right)
+					(Y-axis	is	vertical	and	positive	up)
+					(resulting	force	is	'collect'ed	in	the	S_define	file))
 CLASS:
-    (derivative)
-LIBRARY DEPENDENCY:
-    ((BallForce_default_data.o))
+				(derivative)
+LIBRARY	DEPENDENCY:
+				((BallForce_default_data.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <stdexcept>
-#include <math.h>
+/*	System	include	files.	*/
+#include	<stdexcept>
+#include	<math.h>
 
-/* Model include files. */
-#include "BallForce.hh"
+/*	Model	include	files.	*/
+#include	"BallForce.hh"
 
-/* ENTRY POINT */
-int BallForce::default_data() {
+/*	ENTRY	POINT	*/
+int	BallForce::default_data()	{
 
-    // This data is the same as in the constructor.
-    input.origin[0] = 0.0 ;
-    input.origin[1] = 2.0 ;
-    input.force = 8.0 ;
+				//	This	data	is	the	same	as	in	the	constructor.
+				input.origin[0]	=	0.0	;
+				input.origin[1]	=	2.0	;
+				input.force	=	8.0	;
 
-    return(0) ;
+				return(0)	;
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp b/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp
index 4c0b67f49..6f384a584 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp
@@ -1,41 +1,41 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_init performs the following:
-        - passes the input position vector to the output vector
-        - xforms the input ball speed and trajectory elevation into a
-          velocity vector.)
+				(Ball::state_init	performs	the	following:
+								-	passes	the	input	position	vector	to	the	output	vector
+								-	xforms	the	input	ball	speed	and	trajectory	elevation	into	a
+										velocity	vector.)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (Positive X is horizontal to the right)
-     (Positive Y is vertical and up))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(Positive	X	is	horizontal	to	the	right)
+					(Positive	Y	is	vertical	and	up))
 CLASS:
-    (initialization)
-LIBRARY DEPENDENCY:
-    ((BallStateInit.o))
+				(initialization)
+LIBRARY	DEPENDENCY:
+				((BallStateInit.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-#include "trick/trick_tests.h"
+#include	"trick/trick_tests.h"
 
-/* Model include files. */
-#include "Ball.hh"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
 
-     /* ENTRY POINT */
-int Ball::shutdown() {
+					/*	ENTRY	POINT	*/
+int	Ball::shutdown()	{
 
-   TRICK_EXPECT_NEAR( state.output.position[0] , -7.627512 , 0.000001 , "BallSim" , "FinalXPositionCheck" )
-   TRICK_EXPECT_NEAR( state.output.position[1] , 3.131932 , 0.000001 , "BallSim" , "FinalYPositionCheck" )
+			TRICK_EXPECT_NEAR(	state.output.position[0]	,	-7.627512	,	0.000001	,	"BallSim"	,	"FinalXPositionCheck"	)
+			TRICK_EXPECT_NEAR(	state.output.position[1]	,	3.131932	,	0.000001	,	"BallSim"	,	"FinalYPositionCheck"	)
 
 
-   /* RETURN */
-   return( 0 );
+			/*	RETURN	*/
+			return(	0	);
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallState.cpp b/trick_sims/SIM_Ball++_L1/models/BallState.cpp
index f4227e6f1..4342e5482 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallState.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallState.cpp
@@ -1,47 +1,47 @@
 
-#include <stdio.h>
+#include	<stdio.h>
 
-#include "BallState.hh"
-#include "trick/constant.h"
-#include "trick/memorymanager_c_intf.h"
+#include	"BallState.hh"
+#include	"trick/constant.h"
+#include	"trick/memorymanager_c_intf.h"
 
-BallStateInput::BallStateInput() {
+BallStateInput::BallStateInput()	{
 
-    mass = 10.0 ;
-    position[0] = 5.0 ;
-    position[1] = 5.0 ;
-    speed = 3.5 ;
-    elevation = 45.0 * DTR ;
+				mass	=	10.0	;
+				position[0]	=	5.0	;
+				position[1]	=	5.0	;
+				speed	=	3.5	;
+				elevation	=	45.0	*	DTR	;
 
 }
 
-BallStateOutput::BallStateOutput() {
+BallStateOutput::BallStateOutput()	{
 
-    position[0] = 0.0 ;
-    position[1] = 0.0 ;
-    velocity[0] = 0.0 ;
-    velocity[1] = 0.0 ;
-    acceleration[0] = 0.0 ;
-    acceleration[1] = 0.0 ;
-    external_force[0] = 0.0 ;
-    external_force[1] = 0.0 ;
+				position[0]	=	0.0	;
+				position[1]	=	0.0	;
+				velocity[0]	=	0.0	;
+				velocity[1]	=	0.0	;
+				acceleration[0]	=	0.0	;
+				acceleration[1]	=	0.0	;
+				external_force[0]	=	0.0	;
+				external_force[1]	=	0.0	;
 
 }
 
-BallStateWork::BallStateWork() {
-    num_external_force = 0 ;
-    external_force = NULL ;
+BallStateWork::BallStateWork()	{
+				num_external_force	=	0	;
+				external_force	=	NULL	;
 }
 
-int BallState::add_external_force( double * in_ptr ) {
-    if ( work.num_external_force == 0 ) {
-        // Declares a new array to hold a single double *
-        work.external_force = (double **)TMM_declare_var_1d("double *", ++work.num_external_force) ;
-    } else {
-        // Increases the array size by one to accommodate a new force.
-        work.external_force = (double **)TMM_resize_array_1d_a( work.external_force, ++work.num_external_force ) ;
-    }
-    // Add the force to the list
-    work.external_force[work.num_external_force - 1] = in_ptr ;
-    return 0 ;
+int	BallState::add_external_force(	double	*	in_ptr	)	{
+				if	(	work.num_external_force	==	0	)	{
+								//	Declares	a	new	array	to	hold	a	single	double	*
+								work.external_force	=	(double	**)TMM_declare_var_1d("double	*",	++work.num_external_force)	;
+				}	else	{
+								//	Increases	the	array	size	by	one	to	accommodate	a	new	force.
+								work.external_force	=	(double	**)TMM_resize_array_1d_a(	work.external_force,	++work.num_external_force	)	;
+				}
+				//	Add	the	force	to	the	list
+				work.external_force[work.num_external_force	-	1]	=	in_ptr	;
+				return	0	;
 }
diff --git a/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp
index f365d9772..70edf25da 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp
@@ -1,64 +1,64 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_deriv performs the following:
-        - collects all the external forces on the ball
-        - solves the EOM F=ma for accelerations)
+				(Ball::state_deriv	performs	the	following:
+								-	collects	all	the	external	forces	on	the	ball
+								-	solves	the	EOM	F=ma	for	accelerations)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (X-axis is horizontal and positive to the right)
-     (Y-axis is vertical and positive up)
-     (derivative of position already exists as velocity vector)
-     (collect contains external forces 'collect'ed in the S_define file))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(X-axis	is	horizontal	and	positive	to	the	right)
+					(Y-axis	is	vertical	and	positive	up)
+					(derivative	of	position	already	exists	as	velocity	vector)
+					(collect	contains	external	forces	'collect'ed	in	the	S_define	file))
 CLASS:
-    (derivative)
-LIBRARY DEPENDENCY:
-    ((BallStateDeriv.o))
+				(derivative)
+LIBRARY	DEPENDENCY:
+				((BallStateDeriv.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <stdio.h>
-#include <iostream>
+/*	System	include	files.	*/
+#include	<stdio.h>
+#include	<iostream>
 
-/* Trick include files. */
-#include "trick/collect_macros.h"
+/*	Trick	include	files.	*/
+#include	"trick/collect_macros.h"
 
-/* Model include files. */
-#include "Ball.hh"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
 
-/* ENTRY POINT */
-int Ball::state_deriv() /* RETURN: -- Always return zero. */
+/*	ENTRY	POINT	*/
+int	Ball::state_deriv()	/*	RETURN:	--	Always	return	zero.	*/
 {
 
-   /* GET SHORTHAND NOTATION FOR DATA STRUCTURES */
-   BallStateInput  * state_in   = &(this->state.input);
-   BallStateOutput * state_out  = &(this->state.output);
-   BallStateWork   * state_work = &(this->state.work);
+			/*	GET	SHORTHAND	NOTATION	FOR	DATA	STRUCTURES	*/
+			BallStateInput		*	state_in			=	&(this->state.input);
+			BallStateOutput	*	state_out		=	&(this->state.output);
+			BallStateWork			*	state_work	=	&(this->state.work);
 
-   /* COLLECT EXTERNAL FORCES ON THE BALL  --  TRUST US ON THIS ONE */
-   //collected_forces = (double**)(state_work->external_force) ;
-   state_out->external_force[0] = 0.0 ;
-   state_out->external_force[1] = 0.0 ;
+			/*	COLLECT	EXTERNAL	FORCES	ON	THE	BALL		--		TRUST	US	ON	THIS	ONE	*/
+			//collected_forces	=	(double**)(state_work->external_force)	;
+			state_out->external_force[0]	=	0.0	;
+			state_out->external_force[1]	=	0.0	;
 
-   unsigned int ii;
-   for( ii = 0 ; ii < state_work->num_external_force ; ii++ ) {
-      state_out->external_force[0] += state_work->external_force[ii][0];
-      state_out->external_force[1] += state_work->external_force[ii][1];
-   }
+			unsigned	int	ii;
+			for(	ii	=	0	;	ii	<	state_work->num_external_force	;	ii++	)	{
+						state_out->external_force[0]	+=	state_work->external_force[ii][0];
+						state_out->external_force[1]	+=	state_work->external_force[ii][1];
+			}
 
-   /* SOLVE FOR THE X AND Y ACCELERATIONS OF THE BALL */
-   state_out->acceleration[0] = state_out->external_force[0] / state_in->mass;
-   state_out->acceleration[1] = state_out->external_force[1] / state_in->mass;
+			/*	SOLVE	FOR	THE	X	AND	Y	ACCELERATIONS	OF	THE	BALL	*/
+			state_out->acceleration[0]	=	state_out->external_force[0]	/	state_in->mass;
+			state_out->acceleration[1]	=	state_out->external_force[1]	/	state_in->mass;
 
-   /* RETURN */
-   return(0);
+			/*	RETURN	*/
+			return(0);
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp
index 7345da161..daaa51351 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp
@@ -1,51 +1,51 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_init performs the following:
-        - passes the input position vector to the output vector
-        - xforms the input ball speed and trajectory elevation into a
-          velocity vector.)
+				(Ball::state_init	performs	the	following:
+								-	passes	the	input	position	vector	to	the	output	vector
+								-	xforms	the	input	ball	speed	and	trajectory	elevation	into	a
+										velocity	vector.)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (Positive X is horizontal to the right)
-     (Positive Y is vertical and up))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(Positive	X	is	horizontal	to	the	right)
+					(Positive	Y	is	vertical	and	up))
 CLASS:
-    (initialization)
-LIBRARY DEPENDENCY:
-    ((BallStateInit.o))
+				(initialization)
+LIBRARY	DEPENDENCY:
+				((BallStateInit.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <math.h>
+/*	System	include	files.	*/
+#include	<math.h>
 
-/* Model include files. */
-#include "Ball.hh"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
 
-     /* ENTRY POINT */
-int Ball::state_init() /* RETURN: -- Always return zero. */
+					/*	ENTRY	POINT	*/
+int	Ball::state_init()	/*	RETURN:	--	Always	return	zero.	*/
 {
 
-   /* GET SHORHAND NOTATION FOR DATA STRUCTURES */
-   BallStateInput  * state_in  = &(this->state.input);
-   BallStateOutput * state_out = &(this->state.output);
+			/*	GET	SHORHAND	NOTATION	FOR	DATA	STRUCTURES	*/
+			BallStateInput		*	state_in		=	&(this->state.input);
+			BallStateOutput	*	state_out	=	&(this->state.output);
 
-   /* TRANSFER INPUT POSITION STATES TO OUTPUT POSITION STATES */
-   state_out->position[0] = state_in->position[0];  /* X state */
-   state_out->position[1] = state_in->position[1];  /* Y state */
+			/*	TRANSFER	INPUT	POSITION	STATES	TO	OUTPUT	POSITION	STATES	*/
+			state_out->position[0]	=	state_in->position[0];		/*	X	state	*/
+			state_out->position[1]	=	state_in->position[1];		/*	Y	state	*/
 
-   /* TRANSFER INPUT SPEED AND ELEVATION INTO THE VELOCITY VECTOR */
-   state_out->velocity[0] =   state_in->speed * cos( state_in->elevation ); /* X velocity */
-   state_out->velocity[1] =   state_in->speed * sin( state_in->elevation ); /* Y velocity */
+			/*	TRANSFER	INPUT	SPEED	AND	ELEVATION	INTO	THE	VELOCITY	VECTOR	*/
+			state_out->velocity[0]	=			state_in->speed	*	cos(	state_in->elevation	);	/*	X	velocity	*/
+			state_out->velocity[1]	=			state_in->speed	*	sin(	state_in->elevation	);	/*	Y	velocity	*/
 
-   /* RETURN */
-   return( 0 );
+			/*	RETURN	*/
+			return(	0	);
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
index cffd8d72a..f87b5df28 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp
@@ -1,75 +1,75 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_integ performs the following:
-        - loads the position states into the INTEGRATOR state ws arrays
-        - loads the velocity states into the INTEGRATOR state derivative ws
-        - loads the velocity states into the INTEGRATOR state ws arrays
-        - loads the acceleration states into the INTEGRATOR state derivative ws
-        - calls the TRICK state integration service
-        - unloads the new pos and vel states from the INTEGRATOR ws arrays)
+				(Ball::state_integ	performs	the	following:
+								-	loads	the	position	states	into	the	INTEGRATOR	state	ws	arrays
+								-	loads	the	velocity	states	into	the	INTEGRATOR	state	derivative	ws
+								-	loads	the	velocity	states	into	the	INTEGRATOR	state	ws	arrays
+								-	loads	the	acceleration	states	into	the	INTEGRATOR	state	derivative	ws
+								-	calls	the	TRICK	state	integration	service
+								-	unloads	the	new	pos	and	vel	states	from	the	INTEGRATOR	ws	arrays)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (integrate accel to pos as two first order diffEQs))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(integrate	accel	to	pos	as	two	first	order	diffEQs))
 CLASS:
-    (integration)
-LIBRARY DEPENDENCY:
-    ((BallStateInteg.o))
+				(integration)
+LIBRARY	DEPENDENCY:
+				((BallStateInteg.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* Model include files. */
-#include <stdio.h>
+/*	Model	include	files.	*/
+#include	<stdio.h>
 
-#include "trick/integrator_c_intf.h"
-#include "Ball.hh"
-#include <iostream>
+#include	"trick/integrator_c_intf.h"
+#include	"Ball.hh"
+#include	<iostream>
 
-/* ENTRY POINT */
-int Ball::state_integ() {
+/*	ENTRY	POINT	*/
+int	Ball::state_integ()	{
 
-   int ipass;
+			int	ipass;
 
-   /* GET SHORTHAND NOTATION FOR DATA STRUCTURES */
-   BallStateOutput * state_out = &(this->state.output);
+			/*	GET	SHORTHAND	NOTATION	FOR	DATA	STRUCTURES	*/
+			BallStateOutput	*	state_out	=	&(this->state.output);
 
-   /* LOAD THE POSITION AND VELOCITY STATES */
-   load_state(
-       &state_out->position[0] ,
-       &state_out->position[1] ,
-       &state_out->velocity[0] ,
-       &state_out->velocity[1] ,
-       NULL
-   );
+			/*	LOAD	THE	POSITION	AND	VELOCITY	STATES	*/
+			load_state(
+							&state_out->position[0]	,
+							&state_out->position[1]	,
+							&state_out->velocity[0]	,
+							&state_out->velocity[1]	,
+							NULL
+			);
 
-   /* LOAD THE POSITION AND VELOCITY STATE DERIVATIVES */
-   load_deriv(
-       &state_out->velocity[0] ,
-       &state_out->velocity[1] ,
-       &state_out->acceleration[0] ,
-       &state_out->acceleration[1] ,
-       NULL
-   );
+			/*	LOAD	THE	POSITION	AND	VELOCITY	STATE	DERIVATIVES	*/
+			load_deriv(
+							&state_out->velocity[0]	,
+							&state_out->velocity[1]	,
+							&state_out->acceleration[0]	,
+							&state_out->acceleration[1]	,
+							NULL
+			);
 
-   /* CALL THE TRICK INTEGRATION SERVICE */
-   ipass = integrate();
+			/*	CALL	THE	TRICK	INTEGRATION	SERVICE	*/
+			ipass	=	integrate();
 
-   /* UNLOAD THE NEW POSITION AND VELOCITY STATES */
-   unload_state(
-       &state_out->position[0] ,
-       &state_out->position[1] ,
-       &state_out->velocity[0] ,
-       &state_out->velocity[1] ,
-       NULL
-   );
+			/*	UNLOAD	THE	NEW	POSITION	AND	VELOCITY	STATES	*/
+			unload_state(
+							&state_out->position[0]	,
+							&state_out->position[1]	,
+							&state_out->velocity[0]	,
+							&state_out->velocity[1]	,
+							NULL
+			);
 
-   /* RETURN */
-   return( ipass );
+			/*	RETURN	*/
+			return(	ipass	);
 
 }
diff --git a/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp b/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp
index bd6f2cd02..6af9eb4aa 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp
@@ -1,46 +1,46 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_init performs the following:
-        - passes the input position vector to the output vector
-        - xforms the input ball speed and trajectory elevation into a
-          velocity vector.)
+				(Ball::state_init	performs	the	following:
+								-	passes	the	input	position	vector	to	the	output	vector
+								-	xforms	the	input	ball	speed	and	trajectory	elevation	into	a
+										velocity	vector.)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (Positive X is horizontal to the right)
-     (Positive Y is vertical and up))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(Positive	X	is	horizontal	to	the	right)
+					(Positive	Y	is	vertical	and	up))
 CLASS:
-    (initialization)
-LIBRARY DEPENDENCY:
-    ((BallStateInit.o))
+				(initialization)
+LIBRARY	DEPENDENCY:
+				((BallStateInit.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-/* System include files. */
-#include <math.h>
-#include <iostream>
-#include <unistd.h>
+/*	System	include	files.	*/
+#include	<math.h>
+#include	<iostream>
+#include	<unistd.h>
 
-/* Model include files. */
-#include "Ball.hh"
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
+/*	Model	include	files.	*/
+#include	"Ball.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
 
-     /* ENTRY POINT */
-int Ball::state_print() {
+					/*	ENTRY	POINT	*/
+int	Ball::state_print()	{
 
-   message_publish(MSG_NORMAL, "time = %8.2f , position = %12.6f , %12.6f\n",
-    exec_get_sim_time() , state.output.position[0] , state.output.position[1]) ;
+			message_publish(MSG_NORMAL,	"time	=	%8.2f	,	position	=	%12.6f	,	%12.6f\n",
+				exec_get_sim_time()	,	state.output.position[0]	,	state.output.position[1])	;
 
-   /* RETURN */
-   return( 0 );
+			/*	RETURN	*/
+			return(	0	);
 
 }
 
diff --git a/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp b/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp
index 4c83125a0..19643559e 100644
--- a/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp
+++ b/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp
@@ -1,45 +1,45 @@
-/********************************* TRICK HEADER *******************************
+/*********************************	TRICK	HEADER	*******************************
 PURPOSE:
-    (Ball::state_integ performs the following:
-        - loads the position states into the INTEGRATOR state ws arrays
-        - loads the velocity states into the INTEGRATOR state derivative ws
-        - loads the velocity states into the INTEGRATOR state ws arrays
-        - loads the acceleration states into the INTEGRATOR state derivative ws
-        - calls the TRICK state integration service
-        - unloads the new pos and vel states from the INTEGRATOR ws arrays)
+				(Ball::state_integ	performs	the	following:
+								-	loads	the	position	states	into	the	INTEGRATOR	state	ws	arrays
+								-	loads	the	velocity	states	into	the	INTEGRATOR	state	derivative	ws
+								-	loads	the	velocity	states	into	the	INTEGRATOR	state	ws	arrays
+								-	loads	the	acceleration	states	into	the	INTEGRATOR	state	derivative	ws
+								-	calls	the	TRICK	state	integration	service
+								-	unloads	the	new	pos	and	vel	states	from	the	INTEGRATOR	ws	arrays)
 REFERENCE:
-    (((Bailey, R.W, and Paddock, E.J.)
-      (Trick Simulation Environment) (NASA:JSC #37943)
-      (JSC/Engineering Directorate/Automation, Robotics and Simulation Division)
-      (March 1997)))
-ASSUMPTIONS AND LIMITATIONS:
-    ((2 dimensional space)
-     (integrate accel to pos as two first order diffEQs))
+				(((Bailey,	R.W,	and	Paddock,	E.J.)
+						(Trick	Simulation	Environment)	(NASA:JSC	#37943)
+						(JSC/Engineering	Directorate/Automation,	Robotics	and	Simulation	Division)
+						(March	1997)))
+ASSUMPTIONS	AND	LIMITATIONS:
+				((2	dimensional	space)
+					(integrate	accel	to	pos	as	two	first	order	diffEQs))
 CLASS:
-    (integration)
-LIBRARY DEPENDENCY:
-    ((BallState_default_data.o))
+				(integration)
+LIBRARY	DEPENDENCY:
+				((BallState_default_data.o))
 PROGRAMMERS:
-    (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
-     ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
+				(((Robert	W.	Bailey)	(Sweet	Systems	Inc)	(March	1997)	(Tutorial	Lesson	1))
+					((Edwin	Z.	Crues)(Titan	Systems	Corp.)(Jan	2002)(Crude	C++	translation)))
 *******************************************************************************/
 
-#include <stdlib.h>
+#include	<stdlib.h>
 
-/* Model include files. */
-#include "BallState.hh"
-#include "trick/constant.h"
-#include "trick/memorymanager_c_intf.h"
+/*	Model	include	files.	*/
+#include	"BallState.hh"
+#include	"trick/constant.h"
+#include	"trick/memorymanager_c_intf.h"
 
-/* ENTRY POINT */
-int BallState::default_data() {
+/*	ENTRY	POINT	*/
+int	BallState::default_data()	{
 
-    // This data is the same as in the constructor.
-    input.mass = 10.0 ;
-    input.speed = 3.5 ;
-    input.elevation = 45.0 * DTR ;
-    input.position[0] = 5.0 ;
-    input.position[1] = 5.0 ;
+				//	This	data	is	the	same	as	in	the	constructor.
+				input.mass	=	10.0	;
+				input.speed	=	3.5	;
+				input.elevation	=	45.0	*	DTR	;
+				input.position[0]	=	5.0	;
+				input.position[1]	=	5.0	;
 
-    return(0);
+				return(0);
 }
diff --git a/trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp b/trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
index 3eef4e75f..ad5d06977 100644
--- a/trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
+++ b/trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
@@ -1,207 +1,207 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a Aircraft. )
-LIBRARY DEPENDENCY:
-    ((Aircraft.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	Aircraft.	)
+LIBRARY	DEPENDENCY:
+				((Aircraft.o))
 *******************************************************************************/
-#include "Aircraft/include/Aircraft.hh"
-
-#include "trick/integrator_c_intf.h"
-#include <stdlib.h>
-#include <math.h>
-#include <iostream>
-#include "Aircraft.hh"
-
-int Aircraft::default_data() {
-    pos[0] = 0.0;         // m
-    pos[1] = 0.0;
-    vel[0] = 100.0;       // m/s
-    vel[1] = 0.0;
-    
-    mass = 5000;              // kg
-    thrust_mag_max = 45000;   // N
-    K_drag = 0.72;
-    heading_rate_gain = 0.1;
-    set_desired_compass_heading(45.0);
-    desired_speed = 200; // m/s
-    autoPilot = false;
-
-    flightPath = WaypointList();
-    cWP = 0;
-    wpIdx = -1;
-
-    return (0);
-}
-
-int Aircraft::state_init() {
-    heading = northWestToPsi(vel);
-    return (0);
-}
-
-int Aircraft::state_deriv() {
-    double F_total_body[2];
-    calc_total_force(F_total_body);
-    double F_total_world[2];
-    rotateBodyToWorld(F_total_world, F_total_body);
-    /* Equation #1 */
-    acc[0] = F_total_world[0] / mass;
-    acc[1] = F_total_world[1] / mass;
-    return(0);
-}
-
-int Aircraft::state_integ() {
-   int integration_step;
-   load_state ( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
-   load_deriv ( &vel[0], &vel[1], &acc[0], &acc[1], (double*)0);
-   integration_step = integrate();
-   unload_state( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
-   // Calculate heading from velocity.
-   heading = northWestToPsi(vel);
-   return(integration_step);
-}
-
-// This calculates the total force on the aircraft in body coordinates.
-void Aircraft::calc_total_force( double (&F_total_body)[2] ) {
-    double F_thrust_body[2];
-    double F_drag_body[2];
-    double F_turning_body[2];
-    calc_thrust_force(F_thrust_body);
-    calc_drag_force(F_drag_body);
-    calc_turning_force(F_turning_body);
-    // Eq #2
-    F_total_body[0] = F_thrust_body[0] + F_drag_body[0] + F_turning_body[0];
-    F_total_body[1] = F_thrust_body[1] + F_drag_body[1] + F_turning_body[1];
-}
-
-void Aircraft::calc_thrust_force(double (&F_thrust_body)[2]) {
-    // Eq #5
-    double thrust_mag_desired = K_drag * desired_speed * desired_speed;
-    // Eq #6
-    double thrust_mag;
-    if (thrust_mag_desired > thrust_mag_max) {
-      thrust_mag = thrust_mag_max;
-    } else if ( thrust_mag_desired < 0.0) {
-      thrust_mag = 0.0;
-    } else {
-      thrust_mag = thrust_mag_desired;
-    }
-    // Eq #7
-    F_thrust_body[0] = thrust_mag;
-    F_thrust_body[1] = 0.0;
-}
-
-void Aircraft::calc_drag_force(double ( &F_drag_body)[2] ) {
-    // Eq #4
-    double speed = vector_magnitude(vel);
-    // Eq #3
-    F_drag_body[0] = - K_drag * speed * speed;
-    F_drag_body[1] = 0.0;
-}
-
-void Aircraft::calc_turning_force(double ( &F_turning_body)[2] ) {
-    double heading_diff;
-    double heading_error = 0.0;
-    // Eq#8
-    heading_diff = desired_heading - heading;
-    // Eq#9
-    if ( heading_diff > M_PI ) {
-      heading_error = heading_diff - 2 * M_PI;
-    } else if (heading_diff < -M_PI) {
-      heading_error = heading_diff + 2 * M_PI;
-    } else {
-      heading_error = heading_diff;
-    }
-    // Eq#10
-    double heading_rate_desired = heading_rate_gain * heading_error;
-    double speed = vector_magnitude(vel);
-    // Eq#11
-    double Fmag = heading_rate_desired * speed * mass;
-    if (Fmag >  49000.0) Fmag =  49000.0;
-    if (Fmag < -49000.0) Fmag = -49000.0;
-    // Eq#3
-    F_turning_body[0] = 0.0;
-    F_turning_body[1] = Fmag;
-}
-
-void Aircraft::rotateBodyToWorld( double (&F_total_world)[2], double (&F_total_body)[2] ) {
-    // Eq#12
-    F_total_world[0] =  cos(heading) * F_total_body[0] - sin(heading) * F_total_body[1];
-    F_total_world[1] =  sin(heading) * F_total_body[0] + cos(heading) * F_total_body[1];
-}
-
-int Aircraft::control() {
-    if (autoPilot) {
-        if (flightPath.size() > 0) {
-            // Calculate the difference between where we want to be, and where we are.
-            double posDiff[2];
-            double _wp[2];
-            flightPath.getPosition(cWP, _wp);
-            vector_difference(posDiff, _wp, pos);
-            // Calculate bearing to waypoint.
-            desired_heading = northWestToPsi(posDiff);
-            // Calculate distance to waypoint.
-            double distanceToWaypoint = vector_magnitude(posDiff);
-            // If we've arrived, that is we're close enough, go to the next waypoint.
-            if (distanceToWaypoint < 100.0) {
-                cWP = (cWP + 1) % flightPath.size();
-            }
-        } 
-    }
-    return 0;
-}
-
-int Aircraft::cycleWaypoints() {
-    if(flightPath.size() > 0) {
-        wpIdx = (wpIdx + 1) % flightPath.size();
-        flightPath.getPosition(wpIdx, wpPos);
-        wpImg = flightPath.getImage(wpIdx);
-    } else {
-        wpIdx = -1;
-    }
-    return 0;
-}
-
-void Aircraft::set_desired_compass_heading( double compass_heading) {
-    desired_heading = compassToPsi( compass_heading );
-}
-
-double compassToPsi( double compass_heading ) {
-    compass_heading = fmod( compass_heading, 360.0 );
-    return ( M_PI * ( 2.0 - compass_heading/180.0) );
-}
-
-double psiToCompass( double psi ) {
-    psi = fmod(psi + 2*M_PI, 2*M_PI);
-    return ( 180.0 * (2.0 - psi/M_PI));
-}
-
-double northWestToPsi (double (&p)[2]) {
-    double psi;
-    double mag = sqrt( p[0]*p[0] + p[1]*p[1] );
-    if (mag > 0.0) {
-        psi = atan2( p[1], p[0] );
-
-    } else {
-        std::cerr << "Error: Arguments to northWestToPsi() are zero."
-                  << std::endl;
-        psi = 0.0;
-    }
-    return psi;
-}
-
-double vector_magnitude(double (&vector)[2]) {
-    return ( sqrt( vector[0] * vector[0] + vector[1] * vector[1] ));
-}
-
-void vector_difference(double (&result)[2], double (&A)[2], double (&B)[2] ) {
-    result[0] = A[0] - B[0];
-    result[1] = A[1] - B[1];
-}
-
-// double vector_dot_product( double (&A)[2], double (&B)[2] ) {
-//     return ( A[0] * B[0] + A[1] * B[1] );
-// }
-
-// double vector_scale( double (&result)[2], double (&A)[2], double scale ) {
-//     result[0] = A[0] * scale;
-//     result[1] = A[1] * scale;
-// }
+#include	"Aircraft/include/Aircraft.hh"
+
+#include	"trick/integrator_c_intf.h"
+#include	<stdlib.h>
+#include	<math.h>
+#include	<iostream>
+#include	"Aircraft.hh"
+
+int	Aircraft::default_data()	{
+				pos[0]	=	0.0;									//	m
+				pos[1]	=	0.0;
+				vel[0]	=	100.0;							//	m/s
+				vel[1]	=	0.0;
+				
+				mass	=	5000;														//	kg
+				thrust_mag_max	=	45000;			//	N
+				K_drag	=	0.72;
+				heading_rate_gain	=	0.1;
+				set_desired_compass_heading(45.0);
+				desired_speed	=	200;	//	m/s
+				autoPilot	=	false;
+
+				flightPath	=	WaypointList();
+				cWP	=	0;
+				wpIdx	=	-1;
+
+				return	(0);
+}
+
+int	Aircraft::state_init()	{
+				heading	=	northWestToPsi(vel);
+				return	(0);
+}
+
+int	Aircraft::state_deriv()	{
+				double	F_total_body[2];
+				calc_total_force(F_total_body);
+				double	F_total_world[2];
+				rotateBodyToWorld(F_total_world,	F_total_body);
+				/*	Equation	#1	*/
+				acc[0]	=	F_total_world[0]	/	mass;
+				acc[1]	=	F_total_world[1]	/	mass;
+				return(0);
+}
+
+int	Aircraft::state_integ()	{
+			int	integration_step;
+			load_state	(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
+			load_deriv	(	&vel[0],	&vel[1],	&acc[0],	&acc[1],	(double*)0);
+			integration_step	=	integrate();
+			unload_state(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
+			//	Calculate	heading	from	velocity.
+			heading	=	northWestToPsi(vel);
+			return(integration_step);
+}
+
+//	This	calculates	the	total	force	on	the	aircraft	in	body	coordinates.
+void	Aircraft::calc_total_force(	double	(&F_total_body)[2]	)	{
+				double	F_thrust_body[2];
+				double	F_drag_body[2];
+				double	F_turning_body[2];
+				calc_thrust_force(F_thrust_body);
+				calc_drag_force(F_drag_body);
+				calc_turning_force(F_turning_body);
+				//	Eq	#2
+				F_total_body[0]	=	F_thrust_body[0]	+	F_drag_body[0]	+	F_turning_body[0];
+				F_total_body[1]	=	F_thrust_body[1]	+	F_drag_body[1]	+	F_turning_body[1];
+}
+
+void	Aircraft::calc_thrust_force(double	(&F_thrust_body)[2])	{
+				//	Eq	#5
+				double	thrust_mag_desired	=	K_drag	*	desired_speed	*	desired_speed;
+				//	Eq	#6
+				double	thrust_mag;
+				if	(thrust_mag_desired	>	thrust_mag_max)	{
+						thrust_mag	=	thrust_mag_max;
+				}	else	if	(	thrust_mag_desired	<	0.0)	{
+						thrust_mag	=	0.0;
+				}	else	{
+						thrust_mag	=	thrust_mag_desired;
+				}
+				//	Eq	#7
+				F_thrust_body[0]	=	thrust_mag;
+				F_thrust_body[1]	=	0.0;
+}
+
+void	Aircraft::calc_drag_force(double	(	&F_drag_body)[2]	)	{
+				//	Eq	#4
+				double	speed	=	vector_magnitude(vel);
+				//	Eq	#3
+				F_drag_body[0]	=	-	K_drag	*	speed	*	speed;
+				F_drag_body[1]	=	0.0;
+}
+
+void	Aircraft::calc_turning_force(double	(	&F_turning_body)[2]	)	{
+				double	heading_diff;
+				double	heading_error	=	0.0;
+				//	Eq#8
+				heading_diff	=	desired_heading	-	heading;
+				//	Eq#9
+				if	(	heading_diff	>	M_PI	)	{
+						heading_error	=	heading_diff	-	2	*	M_PI;
+				}	else	if	(heading_diff	<	-M_PI)	{
+						heading_error	=	heading_diff	+	2	*	M_PI;
+				}	else	{
+						heading_error	=	heading_diff;
+				}
+				//	Eq#10
+				double	heading_rate_desired	=	heading_rate_gain	*	heading_error;
+				double	speed	=	vector_magnitude(vel);
+				//	Eq#11
+				double	Fmag	=	heading_rate_desired	*	speed	*	mass;
+				if	(Fmag	>		49000.0)	Fmag	=		49000.0;
+				if	(Fmag	<	-49000.0)	Fmag	=	-49000.0;
+				//	Eq#3
+				F_turning_body[0]	=	0.0;
+				F_turning_body[1]	=	Fmag;
+}
+
+void	Aircraft::rotateBodyToWorld(	double	(&F_total_world)[2],	double	(&F_total_body)[2]	)	{
+				//	Eq#12
+				F_total_world[0]	=		cos(heading)	*	F_total_body[0]	-	sin(heading)	*	F_total_body[1];
+				F_total_world[1]	=		sin(heading)	*	F_total_body[0]	+	cos(heading)	*	F_total_body[1];
+}
+
+int	Aircraft::control()	{
+				if	(autoPilot)	{
+								if	(flightPath.size()	>	0)	{
+												//	Calculate	the	difference	between	where	we	want	to	be,	and	where	we	are.
+												double	posDiff[2];
+												double	_wp[2];
+												flightPath.getPosition(cWP,	_wp);
+												vector_difference(posDiff,	_wp,	pos);
+												//	Calculate	bearing	to	waypoint.
+												desired_heading	=	northWestToPsi(posDiff);
+												//	Calculate	distance	to	waypoint.
+												double	distanceToWaypoint	=	vector_magnitude(posDiff);
+												//	If	we've	arrived,	that	is	we're	close	enough,	go	to	the	next	waypoint.
+												if	(distanceToWaypoint	<	100.0)	{
+																cWP	=	(cWP	+	1)	%	flightPath.size();
+												}
+								}	
+				}
+				return	0;
+}
+
+int	Aircraft::cycleWaypoints()	{
+				if(flightPath.size()	>	0)	{
+								wpIdx	=	(wpIdx	+	1)	%	flightPath.size();
+								flightPath.getPosition(wpIdx,	wpPos);
+								wpImg	=	flightPath.getImage(wpIdx);
+				}	else	{
+								wpIdx	=	-1;
+				}
+				return	0;
+}
+
+void	Aircraft::set_desired_compass_heading(	double	compass_heading)	{
+				desired_heading	=	compassToPsi(	compass_heading	);
+}
+
+double	compassToPsi(	double	compass_heading	)	{
+				compass_heading	=	fmod(	compass_heading,	360.0	);
+				return	(	M_PI	*	(	2.0	-	compass_heading/180.0)	);
+}
+
+double	psiToCompass(	double	psi	)	{
+				psi	=	fmod(psi	+	2*M_PI,	2*M_PI);
+				return	(	180.0	*	(2.0	-	psi/M_PI));
+}
+
+double	northWestToPsi	(double	(&p)[2])	{
+				double	psi;
+				double	mag	=	sqrt(	p[0]*p[0]	+	p[1]*p[1]	);
+				if	(mag	>	0.0)	{
+								psi	=	atan2(	p[1],	p[0]	);
+
+				}	else	{
+								std::cerr	<<	"Error:	Arguments	to	northWestToPsi()	are	zero."
+																		<<	std::endl;
+								psi	=	0.0;
+				}
+				return	psi;
+}
+
+double	vector_magnitude(double	(&vector)[2])	{
+				return	(	sqrt(	vector[0]	*	vector[0]	+	vector[1]	*	vector[1]	));
+}
+
+void	vector_difference(double	(&result)[2],	double	(&A)[2],	double	(&B)[2]	)	{
+				result[0]	=	A[0]	-	B[0];
+				result[1]	=	A[1]	-	B[1];
+}
+
+//	double	vector_dot_product(	double	(&A)[2],	double	(&B)[2]	)	{
+//					return	(	A[0]	*	B[0]	+	A[1]	*	B[1]	);
+//	}
+
+//	double	vector_scale(	double	(&result)[2],	double	(&A)[2],	double	scale	)	{
+//					result[0]	=	A[0]	*	scale;
+//					result[1]	=	A[1]	*	scale;
+//	}
diff --git a/trick_sims/SIM_aircraft/models/Aircraft/src/Waypoint.cpp b/trick_sims/SIM_aircraft/models/Aircraft/src/Waypoint.cpp
index 4ee8cd113..473175f24 100644
--- a/trick_sims/SIM_aircraft/models/Aircraft/src/Waypoint.cpp
+++ b/trick_sims/SIM_aircraft/models/Aircraft/src/Waypoint.cpp
@@ -1,111 +1,111 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Handles the waypoints. )
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Handles	the	waypoints.	)
 *******************************************************************************/
-#include "Aircraft/include/Waypoint.hh"
+#include	"Aircraft/include/Waypoint.hh"
 
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
-#include "Waypoint.hh"
+#include	<stdlib.h>
+#include	<iostream>
+#include	<fstream>
+#include	"Waypoint.hh"
 
-WaypointList::WaypointList() {
-    length = 0;
+WaypointList::WaypointList()	{
+				length	=	0;
 }
 
-WaypointList::WaypointList(std::string path) {
-    length = 0;
+WaypointList::WaypointList(std::string	path)	{
+				length	=	0;
 
-    load(path);
+				load(path);
 }
 
-int WaypointList::add(double n, double w, std::string i="images/defaultIcon.png")
+int	WaypointList::add(double	n,	double	w,	std::string	i="images/defaultIcon.png")
 {
-    if (length < ARRAY_SIZE)
-    {
-        north[length] = n;
-        west[length] = w;
-        img[length] = i;
-        length++;
-        return length-1;
-    }
-    
-    return -1;
+				if	(length	<	ARRAY_SIZE)
+				{
+								north[length]	=	n;
+								west[length]	=	w;
+								img[length]	=	i;
+								length++;
+								return	length-1;
+				}
+				
+				return	-1;
 }
 
-void WaypointList::remove(int index)
+void	WaypointList::remove(int	index)
 {
-    if (index < 0 || index >= length) {
-        std::cerr << "Invalid Index" << std::endl;
-        return;
-    }
-
-    length--;
-    for(int i = index; i < length; i++) {
-        north[i] = north[i+1];
-        west[i] = west[i+1];
-        img[i] = img[i+1];
-    }
+				if	(index	<	0	||	index	>=	length)	{
+								std::cerr	<<	"Invalid	Index"	<<	std::endl;
+								return;
+				}
+
+				length--;
+				for(int	i	=	index;	i	<	length;	i++)	{
+								north[i]	=	north[i+1];
+								west[i]	=	west[i+1];
+								img[i]	=	img[i+1];
+				}
 }
 
-void WaypointList::clear() {
-    length = 0;
+void	WaypointList::clear()	{
+				length	=	0;
 }
 
-void WaypointList::load(std::string path) {
-    clear();
-    append(path);
+void	WaypointList::load(std::string	path)	{
+				clear();
+				append(path);
 }
 
-void WaypointList::append(std::string path) {
-    std::ifstream in(path);
-
-    if(in.is_open()) {
-        std::string str;
-        // Expected input formatting: <North>,<West> OR <North>,<West>,<Image Path>
-        while(getline(in,str)) {
-            int k = str.find(','), j = str.find(',',k+1);
-            double n,w;
-            if (j>=0) {
-                n = std::stod(str.substr(0,k));
-                w = std::stod(str.substr(k+1,(j-k-1)));
-                std::string i = str.substr(j+1);
-                add(n,w,i);
-            } else {
-                n = std::stod(str.substr(0,k));
-                w = std::stod(str.substr(k+1));
-                add(n,w);
-            }
-            
-        }
-        in.close();
-    } else {
-        std::cerr << "FILE DID NOT OPEN" << std::endl;
-    }
+void	WaypointList::append(std::string	path)	{
+				std::ifstream	in(path);
+
+				if(in.is_open())	{
+								std::string	str;
+								//	Expected	input	formatting:	<North>,<West>	OR	<North>,<West>,<Image	Path>
+								while(getline(in,str))	{
+												int	k	=	str.find(','),	j	=	str.find(',',k+1);
+												double	n,w;
+												if	(j>=0)	{
+																n	=	std::stod(str.substr(0,k));
+																w	=	std::stod(str.substr(k+1,(j-k-1)));
+																std::string	i	=	str.substr(j+1);
+																add(n,w,i);
+												}	else	{
+																n	=	std::stod(str.substr(0,k));
+																w	=	std::stod(str.substr(k+1));
+																add(n,w);
+												}
+												
+								}
+								in.close();
+				}	else	{
+								std::cerr	<<	"FILE	DID	NOT	OPEN"	<<	std::endl;
+				}
 }
 
-void WaypointList::save(std::string path) {
-    std::ofstream out(path);
+void	WaypointList::save(std::string	path)	{
+				std::ofstream	out(path);
 
-    if(out.is_open()) {
-        for(int i = 0; i < length; i++) {
-            out << std::to_string(north[i]) + "," + std::to_string(west[i]) + "," + img[i] << std::endl;
-        }
-    }
+				if(out.is_open())	{
+								for(int	i	=	0;	i	<	length;	i++)	{
+												out	<<	std::to_string(north[i])	+	","	+	std::to_string(west[i])	+	","	+	img[i]	<<	std::endl;
+								}
+				}
 
-    out.close();
+				out.close();
 }
 
-void WaypointList::getPosition(int index, double (&pos)[2]) {
-    pos[0] = north[index];
-    pos[1] = west[index];
+void	WaypointList::getPosition(int	index,	double	(&pos)[2])	{
+				pos[0]	=	north[index];
+				pos[1]	=	west[index];
 }
 
-std::string WaypointList::getImage(int index)
+std::string	WaypointList::getImage(int	index)
 {
-    return img[index];
+				return	img[index];
 }
 
-int WaypointList::size()
+int	WaypointList::size()
 {
-    return length;
+				return	length;
 }
diff --git a/trick_sims/SIM_balloon/models/balloon/src/Balloon.cpp b/trick_sims/SIM_balloon/models/balloon/src/Balloon.cpp
index 458dd5bf8..1861148e2 100644
--- a/trick_sims/SIM_balloon/models/balloon/src/Balloon.cpp
+++ b/trick_sims/SIM_balloon/models/balloon/src/Balloon.cpp
@@ -1,163 +1,163 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a hot-air balloon. )
-LIBRARY DEPENDENCY:
-    ((Balloon.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	hot-air	balloon.	)
+LIBRARY	DEPENDENCY:
+				((Balloon.o))
 *******************************************************************************/
-#include "balloon/include/Balloon.hh"
-#include "atmosphere/include/atmosphere.h"
+#include	"balloon/include/Balloon.hh"
+#include	"atmosphere/include/atmosphere.h"
 
-#include "trick/integrator_c_intf.h"
-#include <stdlib.h>
-#include <math.h>
-#include <iostream>
+#include	"trick/integrator_c_intf.h"
+#include	<stdlib.h>
+#include	<math.h>
+#include	<iostream>
 
-int Balloon::default_data() {
+int	Balloon::default_data()	{
 
-    pos[0] = 0.0;
-    pos[1] = 2.0;
-    vel[0] = 0.0;
-    vel[1] = 0.0;
+				pos[0]	=	0.0;
+				pos[1]	=	2.0;
+				vel[0]	=	0.0;
+				vel[1]	=	0.0;
 
-    envelope_mass      = 113.4;
-    basket_mass        =  63.5;
-    burner_system_mass = 206.4;
-    payload_mass       = 300.0;
+				envelope_mass						=	113.4;
+				basket_mass								=		63.5;
+				burner_system_mass	=	206.4;
+				payload_mass							=	300.0;
 
-    envelope_air_temperature = 80;
-    envelope_radius          = 8.5;
-    envelope_theta           = 45 * (M_PI/180.0);
+				envelope_air_temperature	=	80;
+				envelope_radius										=	8.5;
+				envelope_theta											=	45	*	(M_PI/180.0);
 
-    Cd[0] = 0.5;
-    Cd[1] = 0.5;
+				Cd[0]	=	0.5;
+				Cd[1]	=	0.5;
 
-    return (0);
+				return	(0);
 }
 
-int Balloon::state_init() {
-    envelope_volume = calc_envelope_volume();
-    fixed_mass = calc_fixed_mass();
-    return (0);
+int	Balloon::state_init()	{
+				envelope_volume	=	calc_envelope_volume();
+				fixed_mass	=	calc_fixed_mass();
+				return	(0);
 }
 
-int Balloon::state_deriv() {
-    double total_mass = calc_total_mass();
-    double F_gravity  = total_mass * (-US_STD_gravity( pos[1])); /* Equation #2 */
-    double F_buoyancy = calc_buoyancy_force();
-    double F_drag[2];
-    calc_drag_force(F_drag);
-    acc[0] = 0.0;
+int	Balloon::state_deriv()	{
+				double	total_mass	=	calc_total_mass();
+				double	F_gravity		=	total_mass	*	(-US_STD_gravity(	pos[1]));	/*	Equation	#2	*/
+				double	F_buoyancy	=	calc_buoyancy_force();
+				double	F_drag[2];
+				calc_drag_force(F_drag);
+				acc[0]	=	0.0;
 
-    acc[0] = (F_drag[0]) / total_mass;                          /* Equation #1 */
-    acc[1] = (F_gravity + F_buoyancy + F_drag[1]) / total_mass; /* Equation #1 */
+				acc[0]	=	(F_drag[0])	/	total_mass;																										/*	Equation	#1	*/
+				acc[1]	=	(F_gravity	+	F_buoyancy	+	F_drag[1])	/	total_mass;	/*	Equation	#1	*/
 
-    return(0);
+				return(0);
 }
 
-int Balloon::state_integ() {
-   int integration_step;
-   load_state ( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
-   load_deriv ( &vel[0], &vel[1], &acc[0], &acc[1], (double*)0);
-   integration_step = integrate();
-   unload_state( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
-   return(integration_step);
+int	Balloon::state_integ()	{
+			int	integration_step;
+			load_state	(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
+			load_deriv	(	&vel[0],	&vel[1],	&acc[0],	&acc[1],	(double*)0);
+			integration_step	=	integrate();
+			unload_state(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
+			return(integration_step);
 }
 
-double Balloon::calc_total_mass() {
-    return (fixed_mass + calc_envelope_air_mass());
+double	Balloon::calc_total_mass()	{
+				return	(fixed_mass	+	calc_envelope_air_mass());
 }
 
-double Balloon::calc_envelope_air_mass() {
-   double heated_air_density = calc_heated_air_density();
-   return ( heated_air_density * envelope_volume ); /* Equation #4 with density of heated air. */
+double	Balloon::calc_envelope_air_mass()	{
+			double	heated_air_density	=	calc_heated_air_density();
+			return	(	heated_air_density	*	envelope_volume	);	/*	Equation	#4	with	density	of	heated	air.	*/
 }
 
-double Balloon::calc_envelope_volume() {
-   double h;
+double	Balloon::calc_envelope_volume()	{
+			double	h;
 
-   h = envelope_radius * (1.0 + sin( envelope_theta));
-   double v_dome = volume_of_a_spherical_dome(envelope_radius, h);
+			h	=	envelope_radius	*	(1.0	+	sin(	envelope_theta));
+			double	v_dome	=	volume_of_a_spherical_dome(envelope_radius,	h);
 
-   double r = envelope_radius * cos(envelope_theta);
-   h = r / tan(envelope_theta);
-   double v_cone = volume_of_a_cone(r, h);
+			double	r	=	envelope_radius	*	cos(envelope_theta);
+			h	=	r	/	tan(envelope_theta);
+			double	v_cone	=	volume_of_a_cone(r,	h);
 
-   return (v_dome + v_cone); /* Equation #7 */
+			return	(v_dome	+	v_cone);	/*	Equation	#7	*/
 }
 
-double Balloon::volume_of_a_spherical_dome( double r, double h) {
-   return (M_PI*((r*h*h)-((h*h*h)/3.0))); /* Equation #5 */
+double	Balloon::volume_of_a_spherical_dome(	double	r,	double	h)	{
+			return	(M_PI*((r*h*h)-((h*h*h)/3.0)));	/*	Equation	#5	*/
 }
 
-double Balloon::volume_of_a_cone( double r, double h) {
-   return ((M_PI*r*r*h)/3.0); /* Equation #6 */
+double	Balloon::volume_of_a_cone(	double	r,	double	h)	{
+			return	((M_PI*r*r*h)/3.0);	/*	Equation	#6	*/
 }
 
-double Balloon::calc_heated_air_density() {
-    double t_k = envelope_air_temperature + 273.15;
-    double rho = US_STD_pressure(pos[1]) / (287.055 * t_k); /* Equation #8 */
-    return rho;
+double	Balloon::calc_heated_air_density()	{
+				double	t_k	=	envelope_air_temperature	+	273.15;
+				double	rho	=	US_STD_pressure(pos[1])	/	(287.055	*	t_k);	/*	Equation	#8	*/
+				return	rho;
 }
 
-double Balloon::calc_buoyancy_force() {
-    return( calc_displaced_air_mass() * US_STD_gravity( pos[1])); /* Equation 9 */
+double	Balloon::calc_buoyancy_force()	{
+				return(	calc_displaced_air_mass()	*	US_STD_gravity(	pos[1]));	/*	Equation	9	*/
 }
 
-double Balloon::calc_displaced_air_mass() {
-    return( US_STD_density(pos[1]) * envelope_volume); /* Equation #4 with standard air density. */
+double	Balloon::calc_displaced_air_mass()	{
+				return(	US_STD_density(pos[1])	*	envelope_volume);	/*	Equation	#4	with	standard	air	density.	*/
 }
 
-double Balloon::calc_fixed_mass() {
-    return (envelope_mass + basket_mass + burner_system_mass + payload_mass);
+double	Balloon::calc_fixed_mass()	{
+				return	(envelope_mass	+	basket_mass	+	burner_system_mass	+	payload_mass);
 }
 
-void Balloon::calc_drag_force(double *F_drag) {
-    double altitude = pos[1];
+void	Balloon::calc_drag_force(double	*F_drag)	{
+				double	altitude	=	pos[1];
 
-    /* Equation 11 */
-    double v_tas[2];
-    v_tas[0] = vel[0] - wind_speed;
-    v_tas[1] = vel[1];
+				/*	Equation	11	*/
+				double	v_tas[2];
+				v_tas[0]	=	vel[0]	-	wind_speed;
+				v_tas[1]	=	vel[1];
 
-    double A[2];
-    A[0] = (0.75 * M_PI + 1.0) * envelope_radius * envelope_radius; /* Equation 13 */
-    A[1] = M_PI * envelope_radius * envelope_radius; /* Equation 12 */
+				double	A[2];
+				A[0]	=	(0.75	*	M_PI	+	1.0)	*	envelope_radius	*	envelope_radius;	/*	Equation	13	*/
+				A[1]	=	M_PI	*	envelope_radius	*	envelope_radius;	/*	Equation	12	*/
 
-    /* Equation 10 */
-    F_drag[0] = -( 0.5 * US_STD_density(altitude) * abs(v_tas[0]) * v_tas[0] * Cd[0] * A[0] );
-    F_drag[1] = -( 0.5 * US_STD_density(altitude) * abs(v_tas[1]) * v_tas[1] * Cd[1] * A[1] );
+				/*	Equation	10	*/
+				F_drag[0]	=	-(	0.5	*	US_STD_density(altitude)	*	abs(v_tas[0])	*	v_tas[0]	*	Cd[0]	*	A[0]	);
+				F_drag[1]	=	-(	0.5	*	US_STD_density(altitude)	*	abs(v_tas[1])	*	v_tas[1]	*	Cd[1]	*	A[1]	);
 
-    return;
+				return;
 }
 
-int Balloon::control() {
-    if ( temperature_change_command != 0) {
-        envelope_air_temperature += temperature_change_command;
-        temperature_change_command = 0;
-    }
-    if (envelope_air_temperature > 120.0) {
-        envelope_air_temperature = 120.0;
-    }
-    if (envelope_air_temperature < 80.0) {
-        envelope_air_temperature = 80.0;
-    }
-    if ( wind_change_command != 0) {
-        wind_speed += wind_change_command;
-        wind_change_command = 0;
-    }
-    if (wind_speed > 10.0) {
-        wind_speed = 10.0;
-    }
-    if (wind_speed < -10.0) {
-        wind_speed = -10.0;
-    }
-    return(0);
+int	Balloon::control()	{
+				if	(	temperature_change_command	!=	0)	{
+								envelope_air_temperature	+=	temperature_change_command;
+								temperature_change_command	=	0;
+				}
+				if	(envelope_air_temperature	>	120.0)	{
+								envelope_air_temperature	=	120.0;
+				}
+				if	(envelope_air_temperature	<	80.0)	{
+								envelope_air_temperature	=	80.0;
+				}
+				if	(	wind_change_command	!=	0)	{
+								wind_speed	+=	wind_change_command;
+								wind_change_command	=	0;
+				}
+				if	(wind_speed	>	10.0)	{
+								wind_speed	=	10.0;
+				}
+				if	(wind_speed	<	-10.0)	{
+								wind_speed	=	-10.0;
+				}
+				return(0);
 }
 
-int Balloon::check_ground_contact() {
-    if (pos[1] < 2.0) {
-        pos[1] = 2.0;
-        vel[0] = 0.0;
-        vel[1] = 0.0;
-    }
-    return(0);
+int	Balloon::check_ground_contact()	{
+				if	(pos[1]	<	2.0)	{
+								pos[1]	=	2.0;
+								vel[0]	=	0.0;
+								vel[1]	=	0.0;
+				}
+				return(0);
 }
diff --git a/trick_sims/SIM_billiards/models/graphics/cpp/Socket.cpp b/trick_sims/SIM_billiards/models/graphics/cpp/Socket.cpp
index d45874783..57221e515 100644
--- a/trick_sims/SIM_billiards/models/graphics/cpp/Socket.cpp
+++ b/trick_sims/SIM_billiards/models/graphics/cpp/Socket.cpp
@@ -1,61 +1,61 @@
-#include "Socket.hh"
+#include	"Socket.hh"
 
-#define SOCKET_BUF_SIZE 20480
+#define	SOCKET_BUF_SIZE	20480
 
-Socket::Socket() : _initialized(false) {}
+Socket::Socket()	:	_initialized(false)	{}
 
-int Socket::init (std::string hostname, int port) {
-    _hostname = hostname;
-    _port = port;
-    _socket_fd = socket(AF_INET, SOCK_STREAM, 0);
-    if (_socket_fd < 0) {
-        std::cout << "Socket connection failed" << std::endl;
-        return -1;
-    }
+int	Socket::init	(std::string	hostname,	int	port)	{
+				_hostname	=	hostname;
+				_port	=	port;
+				_socket_fd	=	socket(AF_INET,	SOCK_STREAM,	0);
+				if	(_socket_fd	<	0)	{
+								std::cout	<<	"Socket	connection	failed"	<<	std::endl;
+								return	-1;
+				}
 
-    struct sockaddr_in serv_addr;
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_port = htons(port); // convert to weird network byte format
+				struct	sockaddr_in	serv_addr;
+				serv_addr.sin_family	=	AF_INET;
+				serv_addr.sin_port	=	htons(port);	//	convert	to	weird	network	byte	format
 
-    if(inet_pton(AF_INET, "127.0.0.1", &serv_addr.sin_addr)<=0) { 
-        std::cout << "Invalid address/ Address not supported" << std::endl; 
-        return -1;
-    } 
+				if(inet_pton(AF_INET,	"127.0.0.1",	&serv_addr.sin_addr)<=0)	{	
+								std::cout	<<	"Invalid	address/	Address	not	supported"	<<	std::endl;	
+								return	-1;
+				}	
 
-    if (connect(_socket_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
-        std::cout << "Connection failed" << std::endl;
-        return -1;
-    }
+				if	(connect(_socket_fd,	(struct	sockaddr	*)&serv_addr,	sizeof(serv_addr))	<	0)	{
+								std::cout	<<	"Connection	failed"	<<	std::endl;
+								return	-1;
+				}
 
-    _initialized = true;
+				_initialized	=	true;
 }
 
-int Socket::send (std::string message) {
-    // weird syntax I've never used before - since the send syscall that i'm trying to use is overloaded in this class,
-    // I have to append :: to the front of it so that the compiler knows to look in the global namespace
-    int success = ::send(_socket_fd, message.c_str(), message.size(), 0);
-    if (success < message.size()) {
-        std::cout << "Failed to send message" << std::endl;
-    }
-    return success;
+int	Socket::send	(std::string	message)	{
+				//	weird	syntax	I've	never	used	before	-	since	the	send	syscall	that	i'm	trying	to	use	is	overloaded	in	this	class,
+				//	I	have	to	append	::	to	the	front	of	it	so	that	the	compiler	knows	to	look	in	the	global	namespace
+				int	success	=	::send(_socket_fd,	message.c_str(),	message.size(),	0);
+				if	(success	<	message.size())	{
+								std::cout	<<	"Failed	to	send	message"	<<	std::endl;
+				}
+				return	success;
 }
 
-int Socket::operator<< (std::string message) {
-    return send(message);
+int	Socket::operator<<	(std::string	message)	{
+				return	send(message);
 }
 
-std::string Socket::receive () {
-    char buffer[SOCKET_BUF_SIZE];
-    int numBytes = read(_socket_fd, buffer, SOCKET_BUF_SIZE);
-    if (numBytes < 0) {
-        std::cout << "Failed to read from socket" << std::endl;
-    } else if (numBytes < SOCKET_BUF_SIZE) {
-        buffer[numBytes] = '\0';
-    }
+std::string	Socket::receive	()	{
+				char	buffer[SOCKET_BUF_SIZE];
+				int	numBytes	=	read(_socket_fd,	buffer,	SOCKET_BUF_SIZE);
+				if	(numBytes	<	0)	{
+								std::cout	<<	"Failed	to	read	from	socket"	<<	std::endl;
+				}	else	if	(numBytes	<	SOCKET_BUF_SIZE)	{
+								buffer[numBytes]	=	'\0';
+				}
 
-    return std::string(buffer);
+				return	std::string(buffer);
 }
 
-void Socket::operator>> (std::string& ret) {
-    ret = receive();
+void	Socket::operator>>	(std::string&	ret)	{
+				ret	=	receive();
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_billiards/models/graphics/cpp/main.cpp b/trick_sims/SIM_billiards/models/graphics/cpp/main.cpp
index 21290ce9b..fe297330b 100644
--- a/trick_sims/SIM_billiards/models/graphics/cpp/main.cpp
+++ b/trick_sims/SIM_billiards/models/graphics/cpp/main.cpp
@@ -1,832 +1,832 @@
-#include <igl/opengl/glfw/Viewer.h>
-#include <igl/opengl/glfw/imgui/ImGuiPlugin.h>
-#include <igl/opengl/glfw/imgui/ImGuiMenu.h>
-#include <igl/opengl/glfw/imgui/ImGuiHelpers.h>
-
-#include <vector>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <stdlib.h> 
-#include <string> 
-
-#include "Socket.hh"
-
-#define STR_MAX 1024
-
-std::vector<Eigen::Vector3d> ball_colors = {Eigen::Vector3d(0.0,0.4,0.0), //green
-                                            Eigen::Vector3d(1.0,1.0,0.0), //yellow
-                                            Eigen::Vector3d(0.0,0.0,1.0), //blue
-                                            Eigen::Vector3d(1.0,0.0,0.0), //red
-                                            Eigen::Vector3d(0.5,0.0,0.3), //purple
-                                            Eigen::Vector3d(0.7,0.5,0.0), //orange
-                                            Eigen::Vector3d(0.0,0.0,0.0), //black
-                                            Eigen::Vector3d(0.3,0.07,0.15), //maroon
-                                            };
-
-
-const double layer_BALL = 0.005;
-const double layer_TABLE = 0.001;
-const double layer_BUMPER = 0.002;
-const double layer_RAIL = 0.000;
-const double layer_CUE = 0.008;
-const double layer_POCKET = 0.002;
-
-
-
-class RenderedShape {
-  public:
-    RenderedShape() {}
-
-    int baseIndex = 0;
-
-    int getNumVertices() {
-      return vertices.size();
-    }
-
-    int getNumFaces() {
-      return faces.size();
-    }
-    
-    std::vector<Eigen::Vector3i> getFacesWithBaseIndex(int newBase) {
-      std::vector<Eigen::Vector3i> newFaces;
-      int offset = newBase - baseIndex;
-      Eigen::Vector3i baseOffset(offset, offset, offset);
-      for (Eigen::Vector3i& face : faces) {
-        newFaces.emplace_back(face + baseOffset);
-      }
-      baseIndex = newBase;
-
-      return newFaces;
-    }
-
-    std::vector<Eigen::Vector3d> vertices;
-    std::vector<Eigen::Vector3i> faces;
-    std::vector<Eigen::Vector3d> colors;
+#include	<igl/opengl/glfw/Viewer.h>
+#include	<igl/opengl/glfw/imgui/ImGuiPlugin.h>
+#include	<igl/opengl/glfw/imgui/ImGuiMenu.h>
+#include	<igl/opengl/glfw/imgui/ImGuiHelpers.h>
+
+#include	<vector>
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>	
+#include	<string>	
+
+#include	"Socket.hh"
+
+#define	STR_MAX	1024
+
+std::vector<Eigen::Vector3d>	ball_colors	=	{Eigen::Vector3d(0.0,0.4,0.0),	//green
+																																												Eigen::Vector3d(1.0,1.0,0.0),	//yellow
+																																												Eigen::Vector3d(0.0,0.0,1.0),	//blue
+																																												Eigen::Vector3d(1.0,0.0,0.0),	//red
+																																												Eigen::Vector3d(0.5,0.0,0.3),	//purple
+																																												Eigen::Vector3d(0.7,0.5,0.0),	//orange
+																																												Eigen::Vector3d(0.0,0.0,0.0),	//black
+																																												Eigen::Vector3d(0.3,0.07,0.15),	//maroon
+																																												};
+
+
+const	double	layer_BALL	=	0.005;
+const	double	layer_TABLE	=	0.001;
+const	double	layer_BUMPER	=	0.002;
+const	double	layer_RAIL	=	0.000;
+const	double	layer_CUE	=	0.008;
+const	double	layer_POCKET	=	0.002;
+
+
+
+class	RenderedShape	{
+		public:
+				RenderedShape()	{}
+
+				int	baseIndex	=	0;
+
+				int	getNumVertices()	{
+						return	vertices.size();
+				}
+
+				int	getNumFaces()	{
+						return	faces.size();
+				}
+				
+				std::vector<Eigen::Vector3i>	getFacesWithBaseIndex(int	newBase)	{
+						std::vector<Eigen::Vector3i>	newFaces;
+						int	offset	=	newBase	-	baseIndex;
+						Eigen::Vector3i	baseOffset(offset,	offset,	offset);
+						for	(Eigen::Vector3i&	face	:	faces)	{
+								newFaces.emplace_back(face	+	baseOffset);
+						}
+						baseIndex	=	newBase;
+
+						return	newFaces;
+				}
+
+				std::vector<Eigen::Vector3d>	vertices;
+				std::vector<Eigen::Vector3i>	faces;
+				std::vector<Eigen::Vector3d>	colors;
 };
 
-class Point {
+class	Point	{
 
-  public:
-    Point () : point(0, 0) {}
-    Point (double x, double y) : point(x, y, 0) {}
-    Point (double x, double y, double layer) : point(x, y, layer) {}
+		public:
+				Point	()	:	point(0,	0)	{}
+				Point	(double	x,	double	y)	:	point(x,	y,	0)	{}
+				Point	(double	x,	double	y,	double	layer)	:	point(x,	y,	layer)	{}
 
-    Eigen::Vector3d toVec3 () const {
-      return Eigen::Vector3d(point);
-    }
+				Eigen::Vector3d	toVec3	()	const	{
+						return	Eigen::Vector3d(point);
+				}
 
-    double x() const {
-      return point[0];
-    }
+				double	x()	const	{
+						return	point[0];
+				}
 
-    double y() const {
-      return point[1];
-    }
+				double	y()	const	{
+						return	point[1];
+				}
 
-    Eigen::Vector3d point;
+				Eigen::Vector3d	point;
 };
 
-class Polygon {
-  public:
-    Polygon(unsigned int verts, double layer) : vertexMax(verts), layer(layer) {}
-
-    void addPoint(double x, double y) {
-      if (points.size() < vertexMax)
-        points.emplace_back(x, y, layer);
-    }
-
-    void setColor(double r, double g, double b) {
-      color = Eigen::Vector3d(r, g, b);
-    }
-
-    void setColor(Eigen::Vector3d& c) {
-      color = Eigen::Vector3d(c);
-    }
-
-    void setLayer(double l) {
-      layer = l;
-    }
-
-    Eigen::Vector3d getColor() const {
-      return color;
-    }
-
-    // Works with any simple convex polygon where the points are in order
-    virtual RenderedShape* render() const {
-      RenderedShape * shape = new RenderedShape();
-      
-      if (!isValid()) {
-        // Should maybe throw an error
-        std::cout << "Generic has incorrect number of corners" << std::endl;
-        return shape;
-      }
-
-      for (int i = 0; i < points.size(); i++) {
-        shape->vertices.emplace_back(points[i].toVec3());
-        shape->colors.emplace_back(color);
-      }
-
-      for (int i = 1; i < points.size()-1; i++) {
-        shape->faces.emplace_back(0, i, i+1);
-      }
-
-      return shape;
-    }
-
-    virtual bool isValid() const {
-      return points.size() <= vertexMax;
-    }
-
-  protected:
-    std::vector<Point> points;
-    Eigen::Vector3d color;
-    unsigned int vertexMax;
-    double layer;
-    int id;
+class	Polygon	{
+		public:
+				Polygon(unsigned	int	verts,	double	layer)	:	vertexMax(verts),	layer(layer)	{}
+
+				void	addPoint(double	x,	double	y)	{
+						if	(points.size()	<	vertexMax)
+								points.emplace_back(x,	y,	layer);
+				}
+
+				void	setColor(double	r,	double	g,	double	b)	{
+						color	=	Eigen::Vector3d(r,	g,	b);
+				}
+
+				void	setColor(Eigen::Vector3d&	c)	{
+						color	=	Eigen::Vector3d(c);
+				}
+
+				void	setLayer(double	l)	{
+						layer	=	l;
+				}
+
+				Eigen::Vector3d	getColor()	const	{
+						return	color;
+				}
+
+				//	Works	with	any	simple	convex	polygon	where	the	points	are	in	order
+				virtual	RenderedShape*	render()	const	{
+						RenderedShape	*	shape	=	new	RenderedShape();
+						
+						if	(!isValid())	{
+								//	Should	maybe	throw	an	error
+								std::cout	<<	"Generic	has	incorrect	number	of	corners"	<<	std::endl;
+								return	shape;
+						}
+
+						for	(int	i	=	0;	i	<	points.size();	i++)	{
+								shape->vertices.emplace_back(points[i].toVec3());
+								shape->colors.emplace_back(color);
+						}
+
+						for	(int	i	=	1;	i	<	points.size()-1;	i++)	{
+								shape->faces.emplace_back(0,	i,	i+1);
+						}
+
+						return	shape;
+				}
+
+				virtual	bool	isValid()	const	{
+						return	points.size()	<=	vertexMax;
+				}
+
+		protected:
+				std::vector<Point>	points;
+				Eigen::Vector3d	color;
+				unsigned	int	vertexMax;
+				double	layer;
+				int	id;
 };
 
-class Circle : public Polygon {
-  public:
-    Circle (double x, double y, double r, double layer) : Polygon(1, layer), radius(r) {
-      addPoint(x, y);
-    }
+class	Circle	:	public	Polygon	{
+		public:
+				Circle	(double	x,	double	y,	double	r,	double	layer)	:	Polygon(1,	layer),	radius(r)	{
+						addPoint(x,	y);
+				}
 
-    bool isValid() const {
-      return points.size() == 1 && radius >= 0;
-    }
+				bool	isValid()	const	{
+						return	points.size()	==	1	&&	radius	>=	0;
+				}
 
-    RenderedShape *render() const {
-      // Circle is broken down into wedges in order to be rendered here
-      RenderedShape *shape = new RenderedShape();
+				RenderedShape	*render()	const	{
+						//	Circle	is	broken	down	into	wedges	in	order	to	be	rendered	here
+						RenderedShape	*shape	=	new	RenderedShape();
 
-      if (!isValid()) {
-        std::cout << "Circle has incorrect number of points" << std::endl;
-        return shape;
-      }
+						if	(!isValid())	{
+								std::cout	<<	"Circle	has	incorrect	number	of	points"	<<	std::endl;
+								return	shape;
+						}
 
-      // Add colors
-      for (int i = 0; i < numWedges + 2; i++) {
-        shape->colors.emplace_back(color);
-      }
+						//	Add	colors
+						for	(int	i	=	0;	i	<	numWedges	+	2;	i++)	{
+								shape->colors.emplace_back(color);
+						}
 
-      // Add center
-      shape->vertices.emplace_back(points[0].toVec3());
+						//	Add	center
+						shape->vertices.emplace_back(points[0].toVec3());
 
-      // Add outside vertices
-      for (int i = 0; i <= numWedges; i++) {
-        shape->vertices.emplace_back(points[0].x() + radius * cos(2 * M_PI * i / numWedges),
-                                    points[0].y() + radius * sin(2 * M_PI * i / numWedges),
-                                    layer);
+						//	Add	outside	vertices
+						for	(int	i	=	0;	i	<=	numWedges;	i++)	{
+								shape->vertices.emplace_back(points[0].x()	+	radius	*	cos(2	*	M_PI	*	i	/	numWedges),
+																																				points[0].y()	+	radius	*	sin(2	*	M_PI	*	i	/	numWedges),
+																																				layer);
 
-      }
+						}
 
-      // Make the triangles
-      for (int j = 0; j <= numWedges; j++) {
-        shape->faces.emplace_back(0, j + 1, 1 + ((j + 1) % (numWedges + 1)));
-      }
+						//	Make	the	triangles
+						for	(int	j	=	0;	j	<=	numWedges;	j++)	{
+								shape->faces.emplace_back(0,	j	+	1,	1	+	((j	+	1)	%	(numWedges	+	1)));
+						}
 
 
-      return shape;
-    }
+						return	shape;
+				}
 
-  private:
-    double radius;
-    int numWedges = 20;
+		private:
+				double	radius;
+				int	numWedges	=	20;
 };
 
-class Rectangle : public Polygon {
-  public:
+class	Rectangle	:	public	Polygon	{
+		public:
 
-    // only need upper left and lower right corners
-    Rectangle(double layer) : Polygon(2, layer) {}
+				//	only	need	upper	left	and	lower	right	corners
+				Rectangle(double	layer)	:	Polygon(2,	layer)	{}
 
-    bool isValid() const {
-      return points.size() == vertexMax;
-    }
+				bool	isValid()	const	{
+						return	points.size()	==	vertexMax;
+				}
 
-    void addCorner (double x, double y) {
-      addPoint(x, y);
-    }
+				void	addCorner	(double	x,	double	y)	{
+						addPoint(x,	y);
+				}
 
-    RenderedShape* render() const {
-      RenderedShape *shape = new RenderedShape();
+				RenderedShape*	render()	const	{
+						RenderedShape	*shape	=	new	RenderedShape();
 
-      if (!isValid()) {
-        // Should maybe throw an error
-        std::cerr << "Rectangle has incorrect number of corners" << std::endl;
-        return shape;
-      }
-      
-      // Add colors
-      for (int i = 0; i < 6; i++) {
-        shape->colors.emplace_back(color);
-      }
+						if	(!isValid())	{
+								//	Should	maybe	throw	an	error
+								std::cerr	<<	"Rectangle	has	incorrect	number	of	corners"	<<	std::endl;
+								return	shape;
+						}
+						
+						//	Add	colors
+						for	(int	i	=	0;	i	<	6;	i++)	{
+								shape->colors.emplace_back(color);
+						}
 
-      // Add triangles within rectangle
-      shape->vertices.emplace_back(points[0].x(), points[1].y(), layer);
-      shape->vertices.emplace_back(points[1].x(), points[0].y(), layer);
-      shape->vertices.emplace_back(points[0].toVec3());
+						//	Add	triangles	within	rectangle
+						shape->vertices.emplace_back(points[0].x(),	points[1].y(),	layer);
+						shape->vertices.emplace_back(points[1].x(),	points[0].y(),	layer);
+						shape->vertices.emplace_back(points[0].toVec3());
 
-      shape->faces.emplace_back(0, 1, 2);
+						shape->faces.emplace_back(0,	1,	2);
 
-      shape->vertices.emplace_back(points[0].x(), points[1].y(), layer);
-      shape->vertices.emplace_back(points[1].toVec3());
-      shape->vertices.emplace_back(points[1].x(), points[0].y(), layer);
+						shape->vertices.emplace_back(points[0].x(),	points[1].y(),	layer);
+						shape->vertices.emplace_back(points[1].toVec3());
+						shape->vertices.emplace_back(points[1].x(),	points[0].y(),	layer);
 
-      shape->faces.emplace_back(3, 4, 5);
+						shape->faces.emplace_back(3,	4,	5);
 
-      return shape;
-    }
+						return	shape;
+				}
 };
 
-class Triangle : public Polygon {
-  public:
-    Triangle (double layer) : Polygon(3, layer) {}
+class	Triangle	:	public	Polygon	{
+		public:
+				Triangle	(double	layer)	:	Polygon(3,	layer)	{}
 
 
-    void addCorner (double x, double y) {
-      addPoint(x, y);
-    }
+				void	addCorner	(double	x,	double	y)	{
+						addPoint(x,	y);
+				}
 
-    RenderedShape* render() const {
-      RenderedShape *shape = new RenderedShape();
+				RenderedShape*	render()	const	{
+						RenderedShape	*shape	=	new	RenderedShape();
 
-      if (!isValid()) {
-        // Should maybe throw an error
-        std::cerr << "Triangle has incorrect number of corners" << std::endl;
-        return shape;
-      }
+						if	(!isValid())	{
+								//	Should	maybe	throw	an	error
+								std::cerr	<<	"Triangle	has	incorrect	number	of	corners"	<<	std::endl;
+								return	shape;
+						}
 
-      // Add colors and vertices at the same time
-      for (int i = 0; i < 3; i++) {
-        shape->colors.emplace_back(color);
-        shape->vertices.emplace_back(points[i].toVec3());
-      }
+						//	Add	colors	and	vertices	at	the	same	time
+						for	(int	i	=	0;	i	<	3;	i++)	{
+								shape->colors.emplace_back(color);
+								shape->vertices.emplace_back(points[i].toVec3());
+						}
 
-      // just the 1 triangle
-      shape->faces.emplace_back(0, 1, 2);
+						//	just	the	1	triangle
+						shape->faces.emplace_back(0,	1,	2);
 
-      return shape;
-    }
+						return	shape;
+				}
 };
 
-enum PolygonType {
-  GENERIC,
-  CIRCLE,
-  TRIANGLE,
-  RECTANGLE
+enum	PolygonType	{
+		GENERIC,
+		CIRCLE,
+		TRIANGLE,
+		RECTANGLE
 };
 
-class Table {
-  public:
-    Table () {}
-
-    void clearMovingShapes() {
-      for (int i = 0; i < movingShapes.size(); i++) {
-        delete movingShapes[i];
-        delete movingRenderedShapes[i];
-      }
-      movingShapes.clear();
-      movingRenderedShapes.clear();
-
-    }
-
-    void updateMovingShape(int id) {
-      // TODO
-    }
-
-    // Need to have an agreed upon way to send over variables
-    int addShape(std::vector<double> shapeData, Eigen::Vector3d color, bool isStatic, PolygonType type, double layer) {
-      Polygon *shape;
-
-      switch (type) {
-        case GENERIC: {
-          // Number of points is just data / 2 i guess
-          Polygon *newPolygon = new Polygon(shapeData.size()/2, layer);
-          for (int i = 0; i < shapeData.size(); i+=2) {
-            double x = shapeData[i];
-            double y = shapeData[i+1];
-            newPolygon->addPoint(x,y);
-          }
-          shape = newPolygon;
-          break;
-        }
-        case CIRCLE: {
-          if (shapeData.size() != 3) {
-            std::cout << "Bad shapedata size for circle" << std::endl;
-            return -1;
-          }
-          double x = shapeData[0];
-          double y = shapeData[1];
-          double r = shapeData[2];
-          Circle *newCircle = new Circle(x, y, r, layer);
-
-          shape = newCircle;
-          break;
-        }
-        case TRIANGLE: {
-          Triangle *newTriangle = new Triangle(layer);
-          if (shapeData.size() != 6) {
-            std::cout << "Bad shapedata size for triangle" << std::endl;
-            return -1;
-          }
-          for (int i = 0; i < shapeData.size(); i+=2) {
-            double x = shapeData[i];
-            double y = shapeData[i+1];
-            newTriangle->addCorner(x, y);
-          }
-
-          shape = newTriangle;
-          break;
-        }
-        case RECTANGLE: {
-          Rectangle *newRectangle = new Rectangle(layer);
-          if (shapeData.size() != 4) {
-            std::cout << "Bad shapedata size for rectangle" << std::endl;
-            return -1;
-          }
-          for (int i = 0; i < shapeData.size(); i+=2) {
-            double x = shapeData[i];
-            double y = shapeData[i+1];
-            newRectangle->addCorner(x, y);
-          }
-          shape = newRectangle;
-          break;
-        }
-        default: {
-          break;
-        }
-      }
-
-      shape->setColor(color);
-
-      if (isStatic) {
-        std::cout << "Adding to static shapes" << std::endl;
-        staticShapes.emplace_back(shape);
-      } else {
-        // std::cout << "Adding to moving shapes" << std::endl;
-        movingShapes.emplace_back(shape);
-      }
-      
-
-      return 0;
-    }
-
-    // Call this once
-    void renderStaticShapes() {
-      staticRendered = true;
-      numStaticVertices = 0;
-      numStaticFaces = 0;
-      int i = 0;
-      staticRenderedShapes.clear();
-      for (Polygon* shape : staticShapes) {
-        std::cout << "Rendering shape " << i++ << std::endl;
-        RenderedShape *renderedShape = shape->render();
-        numStaticVertices += renderedShape->getNumVertices();
-        numStaticFaces += renderedShape->getNumFaces();
-        staticRenderedShapes.emplace_back(renderedShape);
-      }
-    }
-
-    // Should think about how to make sure we aren't making big unnessary copies of stuff
-    std::tuple<Eigen::MatrixXd, Eigen::MatrixXi, Eigen::MatrixXd> getMesh() {
-
-      // if (!staticRendered) {
-      //   renderStaticShapes();
-      // }
-
-      numStaticVertices = 0;
-      numStaticFaces = 0;
-      int i = 0;
-      staticRenderedShapes.clear();
-      
-      for (Polygon* shape : staticShapes) {
-        RenderedShape *renderedShape = shape->render();
-        numStaticVertices += renderedShape->getNumVertices();
-        numStaticFaces += renderedShape->getNumFaces();
-        staticRenderedShapes.emplace_back(renderedShape);
-      }
-
-      int totalFaces = numStaticFaces;
-      int totalVertices = numStaticVertices;
-      for (Polygon* shape : movingShapes) {
-          RenderedShape *renderedShape = shape->render();
-          totalVertices += renderedShape->getNumVertices();
-          totalFaces += renderedShape->getNumFaces();
-          movingRenderedShapes.push_back(renderedShape);
-      }
-
-      // std::cout << "Total Vertices: " << totalVertices << std::endl;
-      // std::cout << "Total Faces: " << totalFaces << std::endl;
-      // std::cout << "Total Colors: " << totalVertices << std::endl;
-
-
-      // Now have to put all of these into giant matrices
-      Eigen::MatrixXd renderV;
-      renderV.resize(totalVertices, 3);
-      Eigen::MatrixXi renderF;
-      renderF.resize(totalFaces, 3);
-      Eigen::MatrixXd renderC;
-      renderC.resize(totalVertices, 3);
-
-      // TODO: Ideally have some matrix with preloaded static shapes
-      // For now do them all here
-
-      int vertexIndex = 0;
-      int faceIndex = 0;
-      for (RenderedShape* shape : staticRenderedShapes) {
-        // Add vertices and colors
-        for (int i = 0; i < shape->getNumVertices(); i++) {
-          renderV.row(i+vertexIndex) = shape->vertices[i];
-          renderC.row(i+vertexIndex) = shape->colors[i];
-        }
-
-        auto newFaces = shape->getFacesWithBaseIndex(vertexIndex);
-
-        // Add faces - with the correct offset
-        for (int i = 0; i < newFaces.size(); i++) {
-          renderF.row(i+faceIndex) = newFaces[i];
-        }
-
-        vertexIndex += shape->getNumVertices();
-        faceIndex += newFaces.size();
-      }
-
-      for (RenderedShape* shape : movingRenderedShapes) {
-        // Add vertices and colors
-        for (int i = 0; i < shape->getNumVertices(); i++) {
-          renderV.row(i+vertexIndex) = shape->vertices[i];
-          renderC.row(i+vertexIndex) = shape->colors[i];
-        }
-
-        auto newFaces = shape->getFacesWithBaseIndex(vertexIndex);
-
-        // Add faces - with the correct offset
-        for (int i = 0; i < newFaces.size(); i++) {
-          renderF.row(i+faceIndex) = newFaces[i];
-        }
-
-        vertexIndex += shape->getNumVertices();
-        faceIndex += newFaces.size();
-      }
-
-      return std::make_tuple(renderV, renderF, renderC);
-    }
-
-  private:
-    std::vector<Polygon *> staticShapes;
-    std::vector<Polygon *> movingShapes;
-    std::vector<RenderedShape *> staticRenderedShapes;
-    std::vector<RenderedShape *> movingRenderedShapes;
-    int numStaticVertices;
-    int numStaticFaces;
-    bool staticRendered = false;
+class	Table	{
+		public:
+				Table	()	{}
+
+				void	clearMovingShapes()	{
+						for	(int	i	=	0;	i	<	movingShapes.size();	i++)	{
+								delete	movingShapes[i];
+								delete	movingRenderedShapes[i];
+						}
+						movingShapes.clear();
+						movingRenderedShapes.clear();
+
+				}
+
+				void	updateMovingShape(int	id)	{
+						//	TODO
+				}
+
+				//	Need	to	have	an	agreed	upon	way	to	send	over	variables
+				int	addShape(std::vector<double>	shapeData,	Eigen::Vector3d	color,	bool	isStatic,	PolygonType	type,	double	layer)	{
+						Polygon	*shape;
+
+						switch	(type)	{
+								case	GENERIC:	{
+										//	Number	of	points	is	just	data	/	2	i	guess
+										Polygon	*newPolygon	=	new	Polygon(shapeData.size()/2,	layer);
+										for	(int	i	=	0;	i	<	shapeData.size();	i+=2)	{
+												double	x	=	shapeData[i];
+												double	y	=	shapeData[i+1];
+												newPolygon->addPoint(x,y);
+										}
+										shape	=	newPolygon;
+										break;
+								}
+								case	CIRCLE:	{
+										if	(shapeData.size()	!=	3)	{
+												std::cout	<<	"Bad	shapedata	size	for	circle"	<<	std::endl;
+												return	-1;
+										}
+										double	x	=	shapeData[0];
+										double	y	=	shapeData[1];
+										double	r	=	shapeData[2];
+										Circle	*newCircle	=	new	Circle(x,	y,	r,	layer);
+
+										shape	=	newCircle;
+										break;
+								}
+								case	TRIANGLE:	{
+										Triangle	*newTriangle	=	new	Triangle(layer);
+										if	(shapeData.size()	!=	6)	{
+												std::cout	<<	"Bad	shapedata	size	for	triangle"	<<	std::endl;
+												return	-1;
+										}
+										for	(int	i	=	0;	i	<	shapeData.size();	i+=2)	{
+												double	x	=	shapeData[i];
+												double	y	=	shapeData[i+1];
+												newTriangle->addCorner(x,	y);
+										}
+
+										shape	=	newTriangle;
+										break;
+								}
+								case	RECTANGLE:	{
+										Rectangle	*newRectangle	=	new	Rectangle(layer);
+										if	(shapeData.size()	!=	4)	{
+												std::cout	<<	"Bad	shapedata	size	for	rectangle"	<<	std::endl;
+												return	-1;
+										}
+										for	(int	i	=	0;	i	<	shapeData.size();	i+=2)	{
+												double	x	=	shapeData[i];
+												double	y	=	shapeData[i+1];
+												newRectangle->addCorner(x,	y);
+										}
+										shape	=	newRectangle;
+										break;
+								}
+								default:	{
+										break;
+								}
+						}
+
+						shape->setColor(color);
+
+						if	(isStatic)	{
+								std::cout	<<	"Adding	to	static	shapes"	<<	std::endl;
+								staticShapes.emplace_back(shape);
+						}	else	{
+								//	std::cout	<<	"Adding	to	moving	shapes"	<<	std::endl;
+								movingShapes.emplace_back(shape);
+						}
+						
+
+						return	0;
+				}
+
+				//	Call	this	once
+				void	renderStaticShapes()	{
+						staticRendered	=	true;
+						numStaticVertices	=	0;
+						numStaticFaces	=	0;
+						int	i	=	0;
+						staticRenderedShapes.clear();
+						for	(Polygon*	shape	:	staticShapes)	{
+								std::cout	<<	"Rendering	shape	"	<<	i++	<<	std::endl;
+								RenderedShape	*renderedShape	=	shape->render();
+								numStaticVertices	+=	renderedShape->getNumVertices();
+								numStaticFaces	+=	renderedShape->getNumFaces();
+								staticRenderedShapes.emplace_back(renderedShape);
+						}
+				}
+
+				//	Should	think	about	how	to	make	sure	we	aren't	making	big	unnessary	copies	of	stuff
+				std::tuple<Eigen::MatrixXd,	Eigen::MatrixXi,	Eigen::MatrixXd>	getMesh()	{
+
+						//	if	(!staticRendered)	{
+						//			renderStaticShapes();
+						//	}
+
+						numStaticVertices	=	0;
+						numStaticFaces	=	0;
+						int	i	=	0;
+						staticRenderedShapes.clear();
+						
+						for	(Polygon*	shape	:	staticShapes)	{
+								RenderedShape	*renderedShape	=	shape->render();
+								numStaticVertices	+=	renderedShape->getNumVertices();
+								numStaticFaces	+=	renderedShape->getNumFaces();
+								staticRenderedShapes.emplace_back(renderedShape);
+						}
+
+						int	totalFaces	=	numStaticFaces;
+						int	totalVertices	=	numStaticVertices;
+						for	(Polygon*	shape	:	movingShapes)	{
+										RenderedShape	*renderedShape	=	shape->render();
+										totalVertices	+=	renderedShape->getNumVertices();
+										totalFaces	+=	renderedShape->getNumFaces();
+										movingRenderedShapes.push_back(renderedShape);
+						}
+
+						//	std::cout	<<	"Total	Vertices:	"	<<	totalVertices	<<	std::endl;
+						//	std::cout	<<	"Total	Faces:	"	<<	totalFaces	<<	std::endl;
+						//	std::cout	<<	"Total	Colors:	"	<<	totalVertices	<<	std::endl;
+
+
+						//	Now	have	to	put	all	of	these	into	giant	matrices
+						Eigen::MatrixXd	renderV;
+						renderV.resize(totalVertices,	3);
+						Eigen::MatrixXi	renderF;
+						renderF.resize(totalFaces,	3);
+						Eigen::MatrixXd	renderC;
+						renderC.resize(totalVertices,	3);
+
+						//	TODO:	Ideally	have	some	matrix	with	preloaded	static	shapes
+						//	For	now	do	them	all	here
+
+						int	vertexIndex	=	0;
+						int	faceIndex	=	0;
+						for	(RenderedShape*	shape	:	staticRenderedShapes)	{
+								//	Add	vertices	and	colors
+								for	(int	i	=	0;	i	<	shape->getNumVertices();	i++)	{
+										renderV.row(i+vertexIndex)	=	shape->vertices[i];
+										renderC.row(i+vertexIndex)	=	shape->colors[i];
+								}
+
+								auto	newFaces	=	shape->getFacesWithBaseIndex(vertexIndex);
+
+								//	Add	faces	-	with	the	correct	offset
+								for	(int	i	=	0;	i	<	newFaces.size();	i++)	{
+										renderF.row(i+faceIndex)	=	newFaces[i];
+								}
+
+								vertexIndex	+=	shape->getNumVertices();
+								faceIndex	+=	newFaces.size();
+						}
+
+						for	(RenderedShape*	shape	:	movingRenderedShapes)	{
+								//	Add	vertices	and	colors
+								for	(int	i	=	0;	i	<	shape->getNumVertices();	i++)	{
+										renderV.row(i+vertexIndex)	=	shape->vertices[i];
+										renderC.row(i+vertexIndex)	=	shape->colors[i];
+								}
+
+								auto	newFaces	=	shape->getFacesWithBaseIndex(vertexIndex);
+
+								//	Add	faces	-	with	the	correct	offset
+								for	(int	i	=	0;	i	<	newFaces.size();	i++)	{
+										renderF.row(i+faceIndex)	=	newFaces[i];
+								}
+
+								vertexIndex	+=	shape->getNumVertices();
+								faceIndex	+=	newFaces.size();
+						}
+
+						return	std::make_tuple(renderV,	renderF,	renderC);
+				}
+
+		private:
+				std::vector<Polygon	*>	staticShapes;
+				std::vector<Polygon	*>	movingShapes;
+				std::vector<RenderedShape	*>	staticRenderedShapes;
+				std::vector<RenderedShape	*>	movingRenderedShapes;
+				int	numStaticVertices;
+				int	numStaticFaces;
+				bool	staticRendered	=	false;
 };
 
-void printUsage() {
-  std::cout << "Usage: program <portNumber>" << std::endl;
+void	printUsage()	{
+		std::cout	<<	"Usage:	program	<portNumber>"	<<	std::endl;
 }
 
-std::vector<std::string> split (std::string& str, const char delim) {
-  std::stringstream ss(str);
-  std::string s;
-  std::vector<std::string> ret;
-  while (ss >> s) {
-    ret.push_back(s);
-  }
-  return ret;
+std::vector<std::string>	split	(std::string&	str,	const	char	delim)	{
+		std::stringstream	ss(str);
+		std::string	s;
+		std::vector<std::string>	ret;
+		while	(ss	>>	s)	{
+				ret.push_back(s);
+		}
+		return	ret;
 }
 
-double totalTime = 0;
-std::vector<double> requestTime;
+double	totalTime	=	0;
+std::vector<double>	requestTime;
 
-template <typename T> 
-T stringConvert (const std::string& str)
+template	<typename	T>	
+T	stringConvert	(const	std::string&	str)
 {
-    std::istringstream ss(str);
-    T num;
-    ss >> num;
-    return num;
+				std::istringstream	ss(str);
+				T	num;
+				ss	>>	num;
+				return	num;
 }
 
-template <typename T> 
-std::vector<T> trickResponseConvert (std::string& response)
+template	<typename	T>	
+std::vector<T>	trickResponseConvert	(std::string&	response)
 {
-    auto responseSplit = split(response, '\t');
-    std::vector<T> result;
-    // ignore index 0
-    for (int i = 1; i < responseSplit.size(); i++) {
-      result.push_back(stringConvert<T>(responseSplit[i]));
-    }
-    return result;
+				auto	responseSplit	=	split(response,	'\t');
+				std::vector<T>	result;
+				//	ignore	index	0
+				for	(int	i	=	1;	i	<	responseSplit.size();	i++)	{
+						result.push_back(stringConvert<T>(responseSplit[i]));
+				}
+				return	result;
 }
 
-template <typename T> 
-T getVar(Socket& socket, std::string varName) {
-  std::string requestString = "trick.var_send_once(\"" + varName + "\")\n";
-  std::string reply;
-  // std::cout << "Request: " << requestString << std::endl;
+template	<typename	T>	
+T	getVar(Socket&	socket,	std::string	varName)	{
+		std::string	requestString	=	"trick.var_send_once(\""	+	varName	+	"\")\n";
+		std::string	reply;
+		//	std::cout	<<	"Request:	"	<<	requestString	<<	std::endl;
 
-  socket << requestString;
-  socket >> reply;
-  // std::cout << "Reply: " << reply << std::endl;
+		socket	<<	requestString;
+		socket	>>	reply;
+		//	std::cout	<<	"Reply:	"	<<	reply	<<	std::endl;
 
-  return stringConvert<T>(split(reply, '\t')[1]);
+		return	stringConvert<T>(split(reply,	'\t')[1]);
 }
 
-// Wrapper for sprintf use case bc im tired of dealing with std::string vs char* stuff
-std::string format(const std::string& formatString, int num) {
-    size_t buf_len = formatString.size() + 10;
-    char *buf = (char *)malloc(buf_len);
-    snprintf(buf, buf_len, formatString.c_str(), num);
-    
-    return std::string(buf);
+//	Wrapper	for	sprintf	use	case	bc	im	tired	of	dealing	with	std::string	vs	char*	stuff
+std::string	format(const	std::string&	formatString,	int	num)	{
+				size_t	buf_len	=	formatString.size()	+	10;
+				char	*buf	=	(char	*)malloc(buf_len);
+				snprintf(buf,	buf_len,	formatString.c_str(),	num);
+				
+				return	std::string(buf);
 }
 
-// Assumes the varName string has a %d in it
-template <typename T> 
-std::vector<T> getVarList(Socket& socket, std::string varName, int num) {
-  std::string totalRequest = "";
-  std::vector<T> result;
-  totalRequest += format(varName, 0);
-  for (int i = 1; i < num; i++) {
-    totalRequest += ", ";
-    totalRequest += format(varName, i);
-  }
-
-  std::string requestString = "trick.var_send_once(\"" + totalRequest + "\", " + std::to_string(num) + ")\n";
-  // std::cout << "Request: " << requestString << std::endl;
-
-  std::string reply;
-  socket << requestString;
-  socket >> reply;
-
-  // std::cout << "Reply: " << reply << std::endl;
-  return trickResponseConvert<T>(reply);
+//	Assumes	the	varName	string	has	a	%d	in	it
+template	<typename	T>	
+std::vector<T>	getVarList(Socket&	socket,	std::string	varName,	int	num)	{
+		std::string	totalRequest	=	"";
+		std::vector<T>	result;
+		totalRequest	+=	format(varName,	0);
+		for	(int	i	=	1;	i	<	num;	i++)	{
+				totalRequest	+=	",	";
+				totalRequest	+=	format(varName,	i);
+		}
+
+		std::string	requestString	=	"trick.var_send_once(\""	+	totalRequest	+	"\",	"	+	std::to_string(num)	+	")\n";
+		//	std::cout	<<	"Request:	"	<<	requestString	<<	std::endl;
+
+		std::string	reply;
+		socket	<<	requestString;
+		socket	>>	reply;
+
+		//	std::cout	<<	"Reply:	"	<<	reply	<<	std::endl;
+		return	trickResponseConvert<T>(reply);
 }
 
-template <typename T>
-std::vector<T> fold (const std::vector<T> a, const std::vector<T> b) {
-  std::vector<T> result;
-  for (int i = 0; i < a.size() && i < b.size(); i++) {
-    result.emplace_back (a[i]);
-    result.emplace_back (b[i]);
-  }
-  return result;
+template	<typename	T>
+std::vector<T>	fold	(const	std::vector<T>	a,	const	std::vector<T>	b)	{
+		std::vector<T>	result;
+		for	(int	i	=	0;	i	<	a.size()	&&	i	<	b.size();	i++)	{
+				result.emplace_back	(a[i]);
+				result.emplace_back	(b[i]);
+		}
+		return	result;
 }
 
-int main(int argc, char *argv[])
+int	main(int	argc,	char	*argv[])
 {
-  // Parse socket number out of argv
-  if (argc != 2) {
-    printUsage();
-    return -1;
-  }
-
-  bool socketOn = true;
-  int port = 0;
-  port = std::stoi(argv[1]);
-  if (port == 0) {
-    socketOn = false;
-  }
-
-  std::cout << "Port received: " << port << std::endl;
-  Socket socket;
-  socket.init("localhost", port);
-
-  std::string reply;
-
-  socket << "trick.var_set_client_tag(\"PoolTableDisplay\") \n";
-
-  int numBalls = getVar<int>(socket, "dyn.table.numBalls");
-  // int numBalls = 16;
-  std::vector<double> radii = getVarList<double>(socket, "dyn.table.balls[%d][0].radius", numBalls);
-  int numTablePoints = getVar<int>(socket, "dyn.table.numTablePoints");
-  enum PolygonType tableShape = PolygonType(getVar<int>(socket, "dyn.table.tableShapeType"));
-  std::vector<double> table_x = getVarList<double>(socket, "dyn.table.tableShape[%d][0]._x", numTablePoints);
-  std::vector<double> table_y = getVarList<double>(socket, "dyn.table.tableShape[%d][0]._y", numTablePoints);
-  std::vector<double> tablePoints = fold(table_x, table_y);
-
-  Table table;
-  // std::cout << "TablePoints: ";
-  
-  for (auto point : tablePoints ) {
-    // std::cout << point << " ";
-  }
-  // std::cout << "\ttableShape: " << tableShape << std::endl;
-
-  table.addShape(tablePoints, Eigen::Vector3d(0.2, 0.6, 0.2), true, tableShape, layer_TABLE);
-
-  // Make the rail - translate each point on the table out from center by railWidth
-  std::vector<double> railData;
-
-  if (tableShape == RECTANGLE) { 
-    // If it's a rectangle then the rail is a bigger rectangle   
-    double railWidth = 0.07;
-    railData.push_back(tablePoints[0] - railWidth);
-    railData.push_back(tablePoints[1] - railWidth);
-    railData.push_back(tablePoints[2] + railWidth);
-    railData.push_back(tablePoints[3] + railWidth);
-  } else {
-    // If it's just a shape then rail is bigger shape
-    // Works with simple convex polygons centered at 0,0
-    // Could probably calculate center and make it more general but i dont want to
-    double railWidth = 0.15;
-    for (int i = 0; i < tablePoints.size(); i+=2) {
-      Eigen::Vector2d point(tablePoints[i], tablePoints[i+1]);
-      Eigen::Vector2d railPoint(tablePoints[i], tablePoints[i+1]);
-      point = point.normalized() * railWidth;
-      railPoint = railPoint + point;
-      railData.push_back(railPoint(0));
-      railData.push_back(railPoint(1));
-    }
-  }
-
-  table.addShape(railData, Eigen::Vector3d(.3, .2, .15), true, tableShape, layer_RAIL);
-
-  // pockets
-  int numPockets = getVar<int>(socket, "dyn.table.numPockets");
-  
-  std::vector<double> pocket_x = getVarList<double>(socket, "dyn.table.pockets[%d][0].pos._x", numPockets);
-  std::vector<double> pocket_y = getVarList<double>(socket, "dyn.table.pockets[%d][0].pos._y", numPockets);
-  std::vector<double> pocket_r = getVarList<double>(socket, "dyn.table.pockets[%d][0].radius", numPockets);
-  for (int i = 0; i < numPockets; i++) {
-    table.addShape(std::vector<double>({pocket_x[i],pocket_y[i],pocket_r[i]}), Eigen::Vector3d(0.0, 0.0, 0.0), true, CIRCLE, layer_POCKET);
-  }
-
-  // bumpers
-  int numBumpers = getVar<int>(socket, "dyn.table.numBumpers");
-  for (int i = 0; i < numBumpers; i++) {
-    int numPoints = getVar<int>(socket,format("dyn.table.bumpers[%d][0].numPoints", i));
-    PolygonType bumperShapeType = PolygonType(getVar<int>(socket,format("dyn.table.bumpers[%d][0].shapeType", i)));
-
-    std::string request_bumper = format("dyn.table.bumpers[%d][0]", i);
-
-    std::string request_x =  request_bumper + ".renderedShape[%d][0]._x";
-    std::string request_y =  request_bumper + ".renderedShape[%d][0]._y";
-
-    std::vector<double> list_x = getVarList<double>(socket, request_x, numPoints);
-    std::vector<double> list_y = getVarList<double>(socket, request_y, numPoints);
-    std::vector<double> bumperBorder = fold(list_x, list_y);
-    table.addShape(bumperBorder, Eigen::Vector3d(0.2,0.4,0.2), true, bumperShapeType, layer_BUMPER);
-
-  }
-
-  // Request all of the ball positions
-
-  std::vector<double> ball_x = getVarList<double>(socket, "dyn.table.balls[%d][0].pos._x", numBalls);
-  std::vector<double> ball_y = getVarList<double>(socket, "dyn.table.balls[%d][0].pos._y", numBalls);
-  for (int i = 0; i < numBalls; i++) {
-    Eigen::Vector3d circleColor = ball_colors[i % ball_colors.size()];
-    table.addShape(std::vector<double>({ball_x[i], ball_y[i], radii[i]}), circleColor, false, CIRCLE, layer_BALL);
-  }
-
-  bool mousePressed = false;
-  double mouseX = 0;
-  double mouseY = 0;
-
-  Eigen::MatrixXd V;
-  Eigen::MatrixXi F;
-  Eigen::MatrixXd C;
-
-  std::tie(V, F, C) = table.getMesh();
-
-  igl::opengl::glfw::Viewer * view = new igl::opengl::glfw::Viewer();
-  igl::opengl::glfw::imgui::ImGuiPlugin *plugin = new igl::opengl::glfw::imgui::ImGuiPlugin();
-  igl::opengl::glfw::imgui::ImGuiMenu *menu = new igl::opengl::glfw::imgui::ImGuiMenu();
-
-  view->plugins.push_back(plugin);
-  plugin->widgets.push_back(menu);
-
-  view->callback_mouse_down = [&](igl::opengl::glfw::Viewer& viewer, int button, int modifier) -> bool {
-    mousePressed = true;
-    return false;
-  };
-
-  view->callback_mouse_up = [&] (igl::opengl::glfw::Viewer& viewer, int button, int modifier) -> bool {
-    mousePressed = false;
-    std::string cueRequest = "";
-    std::string templateString = "dyn.table.applyCueForce(%.3f, %.3f) \n";
-
-    char buf[2048];
-    snprintf(buf, sizeof(buf), templateString.c_str(), mouseX, mouseY);
-    cueRequest += std::string(buf);
-    socket << cueRequest;
-    return false;
-  };
-
-  view->callback_mouse_move = [&] (igl::opengl::glfw::Viewer& viewer, int mouse_x, int mouse_y) {
-    Eigen::Vector3f pos(mouse_x, mouse_y, 0);
-    Eigen::Matrix4f model = viewer.core().view;
-    // Viewer is made for 3d, so we have to do math to figure out what the 2d mouse coordinates are
-    Eigen::Vector3f unproj = igl::unproject(pos, model, viewer.core().proj, viewer.core().viewport);
-    mouseX = unproj[0];
-    mouseY = -unproj[1];
-    return true;
-  };
-
-  view->callback_pre_draw = [&](igl::opengl::glfw::Viewer& viewer) -> bool {
-    // Look for new data and redraw
-    // std::cout << "Waiting vars" << std::endl;
-    socket >> reply;
-    // std::cout << "Got vars: " << reply << std::endl;
-
-    std::vector<double> replyData = trickResponseConvert<double>(reply);
-
-    if (replyData.size() <= 1) {
-      return false;
-    }
-
-    table.clearMovingShapes();
-
-    Eigen::Vector2d cueBallPos;
-    int cueBallIndex = 0;
-
-    for (int i = 0; i < numBalls; i++) {
-      double inPlay = replyData[1+(i*3 + 2)];
-      if (inPlay == 0) {
-        continue;
-      }
-      std::vector<double> circleData = {replyData[1+(i*3)], replyData[1+(i*3 + 1)], radii[i]};
-      Eigen::Vector3d circleColor;
-      if (i == cueBallIndex) {
-        circleColor = Eigen::Vector3d(1,1,1);
-        cueBallPos = Eigen::Vector2d(replyData[1+(i*2)], replyData[1+(i*2 + 1)]);
-      } else {
-        circleColor = ball_colors[i % ball_colors.size()];
-      }
-      table.addShape(circleData, circleColor, false, CIRCLE, layer_BALL);
-    }
-
-    if (mousePressed) {
-      // Draw the cue
-      double cue_width = 0.03;
-      Eigen::Vector2d cue_end(mouseX, mouseY);
-      Eigen::Vector2d vec = (cue_end - cueBallPos).normalized();
-      Eigen::Vector2d off1(-vec(1), vec(0));
-      Eigen::Vector2d off2(vec(1), -vec(0));
-      Eigen::Vector2d point1 = cue_end + (off1 * cue_width);
-      Eigen::Vector2d point2 = cue_end + (off2 * cue_width);
-      std::vector<double> triangleData = {cueBallPos(0), cueBallPos(1), point1(0), point1(1), point2(0), point2(1)};
-      table.addShape(triangleData, Eigen::Vector3d(0, 0, 0), false, TRIANGLE, layer_CUE);
-    }
-
-    std::tie(V, F, C) = table.getMesh();
-    
-    viewer.data().clear();
-    viewer.core().orthographic = true;
-    viewer.data().show_lines = false;
-    viewer.data().set_face_based(false);
-    viewer.data().double_sided = true;
-    viewer.core().is_animating = true;
-    viewer.core().camera_zoom = 2;
-
-    // Set mesh and colors to new positions
-    viewer.data().set_mesh(V, F);
-    viewer.data().set_colors(C);
-
-    return false;
-  };
-
-  menu->callback_draw_viewer_menu = [&] () {
-    ImGui::Text("Menu");
-    if (ImGui::Button("Reset Cue Ball", ImVec2(-1, 0)))
-    {
-      std::string message = "dyn.table.resetCueBall() \n";
-      socket << message;
-    }
-  };
-
-
-  // Initial viewer setup
-  view->core().orthographic = true;
-  view->core().camera_zoom = 2;
-  view->data().show_lines = false;
-  view->data().set_face_based(false);
-  view->data().double_sided = true;
-  view->core().is_animating = true;
-
-  // Plot the mesh
-  view->data().set_mesh(V, F);
-  view->data().set_colors(C);
-
-  // Viewer is blocking, have to launch it in a separate thread
-
-  // Need to get nBalls and positions every time
-  socket << "trick.var_pause() \n";
-  socket << "trick.var_add(\"dyn.table.numBalls\")\n";
-  std::string positionRequest = "";
-  char * templateString = "trick.var_add(\"dyn.table.balls[%d][0].pos._x\")\ntrick.var_add(\"dyn.table.balls[%d][0].pos._y\")\ntrick.var_add(\"dyn.table.balls[%d][0].inPlay\")\n";
-  for (int i = 0; i < numBalls; i++) {
-    char buf[2048];
-    snprintf(buf, sizeof(buf), templateString, i, i, i);
-    positionRequest += std::string(buf);
-  }
-  socket << positionRequest;
-  socket << "trick.var_ascii() \n";
-  socket << "trick.var_cycle(0.010) \n";
-  socket << "trick.var_unpause() \n";
-    
-  view->launch();
+		//	Parse	socket	number	out	of	argv
+		if	(argc	!=	2)	{
+				printUsage();
+				return	-1;
+		}
+
+		bool	socketOn	=	true;
+		int	port	=	0;
+		port	=	std::stoi(argv[1]);
+		if	(port	==	0)	{
+				socketOn	=	false;
+		}
+
+		std::cout	<<	"Port	received:	"	<<	port	<<	std::endl;
+		Socket	socket;
+		socket.init("localhost",	port);
+
+		std::string	reply;
+
+		socket	<<	"trick.var_set_client_tag(\"PoolTableDisplay\")	\n";
+
+		int	numBalls	=	getVar<int>(socket,	"dyn.table.numBalls");
+		//	int	numBalls	=	16;
+		std::vector<double>	radii	=	getVarList<double>(socket,	"dyn.table.balls[%d][0].radius",	numBalls);
+		int	numTablePoints	=	getVar<int>(socket,	"dyn.table.numTablePoints");
+		enum	PolygonType	tableShape	=	PolygonType(getVar<int>(socket,	"dyn.table.tableShapeType"));
+		std::vector<double>	table_x	=	getVarList<double>(socket,	"dyn.table.tableShape[%d][0]._x",	numTablePoints);
+		std::vector<double>	table_y	=	getVarList<double>(socket,	"dyn.table.tableShape[%d][0]._y",	numTablePoints);
+		std::vector<double>	tablePoints	=	fold(table_x,	table_y);
+
+		Table	table;
+		//	std::cout	<<	"TablePoints:	";
+		
+		for	(auto	point	:	tablePoints	)	{
+				//	std::cout	<<	point	<<	"	";
+		}
+		//	std::cout	<<	"\ttableShape:	"	<<	tableShape	<<	std::endl;
+
+		table.addShape(tablePoints,	Eigen::Vector3d(0.2,	0.6,	0.2),	true,	tableShape,	layer_TABLE);
+
+		//	Make	the	rail	-	translate	each	point	on	the	table	out	from	center	by	railWidth
+		std::vector<double>	railData;
+
+		if	(tableShape	==	RECTANGLE)	{	
+				//	If	it's	a	rectangle	then	the	rail	is	a	bigger	rectangle			
+				double	railWidth	=	0.07;
+				railData.push_back(tablePoints[0]	-	railWidth);
+				railData.push_back(tablePoints[1]	-	railWidth);
+				railData.push_back(tablePoints[2]	+	railWidth);
+				railData.push_back(tablePoints[3]	+	railWidth);
+		}	else	{
+				//	If	it's	just	a	shape	then	rail	is	bigger	shape
+				//	Works	with	simple	convex	polygons	centered	at	0,0
+				//	Could	probably	calculate	center	and	make	it	more	general	but	i	dont	want	to
+				double	railWidth	=	0.15;
+				for	(int	i	=	0;	i	<	tablePoints.size();	i+=2)	{
+						Eigen::Vector2d	point(tablePoints[i],	tablePoints[i+1]);
+						Eigen::Vector2d	railPoint(tablePoints[i],	tablePoints[i+1]);
+						point	=	point.normalized()	*	railWidth;
+						railPoint	=	railPoint	+	point;
+						railData.push_back(railPoint(0));
+						railData.push_back(railPoint(1));
+				}
+		}
+
+		table.addShape(railData,	Eigen::Vector3d(.3,	.2,	.15),	true,	tableShape,	layer_RAIL);
+
+		//	pockets
+		int	numPockets	=	getVar<int>(socket,	"dyn.table.numPockets");
+		
+		std::vector<double>	pocket_x	=	getVarList<double>(socket,	"dyn.table.pockets[%d][0].pos._x",	numPockets);
+		std::vector<double>	pocket_y	=	getVarList<double>(socket,	"dyn.table.pockets[%d][0].pos._y",	numPockets);
+		std::vector<double>	pocket_r	=	getVarList<double>(socket,	"dyn.table.pockets[%d][0].radius",	numPockets);
+		for	(int	i	=	0;	i	<	numPockets;	i++)	{
+				table.addShape(std::vector<double>({pocket_x[i],pocket_y[i],pocket_r[i]}),	Eigen::Vector3d(0.0,	0.0,	0.0),	true,	CIRCLE,	layer_POCKET);
+		}
+
+		//	bumpers
+		int	numBumpers	=	getVar<int>(socket,	"dyn.table.numBumpers");
+		for	(int	i	=	0;	i	<	numBumpers;	i++)	{
+				int	numPoints	=	getVar<int>(socket,format("dyn.table.bumpers[%d][0].numPoints",	i));
+				PolygonType	bumperShapeType	=	PolygonType(getVar<int>(socket,format("dyn.table.bumpers[%d][0].shapeType",	i)));
+
+				std::string	request_bumper	=	format("dyn.table.bumpers[%d][0]",	i);
+
+				std::string	request_x	=		request_bumper	+	".renderedShape[%d][0]._x";
+				std::string	request_y	=		request_bumper	+	".renderedShape[%d][0]._y";
+
+				std::vector<double>	list_x	=	getVarList<double>(socket,	request_x,	numPoints);
+				std::vector<double>	list_y	=	getVarList<double>(socket,	request_y,	numPoints);
+				std::vector<double>	bumperBorder	=	fold(list_x,	list_y);
+				table.addShape(bumperBorder,	Eigen::Vector3d(0.2,0.4,0.2),	true,	bumperShapeType,	layer_BUMPER);
+
+		}
+
+		//	Request	all	of	the	ball	positions
+
+		std::vector<double>	ball_x	=	getVarList<double>(socket,	"dyn.table.balls[%d][0].pos._x",	numBalls);
+		std::vector<double>	ball_y	=	getVarList<double>(socket,	"dyn.table.balls[%d][0].pos._y",	numBalls);
+		for	(int	i	=	0;	i	<	numBalls;	i++)	{
+				Eigen::Vector3d	circleColor	=	ball_colors[i	%	ball_colors.size()];
+				table.addShape(std::vector<double>({ball_x[i],	ball_y[i],	radii[i]}),	circleColor,	false,	CIRCLE,	layer_BALL);
+		}
+
+		bool	mousePressed	=	false;
+		double	mouseX	=	0;
+		double	mouseY	=	0;
+
+		Eigen::MatrixXd	V;
+		Eigen::MatrixXi	F;
+		Eigen::MatrixXd	C;
+
+		std::tie(V,	F,	C)	=	table.getMesh();
+
+		igl::opengl::glfw::Viewer	*	view	=	new	igl::opengl::glfw::Viewer();
+		igl::opengl::glfw::imgui::ImGuiPlugin	*plugin	=	new	igl::opengl::glfw::imgui::ImGuiPlugin();
+		igl::opengl::glfw::imgui::ImGuiMenu	*menu	=	new	igl::opengl::glfw::imgui::ImGuiMenu();
+
+		view->plugins.push_back(plugin);
+		plugin->widgets.push_back(menu);
+
+		view->callback_mouse_down	=	[&](igl::opengl::glfw::Viewer&	viewer,	int	button,	int	modifier)	->	bool	{
+				mousePressed	=	true;
+				return	false;
+		};
+
+		view->callback_mouse_up	=	[&]	(igl::opengl::glfw::Viewer&	viewer,	int	button,	int	modifier)	->	bool	{
+				mousePressed	=	false;
+				std::string	cueRequest	=	"";
+				std::string	templateString	=	"dyn.table.applyCueForce(%.3f,	%.3f)	\n";
+
+				char	buf[2048];
+				snprintf(buf,	sizeof(buf),	templateString.c_str(),	mouseX,	mouseY);
+				cueRequest	+=	std::string(buf);
+				socket	<<	cueRequest;
+				return	false;
+		};
+
+		view->callback_mouse_move	=	[&]	(igl::opengl::glfw::Viewer&	viewer,	int	mouse_x,	int	mouse_y)	{
+				Eigen::Vector3f	pos(mouse_x,	mouse_y,	0);
+				Eigen::Matrix4f	model	=	viewer.core().view;
+				//	Viewer	is	made	for	3d,	so	we	have	to	do	math	to	figure	out	what	the	2d	mouse	coordinates	are
+				Eigen::Vector3f	unproj	=	igl::unproject(pos,	model,	viewer.core().proj,	viewer.core().viewport);
+				mouseX	=	unproj[0];
+				mouseY	=	-unproj[1];
+				return	true;
+		};
+
+		view->callback_pre_draw	=	[&](igl::opengl::glfw::Viewer&	viewer)	->	bool	{
+				//	Look	for	new	data	and	redraw
+				//	std::cout	<<	"Waiting	vars"	<<	std::endl;
+				socket	>>	reply;
+				//	std::cout	<<	"Got	vars:	"	<<	reply	<<	std::endl;
+
+				std::vector<double>	replyData	=	trickResponseConvert<double>(reply);
+
+				if	(replyData.size()	<=	1)	{
+						return	false;
+				}
+
+				table.clearMovingShapes();
+
+				Eigen::Vector2d	cueBallPos;
+				int	cueBallIndex	=	0;
+
+				for	(int	i	=	0;	i	<	numBalls;	i++)	{
+						double	inPlay	=	replyData[1+(i*3	+	2)];
+						if	(inPlay	==	0)	{
+								continue;
+						}
+						std::vector<double>	circleData	=	{replyData[1+(i*3)],	replyData[1+(i*3	+	1)],	radii[i]};
+						Eigen::Vector3d	circleColor;
+						if	(i	==	cueBallIndex)	{
+								circleColor	=	Eigen::Vector3d(1,1,1);
+								cueBallPos	=	Eigen::Vector2d(replyData[1+(i*2)],	replyData[1+(i*2	+	1)]);
+						}	else	{
+								circleColor	=	ball_colors[i	%	ball_colors.size()];
+						}
+						table.addShape(circleData,	circleColor,	false,	CIRCLE,	layer_BALL);
+				}
+
+				if	(mousePressed)	{
+						//	Draw	the	cue
+						double	cue_width	=	0.03;
+						Eigen::Vector2d	cue_end(mouseX,	mouseY);
+						Eigen::Vector2d	vec	=	(cue_end	-	cueBallPos).normalized();
+						Eigen::Vector2d	off1(-vec(1),	vec(0));
+						Eigen::Vector2d	off2(vec(1),	-vec(0));
+						Eigen::Vector2d	point1	=	cue_end	+	(off1	*	cue_width);
+						Eigen::Vector2d	point2	=	cue_end	+	(off2	*	cue_width);
+						std::vector<double>	triangleData	=	{cueBallPos(0),	cueBallPos(1),	point1(0),	point1(1),	point2(0),	point2(1)};
+						table.addShape(triangleData,	Eigen::Vector3d(0,	0,	0),	false,	TRIANGLE,	layer_CUE);
+				}
+
+				std::tie(V,	F,	C)	=	table.getMesh();
+				
+				viewer.data().clear();
+				viewer.core().orthographic	=	true;
+				viewer.data().show_lines	=	false;
+				viewer.data().set_face_based(false);
+				viewer.data().double_sided	=	true;
+				viewer.core().is_animating	=	true;
+				viewer.core().camera_zoom	=	2;
+
+				//	Set	mesh	and	colors	to	new	positions
+				viewer.data().set_mesh(V,	F);
+				viewer.data().set_colors(C);
+
+				return	false;
+		};
+
+		menu->callback_draw_viewer_menu	=	[&]	()	{
+				ImGui::Text("Menu");
+				if	(ImGui::Button("Reset	Cue	Ball",	ImVec2(-1,	0)))
+				{
+						std::string	message	=	"dyn.table.resetCueBall()	\n";
+						socket	<<	message;
+				}
+		};
+
+
+		//	Initial	viewer	setup
+		view->core().orthographic	=	true;
+		view->core().camera_zoom	=	2;
+		view->data().show_lines	=	false;
+		view->data().set_face_based(false);
+		view->data().double_sided	=	true;
+		view->core().is_animating	=	true;
+
+		//	Plot	the	mesh
+		view->data().set_mesh(V,	F);
+		view->data().set_colors(C);
+
+		//	Viewer	is	blocking,	have	to	launch	it	in	a	separate	thread
+
+		//	Need	to	get	nBalls	and	positions	every	time
+		socket	<<	"trick.var_pause()	\n";
+		socket	<<	"trick.var_add(\"dyn.table.numBalls\")\n";
+		std::string	positionRequest	=	"";
+		char	*	templateString	=	"trick.var_add(\"dyn.table.balls[%d][0].pos._x\")\ntrick.var_add(\"dyn.table.balls[%d][0].pos._y\")\ntrick.var_add(\"dyn.table.balls[%d][0].inPlay\")\n";
+		for	(int	i	=	0;	i	<	numBalls;	i++)	{
+				char	buf[2048];
+				snprintf(buf,	sizeof(buf),	templateString,	i,	i,	i);
+				positionRequest	+=	std::string(buf);
+		}
+		socket	<<	positionRequest;
+		socket	<<	"trick.var_ascii()	\n";
+		socket	<<	"trick.var_cycle(0.010)	\n";
+		socket	<<	"trick.var_unpause()	\n";
+				
+		view->launch();
 }
diff --git a/trick_sims/SIM_billiards/models/pool_table/src/ball.cpp b/trick_sims/SIM_billiards/models/pool_table/src/ball.cpp
index b7a4a0813..91c6725a8 100644
--- a/trick_sims/SIM_billiards/models/pool_table/src/ball.cpp
+++ b/trick_sims/SIM_billiards/models/pool_table/src/ball.cpp
@@ -1,60 +1,60 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate balls contacting boundaries. )
-LIBRARY DEPENDENCY:
-    ((ball.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	balls	contacting	boundaries.	)
+LIBRARY	DEPENDENCY:
+				((ball.o))
 *******************************************************************************/
-#include "../include/ball.hh"
-// #include "trick/memorymanager_c_intf.h"
+#include	"../include/ball.hh"
+//	#include	"trick/memorymanager_c_intf.h"
 
-// #include "trick/MemoryManager.hh"
-// extern Trick::MemoryManager* trick_MM;
+//	#include	"trick/MemoryManager.hh"
+//	extern	Trick::MemoryManager*	trick_MM;
 
-#include <new>
+#include	<new>
 
-Ball::Ball(double x, double y, double mass, double radius, bool isFixed, int id) :
-    mass(mass),
-    radius(radius),
-    fixed(isFixed),
-    id(id)
+Ball::Ball(double	x,	double	y,	double	mass,	double	radius,	bool	isFixed,	int	id)	:
+				mass(mass),
+				radius(radius),
+				fixed(isFixed),
+				id(id)
 {
-    pos = Vec(x, y, 0);
+				pos	=	Vec(x,	y,	0);
 }
 
-void Ball::setPos(double x, double y) { setPos(x, y, 0); }
-void Ball::setPos(double x, double y, double z) {
-    pos = Vec(x, y, z);
+void	Ball::setPos(double	x,	double	y)	{	setPos(x,	y,	0);	}
+void	Ball::setPos(double	x,	double	y,	double	z)	{
+				pos	=	Vec(x,	y,	z);
 }
 
-void Ball::setVel(double x, double y) { setVel(x, y, 0); }
-void Ball::setVel(double x, double y, double z) {
-    vel = Vec(x, y, z);
+void	Ball::setVel(double	x,	double	y)	{	setVel(x,	y,	0);	}
+void	Ball::setVel(double	x,	double	y,	double	z)	{
+				vel	=	Vec(x,	y,	z);
 }
 
-void Ball::setAccel(double x, double y) { setAccel(x, y, 0); }
-void Ball::setAccel(double x, double y, double z) {
-    accel = Vec(x, y, z);
+void	Ball::setAccel(double	x,	double	y)	{	setAccel(x,	y,	0);	}
+void	Ball::setAccel(double	x,	double	y,	double	z)	{
+				accel	=	Vec(x,	y,	z);
 }
 
-void Ball::setRelativeVel(double x, double y, double z) {
-    relativeVel = Vec(x, y, z);
+void	Ball::setRelativeVel(double	x,	double	y,	double	z)	{
+				relativeVel	=	Vec(x,	y,	z);
 }
 
-void Ball::setAngularVel(double x, double y, double z) {
-    w = Vec(x, y, z);
+void	Ball::setAngularVel(double	x,	double	y,	double	z)	{
+				w	=	Vec(x,	y,	z);
 }
 
-void Ball::setAngularAccel(double x, double y, double z) {
-    angularAccel = Vec(x, y, z);
+void	Ball::setAngularAccel(double	x,	double	y,	double	z)	{
+				angularAccel	=	Vec(x,	y,	z);
 }
 
-void Ball::clearAllState() {
-    setPos(0, 0, 0);
-    setVel(0, 0, 0);
-    setAccel(0, 0, 0);
-    setRelativeVel(0, 0, 0);
-    setAngularVel(0, 0, 0);
-    setAngularAccel(0, 0, 0);
-    sliding = false;
+void	Ball::clearAllState()	{
+				setPos(0,	0,	0);
+				setVel(0,	0,	0);
+				setAccel(0,	0,	0);
+				setRelativeVel(0,	0,	0);
+				setAngularVel(0,	0,	0);
+				setAngularAccel(0,	0,	0);
+				sliding	=	false;
 }
 
 
diff --git a/trick_sims/SIM_billiards/models/pool_table/src/bumper.cpp b/trick_sims/SIM_billiards/models/pool_table/src/bumper.cpp
index 435e9c790..00d0cf61e 100644
--- a/trick_sims/SIM_billiards/models/pool_table/src/bumper.cpp
+++ b/trick_sims/SIM_billiards/models/pool_table/src/bumper.cpp
@@ -1,25 +1,25 @@
-#include "bumper.hh"
-#include "stdlib.h"
+#include	"bumper.hh"
+#include	"stdlib.h"
 
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/memorymanager_c_intf.h"
 
-Bumper::Bumper() {}
+Bumper::Bumper()	{}
 
-Bumper::Bumper(int numPoints, double x1, double y1, double x2, double y2) :
-                            border(Line(Vec(x1, y1), Vec(x2, y2))),
-                            numPoints(numPoints) 
+Bumper::Bumper(int	numPoints,	double	x1,	double	y1,	double	x2,	double	y2)	:
+																												border(Line(Vec(x1,	y1),	Vec(x2,	y2))),
+																												numPoints(numPoints)	
 {
 }
 
 
-void Bumper::AddPointToRender(double x, double y) {
-    int id = nextPointSlot++;
-    if (id < numPoints) {
-        Vec * point = (Vec*) TMM_declare_var_s("Vec");
-        renderedShape[id] = (new (point) Vec(x, y));
-    }
+void	Bumper::AddPointToRender(double	x,	double	y)	{
+				int	id	=	nextPointSlot++;
+				if	(id	<	numPoints)	{
+								Vec	*	point	=	(Vec*)	TMM_declare_var_s("Vec");
+								renderedShape[id]	=	(new	(point)	Vec(x,	y));
+				}
 }
 
-void Bumper::AddBorder (double x1, double y1, double x2, double y2) {
-    border = Line(Vec(x1, y1), Vec(x2, y2));
+void	Bumper::AddBorder	(double	x1,	double	y1,	double	x2,	double	y2)	{
+				border	=	Line(Vec(x1,	y1),	Vec(x2,	y2));
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_billiards/models/pool_table/src/pool_table.cpp b/trick_sims/SIM_billiards/models/pool_table/src/pool_table.cpp
index dc82bd19a..965f01fd1 100644
--- a/trick_sims/SIM_billiards/models/pool_table/src/pool_table.cpp
+++ b/trick_sims/SIM_billiards/models/pool_table/src/pool_table.cpp
@@ -1,552 +1,552 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: (Simulate a pool table.)
-LIBRARY DEPENDENCY:
-    ((pool_table.o)
-     (ball.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(Simulate	a	pool	table.)
+LIBRARY	DEPENDENCY:
+				((pool_table.o)
+					(ball.o))
 *******************************************************************************/
-#include <math.h>
-#include <iostream>
-#include "trick/integrator_c_intf.h"
-#include "trick/memorymanager_c_intf.h"
-#include "../include/pool_table.hh"
-#include "trick/trick_math_proto.h"
-
-
-// Leaving these here, but should probably go somewhere else
-double dot(                  /* Return: Scalar dot or inner product */
-                 double vec1[],        /* In: Vector 1 */
-                 double vec2[],        /* In: Vector 2 */
-                 int dim)
-{                  
-    double dot = 0;
-    for (int i = 0; i < dim; i++) {
-        dot += vec1[i] * vec2[i];
-    }                    
-    return dot;
+#include	<math.h>
+#include	<iostream>
+#include	"trick/integrator_c_intf.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"../include/pool_table.hh"
+#include	"trick/trick_math_proto.h"
+
+
+//	Leaving	these	here,	but	should	probably	go	somewhere	else
+double	dot(																		/*	Return:	Scalar	dot	or	inner	product	*/
+																	double	vec1[],								/*	In:	Vector	1	*/
+																	double	vec2[],								/*	In:	Vector	2	*/
+																	int	dim)
+{																		
+				double	dot	=	0;
+				for	(int	i	=	0;	i	<	dim;	i++)	{
+								dot	+=	vec1[i]	*	vec2[i];
+				}																				
+				return	dot;
 }
 
-void scaleInPlace (double vec[], double scale, int dim) {
-    for (int i = 0; i < dim; i++) {
-        vec[i] *= scale;
-    }
+void	scaleInPlace	(double	vec[],	double	scale,	int	dim)	{
+				for	(int	i	=	0;	i	<	dim;	i++)	{
+								vec[i]	*=	scale;
+				}
 }
 
-void mProduct (double product[2], double matrix[2][2], double vec[2]) {
-    product[0] = matrix[0][0] * vec[0] + matrix[1][0] * vec[1];
-    product[1] = matrix[0][1] * vec[0] + matrix[1][1] * vec[1];
+void	mProduct	(double	product[2],	double	matrix[2][2],	double	vec[2])	{
+				product[0]	=	matrix[0][0]	*	vec[0]	+	matrix[1][0]	*	vec[1];
+				product[1]	=	matrix[0][1]	*	vec[0]	+	matrix[1][1]	*	vec[1];
 }
 
-int PoolTable::default_data() {
-    // balls.clear();
-    // bumpers.clear();
+int	PoolTable::default_data()	{
+				//	balls.clear();
+				//	bumpers.clear();
 
-    numBalls = 0;
-    numBumpers = 0;
-    return 0;
+				numBalls	=	0;
+				numBumpers	=	0;
+				return	0;
 }
 
-// Input stage runs before this, which populates balls and bumpers
-int PoolTable::state_init() {
-    
-    // Do regula falsi setup here
-
-    // Vars for ball/ball collisions
-    double now ;
-    numAssociations = (numBalls*(numBalls-1))/2;
-    ballAssociations = (REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI", numAssociations);
-    unsigned int ii,jj;
-    for (ii=1; ii<numBalls; ii++) {
-        for (jj=0; jj<ii; jj++) {
-            unsigned int association_index = ii*(ii-1)/2+jj;
-            ballAssociations[association_index].mode = Decreasing;
-            ballAssociations[association_index].error_tol = 0.0000001;
-            now = get_integ_time() ;
-            reset_regula_falsi( now, &ballAssociations[association_index] );
-        }
-    }
-
-    // Bumper/ball collisions
-    bumperBallCombos = numBalls * numBumpers;
-    bumperAssociations = (REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI", bumperBallCombos);
-    for (ii=0; ii<numBalls; ii++) {
-        for (jj=0; jj<numBumpers; jj++) {
-            unsigned int association_index = (ii*numBumpers) + jj;
-            bumperAssociations[association_index].mode = Any;
-            bumperAssociations[association_index].error_tol = 0.0000001;
-            now = get_integ_time() ;
-            reset_regula_falsi( now, &bumperAssociations[association_index] );
-        }
-    }
-
-    // Need to do the same thing with pocket/ball associations
-    pocketBallCombos = numBalls * numPockets;
-    pocketAssociations = (REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI", pocketBallCombos);
-    for (ii=0; ii<numBalls; ii++) {
-        for (jj=0; jj<numPockets; jj++) {
-            unsigned int association_index = (ii*numPockets) + jj;
-            pocketAssociations[association_index].mode = Decreasing;
-            pocketAssociations[association_index].error_tol = 0.0000001;
-            now = get_integ_time() ;
-            reset_regula_falsi( now, &pocketAssociations[association_index] );
-        }
-    }
-
-    return 0;
+//	Input	stage	runs	before	this,	which	populates	balls	and	bumpers
+int	PoolTable::state_init()	{
+				
+				//	Do	regula	falsi	setup	here
+
+				//	Vars	for	ball/ball	collisions
+				double	now	;
+				numAssociations	=	(numBalls*(numBalls-1))/2;
+				ballAssociations	=	(REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI",	numAssociations);
+				unsigned	int	ii,jj;
+				for	(ii=1;	ii<numBalls;	ii++)	{
+								for	(jj=0;	jj<ii;	jj++)	{
+												unsigned	int	association_index	=	ii*(ii-1)/2+jj;
+												ballAssociations[association_index].mode	=	Decreasing;
+												ballAssociations[association_index].error_tol	=	0.0000001;
+												now	=	get_integ_time()	;
+												reset_regula_falsi(	now,	&ballAssociations[association_index]	);
+								}
+				}
+
+				//	Bumper/ball	collisions
+				bumperBallCombos	=	numBalls	*	numBumpers;
+				bumperAssociations	=	(REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI",	bumperBallCombos);
+				for	(ii=0;	ii<numBalls;	ii++)	{
+								for	(jj=0;	jj<numBumpers;	jj++)	{
+												unsigned	int	association_index	=	(ii*numBumpers)	+	jj;
+												bumperAssociations[association_index].mode	=	Any;
+												bumperAssociations[association_index].error_tol	=	0.0000001;
+												now	=	get_integ_time()	;
+												reset_regula_falsi(	now,	&bumperAssociations[association_index]	);
+								}
+				}
+
+				//	Need	to	do	the	same	thing	with	pocket/ball	associations
+				pocketBallCombos	=	numBalls	*	numPockets;
+				pocketAssociations	=	(REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI",	pocketBallCombos);
+				for	(ii=0;	ii<numBalls;	ii++)	{
+								for	(jj=0;	jj<numPockets;	jj++)	{
+												unsigned	int	association_index	=	(ii*numPockets)	+	jj;
+												pocketAssociations[association_index].mode	=	Decreasing;
+												pocketAssociations[association_index].error_tol	=	0.0000001;
+												now	=	get_integ_time()	;
+												reset_regula_falsi(	now,	&pocketAssociations[association_index]	);
+								}
+				}
+
+				return	0;
 }
 
-int PoolTable::state_deriv() {
-    // derivative - determine the acceleration here
-    // This is probably just friction
-    // And angular stuff
-    // F = MA => A = M^-1 * F
+int	PoolTable::state_deriv()	{
+				//	derivative	-	determine	the	acceleration	here
+				//	This	is	probably	just	friction
+				//	And	angular	stuff
+				//	F	=	MA	=>	A	=	M^-1	*	F
 
-    // Will have to account for rolling vs sliding here
-    // For now, just rolling
+				//	Will	have	to	account	for	rolling	vs	sliding	here
+				//	For	now,	just	rolling
 
-    for (int i = 0; i < numBalls; i++) {
-        // Frictional force a constant applied in the opposing direction of velocity.
-        // Magnitude of velocity is irrelevant unless very close to 0
-        // Has weird behavior when velocity is very small, so only apply friction if velocity is greater than a tolerance
+				for	(int	i	=	0;	i	<	numBalls;	i++)	{
+								//	Frictional	force	a	constant	applied	in	the	opposing	direction	of	velocity.
+								//	Magnitude	of	velocity	is	irrelevant	unless	very	close	to	0
+								//	Has	weird	behavior	when	velocity	is	very	small,	so	only	apply	friction	if	velocity	is	greater	than	a	tolerance
 
-        if (!balls[i]->inPlay) {
-            continue;
-        }
+								if	(!balls[i]->inPlay)	{
+												continue;
+								}
 
-        if (balls[i]->vel.norm() > frictionTolerance) {
-            Vec velocityNorm = balls[i]->vel.normalized();
+								if	(balls[i]->vel.norm()	>	frictionTolerance)	{
+												Vec	velocityNorm	=	balls[i]->vel.normalized();
 
-            balls[i]->accel[0] = - (frictionScale * frictionRolling * velocityNorm[0]);
-            balls[i]->accel[1] = - (frictionScale * frictionRolling * velocityNorm[1]);
-            balls[i]->accel[2] = 0;
-        } else {
-            balls[i]->vel[0] = 0;
-            balls[i]->vel[1] = 0;
-            balls[i]->vel[2] = 0;
+												balls[i]->accel[0]	=	-	(frictionScale	*	frictionRolling	*	velocityNorm[0]);
+												balls[i]->accel[1]	=	-	(frictionScale	*	frictionRolling	*	velocityNorm[1]);
+												balls[i]->accel[2]	=	0;
+								}	else	{
+												balls[i]->vel[0]	=	0;
+												balls[i]->vel[1]	=	0;
+												balls[i]->vel[2]	=	0;
 
-            balls[i]->accel[0] = 0;
-            balls[i]->accel[1] = 0;
-            balls[i]->accel[2] = 0;
+												balls[i]->accel[0]	=	0;
+												balls[i]->accel[1]	=	0;
+												balls[i]->accel[2]	=	0;
 
-        }
+								}
 
 
-    }
+				}
 
-    return 0;
+				return	0;
 }
 
-int PoolTable::state_integ() {
-    // Apply the acceleration by changing the velocity by the appropriate amount over the time step 
+int	PoolTable::state_integ()	{
+				//	Apply	the	acceleration	by	changing	the	velocity	by	the	appropriate	amount	over	the	time	step	
 
-    // How many state variables are needed for each ball
-    int n = 6;
+				//	How	many	state	variables	are	needed	for	each	ball
+				int	n	=	6;
 
-    for (int i = 0; i < numBalls; i++) {
-        if (!balls[i]->inPlay) {
-            continue;
-        }
+				for	(int	i	=	0;	i	<	numBalls;	i++)	{
+								if	(!balls[i]->inPlay)	{
+												continue;
+								}
 
-        int inner_index = 0;
-        load_indexed_state(n*i + inner_index++, balls[i]->pos[0]);
-        load_indexed_state(n*i + inner_index++, balls[i]->pos[1]);
-        load_indexed_state(n*i + inner_index++, balls[i]->pos[2]);
+								int	inner_index	=	0;
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->pos[0]);
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->pos[1]);
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->pos[2]);
 
-        load_indexed_state(n*i + inner_index++, balls[i]->vel[0]);
-        load_indexed_state(n*i + inner_index++, balls[i]->vel[1]);
-        load_indexed_state(n*i + inner_index++, balls[i]->vel[2]);
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->vel[0]);
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->vel[1]);
+								load_indexed_state(n*i	+	inner_index++,	balls[i]->vel[2]);
 
-        // Derivatives of all of this junk
-        inner_index = 0;
-        load_indexed_deriv(n*i + inner_index++, balls[i]->vel[0]);
-        load_indexed_deriv(n*i + inner_index++, balls[i]->vel[1]);
-        load_indexed_deriv(n*i + inner_index++, balls[i]->vel[2]);
+								//	Derivatives	of	all	of	this	junk
+								inner_index	=	0;
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->vel[0]);
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->vel[1]);
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->vel[2]);
 
-        load_indexed_deriv(n*i + inner_index++, balls[i]->accel[0]);   
-        load_indexed_deriv(n*i + inner_index++, balls[i]->accel[1]);   
-        load_indexed_deriv(n*i + inner_index++, balls[i]->accel[2]);   
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->accel[0]);			
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->accel[1]);			
+								load_indexed_deriv(n*i	+	inner_index++,	balls[i]->accel[2]);			
 
-    }
+				}
 
-    int integration_step = integrate();
+				int	integration_step	=	integrate();
 
-    for (int i = 0; i < numBalls; i++) {
-        if (!balls[i]->inPlay) {
-            continue;
-        }
+				for	(int	i	=	0;	i	<	numBalls;	i++)	{
+								if	(!balls[i]->inPlay)	{
+												continue;
+								}
 
-        // pos[0] pos[1] pos[2] vel[0] vel[1] vel[2]
-        int inner_index = 0;
-        balls[i]->pos[0] = unload_indexed_state(n*i + inner_index++);
-        balls[i]->pos[1] = unload_indexed_state(n*i + inner_index++);
-        balls[i]->pos[2] = unload_indexed_state(n*i + inner_index++);
+								//	pos[0]	pos[1]	pos[2]	vel[0]	vel[1]	vel[2]
+								int	inner_index	=	0;
+								balls[i]->pos[0]	=	unload_indexed_state(n*i	+	inner_index++);
+								balls[i]->pos[1]	=	unload_indexed_state(n*i	+	inner_index++);
+								balls[i]->pos[2]	=	unload_indexed_state(n*i	+	inner_index++);
 
-        balls[i]->vel[0] = unload_indexed_state(n*i + inner_index++);
-        balls[i]->vel[1] = unload_indexed_state(n*i + inner_index++);
-        balls[i]->vel[2] = unload_indexed_state(n*i + inner_index++);
+								balls[i]->vel[0]	=	unload_indexed_state(n*i	+	inner_index++);
+								balls[i]->vel[1]	=	unload_indexed_state(n*i	+	inner_index++);
+								balls[i]->vel[2]	=	unload_indexed_state(n*i	+	inner_index++);
 
-        balls[i]->accel[0] = 0;
-        balls[i]->accel[1] = 0;
-        balls[i]->accel[2] = 0;
+								balls[i]->accel[0]	=	0;
+								balls[i]->accel[1]	=	0;
+								balls[i]->accel[2]	=	0;
 
-    }
+				}
 
-    return integration_step;
+				return	integration_step;
 }
 
-double closestPointOnLine(Line& line, Vec pos, Vec& result, bool print) {
-    Vec a(line.p1);
-    Vec b(line.p2);
-    Vec diff = pos - a;
-    Vec m = b - a;
+double	closestPointOnLine(Line&	line,	Vec	pos,	Vec&	result,	bool	print)	{
+				Vec	a(line.p1);
+				Vec	b(line.p2);
+				Vec	diff	=	pos	-	a;
+				Vec	m	=	b	-	a;
 
-    double t = (diff * m) / (m * m);
+				double	t	=	(diff	*	m)	/	(m	*	m);
 
-    if (t < 0)
-        t = 0;
-    
-    if (t > 1)
-        t = 1;
+				if	(t	<	0)
+								t	=	0;
+				
+				if	(t	>	1)
+								t	=	1;
 
-    m = m * t;
-    result = a + m;
+				m	=	m	*	t;
+				result	=	a	+	m;
 
-    return t;
+				return	t;
 }
 
-double PoolTable::removeBall(int id) {
-    balls[id]->inPlay = false;
-    balls[id]->clearAllState();
+double	PoolTable::removeBall(int	id)	{
+				balls[id]->inPlay	=	false;
+				balls[id]->clearAllState();
 }
 
 
-double PoolTable::collision() {
+double	PoolTable::collision()	{
 
-    // Handle when the balls collide with others
+				//	Handle	when	the	balls	collide	with	others
 
-    double now ; /* current integration time. */
-    double event_tgo;
-    unsigned int ii,jj;
+				double	now	;	/*	current	integration	time.	*/
+				double	event_tgo;
+				unsigned	int	ii,jj;
 
-    now = get_integ_time() ;
-    event_tgo = BIG_TGO;
+				now	=	get_integ_time()	;
+				event_tgo	=	BIG_TGO;
 
-    std::vector<unsigned int> collisionsToProcess;
+				std::vector<unsigned	int>	collisionsToProcess;
 
-    for (ii=1; ii<numBalls; ii++) {
-        if (!balls[ii]->inPlay) {
-                continue;
-        }
-        for (jj=0; jj<ii; jj++) {
-            if (!balls[jj]->inPlay) {
-                continue;
-            }
-
-            unsigned int associationIndex = ii*(ii-1)/2+jj;
-
-            // boundary is distance between balls - radiuses of balls
-            double distanceBetweenBalls = (balls[ii]->pos - balls[jj]->pos).norm();
-            double error = distanceBetweenBalls - (balls[ii]->radius + balls[jj]->radius);
-            ballAssociations[associationIndex].error = error;
-
-            double this_tgo = regula_falsi( now, &(ballAssociations[associationIndex])) ;
-            
-            if (this_tgo < event_tgo) {
-                event_tgo = this_tgo;
-            }
-
-            if (this_tgo == 0) {
-                std::cout << "Found colliding balls" << std::endl;
-
-                // Add this collision to a list of collisions to process
-                // probably don't need to do this
-                collisionsToProcess.push_back(ii);
-                collisionsToProcess.push_back(jj);
-                reset_regula_falsi( now, &(ballAssociations[associationIndex]) );
-
-            } else {
-                regula_falsi_set_upper (now, error, &ballAssociations[associationIndex]);
-            }
-        }
-    }
-
-    // Handle collisions
-    for (int i = 0; i < collisionsToProcess.size(); i+=2) {
-        int index1 = collisionsToProcess[i];
-        int index2 = collisionsToProcess[i+1];
-        std::cout << "Collision detected between balls " << index1 << " and " << index2 << std::endl;
-
-        Vec q1(balls[index1]->pos);
-        Vec q2(balls[index2]->pos);
-
-        // dg = (q1 - q2) / (|q1 - q2|)
-        Vec diff = q1 - q2;
-        Vec dg = diff.normalized();
-
-        // Have to stuff both velocities and dg values into 4d vector to do the calculation
-        // Otherwise I have to do more math
-        double dg4[4] = {dg[0], dg[1], -dg[0], -dg[1]};
-        double vel4[4] = {balls[index1]->vel[0], balls[index1]->vel[1], balls[index2]->vel[0], balls[index2]->vel[1]};
-
-        // Calculate the impulse
-        // J = ((-(1 + c) * dg * v) / (dg * M^-1 * dg^T) ) dg
-        // For now let's just pretend all the masses are 1
-        double impulse = ((1.0 + coefficientOfElasticity) * dot(dg4, vel4, 4)) / (dot(dg4, dg4, 4));
-        scaleInPlace(dg4, impulse, 4);
-
-        // Impulse[0:1] is x and y components of what should be applied to v1, Impulse[2:3] goes to v2
-        Vec impulse1(dg4[0], dg4[1], 0);
-        Vec impulse2(dg4[2], dg4[3], 0);
-
-        Vec newV1(balls[index1]->vel);
-        Vec newV2(balls[index2]->vel);
-
-        newV1 = ((newV1 * balls[index1]->mass) - impulse1) * (1.0 / balls[index1]->mass);
-        newV2 = ((newV2 * balls[index2]->mass) - impulse2) * (1.0 / balls[index2]->mass);
-
-        std::cout << "Impulses applied: \n\tV1: " << newV1[0] << " " << newV1[1] << " \n\tV2: " << newV2[0] << " " << newV2[1] << std::endl;
-
-        balls[index1]->vel[0] = newV1[0];
-        balls[index1]->vel[1] = newV1[1];
-
-        balls[index2]->vel[0] = newV2[0];
-        balls[index2]->vel[1] = newV2[1];
-    }
-
-    int numBumperCollisions = 0;
-    for (ii=0; ii<numBalls; ii++) {
-        if (!balls[ii]->inPlay) {
-                continue;
-        }
-        for (jj=0; jj<numBumpers; jj++) {
-            unsigned int association_index = (ii*numBumpers) + jj;
-
-            Ball *ball = balls[ii];
-            Bumper *bumper = bumpers[jj];
-
-            Vec closestPointOnBumper;
-            double t = closestPointOnLine(bumper->border, ball->pos, closestPointOnBumper, true);
-            double distanceToBumper = (ball->pos - closestPointOnBumper).norm() - ball->radius;
-            bumperAssociations[association_index].error = distanceToBumper;
-
-            double this_tgo = regula_falsi( now, &(bumperAssociations[association_index])) ;
-            if (this_tgo < event_tgo) {
-                event_tgo = this_tgo;
-            }
-
-            if (this_tgo == 0) {
-                numBumperCollisions++;
-                std::cout << "Found colliding ball " << ii << " and bumper " << jj << std::endl;
-                reset_regula_falsi( now, &(bumperAssociations[association_index]) );
-
-                if (numBumperCollisions > 1) {
-                    // When a ball hits exactly a corner of 2 bumpers, both collisions will be detected and impulses applied.
-                    // But since an impulse takes into consideration the original velocity, the second impulse applied
-                    // just cancels out the first one most of the time. Both impulses should be identical since the
-                    // collision point is the same, so make sure only 1 gets applied. This is kind of hacky
-                    continue;
-                }
-                    
-                Vec q1(ball->pos);
-                Vec q2(closestPointOnBumper);
-
-                Vec diff = q1 - q2;
-                Vec dg = diff.normalized();
-
-                // Have to stuff both velocities and dg values into 4d vector to do the calculation
-                // Otherwise I have to do more math
-                double dg4[4] = {dg[0], dg[1], -dg[0], -dg[1]};
-                double vel4[4] = {ball->vel[0], ball->vel[1], 0, 0};
-
-                // Calculate the impulse
-                // J = ((-(1 + c) * dg * v) / (dg * M^-1 * dg^T) ) dg
-                // Really need to get some better matrix math in here
-                // only used the dot product of the first 2 in the last term since it's supposed to be dg * minv * dg
-                // and since the bumpers are immovable the mass is infinite which inverse is 0
-                // So this isn't robust at all
-                // Setting the CoE to be 1 always - perfectly elastic
-                // Otherwise there's a weird bouncy thing
-                double impulse = ((1.0 + 1.0) * dot(dg4, vel4, 4)) / (dot(dg4, dg4, 2));
-                std::cout << "Impulse: " << impulse << std::endl;
-                scaleInPlace(dg4, impulse, 4);
-
-                // Impulse[0:1] is x and y components of what should be applied to v1, Impulse[2:3] goes to v2
-                Vec impulse1(dg4[0], dg4[1], 0);
-                Vec impulse2(dg4[2], dg4[3], 0);
-
-
-                Vec newV1 (ball->vel);
-
-                newV1 = ((newV1 * ball->mass) - impulse1) * (1.0 / ball->mass);
-
-                std::cout << "Impulses applied: \n\tV1: " << newV1[0] << " " << newV1[1] << std::endl;
-
-                ball->vel[0] = newV1[0];
-                ball->vel[1] = newV1[1];
-
-            } else {
-                regula_falsi_set_upper (now, distanceToBumper, &bumperAssociations[association_index]);
-            }
-        }
-
-    }
-    if (numBumperCollisions > 0) {
-        std::cout << "In this time step, " << numBumperCollisions << " collisions applied" << std::endl;
-    }
-
-    // Pockets
-    for (ii=0; ii<numBalls; ii++) {
-        if (!balls[ii]->inPlay) {
-                continue;
-        }
-        for (jj=0; jj<numPockets; jj++) {
-            unsigned int association_index = (ii*numPockets) + jj;
-            Ball *ball = balls[ii];
-            Pocket *pocket = pockets[jj];
-
-            // Ball is pocketed when center is within pocket radius
-            double error = (ball->pos - pocket->pos).norm() - (pocket->radius);
-            pocketAssociations[association_index].error = error;
-
-            double this_tgo = regula_falsi( now, &(pocketAssociations[association_index]));
-
-            if (this_tgo < event_tgo) {
-                event_tgo = this_tgo;
-            }
-
-            if (this_tgo == 0) {
-                std::cout << "Found pocketed ball " << ii << std::endl;
-                reset_regula_falsi( now, &(pocketAssociations[association_index]) );
-                removeBall(ii);
-            }
-        }
-    }
-
-    return event_tgo;
+				for	(ii=1;	ii<numBalls;	ii++)	{
+								if	(!balls[ii]->inPlay)	{
+																continue;
+								}
+								for	(jj=0;	jj<ii;	jj++)	{
+												if	(!balls[jj]->inPlay)	{
+																continue;
+												}
+
+												unsigned	int	associationIndex	=	ii*(ii-1)/2+jj;
+
+												//	boundary	is	distance	between	balls	-	radiuses	of	balls
+												double	distanceBetweenBalls	=	(balls[ii]->pos	-	balls[jj]->pos).norm();
+												double	error	=	distanceBetweenBalls	-	(balls[ii]->radius	+	balls[jj]->radius);
+												ballAssociations[associationIndex].error	=	error;
+
+												double	this_tgo	=	regula_falsi(	now,	&(ballAssociations[associationIndex]))	;
+												
+												if	(this_tgo	<	event_tgo)	{
+																event_tgo	=	this_tgo;
+												}
+
+												if	(this_tgo	==	0)	{
+																std::cout	<<	"Found	colliding	balls"	<<	std::endl;
+
+																//	Add	this	collision	to	a	list	of	collisions	to	process
+																//	probably	don't	need	to	do	this
+																collisionsToProcess.push_back(ii);
+																collisionsToProcess.push_back(jj);
+																reset_regula_falsi(	now,	&(ballAssociations[associationIndex])	);
+
+												}	else	{
+																regula_falsi_set_upper	(now,	error,	&ballAssociations[associationIndex]);
+												}
+								}
+				}
+
+				//	Handle	collisions
+				for	(int	i	=	0;	i	<	collisionsToProcess.size();	i+=2)	{
+								int	index1	=	collisionsToProcess[i];
+								int	index2	=	collisionsToProcess[i+1];
+								std::cout	<<	"Collision	detected	between	balls	"	<<	index1	<<	"	and	"	<<	index2	<<	std::endl;
+
+								Vec	q1(balls[index1]->pos);
+								Vec	q2(balls[index2]->pos);
+
+								//	dg	=	(q1	-	q2)	/	(|q1	-	q2|)
+								Vec	diff	=	q1	-	q2;
+								Vec	dg	=	diff.normalized();
+
+								//	Have	to	stuff	both	velocities	and	dg	values	into	4d	vector	to	do	the	calculation
+								//	Otherwise	I	have	to	do	more	math
+								double	dg4[4]	=	{dg[0],	dg[1],	-dg[0],	-dg[1]};
+								double	vel4[4]	=	{balls[index1]->vel[0],	balls[index1]->vel[1],	balls[index2]->vel[0],	balls[index2]->vel[1]};
+
+								//	Calculate	the	impulse
+								//	J	=	((-(1	+	c)	*	dg	*	v)	/	(dg	*	M^-1	*	dg^T)	)	dg
+								//	For	now	let's	just	pretend	all	the	masses	are	1
+								double	impulse	=	((1.0	+	coefficientOfElasticity)	*	dot(dg4,	vel4,	4))	/	(dot(dg4,	dg4,	4));
+								scaleInPlace(dg4,	impulse,	4);
+
+								//	Impulse[0:1]	is	x	and	y	components	of	what	should	be	applied	to	v1,	Impulse[2:3]	goes	to	v2
+								Vec	impulse1(dg4[0],	dg4[1],	0);
+								Vec	impulse2(dg4[2],	dg4[3],	0);
+
+								Vec	newV1(balls[index1]->vel);
+								Vec	newV2(balls[index2]->vel);
+
+								newV1	=	((newV1	*	balls[index1]->mass)	-	impulse1)	*	(1.0	/	balls[index1]->mass);
+								newV2	=	((newV2	*	balls[index2]->mass)	-	impulse2)	*	(1.0	/	balls[index2]->mass);
+
+								std::cout	<<	"Impulses	applied:	\n\tV1:	"	<<	newV1[0]	<<	"	"	<<	newV1[1]	<<	"	\n\tV2:	"	<<	newV2[0]	<<	"	"	<<	newV2[1]	<<	std::endl;
+
+								balls[index1]->vel[0]	=	newV1[0];
+								balls[index1]->vel[1]	=	newV1[1];
+
+								balls[index2]->vel[0]	=	newV2[0];
+								balls[index2]->vel[1]	=	newV2[1];
+				}
+
+				int	numBumperCollisions	=	0;
+				for	(ii=0;	ii<numBalls;	ii++)	{
+								if	(!balls[ii]->inPlay)	{
+																continue;
+								}
+								for	(jj=0;	jj<numBumpers;	jj++)	{
+												unsigned	int	association_index	=	(ii*numBumpers)	+	jj;
+
+												Ball	*ball	=	balls[ii];
+												Bumper	*bumper	=	bumpers[jj];
+
+												Vec	closestPointOnBumper;
+												double	t	=	closestPointOnLine(bumper->border,	ball->pos,	closestPointOnBumper,	true);
+												double	distanceToBumper	=	(ball->pos	-	closestPointOnBumper).norm()	-	ball->radius;
+												bumperAssociations[association_index].error	=	distanceToBumper;
+
+												double	this_tgo	=	regula_falsi(	now,	&(bumperAssociations[association_index]))	;
+												if	(this_tgo	<	event_tgo)	{
+																event_tgo	=	this_tgo;
+												}
+
+												if	(this_tgo	==	0)	{
+																numBumperCollisions++;
+																std::cout	<<	"Found	colliding	ball	"	<<	ii	<<	"	and	bumper	"	<<	jj	<<	std::endl;
+																reset_regula_falsi(	now,	&(bumperAssociations[association_index])	);
+
+																if	(numBumperCollisions	>	1)	{
+																				//	When	a	ball	hits	exactly	a	corner	of	2	bumpers,	both	collisions	will	be	detected	and	impulses	applied.
+																				//	But	since	an	impulse	takes	into	consideration	the	original	velocity,	the	second	impulse	applied
+																				//	just	cancels	out	the	first	one	most	of	the	time.	Both	impulses	should	be	identical	since	the
+																				//	collision	point	is	the	same,	so	make	sure	only	1	gets	applied.	This	is	kind	of	hacky
+																				continue;
+																}
+																				
+																Vec	q1(ball->pos);
+																Vec	q2(closestPointOnBumper);
+
+																Vec	diff	=	q1	-	q2;
+																Vec	dg	=	diff.normalized();
+
+																//	Have	to	stuff	both	velocities	and	dg	values	into	4d	vector	to	do	the	calculation
+																//	Otherwise	I	have	to	do	more	math
+																double	dg4[4]	=	{dg[0],	dg[1],	-dg[0],	-dg[1]};
+																double	vel4[4]	=	{ball->vel[0],	ball->vel[1],	0,	0};
+
+																//	Calculate	the	impulse
+																//	J	=	((-(1	+	c)	*	dg	*	v)	/	(dg	*	M^-1	*	dg^T)	)	dg
+																//	Really	need	to	get	some	better	matrix	math	in	here
+																//	only	used	the	dot	product	of	the	first	2	in	the	last	term	since	it's	supposed	to	be	dg	*	minv	*	dg
+																//	and	since	the	bumpers	are	immovable	the	mass	is	infinite	which	inverse	is	0
+																//	So	this	isn't	robust	at	all
+																//	Setting	the	CoE	to	be	1	always	-	perfectly	elastic
+																//	Otherwise	there's	a	weird	bouncy	thing
+																double	impulse	=	((1.0	+	1.0)	*	dot(dg4,	vel4,	4))	/	(dot(dg4,	dg4,	2));
+																std::cout	<<	"Impulse:	"	<<	impulse	<<	std::endl;
+																scaleInPlace(dg4,	impulse,	4);
+
+																//	Impulse[0:1]	is	x	and	y	components	of	what	should	be	applied	to	v1,	Impulse[2:3]	goes	to	v2
+																Vec	impulse1(dg4[0],	dg4[1],	0);
+																Vec	impulse2(dg4[2],	dg4[3],	0);
+
+
+																Vec	newV1	(ball->vel);
+
+																newV1	=	((newV1	*	ball->mass)	-	impulse1)	*	(1.0	/	ball->mass);
+
+																std::cout	<<	"Impulses	applied:	\n\tV1:	"	<<	newV1[0]	<<	"	"	<<	newV1[1]	<<	std::endl;
+
+																ball->vel[0]	=	newV1[0];
+																ball->vel[1]	=	newV1[1];
+
+												}	else	{
+																regula_falsi_set_upper	(now,	distanceToBumper,	&bumperAssociations[association_index]);
+												}
+								}
+
+				}
+				if	(numBumperCollisions	>	0)	{
+								std::cout	<<	"In	this	time	step,	"	<<	numBumperCollisions	<<	"	collisions	applied"	<<	std::endl;
+				}
+
+				//	Pockets
+				for	(ii=0;	ii<numBalls;	ii++)	{
+								if	(!balls[ii]->inPlay)	{
+																continue;
+								}
+								for	(jj=0;	jj<numPockets;	jj++)	{
+												unsigned	int	association_index	=	(ii*numPockets)	+	jj;
+												Ball	*ball	=	balls[ii];
+												Pocket	*pocket	=	pockets[jj];
+
+												//	Ball	is	pocketed	when	center	is	within	pocket	radius
+												double	error	=	(ball->pos	-	pocket->pos).norm()	-	(pocket->radius);
+												pocketAssociations[association_index].error	=	error;
+
+												double	this_tgo	=	regula_falsi(	now,	&(pocketAssociations[association_index]));
+
+												if	(this_tgo	<	event_tgo)	{
+																event_tgo	=	this_tgo;
+												}
+
+												if	(this_tgo	==	0)	{
+																std::cout	<<	"Found	pocketed	ball	"	<<	ii	<<	std::endl;
+																reset_regula_falsi(	now,	&(pocketAssociations[association_index])	);
+																removeBall(ii);
+												}
+								}
+				}
+
+				return	event_tgo;
 }
 
-void PoolTable::resetCueBall() {
-    resetCueBall(defaultCueBallX, defaultCueBallY);
+void	PoolTable::resetCueBall()	{
+				resetCueBall(defaultCueBallX,	defaultCueBallY);
 }
 
-void PoolTable::resetCueBall(double x, double y) {
-    balls[cueBallIndex]->clearAllState();
-    balls[cueBallIndex]->setPos(x, y);
+void	PoolTable::resetCueBall(double	x,	double	y)	{
+				balls[cueBallIndex]->clearAllState();
+				balls[cueBallIndex]->setPos(x,	y);
 
-    balls[cueBallIndex]->inPlay = true;
+				balls[cueBallIndex]->inPlay	=	true;
 }
 
-void PoolTable::applyCueForce(double x_end, double y_end) {
-    applyCueForce(x_end, y_end, 0, 0, 0);
+void	PoolTable::applyCueForce(double	x_end,	double	y_end)	{
+				applyCueForce(x_end,	y_end,	0,	0,	0);
 }
 
-void PoolTable::applyCueForce(double x_end, double y_end, double cueHorizontalDisplacement, double cueVerticalDisplacement, double cueAngle) {
-    std::cout << "Applying cue force" << std::endl;
+void	PoolTable::applyCueForce(double	x_end,	double	y_end,	double	cueHorizontalDisplacement,	double	cueVerticalDisplacement,	double	cueAngle)	{
+				std::cout	<<	"Applying	cue	force"	<<	std::endl;
 
-    // assume index 0 is cue ball
-    int cueIndex = 0;
-    Vec cueEnd(x_end, y_end);
-    Vec cueBallPos(balls[cueIndex]->pos);
+				//	assume	index	0	is	cue	ball
+				int	cueIndex	=	0;
+				Vec	cueEnd(x_end,	y_end);
+				Vec	cueBallPos(balls[cueIndex]->pos);
 
-    double r = balls[cueIndex]->radius;
-    double m = balls[cueIndex]->mass;
-    
-    double a = cueHorizontalDisplacement * r;
-    double b = cueVerticalDisplacement * r;
-    double c = abs(sqrt(pow(r,2) - pow(a,2) - pow(b,2)));
+				double	r	=	balls[cueIndex]->radius;
+				double	m	=	balls[cueIndex]->mass;
+				
+				double	a	=	cueHorizontalDisplacement	*	r;
+				double	b	=	cueVerticalDisplacement	*	r;
+				double	c	=	abs(sqrt(pow(r,2)	-	pow(a,2)	-	pow(b,2)));
 
-    double theta = cueAngle * M_PI / 180.0;
-    double angleScaling = 1.0 + (cueAngle / 25.0);
+				double	theta	=	cueAngle	*	M_PI	/	180.0;
+				double	angleScaling	=	1.0	+	(cueAngle	/	25.0);
 
-    Vec cueAxis = cueEnd - cueBallPos;
-    double cue_v = cueAxis.norm() * cueForceScale * angleScaling;
-    cueAxis = cueAxis.normalized();
+				Vec	cueAxis	=	cueEnd	-	cueBallPos;
+				double	cue_v	=	cueAxis.norm()	*	cueForceScale	*	angleScaling;
+				cueAxis	=	cueAxis.normalized();
 
-    double axis2[2] = {cueAxis[0], cueAxis[1]};
+				double	axis2[2]	=	{cueAxis[0],	cueAxis[1]};
 
-    double force = (2 * m * cue_v) / (1.0 * (m / cueMass) + (5.0 / (2.0*pow(r, 2))) * (pow(a,2) + pow(b,2)*pow(cos(theta),2) + pow(c,2)*pow(sin(theta),2) - 2*b*c*sin(theta)*cos(theta)));
+				double	force	=	(2	*	m	*	cue_v)	/	(1.0	*	(m	/	cueMass)	+	(5.0	/	(2.0*pow(r,	2)))	*	(pow(a,2)	+	pow(b,2)*pow(cos(theta),2)	+	pow(c,2)*pow(sin(theta),2)	-	2*b*c*sin(theta)*cos(theta)));
 
-    // Velocity in the frame of the cue
-    double v_multiplier = -force/m * cos(theta);
-    Vec velocityAfterHit = cueAxis * v_multiplier;
+				//	Velocity	in	the	frame	of	the	cue
+				double	v_multiplier	=	-force/m	*	cos(theta);
+				Vec	velocityAfterHit	=	cueAxis	*	v_multiplier;
 
-    std::cout << "Velocity of ball after cue hit: " << velocityAfterHit[0] << " " << velocityAfterHit[1] << std::endl;
+				std::cout	<<	"Velocity	of	ball	after	cue	hit:	"	<<	velocityAfterHit[0]	<<	"	"	<<	velocityAfterHit[1]	<<	std::endl;
 
-    balls[cueIndex]->vel = velocityAfterHit;
+				balls[cueIndex]->vel	=	velocityAfterHit;
 
-    // TODO: logic for angular and relative velocity
+				//	TODO:	logic	for	angular	and	relative	velocity
 
 }
 
 
-// Add a ball to the table and return the ID
-int PoolTable::addBall (double x, double y, double mass, double radius, bool fixed) {
-    int id = nextBallSlot++;
-    if (id < numBalls) {
-        Ball * ball = (Ball*) TMM_declare_var_s("Ball");
-        balls[id] = (new (ball) Ball(x,y,mass,radius, fixed, id));
-        return id;
-    }
-    return -1;
+//	Add	a	ball	to	the	table	and	return	the	ID
+int	PoolTable::addBall	(double	x,	double	y,	double	mass,	double	radius,	bool	fixed)	{
+				int	id	=	nextBallSlot++;
+				if	(id	<	numBalls)	{
+								Ball	*	ball	=	(Ball*)	TMM_declare_var_s("Ball");
+								balls[id]	=	(new	(ball)	Ball(x,y,mass,radius,	fixed,	id));
+								return	id;
+				}
+				return	-1;
 }
 
-// Add a bumper to the table and return the ID
-// Only takes in the actual effective line, need to add something else for the rendered shape
-int PoolTable::addBumper (int numPoints, double x1, double y1, double x2, double y2) {
-    int id = nextBumperSlot++;
-    if (id < numBumpers) {
-        Bumper * bumper = (Bumper*) TMM_declare_var_s("Bumper");
-        bumpers[id] = (new (bumper) Bumper(numPoints, x1, y1, x2, y2));
-        return id;
-    }
-    return -1;
+//	Add	a	bumper	to	the	table	and	return	the	ID
+//	Only	takes	in	the	actual	effective	line,	need	to	add	something	else	for	the	rendered	shape
+int	PoolTable::addBumper	(int	numPoints,	double	x1,	double	y1,	double	x2,	double	y2)	{
+				int	id	=	nextBumperSlot++;
+				if	(id	<	numBumpers)	{
+								Bumper	*	bumper	=	(Bumper*)	TMM_declare_var_s("Bumper");
+								bumpers[id]	=	(new	(bumper)	Bumper(numPoints,	x1,	y1,	x2,	y2));
+								return	id;
+				}
+				return	-1;
 }
 
-int PoolTable::addPointToBumper(int id, double x, double y) {
-    Bumper * bumper = bumpers[id];
-    bumper->AddPointToRender(x, y);
+int	PoolTable::addPointToBumper(int	id,	double	x,	double	y)	{
+				Bumper	*	bumper	=	bumpers[id];
+				bumper->AddPointToRender(x,	y);
 
-    return 0;
+				return	0;
 }
 
-int PoolTable::addPointToTable(double x, double y) {
-    int id = nextTablePointSlot++;
-    if (id < numTablePoints) {
-        Vec * point = (Vec*) TMM_declare_var_s("Vec");
-        tableShape[id] = (new (point) Vec(x, y));
-        return id;
-    }
-    return -1;
+int	PoolTable::addPointToTable(double	x,	double	y)	{
+				int	id	=	nextTablePointSlot++;
+				if	(id	<	numTablePoints)	{
+								Vec	*	point	=	(Vec*)	TMM_declare_var_s("Vec");
+								tableShape[id]	=	(new	(point)	Vec(x,	y));
+								return	id;
+				}
+				return	-1;
 }
 
-int PoolTable::addPocket(double x, double y, double r) {
-    int id = nextPocketSlot++;
-    if (id < numPockets) {
-        Pocket * pocket = (Pocket*) TMM_declare_var_s("Pocket");
-        pockets[id] = (new (pocket) Pocket(x, y, r));
-        return id;
-    }
-    return -1;
+int	PoolTable::addPocket(double	x,	double	y,	double	r)	{
+				int	id	=	nextPocketSlot++;
+				if	(id	<	numPockets)	{
+								Pocket	*	pocket	=	(Pocket*)	TMM_declare_var_s("Pocket");
+								pockets[id]	=	(new	(pocket)	Pocket(x,	y,	r));
+								return	id;
+				}
+				return	-1;
 }
 
 
 
-int PoolTable::setBallPos(int id, double x, double y) {
-    if (id < numBalls && balls[id] != NULL) {
-        balls[id]->pos[0] = x;
-        balls[id]->pos[1] = y;
-        return 1;
-    }
+int	PoolTable::setBallPos(int	id,	double	x,	double	y)	{
+				if	(id	<	numBalls	&&	balls[id]	!=	NULL)	{
+								balls[id]->pos[0]	=	x;
+								balls[id]->pos[1]	=	y;
+								return	1;
+				}
 
-    return -1;
+				return	-1;
 }
 
-int PoolTable::setBallVel(int id, double v_x, double v_y) {
-    if (id < numBalls && balls[id] != NULL) {
-        balls[id]->vel[0] = v_x;
-        balls[id]->vel[1] = v_y;
-        return 1;
-    }
-    return -1;
+int	PoolTable::setBallVel(int	id,	double	v_x,	double	v_y)	{
+				if	(id	<	numBalls	&&	balls[id]	!=	NULL)	{
+								balls[id]->vel[0]	=	v_x;
+								balls[id]->vel[1]	=	v_y;
+								return	1;
+				}
+				return	-1;
 }
 
 
diff --git a/trick_sims/SIM_contact/models/contact/src/Ball.cpp b/trick_sims/SIM_contact/models/contact/src/Ball.cpp
index 0eb7d8c61..cc580c38f 100644
--- a/trick_sims/SIM_contact/models/contact/src/Ball.cpp
+++ b/trick_sims/SIM_contact/models/contact/src/Ball.cpp
@@ -1,22 +1,22 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate balls contacting boundaries. )
-LIBRARY DEPENDENCY:
-    ((Ball.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	balls	contacting	boundaries.	)
+LIBRARY	DEPENDENCY:
+				((Ball.o))
 *******************************************************************************/
-#include "../include/Ball.hh"
-#include "trick/memorymanager_c_intf.h"
-#include <new>
+#include	"../include/Ball.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	<new>
 
-Ball::Ball(double x, double y, double vx, double vy, double r, double m) {
-    pos[0] = x;
-    pos[1] = y;
-    vel[0] = vx;
-    vel[1] = vy;
-    radius = r;
-    mass = m;
+Ball::Ball(double	x,	double	y,	double	vx,	double	vy,	double	r,	double	m)	{
+				pos[0]	=	x;
+				pos[1]	=	y;
+				vel[0]	=	vx;
+				vel[1]	=	vy;
+				radius	=	r;
+				mass	=	m;
 }
 
-Ball* make_Ball(double x, double y, double vx, double vy, double r, double m) {
-    Ball* b = (Ball*)TMM_declare_var_s("Ball");
-    return (new (b) Ball(x,y,vx,vy,r,m));
+Ball*	make_Ball(double	x,	double	y,	double	vx,	double	vy,	double	r,	double	m)	{
+				Ball*	b	=	(Ball*)TMM_declare_var_s("Ball");
+				return	(new	(b)	Ball(x,y,vx,vy,r,m));
 }
diff --git a/trick_sims/SIM_contact/models/contact/src/Contact.cpp b/trick_sims/SIM_contact/models/contact/src/Contact.cpp
index 02a9d8629..d73c5c377 100644
--- a/trick_sims/SIM_contact/models/contact/src/Contact.cpp
+++ b/trick_sims/SIM_contact/models/contact/src/Contact.cpp
@@ -1,140 +1,140 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate balls contacting boundaries. )
-LIBRARY DEPENDENCY:
-    ((Contact.o)
-     (Ball.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	balls	contacting	boundaries.	)
+LIBRARY	DEPENDENCY:
+				((Contact.o)
+					(Ball.o))
 *******************************************************************************/
-#include <math.h>
-#include <iostream>
-#include "trick/integrator_c_intf.h"
-#include "trick/memorymanager_c_intf.h"
-#include "../include/Contact.hh"
+#include	<math.h>
+#include	<iostream>
+#include	"trick/integrator_c_intf.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"../include/Contact.hh"
 
-int Contact::default_data() {
-    balls = NULL;
-    nballs = 0;
-    return (0);
+int	Contact::default_data()	{
+				balls	=	NULL;
+				nballs	=	0;
+				return	(0);
 }
 
-int Contact::state_init() {
+int	Contact::state_init()	{
 
-    double now ;
-    numAssociations = (nballs*(nballs-1))/2;
-    ballAssociations = (REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI", numAssociations);
-    unsigned int ii,jj;
-    for (ii=1; ii<nballs; ii++) {
-        for (jj=0; jj<ii; jj++) {
-            unsigned int association_index = ii*(ii-1)/2+jj;
-            ballAssociations[association_index].mode = Decreasing;
-            ballAssociations[association_index].error_tol = 0.0000001;
-            now = get_integ_time() ;
-            reset_regula_falsi( now, &ballAssociations[association_index] );
-        }
-    }
-    return (0);
+				double	now	;
+				numAssociations	=	(nballs*(nballs-1))/2;
+				ballAssociations	=	(REGULA_FALSI*)TMM_declare_var_1d("REGULA_FALSI",	numAssociations);
+				unsigned	int	ii,jj;
+				for	(ii=1;	ii<nballs;	ii++)	{
+								for	(jj=0;	jj<ii;	jj++)	{
+												unsigned	int	association_index	=	ii*(ii-1)/2+jj;
+												ballAssociations[association_index].mode	=	Decreasing;
+												ballAssociations[association_index].error_tol	=	0.0000001;
+												now	=	get_integ_time()	;
+												reset_regula_falsi(	now,	&ballAssociations[association_index]	);
+								}
+				}
+				return	(0);
 }
 
-int Contact::state_deriv() {
-    return(0);
+int	Contact::state_deriv()	{
+				return(0);
 }
 
-int Contact::state_integ() {
-    int integration_step;
-    for (unsigned int ii = 0; ii < nballs; ii++) {
+int	Contact::state_integ()	{
+				int	integration_step;
+				for	(unsigned	int	ii	=	0;	ii	<	nballs;	ii++)	{
 
-#ifdef USE_ER7_UTILS_INTEGRATORS
-        load_indexed_state( 2*ii,   balls[ii]->pos[0]);
-        load_indexed_state( 2*ii+1, balls[ii]->pos[1]);
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+								load_indexed_state(	2*ii,			balls[ii]->pos[0]);
+								load_indexed_state(	2*ii+1,	balls[ii]->pos[1]);
 #else
-        load_state_element( 2*ii,   &balls[ii]->pos[0]);
-        load_state_element( 2*ii+1, &balls[ii]->pos[1]);
+								load_state_element(	2*ii,			&balls[ii]->pos[0]);
+								load_state_element(	2*ii+1,	&balls[ii]->pos[1]);
 #endif
 
-    }
-    for (unsigned int ii = 0; ii < nballs; ii++) {
-        load_indexed_deriv( 2*ii,   balls[ii]->vel[0]);
-        load_indexed_deriv( 2*ii+1, balls[ii]->vel[1]);
-    }
-    integration_step = integrate();
-    for (unsigned int ii = 0; ii < nballs; ii++) {
-        balls[ii]->pos[0] = unload_indexed_state( 2*ii );
-        balls[ii]->pos[1] = unload_indexed_state( 2*ii+1 );
-    }
-    return(integration_step);
+				}
+				for	(unsigned	int	ii	=	0;	ii	<	nballs;	ii++)	{
+								load_indexed_deriv(	2*ii,			balls[ii]->vel[0]);
+								load_indexed_deriv(	2*ii+1,	balls[ii]->vel[1]);
+				}
+				integration_step	=	integrate();
+				for	(unsigned	int	ii	=	0;	ii	<	nballs;	ii++)	{
+								balls[ii]->pos[0]	=	unload_indexed_state(	2*ii	);
+								balls[ii]->pos[1]	=	unload_indexed_state(	2*ii+1	);
+				}
+				return(integration_step);
 }
 
-void Contact::ballCollision(Ball &b1, Ball &b2) {
-    double unorm[2];
-    double utang[2];
-    if ((b1.mass > 0.0) && (b2.mass > 0.0)) {
-        unorm[0] = ( b2.pos[0] - b1.pos[0] ) / ( b2.radius + b1.radius );
-        unorm[1] = ( b2.pos[1] - b1.pos[1] ) / ( b2.radius + b1.radius );
-        utang[0] = -unorm[1];
-        utang[1] =  unorm[0];
-        double b1vn = unorm[0] * b1.vel[0] + unorm[1] * b1.vel[1];
-        double b1vt = utang[0] * b1.vel[0] + utang[1] * b1.vel[1];
-        double b2vn = unorm[0] * b2.vel[0] + unorm[1] * b2.vel[1];
-        double b2vt = utang[0] * b2.vel[0] + utang[1] * b2.vel[1];
-        double b1vtAfter = b1vt;
-        double b2vtAfter = b2vt;
-        double b1vnAfter = ( b1vn * (b1.mass - b2.mass) + 2.0 * b2.mass * b2vn ) / ( b1.mass + b2.mass );
-        double b2vnAfter = ( b2vn * (b2.mass - b1.mass) + 2.0 * b1.mass * b1vn ) / ( b1.mass + b2.mass );
-        b1.vel[0] = b1vnAfter * unorm[0] + b1vtAfter * utang[0];
-        b1.vel[1] = b1vnAfter * unorm[1] + b1vtAfter * utang[1];
-        b2.vel[0] = b2vnAfter * unorm[0] + b2vtAfter * utang[0];
-        b2.vel[1] = b2vnAfter * unorm[1] + b2vtAfter * utang[1];
-    } else {
-        std::cout << "ERROR: Balls must have positive mass." << std::endl;
-    }
+void	Contact::ballCollision(Ball	&b1,	Ball	&b2)	{
+				double	unorm[2];
+				double	utang[2];
+				if	((b1.mass	>	0.0)	&&	(b2.mass	>	0.0))	{
+								unorm[0]	=	(	b2.pos[0]	-	b1.pos[0]	)	/	(	b2.radius	+	b1.radius	);
+								unorm[1]	=	(	b2.pos[1]	-	b1.pos[1]	)	/	(	b2.radius	+	b1.radius	);
+								utang[0]	=	-unorm[1];
+								utang[1]	=		unorm[0];
+								double	b1vn	=	unorm[0]	*	b1.vel[0]	+	unorm[1]	*	b1.vel[1];
+								double	b1vt	=	utang[0]	*	b1.vel[0]	+	utang[1]	*	b1.vel[1];
+								double	b2vn	=	unorm[0]	*	b2.vel[0]	+	unorm[1]	*	b2.vel[1];
+								double	b2vt	=	utang[0]	*	b2.vel[0]	+	utang[1]	*	b2.vel[1];
+								double	b1vtAfter	=	b1vt;
+								double	b2vtAfter	=	b2vt;
+								double	b1vnAfter	=	(	b1vn	*	(b1.mass	-	b2.mass)	+	2.0	*	b2.mass	*	b2vn	)	/	(	b1.mass	+	b2.mass	);
+								double	b2vnAfter	=	(	b2vn	*	(b2.mass	-	b1.mass)	+	2.0	*	b1.mass	*	b1vn	)	/	(	b1.mass	+	b2.mass	);
+								b1.vel[0]	=	b1vnAfter	*	unorm[0]	+	b1vtAfter	*	utang[0];
+								b1.vel[1]	=	b1vnAfter	*	unorm[1]	+	b1vtAfter	*	utang[1];
+								b2.vel[0]	=	b2vnAfter	*	unorm[0]	+	b2vtAfter	*	utang[0];
+								b2.vel[1]	=	b2vnAfter	*	unorm[1]	+	b2vtAfter	*	utang[1];
+				}	else	{
+								std::cout	<<	"ERROR:	Balls	must	have	positive	mass."	<<	std::endl;
+				}
 }
 
-double Contact::collision() {
-    //double tgo ; /* time-to-go */
-    double now ; /* current integration time. */
-    unsigned int first, second;
+double	Contact::collision()	{
+				//double	tgo	;	/*	time-to-go	*/
+				double	now	;	/*	current	integration	time.	*/
+				unsigned	int	first,	second;
 
-    unsigned int association_index;
-    double event_tgo;
-    unsigned int ii,jj;
+				unsigned	int	association_index;
+				double	event_tgo;
+				unsigned	int	ii,jj;
 
-    now = get_integ_time() ;
-    event_tgo = BIG_TGO;
+				now	=	get_integ_time()	;
+				event_tgo	=	BIG_TGO;
 
-    for (ii=1; ii<nballs; ii++) {
-        for (jj=0; jj<ii; jj++) {
-            association_index = ii*(ii-1)/2+jj;
-            double xdiff = balls[ii]->pos[0] - balls[jj]->pos[0];
-            double ydiff = balls[ii]->pos[1] - balls[jj]->pos[1];
-            double distance = sqrt( xdiff * xdiff + ydiff * ydiff) - (balls[ii]->radius + balls[jj]->radius);
-            ballAssociations[association_index].error = distance;
-            double tgo = regula_falsi( now, &ballAssociations[association_index] ) ;
+				for	(ii=1;	ii<nballs;	ii++)	{
+								for	(jj=0;	jj<ii;	jj++)	{
+												association_index	=	ii*(ii-1)/2+jj;
+												double	xdiff	=	balls[ii]->pos[0]	-	balls[jj]->pos[0];
+												double	ydiff	=	balls[ii]->pos[1]	-	balls[jj]->pos[1];
+												double	distance	=	sqrt(	xdiff	*	xdiff	+	ydiff	*	ydiff)	-	(balls[ii]->radius	+	balls[jj]->radius);
+												ballAssociations[association_index].error	=	distance;
+												double	tgo	=	regula_falsi(	now,	&ballAssociations[association_index]	)	;
 
-            if (tgo < BIG_TGO) {
-                first = ii;
-                second = jj;
-                event_tgo = tgo;
-            }
-        }
-    }
-    if (event_tgo == 0.0) {
-        now = get_integ_time() ;
-        ballCollision(*balls[first], *balls[second]);
-        std::cout << "Balls "<<second<<" and "<<first<<" collide at t = "<<now<<"." << std::endl;
-        //
-        for (ii=1; ii<nballs; ii++) {
-            for (jj=0; jj<ii; jj++) {
-                association_index = ii*(ii-1)/2+jj;
-                if ((ii==first) && (jj==second)) {
-                    reset_regula_falsi( now, &ballAssociations[association_index] );
-                } else {
-                    // Update the remaining REGULA_FALSI objects to the current event state.
-                    double xdiff = balls[ii]->pos[0] - balls[jj]->pos[0];
-                    double ydiff = balls[ii]->pos[1] - balls[jj]->pos[1];
-                    double distance = sqrt( xdiff * xdiff + ydiff * ydiff) - (balls[ii]->radius + balls[jj]->radius);
-                    regula_falsi_set_upper (now, distance, &ballAssociations[association_index]);
-                }
-            }
-        }
-    }
-    return (event_tgo) ;
+												if	(tgo	<	BIG_TGO)	{
+																first	=	ii;
+																second	=	jj;
+																event_tgo	=	tgo;
+												}
+								}
+				}
+				if	(event_tgo	==	0.0)	{
+								now	=	get_integ_time()	;
+								ballCollision(*balls[first],	*balls[second]);
+								std::cout	<<	"Balls	"<<second<<"	and	"<<first<<"	collide	at	t	=	"<<now<<"."	<<	std::endl;
+								//
+								for	(ii=1;	ii<nballs;	ii++)	{
+												for	(jj=0;	jj<ii;	jj++)	{
+																association_index	=	ii*(ii-1)/2+jj;
+																if	((ii==first)	&&	(jj==second))	{
+																				reset_regula_falsi(	now,	&ballAssociations[association_index]	);
+																}	else	{
+																				//	Update	the	remaining	REGULA_FALSI	objects	to	the	current	event	state.
+																				double	xdiff	=	balls[ii]->pos[0]	-	balls[jj]->pos[0];
+																				double	ydiff	=	balls[ii]->pos[1]	-	balls[jj]->pos[1];
+																				double	distance	=	sqrt(	xdiff	*	xdiff	+	ydiff	*	ydiff)	-	(balls[ii]->radius	+	balls[jj]->radius);
+																				regula_falsi_set_upper	(now,	distance,	&ballAssociations[association_index]);
+																}
+												}
+								}
+				}
+				return	(event_tgo)	;
 }
diff --git a/trick_sims/SIM_fibonacci_time/models/fibonacci_time/src/Fibonacci_time.cpp b/trick_sims/SIM_fibonacci_time/models/fibonacci_time/src/Fibonacci_time.cpp
index f76dcdb0e..d464dc6eb 100644
--- a/trick_sims/SIM_fibonacci_time/models/fibonacci_time/src/Fibonacci_time.cpp
+++ b/trick_sims/SIM_fibonacci_time/models/fibonacci_time/src/Fibonacci_time.cpp
@@ -1,59 +1,59 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Example of an "automatic" (self-scheduling) job. )
-LIBRARY DEPENDENCY:
-    ((Fibonacci_time.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Example	of	an	"automatic"	(self-scheduling)	job.	)
+LIBRARY	DEPENDENCY:
+				((Fibonacci_time.o))
 *******************************************************************************/
-#include "../include/Fibonacci_time.hh"
-#include <math.h>
-#include <iostream>
-
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
-
-const char * ISO_6429_Restore_Default   = "\x1b[00m";
-const char * ISO_6429_Red_Foreground    = "\x1b[31m";
-const char * ISO_6429_Green_Foreground  = "\x1b[32m";
-
-int Fibonacci(int n) {
-    if (n<=1) {
-        return n;
-    } else {
-        return Fibonacci(n-1) + Fibonacci(n-2) ;
-    }
+#include	"../include/Fibonacci_time.hh"
+#include	<math.h>
+#include	<iostream>
+
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
+
+const	char	*	ISO_6429_Restore_Default			=	"\x1b[00m";
+const	char	*	ISO_6429_Red_Foreground				=	"\x1b[31m";
+const	char	*	ISO_6429_Green_Foreground		=	"\x1b[32m";
+
+int	Fibonacci(int	n)	{
+				if	(n<=1)	{
+								return	n;
+				}	else	{
+								return	Fibonacci(n-1)	+	Fibonacci(n-2)	;
+				}
 }
 
-int Fibonacci_time::default_data() {
-    N = 1;
-    tics_per_second = exec_get_time_tic_value();
-    return (0);
+int	Fibonacci_time::default_data()	{
+				N	=	1;
+				tics_per_second	=	exec_get_time_tic_value();
+				return	(0);
 }
 
-int Fibonacci_time::state_init() {
-    return (0);
+int	Fibonacci_time::state_init()	{
+				return	(0);
 }
 
-int Fibonacci_time::scheduled_job_1() {
+int	Fibonacci_time::scheduled_job_1()	{
 
-    double time_in_seconds = (double)exec_get_time_tics() / tics_per_second;
-    std::cout << ISO_6429_Green_Foreground
-              << "Scheduled Job Time = " << time_in_seconds
-              << ISO_6429_Restore_Default << std::endl; 
+				double	time_in_seconds	=	(double)exec_get_time_tics()	/	tics_per_second;
+				std::cout	<<	ISO_6429_Green_Foreground
+														<<	"Scheduled	Job	Time	=	"	<<	time_in_seconds
+														<<	ISO_6429_Restore_Default	<<	std::endl;	
 
-    return(0);
+				return(0);
 }
 
-int Fibonacci_time::automatic_job_1() {
+int	Fibonacci_time::automatic_job_1()	{
 
-    double time_in_seconds = (double)exec_get_time_tics() / tics_per_second;
-    std::cout << ISO_6429_Red_Foreground
-              << "Automatic Job Time = " << time_in_seconds
-              << ISO_6429_Restore_Default << std::endl; 
+				double	time_in_seconds	=	(double)exec_get_time_tics()	/	tics_per_second;
+				std::cout	<<	ISO_6429_Red_Foreground
+														<<	"Automatic	Job	Time	=	"	<<	time_in_seconds
+														<<	ISO_6429_Restore_Default	<<	std::endl;	
 
-    N++;
-    double next_time = Fibonacci(N);
+				N++;
+				double	next_time	=	Fibonacci(N);
 
-    Trick::JobData * thisJob = exec_get_curr_job() ;
-    thisJob->set_next_call_time(next_time * tics_per_second);
+				Trick::JobData	*	thisJob	=	exec_get_curr_job()	;
+				thisJob->set_next_call_time(next_time	*	tics_per_second);
 
-    return(0);
+				return(0);
 }
diff --git a/trick_sims/SIM_lander/models/PIDController/src/PIDController.cpp b/trick_sims/SIM_lander/models/PIDController/src/PIDController.cpp
index 60ed48089..a078cfc26 100644
--- a/trick_sims/SIM_lander/models/PIDController/src/PIDController.cpp
+++ b/trick_sims/SIM_lander/models/PIDController/src/PIDController.cpp
@@ -1,76 +1,76 @@
 
-#include "PIDController.hh"
+#include	"PIDController.hh"
 
-PIDController::PIDController( double kp, double ki, double kd, double omax, double omin, double dt, double tc ) {
-    Kp=kp;
-    Ki=ki;
-    Kd=kd;
-    Dt=dt;
-    k = dt/tc;
-    integral = 0.0;
-    out_max = omax;
-    out_min = omin;
-    error = 0.0;
-    previous_error = 0.0;
-    prev_setpoint_value = 0.0;
-    integration_enabled = true;
+PIDController::PIDController(	double	kp,	double	ki,	double	kd,	double	omax,	double	omin,	double	dt,	double	tc	)	{
+				Kp=kp;
+				Ki=ki;
+				Kd=kd;
+				Dt=dt;
+				k	=	dt/tc;
+				integral	=	0.0;
+				out_max	=	omax;
+				out_min	=	omin;
+				error	=	0.0;
+				previous_error	=	0.0;
+				prev_setpoint_value	=	0.0;
+				integration_enabled	=	true;
 }
 
-double PIDController::getOutput(double setpoint_value, double measured_value) {
+double	PIDController::getOutput(double	setpoint_value,	double	measured_value)	{
 
-    double error_unfiltered = setpoint_value - measured_value;
+				double	error_unfiltered	=	setpoint_value	-	measured_value;
 
-    // Low pass filter for our error signal.
-    error = error + k * (error_unfiltered - error);
+				//	Low	pass	filter	for	our	error	signal.
+				error	=	error	+	k	*	(error_unfiltered	-	error);
 
-    // If we suddenly change the set point value then we need to reset
-    // our previous_error, otherwise we'll get a spike in our derivative.
-    if (prev_setpoint_value != setpoint_value) {
-        previous_error = error;
-    }
+				//	If	we	suddenly	change	the	set	point	value	then	we	need	to	reset
+				//	our	previous_error,	otherwise	we'll	get	a	spike	in	our	derivative.
+				if	(prev_setpoint_value	!=	setpoint_value)	{
+								previous_error	=	error;
+				}
 
-    // Integration is normally enabled unless we are mitigating integral windup.
-    if (integration_enabled) {
-        integral = integral + error * Dt;
-    }
+				//	Integration	is	normally	enabled	unless	we	are	mitigating	integral	windup.
+				if	(integration_enabled)	{
+								integral	=	integral	+	error	*	Dt;
+				}
 
-    double derivative = (error - previous_error) / Dt;
+				double	derivative	=	(error	-	previous_error)	/	Dt;
 
-    double pterm = Kp * error;
-    double iterm = Ki * integral;
-    double dterm = Kd * derivative;
-    double output = pterm + iterm + dterm;
+				double	pterm	=	Kp	*	error;
+				double	iterm	=	Ki	*	integral;
+				double	dterm	=	Kd	*	derivative;
+				double	output	=	pterm	+	iterm	+	dterm;
 
-    bool same_sign;
-    // If the signs of the error and the output are the same,
-    // then the output isn't reducing the error.
-    if ((error * output) > 0.0) {
-        same_sign = 1;
-    } else {
-        same_sign = 0;
-    }
+				bool	same_sign;
+				//	If	the	signs	of	the	error	and	the	output	are	the	same,
+				//	then	the	output	isn't	reducing	the	error.
+				if	((error	*	output)	>	0.0)	{
+								same_sign	=	1;
+				}	else	{
+								same_sign	=	0;
+				}
 
-    bool output_limited;
-    // Check for saturation.
-    if (output > out_max) {
-        output = out_max;
-        output_limited = 1;
-    }
-    if (output < out_min) {
-        output = out_min;
-        output_limited = 1;
-    }
+				bool	output_limited;
+				//	Check	for	saturation.
+				if	(output	>	out_max)	{
+								output	=	out_max;
+								output_limited	=	1;
+				}
+				if	(output	<	out_min)	{
+								output	=	out_min;
+								output_limited	=	1;
+				}
 
-    // If the output isn't reducing the error, and is being limited,
-    // then we need to inhibit integration to prevent integral windup.
-    if (same_sign && output_limited) {
-        integration_enabled = false;
-    } else {
-        integration_enabled = true;
-    }
+				//	If	the	output	isn't	reducing	the	error,	and	is	being	limited,
+				//	then	we	need	to	inhibit	integration	to	prevent	integral	windup.
+				if	(same_sign	&&	output_limited)	{
+								integration_enabled	=	false;
+				}	else	{
+								integration_enabled	=	true;
+				}
 
-    previous_error = error;
-    prev_setpoint_value = setpoint_value;
+				previous_error	=	error;
+				prev_setpoint_value	=	setpoint_value;
 
-    return ( output );
+				return	(	output	);
 }
diff --git a/trick_sims/SIM_lander/models/lander/src/Lander.cpp b/trick_sims/SIM_lander/models/lander/src/Lander.cpp
index 78393ac12..0b5c7e4cb 100644
--- a/trick_sims/SIM_lander/models/lander/src/Lander.cpp
+++ b/trick_sims/SIM_lander/models/lander/src/Lander.cpp
@@ -1,225 +1,225 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a satellite orbiting the Earth. )
-LIBRARY DEPENDENCY:
-    ((Lander.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	satellite	orbiting	the	Earth.	)
+LIBRARY	DEPENDENCY:
+				((Lander.o))
 *******************************************************************************/
-#include "lander/include/Lander.hh"
-
-#include "trick/integrator_c_intf.h"
-#include <math.h>
-#include <iostream>
-
-#define RAD_PER_DEG (M_PI / 180.0)
-#define DEG_PER_RAD (180.0/ M_PI)
-
-int Lander::default_data() {
-
-    pos[0] = 0.0;
-    pos[1] = 1.8;
-    vel[0] = 0.0;
-    vel[1] = 0.0;
-    pitch = 0.0;
-    pitchDot = 0.0;
-    pitchDDot = 0.0;
-
-    thrust_max = 6500;
-    rcs_thrust = 50;
-    rcs_offset = 1.15;
-    mass = 2000;
-    moment_of_inertia = 2000;
-    main_engine_offset = 1.0;
-    g = 1.62;                  // Gravitional acceleration on the moon.
-
-    RCS_pitch_dot_limit = (RAD_PER_DEG * 5.0);
-
-    nozzle_angle = 0.0;
-    throttle = 0;
-    rcs_command = 0;
-
-    // Controls
-    manual_throttle_change_command = 0;
-    manual_rcs_command = 0;
-    altitudeCtrlEnabled = 0;
-    downRangeCtrlEnabled = 0;
-
-    // Auto Control Parameters
-    x_cmd = 40.0;
-    y_cmd = 0.0;
-
-    return (0);
+#include	"lander/include/Lander.hh"
+
+#include	"trick/integrator_c_intf.h"
+#include	<math.h>
+#include	<iostream>
+
+#define	RAD_PER_DEG	(M_PI	/	180.0)
+#define	DEG_PER_RAD	(180.0/	M_PI)
+
+int	Lander::default_data()	{
+
+				pos[0]	=	0.0;
+				pos[1]	=	1.8;
+				vel[0]	=	0.0;
+				vel[1]	=	0.0;
+				pitch	=	0.0;
+				pitchDot	=	0.0;
+				pitchDDot	=	0.0;
+
+				thrust_max	=	6500;
+				rcs_thrust	=	50;
+				rcs_offset	=	1.15;
+				mass	=	2000;
+				moment_of_inertia	=	2000;
+				main_engine_offset	=	1.0;
+				g	=	1.62;																		//	Gravitional	acceleration	on	the	moon.
+
+				RCS_pitch_dot_limit	=	(RAD_PER_DEG	*	5.0);
+
+				nozzle_angle	=	0.0;
+				throttle	=	0;
+				rcs_command	=	0;
+
+				//	Controls
+				manual_throttle_change_command	=	0;
+				manual_rcs_command	=	0;
+				altitudeCtrlEnabled	=	0;
+				downRangeCtrlEnabled	=	0;
+
+				//	Auto	Control	Parameters
+				x_cmd	=	40.0;
+				y_cmd	=	0.0;
+
+				return	(0);
 }
 
-int Lander::state_init() {
+int	Lander::state_init()	{
 
-    RCS_pitch_ddot_limit = (rcs_thrust * rcs_offset) / moment_of_inertia;
+				RCS_pitch_ddot_limit	=	(rcs_thrust	*	rcs_offset)	/	moment_of_inertia;
 
-    // =========================================================================
-    //  Horizontal Position Controllers
+				//	=========================================================================
+				//		Horizontal	Position	Controllers
 
-    // Horizontal Position Controller
-    // Generates x-axis (horizontal) velocity commands.
-    posxCntrl  = new PIDController( 0.08, 0.002, 0.20, 10.0, -10.0,  0.10, 0.10 );
+				//	Horizontal	Position	Controller
+				//	Generates	x-axis	(horizontal)	velocity	commands.
+				posxCntrl		=	new	PIDController(	0.08,	0.002,	0.20,	10.0,	-10.0,		0.10,	0.10	);
 
-    // Horizontal Velocity Controller
-    // Generates x-axis (horizontal) acceleration commands.
-    double ax_limit = 0.30 * (thrust_max / mass);
-    velxCntrl  = new PIDController( 0.18, 0.0, 0.0, ax_limit, -ax_limit,  0.10, 0.10 );
+				//	Horizontal	Velocity	Controller
+				//	Generates	x-axis	(horizontal)	acceleration	commands.
+				double	ax_limit	=	0.30	*	(thrust_max	/	mass);
+				velxCntrl		=	new	PIDController(	0.18,	0.0,	0.0,	ax_limit,	-ax_limit,		0.10,	0.10	);
 
-    // =========================================================================
-    // Vertical Position Controllers (Below 100 meters)
+				//	=========================================================================
+				//	Vertical	Position	Controllers	(Below	100	meters)
 
-    // Vertical Position Controller
-    // Generates y-axis (vertical) velocity commands.
-    posyCntrl  = new PIDController( 0.4, 0.0001, 0.2, 5.0,  -2.0,  0.10, 0.10 );
+				//	Vertical	Position	Controller
+				//	Generates	y-axis	(vertical)	velocity	commands.
+				posyCntrl		=	new	PIDController(	0.4,	0.0001,	0.2,	5.0,		-2.0,		0.10,	0.10	);
 
-    // Vertical Velocity Controller
-    // Generates y-axis (vertical) acceleration commands.
-    double ay_limit = 0.95 * (thrust_max / mass);
-    velyCntrl  = new PIDController( 0.5, 0.1, 0.0, ay_limit, -ay_limit,  0.10, 0.10 );
+				//	Vertical	Velocity	Controller
+				//	Generates	y-axis	(vertical)	acceleration	commands.
+				double	ay_limit	=	0.95	*	(thrust_max	/	mass);
+				velyCntrl		=	new	PIDController(	0.5,	0.1,	0.0,	ay_limit,	-ay_limit,		0.10,	0.10	);
 
-    // =========================================================================
-    // Vertical Position Controller (Above 100 meters)
-    // Generates y-axis (vertical) acceleration commands.
-    // Setpoint: Potential Energy per Kg due to gravity between the commanded
-    // altitude and the surface.
-    // Measured value: Total Energy per Kg (Potential + Kinetic) due to the
-    // current altitude and altitude rate.
-    energy_controller  = new PIDController( 0.1, 0.0001, 0.2, 30.0,  0.00,   0.10, 0.10 );
+				//	=========================================================================
+				//	Vertical	Position	Controller	(Above	100	meters)
+				//	Generates	y-axis	(vertical)	acceleration	commands.
+				//	Setpoint:	Potential	Energy	per	Kg	due	to	gravity	between	the	commanded
+				//	altitude	and	the	surface.
+				//	Measured	value:	Total	Energy	per	Kg	(Potential	+	Kinetic)	due	to	the
+				//	current	altitude	and	altitude	rate.
+				energy_controller		=	new	PIDController(	0.1,	0.0001,	0.2,	30.0,		0.00,			0.10,	0.10	);
 
-    // =========================================================================
-    // Pitch Controllers (when throttle > 10)
+				//	=========================================================================
+				//	Pitch	Controllers	(when	throttle	>	10)
 
-    // Pitch Controller
-    // Generates pitch rate commands (radians / sec)
-    nozzlePitchController = new PIDController( 0.50, 0.0, 0.0, RAD_PER_DEG * 20.0, -RAD_PER_DEG * 20.0, 0.10 , 0.10);
+				//	Pitch	Controller
+				//	Generates	pitch	rate	commands	(radians	/	sec)
+				nozzlePitchController	=	new	PIDController(	0.50,	0.0,	0.0,	RAD_PER_DEG	*	20.0,	-RAD_PER_DEG	*	20.0,	0.10	,	0.10);
 
-    // Pitch Rate Controller
-    // Generates pitch angular acceleration commands (radians /sec^2)
-    nozzlePitchRateController = new PIDController( 0.50, 0.0, 0.0, RAD_PER_DEG * 10.0, -RAD_PER_DEG * 10.0, 0.10 , 0.10);
+				//	Pitch	Rate	Controller
+				//	Generates	pitch	angular	acceleration	commands	(radians	/sec^2)
+				nozzlePitchRateController	=	new	PIDController(	0.50,	0.0,	0.0,	RAD_PER_DEG	*	10.0,	-RAD_PER_DEG	*	10.0,	0.10	,	0.10);
 
-    // =========================================================================
-    // Pitch Controller (when throttle < 10)
+				//	=========================================================================
+				//	Pitch	Controller	(when	throttle	<	10)
 
-    // RCS Pitch Controller
-    // Generates pitch rate commands (radians / sec) for the RCS.
-    RCSpitchController = new PIDController( 0.30, 0.0, 0.0, RCS_pitch_dot_limit, -RCS_pitch_dot_limit, 0.10 , 0.10);
+				//	RCS	Pitch	Controller
+				//	Generates	pitch	rate	commands	(radians	/	sec)	for	the	RCS.
+				RCSpitchController	=	new	PIDController(	0.30,	0.0,	0.0,	RCS_pitch_dot_limit,	-RCS_pitch_dot_limit,	0.10	,	0.10);
 
-    // RCS Pitch Rate Controller
-    // Generates pitch rate commands (radians / sec) for the RCS.
-    RCSpitchRateController = new PIDController( 0.60, 0.0, 0.0, RCS_pitch_ddot_limit, -RCS_pitch_ddot_limit, 0.10 , 0.10);
+				//	RCS	Pitch	Rate	Controller
+				//	Generates	pitch	rate	commands	(radians	/	sec)	for	the	RCS.
+				RCSpitchRateController	=	new	PIDController(	0.60,	0.0,	0.0,	RCS_pitch_ddot_limit,	-RCS_pitch_ddot_limit,	0.10	,	0.10);
 
-    return (0);
+				return	(0);
 }
 
-int Lander::control() {
+int	Lander::control()	{
 
-    rcs_command = 0;
+				rcs_command	=	0;
 
-    if (altitudeCtrlEnabled) {
+				if	(altitudeCtrlEnabled)	{
 
-        double Eppkg = g * y_cmd;                                // Potential Energy per kg.
-        double Etpkg = g * pos[1] + 0.5 * fabs(vel[1]) * vel[1]; // Total Energy per kg.
-        double Ediff = fabs(Eppkg - Etpkg);
+								double	Eppkg	=	g	*	y_cmd;																																//	Potential	Energy	per	kg.
+								double	Etpkg	=	g	*	pos[1]	+	0.5	*	fabs(vel[1])	*	vel[1];	//	Total	Energy	per	kg.
+								double	Ediff	=	fabs(Eppkg	-	Etpkg);
 
-        if ((pos[1] < 100.0) && (Ediff < 50.0) ){
-             vy_cmd = posyCntrl->getOutput(y_cmd,  pos[1]);
-             ay_cmd = velyCntrl->getOutput(vy_cmd, vel[1]);
-        } else {
-            // This controller is intended to be more energy efficient.
-             ay_cmd = energy_controller->getOutput(
-                  g * y_cmd,                                   // Potential Energy
-                  g * pos[1] + 0.5 * fabs(vel[1]) * vel[1]     // Kinetic Energy
-              );
-        }
+								if	((pos[1]	<	100.0)	&&	(Ediff	<	50.0)	){
+													vy_cmd	=	posyCntrl->getOutput(y_cmd,		pos[1]);
+													ay_cmd	=	velyCntrl->getOutput(vy_cmd,	vel[1]);
+								}	else	{
+												//	This	controller	is	intended	to	be	more	energy	efficient.
+													ay_cmd	=	energy_controller->getOutput(
+																		g	*	y_cmd,																																			//	Potential	Energy
+																		g	*	pos[1]	+	0.5	*	fabs(vel[1])	*	vel[1]					//	Kinetic	Energy
+														);
+								}
 
-        if ((downRangeCtrlEnabled) && (throttle >= 10)) {
+								if	((downRangeCtrlEnabled)	&&	(throttle	>=	10))	{
 
-            vx_cmd = posxCntrl->getOutput(x_cmd, pos[0]);
-            ax_cmd = velxCntrl->getOutput(vx_cmd, vel[0]);
+												vx_cmd	=	posxCntrl->getOutput(x_cmd,	pos[0]);
+												ax_cmd	=	velxCntrl->getOutput(vx_cmd,	vel[0]);
 
-            if (ay_cmd > 0.0) {
-                pitch_cmd = -atan( ax_cmd / ay_cmd );
-            } else {
-                pitch_cmd = 0.0;
-            }
+												if	(ay_cmd	>	0.0)	{
+																pitch_cmd	=	-atan(	ax_cmd	/	ay_cmd	);
+												}	else	{
+																pitch_cmd	=	0.0;
+												}
 
-            pitch_dot_cmd  = nozzlePitchController->getOutput(pitch_cmd, pitch);
-            pitch_ddot_cmd = nozzlePitchRateController->getOutput(pitch_dot_cmd, pitchDot);
-            double thrust = (throttle / 100.0) * thrust_max;
-            // Calculate the nozzle angle that would give us the commanded pitch angular acceleration.
-            nozzle_angle = asin( (moment_of_inertia * pitch_ddot_cmd)/ (main_engine_offset * thrust) );
+												pitch_dot_cmd		=	nozzlePitchController->getOutput(pitch_cmd,	pitch);
+												pitch_ddot_cmd	=	nozzlePitchRateController->getOutput(pitch_dot_cmd,	pitchDot);
+												double	thrust	=	(throttle	/	100.0)	*	thrust_max;
+												//	Calculate	the	nozzle	angle	that	would	give	us	the	commanded	pitch	angular	acceleration.
+												nozzle_angle	=	asin(	(moment_of_inertia	*	pitch_ddot_cmd)/	(main_engine_offset	*	thrust)	);
 
 
-        } else {
-            vx_cmd = 0.0;
-            ax_cmd = 0.0;
-            nozzle_angle = 0.0;
+								}	else	{
+												vx_cmd	=	0.0;
+												ax_cmd	=	0.0;
+												nozzle_angle	=	0.0;
 
-            pitch_cmd = 0.0;
-            pitch_dot_cmd = RCSpitchController->getOutput(pitch_cmd, pitch);
-            pitch_ddot_cmd = RCSpitchRateController->getOutput(pitch_dot_cmd, pitchDot);
-            if ( pitch_ddot_cmd > 0.1 * RCS_pitch_ddot_limit) {
-                rcs_command = 1;
-            } else if (pitch_ddot_cmd < -0.1 * RCS_pitch_ddot_limit) {
-                rcs_command = -1;
-            } else {
-                rcs_command = 0;
-            }
-        }
+												pitch_cmd	=	0.0;
+												pitch_dot_cmd	=	RCSpitchController->getOutput(pitch_cmd,	pitch);
+												pitch_ddot_cmd	=	RCSpitchRateController->getOutput(pitch_dot_cmd,	pitchDot);
+												if	(	pitch_ddot_cmd	>	0.1	*	RCS_pitch_ddot_limit)	{
+																rcs_command	=	1;
+												}	else	if	(pitch_ddot_cmd	<	-0.1	*	RCS_pitch_ddot_limit)	{
+																rcs_command	=	-1;
+												}	else	{
+																rcs_command	=	0;
+												}
+								}
 
-        double a_cmd = sqrt(ax_cmd * ax_cmd + ay_cmd * ay_cmd);
-        throttle = (a_cmd * mass * 100) / thrust_max;
+								double	a_cmd	=	sqrt(ax_cmd	*	ax_cmd	+	ay_cmd	*	ay_cmd);
+								throttle	=	(a_cmd	*	mass	*	100)	/	thrust_max;
 
-    }
+				}
 
-    throttle += manual_throttle_change_command;
-    if (throttle > 100 ) throttle = 100;
-    if (throttle <   0) throttle = 0;
+				throttle	+=	manual_throttle_change_command;
+				if	(throttle	>	100	)	throttle	=	100;
+				if	(throttle	<			0)	throttle	=	0;
 
-    rcs_command += manual_rcs_command;
-    if (rcs_command >  1) rcs_command =  1;
-    if (rcs_command < -1) rcs_command = -1;
+				rcs_command	+=	manual_rcs_command;
+				if	(rcs_command	>		1)	rcs_command	=		1;
+				if	(rcs_command	<	-1)	rcs_command	=	-1;
 
-    return (0);
+				return	(0);
 }
 
-int Lander::state_deriv() {
+int	Lander::state_deriv()	{
 
-   double thrust = (throttle / 100.0) * thrust_max;
+			double	thrust	=	(throttle	/	100.0)	*	thrust_max;
 
-    acc[0] = (thrust * -sin(pitch)) / mass;
-    acc[1] = (thrust *  cos(pitch)) / mass - g;
+				acc[0]	=	(thrust	*	-sin(pitch))	/	mass;
+				acc[1]	=	(thrust	*		cos(pitch))	/	mass	-	g;
 
-    double torque_main_engine = main_engine_offset * thrust * sin( nozzle_angle );
-    double torque_rcs = rcs_command * rcs_thrust * rcs_offset;
-    double torque_total = torque_main_engine + torque_rcs;
+				double	torque_main_engine	=	main_engine_offset	*	thrust	*	sin(	nozzle_angle	);
+				double	torque_rcs	=	rcs_command	*	rcs_thrust	*	rcs_offset;
+				double	torque_total	=	torque_main_engine	+	torque_rcs;
 
-    pitchDDot = torque_total / moment_of_inertia;
+				pitchDDot	=	torque_total	/	moment_of_inertia;
 
-    return(0);
+				return(0);
 }
 
-int Lander::state_integ() {
+int	Lander::state_integ()	{
 
-   int integration_step;
+			int	integration_step;
 
-   load_state ( &pos[0], &pos[1], &vel[0], &vel[1], &pitch, &pitchDot, (double*)0);
-   load_deriv ( &vel[0], &vel[1], &acc[0], &acc[1], &pitchDot, &pitchDDot, (double*)0);
+			load_state	(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	&pitch,	&pitchDot,	(double*)0);
+			load_deriv	(	&vel[0],	&vel[1],	&acc[0],	&acc[1],	&pitchDot,	&pitchDDot,	(double*)0);
 
-   integration_step = integrate();
+			integration_step	=	integrate();
 
-   unload_state( &pos[0], &pos[1], &vel[0], &vel[1], &pitch, &pitchDot, (double*)0);
+			unload_state(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	&pitch,	&pitchDot,	(double*)0);
 
-   return(integration_step);
+			return(integration_step);
 }
 
-int Lander::check_ground_contact() {
-    if (pos[1] < 1.8) {
-        pos[1] = 1.8;
-        vel[0] = 0.0;
-        vel[1] = 0.0;
-        pitch = 0.0;
-        pitchDot = 0.0;
-    }
-    return(0);
+int	Lander::check_ground_contact()	{
+				if	(pos[1]	<	1.8)	{
+								pos[1]	=	1.8;
+								vel[0]	=	0.0;
+								vel[1]	=	0.0;
+								pitch	=	0.0;
+								pitchDot	=	0.0;
+				}
+				return(0);
 }
diff --git a/trick_sims/SIM_msd/models/msd/src/msd.cpp b/trick_sims/SIM_msd/models/msd/src/msd.cpp
index 5ba59dd6a..4c124214b 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd.cpp
@@ -1,20 +1,20 @@
-/************************TRICK HEADER*************************
-PURPOSE: MSD is a mass-spring-damper class for a trick sim.
+/************************TRICK	HEADER*************************
+PURPOSE:	MSD	is	a	mass-spring-damper	class	for	a	trick	sim.
 PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
-#include <math.h>
-#include "msd.hh"
-#include <float.h>
+#include	<math.h>
+#include	"msd.hh"
+#include	<float.h>
 
-MSD::MSD(double _m, double _k, double _b, double _F, double _v_0, double _x_0) {
-    m = _m;
-    k = _k;
-    b = _b;
-    F = _F;
-    v_0 = _v_0;
-    x_0 = _x_0;
+MSD::MSD(double	_m,	double	_k,	double	_b,	double	_F,	double	_v_0,	double	_x_0)	{
+				m	=	_m;
+				k	=	_k;
+				b	=	_b;
+				F	=	_F;
+				v_0	=	_v_0;
+				x_0	=	_x_0;
 }
 
-MSD::MSD(void) {/* not used */}
+MSD::MSD(void)	{/*	not	used	*/}
 
diff --git a/trick_sims/SIM_msd/models/msd/src/msd_default_data.cpp b/trick_sims/SIM_msd/models/msd/src/msd_default_data.cpp
index b55139787..c2cf08096 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd_default_data.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd_default_data.cpp
@@ -1,20 +1,20 @@
-/************************TRICK HEADER*************************
-PURPOSE: MSD default data job
+/************************TRICK	HEADER*************************
+PURPOSE:	MSD	default	data	job
 PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
-#include "msd.hh"
+#include	"msd.hh"
 
-/* default data job */
-int MSD::default_data(MSD &M) {
-    M = MSD(
-            1.0, /* m */
-            2.0, /* k */
-            0.5, /* b */
-            5.0, /* F */
-            0.0, /* v_0 */
-            5.0  /* x_0 */
-    );
+/*	default	data	job	*/
+int	MSD::default_data(MSD	&M)	{
+				M	=	MSD(
+												1.0,	/*	m	*/
+												2.0,	/*	k	*/
+												0.5,	/*	b	*/
+												5.0,	/*	F	*/
+												0.0,	/*	v_0	*/
+												5.0		/*	x_0	*/
+				);
 
-    return 0;
+				return	0;
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_msd/models/msd/src/msd_deriv.cpp b/trick_sims/SIM_msd/models/msd/src/msd_deriv.cpp
index 9b4da4dd5..7c49194dc 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd_deriv.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd_deriv.cpp
@@ -1,14 +1,14 @@
-/************************TRICK HEADER*************************
-  PURPOSE: ( Trick integration )
+/************************TRICK	HEADER*************************
+		PURPOSE:	(	Trick	integration	)
 PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
-#include "msd.hh"
-#include <math.h>
+#include	"msd.hh"
+#include	<math.h>
 
-int MSD::state_deriv(void) {
-    /* system equation for second derivitive */
-    a = (F - b*v - k*x)/m;
-    
-    return(0);
+int	MSD::state_deriv(void)	{
+				/*	system	equation	for	second	derivitive	*/
+				a	=	(F	-	b*v	-	k*x)/m;
+				
+				return(0);
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_msd/models/msd/src/msd_init.cpp b/trick_sims/SIM_msd/models/msd/src/msd_init.cpp
index de8c099da..e3f3ba8c7 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd_init.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd_init.cpp
@@ -1,16 +1,16 @@
-/************************TRICK HEADER*************************
-PURPOSE: Set the initial data values of the MSD
+/************************TRICK	HEADER*************************
+PURPOSE:	Set	the	initial	data	values	of	the	MSD
 PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
 
-/* Model Include files */
-#include "msd.hh"
+/*	Model	Include	files	*/
+#include	"msd.hh"
 
-/* initialization job */
-int MSD::init() {
-    x = x_0;
-    v = v_0;
-    a = (F - b*v - k*x)/m;
-    return 0;
+/*	initialization	job	*/
+int	MSD::init()	{
+				x	=	x_0;
+				v	=	v_0;
+				a	=	(F	-	b*v	-	k*x)/m;
+				return	0;
 }
diff --git a/trick_sims/SIM_msd/models/msd/src/msd_integ.cpp b/trick_sims/SIM_msd/models/msd/src/msd_integ.cpp
index 872fcb4c3..0993b0aaa 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd_integ.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd_integ.cpp
@@ -1,31 +1,31 @@
-/************************TRICK HEADER*************************
-  PURPOSE: ( Trick integration )
-  PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+/************************TRICK	HEADER*************************
+		PURPOSE:	(	Trick	integration	)
+		PROGRAMMERS:
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
-#include "msd.hh"
-#include "trick/Integrator.hh"
-#include "trick/integrator_c_intf.h"
-#include <math.h>
+#include	"msd.hh"
+#include	"trick/Integrator.hh"
+#include	"trick/integrator_c_intf.h"
+#include	<math.h>
 
-int MSD::state_integ(void) {
-    int ipass;
-	    load_state(
-	    	&x,
-	    	&v,
-	    	NULL);
+int	MSD::state_integ(void)	{
+				int	ipass;
+					load_state(
+						&x,
+						&v,
+						NULL);
 
-	    load_deriv(
-	    	&v,
-	    	&a,
-	    	NULL);
-	    
-	    ipass = integrate();
+					load_deriv(
+						&v,
+						&a,
+						NULL);
+					
+					ipass	=	integrate();
 
-	    unload_state(
-	    	&x,
-	    	&v,	
+					unload_state(
+						&x,
+						&v,	
 			NULL);
 
-    return(ipass);
+				return(ipass);
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_msd/models/msd/src/msd_shutdown.cpp b/trick_sims/SIM_msd/models/msd/src/msd_shutdown.cpp
index a7ea6f843..988a3ec3d 100644
--- a/trick_sims/SIM_msd/models/msd/src/msd_shutdown.cpp
+++ b/trick_sims/SIM_msd/models/msd/src/msd_shutdown.cpp
@@ -1,17 +1,17 @@
-/************************TRICK HEADER*************************
-PURPOSE: (Print the final msd state.)
+/************************TRICK	HEADER*************************
+PURPOSE:	(Print	the	final	msd	state.)
 PROGRAMMERS:
-    (((Scott P. Fennell) (CACI International Inc.) (January 2018) (Trick Learning Project)))
+				(((Scott	P.	Fennell)	(CACI	International	Inc.)	(January	2018)	(Trick	Learning	Project)))
 *************************************************************/
-#include "msd.hh"
-#include "trick/exec_proto.h"
-#include <stdio.h>
+#include	"msd.hh"
+#include	"trick/exec_proto.h"
+#include	<stdio.h>
 
-int MSD::shutdown() {
-    printf("========================================\n");
-    printf("         MSD State at Shutdown     \n");
-    printf("pos = [%g], vel = [%g], acc = [%g]\n",
-             x, v, a);
-    printf("========================================\n");
-    return 0;
+int	MSD::shutdown()	{
+				printf("========================================\n");
+				printf("									MSD	State	at	Shutdown					\n");
+				printf("pos	=	[%g],	vel	=	[%g],	acc	=	[%g]\n",
+													x,	v,	a);
+				printf("========================================\n");
+				return	0;
 }
\ No newline at end of file
diff --git a/trick_sims/SIM_parachute/models/parachute/src/Parachutist.cpp b/trick_sims/SIM_parachute/models/parachute/src/Parachutist.cpp
index d6b69962b..379e44e5d 100644
--- a/trick_sims/SIM_parachute/models/parachute/src/Parachutist.cpp
+++ b/trick_sims/SIM_parachute/models/parachute/src/Parachutist.cpp
@@ -1,105 +1,105 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a skydiver jumping from very high altitude.)
-LIBRARY DEPENDENCY:
-    ((Parachutist.o)(interpolate.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	skydiver	jumping	from	very	high	altitude.)
+LIBRARY	DEPENDENCY:
+				((Parachutist.o)(interpolate.o))
 PROGRAMMERS:
-    (((John M. Penn) (L3 Communications) (March 2015) (Trick Refresher Project)))
+				(((John	M.	Penn)	(L3	Communications)	(March	2015)	(Trick	Refresher	Project)))
 *******************************************************************************/
-#include "../include/Parachutist.hh"
-#include "../include/interpolate.h"
-#include <iostream>
-
-// The following three data arrays come from:
-// http://www.engineeringtoolbox.com/standard-atmosphere-d_604.html
-// U.S Standard Atmosphere Air Properties in SI Units
-#define NUM_ELEMENTS 21
-// Units = meters (above sea level).
-const double altitude_array[NUM_ELEMENTS] = {
- -1000.0,     0.0,  1000.0,  2000.0,  3000.0,  4000.0,  5000.0,  6000.0,
-  7000.0,  8000.0,  9000.0, 10000.0, 15000.0, 20000.0, 25000.0, 30000.0,
- 40000.0, 50000.0, 60000.0, 70000.0, 80000.0 };
-
-// Units = kilograms per cubic meter.
-const double air_density_array[NUM_ELEMENTS] = {
-    1.347, 1.225, 1.112, 1.007, 0.9093, 0.8194, 0.7364, 0.6601,
-   0.5900, 0.5258, 0.4671, 0.4135, 0.1948, 0.08891, 0.04008, 0.01841,
- 0.003996, 0.001027, 0.0003097, 0.00008283, 0.00001846 };
-
-// Units = meters per second squared.
-const double gravity_array[NUM_ELEMENTS] = {
-9.810, 9.807, 9.804, 9.801, 9.797, 9.794, 9.791, 9.788,
-9.785, 9.782, 9.779, 9.776, 9.761, 9.745, 9.730, 9.715,
-9.684, 9.654, 9.624, 9.594, 9.564
+#include	"../include/Parachutist.hh"
+#include	"../include/interpolate.h"
+#include	<iostream>
+
+//	The	following	three	data	arrays	come	from:
+//	http://www.engineeringtoolbox.com/standard-atmosphere-d_604.html
+//	U.S	Standard	Atmosphere	Air	Properties	in	SI	Units
+#define	NUM_ELEMENTS	21
+//	Units	=	meters	(above	sea	level).
+const	double	altitude_array[NUM_ELEMENTS]	=	{
+	-1000.0,					0.0,		1000.0,		2000.0,		3000.0,		4000.0,		5000.0,		6000.0,
+		7000.0,		8000.0,		9000.0,	10000.0,	15000.0,	20000.0,	25000.0,	30000.0,
+	40000.0,	50000.0,	60000.0,	70000.0,	80000.0	};
+
+//	Units	=	kilograms	per	cubic	meter.
+const	double	air_density_array[NUM_ELEMENTS]	=	{
+				1.347,	1.225,	1.112,	1.007,	0.9093,	0.8194,	0.7364,	0.6601,
+			0.5900,	0.5258,	0.4671,	0.4135,	0.1948,	0.08891,	0.04008,	0.01841,
+	0.003996,	0.001027,	0.0003097,	0.00008283,	0.00001846	};
+
+//	Units	=	meters	per	second	squared.
+const	double	gravity_array[NUM_ELEMENTS]	=	{
+9.810,	9.807,	9.804,	9.801,	9.797,	9.794,	9.791,	9.788,
+9.785,	9.782,	9.779,	9.776,	9.761,	9.745,	9.730,	9.715,
+9.684,	9.654,	9.624,	9.594,	9.564
 };
 
-int Parachutist::default_data() {
+int	Parachutist::default_data()	{
 
-    altitude = 38969.3; //38969.3 meters = 127852 feet
-    velocity = 0.0;
-    area = 0.75;
-    Cd = 0.75;
-    touchDown = false;
-    mass = 82.0;
-    return (0);
+				altitude	=	38969.3;	//38969.3	meters	=	127852	feet
+				velocity	=	0.0;
+				area	=	0.75;
+				Cd	=	0.75;
+				touchDown	=	false;
+				mass	=	82.0;
+				return	(0);
 }
 
-int Parachutist::state_init() {
-    return (0);
+int	Parachutist::state_init()	{
+				return	(0);
 }
 
-int Parachutist::state_deriv() {
-
-// Calculate the forces and acceleration.
-
-   // Calculate Force of gravity.
-   double g = interpolate( altitude, altitude_array, gravity_array, NUM_ELEMENTS );
-   double Force_gravity = mass * -g;
-
-   // Calculate Force of drag.
-   double air_density = interpolate( altitude, altitude_array, air_density_array, NUM_ELEMENTS );
-   double Force_drag = Cd * 0.5 * air_density * velocity * velocity * area;
-
-   // Calculate Total Force.
-   double Force_total;
-   if ( !touchDown ) {
-       Force_total = Force_gravity + Force_drag ;
-       acceleration = Force_total / mass;
-   } else {
-       Force_total = 0.0;
-       velocity = 0.0;
-       acceleration = 0.0;
-   }
-   return(0);
+int	Parachutist::state_deriv()	{
+
+//	Calculate	the	forces	and	acceleration.
+
+			//	Calculate	Force	of	gravity.
+			double	g	=	interpolate(	altitude,	altitude_array,	gravity_array,	NUM_ELEMENTS	);
+			double	Force_gravity	=	mass	*	-g;
+
+			//	Calculate	Force	of	drag.
+			double	air_density	=	interpolate(	altitude,	altitude_array,	air_density_array,	NUM_ELEMENTS	);
+			double	Force_drag	=	Cd	*	0.5	*	air_density	*	velocity	*	velocity	*	area;
+
+			//	Calculate	Total	Force.
+			double	Force_total;
+			if	(	!touchDown	)	{
+							Force_total	=	Force_gravity	+	Force_drag	;
+							acceleration	=	Force_total	/	mass;
+			}	else	{
+							Force_total	=	0.0;
+							velocity	=	0.0;
+							acceleration	=	0.0;
+			}
+			return(0);
 }
 
-#include "sim_services/Integrator/include/integrator_c_intf.h"
-int Parachutist::state_integ() {
+#include	"sim_services/Integrator/include/integrator_c_intf.h"
+int	Parachutist::state_integ()	{
 
-   int integration_step;
-   load_state( &altitude, &velocity, (double*)0);
-   load_deriv ( &velocity, &acceleration, (double*)0);
-   integration_step = integrate();
-   unload_state( &altitude, &velocity, (double*)0);
+			int	integration_step;
+			load_state(	&altitude,	&velocity,	(double*)0);
+			load_deriv	(	&velocity,	&acceleration,	(double*)0);
+			integration_step	=	integrate();
+			unload_state(	&altitude,	&velocity,	(double*)0);
 
-   return(integration_step);
+			return(integration_step);
 }
 
-double Parachutist::touch_down(double groundAltitude) {
-    double tgo ;
-    double now ;
-
-    /* error function: how far the skydiver is above ground */
-    rf.error = altitude - groundAltitude ;
-
-    now = get_integ_time() ;
-    tgo = regula_falsi( now, &rf ) ;
-    if (tgo == 0.0) {
-        now = get_integ_time() ;
-        reset_regula_falsi( now, &rf);
-        velocity = 0.0;
-        acceleration = 0.0;
-        touchDown = true;
-        std::cout << "Touchdown: time = " << now << "." << std::endl;
-    }
-    return ( tgo ) ;
+double	Parachutist::touch_down(double	groundAltitude)	{
+				double	tgo	;
+				double	now	;
+
+				/*	error	function:	how	far	the	skydiver	is	above	ground	*/
+				rf.error	=	altitude	-	groundAltitude	;
+
+				now	=	get_integ_time()	;
+				tgo	=	regula_falsi(	now,	&rf	)	;
+				if	(tgo	==	0.0)	{
+								now	=	get_integ_time()	;
+								reset_regula_falsi(	now,	&rf);
+								velocity	=	0.0;
+								acceleration	=	0.0;
+								touchDown	=	true;
+								std::cout	<<	"Touchdown:	time	=	"	<<	now	<<	"."	<<	std::endl;
+				}
+				return	(	tgo	)	;
 }
diff --git a/trick_sims/SIM_parachute/models/parachute/src/interpolate.cpp b/trick_sims/SIM_parachute/models/parachute/src/interpolate.cpp
index 3858108b7..9a16090cb 100644
--- a/trick_sims/SIM_parachute/models/parachute/src/interpolate.cpp
+++ b/trick_sims/SIM_parachute/models/parachute/src/interpolate.cpp
@@ -1,22 +1,22 @@
-#include "../include/interpolate.h"
-#include <stdio.h>
+#include	"../include/interpolate.h"
+#include	<stdio.h>
 
-double interpolate( double x, const double xa[], const double fa[], int N_elems ) {
-    int ii;
-    for (ii=0 ; ((ii+2 < N_elems ) && (x > xa[ii+1])) ; ii++ ) ;
-    double x_lower = xa[ii];
-    double x_upper = xa[ii+1];
-    double f_lower = fa[ii];
-    double f_upper = fa[ii+1];
-    if (x < x_lower) {
-        fprintf(stderr, "Interpolation x is out of range low.\n");
-        return(f_lower);
-    }
-    if (x > x_upper) {
-        fprintf(stderr, "Interpolation x is out of range high.\n");
-        return(f_upper);
-    }
-    double f = (x_upper - x)/(x_upper - x_lower) * f_lower +
-               (x - x_lower)/(x_upper - x_lower) * f_upper ;
-    return(f);
+double	interpolate(	double	x,	const	double	xa[],	const	double	fa[],	int	N_elems	)	{
+				int	ii;
+				for	(ii=0	;	((ii+2	<	N_elems	)	&&	(x	>	xa[ii+1]))	;	ii++	)	;
+				double	x_lower	=	xa[ii];
+				double	x_upper	=	xa[ii+1];
+				double	f_lower	=	fa[ii];
+				double	f_upper	=	fa[ii+1];
+				if	(x	<	x_lower)	{
+								fprintf(stderr,	"Interpolation	x	is	out	of	range	low.\n");
+								return(f_lower);
+				}
+				if	(x	>	x_upper)	{
+								fprintf(stderr,	"Interpolation	x	is	out	of	range	high.\n");
+								return(f_upper);
+				}
+				double	f	=	(x_upper	-	x)/(x_upper	-	x_lower)	*	f_lower	+
+															(x	-	x_lower)/(x_upper	-	x_lower)	*	f_upper	;
+				return(f);
 }
diff --git a/trick_sims/SIM_rocket/models/rocket/src/Environment.cpp b/trick_sims/SIM_rocket/models/rocket/src/Environment.cpp
index 3d3488c48..90be58739 100644
--- a/trick_sims/SIM_rocket/models/rocket/src/Environment.cpp
+++ b/trick_sims/SIM_rocket/models/rocket/src/Environment.cpp
@@ -1,8 +1,8 @@
-#include "../include/Environment.hh"
+#include	"../include/Environment.hh"
 
-int Environment::default_data () {
-    air_density = 1.2;
-    gravity[0] = 0.0;
-    gravity[1] = -9.81;
-    return 0;
+int	Environment::default_data	()	{
+				air_density	=	1.2;
+				gravity[0]	=	0.0;
+				gravity[1]	=	-9.81;
+				return	0;
 }
diff --git a/trick_sims/SIM_rocket/models/rocket/src/Motor.cpp b/trick_sims/SIM_rocket/models/rocket/src/Motor.cpp
index e6b428d0a..75ebe90f1 100644
--- a/trick_sims/SIM_rocket/models/rocket/src/Motor.cpp
+++ b/trick_sims/SIM_rocket/models/rocket/src/Motor.cpp
@@ -1,42 +1,42 @@
-#include "../include/Motor.hh"
-#include "../include/interpolate.h"
-#include <iostream>
-
-#define NUM_ELEMENTS 29
-const double E9_sample_time_array[NUM_ELEMENTS] = {
-0.000, 0.010, 0.020, 0.030, 0.040, 0.050, 0.100, 0.110, 0.120, 0.130,
-0.140, 0.155, 0.165, 0.180, 0.190, 0.200, 0.215, 0.230, 0.250, 0.275,
-0.300, 0.400, 0.500, 2.600, 2.700, 2.725, 2.750, 2.800, 100.0 };
-
-const double E9_thrust_array[NUM_ELEMENTS] = {
- 0.0,  0.1,  0.3,  0.5,  0.8,  1.5, 10.0, 12.6, 15.2, 17.8,
-20.4, 23.0, 24.6, 25.0, 24.8, 24.4, 22.0, 17.0, 13.7, 12.6,
-11.9, 10.7, 10.6, 10.5, 10.3, 10.0,  9.7, 0.0, 0.0 };
-
-int Motor::default_data () {
-
-    thrust_sample_times = E9_sample_time_array;
-    thrust_sample_values = E9_thrust_array;
-    thrust_sample_count = NUM_ELEMENTS;
-
-    total_mass = 0.0567;
-    propellant_mass = 0.0358;
-    state_init();
-    return 0;
+#include	"../include/Motor.hh"
+#include	"../include/interpolate.h"
+#include	<iostream>
+
+#define	NUM_ELEMENTS	29
+const	double	E9_sample_time_array[NUM_ELEMENTS]	=	{
+0.000,	0.010,	0.020,	0.030,	0.040,	0.050,	0.100,	0.110,	0.120,	0.130,
+0.140,	0.155,	0.165,	0.180,	0.190,	0.200,	0.215,	0.230,	0.250,	0.275,
+0.300,	0.400,	0.500,	2.600,	2.700,	2.725,	2.750,	2.800,	100.0	};
+
+const	double	E9_thrust_array[NUM_ELEMENTS]	=	{
+	0.0,		0.1,		0.3,		0.5,		0.8,		1.5,	10.0,	12.6,	15.2,	17.8,
+20.4,	23.0,	24.6,	25.0,	24.8,	24.4,	22.0,	17.0,	13.7,	12.6,
+11.9,	10.7,	10.6,	10.5,	10.3,	10.0,		9.7,	0.0,	0.0	};
+
+int	Motor::default_data	()	{
+
+				thrust_sample_times	=	E9_sample_time_array;
+				thrust_sample_values	=	E9_thrust_array;
+				thrust_sample_count	=	NUM_ELEMENTS;
+
+				total_mass	=	0.0567;
+				propellant_mass	=	0.0358;
+				state_init();
+				return	0;
 }
 
-int Motor::state_init () {
+int	Motor::state_init	()	{
 
-    total_impulse = 0.0;
-    for (int ii=1 ; ii<NUM_ELEMENTS ; ii++) {
-        total_impulse +=  (thrust_sample_times[ii] - thrust_sample_times[ii-1]) *
-                          (thrust_sample_values[ii] + thrust_sample_values[ii-1]) / 2.0;
-    }
-    exhaust_speed = total_impulse / propellant_mass;
-    return 0;
+				total_impulse	=	0.0;
+				for	(int	ii=1	;	ii<NUM_ELEMENTS	;	ii++)	{
+								total_impulse	+=		(thrust_sample_times[ii]	-	thrust_sample_times[ii-1])	*
+																										(thrust_sample_values[ii]	+	thrust_sample_values[ii-1])	/	2.0;
+				}
+				exhaust_speed	=	total_impulse	/	propellant_mass;
+				return	0;
 }
 
-double Motor::thrust_magnitude(double time) {
-    // Call interpolator
-    return interpolate( time, thrust_sample_times, thrust_sample_values, thrust_sample_count );
+double	Motor::thrust_magnitude(double	time)	{
+				//	Call	interpolator
+				return	interpolate(	time,	thrust_sample_times,	thrust_sample_values,	thrust_sample_count	);
 }
diff --git a/trick_sims/SIM_rocket/models/rocket/src/Rocket.cpp b/trick_sims/SIM_rocket/models/rocket/src/Rocket.cpp
index e534baf99..2cbbf69f4 100644
--- a/trick_sims/SIM_rocket/models/rocket/src/Rocket.cpp
+++ b/trick_sims/SIM_rocket/models/rocket/src/Rocket.cpp
@@ -1,86 +1,86 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a model rocket. )
-LIBRARY DEPENDENCY:
-    ((Rocket.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	model	rocket.	)
+LIBRARY	DEPENDENCY:
+				((Rocket.o))
 *******************************************************************************/
-#include "../include/Rocket.hh"
-#include <math.h>
-#include <iostream>
-
-int Rocket::default_data() {
-
-    env.default_data();
-    motor.default_data();
-    mission_time = 0.0;
-    mission_time_rate = 1.0;
-    cross_sectional_area = 0.0015;
-    coefficient_of_drag = 0.75;
-    empty_mass = 0.1162; // 116.2 g
-    total_mass = empty_mass;
-    position[0] = 0.0;
-    position[1] = 0.0;
-    velocity[0] = 0.0;
-    velocity[1] = 0.001;
-    return (0);
+#include	"../include/Rocket.hh"
+#include	<math.h>
+#include	<iostream>
+
+int	Rocket::default_data()	{
+
+				env.default_data();
+				motor.default_data();
+				mission_time	=	0.0;
+				mission_time_rate	=	1.0;
+				cross_sectional_area	=	0.0015;
+				coefficient_of_drag	=	0.75;
+				empty_mass	=	0.1162;	//	116.2	g
+				total_mass	=	empty_mass;
+				position[0]	=	0.0;
+				position[1]	=	0.0;
+				velocity[0]	=	0.0;
+				velocity[1]	=	0.001;
+				return	(0);
 }
 
-int Rocket::state_init() {
-    motor.state_init();
-    total_mass = empty_mass + motor.total_mass;
-    return (0);
+int	Rocket::state_init()	{
+				motor.state_init();
+				total_mass	=	empty_mass	+	motor.total_mass;
+				return	(0);
 }
 
-int Rocket::state_deriv() {
+int	Rocket::state_deriv()	{
 
-    mission_time_rate = 1.0;
+				mission_time_rate	=	1.0;
 
-    double thrust_mag = motor.thrust_magnitude( mission_time );
+				double	thrust_mag	=	motor.thrust_magnitude(	mission_time	);
 
-    mass_rate = - thrust_mag / motor.exhaust_speed;
+				mass_rate	=	-	thrust_mag	/	motor.exhaust_speed;
 
-    double vel_magnitude = sqrt( velocity[0] * velocity[0] + velocity[1] * velocity[1] );
+				double	vel_magnitude	=	sqrt(	velocity[0]	*	velocity[0]	+	velocity[1]	*	velocity[1]	);
 
-    if ( position[1] < 1.0 ) {
-        vel_unit[0] = 0.0;
-        vel_unit[1] = 1.0;
-    } else {
-        vel_unit[0] = velocity[0] / vel_magnitude;
-        vel_unit[1] = velocity[1] / vel_magnitude;
-    }
+				if	(	position[1]	<	1.0	)	{
+								vel_unit[0]	=	0.0;
+								vel_unit[1]	=	1.0;
+				}	else	{
+								vel_unit[0]	=	velocity[0]	/	vel_magnitude;
+								vel_unit[1]	=	velocity[1]	/	vel_magnitude;
+				}
 
-    thrust_force[0] = vel_unit[0] * thrust_mag;
-    thrust_force[1] = vel_unit[1] * thrust_mag;
+				thrust_force[0]	=	vel_unit[0]	*	thrust_mag;
+				thrust_force[1]	=	vel_unit[1]	*	thrust_mag;
 
-    drag_force[0] = - 0.5 * coefficient_of_drag * env.air_density * cross_sectional_area * vel_magnitude * velocity[0];
-    drag_force[1] = - 0.5 * coefficient_of_drag * env.air_density * cross_sectional_area * vel_magnitude * velocity[1];
+				drag_force[0]	=	-	0.5	*	coefficient_of_drag	*	env.air_density	*	cross_sectional_area	*	vel_magnitude	*	velocity[0];
+				drag_force[1]	=	-	0.5	*	coefficient_of_drag	*	env.air_density	*	cross_sectional_area	*	vel_magnitude	*	velocity[1];
 
-    gravity_force[0] = env.gravity[0] * total_mass;
-    gravity_force[1] = env.gravity[1] * total_mass;
+				gravity_force[0]	=	env.gravity[0]	*	total_mass;
+				gravity_force[1]	=	env.gravity[1]	*	total_mass;
 
-    total_force[0] = thrust_force[0] + drag_force[0] + gravity_force[0];
-    total_force[1] = thrust_force[1] + drag_force[1] + gravity_force[1];
+				total_force[0]	=	thrust_force[0]	+	drag_force[0]	+	gravity_force[0];
+				total_force[1]	=	thrust_force[1]	+	drag_force[1]	+	gravity_force[1];
 
-    acc[0] = total_force[0] / total_mass;
-    acc[1] = total_force[1] / total_mass;
+				acc[0]	=	total_force[0]	/	total_mass;
+				acc[1]	=	total_force[1]	/	total_mass;
 
-   return(0);
+			return(0);
 }
 
-#include "sim_services/Integrator/include/integrator_c_intf.h"
+#include	"sim_services/Integrator/include/integrator_c_intf.h"
 
-int Rocket::state_integ() {
+int	Rocket::state_integ()	{
 
-   int integration_step;
+			int	integration_step;
 
-   load_state ( &mission_time, &total_mass, &position[0], &position[1], &velocity[0], &velocity[1], (double*)0);
-   load_deriv ( &mission_time_rate, &mass_rate, &velocity[0], &velocity[1], &acc[0], &acc[1], (double*)0);
+			load_state	(	&mission_time,	&total_mass,	&position[0],	&position[1],	&velocity[0],	&velocity[1],	(double*)0);
+			load_deriv	(	&mission_time_rate,	&mass_rate,	&velocity[0],	&velocity[1],	&acc[0],	&acc[1],	(double*)0);
 
-   integration_step = integrate();
-   unload_state ( &mission_time,
-                  &total_mass,
-                  &position[0], &position[1],
-                  &velocity[0], &velocity[1],
-                  (double*)0);
+			integration_step	=	integrate();
+			unload_state	(	&mission_time,
+																		&total_mass,
+																		&position[0],	&position[1],
+																		&velocity[0],	&velocity[1],
+																		(double*)0);
 
-   return(integration_step);
+			return(integration_step);
 }
diff --git a/trick_sims/SIM_sat2d/models/satellite/src/Satellite.cpp b/trick_sims/SIM_sat2d/models/satellite/src/Satellite.cpp
index 7144f469a..19df74930 100644
--- a/trick_sims/SIM_sat2d/models/satellite/src/Satellite.cpp
+++ b/trick_sims/SIM_sat2d/models/satellite/src/Satellite.cpp
@@ -1,46 +1,46 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a satellite orbiting the Earth. )
-LIBRARY DEPENDENCY:
-    ((Satellite.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	satellite	orbiting	the	Earth.	)
+LIBRARY	DEPENDENCY:
+				((Satellite.o))
 *******************************************************************************/
-#include "../include/Satellite.hh"
-#include <math.h>
-#include <iostream>
+#include	"../include/Satellite.hh"
+#include	<math.h>
+#include	<iostream>
 
-int Satellite::default_data() {
+int	Satellite::default_data()	{
 
-    pos[0] = 0.0;
-    pos[1] = 6578000.0;
-    vel[0] = 7905.0;
-    vel[1] = 0.0;
-    return (0);
+				pos[0]	=	0.0;
+				pos[1]	=	6578000.0;
+				vel[0]	=	7905.0;
+				vel[1]	=	0.0;
+				return	(0);
 }
 
-int Satellite::state_init() {
-    return (0);
+int	Satellite::state_init()	{
+				return	(0);
 }
 
-int Satellite::state_deriv() {
+int	Satellite::state_deriv()	{
 
-   double d = sqrt( pos[0]*pos[0] + pos[1]*pos[1]);
-   acc[0] = -pos[0] * GRAVITATIONAL_CONSTANT * EARTH_MASS / (d*d*d);
-   acc[1] = -pos[1] * GRAVITATIONAL_CONSTANT * EARTH_MASS / (d*d*d); 
-   return(0);
+			double	d	=	sqrt(	pos[0]*pos[0]	+	pos[1]*pos[1]);
+			acc[0]	=	-pos[0]	*	GRAVITATIONAL_CONSTANT	*	EARTH_MASS	/	(d*d*d);
+			acc[1]	=	-pos[1]	*	GRAVITATIONAL_CONSTANT	*	EARTH_MASS	/	(d*d*d);	
+			return(0);
 }
 
-#include "sim_services/Integrator/include/integrator_c_intf.h"
+#include	"sim_services/Integrator/include/integrator_c_intf.h"
 
-int Satellite::state_integ() {
+int	Satellite::state_integ()	{
 
-   int integration_step;
+			int	integration_step;
 
-   load_state ( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
-   load_deriv ( &vel[0], &vel[1], &acc[0], &acc[1], (double*)0);
+			load_state	(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
+			load_deriv	(	&vel[0],	&vel[1],	&acc[0],	&acc[1],	(double*)0);
 
-   integration_step = integrate();
+			integration_step	=	integrate();
 
-   unload_state( &pos[0], &pos[1], &vel[0], &vel[1], (double*)0);
+			unload_state(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	(double*)0);
 
-   return(integration_step);
+			return(integration_step);
 }
 
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp
index 9b9c583a5..13c9e90b3 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp
@@ -1,29 +1,29 @@
-#if ( __APPLE__ )
-#include <GLUT/glut.h>
+#if	(	__APPLE__	)
+#include	<GLUT/glut.h>
 #else
-#include <GL/glut.h>
+#include	<GL/glut.h>
 #endif
-#include "Camera.hh"
-#include <iostream>
+#include	"Camera.hh"
+#include	<iostream>
 
-Camera::Camera() {
-    pos[0] = 0.0;
-    pos[1] = 0.0;
-    pos[2] = 0.0;
+Camera::Camera()	{
+				pos[0]	=	0.0;
+				pos[1]	=	0.0;
+				pos[2]	=	0.0;
 
-    tgt[0] = 0.0;
-    tgt[1] = 0.0;
-    tgt[2] = 0.0;
+				tgt[0]	=	0.0;
+				tgt[1]	=	0.0;
+				tgt[2]	=	0.0;
 
-    up[0] = 0.0 ;
-    up[1] = 0.0 ;
-    up[2] = 1.0 ;
+				up[0]	=	0.0	;
+				up[1]	=	0.0	;
+				up[2]	=	1.0	;
 }
 
-void Camera::look() {
+void	Camera::look()	{
 
-    gluLookAt (pos[0], pos[1], pos[2],
-               tgt[0], tgt[1], tgt[2],
-               up[0],  up[1],  up[2]
-              );
+				gluLookAt	(pos[0],	pos[1],	pos[2],
+															tgt[0],	tgt[1],	tgt[2],
+															up[0],		up[1],		up[2]
+														);
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
index 097a3bd0b..7fab475a3 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
@@ -1,232 +1,232 @@
-#if ( __APPLE__ )
-#include <GLUT/glut.h>
+#if	(	__APPLE__	)
+#include	<GLUT/glut.h>
 #else
-#include <GL/glut.h>
+#include	<GL/glut.h>
 #endif
-#include "Scene.hh"
-#include <iostream>
-#include <vector>
-#include "trick/tc_proto.h"
-#include "trick/vector_macros.h"
-#include <stdio.h>
-
-#ifndef PI
-#define PI (double)3.14159265358979323846
+#include	"Scene.hh"
+#include	<iostream>
+#include	<vector>
+#include	"trick/tc_proto.h"
+#include	"trick/vector_macros.h"
+#include	<stdio.h>
+
+#ifndef	PI
+#define	PI	(double)3.14159265358979323846
 #endif
 
-void * dl_handle ;
-std::vector<SceneElement*> element_list ;
-std::vector<Camera*> camera_list ;
-int window_ID;
+void	*	dl_handle	;
+std::vector<SceneElement*>	element_list	;
+std::vector<Camera*>	camera_list	;
+int	window_ID;
 
-double near_clip_distance = 10.0;
-double far_clip_distance = 100000000.0;
+double	near_clip_distance	=	10.0;
+double	far_clip_distance	=	100000000.0;
 
-Camera* current_camera;
-Camera* satellite_camera;
+Camera*	current_camera;
+Camera*	satellite_camera;
 
-double camera_azimuth = 0.0;
-double camera_range = 100.0;
+double	camera_azimuth	=	0.0;
+double	camera_range	=	100.0;
 
-SceneElement* satellite;
-SceneElement* planet;
+SceneElement*	satellite;
+SceneElement*	planet;
 
-TCDevice listen_device;
-TCDevice  connection;
-Comm_packet comm_packet;
+TCDevice	listen_device;
+TCDevice		connection;
+Comm_packet	comm_packet;
 
 
 
 
-SceneElement* add_element(const char* model_name) {
+SceneElement*	add_element(const	char*	model_name)	{
 
-   SceneElement* scene_element = new SceneElement(model_name);
-   element_list.push_back( scene_element );
-   return ( scene_element );
+			SceneElement*	scene_element	=	new	SceneElement(model_name);
+			element_list.push_back(	scene_element	);
+			return	(	scene_element	);
 
 }
 
 
-void display_init() {
+void	display_init()	{
 
-   near_clip_distance = 10.0;
-   far_clip_distance = 100000000.0;
-   current_camera = NULL;
-   window_ID = 0;
+			near_clip_distance	=	10.0;
+			far_clip_distance	=	100000000.0;
+			current_camera	=	NULL;
+			window_ID	=	0;
 
-   /* Init glut */
-   glutInitDisplayMode (GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
-   glutInitWindowSize (810, 500);
-   glutInitWindowPosition (100, 100);
-   window_ID = glutCreateWindow ("Satellite Display");
+			/*	Init	glut	*/
+			glutInitDisplayMode	(GLUT_DOUBLE	|	GLUT_RGB	|	GLUT_DEPTH);
+			glutInitWindowSize	(810,	500);
+			glutInitWindowPosition	(100,	100);
+			window_ID	=	glutCreateWindow	("Satellite	Display");
 
 }
 
 
-void keyboard(unsigned char key, int x, int y) {
+void	keyboard(unsigned	char	key,	int	x,	int	y)	{
 
-    switch (key) {
+				switch	(key)	{
 
-        case 'a':
-         camera_azimuth += 1.0;
-         if (camera_azimuth > 180.0) camera_azimuth -= 360.0;
-        break;
+								case	'a':
+									camera_azimuth	+=	1.0;
+									if	(camera_azimuth	>	180.0)	camera_azimuth	-=	360.0;
+								break;
 
-        case 'd':
-         camera_azimuth -= 1.0;
-         if (camera_azimuth < -180.0) camera_azimuth += 360.0;
-        break;
+								case	'd':
+									camera_azimuth	-=	1.0;
+									if	(camera_azimuth	<	-180.0)	camera_azimuth	+=	360.0;
+								break;
 
-        case 'w':
-         camera_range -= 1.0;
-         if (camera_range < 20.0) camera_range = 20.0;
-        break;
+								case	'w':
+									camera_range	-=	1.0;
+									if	(camera_range	<	20.0)	camera_range	=	20.0;
+								break;
 
-        case 's':
-         camera_range += 1.0;
-         if (camera_range > 500.0) camera_range = 500.0;
-        break;
+								case	's':
+									camera_range	+=	1.0;
+									if	(camera_range	>	500.0)	camera_range	=	500.0;
+								break;
 
-    }
+				}
 
 }
 
 
-void display() {
+void	display()	{
 
-    glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+				glClear	(GL_COLOR_BUFFER_BIT	|	GL_DEPTH_BUFFER_BIT	);
 
-    glLoadIdentity();
+				glLoadIdentity();
 
-    current_camera->look();
+				current_camera->look();
 
-    GLfloat light_ambient[] = { 1.0, 1.0, 1.0, 1.0 };
-    GLfloat light_position[] = { 200.0, 200.0, 0.0, 1.0 };
+				GLfloat	light_ambient[]	=	{	1.0,	1.0,	1.0,	1.0	};
+				GLfloat	light_position[]	=	{	200.0,	200.0,	0.0,	1.0	};
 
-    glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-    glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
+				glLightfv(GL_LIGHT0,	GL_POSITION,	light_position);
+				glLightfv(GL_LIGHT0,	GL_AMBIENT,	light_ambient);
 
-    glEnable(GL_LIGHT0);
-    glEnable(GL_DEPTH_TEST);
+				glEnable(GL_LIGHT0);
+				glEnable(GL_DEPTH_TEST);
 
-    glEnable(GL_BLEND);
+				glEnable(GL_BLEND);
 
-    int n =  (int)element_list.size();
-    for (int ii=0 ; ii < n ; ii++) {
-        element_list[ii]->display();
-    }
+				int	n	=		(int)element_list.size();
+				for	(int	ii=0	;	ii	<	n	;	ii++)	{
+								element_list[ii]->display();
+				}
 
-    glutSwapBuffers();
+				glutSwapBuffers();
 }
 
-void reshape(int width, int height) {
+void	reshape(int	width,	int	height)	{
 
-    glMatrixMode (GL_PROJECTION);
-    glLoadIdentity ();
-    gluPerspective(30.0, (GLdouble)width / (GLdouble)height, near_clip_distance, far_clip_distance);
+				glMatrixMode	(GL_PROJECTION);
+				glLoadIdentity	();
+				gluPerspective(30.0,	(GLdouble)width	/	(GLdouble)height,	near_clip_distance,	far_clip_distance);
 
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
+				glMatrixMode(GL_MODELVIEW);
+				glLoadIdentity();
 
-    glViewport (0, 0, (GLsizei) width, (GLsizei) height);
+				glViewport	(0,	0,	(GLsizei)	width,	(GLsizei)	height);
 
-    current_camera->look();
+				current_camera->look();
 
 }
 
-void comm_initialize() {
+void	comm_initialize()	{
 
-    memset(&listen_device, '\0', sizeof(TCDevice));
-    memset(&connection, '\0', sizeof(TCDevice));
-    listen_device.port = 9000;
-    connection.blockio_type = TC_COMM_NOBLOCKIO;
-    tc_init(&listen_device);
-    tc_accept(&listen_device, &connection);
+				memset(&listen_device,	'\0',	sizeof(TCDevice));
+				memset(&connection,	'\0',	sizeof(TCDevice));
+				listen_device.port	=	9000;
+				connection.blockio_type	=	TC_COMM_NOBLOCKIO;
+				tc_init(&listen_device);
+				tc_accept(&listen_device,	&connection);
 
 }
 
-void comm_read() {
+void	comm_read()	{
 
-    int nbytes;
-    double packet[15];
+				int	nbytes;
+				double	packet[15];
 
-    if ( tc_isValid( &connection) && tc_pending( &connection)) {
+				if	(	tc_isValid(	&connection)	&&	tc_pending(	&connection))	{
 
-        nbytes = tc_read(& connection, (char*)&packet, sizeof(packet));
+								nbytes	=	tc_read(&	connection,	(char*)&packet,	sizeof(packet));
 
-        // Satellite Position
-//        satellite->pos[0] = packet[0];
-//        satellite->pos[1] = packet[1];
-//        satellite->pos[2] = packet[2];
+								//	Satellite	Position
+//								satellite->pos[0]	=	packet[0];
+//								satellite->pos[1]	=	packet[1];
+//								satellite->pos[2]	=	packet[2];
 
-        satellite->pos[0] = 0.0;
-        satellite->pos[1] = 0.0;
-        satellite->pos[2] = 0.0;
+								satellite->pos[0]	=	0.0;
+								satellite->pos[1]	=	0.0;
+								satellite->pos[2]	=	0.0;
 
-        planet->pos[0] = -packet[0];
-        planet->pos[1] = -packet[1];
-        planet->pos[2] = -packet[2];
+								planet->pos[0]	=	-packet[0];
+								planet->pos[1]	=	-packet[1];
+								planet->pos[2]	=	-packet[2];
 
-        // Satellite Velocity
-        satellite->vel[0] = packet[3];
-        satellite->vel[1] = packet[4];
-        satellite->vel[2] = packet[5];
+								//	Satellite	Velocity
+								satellite->vel[0]	=	packet[3];
+								satellite->vel[1]	=	packet[4];
+								satellite->vel[2]	=	packet[5];
 
-        // Vehicle Body to World Rotation Matrix
-        satellite->R[0][0] = packet[6];
-        satellite->R[0][1] = packet[7];
-        satellite->R[0][2] = packet[8];
-        satellite->R[1][0] = packet[9];
-        satellite->R[1][1] = packet[10];
-        satellite->R[1][2] = packet[11];
-        satellite->R[2][0] = packet[12];
-        satellite->R[2][1] = packet[13];
-        satellite->R[2][2] = packet[14];
+								//	Vehicle	Body	to	World	Rotation	Matrix
+								satellite->R[0][0]	=	packet[6];
+								satellite->R[0][1]	=	packet[7];
+								satellite->R[0][2]	=	packet[8];
+								satellite->R[1][0]	=	packet[9];
+								satellite->R[1][1]	=	packet[10];
+								satellite->R[1][2]	=	packet[11];
+								satellite->R[2][0]	=	packet[12];
+								satellite->R[2][1]	=	packet[13];
+								satellite->R[2][2]	=	packet[14];
 
-        // The camera position is relative to the satellite position.
-        satellite_camera->pos[0] = satellite->pos[0] + camera_range * sin(camera_azimuth * (PI/180.0));
-        satellite_camera->pos[1] = satellite->pos[1] + camera_range * cos(camera_azimuth * (PI/180.0));
-        satellite_camera->pos[2] = satellite->pos[2] + 0.0;
+								//	The	camera	position	is	relative	to	the	satellite	position.
+								satellite_camera->pos[0]	=	satellite->pos[0]	+	camera_range	*	sin(camera_azimuth	*	(PI/180.0));
+								satellite_camera->pos[1]	=	satellite->pos[1]	+	camera_range	*	cos(camera_azimuth	*	(PI/180.0));
+								satellite_camera->pos[2]	=	satellite->pos[2]	+	0.0;
 
-        // The camera is looking at the satellite.
-        satellite_camera->tgt[0] = satellite->pos[0];
-        satellite_camera->tgt[1] = satellite->pos[1];
-        satellite_camera->tgt[2] = satellite->pos[2];
+								//	The	camera	is	looking	at	the	satellite.
+								satellite_camera->tgt[0]	=	satellite->pos[0];
+								satellite_camera->tgt[1]	=	satellite->pos[1];
+								satellite_camera->tgt[2]	=	satellite->pos[2];
 
-        // Camera up is in the positive World-Z direction;
-        satellite_camera->up[0] = 0.0;
-        satellite_camera->up[1] = 0.0;
-        satellite_camera->up[2] = 1.0;
+								//	Camera	up	is	in	the	positive	World-Z	direction;
+								satellite_camera->up[0]	=	0.0;
+								satellite_camera->up[1]	=	0.0;
+								satellite_camera->up[2]	=	1.0;
 
-        glutPostRedisplay();
+								glutPostRedisplay();
 
-    }
+				}
 
 }
 
-int main(int argc, char* argv[]) {
+int	main(int	argc,	char*	argv[])	{
 
-    glutInit(&argc, argv);
+				glutInit(&argc,	argv);
 
-    display_init();
+				display_init();
 
-    comm_initialize();
+				comm_initialize();
 
-   /* Call backs */
-    glutDisplayFunc( display);
-    glutReshapeFunc( reshape);
-    glutKeyboardFunc( keyboard);
-    glutIdleFunc( comm_read);
+			/*	Call	backs	*/
+				glutDisplayFunc(	display);
+				glutReshapeFunc(	reshape);
+				glutKeyboardFunc(	keyboard);
+				glutIdleFunc(	comm_read);
 
-    satellite = add_element("Satellite");
-    satellite_camera = new Camera();
-    current_camera = satellite_camera;
+				satellite	=	add_element("Satellite");
+				satellite_camera	=	new	Camera();
+				current_camera	=	satellite_camera;
 
-    planet = add_element("Ball");
-    for (int ii=0; ii<3 ; ii++) { planet->pos[ii] = 0.0; }
+				planet	=	add_element("Ball");
+				for	(int	ii=0;	ii<3	;	ii++)	{	planet->pos[ii]	=	0.0;	}
 
-    glutMainLoop();
+				glutMainLoop();
 
-    return 0;
+				return	0;
 
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
index ac17a7e0f..999c840c7 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
@@ -1,84 +1,84 @@
-#if ( __APPLE__ )
-#       include <GLUT/glut.h>
+#if	(	__APPLE__	)
+#							include	<GLUT/glut.h>
 #else
-#       include <GL/glut.h>
+#							include	<GL/glut.h>
 #endif
-#include "SceneElement.hh"
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <stdio.h>
-
-SceneElement::SceneElement(const char* model_name) {
-    char name[128];
-
-    pos[0] = 0.0;
-    pos[1] = 0.0;
-    pos[2] = 0.0;
-
-    vel[0] = 1.0;
-    vel[1] = 0.0;
-    vel[2] = 0.0;
-
-    R[0][0] = 1.0;
-    R[0][1] = 0.0;
-    R[0][2] = 0.0;
-    R[0][3] = 0.0;
-
-    R[1][0] = 0.0;
-    R[1][1] = 1.0;
-    R[1][2] = 0.0;
-    R[1][3] = 0.0;
-
-    R[2][0] = 0.0;
-    R[2][1] = 0.0;
-    R[2][2] = 1.0;
-    R[2][3] = 0.0;
-
-    R[3][0] = 0.0;
-    R[3][1] = 0.0;
-    R[3][2] = 0.0;
-    R[3][3] = 1.0;
-
-    dl_handle = dlopen( NULL, RTLD_LAZY ) ;
-
-    name[0] = '\0';
-    strcat(name, model_name);
-    strcat(name, "_initialize");
-
-    if ((model_init_func = (void(*)(void)) dlsym(dl_handle, name)) != NULL) {
-        (*model_init_func)();
-    } else {
-        fprintf(stderr, "Failed to find %s.\n", name);
-        fflush(stdout);
-    }
-
-    name[0] = '\0';
-    strcat(name, model_name);
-    strcat(name, "_display");
-
-    if ((model_display_func = (void(*)(void)) dlsym(dl_handle, name)) == NULL) {
-        printf("Failed to find %s.\n", name);
-        fflush(stdout);
-    }
+#include	"SceneElement.hh"
+#include	<stdlib.h>
+#include	<string.h>
+#include	<dlfcn.h>
+#include	<stdio.h>
+
+SceneElement::SceneElement(const	char*	model_name)	{
+				char	name[128];
+
+				pos[0]	=	0.0;
+				pos[1]	=	0.0;
+				pos[2]	=	0.0;
+
+				vel[0]	=	1.0;
+				vel[1]	=	0.0;
+				vel[2]	=	0.0;
+
+				R[0][0]	=	1.0;
+				R[0][1]	=	0.0;
+				R[0][2]	=	0.0;
+				R[0][3]	=	0.0;
+
+				R[1][0]	=	0.0;
+				R[1][1]	=	1.0;
+				R[1][2]	=	0.0;
+				R[1][3]	=	0.0;
+
+				R[2][0]	=	0.0;
+				R[2][1]	=	0.0;
+				R[2][2]	=	1.0;
+				R[2][3]	=	0.0;
+
+				R[3][0]	=	0.0;
+				R[3][1]	=	0.0;
+				R[3][2]	=	0.0;
+				R[3][3]	=	1.0;
+
+				dl_handle	=	dlopen(	NULL,	RTLD_LAZY	)	;
+
+				name[0]	=	'\0';
+				strcat(name,	model_name);
+				strcat(name,	"_initialize");
+
+				if	((model_init_func	=	(void(*)(void))	dlsym(dl_handle,	name))	!=	NULL)	{
+								(*model_init_func)();
+				}	else	{
+								fprintf(stderr,	"Failed	to	find	%s.\n",	name);
+								fflush(stdout);
+				}
+
+				name[0]	=	'\0';
+				strcat(name,	model_name);
+				strcat(name,	"_display");
+
+				if	((model_display_func	=	(void(*)(void))	dlsym(dl_handle,	name))	==	NULL)	{
+								printf("Failed	to	find	%s.\n",	name);
+								fflush(stdout);
+				}
 
 };
 
-void SceneElement::init() {
-    if (model_init_func != 0) {
-      (*model_init_func)();
-    }
+void	SceneElement::init()	{
+				if	(model_init_func	!=	0)	{
+						(*model_init_func)();
+				}
 }
 
-void SceneElement::display() {
+void	SceneElement::display()	{
 
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glTranslated (pos[0], pos[1], pos[2]);
-    glMultMatrixd((GLdouble*)R);
-    if (model_display_func != 0) {
-      (*model_display_func)();
-    }
-    glPopMatrix();
+				glMatrixMode(GL_MODELVIEW);
+				glPushMatrix();
+				glTranslated	(pos[0],	pos[1],	pos[2]);
+				glMultMatrixd((GLdouble*)R);
+				if	(model_display_func	!=	0)	{
+						(*model_display_func)();
+				}
+				glPopMatrix();
 
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
index 3f947b2d8..bd3374d8d 100644
--- a/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
@@ -1,10 +1,10 @@
-#include  "Planet.hh"
+#include		"Planet.hh"
 
-Planet::Planet() {
-    mass = EARTH_MASS;
-    radius = EARTH_RADIUS;
-    for (int ii = 0; ii<3 ; ii++ ) {
-        pos[ii] = 0.0;
-    }
+Planet::Planet()	{
+				mass	=	EARTH_MASS;
+				radius	=	EARTH_RADIUS;
+				for	(int	ii	=	0;	ii<3	;	ii++	)	{
+								pos[ii]	=	0.0;
+				}
 }
 
diff --git a/trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp b/trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp
index d9116cf55..7d1bb1621 100644
--- a/trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp
@@ -1,78 +1,78 @@
-#include <unistd.h>
-#include <iostream>
-#include "SatGraphicsComm.hh"
+#include	<unistd.h>
+#include	<iostream>
+#include	"SatGraphicsComm.hh"
 
-SatGraphicsComm::SatGraphicsComm() {
+SatGraphicsComm::SatGraphicsComm()	{
 
-     syscmd = "Scene &";
-     connection.port = 9000;
-     connection.hostname = "localhost";
+					syscmd	=	"Scene	&";
+					connection.port	=	9000;
+					connection.hostname	=	"localhost";
 
 }
 
-int SatGraphicsComm::connect() {
+int	SatGraphicsComm::connect()	{
 
-    int ret, num_attempts;
+				int	ret,	num_attempts;
 
-    system(syscmd);
-    std::cout << "SatGraphicsComm: Starting graphics server using: \"" << syscmd << "\"" << std::endl;
+				system(syscmd);
+				std::cout	<<	"SatGraphicsComm:	Starting	graphics	server	using:	\""	<<	syscmd	<<	"\""	<<	std::endl;
 
-    tc_error( &connection, 0);
+				tc_error(	&connection,	0);
 
-    num_attempts = 0;
-    while(1) {
-        ret = tc_connect( &connection);
-        if  (ret == TC_SUCCESS) {
-            std::cerr << "SatGraphicsComm: CONNECT." << std::endl;
-            break;
-        } else {
-            num_attempts ++;
-            if ( num_attempts == 30 ) {
-                std::cerr << "SatGraphicsComm: Couldn't connect to graphics server." << std::endl;
-                return 1;
-            }
-        }
-        sleep(1);
-    }
+				num_attempts	=	0;
+				while(1)	{
+								ret	=	tc_connect(	&connection);
+								if		(ret	==	TC_SUCCESS)	{
+												std::cerr	<<	"SatGraphicsComm:	CONNECT."	<<	std::endl;
+												break;
+								}	else	{
+												num_attempts	++;
+												if	(	num_attempts	==	30	)	{
+																std::cerr	<<	"SatGraphicsComm:	Couldn't	connect	to	graphics	server."	<<	std::endl;
+																return	1;
+												}
+								}
+								sleep(1);
+				}
 
-    return 0;
+				return	0;
 }
 
 
-int SatGraphicsComm::send_packet(Satellite* sat) {
+int	SatGraphicsComm::send_packet(Satellite*	sat)	{
 
-    double packet[15];
-//    double packet[24];
+				double	packet[15];
+//				double	packet[24];
 
-    packet[0] = sat->pos[0];
-    packet[1] = sat->pos[1];
-    packet[2] = sat->pos[2];
+				packet[0]	=	sat->pos[0];
+				packet[1]	=	sat->pos[1];
+				packet[2]	=	sat->pos[2];
 
-    packet[3] = sat->vel[0];
-    packet[4] = sat->vel[1];
-    packet[5] = sat->vel[2];
+				packet[3]	=	sat->vel[0];
+				packet[4]	=	sat->vel[1];
+				packet[5]	=	sat->vel[2];
 
-    packet[6]  = sat->R[0][0];
-    packet[7]  = sat->R[0][1];
-    packet[8]  = sat->R[0][2];
-    packet[9]  = sat->R[1][0];
-    packet[10] = sat->R[1][1];
-    packet[11] = sat->R[1][2];
-    packet[12] = sat->R[2][0];
-    packet[13] = sat->R[2][1];
-    packet[14] = sat->R[2][2];
+				packet[6]		=	sat->R[0][0];
+				packet[7]		=	sat->R[0][1];
+				packet[8]		=	sat->R[0][2];
+				packet[9]		=	sat->R[1][0];
+				packet[10]	=	sat->R[1][1];
+				packet[11]	=	sat->R[1][2];
+				packet[12]	=	sat->R[2][0];
+				packet[13]	=	sat->R[2][1];
+				packet[14]	=	sat->R[2][2];
 
-//    packet[15] = sat->Rplat[0][0];
-//    packet[16] = sat->Rplat[0][1];
-//    packet[17] = sat->Rplat[0][2];
-//    packet[18] = sat->Rplat[1][0];
-//    packet[19] = sat->Rplat[1][1];
-//    packet[20] = sat->Rplat[1][2];
-//    packet[21] = sat->Rplat[2][0];
-//    packet[22] = sat->Rplat[2][1];
-//    packet[23] = sat->Rplat[2][2];
+//				packet[15]	=	sat->Rplat[0][0];
+//				packet[16]	=	sat->Rplat[0][1];
+//				packet[17]	=	sat->Rplat[0][2];
+//				packet[18]	=	sat->Rplat[1][0];
+//				packet[19]	=	sat->Rplat[1][1];
+//				packet[20]	=	sat->Rplat[1][2];
+//				packet[21]	=	sat->Rplat[2][0];
+//				packet[22]	=	sat->Rplat[2][1];
+//				packet[23]	=	sat->Rplat[2][2];
 
-    tc_write(&connection, (char*)&packet, sizeof(packet));
+				tc_write(&connection,	(char*)&packet,	sizeof(packet));
 
-    return 0;
+				return	0;
 }
diff --git a/trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp
index 751c2d5dc..58d49042c 100644
--- a/trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp
@@ -1,250 +1,250 @@
-#include "Satellite.hh"
-#include "trick_utils/math/include/quat_macros.h"
-#include "trick_utils/math/include/matrix_macros.h"
-#include "trick_utils/math/include/trick_math_proto.h"
-#include "sim_services/Integrator/include/integrator_c_intf.h"
-#include <iostream>
-
-#define EARTH_MASS 5.9721986e24
-#define EARTH_RADIUS 6367500.0
-#define GRAVITATIONAL_CONSTANT 6.674e-11
-
-// Force is in inertial frame.
-void Satellite::get_force_of_gravity ( double* gForceV) {
-
-     double body_to_planet[3];
-     double body_to_planet_unit_vector[3];
-     double distance;
-     double gForceMag;
-
-     V_SUB( body_to_planet, planet->pos, pos );
-     V_NORM( body_to_planet_unit_vector, body_to_planet)
-     distance = V_MAG( body_to_planet);
-     gForceMag = (GRAVITATIONAL_CONSTANT * mass * planet->mass) / (distance * distance);
-     V_SCALE (gForceV, body_to_planet_unit_vector, gForceMag);
+#include	"Satellite.hh"
+#include	"trick_utils/math/include/quat_macros.h"
+#include	"trick_utils/math/include/matrix_macros.h"
+#include	"trick_utils/math/include/trick_math_proto.h"
+#include	"sim_services/Integrator/include/integrator_c_intf.h"
+#include	<iostream>
+
+#define	EARTH_MASS	5.9721986e24
+#define	EARTH_RADIUS	6367500.0
+#define	GRAVITATIONAL_CONSTANT	6.674e-11
+
+//	Force	is	in	inertial	frame.
+void	Satellite::get_force_of_gravity	(	double*	gForceV)	{
+
+					double	body_to_planet[3];
+					double	body_to_planet_unit_vector[3];
+					double	distance;
+					double	gForceMag;
+
+					V_SUB(	body_to_planet,	planet->pos,	pos	);
+					V_NORM(	body_to_planet_unit_vector,	body_to_planet)
+					distance	=	V_MAG(	body_to_planet);
+					gForceMag	=	(GRAVITATIONAL_CONSTANT	*	mass	*	planet->mass)	/	(distance	*	distance);
+					V_SCALE	(gForceV,	body_to_planet_unit_vector,	gForceMag);
 
 }
 
-void Satellite::get_Force_and_Torque() {
+void	Satellite::get_Force_and_Torque()	{
 
-   double gforcev[3];
+			double	gforcev[3];
 
-   // Zero force.
-   for (int ii=0; ii<3; ii++) { force[ii] = 0.0; }
-   for (int ii=0; ii<3; ii++) { torque[ii] = 0.0; }
+			//	Zero	force.
+			for	(int	ii=0;	ii<3;	ii++)	{	force[ii]	=	0.0;	}
+			for	(int	ii=0;	ii<3;	ii++)	{	torque[ii]	=	0.0;	}
 
-   get_force_of_gravity( gforcev);
-   for (int ii=0; ii<3; ii++) { force[ii] += gforcev[ii]; }
+			get_force_of_gravity(	gforcev);
+			for	(int	ii=0;	ii<3;	ii++)	{	force[ii]	+=	gforcev[ii];	}
 
-   main_engine.add_force_and_torque( force, torque);
+			main_engine.add_force_and_torque(	force,	torque);
 
-   thruster_T1.add_force_and_torque( force, torque);
-   thruster_T2.add_force_and_torque( force, torque);
-   thruster_T3.add_force_and_torque( force, torque);
-   thruster_T4.add_force_and_torque( force, torque);
+			thruster_T1.add_force_and_torque(	force,	torque);
+			thruster_T2.add_force_and_torque(	force,	torque);
+			thruster_T3.add_force_and_torque(	force,	torque);
+			thruster_T4.add_force_and_torque(	force,	torque);
 
-   thruster_R1.add_force_and_torque( force, torque);
-   thruster_R2.add_force_and_torque( force, torque);
-   thruster_R3.add_force_and_torque( force, torque);
-   thruster_R4.add_force_and_torque( force, torque);
+			thruster_R1.add_force_and_torque(	force,	torque);
+			thruster_R2.add_force_and_torque(	force,	torque);
+			thruster_R3.add_force_and_torque(	force,	torque);
+			thruster_R4.add_force_and_torque(	force,	torque);
 
-   thruster_B1.add_force_and_torque( force, torque);
-   thruster_B2.add_force_and_torque( force, torque);
-   thruster_B3.add_force_and_torque( force, torque);
-   thruster_B4.add_force_and_torque( force, torque);
+			thruster_B1.add_force_and_torque(	force,	torque);
+			thruster_B2.add_force_and_torque(	force,	torque);
+			thruster_B3.add_force_and_torque(	force,	torque);
+			thruster_B4.add_force_and_torque(	force,	torque);
 
-   thruster_L1.add_force_and_torque( force, torque);
-   thruster_L2.add_force_and_torque( force, torque);
-   thruster_L3.add_force_and_torque( force, torque);
-   thruster_L4.add_force_and_torque( force, torque);
+			thruster_L1.add_force_and_torque(	force,	torque);
+			thruster_L2.add_force_and_torque(	force,	torque);
+			thruster_L3.add_force_and_torque(	force,	torque);
+			thruster_L4.add_force_and_torque(	force,	torque);
 
 }
 
-void Satellite::initialize(Planet* planet_p) {
-
-    planet = planet_p;
-
-    mass = 1000.0;   /* (kg) */
-
-    double A=2, B=2, C=2;
-    Ibody[0][0] = mass * 0.2 * (B*B + C*C);
-    Ibody[0][1] = 0.0;
-    Ibody[0][2] = 0.0;
-    Ibody[1][0] = 0.0;
-    Ibody[1][1] = mass * 0.2 * (A*A + C*C);
-    Ibody[1][2] = 0.0;
-    Ibody[2][0] = 0.0;
-    Ibody[2][1] = 0.0;
-    Ibody[2][2] = mass * 0.2 * (A*A + B*B);
-
-    dm_invert(Ibodyinv, Ibody);
-
-    // Altitude of 500 km.
-    pos[0] = EARTH_RADIUS + 500000.0;
-    pos[1] = 0.0;
-    pos[2] = 0.0;
-
-    // Initialize velocity for a circular orbit.
-    vel[0] = 0.0;
-    vel[1] = sqrt( (GRAVITATIONAL_CONSTANT * EARTH_MASS) / pos[0] );
-    vel[2] = 0.0;
-
-    // Compute Platform to World Rotation Matrix
-    compute_platform_to_world();
-
-    // Compute Body to World Rotation Matrix
-    for (int ii=0; ii<3; ii++) {
-        for (int jj=0; jj<3; jj++) {
-            R[ii][jj] = Rplat[ii][jj];
-        }
-    }
-
-    // Linear Momentum
-    for (int ii=0; ii<3; ii++) { P[ii] = vel[ii] * mass; }
-
-    // Angular Momentum
-    for (int ii=0; ii<3; ii++) { L[ii] = 0.0; }
-    L[0] = 0.0;
-    L[1] = 0.0;
-    L[2] = 0.0;
-
-   compute_auxiliary_vars();
-
-   for (int ii=0; ii<3; ii++) { force[ii] = 0.0; }
-   for (int ii=0; ii<3; ii++) { torque[ii] = 0.0; }
-
-   main_engine.initialize( 0.0, 0.0, 0.0,  1000.0,  0.0,  0.0);
-
-   // Initialize RCS Thrusters
-   thruster_T1.initialize( 0.0, 0.0, 1.956,  10.0,  0.0,  0.0);
-   thruster_T2.initialize( 0.0, 0.0, 1.956,  0.0,  10.0,  0.0);
-   thruster_T3.initialize( 0.0, 0.0, 1.956, -10.0,  0.0,  0.0);
-   thruster_T4.initialize( 0.0, 0.0, 1.956,  0.0, -10.0,  0.0);
-
-   thruster_R1.initialize( 0.0, 1.956, 0.0,  10.0,  0.0,  0.0);
-   thruster_R2.initialize( 0.0, 1.956, 0.0,  0.0,  0.0, -10.0);
-   thruster_R3.initialize( 0.0, 1.956, 0.0, -10.0,  0.0,  0.0);
-   thruster_R4.initialize( 0.0, 1.956, 0.0,  0.0,  0.0,  1.0);
-
-   thruster_B1.initialize( 0.0, 0.0, -1.956,  10.0,  0.0,  0.0);
-   thruster_B2.initialize( 0.0, 0.0, -1.956,  0.0,  10.0,  0.0);
-   thruster_B3.initialize( 0.0, 0.0, -1.956, -10.0,  0.0,  0.0);
-   thruster_B4.initialize( 0.0, 0.0, -1.956,  0.0, -10.0,  0.0);
-
-   thruster_L1.initialize( 0.0, -1.956, 0.0,  10.0,  0.0,  0.0);
-   thruster_L2.initialize( 0.0, -1.956, 0.0,  0.0,  0.0,  10.0);
-   thruster_L3.initialize( 0.0, -1.956, 0.0, -10.0,  0.0,  0.0);
-   thruster_L4.initialize( 0.0, -1.956, 0.0,  0.0,  0.0, -10.0);
+void	Satellite::initialize(Planet*	planet_p)	{
+
+				planet	=	planet_p;
+
+				mass	=	1000.0;			/*	(kg)	*/
+
+				double	A=2,	B=2,	C=2;
+				Ibody[0][0]	=	mass	*	0.2	*	(B*B	+	C*C);
+				Ibody[0][1]	=	0.0;
+				Ibody[0][2]	=	0.0;
+				Ibody[1][0]	=	0.0;
+				Ibody[1][1]	=	mass	*	0.2	*	(A*A	+	C*C);
+				Ibody[1][2]	=	0.0;
+				Ibody[2][0]	=	0.0;
+				Ibody[2][1]	=	0.0;
+				Ibody[2][2]	=	mass	*	0.2	*	(A*A	+	B*B);
+
+				dm_invert(Ibodyinv,	Ibody);
+
+				//	Altitude	of	500	km.
+				pos[0]	=	EARTH_RADIUS	+	500000.0;
+				pos[1]	=	0.0;
+				pos[2]	=	0.0;
+
+				//	Initialize	velocity	for	a	circular	orbit.
+				vel[0]	=	0.0;
+				vel[1]	=	sqrt(	(GRAVITATIONAL_CONSTANT	*	EARTH_MASS)	/	pos[0]	);
+				vel[2]	=	0.0;
+
+				//	Compute	Platform	to	World	Rotation	Matrix
+				compute_platform_to_world();
+
+				//	Compute	Body	to	World	Rotation	Matrix
+				for	(int	ii=0;	ii<3;	ii++)	{
+								for	(int	jj=0;	jj<3;	jj++)	{
+												R[ii][jj]	=	Rplat[ii][jj];
+								}
+				}
+
+				//	Linear	Momentum
+				for	(int	ii=0;	ii<3;	ii++)	{	P[ii]	=	vel[ii]	*	mass;	}
+
+				//	Angular	Momentum
+				for	(int	ii=0;	ii<3;	ii++)	{	L[ii]	=	0.0;	}
+				L[0]	=	0.0;
+				L[1]	=	0.0;
+				L[2]	=	0.0;
+
+			compute_auxiliary_vars();
+
+			for	(int	ii=0;	ii<3;	ii++)	{	force[ii]	=	0.0;	}
+			for	(int	ii=0;	ii<3;	ii++)	{	torque[ii]	=	0.0;	}
+
+			main_engine.initialize(	0.0,	0.0,	0.0,		1000.0,		0.0,		0.0);
+
+			//	Initialize	RCS	Thrusters
+			thruster_T1.initialize(	0.0,	0.0,	1.956,		10.0,		0.0,		0.0);
+			thruster_T2.initialize(	0.0,	0.0,	1.956,		0.0,		10.0,		0.0);
+			thruster_T3.initialize(	0.0,	0.0,	1.956,	-10.0,		0.0,		0.0);
+			thruster_T4.initialize(	0.0,	0.0,	1.956,		0.0,	-10.0,		0.0);
+
+			thruster_R1.initialize(	0.0,	1.956,	0.0,		10.0,		0.0,		0.0);
+			thruster_R2.initialize(	0.0,	1.956,	0.0,		0.0,		0.0,	-10.0);
+			thruster_R3.initialize(	0.0,	1.956,	0.0,	-10.0,		0.0,		0.0);
+			thruster_R4.initialize(	0.0,	1.956,	0.0,		0.0,		0.0,		1.0);
+
+			thruster_B1.initialize(	0.0,	0.0,	-1.956,		10.0,		0.0,		0.0);
+			thruster_B2.initialize(	0.0,	0.0,	-1.956,		0.0,		10.0,		0.0);
+			thruster_B3.initialize(	0.0,	0.0,	-1.956,	-10.0,		0.0,		0.0);
+			thruster_B4.initialize(	0.0,	0.0,	-1.956,		0.0,	-10.0,		0.0);
+
+			thruster_L1.initialize(	0.0,	-1.956,	0.0,		10.0,		0.0,		0.0);
+			thruster_L2.initialize(	0.0,	-1.956,	0.0,		0.0,		0.0,		10.0);
+			thruster_L3.initialize(	0.0,	-1.956,	0.0,	-10.0,		0.0,		0.0);
+			thruster_L4.initialize(	0.0,	-1.956,	0.0,		0.0,		0.0,	-10.0);
 }
 
 
-void Satellite::compute_platform_to_world() {
+void	Satellite::compute_platform_to_world()	{
 
-    // Compute the Body to World Rotation Matrix
+				//	Compute	the	Body	to	World	Rotation	Matrix
 
-    // The X body axis initially points in the direction of the velocity vector.
-    double vhat[3];
-    V_NORM(vhat, vel);
+				//	The	X	body	axis	initially	points	in	the	direction	of	the	velocity	vector.
+				double	vhat[3];
+				V_NORM(vhat,	vel);
 
-    // The Z body axis initially points in the direction of the position vector.
-    double phat[3];
-    V_NORM(phat, pos);
+				//	The	Z	body	axis	initially	points	in	the	direction	of	the	position	vector.
+				double	phat[3];
+				V_NORM(phat,	pos);
 
-    // The Y body axis is the cross product of the previous two axes.
-    double phatXvhat[3];
-    V_CROSS (phatXvhat, phat, vhat);
+				//	The	Y	body	axis	is	the	cross	product	of	the	previous	two	axes.
+				double	phatXvhat[3];
+				V_CROSS	(phatXvhat,	phat,	vhat);
 
-    Rplat[0][0]  = vhat[0];
-    Rplat[0][1]  = vhat[1];
-    Rplat[0][2]  = vhat[2];
+				Rplat[0][0]		=	vhat[0];
+				Rplat[0][1]		=	vhat[1];
+				Rplat[0][2]		=	vhat[2];
 
-    Rplat[1][0]  = phatXvhat[0];
-    Rplat[1][1]  = phatXvhat[1];
-    Rplat[1][2]  = phatXvhat[2];
+				Rplat[1][0]		=	phatXvhat[0];
+				Rplat[1][1]		=	phatXvhat[1];
+				Rplat[1][2]		=	phatXvhat[2];
 
-    Rplat[2][0]  = phat[0];
-    Rplat[2][1]  = phat[1];
-    Rplat[2][2]  = phat[2];
+				Rplat[2][0]		=	phat[0];
+				Rplat[2][1]		=	phat[1];
+				Rplat[2][2]		=	phat[2];
 
 }
 
-Satellite::Satellite(Planet* planet_p) {
-    initialize( planet_p);
+Satellite::Satellite(Planet*	planet_p)	{
+				initialize(	planet_p);
 }
 
 
-void Satellite::compute_auxiliary_vars() {
+void	Satellite::compute_auxiliary_vars()	{
 
-    double Rtrans[3][3];
-    double tempM[3][3];
-    int axis = 0;
+				double	Rtrans[3][3];
+				double	tempM[3][3];
+				int	axis	=	0;
 
-    // Square up the rotation matrix.
-    dm_orthonormal(R, &axis);
+				//	Square	up	the	rotation	matrix.
+				dm_orthonormal(R,	&axis);
 
-    // - Compute Iinv = R * Ibodyinv * Transpose(R);
-    MxM(tempM, R, Ibodyinv);
-    M_TRANS(Rtrans, R);
-    MxM(Iinv, tempM, Rtrans);
+				//	-	Compute	Iinv	=	R	*	Ibodyinv	*	Transpose(R);
+				MxM(tempM,	R,	Ibodyinv);
+				M_TRANS(Rtrans,	R);
+				MxM(Iinv,	tempM,	Rtrans);
 
-    // - Compute velocity from momentum and mass.
-    for (int ii=0; ii<3; ii++) { vel[ii] = P[ii] / mass; }
+				//	-	Compute	velocity	from	momentum	and	mass.
+				for	(int	ii=0;	ii<3;	ii++)	{	vel[ii]	=	P[ii]	/	mass;	}
 
-    // - Compute omega = Iinv * L;
-    MxV(omega, Iinv, L);
+				//	-	Compute	omega	=	Iinv	*	L;
+				MxV(omega,	Iinv,	L);
 }
 
 
-void Satellite::compute_state_deriv() {
+void	Satellite::compute_state_deriv()	{
 
-    double omega_star[3][3];
-    V_SKEW(omega_star, omega);
-    MxM(Rdot, omega_star, R);
+				double	omega_star[3][3];
+				V_SKEW(omega_star,	omega);
+				MxM(Rdot,	omega_star,	R);
 
-    get_Force_and_Torque();
+				get_Force_and_Torque();
 
-    // - Compute velocity from momentum and mass.
-    for (int ii=0; ii<3; ii++) { vel[ii] = P[ii] / mass; }
+				//	-	Compute	velocity	from	momentum	and	mass.
+				for	(int	ii=0;	ii<3;	ii++)	{	vel[ii]	=	P[ii]	/	mass;	}
 }
 
 
-int Satellite::compute_state() {
+int	Satellite::compute_state()	{
 
-    int ipass;
+				int	ipass;
 
-    load_state( &P[0], &P[1], &P[2],
-                &pos[0], &pos[1], &pos[2],
-                &L[0], &L[1], &L[2],
-                &R[0][0],&R[0][1],&R[0][2],
-                &R[1][0],&R[1][1],&R[1][2],
-                &R[2][0],&R[2][1],&R[2][2],
-                NULL);
+				load_state(	&P[0],	&P[1],	&P[2],
+																&pos[0],	&pos[1],	&pos[2],
+																&L[0],	&L[1],	&L[2],
+																&R[0][0],&R[0][1],&R[0][2],
+																&R[1][0],&R[1][1],&R[1][2],
+																&R[2][0],&R[2][1],&R[2][2],
+																NULL);
 
-    load_deriv( &force[0], &force[1], &force[2],
-                &vel[0], &vel[1], &vel[2],
-                &torque[0], &torque[1], &torque[2],
-                &Rdot[0][0],&Rdot[0][1],&Rdot[0][2],
-                &Rdot[1][0],&Rdot[1][1],&Rdot[1][2],
-                &Rdot[2][0],&Rdot[2][1],&Rdot[2][2],
-                NULL);
+				load_deriv(	&force[0],	&force[1],	&force[2],
+																&vel[0],	&vel[1],	&vel[2],
+																&torque[0],	&torque[1],	&torque[2],
+																&Rdot[0][0],&Rdot[0][1],&Rdot[0][2],
+																&Rdot[1][0],&Rdot[1][1],&Rdot[1][2],
+																&Rdot[2][0],&Rdot[2][1],&Rdot[2][2],
+																NULL);
 
-    ipass = integrate();
+				ipass	=	integrate();
 
-    unload_state( &P[0], &P[1], &P[2],
-                  &pos[0], &pos[1], &pos[2],
-                  &L[0], &L[1], &L[2],
-                  &R[0][0],&R[0][1],&R[0][2],
-                  &R[1][0],&R[1][1],&R[1][2],
-                  &R[2][0],&R[2][1],&R[2][2],
-                  NULL);
+				unload_state(	&P[0],	&P[1],	&P[2],
+																		&pos[0],	&pos[1],	&pos[2],
+																		&L[0],	&L[1],	&L[2],
+																		&R[0][0],&R[0][1],&R[0][2],
+																		&R[1][0],&R[1][1],&R[1][2],
+																		&R[2][0],&R[2][1],&R[2][2],
+																		NULL);
 
-    compute_auxiliary_vars();
+				compute_auxiliary_vars();
 
-    return(ipass);
+				return(ipass);
 
 }
 
-void Satellite::print_state() {
+void	Satellite::print_state()	{
 
 }
 
diff --git a/trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp
index 01dff938c..adfe9b6cc 100644
--- a/trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp
@@ -1,34 +1,34 @@
-#include "Thruster.hh"
-#include "trick_utils/math/include/vector_macros.h"
+#include	"Thruster.hh"
+#include	"trick_utils/math/include/vector_macros.h"
 
-Thruster::Thruster() {
-    for (int ii=0; ii<3;ii++) { position[ii]  = 0.0; }
-    for (int ii=0; ii<3;ii++) { thrust[ii]  = 0.0; }
-    on = false;
+Thruster::Thruster()	{
+				for	(int	ii=0;	ii<3;ii++)	{	position[ii]		=	0.0;	}
+				for	(int	ii=0;	ii<3;ii++)	{	thrust[ii]		=	0.0;	}
+				on	=	false;
 }
 
-void Thruster::initialize(double p0, double p1, double p2,
-                     double f0, double f1, double f2) {
+void	Thruster::initialize(double	p0,	double	p1,	double	p2,
+																					double	f0,	double	f1,	double	f2)	{
 
-    position[0] = p0;
-    position[1] = p1;
-    position[2] = p2;
+				position[0]	=	p0;
+				position[1]	=	p1;
+				position[2]	=	p2;
 
-    thrust[0] = f0;
-    thrust[1] = f1;
-    thrust[2] = f2;
+				thrust[0]	=	f0;
+				thrust[1]	=	f1;
+				thrust[2]	=	f2;
 
-    on = false;
+				on	=	false;
 }
 
-void Thruster::add_force_and_torque (double* force, double* torque) {
-    if (on) {
-        double T[3];
+void	Thruster::add_force_and_torque	(double*	force,	double*	torque)	{
+				if	(on)	{
+								double	T[3];
 
-        V_CROSS(T, position, thrust);
-        for (int ii=0; ii<3;ii++) { torque[ii] += T[ii]; }
+								V_CROSS(T,	position,	thrust);
+								for	(int	ii=0;	ii<3;ii++)	{	torque[ii]	+=	T[ii];	}
 
-        for (int ii=0; ii<3;ii++) { force[ii] += thrust[ii]; }
-    }
+								for	(int	ii=0;	ii<3;ii++)	{	force[ii]	+=	thrust[ii];	}
+				}
 }
 
diff --git a/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleDynamics.cpp b/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleDynamics.cpp
index a0979f2c0..9fc191040 100644
--- a/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleDynamics.cpp
+++ b/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleDynamics.cpp
@@ -1,190 +1,190 @@
-#include <math.h>
-#include <stdio.h>
-#include "trick/integrator_c_intf.h"
-#include "trick/vector_macros.h"
-#include "trick/matrix_macros.h"
-#include "../include/CrewModuleDynamics.hh"
-#include "trick/trick_math_proto.h"
-
-const double acceleration_of_gravity[3] = {0.0, 0.0, -9.81};
-
-CrewModuleDynamics::CrewModuleDynamics() {
-    init_defaults();
-}
-
-void CrewModuleDynamics::init_inertia_tensor(double A, double B, double C) {
-  I_body[0][0] = mass_vehicle * (B*B + C*C);
-  I_body[0][1] = 0.0;
-  I_body[0][2] = 0.0;
-  I_body[1][0] = 0.0;
-  I_body[1][1] = mass_vehicle * (A*A + C*C);
-  I_body[1][2] = 0.0;
-  I_body[2][0] = 0.0;
-  I_body[2][1] = 0.0;
-  I_body[2][2] = mass_vehicle * (A*A + B*B);
-  dm_invert(I_body_inverse, I_body);
-}
-
-void CrewModuleDynamics::init_defaults() {
-    M_IDENT(R);
-    M_INIT(Rdot);
-    mass_vehicle = 9300.0;
-    density_of_water = 1025.0;
-    momentum[0] = 0.0;
-    momentum[1] = 0.0;
-    momentum[2] = 0.0;
-    position[0] = 0.0;
-    position[1] = 0.0;
-    position[2] = 0.0;
-    angular_momentum[0] = 0.0;
-    angular_momentum[1] = 0.0;
-    angular_momentum[2] = 0.0;
-    crewModuleShape.transformCoordinates(R, position);
-    init_inertia_tensor(1.0, 1.0, 1.0);
-}
-
-void CrewModuleDynamics::calcVolumeAndCenterOfBuoyancy() {
-    double x_start = position[0] - 2.6;
-    double x_end   = position[0] + 2.6;
-    double y_start = position[1] - 2.6;
-    double y_end   = position[1] + 2.6;
-    double z_start = position[2] - 2.6;
-    double z_end   = position[2] + 2.6;
-    double sum_r_dv[3] = {0.0, 0.0, 0.0};
-    volume_displaced = 0.0;
-    double P[3];
-    double dx = 0.1;
-    double dy = 0.1;
-    double dz = 0.1;
-    double dv = dx * dy * dz;
-    for (double x = x_start; x < x_end ; x+= dx ) {
-        for (double y = y_start; y < y_end ; y+= dy ) {
-            for (double z = z_start; z < z_end ; z+= dz ) {
-                P[0]=x; P[1]=y; P[2]=z;
-                if ( crewModuleShape.containsPoint(P) ) {
-                    if (P[2] < 0.0) {  // Below the water level.
-                        sum_r_dv[0] += x * dv;
-                        sum_r_dv[1] += y * dv;
-                        sum_r_dv[2] += z * dv;
-                        volume_displaced += dv;
-                    }
-                }
-            }
-        }
-    }
-    if (volume_displaced > 0.0) {
-        center_of_buoyancy[0] = sum_r_dv[0] / volume_displaced;
-        center_of_buoyancy[1] = sum_r_dv[1] / volume_displaced;
-        center_of_buoyancy[2] = sum_r_dv[2] / volume_displaced;
-    } else {
-        center_of_buoyancy[0] = position[0];
-        center_of_buoyancy[1] = position[1];
-        center_of_buoyancy[2] = position[2];
-    }
-}
-
-void CrewModuleDynamics::calcVelocity() {
-    double mass_reciprocal = (1.0/mass_vehicle);
-    V_SCALE(velocity, momentum, mass_reciprocal);
-}
-
-void CrewModuleDynamics::calcRDot() {
-    double omega_skew[3][3];
-    calcAngularVelocity();
-    V_SKEW(omega_skew, angular_velocity);
-    MxM(Rdot, omega_skew, R);
-}
-
-void CrewModuleDynamics::calcAngularVelocity() {
-    double R_transpose[3][3];
-    double R_I_body_inverse[3][3];
-    double I_world_inverse[3][3];
-    MxM(R_I_body_inverse, R, I_body_inverse);
-    M_TRANS(R_transpose, R);
-    MxM(I_world_inverse, R_I_body_inverse, R_transpose);
-    MxV(angular_velocity, I_world_inverse, angular_momentum);
-}
-
-void CrewModuleDynamics::calcBuoyancyTorque() {
-    double lever[3];
-    V_SUB(lever, center_of_buoyancy, position);
-    V_CROSS(torque_buoyancy, lever, force_buoyancy);
-}
-
-void CrewModuleDynamics::calcDragTorque() {
-    V_SCALE(torque_drag, angular_velocity, -5000.0);
-}
-
-void CrewModuleDynamics::calcTotalTorque() {
-    calcBuoyancyTorque();
-    calcDragTorque();
-    V_ADD(torque_total, torque_buoyancy, torque_drag);
-}
-
-void CrewModuleDynamics::calcMassDisplaced() {
-    mass_displaced = density_of_water * volume_displaced;
-}
-
-void CrewModuleDynamics::calcBuoyancyForce() {
-    calcMassDisplaced();
-    V_SCALE(force_buoyancy, -acceleration_of_gravity, mass_displaced);
-}
-
-void CrewModuleDynamics::calcGravityForce() {
-    V_SCALE(force_gravity, acceleration_of_gravity, mass_vehicle);
-}
-
-void CrewModuleDynamics::calcDragForce() {
-    V_SCALE(force_drag, velocity, -2000.0);
-}
-
-void CrewModuleDynamics::calcTotalForce() {
-    calcGravityForce();
-    calcDragForce();
-    /* force_buoyancy is calculated in calc_derivatives() because two different derivative calculations depend on it. */
-    V_ADD(force_total, force_gravity, force_buoyancy);
-    V_ADD(force_total, force_total, force_drag);
-}
-
-int CrewModuleDynamics::calc_derivatives() {
-    crewModuleShape.transformCoordinates(R, position);
-    calcVolumeAndCenterOfBuoyancy ();
-    calcBuoyancyForce();
-    calcTotalForce();
-    calcVelocity();
-    calcTotalTorque();
-    calcRDot();
-    return 0;
-}
-
-int CrewModuleDynamics::calc_state() {
-    int ipass;
-    load_state(
-        &momentum[0], &momentum[1], &momentum[2],
-        &position[0], &position[1], &position[2],
-        &angular_momentum[0], &angular_momentum[1], &angular_momentum[2],
-        &R[0][0],&R[0][1],&R[0][2],
-        &R[1][0],&R[1][1],&R[1][2],
-        &R[2][0],&R[2][1],&R[2][2],
-        NULL);
-    load_deriv(
-        &force_total[0], &force_total[1], &force_total[2],
-        &velocity[0], &velocity[1], &velocity[2],
-        &torque_total[0], &torque_total[1], &torque_total[2],
-        &Rdot[0][0],&Rdot[0][1],&Rdot[0][2],
-        &Rdot[1][0],&Rdot[1][1],&Rdot[1][2],
-        &Rdot[2][0],&Rdot[2][1],&Rdot[2][2],
-        NULL);
-    ipass = integrate();
-    unload_state(
-        &momentum[0], &momentum[1], &momentum[2],
-        &position[0], &position[1], &position[2],
-        &angular_momentum[0], &angular_momentum[1], &angular_momentum[2],
-        &R[0][0],&R[0][1],&R[0][2],
-        &R[1][0],&R[1][1],&R[1][2],
-        &R[2][0],&R[2][1],&R[2][2],
-        NULL);
-        int axis = 0;
-        dm_orthonormal(R, &axis); // Square up the rotation matrix.
-    return(ipass);
+#include	<math.h>
+#include	<stdio.h>
+#include	"trick/integrator_c_intf.h"
+#include	"trick/vector_macros.h"
+#include	"trick/matrix_macros.h"
+#include	"../include/CrewModuleDynamics.hh"
+#include	"trick/trick_math_proto.h"
+
+const	double	acceleration_of_gravity[3]	=	{0.0,	0.0,	-9.81};
+
+CrewModuleDynamics::CrewModuleDynamics()	{
+				init_defaults();
+}
+
+void	CrewModuleDynamics::init_inertia_tensor(double	A,	double	B,	double	C)	{
+		I_body[0][0]	=	mass_vehicle	*	(B*B	+	C*C);
+		I_body[0][1]	=	0.0;
+		I_body[0][2]	=	0.0;
+		I_body[1][0]	=	0.0;
+		I_body[1][1]	=	mass_vehicle	*	(A*A	+	C*C);
+		I_body[1][2]	=	0.0;
+		I_body[2][0]	=	0.0;
+		I_body[2][1]	=	0.0;
+		I_body[2][2]	=	mass_vehicle	*	(A*A	+	B*B);
+		dm_invert(I_body_inverse,	I_body);
+}
+
+void	CrewModuleDynamics::init_defaults()	{
+				M_IDENT(R);
+				M_INIT(Rdot);
+				mass_vehicle	=	9300.0;
+				density_of_water	=	1025.0;
+				momentum[0]	=	0.0;
+				momentum[1]	=	0.0;
+				momentum[2]	=	0.0;
+				position[0]	=	0.0;
+				position[1]	=	0.0;
+				position[2]	=	0.0;
+				angular_momentum[0]	=	0.0;
+				angular_momentum[1]	=	0.0;
+				angular_momentum[2]	=	0.0;
+				crewModuleShape.transformCoordinates(R,	position);
+				init_inertia_tensor(1.0,	1.0,	1.0);
+}
+
+void	CrewModuleDynamics::calcVolumeAndCenterOfBuoyancy()	{
+				double	x_start	=	position[0]	-	2.6;
+				double	x_end			=	position[0]	+	2.6;
+				double	y_start	=	position[1]	-	2.6;
+				double	y_end			=	position[1]	+	2.6;
+				double	z_start	=	position[2]	-	2.6;
+				double	z_end			=	position[2]	+	2.6;
+				double	sum_r_dv[3]	=	{0.0,	0.0,	0.0};
+				volume_displaced	=	0.0;
+				double	P[3];
+				double	dx	=	0.1;
+				double	dy	=	0.1;
+				double	dz	=	0.1;
+				double	dv	=	dx	*	dy	*	dz;
+				for	(double	x	=	x_start;	x	<	x_end	;	x+=	dx	)	{
+								for	(double	y	=	y_start;	y	<	y_end	;	y+=	dy	)	{
+												for	(double	z	=	z_start;	z	<	z_end	;	z+=	dz	)	{
+																P[0]=x;	P[1]=y;	P[2]=z;
+																if	(	crewModuleShape.containsPoint(P)	)	{
+																				if	(P[2]	<	0.0)	{		//	Below	the	water	level.
+																								sum_r_dv[0]	+=	x	*	dv;
+																								sum_r_dv[1]	+=	y	*	dv;
+																								sum_r_dv[2]	+=	z	*	dv;
+																								volume_displaced	+=	dv;
+																				}
+																}
+												}
+								}
+				}
+				if	(volume_displaced	>	0.0)	{
+								center_of_buoyancy[0]	=	sum_r_dv[0]	/	volume_displaced;
+								center_of_buoyancy[1]	=	sum_r_dv[1]	/	volume_displaced;
+								center_of_buoyancy[2]	=	sum_r_dv[2]	/	volume_displaced;
+				}	else	{
+								center_of_buoyancy[0]	=	position[0];
+								center_of_buoyancy[1]	=	position[1];
+								center_of_buoyancy[2]	=	position[2];
+				}
+}
+
+void	CrewModuleDynamics::calcVelocity()	{
+				double	mass_reciprocal	=	(1.0/mass_vehicle);
+				V_SCALE(velocity,	momentum,	mass_reciprocal);
+}
+
+void	CrewModuleDynamics::calcRDot()	{
+				double	omega_skew[3][3];
+				calcAngularVelocity();
+				V_SKEW(omega_skew,	angular_velocity);
+				MxM(Rdot,	omega_skew,	R);
+}
+
+void	CrewModuleDynamics::calcAngularVelocity()	{
+				double	R_transpose[3][3];
+				double	R_I_body_inverse[3][3];
+				double	I_world_inverse[3][3];
+				MxM(R_I_body_inverse,	R,	I_body_inverse);
+				M_TRANS(R_transpose,	R);
+				MxM(I_world_inverse,	R_I_body_inverse,	R_transpose);
+				MxV(angular_velocity,	I_world_inverse,	angular_momentum);
+}
+
+void	CrewModuleDynamics::calcBuoyancyTorque()	{
+				double	lever[3];
+				V_SUB(lever,	center_of_buoyancy,	position);
+				V_CROSS(torque_buoyancy,	lever,	force_buoyancy);
+}
+
+void	CrewModuleDynamics::calcDragTorque()	{
+				V_SCALE(torque_drag,	angular_velocity,	-5000.0);
+}
+
+void	CrewModuleDynamics::calcTotalTorque()	{
+				calcBuoyancyTorque();
+				calcDragTorque();
+				V_ADD(torque_total,	torque_buoyancy,	torque_drag);
+}
+
+void	CrewModuleDynamics::calcMassDisplaced()	{
+				mass_displaced	=	density_of_water	*	volume_displaced;
+}
+
+void	CrewModuleDynamics::calcBuoyancyForce()	{
+				calcMassDisplaced();
+				V_SCALE(force_buoyancy,	-acceleration_of_gravity,	mass_displaced);
+}
+
+void	CrewModuleDynamics::calcGravityForce()	{
+				V_SCALE(force_gravity,	acceleration_of_gravity,	mass_vehicle);
+}
+
+void	CrewModuleDynamics::calcDragForce()	{
+				V_SCALE(force_drag,	velocity,	-2000.0);
+}
+
+void	CrewModuleDynamics::calcTotalForce()	{
+				calcGravityForce();
+				calcDragForce();
+				/*	force_buoyancy	is	calculated	in	calc_derivatives()	because	two	different	derivative	calculations	depend	on	it.	*/
+				V_ADD(force_total,	force_gravity,	force_buoyancy);
+				V_ADD(force_total,	force_total,	force_drag);
+}
+
+int	CrewModuleDynamics::calc_derivatives()	{
+				crewModuleShape.transformCoordinates(R,	position);
+				calcVolumeAndCenterOfBuoyancy	();
+				calcBuoyancyForce();
+				calcTotalForce();
+				calcVelocity();
+				calcTotalTorque();
+				calcRDot();
+				return	0;
+}
+
+int	CrewModuleDynamics::calc_state()	{
+				int	ipass;
+				load_state(
+								&momentum[0],	&momentum[1],	&momentum[2],
+								&position[0],	&position[1],	&position[2],
+								&angular_momentum[0],	&angular_momentum[1],	&angular_momentum[2],
+								&R[0][0],&R[0][1],&R[0][2],
+								&R[1][0],&R[1][1],&R[1][2],
+								&R[2][0],&R[2][1],&R[2][2],
+								NULL);
+				load_deriv(
+								&force_total[0],	&force_total[1],	&force_total[2],
+								&velocity[0],	&velocity[1],	&velocity[2],
+								&torque_total[0],	&torque_total[1],	&torque_total[2],
+								&Rdot[0][0],&Rdot[0][1],&Rdot[0][2],
+								&Rdot[1][0],&Rdot[1][1],&Rdot[1][2],
+								&Rdot[2][0],&Rdot[2][1],&Rdot[2][2],
+								NULL);
+				ipass	=	integrate();
+				unload_state(
+								&momentum[0],	&momentum[1],	&momentum[2],
+								&position[0],	&position[1],	&position[2],
+								&angular_momentum[0],	&angular_momentum[1],	&angular_momentum[2],
+								&R[0][0],&R[0][1],&R[0][2],
+								&R[1][0],&R[1][1],&R[1][2],
+								&R[2][0],&R[2][1],&R[2][2],
+								NULL);
+								int	axis	=	0;
+								dm_orthonormal(R,	&axis);	//	Square	up	the	rotation	matrix.
+				return(ipass);
 }
diff --git a/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleShape.cpp b/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleShape.cpp
index 9d0f2c06d..7d0e2b641 100644
--- a/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleShape.cpp
+++ b/trick_sims/SIM_splashdown/models/CrewModule/src/CrewModuleShape.cpp
@@ -1,69 +1,69 @@
-#include "../include/CrewModuleShape.hh"
-#include "trick/vector_macros.h"
-#include "trick/matrix_macros.h"
+#include	"../include/CrewModuleShape.hh"
+#include	"trick/vector_macros.h"
+#include	"trick/matrix_macros.h"
 
-CrewModuleShape::CrewModuleShape () {
-    sphere_radius = 6.04;
-    cone_angle = (M_PI/180.0) * 32.5;
+CrewModuleShape::CrewModuleShape	()	{
+				sphere_radius	=	6.04;
+				cone_angle	=	(M_PI/180.0)	*	32.5;
 
-    sphere_center_base[0] = 0.00;
-    sphere_center_base[1] = 0.00;
-    sphere_center_base[2] = 5.14;
+				sphere_center_base[0]	=	0.00;
+				sphere_center_base[1]	=	0.00;
+				sphere_center_base[2]	=	5.14;
 
-    cone_point_base[0] = 0.00;
-    cone_point_base[1] = 0.00;
-    cone_point_base[2] = 3.82;
+				cone_point_base[0]	=	0.00;
+				cone_point_base[1]	=	0.00;
+				cone_point_base[2]	=	3.82;
 
-    plane_point_base[0] = 0.00;
-    plane_point_base[1] = 0.00;
-    plane_point_base[2] = 2.40;
+				plane_point_base[0]	=	0.00;
+				plane_point_base[1]	=	0.00;
+				plane_point_base[2]	=	2.40;
 
-    double M[3][3] = {{1.0, 0.0, 0.0},
-                      {0.0, 1.0, 0.0},
-                      {0.0, 0.0, 1.0}};
+				double	M[3][3]	=	{{1.0,	0.0,	0.0},
+																						{0.0,	1.0,	0.0},
+																						{0.0,	0.0,	1.0}};
 
-    double P[3] = {0.0, 0.0, 0.0};
+				double	P[3]	=	{0.0,	0.0,	0.0};
 
-    transformCoordinates(M, P);
+				transformCoordinates(M,	P);
 }
 
-bool CrewModuleShape::containsPoint(double (&test_point)[3]) {
-    double sdiff[3];
-    V_SUB(sdiff, test_point, sphere_center_trans);
-    if ( V_MAG(sdiff) <= sphere_radius) { // The point is in the sphere.
-        double cdiff[3];
-        V_SUB(cdiff, test_point, cone_point_trans);
-        double test_angle = acos ( V_DOT(cdiff, cone_vector_trans) / V_MAG(cdiff) );
-        if ( test_angle < cone_angle ) { // The point is in the cone.
-            double pdiff[3];
-            V_SUB(pdiff, test_point, plane_point_trans);
-            return ( V_DOT(pdiff, plane_vector_trans) > 0.0); // The point is on the correct side of the plane.
-        }
-    }
-    return false;
+bool	CrewModuleShape::containsPoint(double	(&test_point)[3])	{
+				double	sdiff[3];
+				V_SUB(sdiff,	test_point,	sphere_center_trans);
+				if	(	V_MAG(sdiff)	<=	sphere_radius)	{	//	The	point	is	in	the	sphere.
+								double	cdiff[3];
+								V_SUB(cdiff,	test_point,	cone_point_trans);
+								double	test_angle	=	acos	(	V_DOT(cdiff,	cone_vector_trans)	/	V_MAG(cdiff)	);
+								if	(	test_angle	<	cone_angle	)	{	//	The	point	is	in	the	cone.
+												double	pdiff[3];
+												V_SUB(pdiff,	test_point,	plane_point_trans);
+												return	(	V_DOT(pdiff,	plane_vector_trans)	>	0.0);	//	The	point	is	on	the	correct	side	of	the	plane.
+								}
+				}
+				return	false;
 }
 
-void CrewModuleShape::transformCoordinates( double (&rotation)[3][3], double (&position)[3]) {
-    transformPoint(rotation, position, sphere_center_base, sphere_center_trans );
-    transformPoint(rotation, position, cone_point_base, cone_point_trans );
-    transformPoint(rotation, position, plane_point_base, plane_point_trans );
+void	CrewModuleShape::transformCoordinates(	double	(&rotation)[3][3],	double	(&position)[3])	{
+				transformPoint(rotation,	position,	sphere_center_base,	sphere_center_trans	);
+				transformPoint(rotation,	position,	cone_point_base,	cone_point_trans	);
+				transformPoint(rotation,	position,	plane_point_base,	plane_point_trans	);
 
-    /*
-       Calculate these unit vectors so they dont have to be calculated everytime we test a point.
-    */
-    
-    double scale;
-    V_SUB(cone_vector_trans, position, cone_point_trans);
-    scale = 1.0/V_MAG(cone_vector_trans);
-    V_SCALE(cone_vector_trans, cone_vector_trans, scale);
+				/*
+							Calculate	these	unit	vectors	so	they	dont	have	to	be	calculated	everytime	we	test	a	point.
+				*/
+				
+				double	scale;
+				V_SUB(cone_vector_trans,	position,	cone_point_trans);
+				scale	=	1.0/V_MAG(cone_vector_trans);
+				V_SCALE(cone_vector_trans,	cone_vector_trans,	scale);
 
-    V_SUB(plane_vector_trans, position, plane_point_trans);
-    scale = 1.0/V_MAG(plane_vector_trans);
-    V_SCALE(plane_vector_trans, plane_vector_trans, scale);
+				V_SUB(plane_vector_trans,	position,	plane_point_trans);
+				scale	=	1.0/V_MAG(plane_vector_trans);
+				V_SCALE(plane_vector_trans,	plane_vector_trans,	scale);
 }
 
-void CrewModuleShape::transformPoint(double (&rotation)[3][3], double (&translation)[3], double (&in_point)[3], double (&out_point)[3] ) {
-    double work[3];
-    MxV(work, rotation, in_point);
-    V_ADD(out_point, work, translation);
+void	CrewModuleShape::transformPoint(double	(&rotation)[3][3],	double	(&translation)[3],	double	(&in_point)[3],	double	(&out_point)[3]	)	{
+				double	work[3];
+				MxV(work,	rotation,	in_point);
+				V_ADD(out_point,	work,	translation);
 }
diff --git a/trick_sims/SIM_submarine/models/submarine/src/Submarine.cpp b/trick_sims/SIM_submarine/models/submarine/src/Submarine.cpp
index 61649cee8..2cf7191a8 100644
--- a/trick_sims/SIM_submarine/models/submarine/src/Submarine.cpp
+++ b/trick_sims/SIM_submarine/models/submarine/src/Submarine.cpp
@@ -1,145 +1,145 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a submarine. )
-LIBRARY DEPENDENCY:
-    ((Submarine.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	submarine.	)
+LIBRARY	DEPENDENCY:
+				((Submarine.o))
 *******************************************************************************/
-#include "submarine/include/Submarine.hh"
+#include	"submarine/include/Submarine.hh"
 
-#include "trick/integrator_c_intf.h"
-#include <stdlib.h>
-#include <math.h>
-#include <iostream>
+#include	"trick/integrator_c_intf.h"
+#include	<stdlib.h>
+#include	<math.h>
+#include	<iostream>
 
-int Submarine::default_data() {
+int	Submarine::default_data()	{
 
-    // Parameters
-    outer_hull_outer_radius = 1.30; // meters
-    outer_hull_inner_radius = 1.25; // meters
-    inner_hull_outer_radius = 1.10; // meters
-    inner_hull_inner_radius = 1.00; // meters
-    hull_length = 3.0;              // meters
-    ballast_tank_volume = 1.0;      // cubic meter
-    hard_ballast_mass= 0.0;         // kg
-    hull_mass = 10000.0;            // kg
-    payload_mass = 1500.0;          // kg
-    Cd = 0.5;
+				//	Parameters
+				outer_hull_outer_radius	=	1.30;	//	meters
+				outer_hull_inner_radius	=	1.25;	//	meters
+				inner_hull_outer_radius	=	1.10;	//	meters
+				inner_hull_inner_radius	=	1.00;	//	meters
+				hull_length	=	3.0;														//	meters
+				ballast_tank_volume	=	1.0;						//	cubic	meter
+				hard_ballast_mass=	0.0;									//	kg
+				hull_mass	=	10000.0;												//	kg
+				payload_mass	=	1500.0;										//	kg
+				Cd	=	0.5;
 
-    // State
-    pos[0] = 0.0;              // meters
-    pos[1] = 0.0;
-    vel[0] = 0.0;              // meters/second
-    vel[1] = 0.0;
-    ballast_energy = 80000.0;  // Joules
-    pump_power = 0.0;          // Watts
+				//	State
+				pos[0]	=	0.0;														//	meters
+				pos[1]	=	0.0;
+				vel[0]	=	0.0;														//	meters/second
+				vel[1]	=	0.0;
+				ballast_energy	=	80000.0;		//	Joules
+				pump_power	=	0.0;										//	Watts
 
-    // Control Variable
-    ballast_air_ratio = 0.0;
-    water_pressure_pascals = 0.0;
-    water_pressure_PSI = 0.0;
-    pump_power_command = 0;
+				//	Control	Variable
+				ballast_air_ratio	=	0.0;
+				water_pressure_pascals	=	0.0;
+				water_pressure_PSI	=	0.0;
+				pump_power_command	=	0;
 
-    return (0);
+				return	(0);
 }
 
-int Submarine::state_init() {
-    return (0);
+int	Submarine::state_init()	{
+				return	(0);
 }
 
-int Submarine::state_deriv() {
-    double total_mass = calc_total_mass();
-    double F_gravity  = calc_gravity_force();
-    double F_buoyancy = calc_buoyancy_force();
-    double F_drag     = calc_drag_force();
-    acc[0] = 0.0;
-    acc[1] = (F_gravity + F_buoyancy + F_drag) / total_mass;
-    return(0);
+int	Submarine::state_deriv()	{
+				double	total_mass	=	calc_total_mass();
+				double	F_gravity		=	calc_gravity_force();
+				double	F_buoyancy	=	calc_buoyancy_force();
+				double	F_drag					=	calc_drag_force();
+				acc[0]	=	0.0;
+				acc[1]	=	(F_gravity	+	F_buoyancy	+	F_drag)	/	total_mass;
+				return(0);
 }
 
-int Submarine::state_integ() {
-   int integration_step;
-   load_state ( &pos[0], &pos[1], &vel[0], &vel[1], &ballast_energy, (double*)0);
-   load_deriv ( &vel[0], &vel[1], &acc[0], &acc[1], &pump_power, (double*)0);
-   integration_step = integrate();
-   unload_state( &pos[0], &pos[1], &vel[0], &vel[1], &ballast_energy, (double*)0);
-   if (ballast_energy < 0.0) {
-       ballast_energy = 0.0;
-   }
-   return(integration_step);
+int	Submarine::state_integ()	{
+			int	integration_step;
+			load_state	(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	&ballast_energy,	(double*)0);
+			load_deriv	(	&vel[0],	&vel[1],	&acc[0],	&acc[1],	&pump_power,	(double*)0);
+			integration_step	=	integrate();
+			unload_state(	&pos[0],	&pos[1],	&vel[0],	&vel[1],	&ballast_energy,	(double*)0);
+			if	(ballast_energy	<	0.0)	{
+							ballast_energy	=	0.0;
+			}
+			return(integration_step);
 }
 
-// Calculate Water Pressure at depth in Pascals
-void Submarine::calc_water_pressure() {
-    water_pressure_pascals = DENSITY_SALT_WATER * GRAVITY * -pos[1] + 14.7/CONVERSION_PASCALS_TO_PSI;
-    water_pressure_PSI = water_pressure_pascals * CONVERSION_PASCALS_TO_PSI;
+//	Calculate	Water	Pressure	at	depth	in	Pascals
+void	Submarine::calc_water_pressure()	{
+				water_pressure_pascals	=	DENSITY_SALT_WATER	*	GRAVITY	*	-pos[1]	+	14.7/CONVERSION_PASCALS_TO_PSI;
+				water_pressure_PSI	=	water_pressure_pascals	*	CONVERSION_PASCALS_TO_PSI;
 }
-// Calculate volume of water displaced from the ballast water tank by compressed air.
-double Submarine::calc_ballast_air_volume() {
-    calc_water_pressure();
-    double ballast_air_volume = ballast_energy / water_pressure_pascals;
+//	Calculate	volume	of	water	displaced	from	the	ballast	water	tank	by	compressed	air.
+double	Submarine::calc_ballast_air_volume()	{
+				calc_water_pressure();
+				double	ballast_air_volume	=	ballast_energy	/	water_pressure_pascals;
 
-    // Ballast_air_volume cant' exceed to volume of the ballast tank.
-    if ( ballast_air_volume > ballast_tank_volume ) {
-        ballast_air_volume = ballast_tank_volume;
-        ballast_energy = ballast_air_volume * water_pressure_pascals;
-    }
-    ballast_air_ratio = ballast_air_volume / ballast_tank_volume;
-    return ballast_air_volume;
+				//	Ballast_air_volume	cant'	exceed	to	volume	of	the	ballast	tank.
+				if	(	ballast_air_volume	>	ballast_tank_volume	)	{
+								ballast_air_volume	=	ballast_tank_volume;
+								ballast_energy	=	ballast_air_volume	*	water_pressure_pascals;
+				}
+				ballast_air_ratio	=	ballast_air_volume	/	ballast_tank_volume;
+				return	ballast_air_volume;
 }
-// Calculate the volume of water currently displaced by the pressure hull.
-// This is just multiplying the hull volume times a sigmoid.
-double Submarine::calc_pressure_hull_displaced_volume() {
-    double C = 5.5;
-    return ( calc_pressure_hull_volume() / (1 + exp( C * pos[1] )));
+//	Calculate	the	volume	of	water	currently	displaced	by	the	pressure	hull.
+//	This	is	just	multiplying	the	hull	volume	times	a	sigmoid.
+double	Submarine::calc_pressure_hull_displaced_volume()	{
+				double	C	=	5.5;
+				return	(	calc_pressure_hull_volume()	/	(1	+	exp(	C	*	pos[1]	)));
 }
 
-double Submarine::calc_total_displaced_volume() {
-   return calc_ballast_air_volume() + calc_pressure_hull_displaced_volume();
+double	Submarine::calc_total_displaced_volume()	{
+			return	calc_ballast_air_volume()	+	calc_pressure_hull_displaced_volume();
 }
 
-double Submarine::calc_gravity_force () {
-  return -calc_total_mass() * GRAVITY;
+double	Submarine::calc_gravity_force	()	{
+		return	-calc_total_mass()	*	GRAVITY;
 }
 
-double Submarine::calc_total_mass () {
-    double total_mass = hard_ballast_mass + calc_fixed_mass() + calc_ballast_water_mass();
-    return total_mass;
+double	Submarine::calc_total_mass	()	{
+				double	total_mass	=	hard_ballast_mass	+	calc_fixed_mass()	+	calc_ballast_water_mass();
+				return	total_mass;
 }
 
-double Submarine::calc_fixed_mass() {
-    double fixed_mass = (hull_mass + payload_mass);
-    return fixed_mass;
+double	Submarine::calc_fixed_mass()	{
+				double	fixed_mass	=	(hull_mass	+	payload_mass);
+				return	fixed_mass;
 }
 
-double Submarine::calc_buoyancy_force( ) {
-   return ( calc_total_displaced_volume() * DENSITY_SALT_WATER * GRAVITY );
+double	Submarine::calc_buoyancy_force(	)	{
+			return	(	calc_total_displaced_volume()	*	DENSITY_SALT_WATER	*	GRAVITY	);
 }
 
-double Submarine::calc_ballast_water_mass() {
-    double ballast_mass = calc_ballast_water_volume() * DENSITY_SALT_WATER ;
-    return ballast_mass;
+double	Submarine::calc_ballast_water_mass()	{
+				double	ballast_mass	=	calc_ballast_water_volume()	*	DENSITY_SALT_WATER	;
+				return	ballast_mass;
 }
 
-double Submarine::calc_ballast_water_volume () {
-    double ballast_water_volume = ballast_tank_volume - calc_ballast_air_volume();
-    return ballast_water_volume;
+double	Submarine::calc_ballast_water_volume	()	{
+				double	ballast_water_volume	=	ballast_tank_volume	-	calc_ballast_air_volume();
+				return	ballast_water_volume;
 }
 
-double Submarine::calc_drag_force() {
-    double A = outer_hull_outer_radius * 2 * hull_length;
-    return -0.5 * DENSITY_SALT_WATER * vel[1] * fabs(vel[1]) * Cd * A;
+double	Submarine::calc_drag_force()	{
+				double	A	=	outer_hull_outer_radius	*	2	*	hull_length;
+				return	-0.5	*	DENSITY_SALT_WATER	*	vel[1]	*	fabs(vel[1])	*	Cd	*	A;
 }
 
-double Submarine::calc_pressure_hull_volume() {
-    return ( M_PI * inner_hull_outer_radius * inner_hull_outer_radius * hull_length);
+double	Submarine::calc_pressure_hull_volume()	{
+				return	(	M_PI	*	inner_hull_outer_radius	*	inner_hull_outer_radius	*	hull_length);
 }
 
-int Submarine::control() {
-    pump_power = pump_power_command;
-    if (pump_power >  5000.0) pump_power =  5000.0;
-    if (pump_power < -5000.0) pump_power = -5000.0;
-    return(0);
+int	Submarine::control()	{
+				pump_power	=	pump_power_command;
+				if	(pump_power	>		5000.0)	pump_power	=		5000.0;
+				if	(pump_power	<	-5000.0)	pump_power	=	-5000.0;
+				return(0);
 }
 
-int Submarine::state_post_integ() {
-    return(0);
+int	Submarine::state_post_integ()	{
+				return(0);
 }
diff --git a/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp b/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
index 1e3aa2863..72f1cd0ed 100644
--- a/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
+++ b/trick_sims/SIM_wheelbot/models/Battery/src/DCBattery.cpp
@@ -1,23 +1,23 @@
-#include "DCBattery.hh"
-#include <iostream>
+#include	"DCBattery.hh"
+#include	<iostream>
 
 
-DCBattery::DCBattery(double initialIdealVoltage, double initialInternalResistance)
-: actualVoltage(0), current(0), idealVoltage(initialIdealVoltage),
-  internalResistance(initialInternalResistance)  {
+DCBattery::DCBattery(double	initialIdealVoltage,	double	initialInternalResistance)
+:	actualVoltage(0),	current(0),	idealVoltage(initialIdealVoltage),
+		internalResistance(initialInternalResistance)		{
 }
 
-void DCBattery :: update ()
+void	DCBattery	::	update	()
 {
-    actualVoltage = idealVoltage - internalResistance * current;
-    actualVoltage = std :: min (idealVoltage, actualVoltage);
-    actualVoltage = std :: max (0.0, actualVoltage);
+				actualVoltage	=	idealVoltage	-	internalResistance	*	current;
+				actualVoltage	=	std	::	min	(idealVoltage,	actualVoltage);
+				actualVoltage	=	std	::	max	(0.0,	actualVoltage);
 }
-double DCBattery :: getActualVoltage ()
+double	DCBattery	::	getActualVoltage	()
 {
-    return actualVoltage;
+				return	actualVoltage;
 }
-void DCBattery :: setCurrent (double value)
+void	DCBattery	::	setCurrent	(double	value)
 {
-    current = value;
+				current	=	value;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp b/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
index a96e18bfa..48b662c8b 100644
--- a/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Battery/test/DCBatteryTest.cpp
@@ -1,52 +1,52 @@
-#include <gtest/gtest.h>
-#define private public
-#include "DCBattery.hh"
-
-TEST( BatteryTest , one ) {
-    // Attempt to create an Battery
-    DCBattery * battery;
-    battery = new DCBattery(9.0, 2.0);
-    EXPECT_NE( (void*)0, battery);
-    //delete battery;
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"DCBattery.hh"
+
+TEST(	BatteryTest	,	one	)	{
+				//	Attempt	to	create	an	Battery
+				DCBattery	*	battery;
+				battery	=	new	DCBattery(9.0,	2.0);
+				EXPECT_NE(	(void*)0,	battery);
+				//delete	battery;
 }
 
-TEST( BatteryTest , two ) {
-    // Test Ideal Voltage
-    DCBattery battery(9.0, 2.0);
-    EXPECT_DOUBLE_EQ( 9.0, battery.idealVoltage );
+TEST(	BatteryTest	,	two	)	{
+				//	Test	Ideal	Voltage
+				DCBattery	battery(9.0,	2.0);
+				EXPECT_DOUBLE_EQ(	9.0,	battery.idealVoltage	);
 
 }
 
-TEST( BatteryTest , three ) {
-    // Test Internal Resistance
-    DCBattery battery(9.0, 2.0);
-    EXPECT_DOUBLE_EQ( 2, battery.internalResistance );
+TEST(	BatteryTest	,	three	)	{
+				//	Test	Internal	Resistance
+				DCBattery	battery(9.0,	2.0);
+				EXPECT_DOUBLE_EQ(	2,	battery.internalResistance	);
 
 }
 
-TEST( BatteryTest , four ) {
-    // Test Actual Voltage doesnt go below zero
-    DCBattery battery(9.0, 2.0);
-    battery.setCurrent(6.0);
-    battery.update ();
-    EXPECT_DOUBLE_EQ( 0.0, battery.actualVoltage );
+TEST(	BatteryTest	,	four	)	{
+				//	Test	Actual	Voltage	doesnt	go	below	zero
+				DCBattery	battery(9.0,	2.0);
+				battery.setCurrent(6.0);
+				battery.update	();
+				EXPECT_DOUBLE_EQ(	0.0,	battery.actualVoltage	);
 
 }
 
-TEST( BatteryTest , five ) {
-    // Test Actual Voltage under normal load
-    DCBattery battery(9.0, 2.0);
-    battery.setCurrent(4.0);
-    battery.update ();
-    EXPECT_DOUBLE_EQ( 1.0, battery.actualVoltage );
+TEST(	BatteryTest	,	five	)	{
+				//	Test	Actual	Voltage	under	normal	load
+				DCBattery	battery(9.0,	2.0);
+				battery.setCurrent(4.0);
+				battery.update	();
+				EXPECT_DOUBLE_EQ(	1.0,	battery.actualVoltage	);
 
 }
 
-TEST( BatteryTest , six ) {
-    // Test Actual Voltage doesnt go above Ideal Voltage
-    DCBattery battery(9.0, 2.0);
-    battery.setCurrent(-4.0);
-    battery.update ();
-    EXPECT_DOUBLE_EQ( 9.0, battery.actualVoltage );
+TEST(	BatteryTest	,	six	)	{
+				//	Test	Actual	Voltage	doesnt	go	above	Ideal	Voltage
+				DCBattery	battery(9.0,	2.0);
+				battery.setCurrent(-4.0);
+				battery.update	();
+				EXPECT_DOUBLE_EQ(	9.0,	battery.actualVoltage	);
 
 }
diff --git a/trick_sims/SIM_wheelbot/models/Control/src/PIDController.cpp b/trick_sims/SIM_wheelbot/models/Control/src/PIDController.cpp
index 30aae9187..cab7376ca 100644
--- a/trick_sims/SIM_wheelbot/models/Control/src/PIDController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Control/src/PIDController.cpp
@@ -1,77 +1,77 @@
-#include "Control/include/PIDController.hh"
+#include	"Control/include/PIDController.hh"
 
-PIDController::PIDController(double kp, double ki, double kd, double omax, double omin, double dt, double tc) {
-  Kprop = kp;
-  Kinteg = ki;
-  Kderv = kd;
-  Dt = dt;
-  k = dt/tc;
-  error = 0.0;
-  integral = 0;
-  out_max = omax;
-  out_min = omin;
-  previous_error = 0.0;
-  prev_setpoint_value = 0.0;
-  integration_enabled = true;
+PIDController::PIDController(double	kp,	double	ki,	double	kd,	double	omax,	double	omin,	double	dt,	double	tc)	{
+		Kprop	=	kp;
+		Kinteg	=	ki;
+		Kderv	=	kd;
+		Dt	=	dt;
+		k	=	dt/tc;
+		error	=	0.0;
+		integral	=	0;
+		out_max	=	omax;
+		out_min	=	omin;
+		previous_error	=	0.0;
+		prev_setpoint_value	=	0.0;
+		integration_enabled	=	true;
 }
 
-double PIDController::getOutput(double setpoint_value, double measured_value) {
+double	PIDController::getOutput(double	setpoint_value,	double	measured_value)	{
 
-  double error_unfiltered = setpoint_value - measured_value;
+		double	error_unfiltered	=	setpoint_value	-	measured_value;
 
-  // Low Pass Filter
-  error = error + (k * (error_unfiltered - error));
+		//	Low	Pass	Filter
+		error	=	error	+	(k	*	(error_unfiltered	-	error));
 
-  // Check for drastic changes
-  if (prev_setpoint_value != setpoint_value) {
-    previous_error = error;
-  }
+		//	Check	for	drastic	changes
+		if	(prev_setpoint_value	!=	setpoint_value)	{
+				previous_error	=	error;
+		}
 
-  // integration
-  if (integration_enabled == true) {
-    integral = integral + (error * Dt);
-  }
+		//	integration
+		if	(integration_enabled	==	true)	{
+				integral	=	integral	+	(error	*	Dt);
+		}
 
-  // Update derivative (rate of change of error)
-  double derivative = ((error - previous_error) / Dt);
+		//	Update	derivative	(rate	of	change	of	error)
+		double	derivative	=	((error	-	previous_error)	/	Dt);
 
-  double proportionalterm = Kprop * error;
-  double integralterm = Kinteg * integral;
-  double derivateterm = Kderv * derivative;
-  double output = proportionalterm + integralterm + derivateterm;
+		double	proportionalterm	=	Kprop	*	error;
+		double	integralterm	=	Kinteg	*	integral;
+		double	derivateterm	=	Kderv	*	derivative;
+		double	output	=	proportionalterm	+	integralterm	+	derivateterm;
 
-  // Clamping Actuator
+		//	Clamping	Actuator
 
-  // Sign Check
-  bool same_sign;
-  if ((error * output) > 0.0) {
-    same_sign = true;
-  } else {
-    same_sign = false;
-  }
+		//	Sign	Check
+		bool	same_sign;
+		if	((error	*	output)	>	0.0)	{
+				same_sign	=	true;
+		}	else	{
+				same_sign	=	false;
+		}
 
-  //Saturation Check
-  bool output_limited = false;
-  if (output > out_max) {
-    output = out_max;
-    output_limited = true;
-  }
-  if (output < out_min) {
-    output = out_min;
-    output_limited = true;
-  }
+		//Saturation	Check
+		bool	output_limited	=	false;
+		if	(output	>	out_max)	{
+				output	=	out_max;
+				output_limited	=	true;
+		}
+		if	(output	<	out_min)	{
+				output	=	out_min;
+				output_limited	=	true;
+		}
 
-  //AND Gate Check
-  if (output_limited && same_sign) {
-    integration_enabled = false;
-  } else {
-    integration_enabled = true;
-  }
+		//AND	Gate	Check
+		if	(output_limited	&&	same_sign)	{
+				integration_enabled	=	false;
+		}	else	{
+				integration_enabled	=	true;
+		}
 
-  // Prepare for next calcuation
-  previous_error = error;
-  prev_setpoint_value = setpoint_value;
+		//	Prepare	for	next	calcuation
+		previous_error	=	error;
+		prev_setpoint_value	=	setpoint_value;
 
-  return (output);
+		return	(output);
 
 }
diff --git a/trick_sims/SIM_wheelbot/models/Control/src/differentialDriveController.cpp b/trick_sims/SIM_wheelbot/models/Control/src/differentialDriveController.cpp
index 9d1d8a553..9451d6ee1 100644
--- a/trick_sims/SIM_wheelbot/models/Control/src/differentialDriveController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Control/src/differentialDriveController.cpp
@@ -1,85 +1,85 @@
-#include <iostream>
-#include <math.h>
-#include "Control/include/differentialDriveController.hh"
-#ifndef PI
-#define PI 3.14159265
+#include	<iostream>
+#include	<math.h>
+#include	"Control/include/differentialDriveController.hh"
+#ifndef	PI
+#define	PI	3.14159265
 #endif
 
 DifferentialDriveController::
-    DifferentialDriveController ( double DistanceBetweenWheels,
-                                  double WheelRadius,
-                                  double WheelSpeedLimit,
-                                  double HeadingRateLimit,
-                                  double SlowDownDistance,
-                                  MotorSpeedController& RightMotorController,
-                                  MotorSpeedController& LeftMotorController
-                                ):
-    distanceBetweenWheels(DistanceBetweenWheels),
-    wheelRadius(WheelRadius),
-    wheelSpeedLimit(WheelSpeedLimit),
-    headingRateLimit(HeadingRateLimit),
-    slowDownDistance(SlowDownDistance),
-    rightMotorController(RightMotorController),
-    leftMotorController(LeftMotorController),
-
-    rightMotorSpeedCommand(0.0),
-    leftMotorSpeedCommand(0.0),
-    desiredHeadingRate(0.0),
-
-    // PID Controller Initialization
-    headingctrl(1.0, 0.08, 0.5, headingRateLimit,
-                                  -headingRateLimit, 0.1, 0.1),
-    wheelspeedctrl(1.0, 0.082, 0.5, wheelSpeedLimit,
-                                      -wheelSpeedLimit, 0.1, 0.1)
-{ }
-
-void DifferentialDriveController::stop() {
-    rightMotorController.setCommandedSpeed(0.0);
-    leftMotorController.setCommandedSpeed(0.0);
+				DifferentialDriveController	(	double	DistanceBetweenWheels,
+																																		double	WheelRadius,
+																																		double	WheelSpeedLimit,
+																																		double	HeadingRateLimit,
+																																		double	SlowDownDistance,
+																																		MotorSpeedController&	RightMotorController,
+																																		MotorSpeedController&	LeftMotorController
+																																):
+				distanceBetweenWheels(DistanceBetweenWheels),
+				wheelRadius(WheelRadius),
+				wheelSpeedLimit(WheelSpeedLimit),
+				headingRateLimit(HeadingRateLimit),
+				slowDownDistance(SlowDownDistance),
+				rightMotorController(RightMotorController),
+				leftMotorController(LeftMotorController),
+
+				rightMotorSpeedCommand(0.0),
+				leftMotorSpeedCommand(0.0),
+				desiredHeadingRate(0.0),
+
+				//	PID	Controller	Initialization
+				headingctrl(1.0,	0.08,	0.5,	headingRateLimit,
+																																		-headingRateLimit,	0.1,	0.1),
+				wheelspeedctrl(1.0,	0.082,	0.5,	wheelSpeedLimit,
+																																						-wheelSpeedLimit,	0.1,	0.1)
+{	}
+
+void	DifferentialDriveController::stop()	{
+				rightMotorController.setCommandedSpeed(0.0);
+				leftMotorController.setCommandedSpeed(0.0);
 }
 
-int DifferentialDriveController::update( double distance_err,  // m
-                                         double heading_err) { // rad (-PI..+PI)
+int	DifferentialDriveController::update(	double	distance_err,		//	m
+																																									double	heading_err)	{	//	rad	(-PI..+PI)
 
-    rightMotorSpeedCommand = 0.0;
-    leftMotorSpeedCommand  = 0.0;
+				rightMotorSpeedCommand	=	0.0;
+				leftMotorSpeedCommand		=	0.0;
 
-    // If the vehicle heading is within 2 degrees of the target, then the
-    // heading desired heading rate is proportional to the heading error.
-    if ( cos(heading_err) > cos(2.0 * (PI/180.0))) {
-        // PID Controller output for heading
-        desiredHeadingRate = headingctrl.getOutput(headingRateLimit, heading_err);
-    } else {
-        if (heading_err > 0.0) {
-            desiredHeadingRate =  headingRateLimit;
-        } else {
-            desiredHeadingRate =  -headingRateLimit;
-        }
-    }
+				//	If	the	vehicle	heading	is	within	2	degrees	of	the	target,	then	the
+				//	heading	desired	heading	rate	is	proportional	to	the	heading	error.
+				if	(	cos(heading_err)	>	cos(2.0	*	(PI/180.0)))	{
+								//	PID	Controller	output	for	heading
+								desiredHeadingRate	=	headingctrl.getOutput(headingRateLimit,	heading_err);
+				}	else	{
+								if	(heading_err	>	0.0)	{
+												desiredHeadingRate	=		headingRateLimit;
+								}	else	{
+												desiredHeadingRate	=		-headingRateLimit;
+								}
+				}
 
-    double wheelSpeedForHeadingRate = (desiredHeadingRate * distanceBetweenWheels) / (2.0 * wheelRadius);
+				double	wheelSpeedForHeadingRate	=	(desiredHeadingRate	*	distanceBetweenWheels)	/	(2.0	*	wheelRadius);
 
-    double availableWheelSpeedForRangeRate = wheelSpeedLimit - fabs(wheelSpeedForHeadingRate);
+				double	availableWheelSpeedForRangeRate	=	wheelSpeedLimit	-	fabs(wheelSpeedForHeadingRate);
 
-    double wheelSpeedForRangeRate;
+				double	wheelSpeedForRangeRate;
 
-    if (distance_err > slowDownDistance ) {
-        wheelSpeedForRangeRate = availableWheelSpeedForRangeRate;
-    } else {
-        // PID Controller output for wheelspeed
-        wheelSpeedForRangeRate = wheelspeedctrl.getOutput(availableWheelSpeedForRangeRate, distance_err);
-    }
+				if	(distance_err	>	slowDownDistance	)	{
+								wheelSpeedForRangeRate	=	availableWheelSpeedForRangeRate;
+				}	else	{
+								//	PID	Controller	output	for	wheelspeed
+								wheelSpeedForRangeRate	=	wheelspeedctrl.getOutput(availableWheelSpeedForRangeRate,	distance_err);
+				}
 
-    desiredRangeRate = wheelSpeedForRangeRate * wheelRadius;
+				desiredRangeRate	=	wheelSpeedForRangeRate	*	wheelRadius;
 
-    double desiredRightWheelSpeed =  wheelSpeedForRangeRate + wheelSpeedForHeadingRate;
-    double desiredLeftWheelSpeed  =  wheelSpeedForRangeRate - wheelSpeedForHeadingRate;
+				double	desiredRightWheelSpeed	=		wheelSpeedForRangeRate	+	wheelSpeedForHeadingRate;
+				double	desiredLeftWheelSpeed		=		wheelSpeedForRangeRate	-	wheelSpeedForHeadingRate;
 
-    rightMotorSpeedCommand = -desiredRightWheelSpeed;
-    leftMotorSpeedCommand  =  desiredLeftWheelSpeed;
+				rightMotorSpeedCommand	=	-desiredRightWheelSpeed;
+				leftMotorSpeedCommand		=		desiredLeftWheelSpeed;
 
-    rightMotorController.setCommandedSpeed( rightMotorSpeedCommand);
-    leftMotorController.setCommandedSpeed( leftMotorSpeedCommand);
+				rightMotorController.setCommandedSpeed(	rightMotorSpeedCommand);
+				leftMotorController.setCommandedSpeed(	leftMotorSpeedCommand);
 
-    return 0;
+				return	0;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Control/src/vehicleController.cpp b/trick_sims/SIM_wheelbot/models/Control/src/vehicleController.cpp
index 189cb5735..2c55e50b9 100644
--- a/trick_sims/SIM_wheelbot/models/Control/src/vehicleController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Control/src/vehicleController.cpp
@@ -1,79 +1,79 @@
-#include "Control/include/vehicleController.hh"
-#include <iostream>
+#include	"Control/include/vehicleController.hh"
+#include	<iostream>
 
-VehicleController::VehicleController( std::vector<Point>* wayPoints,
-                                      Navigator& theNavigator,
-                                      DifferentialDriveController& theDriveController,
-                                      double arrival_distance):
-   navigator(theNavigator),
-   driveController(theDriveController) {
+VehicleController::VehicleController(	std::vector<Point>*	wayPoints,
+																																						Navigator&	theNavigator,
+																																						DifferentialDriveController&	theDriveController,
+																																						double	arrival_distance):
+			navigator(theNavigator),
+			driveController(theDriveController)	{
 
-    // Enforce minimum arrival distance.
-    if (arrival_distance > 0.01) {
-        arrivalDistance = arrival_distance;
-    } else {
-        arrivalDistance = 0.01;
-    }
-    waypointQueue = wayPoints;
-    destination = waypointQueue->begin();
-    printDestination();
+				//	Enforce	minimum	arrival	distance.
+				if	(arrival_distance	>	0.01)	{
+								arrivalDistance	=	arrival_distance;
+				}	else	{
+								arrivalDistance	=	0.01;
+				}
+				waypointQueue	=	wayPoints;
+				destination	=	waypointQueue->begin();
+				printDestination();
 
-    // Initialize homing variables
-    endofWaypoints = false;
-    homeCommanded = false;
+				//	Initialize	homing	variables
+				endofWaypoints	=	false;
+				homeCommanded	=	false;
 }
 
-void VehicleController::setWayPointQueue( std::vector<Point>* wayPoints ) {
-    waypointQueue = wayPoints;
-    destination = waypointQueue->begin();
-    printDestination();
+void	VehicleController::setWayPointQueue(	std::vector<Point>*	wayPoints	)	{
+				waypointQueue	=	wayPoints;
+				destination	=	waypointQueue->begin();
+				printDestination();
 }
 
-int VehicleController::getCurrentDestination(Point& currentDestination) {
-    if (destination != waypointQueue->end()) {
-        currentDestination = *destination;
-        return 0;
-    }
-    return 1;
+int	VehicleController::getCurrentDestination(Point&	currentDestination)	{
+				if	(destination	!=	waypointQueue->end())	{
+								currentDestination	=	*destination;
+								return	0;
+				}
+				return	1;
 }
 
-// Commands wheelbot to navigate to home
-void VehicleController::gohome() {
-    destination = waypointQueue->end()-1;
-    homeCommanded = true;
+//	Commands	wheelbot	to	navigate	to	home
+void	VehicleController::gohome()	{
+				destination	=	waypointQueue->end()-1;
+				homeCommanded	=	true;
 }
 
-void VehicleController::printDestination() {
-    if (destination != waypointQueue->end()) {
-        std::cout << "Destination = (" << destination->x << "," << destination->y << ")." << std::endl;
-    } else {
-        std::cout << "No Destination." << std::endl;
-    }
+void	VehicleController::printDestination()	{
+				if	(destination	!=	waypointQueue->end())	{
+								std::cout	<<	"Destination	=	("	<<	destination->x	<<	","	<<	destination->y	<<	")."	<<	std::endl;
+				}	else	{
+								std::cout	<<	"No	Destination."	<<	std::endl;
+				}
 }
 
-// Returns the value of the variable endofWaypoints
-bool VehicleController::getStatus() {
-    return endofWaypoints;
+//	Returns	the	value	of	the	variable	endofWaypoints
+bool	VehicleController::getStatus()	{
+				return	endofWaypoints;
 }
 
-void VehicleController::update() {
+void	VehicleController::update()	{
 
-  if (destination == waypointQueue->end() && endofWaypoints == false) {
-      if (homeCommanded == false) {
-          driveController.update(0.0, 0.0);
-      }
-      endofWaypoints = true;
-  } else {
-      double distance_err = navigator.distanceTo(*destination);
-      if ( distance_err > arrivalDistance) {
-          double heading_err = navigator.bearingTo(*destination);
-          driveController.update(distance_err, heading_err);
-      } else {
-          if (endofWaypoints != true) {
-            std::cout << "Arrived at Destination." << std::endl;
-            destination ++;
-            printDestination();
-          }
-      }
-  }
+		if	(destination	==	waypointQueue->end()	&&	endofWaypoints	==	false)	{
+						if	(homeCommanded	==	false)	{
+										driveController.update(0.0,	0.0);
+						}
+						endofWaypoints	=	true;
+		}	else	{
+						double	distance_err	=	navigator.distanceTo(*destination);
+						if	(	distance_err	>	arrivalDistance)	{
+										double	heading_err	=	navigator.bearingTo(*destination);
+										driveController.update(distance_err,	heading_err);
+						}	else	{
+										if	(endofWaypoints	!=	true)	{
+												std::cout	<<	"Arrived	at	Destination."	<<	std::endl;
+												destination	++;
+												printDestination();
+										}
+						}
+		}
 }
diff --git a/trick_sims/SIM_wheelbot/models/Control/test/DifferentialDriveControllerTest.cpp b/trick_sims/SIM_wheelbot/models/Control/test/DifferentialDriveControllerTest.cpp
index 7c9e2fc2e..a14f5f5cd 100644
--- a/trick_sims/SIM_wheelbot/models/Control/test/DifferentialDriveControllerTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Control/test/DifferentialDriveControllerTest.cpp
@@ -1,172 +1,172 @@
-#include <gtest/gtest.h>
-#define private public
-#include "Control/include/testMotorController.hh"
-#include "Control/include/differentialDriveController.hh"
-#include <algorithm>
-
-#ifndef PI
-#define PI 3.1415926535
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"Control/include/testMotorController.hh"
+#include	"Control/include/differentialDriveController.hh"
+#include	<algorithm>
+
+#ifndef	PI
+#define	PI	3.1415926535
 #endif
-#define FLOAT_TOLERANCE 0.000001
+#define	FLOAT_TOLERANCE	0.000001
 
 /*
-    Test Fixture.
+				Test	Fixture.
 */
-class differentialDriveControllerTest : public ::testing::Test {
-    protected:
-
-    TestMotorController* rightMotorController;
-    TestMotorController* leftMotorController;
-    DifferentialDriveController* driveController;
-
-    differentialDriveControllerTest() {
-    rightMotorController =
-        new TestMotorController();
-    leftMotorController =
-        new TestMotorController();
-    driveController =
-        new DifferentialDriveController(0.183, 0.045, 8.880, 0.200,
-                *rightMotorController, *leftMotorController);
-    }
-
-    ~differentialDriveControllerTest() {
-        delete driveController;
-        delete rightMotorController;
-        delete leftMotorController;
-    }
+class	differentialDriveControllerTest	:	public	::testing::Test	{
+				protected:
+
+				TestMotorController*	rightMotorController;
+				TestMotorController*	leftMotorController;
+				DifferentialDriveController*	driveController;
+
+				differentialDriveControllerTest()	{
+				rightMotorController	=
+								new	TestMotorController();
+				leftMotorController	=
+								new	TestMotorController();
+				driveController	=
+								new	DifferentialDriveController(0.183,	0.045,	8.880,	0.200,
+																*rightMotorController,	*leftMotorController);
+				}
+
+				~differentialDriveControllerTest()	{
+								delete	driveController;
+								delete	rightMotorController;
+								delete	leftMotorController;
+				}
 };
 
-TEST_F( differentialDriveControllerTest , constructor) {
+TEST_F(	differentialDriveControllerTest	,	constructor)	{
 
-    EXPECT_NEAR(0.045, driveController->wheelRadius, FLOAT_TOLERANCE);
-    EXPECT_NEAR(0.183, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
-    EXPECT_NEAR(8.880, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
-    EXPECT_NEAR(0.200, driveController->slowDownDistance, FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.045,	driveController->wheelRadius,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.183,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(8.880,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.200,	driveController->slowDownDistance,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setDistanceBetweenWheels ) {
+TEST_F(	differentialDriveControllerTest	,	setDistanceBetweenWheels	)	{
 
-    int result;
+				int	result;
 
-    result = driveController->setDistanceBetweenWheels(0.1);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.1, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(0.1);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.1,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 
-    result = driveController->setDistanceBetweenWheels(0.2);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.2, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(0.2);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.2,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 
-    result = driveController->setDistanceBetweenWheels(-0.3);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(0.2, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(-0.3);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(0.2,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setWheelRadius ) {
+TEST_F(	differentialDriveControllerTest	,	setWheelRadius	)	{
 
-    int result;
-    result = driveController->setWheelRadius(0.059);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.059, driveController->wheelRadius, FLOAT_TOLERANCE);
+				int	result;
+				result	=	driveController->setWheelRadius(0.059);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.059,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRadius(0.083);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.083, driveController->wheelRadius, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRadius(0.083);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.083,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRadius(-0.075);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(0.083, driveController->wheelRadius, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRadius(-0.075);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(0.083,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setWheelRotationRateLimit ) {
+TEST_F(	differentialDriveControllerTest	,	setWheelRotationRateLimit	)	{
 
-    int result;
-    result = driveController->setWheelRotationRateLimit(7.123);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(7.123, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				int	result;
+				result	=	driveController->setWheelRotationRateLimit(7.123);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(7.123,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRotationRateLimit(5.234);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(5.234, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRotationRateLimit(5.234);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(5.234,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRotationRateLimit(-4.987);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(5.234, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRotationRateLimit(-4.987);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(5.234,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , PositiveRangeErrorOnly) {
+TEST_F(	differentialDriveControllerTest	,	PositiveRangeErrorOnly)	{
 
-    // If there is no heading error, and the distance error is non-zero,
-    // then the speeds should be the same, and equal to the wheelRotationRateLimit.
+				//	If	there	is	no	heading	error,	and	the	distance	error	is	non-zero,
+				//	then	the	speeds	should	be	the	same,	and	equal	to	the	wheelRotationRateLimit.
 
-    double distance_err = 1.0;
-    double heading_err  = 0.0;
-    driveController->update(distance_err, heading_err);
+				double	distance_err	=	1.0;
+				double	heading_err		=	0.0;
+				driveController->update(distance_err,	heading_err);
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    // the speeds should be the same
-    EXPECT_NEAR(rightMotorSpeedCommand, leftMotorSpeedCommand, FLOAT_TOLERANCE);
-    // and equal to the setWheelRotationRateLimit.
-    EXPECT_NEAR(rightMotorSpeedCommand, 8.880, FLOAT_TOLERANCE);
+				//	the	speeds	should	be	the	same
+				EXPECT_NEAR(rightMotorSpeedCommand,	leftMotorSpeedCommand,	FLOAT_TOLERANCE);
+				//	and	equal	to	the	setWheelRotationRateLimit.
+				EXPECT_NEAR(rightMotorSpeedCommand,	8.880,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , positiveHeadingError ) {
+TEST_F(	differentialDriveControllerTest	,	positiveHeadingError	)	{
 
-    // If the heading error is positive, then we should turn to the right,
-    // meaning that the left wheel should move faster than the right wheel.
+				//	If	the	heading	error	is	positive,	then	we	should	turn	to	the	right,
+				//	meaning	that	the	left	wheel	should	move	faster	than	the	right	wheel.
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
 
-    driveController->update(0.0, 0.1*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	0.1*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 30*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	30*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(100.0, 60*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(100.0,	60*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 89*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	89*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 90*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	90*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 91*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	91*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(100.0, 120*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(100.0,	120*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 150*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	150*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 179*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	179*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 }
 
-TEST_F( differentialDriveControllerTest, negativeHeadingError ) {
+TEST_F(	differentialDriveControllerTest,	negativeHeadingError	)	{
 
-    // If the heading error is negative, then we should turn to the left,
-    // meaning that the right wheel should move faster than the left wheel.
+				//	If	the	heading	error	is	negative,	then	we	should	turn	to	the	left,
+				//	meaning	that	the	right	wheel	should	move	faster	than	the	left	wheel.
 
-    double distance_err = 0.0;
-    double heading_err  = -30*(PI/180.0);
-    driveController->update(distance_err, heading_err);
+				double	distance_err	=	0.0;
+				double	heading_err		=	-30*(PI/180.0);
+				driveController->update(distance_err,	heading_err);
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(rightMotorSpeedCommand, leftMotorSpeedCommand);
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(rightMotorSpeedCommand,	leftMotorSpeedCommand);
 }
 
 
diff --git a/trick_sims/SIM_wheelbot/models/Control/test/VehicleControllerTest.cpp b/trick_sims/SIM_wheelbot/models/Control/test/VehicleControllerTest.cpp
index bfd57b03e..5bfc699a3 100644
--- a/trick_sims/SIM_wheelbot/models/Control/test/VehicleControllerTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Control/test/VehicleControllerTest.cpp
@@ -1,58 +1,58 @@
-#include <gtest/gtest.h>
-#define private public
-#include "Control/include/testMotorController.hh"
-#include "Control/include/vehicleController.hh"
-#include <algorithm>
-
-#ifndef PI
-#define PI 3.1415926535
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"Control/include/testMotorController.hh"
+#include	"Control/include/vehicleController.hh"
+#include	<algorithm>
+
+#ifndef	PI
+#define	PI	3.1415926535
 #endif
-#define FLOAT_TOLERANCE 0.000001
+#define	FLOAT_TOLERANCE	0.000001
 
 /*
-Test Fixture.
+Test	Fixture.
 */
-class vehicleControllerTest : public ::testing::Test {
-    protected:
-    std::vector<Point> waypointQueue;
-    Navigator *navigator;
-    TestMotorController* rightMotorController;
-    TestMotorController* leftMotorController;
-    DifferentialDriveController* driveController;
-    VehicleController* vehicleController;
-
-    vehicleControllerTest() {
-
-        Point waypoint(1.0, 3.0);
-        waypointQueue.push_back( waypoint);
-
-        Point initLocation(0.0, 0.0);
-        rightMotorController = new TestMotorController();
-        leftMotorController  = new TestMotorController();
-        driveController = new DifferentialDriveController(0.183, 0.045, 8.880, 0.200,
-                                                          *rightMotorController,
-                                                          *leftMotorController);
-        navigator = new Navigator(0.0, initLocation);
-        vehicleController = new VehicleController( &waypointQueue, *navigator, *driveController, 0.02);
-
-    }
-
-    ~vehicleControllerTest() {
-        delete navigator;
-        delete driveController;
-    }
-
-    void SetUp() {}
-    void TearDown() {}
+class	vehicleControllerTest	:	public	::testing::Test	{
+				protected:
+				std::vector<Point>	waypointQueue;
+				Navigator	*navigator;
+				TestMotorController*	rightMotorController;
+				TestMotorController*	leftMotorController;
+				DifferentialDriveController*	driveController;
+				VehicleController*	vehicleController;
+
+				vehicleControllerTest()	{
+
+								Point	waypoint(1.0,	3.0);
+								waypointQueue.push_back(	waypoint);
+
+								Point	initLocation(0.0,	0.0);
+								rightMotorController	=	new	TestMotorController();
+								leftMotorController		=	new	TestMotorController();
+								driveController	=	new	DifferentialDriveController(0.183,	0.045,	8.880,	0.200,
+																																																										*rightMotorController,
+																																																										*leftMotorController);
+								navigator	=	new	Navigator(0.0,	initLocation);
+								vehicleController	=	new	VehicleController(	&waypointQueue,	*navigator,	*driveController,	0.02);
+
+				}
+
+				~vehicleControllerTest()	{
+								delete	navigator;
+								delete	driveController;
+				}
+
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
 
-TEST_F( vehicleControllerTest , one ) {
+TEST_F(	vehicleControllerTest	,	one	)	{
 
-    Point current_destination;
-    int result = vehicleController->getCurrentDestination(current_destination);
-    EXPECT_EQ(result, 0);
-    EXPECT_EQ(current_destination.x, 1);
-    EXPECT_EQ(current_destination.y, 3);
+				Point	current_destination;
+				int	result	=	vehicleController->getCurrentDestination(current_destination);
+				EXPECT_EQ(result,	0);
+				EXPECT_EQ(current_destination.x,	1);
+				EXPECT_EQ(current_destination.y,	3);
 }
 
diff --git a/trick_sims/SIM_wheelbot/models/Electrical/src/ElectricalCircuit.cpp b/trick_sims/SIM_wheelbot/models/Electrical/src/ElectricalCircuit.cpp
index a3b5e5c36..be39675a5 100644
--- a/trick_sims/SIM_wheelbot/models/Electrical/src/ElectricalCircuit.cpp
+++ b/trick_sims/SIM_wheelbot/models/Electrical/src/ElectricalCircuit.cpp
@@ -1,23 +1,23 @@
-#include "ElectricalCircuit.hh"
-#include <iostream>
-#include "../../Motor/include/DCMotor.hh"
-#include "../../Battery/include/DCBattery.hh"
+#include	"ElectricalCircuit.hh"
+#include	<iostream>
+#include	"../../Motor/include/DCMotor.hh"
+#include	"../../Battery/include/DCBattery.hh"
 
-ElectricalCircuit::ElectricalCircuit ()
-: motorsCurrent(0), motor1(0), motor2(0), battery(0) {
+ElectricalCircuit::ElectricalCircuit	()
+:	motorsCurrent(0),	motor1(0),	motor2(0),	battery(0)	{
 
 }
 
-void ElectricalCircuit :: init (DCMotor* motorOne, DCMotor* motorTwo, DCBattery* battery1)
+void	ElectricalCircuit	::	init	(DCMotor*	motorOne,	DCMotor*	motorTwo,	DCBattery*	battery1)
 {
-    motor1 = motorOne;
-    motor2 = motorTwo;
-    battery = battery1;
+				motor1	=	motorOne;
+				motor2	=	motorTwo;
+				battery	=	battery1;
 }
 
-void ElectricalCircuit :: update ()
+void	ElectricalCircuit	::	update	()
 {
-    motorsCurrent = motor1 -> getCurrentLoad() + motor2 -> getCurrentLoad();
-    battery->setCurrent(motorsCurrent);
+				motorsCurrent	=	motor1	->	getCurrentLoad()	+	motor2	->	getCurrentLoad();
+				battery->setCurrent(motorsCurrent);
 
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/src/arena.cpp b/trick_sims/SIM_wheelbot/models/Guidance/src/arena.cpp
index d92e6b098..3e3efc289 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/src/arena.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/src/arena.cpp
@@ -1,201 +1,201 @@
-#include "arena.hh"
-#include <math.h>      // sqrt()
-#include <stdlib.h>    // abs()
-#include <iostream>
-
-Arena::Arena(unsigned int width, unsigned int height)
-    : height(height), width(width) {
-
-    unsigned int area = height * width;
-    grid = new GridSquare[area];
-    for (int i=0; i < area; i++) {
-        grid[i].isBlocked = false;
-        grid[i].mark = ' ' ;
-    }
+#include	"arena.hh"
+#include	<math.h>						//	sqrt()
+#include	<stdlib.h>				//	abs()
+#include	<iostream>
+
+Arena::Arena(unsigned	int	width,	unsigned	int	height)
+				:	height(height),	width(width)	{
+
+				unsigned	int	area	=	height	*	width;
+				grid	=	new	GridSquare[area];
+				for	(int	i=0;	i	<	area;	i++)	{
+								grid[i].isBlocked	=	false;
+								grid[i].mark	=	'	'	;
+				}
 }
 
-Arena::Arena(unsigned int width, unsigned int height, unsigned char bits[])
-      : height(height), width(width) {
-
-   unsigned int area = height * width;
-   grid = new GridSquare[area];
-
-   unsigned int cx =0;
-   for (int row=0; row<height; row++) {
-       unsigned char octet = bits[cx];
-       unsigned int bx=0;
-       while ( bx < width ) {
-           unsigned int ii = row*width+bx;
-           if ((bx != 0) && ((bx % 8)==0)) {
-               cx ++;
-               octet=bits[cx];
-           }
-           grid[ii].isBlocked = (0x01 & octet);
-           octet = octet >> 1;
-           grid[ii].mark = ' ' ;
-           bx++;
-       }
-       cx ++;
-       octet=bits[cx];
-   }
+Arena::Arena(unsigned	int	width,	unsigned	int	height,	unsigned	char	bits[])
+						:	height(height),	width(width)	{
+
+			unsigned	int	area	=	height	*	width;
+			grid	=	new	GridSquare[area];
+
+			unsigned	int	cx	=0;
+			for	(int	row=0;	row<height;	row++)	{
+							unsigned	char	octet	=	bits[cx];
+							unsigned	int	bx=0;
+							while	(	bx	<	width	)	{
+											unsigned	int	ii	=	row*width+bx;
+											if	((bx	!=	0)	&&	((bx	%	8)==0))	{
+															cx	++;
+															octet=bits[cx];
+											}
+											grid[ii].isBlocked	=	(0x01	&	octet);
+											octet	=	octet	>>	1;
+											grid[ii].mark	=	'	'	;
+											bx++;
+							}
+							cx	++;
+							octet=bits[cx];
+			}
 }
 
-Arena::~Arena() {
-    delete grid;
+Arena::~Arena()	{
+				delete	grid;
 }
 
 //straightDistance
-int Arena::distanceBetween( GridSquare* orig, GridSquare* dest, int& distance ) {
-    Point origPt;
-    Point destPt;
-    if ((( getGridSquareCoordinates(orig, origPt) ) == 0) &&
-        (( getGridSquareCoordinates(dest, destPt) ) == 0)) {
-        distance = 10 * sqrt((destPt.x - origPt.x) * (destPt.x - origPt.x) +
-                             (destPt.y - origPt.y) * (destPt.y - origPt.y));
-        return 0;
-    }
-    std::cerr << "Arena::distanceBetween: bad pointer parameter(s)." << std::endl;
-    return 1;
+int	Arena::distanceBetween(	GridSquare*	orig,	GridSquare*	dest,	int&	distance	)	{
+				Point	origPt;
+				Point	destPt;
+				if	(((	getGridSquareCoordinates(orig,	origPt)	)	==	0)	&&
+								((	getGridSquareCoordinates(dest,	destPt)	)	==	0))	{
+								distance	=	10	*	sqrt((destPt.x	-	origPt.x)	*	(destPt.x	-	origPt.x)	+
+																													(destPt.y	-	origPt.y)	*	(destPt.y	-	origPt.y));
+								return	0;
+				}
+				std::cerr	<<	"Arena::distanceBetween:	bad	pointer	parameter(s)."	<<	std::endl;
+				return	1;
 }
 
 //manhattenDistance
-int Arena::movementCostEstimate( GridSquare* orig, GridSquare* dest, int& costEstimate ) {
-    Point origPt;
-    Point destPt;
-    if ((( getGridSquareCoordinates(orig, origPt) ) == 0) &&
-        (( getGridSquareCoordinates(dest, destPt) ) == 0)) {
-        costEstimate = 10 * (abs(destPt.x - origPt.x) + abs(destPt.y - origPt.y));
-        return 0;
-    }
-    std::cerr << "Arena::movementCostEstimate: bad pointer parameter(s)." << std::endl;
-    return 1;
+int	Arena::movementCostEstimate(	GridSquare*	orig,	GridSquare*	dest,	int&	costEstimate	)	{
+				Point	origPt;
+				Point	destPt;
+				if	(((	getGridSquareCoordinates(orig,	origPt)	)	==	0)	&&
+								((	getGridSquareCoordinates(dest,	destPt)	)	==	0))	{
+								costEstimate	=	10	*	(abs(destPt.x	-	origPt.x)	+	abs(destPt.y	-	origPt.y));
+								return	0;
+				}
+				std::cerr	<<	"Arena::movementCostEstimate:	bad	pointer	parameter(s)."	<<	std::endl;
+				return	1;
 }
 
-void Arena::block(unsigned int x, unsigned int y) {
-    GridSquare* gridSquare;
-    if ( (gridSquare = getGridSquare(x, y)) != (GridSquare*)0) {
-        gridSquare->isBlocked = true;
-    }
+void	Arena::block(unsigned	int	x,	unsigned	int	y)	{
+				GridSquare*	gridSquare;
+				if	(	(gridSquare	=	getGridSquare(x,	y))	!=	(GridSquare*)0)	{
+								gridSquare->isBlocked	=	true;
+				}
 }
 
-void Arena::unblock(unsigned int x, unsigned int y) {
-    GridSquare* gridSquare;
-    if ( (gridSquare = getGridSquare(x, y)) != (GridSquare*)0) {
-        gridSquare->isBlocked = false;
-    }
+void	Arena::unblock(unsigned	int	x,	unsigned	int	y)	{
+				GridSquare*	gridSquare;
+				if	(	(gridSquare	=	getGridSquare(x,	y))	!=	(GridSquare*)0)	{
+								gridSquare->isBlocked	=	false;
+				}
 }
 
-void Arena::mark(unsigned int x, unsigned int y, char c) {
-    GridSquare* gridSquare;
-    if ( (gridSquare = getGridSquare(x, y)) != (GridSquare*)0) {
-        gridSquare->mark = c;
-    }
+void	Arena::mark(unsigned	int	x,	unsigned	int	y,	char	c)	{
+				GridSquare*	gridSquare;
+				if	(	(gridSquare	=	getGridSquare(x,	y))	!=	(GridSquare*)0)	{
+								gridSquare->mark	=	c;
+				}
 }
 
-int Arena::calcOffset(unsigned int x, unsigned int y, size_t& offset) {
-    if ((x < width) && (y < height)) {
-        offset = x+width*y;
-        return 0;
-    }
-    return 1;
+int	Arena::calcOffset(unsigned	int	x,	unsigned	int	y,	size_t&	offset)	{
+				if	((x	<	width)	&&	(y	<	height))	{
+								offset	=	x+width*y;
+								return	0;
+				}
+				return	1;
 }
 
-int Arena::calcOffset(GridSquare* gridSquare, size_t& offset) {
+int	Arena::calcOffset(GridSquare*	gridSquare,	size_t&	offset)	{
 
-    if (gridSquare >= grid) {
-        size_t toffset = (gridSquare - grid);
-        if (toffset < (width * height)) {
-            offset = toffset;
-            return 0;
-        }
-    }
-    return 1;
+				if	(gridSquare	>=	grid)	{
+								size_t	toffset	=	(gridSquare	-	grid);
+								if	(toffset	<	(width	*	height))	{
+												offset	=	toffset;
+												return	0;
+								}
+				}
+				return	1;
 }
 
-GridSquare* Arena::getGridSquare(unsigned int x, unsigned int y) {
-    size_t offset;
-    if ( calcOffset(x,y,offset) == 0 ) {
-        return ( grid + offset );
-    }
-    return ((GridSquare*)0);
+GridSquare*	Arena::getGridSquare(unsigned	int	x,	unsigned	int	y)	{
+				size_t	offset;
+				if	(	calcOffset(x,y,offset)	==	0	)	{
+								return	(	grid	+	offset	);
+				}
+				return	((GridSquare*)0);
 }
 
-int Arena::getGridSquareCoordinates( GridSquare* gridSquarePointer, Point& coords ) {
-    size_t offset;
-    if ( calcOffset( gridSquarePointer, offset) == 0) {
-        coords.x = offset % width;
-        coords.y = offset / width;
-        return 0;
-    } else {
-        std::cerr << "Arena::getGridSquareCoordinates: problem." << std::endl;
-        return 1;
-    }
+int	Arena::getGridSquareCoordinates(	GridSquare*	gridSquarePointer,	Point&	coords	)	{
+				size_t	offset;
+				if	(	calcOffset(	gridSquarePointer,	offset)	==	0)	{
+								coords.x	=	offset	%	width;
+								coords.y	=	offset	/	width;
+								return	0;
+				}	else	{
+								std::cerr	<<	"Arena::getGridSquareCoordinates:	problem."	<<	std::endl;
+								return	1;
+				}
 }
 
-std::vector<GridSquare*> Arena::getNeighbors( GridSquare* gridSquarePointer ) {
-
-    std::vector<GridSquare*> neighbors;
-    GridSquare* neighbor;
-    Point loc;
-
-    if ( getGridSquareCoordinates( gridSquarePointer, loc ) == 0) {
-
-#ifdef DIAGONAL_NEIGHBORS
-        if ((neighbor=getGridSquare(loc.x+1, loc.y+1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x+1, loc.y-1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x-1, loc.y-1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x-1, loc.y+1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
+std::vector<GridSquare*>	Arena::getNeighbors(	GridSquare*	gridSquarePointer	)	{
+
+				std::vector<GridSquare*>	neighbors;
+				GridSquare*	neighbor;
+				Point	loc;
+
+				if	(	getGridSquareCoordinates(	gridSquarePointer,	loc	)	==	0)	{
+
+#ifdef	DIAGONAL_NEIGHBORS
+								if	((neighbor=getGridSquare(loc.x+1,	loc.y+1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x+1,	loc.y-1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x-1,	loc.y-1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x-1,	loc.y+1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
 #endif
-        if ((neighbor=getGridSquare(loc.x, loc.y+1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x, loc.y-1)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x-1, loc.y)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-        if ((neighbor=getGridSquare(loc.x+1, loc.y)) != (GridSquare*)0) {
-            if (!neighbor->isBlocked)
-                neighbors.push_back(neighbor);
-        }
-
-    } else {
-        std::cerr << "Arena::getNeighbors: invalid gridSquarePointer.";
-    }
-    return neighbors;
+								if	((neighbor=getGridSquare(loc.x,	loc.y+1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x,	loc.y-1))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x-1,	loc.y))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+								if	((neighbor=getGridSquare(loc.x+1,	loc.y))	!=	(GridSquare*)0)	{
+												if	(!neighbor->isBlocked)
+																neighbors.push_back(neighbor);
+								}
+
+				}	else	{
+								std::cerr	<<	"Arena::getNeighbors:	invalid	gridSquarePointer.";
+				}
+				return	neighbors;
 }
 
-std::ostream& operator<< (std::ostream& s, const Arena& arena) {
-    s << "Arena height=" << arena.height << " width=" << arena.width << std::endl;
-
-    for (int y=0; y < arena.height; y++) {
-        s << "|";
-        for (int x=0; x < arena.width; x++) {
-            if ( arena.grid[x + arena.width * y].isBlocked ) {
-                s << "\x1b[41m" << arena.grid[x + arena.width * y].mark << "\x1b[47m" ;
-            } else {
-                s << arena.grid[x + arena.width * y].mark ;
-            }
-            s << "|" ;
-        }
-        s << std::endl;
-    }
-
-    return s;
+std::ostream&	operator<<	(std::ostream&	s,	const	Arena&	arena)	{
+				s	<<	"Arena	height="	<<	arena.height	<<	"	width="	<<	arena.width	<<	std::endl;
+
+				for	(int	y=0;	y	<	arena.height;	y++)	{
+								s	<<	"|";
+								for	(int	x=0;	x	<	arena.width;	x++)	{
+												if	(	arena.grid[x	+	arena.width	*	y].isBlocked	)	{
+																s	<<	"\x1b[41m"	<<	arena.grid[x	+	arena.width	*	y].mark	<<	"\x1b[47m"	;
+												}	else	{
+																s	<<	arena.grid[x	+	arena.width	*	y].mark	;
+												}
+												s	<<	"|"	;
+								}
+								s	<<	std::endl;
+				}
+
+				return	s;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/src/findpath.cpp b/trick_sims/SIM_wheelbot/models/Guidance/src/findpath.cpp
index eda33e245..5a87511c2 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/src/findpath.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/src/findpath.cpp
@@ -1,110 +1,110 @@
-#include <stdlib.h>
-#include <vector>    // std::vector
-#include <algorithm> // std::find
-#include "findpath.hh"
-
-std::vector<Point> FindPath( GridSquare* origin, GridSquare* goal, Arena* arena) {
-
-    std::vector<GridSquare*> openSet;
-    std::vector<GridSquare*> closedSet;
-    std::vector<Point> failure;
-
-    int estimated_cost_to_goal; // h(n)
-
-    if (arena == (Arena*)0) {
-        return failure;
-    }
-    Point origPt, goalPt;
-    if (arena->getGridSquareCoordinates(origin, origPt) != 0) {
-        std::cerr << "FindPath: Bad Origin.";
-        return failure;
-    }
-    if (arena->getGridSquareCoordinates(goal, goalPt) != 0) {
-        std::cerr << "FindPath: Bad Goal.";
-        return failure;
-    }
-
-    origin->parent = (GridSquare*)0;
-    origin->g_score = 0;
-
-    arena->movementCostEstimate(origin, goal, estimated_cost_to_goal);
-    origin->f_score = estimated_cost_to_goal;
-
-    openSet.push_back(origin);
-
-    while ( !openSet.empty() ) {
-
-        // Get the item in the openSet that has the lowest f_score.
-        std::vector<GridSquare*>::iterator curr, best;
-        for (best=curr=openSet.begin(); curr != openSet.end(); ++curr) {
-             if ( (*curr)->f_score < (*best)->f_score ) {
-                 best = curr;
-             }
-        }
-
-        // Get and remove the best from the open set. This is current.
-        GridSquare* current = *best;
-        openSet.erase(best);
-
-        // if the current position is the goal then backtrack, build
-        // and return the path to get here.
-        if (current == goal) {
-            std::vector<Point> path;
-            while (current != (GridSquare*)0) {
-                Point coordinates;
-                if ( arena->getGridSquareCoordinates( current, coordinates ) == 0) {
-                    path.insert( path.begin(), coordinates);
-                }
-                current = current->parent;
-            }
-            return path;
-        }
-
-        // Add current to the closed set.
-        closedSet.push_back(current);
-
-        // Get the neighbors of current.
-        std::vector<GridSquare*> neighbors = arena->getNeighbors( current );
-
-        // For each of the neighbors
-        std::vector<GridSquare*>::iterator neighborsIterator;
-        for ( neighborsIterator=neighbors.begin();
-              neighborsIterator!=neighbors.end();
-              ++neighborsIterator) {
-
-            GridSquare* neighbor = *neighborsIterator;
-
-            // Search for the neighbor in the closed set.
-            std::vector<GridSquare*>::iterator closedSetIterator =
-                find ( closedSet.begin(), closedSet.end(), neighbor );
-
-            // if neighbor is not in the closed set.
-            if (closedSetIterator == closedSet.end()) {
-
-                // Calculate a g_score for this neighbor.
-                int cost_to_move_to_neighbor;
-                arena->distanceBetween( current, neighbor, cost_to_move_to_neighbor );
-                int neighbor_g_score = current->g_score + cost_to_move_to_neighbor;
-
-                // Search for the neighbor in the openset.
-                std::vector<GridSquare*>::iterator openSetIterator =
-                    find ( openSet.begin(), openSet.end(), neighbor );
-
-                // if neighbor is in the openset and the tentative g score is better than the current score
-                if ((openSetIterator == openSet.end()) || (neighbor_g_score < neighbor->g_score)) {
-
-                    neighbor->parent = current;
-                    neighbor->g_score = neighbor_g_score;
-                    arena->movementCostEstimate(neighbor, goal, estimated_cost_to_goal );
-                    neighbor->f_score = neighbor->g_score + estimated_cost_to_goal;
-
-                    if (openSetIterator == openSet.end()) {
-                        openSet.push_back(neighbor);
-                    }
-                }
-            }
-        }
-    }
-    std::cerr << "Failed to find a path to the goal.";
-    return failure;
+#include	<stdlib.h>
+#include	<vector>				//	std::vector
+#include	<algorithm>	//	std::find
+#include	"findpath.hh"
+
+std::vector<Point>	FindPath(	GridSquare*	origin,	GridSquare*	goal,	Arena*	arena)	{
+
+				std::vector<GridSquare*>	openSet;
+				std::vector<GridSquare*>	closedSet;
+				std::vector<Point>	failure;
+
+				int	estimated_cost_to_goal;	//	h(n)
+
+				if	(arena	==	(Arena*)0)	{
+								return	failure;
+				}
+				Point	origPt,	goalPt;
+				if	(arena->getGridSquareCoordinates(origin,	origPt)	!=	0)	{
+								std::cerr	<<	"FindPath:	Bad	Origin.";
+								return	failure;
+				}
+				if	(arena->getGridSquareCoordinates(goal,	goalPt)	!=	0)	{
+								std::cerr	<<	"FindPath:	Bad	Goal.";
+								return	failure;
+				}
+
+				origin->parent	=	(GridSquare*)0;
+				origin->g_score	=	0;
+
+				arena->movementCostEstimate(origin,	goal,	estimated_cost_to_goal);
+				origin->f_score	=	estimated_cost_to_goal;
+
+				openSet.push_back(origin);
+
+				while	(	!openSet.empty()	)	{
+
+								//	Get	the	item	in	the	openSet	that	has	the	lowest	f_score.
+								std::vector<GridSquare*>::iterator	curr,	best;
+								for	(best=curr=openSet.begin();	curr	!=	openSet.end();	++curr)	{
+													if	(	(*curr)->f_score	<	(*best)->f_score	)	{
+																	best	=	curr;
+													}
+								}
+
+								//	Get	and	remove	the	best	from	the	open	set.	This	is	current.
+								GridSquare*	current	=	*best;
+								openSet.erase(best);
+
+								//	if	the	current	position	is	the	goal	then	backtrack,	build
+								//	and	return	the	path	to	get	here.
+								if	(current	==	goal)	{
+												std::vector<Point>	path;
+												while	(current	!=	(GridSquare*)0)	{
+																Point	coordinates;
+																if	(	arena->getGridSquareCoordinates(	current,	coordinates	)	==	0)	{
+																				path.insert(	path.begin(),	coordinates);
+																}
+																current	=	current->parent;
+												}
+												return	path;
+								}
+
+								//	Add	current	to	the	closed	set.
+								closedSet.push_back(current);
+
+								//	Get	the	neighbors	of	current.
+								std::vector<GridSquare*>	neighbors	=	arena->getNeighbors(	current	);
+
+								//	For	each	of	the	neighbors
+								std::vector<GridSquare*>::iterator	neighborsIterator;
+								for	(	neighborsIterator=neighbors.begin();
+														neighborsIterator!=neighbors.end();
+														++neighborsIterator)	{
+
+												GridSquare*	neighbor	=	*neighborsIterator;
+
+												//	Search	for	the	neighbor	in	the	closed	set.
+												std::vector<GridSquare*>::iterator	closedSetIterator	=
+																find	(	closedSet.begin(),	closedSet.end(),	neighbor	);
+
+												//	if	neighbor	is	not	in	the	closed	set.
+												if	(closedSetIterator	==	closedSet.end())	{
+
+																//	Calculate	a	g_score	for	this	neighbor.
+																int	cost_to_move_to_neighbor;
+																arena->distanceBetween(	current,	neighbor,	cost_to_move_to_neighbor	);
+																int	neighbor_g_score	=	current->g_score	+	cost_to_move_to_neighbor;
+
+																//	Search	for	the	neighbor	in	the	openset.
+																std::vector<GridSquare*>::iterator	openSetIterator	=
+																				find	(	openSet.begin(),	openSet.end(),	neighbor	);
+
+																//	if	neighbor	is	in	the	openset	and	the	tentative	g	score	is	better	than	the	current	score
+																if	((openSetIterator	==	openSet.end())	||	(neighbor_g_score	<	neighbor->g_score))	{
+
+																				neighbor->parent	=	current;
+																				neighbor->g_score	=	neighbor_g_score;
+																				arena->movementCostEstimate(neighbor,	goal,	estimated_cost_to_goal	);
+																				neighbor->f_score	=	neighbor->g_score	+	estimated_cost_to_goal;
+
+																				if	(openSetIterator	==	openSet.end())	{
+																								openSet.push_back(neighbor);
+																				}
+																}
+												}
+								}
+				}
+				std::cerr	<<	"Failed	to	find	a	path	to	the	goal.";
+				return	failure;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/src/navigator.cpp b/trick_sims/SIM_wheelbot/models/Guidance/src/navigator.cpp
index 45fd57e06..11165d410 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/src/navigator.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/src/navigator.cpp
@@ -1,60 +1,60 @@
-#include <math.h> // for: sqrt(), atan2(), cos(), and sin()
-#include "navigator.hh"
-#include <iostream>
+#include	<math.h>	//	for:	sqrt(),	atan2(),	cos(),	and	sin()
+#include	"navigator.hh"
+#include	<iostream>
 
-void Navigator::setHeading(double h) {
-    heading = h;
+void	Navigator::setHeading(double	h)	{
+				heading	=	h;
 }
 
-void Navigator::setLocation(double x, double y) {
-    location.x = x;
-    location.y = y;
+void	Navigator::setLocation(double	x,	double	y)	{
+				location.x	=	x;
+				location.y	=	y;
 }
 
-double Navigator::distanceTo(Point& mapPoint ) {
+double	Navigator::distanceTo(Point&	mapPoint	)	{
 
-    double deltaX = location.x - mapPoint.x;
-    double deltaY = location.y - mapPoint.y;
-    double distance = sqrt( deltaX * deltaX + deltaY * deltaY );
-    return (distance) ;
+				double	deltaX	=	location.x	-	mapPoint.x;
+				double	deltaY	=	location.y	-	mapPoint.y;
+				double	distance	=	sqrt(	deltaX	*	deltaX	+	deltaY	*	deltaY	);
+				return	(distance)	;
 }
 
-double Navigator::bearingTo(Point& mapPoint ) {
+double	Navigator::bearingTo(Point&	mapPoint	)	{
 
-    Point platformPoint = convertMapToPlatform(mapPoint);
-    Point bodyPoint = convertPlatformToBody(platformPoint);
-    double head2 = asin(bodyPoint.y/distanceTo(mapPoint) );
-    return head2;
+				Point	platformPoint	=	convertMapToPlatform(mapPoint);
+				Point	bodyPoint	=	convertPlatformToBody(platformPoint);
+				double	head2	=	asin(bodyPoint.y/distanceTo(mapPoint)	);
+				return	head2;
 }
 
-Point Navigator::convertMapToPlatform(Point& mapPoint ) {
+Point	Navigator::convertMapToPlatform(Point&	mapPoint	)	{
 
-    Point platformPoint;
-    platformPoint.x = mapPoint.x - location.x;
-    platformPoint.y = mapPoint.y - location.y;
-    return (platformPoint);
+				Point	platformPoint;
+				platformPoint.x	=	mapPoint.x	-	location.x;
+				platformPoint.y	=	mapPoint.y	-	location.y;
+				return	(platformPoint);
 }
 
-Point Navigator::convertPlatformToMap( Point& platformPoint ) {
+Point	Navigator::convertPlatformToMap(	Point&	platformPoint	)	{
 
-    Point mapPoint;
-    mapPoint.x = platformPoint.x + location.x;
-    mapPoint.y = platformPoint.y + location.y;
-    return (mapPoint);
+				Point	mapPoint;
+				mapPoint.x	=	platformPoint.x	+	location.x;
+				mapPoint.y	=	platformPoint.y	+	location.y;
+				return	(mapPoint);
 }
 
-Point Navigator::convertPlatformToBody( Point& platformPoint ) {
+Point	Navigator::convertPlatformToBody(	Point&	platformPoint	)	{
 
-    Point bodyPoint;
-    bodyPoint.x =  cos(heading) * platformPoint.x + sin(heading) * platformPoint.y;
-    bodyPoint.y = -sin(heading) * platformPoint.x + cos(heading) * platformPoint.y;
-    return (bodyPoint);
+				Point	bodyPoint;
+				bodyPoint.x	=		cos(heading)	*	platformPoint.x	+	sin(heading)	*	platformPoint.y;
+				bodyPoint.y	=	-sin(heading)	*	platformPoint.x	+	cos(heading)	*	platformPoint.y;
+				return	(bodyPoint);
 }
 
-Point Navigator::convertBodyToPlatform( Point& bodyPoint ) {
+Point	Navigator::convertBodyToPlatform(	Point&	bodyPoint	)	{
 
-    Point platformPoint;
-    platformPoint.x =  cos(heading) * bodyPoint.x - sin(heading) * bodyPoint.y;
-    platformPoint.y =  sin(heading) * bodyPoint.x + cos(heading) * bodyPoint.y;
-    return (platformPoint);
+				Point	platformPoint;
+				platformPoint.x	=		cos(heading)	*	bodyPoint.x	-	sin(heading)	*	bodyPoint.y;
+				platformPoint.y	=		sin(heading)	*	bodyPoint.x	+	cos(heading)	*	bodyPoint.y;
+				return	(platformPoint);
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
index 3073ce147..8cec9e3f6 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/ArenaTest.cpp
@@ -1,375 +1,375 @@
-#include <gtest/gtest.h>
-#define private public
-#include "arena.hh"
-#include <algorithm>
-
-TEST( ArenaTest , one ) {
-    // Attempt to create an arena
-    Arena * arena;
-    arena = new Arena(5,5);
-    EXPECT_NE( (void*)0, arena);
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"arena.hh"
+#include	<algorithm>
+
+TEST(	ArenaTest	,	one	)	{
+				//	Attempt	to	create	an	arena
+				Arena	*	arena;
+				arena	=	new	Arena(5,5);
+				EXPECT_NE(	(void*)0,	arena);
 }
 
-TEST( ArenaTest , two ) {
-    // Make sure that arena size is what we specified.
-    Arena arena(5,5);
-    EXPECT_EQ( arena.getWidth(), 5);
-    EXPECT_EQ( arena.getHeight(), 5);
+TEST(	ArenaTest	,	two	)	{
+				//	Make	sure	that	arena	size	is	what	we	specified.
+				Arena	arena(5,5);
+				EXPECT_EQ(	arena.getWidth(),	5);
+				EXPECT_EQ(	arena.getHeight(),	5);
 }
 
-TEST( ArenaTest , three ) {
-    // Make sure that arena size is what we specified.
-    //Checks that x is width and y is height
-    Arena arena(10,7);
-    EXPECT_EQ( arena.getWidth(), 10);
-    EXPECT_EQ( arena.getHeight(), 7);
+TEST(	ArenaTest	,	three	)	{
+				//	Make	sure	that	arena	size	is	what	we	specified.
+				//Checks	that	x	is	width	and	y	is	height
+				Arena	arena(10,7);
+				EXPECT_EQ(	arena.getWidth(),	10);
+				EXPECT_EQ(	arena.getHeight(),	7);
 }
 
-TEST( ArenaTest , four ) {
-    // Make sure that arena size is what we specified.
+TEST(	ArenaTest	,	four	)	{
+				//	Make	sure	that	arena	size	is	what	we	specified.
 
-    unsigned char ARENA_bits[] = {
-    0x10, 0x00, 0x86, 0x00, 0xe8, 0x00, 0x28, 0x00, 0xe2, 0x00, 0x02, 0x00};
+				unsigned	char	ARENA_bits[]	=	{
+				0x10,	0x00,	0x86,	0x00,	0xe8,	0x00,	0x28,	0x00,	0xe2,	0x00,	0x02,	0x00};
 
-    Arena arena(10,6,ARENA_bits);
-    EXPECT_EQ( arena.getWidth(), 10);
-    EXPECT_EQ( arena.getHeight(), 6);
+				Arena	arena(10,6,ARENA_bits);
+				EXPECT_EQ(	arena.getWidth(),	10);
+				EXPECT_EQ(	arena.getHeight(),	6);
 }
 
-TEST( ArenaTest , calcOffset_one ) {
-    // Make sure that calcOffset properly adds its value to the variable offset
-    Arena arena(10,7);
-    size_t sz;
-    arena.calcOffset(1,1, sz);
-    EXPECT_EQ( sz, (size_t)11);
+TEST(	ArenaTest	,	calcOffset_one	)	{
+				//	Make	sure	that	calcOffset	properly	adds	its	value	to	the	variable	offset
+				Arena	arena(10,7);
+				size_t	sz;
+				arena.calcOffset(1,1,	sz);
+				EXPECT_EQ(	sz,	(size_t)11);
 }
 
-TEST( ArenaTest, calcOffset_two )
+TEST(	ArenaTest,	calcOffset_two	)
 {
-  //Checks to make sure calcOffset function returns 1 if the if-statements
-  //evaluate to false
-  Arena arena(10,7);
-  size_t sz;
-  EXPECT_EQ (arena.calcOffset(15,12,sz), 1);
+		//Checks	to	make	sure	calcOffset	function	returns	1	if	the	if-statements
+		//evaluate	to	false
+		Arena	arena(10,7);
+		size_t	sz;
+		EXPECT_EQ	(arena.calcOffset(15,12,sz),	1);
 }
 
-TEST( ArenaTest, calcOffset_three )
+TEST(	ArenaTest,	calcOffset_three	)
 {
-  //Checks to make sure calcOffset function returns 0 if the if-statements
-  //evaluate to true
-  Arena arena(10,7);
-  size_t sz;
-  EXPECT_EQ (arena.calcOffset(5,6,sz), 0);
+		//Checks	to	make	sure	calcOffset	function	returns	0	if	the	if-statements
+		//evaluate	to	true
+		Arena	arena(10,7);
+		size_t	sz;
+		EXPECT_EQ	(arena.calcOffset(5,6,sz),	0);
 }
 
 
-TEST ( ArenaTest, getGridSquare_one)
+TEST	(	ArenaTest,	getGridSquare_one)
 {
-  //Tests to make sure getGridSquare gets the gridSquare pointer at the location specified
-  //Which in this case is the first gridSquare
-  Arena arena(10,7);
-  GridSquare *agridsquare = arena.getGridSquare(0,0);
-  EXPECT_EQ (agridsquare, arena.grid);
+		//Tests	to	make	sure	getGridSquare	gets	the	gridSquare	pointer	at	the	location	specified
+		//Which	in	this	case	is	the	first	gridSquare
+		Arena	arena(10,7);
+		GridSquare	*agridsquare	=	arena.getGridSquare(0,0);
+		EXPECT_EQ	(agridsquare,	arena.grid);
 }
 
-TEST ( ArenaTest, getGridSquare_two)
+TEST	(	ArenaTest,	getGridSquare_two)
 {
-  //Tests if the gridSquare that getGridSquare picked up is the correct gridSquare
-  //by counting the spaces in memory
-  Arena arena(10,7);
-  GridSquare *agridsquare = arena.getGridSquare(2,3);
-  EXPECT_EQ (agridsquare, arena.grid + 32);
+		//Tests	if	the	gridSquare	that	getGridSquare	picked	up	is	the	correct	gridSquare
+		//by	counting	the	spaces	in	memory
+		Arena	arena(10,7);
+		GridSquare	*agridsquare	=	arena.getGridSquare(2,3);
+		EXPECT_EQ	(agridsquare,	arena.grid	+	32);
 }
 
-TEST (ArenaTest, getGridSquare_three)
+TEST	(ArenaTest,	getGridSquare_three)
 {
-  //failure case for if-statement within getGridSquare
-  Arena arena(10,7);
-  EXPECT_EQ (arena.getGridSquare(50,70), ((GridSquare*)0));
+		//failure	case	for	if-statement	within	getGridSquare
+		Arena	arena(10,7);
+		EXPECT_EQ	(arena.getGridSquare(50,70),	((GridSquare*)0));
 }
 
-TEST( ArenaTest, calcOffset2_one )
+TEST(	ArenaTest,	calcOffset2_one	)
 {
-  //Checks to make sure calcOffset function returns 1 if the if-statements
-  //evaluate to false
-  //failure case for first if-statement in calcOffset function
-    Arena arena(10,7);
-    size_t sz;
-    GridSquare* gridSquare = (GridSquare*)(arena.grid-1);
-    EXPECT_EQ (arena.calcOffset(gridSquare,sz), 1);
+		//Checks	to	make	sure	calcOffset	function	returns	1	if	the	if-statements
+		//evaluate	to	false
+		//failure	case	for	first	if-statement	in	calcOffset	function
+				Arena	arena(10,7);
+				size_t	sz;
+				GridSquare*	gridSquare	=	(GridSquare*)(arena.grid-1);
+				EXPECT_EQ	(arena.calcOffset(gridSquare,sz),	1);
 }
 
-TEST(ArenaTest, calcOffset2_two)
+TEST(ArenaTest,	calcOffset2_two)
 {
-  //Tests if calcOffset function returns 0 when all if statement conditions are met
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(2,3);
-  size_t sz;
-  EXPECT_EQ (arena.calcOffset(agridSquare, sz), 0);
+		//Tests	if	calcOffset	function	returns	0	when	all	if	statement	conditions	are	met
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(2,3);
+		size_t	sz;
+		EXPECT_EQ	(arena.calcOffset(agridSquare,	sz),	0);
 }
 
-TEST(ArenaTest, calcOffset2_three)
+TEST(ArenaTest,	calcOffset2_three)
 {
-  //Tests if offset value is calculated correctly and put in the correct memory location
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(9,6);
-  size_t sz;
-  arena.calcOffset(agridSquare, sz);
-  EXPECT_EQ (sz, 69);
+		//Tests	if	offset	value	is	calculated	correctly	and	put	in	the	correct	memory	location
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(9,6);
+		size_t	sz;
+		arena.calcOffset(agridSquare,	sz);
+		EXPECT_EQ	(sz,	69);
 }
 
-TEST(ArenaTest, calcOffset2_four)
+TEST(ArenaTest,	calcOffset2_four)
 {
-  //failure case for second if-statement in calcOffset function
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(15,10);
-  size_t sz;
-  EXPECT_EQ (arena.calcOffset(agridSquare, sz), 1);
+		//failure	case	for	second	if-statement	in	calcOffset	function
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(15,10);
+		size_t	sz;
+		EXPECT_EQ	(arena.calcOffset(agridSquare,	sz),	1);
 }
 
-TEST(ArenaTest, getGridSquareCoordinates_one)
+TEST(ArenaTest,	getGridSquareCoordinates_one)
 {
-  //failure case for if-statement in getGridSquareCoordinates function
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(15,10);
-  Point coordinate;
-  std::cout << std::endl;
-  std::cout << "The following error message is expected from this test." << std::endl;
-  EXPECT_EQ (arena.getGridSquareCoordinates(agridSquare, coordinate),1);
-  std::cout << std::endl;
+		//failure	case	for	if-statement	in	getGridSquareCoordinates	function
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(15,10);
+		Point	coordinate;
+		std::cout	<<	std::endl;
+		std::cout	<<	"The	following	error	message	is	expected	from	this	test."	<<	std::endl;
+		EXPECT_EQ	(arena.getGridSquareCoordinates(agridSquare,	coordinate),1);
+		std::cout	<<	std::endl;
 }
 
-TEST(ArenaTest, getGridSquareCoordinates_two)
+TEST(ArenaTest,	getGridSquareCoordinates_two)
 {
-  //Tests if the if-statement evaluates to true that the remainder of code (for that function)
-  //runs through
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(9,6);
-  Point coordinate;
-  EXPECT_EQ (arena.getGridSquareCoordinates(agridSquare, coordinate),0);
+		//Tests	if	the	if-statement	evaluates	to	true	that	the	remainder	of	code	(for	that	function)
+		//runs	through
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(9,6);
+		Point	coordinate;
+		EXPECT_EQ	(arena.getGridSquareCoordinates(agridSquare,	coordinate),0);
 }
 
-TEST(ArenaTest, getGridSquareCoordinates_three)
+TEST(ArenaTest,	getGridSquareCoordinates_three)
 {
-  //Tests the arithmetic within the getGridSquareCooordinates function
-  //once the first if-statement evaluates to true
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(9,6);
-  Point coordinate;
-  arena.getGridSquareCoordinates(agridSquare, coordinate);
-  EXPECT_EQ (coordinate.x, 9);
-  EXPECT_EQ (coordinate.y, 6);
+		//Tests	the	arithmetic	within	the	getGridSquareCooordinates	function
+		//once	the	first	if-statement	evaluates	to	true
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(9,6);
+		Point	coordinate;
+		arena.getGridSquareCoordinates(agridSquare,	coordinate);
+		EXPECT_EQ	(coordinate.x,	9);
+		EXPECT_EQ	(coordinate.y,	6);
 }
 
-TEST(ArenaTest, movementCostEstimate_one)
+TEST(ArenaTest,	movementCostEstimate_one)
 {
-  //Failure case for the if-statement
-  //Ensures that the movementCostEstimate function fails appropiately
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(11,3);
-  GridSquare *anothergridSquare = arena.getGridSquare(12,4);
-  int costestimate;
-  std::cout << std::endl;
-  std::cout << "The following error messages are expected from this test." << std::endl;
-  EXPECT_EQ (arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate), 1);
-  std::cout << std::endl;
+		//Failure	case	for	the	if-statement
+		//Ensures	that	the	movementCostEstimate	function	fails	appropiately
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(11,3);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(12,4);
+		int	costestimate;
+		std::cout	<<	std::endl;
+		std::cout	<<	"The	following	error	messages	are	expected	from	this	test."	<<	std::endl;
+		EXPECT_EQ	(arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate),	1);
+		std::cout	<<	std::endl;
 }
 
-TEST(ArenaTest, movementCostEstimate_two)
+TEST(ArenaTest,	movementCostEstimate_two)
 {
-  //Tests the case that the if-statement evaluates to true and if the following lines of code
-  //get executed in their entirety
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  GridSquare *anothergridSquare = arena.getGridSquare(3,4);
-  int costestimate;
-  EXPECT_EQ (arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate), 0);
+		//Tests	the	case	that	the	if-statement	evaluates	to	true	and	if	the	following	lines	of	code
+		//get	executed	in	their	entirety
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(3,4);
+		int	costestimate;
+		EXPECT_EQ	(arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate),	0);
 }
 
-TEST(ArenaTest, movementCostEstimate_three)
+TEST(ArenaTest,	movementCostEstimate_three)
 {
-  //Tests to ensure that movementCostEstimate function is calculating the movement cost correctly
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  GridSquare *anothergridSquare = arena.getGridSquare(3,4);
-  int costestimate;
-  arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate);
-  EXPECT_EQ (costestimate, 40);
+		//Tests	to	ensure	that	movementCostEstimate	function	is	calculating	the	movement	cost	correctly
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(3,4);
+		int	costestimate;
+		arena.movementCostEstimate(agridSquare,anothergridSquare,costestimate);
+		EXPECT_EQ	(costestimate,	40);
 }
 
-TEST(ArenaTest, distanceBetween_one)
+TEST(ArenaTest,	distanceBetween_one)
 {
-  //Failure case for the if-statement
-  //Ensures that the distanceBetween function fails appropiately
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(11,3);
-  GridSquare *anothergridSquare = arena.getGridSquare(12,4);
-  int dist;
-  std::cout << std::endl;
-  std::cout << "The following error messages are expected from this test." << std::endl;
-  EXPECT_EQ (arena.distanceBetween(agridSquare,anothergridSquare,dist), 1);
-  std::cout << std::endl;
+		//Failure	case	for	the	if-statement
+		//Ensures	that	the	distanceBetween	function	fails	appropiately
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(11,3);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(12,4);
+		int	dist;
+		std::cout	<<	std::endl;
+		std::cout	<<	"The	following	error	messages	are	expected	from	this	test."	<<	std::endl;
+		EXPECT_EQ	(arena.distanceBetween(agridSquare,anothergridSquare,dist),	1);
+		std::cout	<<	std::endl;
 }
 
-TEST(ArenaTest, distanceBetween_two)
+TEST(ArenaTest,	distanceBetween_two)
 {
-  //Tests the case that the if-statement evaluates to true and if the following lines of code
-  //get executed in their entirety
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  GridSquare *anothergridSquare = arena.getGridSquare(3,4);
-  int dist;
-  EXPECT_EQ (arena.distanceBetween(agridSquare,anothergridSquare,dist), 0);
+		//Tests	the	case	that	the	if-statement	evaluates	to	true	and	if	the	following	lines	of	code
+		//get	executed	in	their	entirety
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(3,4);
+		int	dist;
+		EXPECT_EQ	(arena.distanceBetween(agridSquare,anothergridSquare,dist),	0);
 }
 
-TEST(ArenaTest, distanceBetween_three)
+TEST(ArenaTest,	distanceBetween_three)
 {
-  //Tests that the distanceBetween function properly calculates the distance between two gridSquares
-  //using gridSquare pointers
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  GridSquare *anothergridSquare = arena.getGridSquare(3,4);
-  int dist;
-  arena.distanceBetween(agridSquare,anothergridSquare,dist);
-  EXPECT_EQ (dist, 28);
+		//Tests	that	the	distanceBetween	function	properly	calculates	the	distance	between	two	gridSquares
+		//using	gridSquare	pointers
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		GridSquare	*anothergridSquare	=	arena.getGridSquare(3,4);
+		int	dist;
+		arena.distanceBetween(agridSquare,anothergridSquare,dist);
+		EXPECT_EQ	(dist,	28);
 }
 
-TEST(ArenaTest, blockunblock_one)
+TEST(ArenaTest,	blockunblock_one)
 {
-  //Tests to ensure that the block and unblock functions change the isBlocked member
-  //respective to their names
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  arena.block(1,2);
-  EXPECT_EQ (agridSquare->isBlocked,true);
-  arena.unblock(1,2);
-  EXPECT_EQ (agridSquare->isBlocked,false);
+		//Tests	to	ensure	that	the	block	and	unblock	functions	change	the	isBlocked	member
+		//respective	to	their	names
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		arena.block(1,2);
+		EXPECT_EQ	(agridSquare->isBlocked,true);
+		arena.unblock(1,2);
+		EXPECT_EQ	(agridSquare->isBlocked,false);
 }
 
-TEST(ArenaTest, mark_one)
+TEST(ArenaTest,	mark_one)
 {
-  //Tests to make sure that the mark function places a mark in the gridSquare desired
-  Arena arena(10,7);
-  GridSquare *agridSquare = arena.getGridSquare(1,2);
-  arena.mark(1,2, 'c');
-  EXPECT_EQ (agridSquare->mark,'c');
+		//Tests	to	make	sure	that	the	mark	function	places	a	mark	in	the	gridSquare	desired
+		Arena	arena(10,7);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,2);
+		arena.mark(1,2,	'c');
+		EXPECT_EQ	(agridSquare->mark,'c');
 }
 
-TEST(ArenaTest, getNeighbors_one)
+TEST(ArenaTest,	getNeighbors_one)
 {
-  //Tests that error message displays when trying to
-  std::cout << std::endl;
-  std::cout << "The following error messages are expected from this test." << std::endl;
-  Arena arena(10,7);
-  std::vector<GridSquare*> neighbors;
-  GridSquare *agridSquare = arena.getGridSquare(11,22);
-  neighbors = arena.getNeighbors(agridSquare);
-  int length = neighbors.size();
-  std::cout << std::endl; std::cout << std::endl;
-  EXPECT_EQ (length, 0);
+		//Tests	that	error	message	displays	when	trying	to
+		std::cout	<<	std::endl;
+		std::cout	<<	"The	following	error	messages	are	expected	from	this	test."	<<	std::endl;
+		Arena	arena(10,7);
+		std::vector<GridSquare*>	neighbors;
+		GridSquare	*agridSquare	=	arena.getGridSquare(11,22);
+		neighbors	=	arena.getNeighbors(agridSquare);
+		int	length	=	neighbors.size();
+		std::cout	<<	std::endl;	std::cout	<<	std::endl;
+		EXPECT_EQ	(length,	0);
 }
 
-TEST(ArenaTest, getNeighbors_two)
+TEST(ArenaTest,	getNeighbors_two)
 {
-  //Tests that getNeighbors returns the correct amount of neighbors within the vector
-  Arena arena(3,3);
-  GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors;
-  neighbors = arena.getNeighbors(agridSquare);
-  int length = neighbors.size();
-  EXPECT_EQ (length, 8);
+		//Tests	that	getNeighbors	returns	the	correct	amount	of	neighbors	within	the	vector
+		Arena	arena(3,3);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,1);
+		std::vector<GridSquare*>	neighbors;
+		neighbors	=	arena.getNeighbors(agridSquare);
+		int	length	=	neighbors.size();
+		EXPECT_EQ	(length,	8);
 }
 
-TEST(ArenaTest, getNeighbors_three)
+TEST(ArenaTest,	getNeighbors_three)
 {
-  //Tests that getNeighbors returns the correct amount of neighbors when
-  //certain neighbors are blocked
-  Arena arena(3,3);
-  GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors;
-  arena.block(0,0);
-  arena.block(2,0);
-  arena.block(2,2);
-  neighbors = arena.getNeighbors(agridSquare);
-  int length = neighbors.size();
-  EXPECT_EQ (length, 5);
+		//Tests	that	getNeighbors	returns	the	correct	amount	of	neighbors	when
+		//certain	neighbors	are	blocked
+		Arena	arena(3,3);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,1);
+		std::vector<GridSquare*>	neighbors;
+		arena.block(0,0);
+		arena.block(2,0);
+		arena.block(2,2);
+		neighbors	=	arena.getNeighbors(agridSquare);
+		int	length	=	neighbors.size();
+		EXPECT_EQ	(length,	5);
 }
 
-TEST(ArenaTest, getNeighbors_four)
+TEST(ArenaTest,	getNeighbors_four)
 {
-  //Tests that getNeighbors returns the correct GridSquare pointers in the neighbors vector
-  Arena arena(3,3);
-  GridSquare *agridSquare = arena.getGridSquare(1,1);
-  std::vector<GridSquare*> neighbors;
+		//Tests	that	getNeighbors	returns	the	correct	GridSquare	pointers	in	the	neighbors	vector
+		Arena	arena(3,3);
+		GridSquare	*agridSquare	=	arena.getGridSquare(1,1);
+		std::vector<GridSquare*>	neighbors;
 
-  arena.block(0,0);
-  GridSquare* n0_1 = arena.getGridSquare(0,1);//0,1
-  GridSquare* n0_2 = arena.getGridSquare(0,2);//0,2
-  GridSquare* n1_0 = arena.getGridSquare(1,0);//1,0
-  GridSquare* n1_2 = arena.getGridSquare(1,2);// 1,2
-  arena.block(2,0);
-  GridSquare* n2_1 = arena.getGridSquare(2,1);//2,1
-  arena.block(2,2);
+		arena.block(0,0);
+		GridSquare*	n0_1	=	arena.getGridSquare(0,1);//0,1
+		GridSquare*	n0_2	=	arena.getGridSquare(0,2);//0,2
+		GridSquare*	n1_0	=	arena.getGridSquare(1,0);//1,0
+		GridSquare*	n1_2	=	arena.getGridSquare(1,2);//	1,2
+		arena.block(2,0);
+		GridSquare*	n2_1	=	arena.getGridSquare(2,1);//2,1
+		arena.block(2,2);
 
-  neighbors = arena.getNeighbors(agridSquare);
-  std::vector<GridSquare*>::iterator neighborsIterator;
+		neighbors	=	arena.getNeighbors(agridSquare);
+		std::vector<GridSquare*>::iterator	neighborsIterator;
 
-  //Test for (0,1) gridSquare
-  bool n0_1_found_flag = false;
-  neighborsIterator = find (neighbors.begin(),neighbors.end(), n0_1); //search for neighbor (0,1) in neighbors
-  if (neighborsIterator != neighbors.end()) //if the value is found
-    n0_1_found_flag = true; //change the found flag to true
+		//Test	for	(0,1)	gridSquare
+		bool	n0_1_found_flag	=	false;
+		neighborsIterator	=	find	(neighbors.begin(),neighbors.end(),	n0_1);	//search	for	neighbor	(0,1)	in	neighbors
+		if	(neighborsIterator	!=	neighbors.end())	//if	the	value	is	found
+				n0_1_found_flag	=	true;	//change	the	found	flag	to	true
 
 
-  Point point;
-  arena.getGridSquareCoordinates(*neighborsIterator,point);
-  std::cout << point.x << " "<< point.y << std::endl;
+		Point	point;
+		arena.getGridSquareCoordinates(*neighborsIterator,point);
+		std::cout	<<	point.x	<<	"	"<<	point.y	<<	std::endl;
 
-  EXPECT_EQ(n0_1_found_flag, true);
+		EXPECT_EQ(n0_1_found_flag,	true);
 
-  //Test for (0,2) gridSquare
-  bool n0_2_found_flag = false;
-  neighborsIterator = find (neighbors.begin(),neighbors.end(), n0_2); //search for neighbor (0,2) in neighbors
-  if (neighborsIterator != neighbors.end()) //if the value is found
-    n0_2_found_flag = true; //change the found flag to true
+		//Test	for	(0,2)	gridSquare
+		bool	n0_2_found_flag	=	false;
+		neighborsIterator	=	find	(neighbors.begin(),neighbors.end(),	n0_2);	//search	for	neighbor	(0,2)	in	neighbors
+		if	(neighborsIterator	!=	neighbors.end())	//if	the	value	is	found
+				n0_2_found_flag	=	true;	//change	the	found	flag	to	true
 
-  arena.getGridSquareCoordinates(*neighborsIterator,point);
-  std::cout << point.x << " "<< point.y << std::endl;
+		arena.getGridSquareCoordinates(*neighborsIterator,point);
+		std::cout	<<	point.x	<<	"	"<<	point.y	<<	std::endl;
 
-  EXPECT_EQ(n0_2_found_flag, true);
+		EXPECT_EQ(n0_2_found_flag,	true);
 
-   //Test for (1,0) gridSquare
-  bool n1_0_found_flag = false;
-  neighborsIterator = find (neighbors.begin(),neighbors.end(), n1_0); //search for neighbor (0,2) in neighbors
-  if (neighborsIterator != neighbors.end()) //if the value is found
-    n1_0_found_flag = true; //change the found flag to true
+			//Test	for	(1,0)	gridSquare
+		bool	n1_0_found_flag	=	false;
+		neighborsIterator	=	find	(neighbors.begin(),neighbors.end(),	n1_0);	//search	for	neighbor	(0,2)	in	neighbors
+		if	(neighborsIterator	!=	neighbors.end())	//if	the	value	is	found
+				n1_0_found_flag	=	true;	//change	the	found	flag	to	true
 
-  arena.getGridSquareCoordinates(*neighborsIterator,point);
-  std::cout << point.x << " "<< point.y << std::endl;
+		arena.getGridSquareCoordinates(*neighborsIterator,point);
+		std::cout	<<	point.x	<<	"	"<<	point.y	<<	std::endl;
 
-  EXPECT_EQ(n1_0_found_flag, true);
+		EXPECT_EQ(n1_0_found_flag,	true);
 
-   //Test for (1,2) gridSquare
-  bool n1_2_found_flag = false;
-  neighborsIterator = find (neighbors.begin(),neighbors.end(), n1_2); //search for neighbor (1,2) in neighbors
-  if (neighborsIterator != neighbors.end()) //if the value is found
-    n1_2_found_flag = true; //change the found flag to true
+			//Test	for	(1,2)	gridSquare
+		bool	n1_2_found_flag	=	false;
+		neighborsIterator	=	find	(neighbors.begin(),neighbors.end(),	n1_2);	//search	for	neighbor	(1,2)	in	neighbors
+		if	(neighborsIterator	!=	neighbors.end())	//if	the	value	is	found
+				n1_2_found_flag	=	true;	//change	the	found	flag	to	true
 
-  arena.getGridSquareCoordinates(*neighborsIterator,point);
-  std::cout << point.x << " "<< point.y << std::endl;
+		arena.getGridSquareCoordinates(*neighborsIterator,point);
+		std::cout	<<	point.x	<<	"	"<<	point.y	<<	std::endl;
 
-  EXPECT_EQ(n1_2_found_flag, true);
+		EXPECT_EQ(n1_2_found_flag,	true);
 
-   //Test for (2,1) gridSquare
-  bool n2_1_found_flag = false;
-  neighborsIterator = find (neighbors.begin(),neighbors.end(), n2_1); //search for neighbor (2,1) in neighbors
-  if (neighborsIterator != neighbors.end()) //if the value is found
-    n2_1_found_flag = true; //change the found flag to true
+			//Test	for	(2,1)	gridSquare
+		bool	n2_1_found_flag	=	false;
+		neighborsIterator	=	find	(neighbors.begin(),neighbors.end(),	n2_1);	//search	for	neighbor	(2,1)	in	neighbors
+		if	(neighborsIterator	!=	neighbors.end())	//if	the	value	is	found
+				n2_1_found_flag	=	true;	//change	the	found	flag	to	true
 
-  arena.getGridSquareCoordinates(*neighborsIterator,point);
-  std::cout << point.x << " "<< point.y << std::endl;
+		arena.getGridSquareCoordinates(*neighborsIterator,point);
+		std::cout	<<	point.x	<<	"	"<<	point.y	<<	std::endl;
 
-  EXPECT_EQ(n2_1_found_flag, true);
+		EXPECT_EQ(n2_1_found_flag,	true);
 
 
 }
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
index 4de8a5eec..2403e7c6d 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/FindPathTest.cpp
@@ -1,243 +1,243 @@
-#include <gtest/gtest.h>
-#include "findpath.hh"
-#include "arena.hh"
-#include <algorithm>
-#include <vector>
+#include	<gtest/gtest.h>
+#include	"findpath.hh"
+#include	"arena.hh"
+#include	<algorithm>
+#include	<vector>
 
-TEST(FindPathTest, FindPath_one)
+TEST(FindPathTest,	FindPath_one)
 {
- //Tests the failure case of the FindPath function
- //This is when the goal is completely blocked
- Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
+	//Tests	the	failure	case	of	the	FindPath	function
+	//This	is	when	the	goal	is	completely	blocked
+	Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
 
- GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5);
+	GridSquare	*origin	=	arena.getGridSquare(2,1);
+	GridSquare	*goal	=	arena.getGridSquare(7,5);
 
- arena.block(7,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(6,5);
- arena.block(8,5);
- arena.block(6,6);
- arena.block(8,6);
+	arena.block(7,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(6,5);
+	arena.block(8,5);
+	arena.block(6,6);
+	arena.block(8,6);
 
- std::cout << std::endl;
+	std::cout	<<	std::endl;
 
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
 
- std::cout << std::endl;
- std::cout << std::endl;
+	std::cout	<<	std::endl;
+	std::cout	<<	std::endl;
 
- EXPECT_EQ(returnvalue.size(),0);
+	EXPECT_EQ(returnvalue.size(),0);
 
 }
 
-TEST(FindPathTest, FindPath_two)
+TEST(FindPathTest,	FindPath_two)
 {
- //Tests if FindPath finds a path
- Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
-
- GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5);
-
-
- arena.block(2,0);
- arena.block(7,1);
- arena.block(0,2);
- arena.block(1,2);
- arena.block(3,2);
- arena.block(6,2);
- arena.block(3,3);
- arena.block(6,3);
- arena.block(8,3);
- arena.block(2,4);
- arena.block(3,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(2,5);
- arena.block(6,6);
- arena.block(7,6);
-
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
-
- EXPECT_GT(returnvalue.size(),0);
+	//Tests	if	FindPath	finds	a	path
+	Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
+
+	GridSquare	*origin	=	arena.getGridSquare(2,1);
+	GridSquare	*goal	=	arena.getGridSquare(7,5);
+
+
+	arena.block(2,0);
+	arena.block(7,1);
+	arena.block(0,2);
+	arena.block(1,2);
+	arena.block(3,2);
+	arena.block(6,2);
+	arena.block(3,3);
+	arena.block(6,3);
+	arena.block(8,3);
+	arena.block(2,4);
+	arena.block(3,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(2,5);
+	arena.block(6,6);
+	arena.block(7,6);
+
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
+
+	EXPECT_GT(returnvalue.size(),0);
 
 }
 
-TEST(FindPathTest, FindPath_three)
+TEST(FindPathTest,	FindPath_three)
 {
- //Tests if FindPath finds a path when start and goal are the same
- Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
-
- GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(2,1);
-
-
- arena.block(2,0);
- arena.block(7,1);
- arena.block(0,2);
- arena.block(1,2);
- arena.block(3,2);
- arena.block(6,2);
- arena.block(3,3);
- arena.block(6,3);
- arena.block(8,3);
- arena.block(2,4);
- arena.block(3,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(2,5);
- arena.block(6,6);
- arena.block(7,6);
-
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
-
- EXPECT_EQ(returnvalue.size(),1);
+	//Tests	if	FindPath	finds	a	path	when	start	and	goal	are	the	same
+	Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
+
+	GridSquare	*origin	=	arena.getGridSquare(2,1);
+	GridSquare	*goal	=	arena.getGridSquare(2,1);
+
+
+	arena.block(2,0);
+	arena.block(7,1);
+	arena.block(0,2);
+	arena.block(1,2);
+	arena.block(3,2);
+	arena.block(6,2);
+	arena.block(3,3);
+	arena.block(6,3);
+	arena.block(8,3);
+	arena.block(2,4);
+	arena.block(3,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(2,5);
+	arena.block(6,6);
+	arena.block(7,6);
+
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
+
+	EXPECT_EQ(returnvalue.size(),1);
 
 }
 
-TEST(FindPathTest, FindPath_four)
+TEST(FindPathTest,	FindPath_four)
 {
- //Tests if FindPath finds a path when start is outside the arena
- Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
-
- GridSquare *origin = arena.getGridSquare(11,13);
- GridSquare *goal = arena.getGridSquare(2,1);
-
-
-
- arena.block(2,0);
- arena.block(7,1);
- arena.block(0,2);
- arena.block(1,2);
- arena.block(3,2);
- arena.block(6,2);
- arena.block(3,3);
- arena.block(6,3);
- arena.block(8,3);
- arena.block(2,4);
- arena.block(3,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(2,5);
- arena.block(6,6);
- arena.block(7,6);
-
- std::cout << std::endl;
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
- std::cout << std::endl;
- std::cout << std::endl;
-
- EXPECT_EQ(returnvalue.size(),0);
+	//Tests	if	FindPath	finds	a	path	when	start	is	outside	the	arena
+	Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
+
+	GridSquare	*origin	=	arena.getGridSquare(11,13);
+	GridSquare	*goal	=	arena.getGridSquare(2,1);
+
+
+
+	arena.block(2,0);
+	arena.block(7,1);
+	arena.block(0,2);
+	arena.block(1,2);
+	arena.block(3,2);
+	arena.block(6,2);
+	arena.block(3,3);
+	arena.block(6,3);
+	arena.block(8,3);
+	arena.block(2,4);
+	arena.block(3,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(2,5);
+	arena.block(6,6);
+	arena.block(7,6);
+
+	std::cout	<<	std::endl;
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
+	std::cout	<<	std::endl;
+	std::cout	<<	std::endl;
+
+	EXPECT_EQ(returnvalue.size(),0);
 
 }
 
-TEST(FindPathTest, FindPath_five)
+TEST(FindPathTest,	FindPath_five)
 {
- //Tests if FindPath finds a path when goal is outside the arena
- Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
+	//Tests	if	FindPath	finds	a	path	when	goal	is	outside	the	arena
+	Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
 
- GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(11,12);
+	GridSquare	*origin	=	arena.getGridSquare(2,1);
+	GridSquare	*goal	=	arena.getGridSquare(11,12);
 
 
- arena.block(2,0);
- arena.block(7,1);
- arena.block(0,2);
- arena.block(1,2);
- arena.block(3,2);
- arena.block(6,2);
- arena.block(3,3);
- arena.block(6,3);
- arena.block(8,3);
- arena.block(2,4);
- arena.block(3,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(2,5);
- arena.block(6,6);
- arena.block(7,6);
+	arena.block(2,0);
+	arena.block(7,1);
+	arena.block(0,2);
+	arena.block(1,2);
+	arena.block(3,2);
+	arena.block(6,2);
+	arena.block(3,3);
+	arena.block(6,3);
+	arena.block(8,3);
+	arena.block(2,4);
+	arena.block(3,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(2,5);
+	arena.block(6,6);
+	arena.block(7,6);
 
- std::cout << std::endl;
+	std::cout	<<	std::endl;
 
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
 
- std::cout << std::endl;
- std::cout << std::endl;
+	std::cout	<<	std::endl;
+	std::cout	<<	std::endl;
 
- EXPECT_EQ(returnvalue.size(),0);
+	EXPECT_EQ(returnvalue.size(),0);
 
 }
 
-/*TEST(FindPathTest, FindPath_three)
+/*TEST(FindPathTest,	FindPath_three)
 {
-  //Tests if FindPath returns the correct values
-  Arena arena(10,7);
- Arena* testarena;
- testarena = &arena;
-
- GridSquare *origin = arena.getGridSquare(2,1);
- GridSquare *goal = arena.getGridSquare(7,5);
-
-
- arena.block(2,0);
- arena.block(7,1);
- arena.block(0,2);
- arena.block(1,2);
- arena.block(3,2);
- arena.block(6,2);
- arena.block(3,3);
- arena.block(6,3);
- arena.block(8,3);
- arena.block(2,4);
- arena.block(3,4);
- arena.block(6,4);
- arena.block(8,4);
- arena.block(2,5);
- arena.block(6,6);
- arena.block(7,6);
-
- std::vector<Point> desiredvalues (7);
-
- desiredvalues[0].x = 2;
- desiredvalues[0].y = 1;
- desiredvalues[1].x = 3;
- desiredvalues[1].y = 1;
- desiredvalues[2].x = 4;
- desiredvalues[2].y = 2;
- desiredvalues[3].x = 5;
- desiredvalues[3].y = 3;
- desiredvalues[4].x = 5;
- desiredvalues[4].y = 4;
- desiredvalues[5].x = 6;
- desiredvalues[5].y = 5;
- desiredvalues[6].x = 7;
- desiredvalues[6].y = 5;
-
- std::vector<Point> returnvalue = FindPath(origin,goal,testarena);
-
- EXPECT_EQ(desiredvalues[0].x, returnvalue[0].x);
- EXPECT_EQ(desiredvalues[0].y, returnvalue[0].y);
- EXPECT_EQ(desiredvalues[1].x, returnvalue[1].x);
- EXPECT_EQ(desiredvalues[1].y, returnvalue[1].y);
- EXPECT_EQ(desiredvalues[2].x, returnvalue[2].x);
- EXPECT_EQ(desiredvalues[2].y, returnvalue[2].y);
- EXPECT_EQ(desiredvalues[3].x, returnvalue[3].x);
- EXPECT_EQ(desiredvalues[3].y, returnvalue[3].y);
- EXPECT_EQ(desiredvalues[4].x, returnvalue[4].x);
- EXPECT_EQ(desiredvalues[4].y, returnvalue[4].y);
- EXPECT_EQ(desiredvalues[5].x, returnvalue[5].x);
- EXPECT_EQ(desiredvalues[5].y, returnvalue[5].y);
- EXPECT_EQ(desiredvalues[6].x, returnvalue[6].x);
- EXPECT_EQ(desiredvalues[6].y, returnvalue[6].y);
+		//Tests	if	FindPath	returns	the	correct	values
+		Arena	arena(10,7);
+	Arena*	testarena;
+	testarena	=	&arena;
+
+	GridSquare	*origin	=	arena.getGridSquare(2,1);
+	GridSquare	*goal	=	arena.getGridSquare(7,5);
+
+
+	arena.block(2,0);
+	arena.block(7,1);
+	arena.block(0,2);
+	arena.block(1,2);
+	arena.block(3,2);
+	arena.block(6,2);
+	arena.block(3,3);
+	arena.block(6,3);
+	arena.block(8,3);
+	arena.block(2,4);
+	arena.block(3,4);
+	arena.block(6,4);
+	arena.block(8,4);
+	arena.block(2,5);
+	arena.block(6,6);
+	arena.block(7,6);
+
+	std::vector<Point>	desiredvalues	(7);
+
+	desiredvalues[0].x	=	2;
+	desiredvalues[0].y	=	1;
+	desiredvalues[1].x	=	3;
+	desiredvalues[1].y	=	1;
+	desiredvalues[2].x	=	4;
+	desiredvalues[2].y	=	2;
+	desiredvalues[3].x	=	5;
+	desiredvalues[3].y	=	3;
+	desiredvalues[4].x	=	5;
+	desiredvalues[4].y	=	4;
+	desiredvalues[5].x	=	6;
+	desiredvalues[5].y	=	5;
+	desiredvalues[6].x	=	7;
+	desiredvalues[6].y	=	5;
+
+	std::vector<Point>	returnvalue	=	FindPath(origin,goal,testarena);
+
+	EXPECT_EQ(desiredvalues[0].x,	returnvalue[0].x);
+	EXPECT_EQ(desiredvalues[0].y,	returnvalue[0].y);
+	EXPECT_EQ(desiredvalues[1].x,	returnvalue[1].x);
+	EXPECT_EQ(desiredvalues[1].y,	returnvalue[1].y);
+	EXPECT_EQ(desiredvalues[2].x,	returnvalue[2].x);
+	EXPECT_EQ(desiredvalues[2].y,	returnvalue[2].y);
+	EXPECT_EQ(desiredvalues[3].x,	returnvalue[3].x);
+	EXPECT_EQ(desiredvalues[3].y,	returnvalue[3].y);
+	EXPECT_EQ(desiredvalues[4].x,	returnvalue[4].x);
+	EXPECT_EQ(desiredvalues[4].y,	returnvalue[4].y);
+	EXPECT_EQ(desiredvalues[5].x,	returnvalue[5].x);
+	EXPECT_EQ(desiredvalues[5].y,	returnvalue[5].y);
+	EXPECT_EQ(desiredvalues[6].x,	returnvalue[6].x);
+	EXPECT_EQ(desiredvalues[6].y,	returnvalue[6].y);
 }*/
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp b/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
index 538393358..cd7477ace 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/NavigatorTest.cpp
@@ -1,143 +1,143 @@
-#include <gtest/gtest.h>
-#define private public
-#include "navigator.hh"
-#include <math.h>
-
-#define PI 3.14159265358979
-#define FP_TOLERANCE 0.000000001
-
-TEST(NavigatorTest, distanceTo_one) {
-
-  Point location(0.0, 0.0);
-  double heading = 0.0;
-  Navigator navigator(heading, location);
-  Point mapPoint(3.0, 4.0);
-  double distance = navigator.distanceTo(mapPoint);
-  EXPECT_NEAR(distance, 5.0, FP_TOLERANCE);
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"navigator.hh"
+#include	<math.h>
+
+#define	PI	3.14159265358979
+#define	FP_TOLERANCE	0.000000001
+
+TEST(NavigatorTest,	distanceTo_one)	{
+
+		Point	location(0.0,	0.0);
+		double	heading	=	0.0;
+		Navigator	navigator(heading,	location);
+		Point	mapPoint(3.0,	4.0);
+		double	distance	=	navigator.distanceTo(mapPoint);
+		EXPECT_NEAR(distance,	5.0,	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, distanceTo_two) {
+TEST(NavigatorTest,	distanceTo_two)	{
 
-  Point location(2.0, 2.0);
-  double heading = 0.0;
-  Navigator navigator(heading, location);
-  Point mapPoint(5.0, 6.0);
-  double distance = navigator.distanceTo(mapPoint);
-  EXPECT_NEAR(distance, 5.0, FP_TOLERANCE);
+		Point	location(2.0,	2.0);
+		double	heading	=	0.0;
+		Navigator	navigator(heading,	location);
+		Point	mapPoint(5.0,	6.0);
+		double	distance	=	navigator.distanceTo(mapPoint);
+		EXPECT_NEAR(distance,	5.0,	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, distanceTo_three) {
-  //Tests if distance is found correctly from a negative location to a positive mapPoint
-  Point location(-4,-5);
-  Navigator navigator(PI/6, location);
-  Point mapPoint(6, 9);
-  double distance = navigator.distanceTo(mapPoint);
+TEST(NavigatorTest,	distanceTo_three)	{
+		//Tests	if	distance	is	found	correctly	from	a	negative	location	to	a	positive	mapPoint
+		Point	location(-4,-5);
+		Navigator	navigator(PI/6,	location);
+		Point	mapPoint(6,	9);
+		double	distance	=	navigator.distanceTo(mapPoint);
 
-  EXPECT_NEAR(distance, 17.204650534, FP_TOLERANCE);
+		EXPECT_NEAR(distance,	17.204650534,	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, convertMapToPlatform_one)
+TEST(NavigatorTest,	convertMapToPlatform_one)
 {
-  //Tests if the mapPoint gets converted to platform correctly
-  Point location(5,4);
-  Navigator navigator(PI/6, location);
-  Point mapPoint(6,9);
-  Point platformPoint;
-  platformPoint = navigator.convertMapToPlatform(mapPoint);
-
-  EXPECT_EQ(platformPoint.x, 1);
-  EXPECT_EQ(platformPoint.y, 5);
+		//Tests	if	the	mapPoint	gets	converted	to	platform	correctly
+		Point	location(5,4);
+		Navigator	navigator(PI/6,	location);
+		Point	mapPoint(6,9);
+		Point	platformPoint;
+		platformPoint	=	navigator.convertMapToPlatform(mapPoint);
+
+		EXPECT_EQ(platformPoint.x,	1);
+		EXPECT_EQ(platformPoint.y,	5);
 }
 
-TEST(NavigatorTest, convertMapToPlatform_two)
+TEST(NavigatorTest,	convertMapToPlatform_two)
 {
-  //Tests if the mapPoint gets converted to platform correctly
-  //under slightly more strenuous conditions than the previous test
-  Point location(-8,-9);
-  Navigator navigator(5*PI/6, location);
-  Point mapPoint(3,-5);
-  Point platformPoint = navigator.convertMapToPlatform(mapPoint);
-
-  EXPECT_EQ(platformPoint.x, 11);
-  EXPECT_EQ(platformPoint.y, 4);
+		//Tests	if	the	mapPoint	gets	converted	to	platform	correctly
+		//under	slightly	more	strenuous	conditions	than	the	previous	test
+		Point	location(-8,-9);
+		Navigator	navigator(5*PI/6,	location);
+		Point	mapPoint(3,-5);
+		Point	platformPoint	=	navigator.convertMapToPlatform(mapPoint);
+
+		EXPECT_EQ(platformPoint.x,	11);
+		EXPECT_EQ(platformPoint.y,	4);
 }
 
-TEST(NavigatorTest, convertPlatformToBody_one)
+TEST(NavigatorTest,	convertPlatformToBody_one)
 {
-  // If heading is 45 degrees then <1,0> in platform coordinates should be
-  // <sqrt(2)/2, sqrt(2)/2> in body coordinates.
-  double heading = 45.0 * (PI/180.0);
-  Point location(0,0);
-  Navigator navigator(heading, location);
-  Point platformPoint(1,0);
-  Point bodyPoint = navigator.convertPlatformToBody(platformPoint);
-
-  double expectedResult = sqrt(2.0)/2.0;
-  EXPECT_NEAR(bodyPoint.x, expectedResult, FP_TOLERANCE);
-  EXPECT_NEAR(bodyPoint.y, expectedResult, FP_TOLERANCE);
+		//	If	heading	is	45	degrees	then	<1,0>	in	platform	coordinates	should	be
+		//	<sqrt(2)/2,	sqrt(2)/2>	in	body	coordinates.
+		double	heading	=	45.0	*	(PI/180.0);
+		Point	location(0,0);
+		Navigator	navigator(heading,	location);
+		Point	platformPoint(1,0);
+		Point	bodyPoint	=	navigator.convertPlatformToBody(platformPoint);
+
+		double	expectedResult	=	sqrt(2.0)/2.0;
+		EXPECT_NEAR(bodyPoint.x,	expectedResult,	FP_TOLERANCE);
+		EXPECT_NEAR(bodyPoint.y,	expectedResult,	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, convertPlatformToBody_two)
+TEST(NavigatorTest,	convertPlatformToBody_two)
 {
-  // If heading is 45 degrees, then <0,1> in platform coordinates
-  // should be <sqrt(2)/2, sqrt(2)/2> in body coordinates.
-  double heading = 45.0 * (PI/180.0);
-  Point location(0,0);
-  Navigator navigator(heading, location);
-  Point platformPoint(1,0);
-  Point bodyPoint = navigator.convertPlatformToBody(platformPoint);
-
-  double expectedResult = sqrt(2.0)/2.0;
-  EXPECT_NEAR(bodyPoint.x, expectedResult, FP_TOLERANCE);
-  EXPECT_NEAR(bodyPoint.y, expectedResult, FP_TOLERANCE);
+		//	If	heading	is	45	degrees,	then	<0,1>	in	platform	coordinates
+		//	should	be	<sqrt(2)/2,	sqrt(2)/2>	in	body	coordinates.
+		double	heading	=	45.0	*	(PI/180.0);
+		Point	location(0,0);
+		Navigator	navigator(heading,	location);
+		Point	platformPoint(1,0);
+		Point	bodyPoint	=	navigator.convertPlatformToBody(platformPoint);
+
+		double	expectedResult	=	sqrt(2.0)/2.0;
+		EXPECT_NEAR(bodyPoint.x,	expectedResult,	FP_TOLERANCE);
+		EXPECT_NEAR(bodyPoint.y,	expectedResult,	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, convertBodyToPlatform_one)
+TEST(NavigatorTest,	convertBodyToPlatform_one)
 {
-  // This test is the inverse of convertPlatformToBody_one.
-  double heading = 45.0 * (PI/180.0);
-  Point location(0,0);
-  Navigator navigator(heading, location);
+		//	This	test	is	the	inverse	of	convertPlatformToBody_one.
+		double	heading	=	45.0	*	(PI/180.0);
+		Point	location(0,0);
+		Navigator	navigator(heading,	location);
 
-  double H  = sqrt(2.0)/2.0;
-  Point bodyPoint(H,H);
-  Point platformPoint = navigator.convertBodyToPlatform(bodyPoint);
+		double	H		=	sqrt(2.0)/2.0;
+		Point	bodyPoint(H,H);
+		Point	platformPoint	=	navigator.convertBodyToPlatform(bodyPoint);
 
-  EXPECT_NEAR(platformPoint.x, 1.0, 00001);
-  EXPECT_NEAR(platformPoint.y, 0.0, 00001);
+		EXPECT_NEAR(platformPoint.x,	1.0,	00001);
+		EXPECT_NEAR(platformPoint.y,	0.0,	00001);
 }
 
-TEST(NavigatorTest, convertPlatformToMap_one)
+TEST(NavigatorTest,	convertPlatformToMap_one)
 {
-  //Tests if Platform points get converted to mapPoints correctly
-  Point location(-8,-9);
-  Navigator navigator(PI/6, location);
-  Point platformPoint(11,4);
-  Point mapPoint;
-  mapPoint = navigator.convertPlatformToMap(platformPoint);
-
-  EXPECT_EQ (mapPoint.x, 3);
-  EXPECT_EQ (mapPoint.y, -5);
+		//Tests	if	Platform	points	get	converted	to	mapPoints	correctly
+		Point	location(-8,-9);
+		Navigator	navigator(PI/6,	location);
+		Point	platformPoint(11,4);
+		Point	mapPoint;
+		mapPoint	=	navigator.convertPlatformToMap(platformPoint);
+
+		EXPECT_EQ	(mapPoint.x,	3);
+		EXPECT_EQ	(mapPoint.y,	-5);
 }
 
-TEST(NavigatorTest, bearingTo_one)
+TEST(NavigatorTest,	bearingTo_one)
 {
-  Point location(0,0);
-  Navigator navigator(PI/6, location);
-  Point mapPoint(3,0);
-  double bearing;
-  bearing = navigator.bearingTo(mapPoint);
+		Point	location(0,0);
+		Navigator	navigator(PI/6,	location);
+		Point	mapPoint(3,0);
+		double	bearing;
+		bearing	=	navigator.bearingTo(mapPoint);
 
-  EXPECT_NEAR (bearing, (-PI/6), FP_TOLERANCE);
+		EXPECT_NEAR	(bearing,	(-PI/6),	FP_TOLERANCE);
 }
 
-TEST(NavigatorTest, bearingTo_two)
+TEST(NavigatorTest,	bearingTo_two)
 {
-  Point location(20,0);
-  Navigator navigator(0.0, location);
-  Point mapPoint(20,20);
-  double bearing;
-  bearing = navigator.bearingTo(mapPoint);
-  std::cout << "bearing = " << bearing << std::endl;
-  EXPECT_NEAR (bearing, (-PI/6), FP_TOLERANCE);
+		Point	location(20,0);
+		Navigator	navigator(0.0,	location);
+		Point	mapPoint(20,20);
+		double	bearing;
+		bearing	=	navigator.bearingTo(mapPoint);
+		std::cout	<<	"bearing	=	"	<<	bearing	<<	std::endl;
+		EXPECT_NEAR	(bearing,	(-PI/6),	FP_TOLERANCE);
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/DCMotor.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/DCMotor.cpp
index ebe82c683..cd76e6658 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/DCMotor.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/DCMotor.cpp
@@ -1,35 +1,35 @@
-#include "../include/DCMotor.hh"
-#include <iostream>
-#include <cmath>
+#include	"../include/DCMotor.hh"
+#include	<iostream>
+#include	<cmath>
 
 
-DCMotor::DCMotor (const double initialInternalResistance,
-                  const double initialMotorTorqueConstant)
-                : motorTorque(0.0),
-                  motorCurrent(0.0),
-                  currentLoad(0.0),
-                  internalResistance(initialInternalResistance),
-                  motorTorqueConstant(initialMotorTorqueConstant)
-{ }
+DCMotor::DCMotor	(const	double	initialInternalResistance,
+																		const	double	initialMotorTorqueConstant)
+																:	motorTorque(0.0),
+																		motorCurrent(0.0),
+																		currentLoad(0.0),
+																		internalResistance(initialInternalResistance),
+																		motorTorqueConstant(initialMotorTorqueConstant)
+{	}
 
-void DCMotor :: update (const double motorVoltage)
+void	DCMotor	::	update	(const	double	motorVoltage)
 {
-    motorCurrent = motorVoltage / internalResistance ;
-    motorTorque = motorCurrent * motorTorqueConstant;
-    currentLoad = std :: abs (motorCurrent);
+				motorCurrent	=	motorVoltage	/	internalResistance	;
+				motorTorque	=	motorCurrent	*	motorTorqueConstant;
+				currentLoad	=	std	::	abs	(motorCurrent);
 }
 
-void DCMotor::update (const PWM& PulseWidth)
+void	DCMotor::update	(const	PWM&	PulseWidth)
 {
-    update(PulseWidth.getAverageVoltage());
+				update(PulseWidth.getAverageVoltage());
 }
 
-double DCMotor :: getTorque()
+double	DCMotor	::	getTorque()
 {
-    return motorTorque;
+				return	motorTorque;
 }
 
-double DCMotor :: getCurrentLoad()
+double	DCMotor	::	getCurrentLoad()
 {
-    return currentLoad;
+				return	currentLoad;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/DCMotorSpeedController.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/DCMotorSpeedController.cpp
index 381f51ea3..259136144 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/DCMotorSpeedController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/DCMotorSpeedController.cpp
@@ -1,29 +1,29 @@
 
-#include "Motor/include/DCMotorSpeedController.hh"
-#include <iostream>
+#include	"Motor/include/DCMotorSpeedController.hh"
+#include	<iostream>
 
 DCMotorSpeedController::DCMotorSpeedController(
-        DCMotor& dc_motor,
-        double Gain,
-        const double& actual_speed,
-        const double& supply_voltage)
-        : motorVoltage(0.0),
-          motor(dc_motor),
-          gain(Gain),
-          actualSpeed(actual_speed),
-          supplyVoltage(supply_voltage)
+								DCMotor&	dc_motor,
+								double	Gain,
+								const	double&	actual_speed,
+								const	double&	supply_voltage)
+								:	motorVoltage(0.0),
+										motor(dc_motor),
+										gain(Gain),
+										actualSpeed(actual_speed),
+										supplyVoltage(supply_voltage)
 {};
 
-void DCMotorSpeedController::setCommandedSpeed ( double commandedSpeed)
+void	DCMotorSpeedController::setCommandedSpeed	(	double	commandedSpeed)
 {
-    MotorSpeedController::setCommandedSpeed( commandedSpeed);
-    motorVoltage = supplyVoltage * gain * (commandedSpeed - actualSpeed);
-    motorVoltage = std :: min (supplyVoltage, motorVoltage);
-    motorVoltage = std :: max (-supplyVoltage, motorVoltage);
-    motor.update( motorVoltage);
+				MotorSpeedController::setCommandedSpeed(	commandedSpeed);
+				motorVoltage	=	supplyVoltage	*	gain	*	(commandedSpeed	-	actualSpeed);
+				motorVoltage	=	std	::	min	(supplyVoltage,	motorVoltage);
+				motorVoltage	=	std	::	max	(-supplyVoltage,	motorVoltage);
+				motor.update(	motorVoltage);
 }
 
-double DCMotorSpeedController::getMotorVoltage()
+double	DCMotorSpeedController::getMotorVoltage()
 {
-    return motorVoltage;
+				return	motorVoltage;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/Motor.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/Motor.cpp
index 1369c0f03..e78f4a010 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/Motor.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/Motor.cpp
@@ -1,5 +1,5 @@
-#include "Motor.hh"
+#include	"Motor.hh"
 
-Motor::Motor () {}
-Motor::~Motor() {}
-double Motor::getActualSpeed() {return 0;}
+Motor::Motor	()	{}
+Motor::~Motor()	{}
+double	Motor::getActualSpeed()	{return	0;}
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
index 29ae91ac6..e841b94e4 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
@@ -1,29 +1,29 @@
-#include "../include/PWM.hh"
-#include <iostream>
-#include <cmath>
+#include	"../include/PWM.hh"
+#include	<iostream>
+#include	<cmath>
 
-PWM::PWM ( double HighVoltage,
-           double LowVoltage,
-           double DutyCycle) {
+PWM::PWM	(	double	HighVoltage,
+											double	LowVoltage,
+											double	DutyCycle)	{
 
-   highVoltage = HighVoltage;
-   lowVoltage  = LowVoltage;
-   setDutyCycle( DutyCycle);
+			highVoltage	=	HighVoltage;
+			lowVoltage		=	LowVoltage;
+			setDutyCycle(	DutyCycle);
 }
 
-void PWM::setDutyCycle( double DutyCycle) {
-   if (( DutyCycle >= 0.0 ) && ( DutyCycle <= 1.0 )) {
-       dutyCycle = DutyCycle;
-   } else {
-       throw std::logic_error("PWM::PWM(): DutyCycle must be between 0.0 .. 1.0.");
-   }
+void	PWM::setDutyCycle(	double	DutyCycle)	{
+			if	((	DutyCycle	>=	0.0	)	&&	(	DutyCycle	<=	1.0	))	{
+							dutyCycle	=	DutyCycle;
+			}	else	{
+							throw	std::logic_error("PWM::PWM():	DutyCycle	must	be	between	0.0	..	1.0.");
+			}
 }
 
-double PWM :: getDutyCycle() const {
-    return dutyCycle;
+double	PWM	::	getDutyCycle()	const	{
+				return	dutyCycle;
 }
 
-double PWM::getAverageVoltage() const {
+double	PWM::getAverageVoltage()	const	{
 
-    return ( (highVoltage * dutyCycle + lowVoltage * (1 - dutyCycle)) / 2);
+				return	(	(highVoltage	*	dutyCycle	+	lowVoltage	*	(1	-	dutyCycle))	/	2);
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
index 8a70ceef0..15ca9e2cb 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/ServoMotor.cpp
@@ -1,35 +1,35 @@
-#include "Motor/include/ServoMotor.hh"
+#include	"Motor/include/ServoMotor.hh"
 
-ServoMotor::ServoMotor (char side)
+ServoMotor::ServoMotor	(char	side)
 {
-  _side = side;
+		_side	=	side;
 }
 
-double ServoMotor::getActualSpeed(int PulseWidth)
+double	ServoMotor::getActualSpeed(int	PulseWidth)
 {
-  _PulseWidth = PulseWidth;
+		_PulseWidth	=	PulseWidth;
 
-  if (_side == 'L')
-  {
-     actualspeed = -1.8147280722744906e+001 * pow(_PulseWidth,0)
-		    + -3.4553463215611258e-001 * pow(_PulseWidth,1)
-		    +  4.5593326051360884e-002 * pow(_PulseWidth,2)
-		    + -1.8392645176315394e-003 * pow(_PulseWidth,3)
-		    +  3.3261726281542813e-005 * pow(_PulseWidth,4)
-		    + -2.8937430901462806e-007 * pow(_PulseWidth,5)
-		    +  1.2003663411874751e-009 * pow(_PulseWidth,6)
-		    + -1.9140644089539568e-012 * pow(_PulseWidth,7);
-  }
-  else if (_side == 'R')
-  {
-      actualspeed = 1.8147280722744906e+001 * pow(_PulseWidth,0)
-		    +  3.4553463215611258e-001 * pow(_PulseWidth,1)
-		    + -4.5593326051360884e-002 * pow(_PulseWidth,2)
-		    +  1.8392645176315394e-003 * pow(_PulseWidth,3)
-		    + -3.3261726281542813e-005 * pow(_PulseWidth,4)
-		    +  2.8937430901462806e-007 * pow(_PulseWidth,5)
-		    + -1.2003663411874751e-009 * pow(_PulseWidth,6)
-		    +  1.9140644089539568e-012 * pow(_PulseWidth,7);
-  }
-  return actualspeed;
+		if	(_side	==	'L')
+		{
+					actualspeed	=	-1.8147280722744906e+001	*	pow(_PulseWidth,0)
+						+	-3.4553463215611258e-001	*	pow(_PulseWidth,1)
+						+		4.5593326051360884e-002	*	pow(_PulseWidth,2)
+						+	-1.8392645176315394e-003	*	pow(_PulseWidth,3)
+						+		3.3261726281542813e-005	*	pow(_PulseWidth,4)
+						+	-2.8937430901462806e-007	*	pow(_PulseWidth,5)
+						+		1.2003663411874751e-009	*	pow(_PulseWidth,6)
+						+	-1.9140644089539568e-012	*	pow(_PulseWidth,7);
+		}
+		else	if	(_side	==	'R')
+		{
+						actualspeed	=	1.8147280722744906e+001	*	pow(_PulseWidth,0)
+						+		3.4553463215611258e-001	*	pow(_PulseWidth,1)
+						+	-4.5593326051360884e-002	*	pow(_PulseWidth,2)
+						+		1.8392645176315394e-003	*	pow(_PulseWidth,3)
+						+	-3.3261726281542813e-005	*	pow(_PulseWidth,4)
+						+		2.8937430901462806e-007	*	pow(_PulseWidth,5)
+						+	-1.2003663411874751e-009	*	pow(_PulseWidth,6)
+						+		1.9140644089539568e-012	*	pow(_PulseWidth,7);
+		}
+		return	actualspeed;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
index b50da8252..69eb3061b 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/ServoSpeedController.cpp
@@ -1,59 +1,59 @@
-#include "Motor/include/ServoSpeedController.hh"
+#include	"Motor/include/ServoSpeedController.hh"
 
 
-ServoSpeedController::ServoSpeedController(ServoMotor& Servo_Motor, char side):
-					  servo(Servo_Motor), _side(side)
+ServoSpeedController::ServoSpeedController(ServoMotor&	Servo_Motor,	char	side):
+							servo(Servo_Motor),	_side(side)
 {};
 
-void ServoSpeedController::setCommandedSpeed (double commandedSpeed)
+void	ServoSpeedController::setCommandedSpeed	(double	commandedSpeed)
 {
-  double PulseWidth;
-
-  if (_side == 'L')
-  {
-    std::cout <<"The left wheel desired speed is: " << desiredspeed << std::endl;
-
-    PulseWidth = 9.1296697267545980e+001 * pow(desiredspeed,0)
-		+  1.3551549019843796e+000 * pow(desiredspeed,1)
-		+ -2.5748263162935388e-002 * pow(desiredspeed,2)
-		+ -3.7691759514032080e-003 * pow(desiredspeed,3)
-		+  3.8490572015823302e-004 * pow(desiredspeed,4)
-		+  4.5526955758039407e-005 * pow(desiredspeed,5)
-		+ -6.7622608926425730e-007 * pow(desiredspeed,6);
-    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl;
-
-    _PulseWidth = (int)PulseWidth;
-  }
-  else if(_side == 'R')
-  {
-
-    std::cout <<"The right wheel desired speed is: " << desiredspeed << std::endl;
-
-    PulseWidth = 9.1296697267545980e+001 * pow(desiredspeed,0)
-		  + -1.3551549019843796e+000 * pow(desiredspeed,1)
-		  + -2.5748263162935388e-002 * pow(desiredspeed,2)
-		  +  3.7691759514032080e-003 * pow(desiredspeed,3)
-		  +  3.8490572015823302e-004 * pow(desiredspeed,4)
-		  + -4.5526955758039407e-005 * pow(desiredspeed,5)
-		  + -6.7622608926425730e-007 * pow(desiredspeed,6);
-    std::cout << "The pulse width for the side above is " << PulseWidth << std::endl;
-
-    _PulseWidth = (int)PulseWidth;
-  }
-
-  if (_PulseWidth > 180)
-  {
-    _PulseWidth = 180;
-  }
-  else if (_PulseWidth < 0)
-  {
-    _PulseWidth = 0;
-  }
-
-  if (_side == 'L')
-    std::cout<<"Left Servo angle is: " << _PulseWidth <<std::endl;
-  else if (_side == 'R')
-    std::cout<<"Right Servo angle is: "<< _PulseWidth <<std::endl;
-
-  //return _PulseWidth;
+		double	PulseWidth;
+
+		if	(_side	==	'L')
+		{
+				std::cout	<<"The	left	wheel	desired	speed	is:	"	<<	desiredspeed	<<	std::endl;
+
+				PulseWidth	=	9.1296697267545980e+001	*	pow(desiredspeed,0)
+		+		1.3551549019843796e+000	*	pow(desiredspeed,1)
+		+	-2.5748263162935388e-002	*	pow(desiredspeed,2)
+		+	-3.7691759514032080e-003	*	pow(desiredspeed,3)
+		+		3.8490572015823302e-004	*	pow(desiredspeed,4)
+		+		4.5526955758039407e-005	*	pow(desiredspeed,5)
+		+	-6.7622608926425730e-007	*	pow(desiredspeed,6);
+				std::cout	<<	"The	pulse	width	for	the	side	above	is	"	<<	PulseWidth	<<	std::endl;
+
+				_PulseWidth	=	(int)PulseWidth;
+		}
+		else	if(_side	==	'R')
+		{
+
+				std::cout	<<"The	right	wheel	desired	speed	is:	"	<<	desiredspeed	<<	std::endl;
+
+				PulseWidth	=	9.1296697267545980e+001	*	pow(desiredspeed,0)
+				+	-1.3551549019843796e+000	*	pow(desiredspeed,1)
+				+	-2.5748263162935388e-002	*	pow(desiredspeed,2)
+				+		3.7691759514032080e-003	*	pow(desiredspeed,3)
+				+		3.8490572015823302e-004	*	pow(desiredspeed,4)
+				+	-4.5526955758039407e-005	*	pow(desiredspeed,5)
+				+	-6.7622608926425730e-007	*	pow(desiredspeed,6);
+				std::cout	<<	"The	pulse	width	for	the	side	above	is	"	<<	PulseWidth	<<	std::endl;
+
+				_PulseWidth	=	(int)PulseWidth;
+		}
+
+		if	(_PulseWidth	>	180)
+		{
+				_PulseWidth	=	180;
+		}
+		else	if	(_PulseWidth	<	0)
+		{
+				_PulseWidth	=	0;
+		}
+
+		if	(_side	==	'L')
+				std::cout<<"Left	Servo	angle	is:	"	<<	_PulseWidth	<<std::endl;
+		else	if	(_side	==	'R')
+				std::cout<<"Right	Servo	angle	is:	"<<	_PulseWidth	<<std::endl;
+
+		//return	_PulseWidth;
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp b/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
index 89f626c38..22c5371f6 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/DCMotorTest.cpp
@@ -1,83 +1,83 @@
-#include <gtest/gtest.h>
-#define private public
-#include "DCMotor.hh"
-
-TEST( MotorModelTest , one ) {
-    // Attempt to create a Motor
-   DCMotor * motor;
-   motor = new DCMotor(8.0, 7.0);
-   EXPECT_NE( (void*)0, motor);
-   //delete motor;
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"DCMotor.hh"
+
+TEST(	MotorModelTest	,	one	)	{
+				//	Attempt	to	create	a	Motor
+			DCMotor	*	motor;
+			motor	=	new	DCMotor(8.0,	7.0);
+			EXPECT_NE(	(void*)0,	motor);
+			//delete	motor;
 }
 
-TEST( MotorModelTest , two ) {
-    // Test Motor Torque
-    DCMotor motor(8.0, 7.0);
-    EXPECT_DOUBLE_EQ( 0.0, motor.motorTorque );
+TEST(	MotorModelTest	,	two	)	{
+				//	Test	Motor	Torque
+				DCMotor	motor(8.0,	7.0);
+				EXPECT_DOUBLE_EQ(	0.0,	motor.motorTorque	);
 
 }
 
-TEST( MotorModelTest , three ) {
-    // Test Motor Current
-    DCMotor motor(8.0, 7.0);
-    EXPECT_DOUBLE_EQ( 0.0, motor.motorCurrent );
+TEST(	MotorModelTest	,	three	)	{
+				//	Test	Motor	Current
+				DCMotor	motor(8.0,	7.0);
+				EXPECT_DOUBLE_EQ(	0.0,	motor.motorCurrent	);
 
 }
 
-TEST( MotorModelTest , four ) {
-    // Test Battery Current
-    DCMotor motor(8.0, 7.0);
-    EXPECT_DOUBLE_EQ( 0.0, motor.currentLoad );
+TEST(	MotorModelTest	,	four	)	{
+				//	Test	Battery	Current
+				DCMotor	motor(8.0,	7.0);
+				EXPECT_DOUBLE_EQ(	0.0,	motor.currentLoad	);
 
 }
 
-TEST( MotorModelTest , five ) {
-    // Test Internal Resistance
-    DCMotor motor(8.0, 7.0);
-    EXPECT_DOUBLE_EQ( 8.0, motor.internalResistance );
+TEST(	MotorModelTest	,	five	)	{
+				//	Test	Internal	Resistance
+				DCMotor	motor(8.0,	7.0);
+				EXPECT_DOUBLE_EQ(	8.0,	motor.internalResistance	);
 
 }
 
-TEST( MotorModelTest , six ) {
-    // Test Motor Torque Constant
-    DCMotor motor(8.0, 7.0);
-    EXPECT_DOUBLE_EQ( 7.0, motor.motorTorqueConstant );
+TEST(	MotorModelTest	,	six	)	{
+				//	Test	Motor	Torque	Constant
+				DCMotor	motor(8.0,	7.0);
+				EXPECT_DOUBLE_EQ(	7.0,	motor.motorTorqueConstant	);
 
 }
 
-TEST( MotorModelTest , seven ) {
-    // Test Caculation for Motor Torque
-    DCMotor motor(8.0, 7.0);
-    double motorVoltage = (16.0);
-    motor.update (motorVoltage );
-    EXPECT_DOUBLE_EQ( 14.0, motor.motorTorque );
+TEST(	MotorModelTest	,	seven	)	{
+				//	Test	Caculation	for	Motor	Torque
+				DCMotor	motor(8.0,	7.0);
+				double	motorVoltage	=	(16.0);
+				motor.update	(motorVoltage	);
+				EXPECT_DOUBLE_EQ(	14.0,	motor.motorTorque	);
 
 }
 
-TEST( MotorModelTest , eight ) {
-    // Test Caculation for Motor Current
-    DCMotor motor(8.0, 7.0);
-    double motorVoltage = (16.0);
-    motor.update (motorVoltage );
-    EXPECT_DOUBLE_EQ( 2.0, motor.motorCurrent );
+TEST(	MotorModelTest	,	eight	)	{
+				//	Test	Caculation	for	Motor	Current
+				DCMotor	motor(8.0,	7.0);
+				double	motorVoltage	=	(16.0);
+				motor.update	(motorVoltage	);
+				EXPECT_DOUBLE_EQ(	2.0,	motor.motorCurrent	);
 
 }
 
-TEST( MotorModelTest , nine ) {
-    // Test Caculation for Battery Current
-    DCMotor motor(8.0, 7.0);
-    double motorVoltage = (24.0);
-    motor.update (motorVoltage );
-    EXPECT_DOUBLE_EQ( 3.0, motor.currentLoad );
+TEST(	MotorModelTest	,	nine	)	{
+				//	Test	Caculation	for	Battery	Current
+				DCMotor	motor(8.0,	7.0);
+				double	motorVoltage	=	(24.0);
+				motor.update	(motorVoltage	);
+				EXPECT_DOUBLE_EQ(	3.0,	motor.currentLoad	);
 
 }
 
 
-TEST( MotorModelTest , ten ) {
-    // Test Caculation for Battery Current that returns an Absolute Value
-    DCMotor motor(8.0, 7.0);
-    double motorVoltage = (-24.0);
-    motor.update (motorVoltage );
-    EXPECT_DOUBLE_EQ( 3.0, motor.currentLoad );
+TEST(	MotorModelTest	,	ten	)	{
+				//	Test	Caculation	for	Battery	Current	that	returns	an	Absolute	Value
+				DCMotor	motor(8.0,	7.0);
+				double	motorVoltage	=	(-24.0);
+				motor.update	(motorVoltage	);
+				EXPECT_DOUBLE_EQ(	3.0,	motor.currentLoad	);
 
 }
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/test/DifferentialDriveControllerTest.cpp b/trick_sims/SIM_wheelbot/models/Motor/test/test/DifferentialDriveControllerTest.cpp
index 7c9e2fc2e..a14f5f5cd 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/test/DifferentialDriveControllerTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/test/DifferentialDriveControllerTest.cpp
@@ -1,172 +1,172 @@
-#include <gtest/gtest.h>
-#define private public
-#include "Control/include/testMotorController.hh"
-#include "Control/include/differentialDriveController.hh"
-#include <algorithm>
-
-#ifndef PI
-#define PI 3.1415926535
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"Control/include/testMotorController.hh"
+#include	"Control/include/differentialDriveController.hh"
+#include	<algorithm>
+
+#ifndef	PI
+#define	PI	3.1415926535
 #endif
-#define FLOAT_TOLERANCE 0.000001
+#define	FLOAT_TOLERANCE	0.000001
 
 /*
-    Test Fixture.
+				Test	Fixture.
 */
-class differentialDriveControllerTest : public ::testing::Test {
-    protected:
-
-    TestMotorController* rightMotorController;
-    TestMotorController* leftMotorController;
-    DifferentialDriveController* driveController;
-
-    differentialDriveControllerTest() {
-    rightMotorController =
-        new TestMotorController();
-    leftMotorController =
-        new TestMotorController();
-    driveController =
-        new DifferentialDriveController(0.183, 0.045, 8.880, 0.200,
-                *rightMotorController, *leftMotorController);
-    }
-
-    ~differentialDriveControllerTest() {
-        delete driveController;
-        delete rightMotorController;
-        delete leftMotorController;
-    }
+class	differentialDriveControllerTest	:	public	::testing::Test	{
+				protected:
+
+				TestMotorController*	rightMotorController;
+				TestMotorController*	leftMotorController;
+				DifferentialDriveController*	driveController;
+
+				differentialDriveControllerTest()	{
+				rightMotorController	=
+								new	TestMotorController();
+				leftMotorController	=
+								new	TestMotorController();
+				driveController	=
+								new	DifferentialDriveController(0.183,	0.045,	8.880,	0.200,
+																*rightMotorController,	*leftMotorController);
+				}
+
+				~differentialDriveControllerTest()	{
+								delete	driveController;
+								delete	rightMotorController;
+								delete	leftMotorController;
+				}
 };
 
-TEST_F( differentialDriveControllerTest , constructor) {
+TEST_F(	differentialDriveControllerTest	,	constructor)	{
 
-    EXPECT_NEAR(0.045, driveController->wheelRadius, FLOAT_TOLERANCE);
-    EXPECT_NEAR(0.183, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
-    EXPECT_NEAR(8.880, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
-    EXPECT_NEAR(0.200, driveController->slowDownDistance, FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.045,	driveController->wheelRadius,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.183,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(8.880,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
+				EXPECT_NEAR(0.200,	driveController->slowDownDistance,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setDistanceBetweenWheels ) {
+TEST_F(	differentialDriveControllerTest	,	setDistanceBetweenWheels	)	{
 
-    int result;
+				int	result;
 
-    result = driveController->setDistanceBetweenWheels(0.1);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.1, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(0.1);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.1,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 
-    result = driveController->setDistanceBetweenWheels(0.2);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.2, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(0.2);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.2,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 
-    result = driveController->setDistanceBetweenWheels(-0.3);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(0.2, driveController->distanceBetweenWheels, FLOAT_TOLERANCE);
+				result	=	driveController->setDistanceBetweenWheels(-0.3);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(0.2,	driveController->distanceBetweenWheels,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setWheelRadius ) {
+TEST_F(	differentialDriveControllerTest	,	setWheelRadius	)	{
 
-    int result;
-    result = driveController->setWheelRadius(0.059);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.059, driveController->wheelRadius, FLOAT_TOLERANCE);
+				int	result;
+				result	=	driveController->setWheelRadius(0.059);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.059,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRadius(0.083);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(0.083, driveController->wheelRadius, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRadius(0.083);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(0.083,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRadius(-0.075);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(0.083, driveController->wheelRadius, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRadius(-0.075);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(0.083,	driveController->wheelRadius,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , setWheelRotationRateLimit ) {
+TEST_F(	differentialDriveControllerTest	,	setWheelRotationRateLimit	)	{
 
-    int result;
-    result = driveController->setWheelRotationRateLimit(7.123);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(7.123, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				int	result;
+				result	=	driveController->setWheelRotationRateLimit(7.123);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(7.123,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRotationRateLimit(5.234);
-    EXPECT_EQ(0,result);
-    EXPECT_NEAR(5.234, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRotationRateLimit(5.234);
+				EXPECT_EQ(0,result);
+				EXPECT_NEAR(5.234,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 
-    result = driveController->setWheelRotationRateLimit(-4.987);
-    EXPECT_EQ(1,result);
-    EXPECT_NEAR(5.234, driveController->wheelRotationRateLimit, FLOAT_TOLERANCE);
+				result	=	driveController->setWheelRotationRateLimit(-4.987);
+				EXPECT_EQ(1,result);
+				EXPECT_NEAR(5.234,	driveController->wheelRotationRateLimit,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , PositiveRangeErrorOnly) {
+TEST_F(	differentialDriveControllerTest	,	PositiveRangeErrorOnly)	{
 
-    // If there is no heading error, and the distance error is non-zero,
-    // then the speeds should be the same, and equal to the wheelRotationRateLimit.
+				//	If	there	is	no	heading	error,	and	the	distance	error	is	non-zero,
+				//	then	the	speeds	should	be	the	same,	and	equal	to	the	wheelRotationRateLimit.
 
-    double distance_err = 1.0;
-    double heading_err  = 0.0;
-    driveController->update(distance_err, heading_err);
+				double	distance_err	=	1.0;
+				double	heading_err		=	0.0;
+				driveController->update(distance_err,	heading_err);
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    // the speeds should be the same
-    EXPECT_NEAR(rightMotorSpeedCommand, leftMotorSpeedCommand, FLOAT_TOLERANCE);
-    // and equal to the setWheelRotationRateLimit.
-    EXPECT_NEAR(rightMotorSpeedCommand, 8.880, FLOAT_TOLERANCE);
+				//	the	speeds	should	be	the	same
+				EXPECT_NEAR(rightMotorSpeedCommand,	leftMotorSpeedCommand,	FLOAT_TOLERANCE);
+				//	and	equal	to	the	setWheelRotationRateLimit.
+				EXPECT_NEAR(rightMotorSpeedCommand,	8.880,	FLOAT_TOLERANCE);
 }
 
-TEST_F( differentialDriveControllerTest , positiveHeadingError ) {
+TEST_F(	differentialDriveControllerTest	,	positiveHeadingError	)	{
 
-    // If the heading error is positive, then we should turn to the right,
-    // meaning that the left wheel should move faster than the right wheel.
+				//	If	the	heading	error	is	positive,	then	we	should	turn	to	the	right,
+				//	meaning	that	the	left	wheel	should	move	faster	than	the	right	wheel.
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
 
-    driveController->update(0.0, 0.1*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	0.1*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 30*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	30*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(100.0, 60*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(100.0,	60*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 89*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	89*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 90*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	90*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 91*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	91*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(100.0, 120*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(100.0,	120*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(0.0, 150*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(0.0,	150*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 
-    driveController->update(50.0, 179*(PI/180.0));
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(leftMotorSpeedCommand, rightMotorSpeedCommand);
+				driveController->update(50.0,	179*(PI/180.0));
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(leftMotorSpeedCommand,	rightMotorSpeedCommand);
 }
 
-TEST_F( differentialDriveControllerTest, negativeHeadingError ) {
+TEST_F(	differentialDriveControllerTest,	negativeHeadingError	)	{
 
-    // If the heading error is negative, then we should turn to the left,
-    // meaning that the right wheel should move faster than the left wheel.
+				//	If	the	heading	error	is	negative,	then	we	should	turn	to	the	left,
+				//	meaning	that	the	right	wheel	should	move	faster	than	the	left	wheel.
 
-    double distance_err = 0.0;
-    double heading_err  = -30*(PI/180.0);
-    driveController->update(distance_err, heading_err);
+				double	distance_err	=	0.0;
+				double	heading_err		=	-30*(PI/180.0);
+				driveController->update(distance_err,	heading_err);
 
-    double rightMotorSpeedCommand, leftMotorSpeedCommand;
-    driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand, rightMotorSpeedCommand);
-    EXPECT_GT(rightMotorSpeedCommand, leftMotorSpeedCommand);
+				double	rightMotorSpeedCommand,	leftMotorSpeedCommand;
+				driveController->getCommandedMotorSpeeds(leftMotorSpeedCommand,	rightMotorSpeedCommand);
+				EXPECT_GT(rightMotorSpeedCommand,	leftMotorSpeedCommand);
 }
 
 
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/test/VehicleControllerTest.cpp b/trick_sims/SIM_wheelbot/models/Motor/test/test/VehicleControllerTest.cpp
index bfd57b03e..5bfc699a3 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/test/VehicleControllerTest.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/test/VehicleControllerTest.cpp
@@ -1,58 +1,58 @@
-#include <gtest/gtest.h>
-#define private public
-#include "Control/include/testMotorController.hh"
-#include "Control/include/vehicleController.hh"
-#include <algorithm>
-
-#ifndef PI
-#define PI 3.1415926535
+#include	<gtest/gtest.h>
+#define	private	public
+#include	"Control/include/testMotorController.hh"
+#include	"Control/include/vehicleController.hh"
+#include	<algorithm>
+
+#ifndef	PI
+#define	PI	3.1415926535
 #endif
-#define FLOAT_TOLERANCE 0.000001
+#define	FLOAT_TOLERANCE	0.000001
 
 /*
-Test Fixture.
+Test	Fixture.
 */
-class vehicleControllerTest : public ::testing::Test {
-    protected:
-    std::vector<Point> waypointQueue;
-    Navigator *navigator;
-    TestMotorController* rightMotorController;
-    TestMotorController* leftMotorController;
-    DifferentialDriveController* driveController;
-    VehicleController* vehicleController;
-
-    vehicleControllerTest() {
-
-        Point waypoint(1.0, 3.0);
-        waypointQueue.push_back( waypoint);
-
-        Point initLocation(0.0, 0.0);
-        rightMotorController = new TestMotorController();
-        leftMotorController  = new TestMotorController();
-        driveController = new DifferentialDriveController(0.183, 0.045, 8.880, 0.200,
-                                                          *rightMotorController,
-                                                          *leftMotorController);
-        navigator = new Navigator(0.0, initLocation);
-        vehicleController = new VehicleController( &waypointQueue, *navigator, *driveController, 0.02);
-
-    }
-
-    ~vehicleControllerTest() {
-        delete navigator;
-        delete driveController;
-    }
-
-    void SetUp() {}
-    void TearDown() {}
+class	vehicleControllerTest	:	public	::testing::Test	{
+				protected:
+				std::vector<Point>	waypointQueue;
+				Navigator	*navigator;
+				TestMotorController*	rightMotorController;
+				TestMotorController*	leftMotorController;
+				DifferentialDriveController*	driveController;
+				VehicleController*	vehicleController;
+
+				vehicleControllerTest()	{
+
+								Point	waypoint(1.0,	3.0);
+								waypointQueue.push_back(	waypoint);
+
+								Point	initLocation(0.0,	0.0);
+								rightMotorController	=	new	TestMotorController();
+								leftMotorController		=	new	TestMotorController();
+								driveController	=	new	DifferentialDriveController(0.183,	0.045,	8.880,	0.200,
+																																																										*rightMotorController,
+																																																										*leftMotorController);
+								navigator	=	new	Navigator(0.0,	initLocation);
+								vehicleController	=	new	VehicleController(	&waypointQueue,	*navigator,	*driveController,	0.02);
+
+				}
+
+				~vehicleControllerTest()	{
+								delete	navigator;
+								delete	driveController;
+				}
+
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
 
-TEST_F( vehicleControllerTest , one ) {
+TEST_F(	vehicleControllerTest	,	one	)	{
 
-    Point current_destination;
-    int result = vehicleController->getCurrentDestination(current_destination);
-    EXPECT_EQ(result, 0);
-    EXPECT_EQ(current_destination.x, 1);
-    EXPECT_EQ(current_destination.y, 3);
+				Point	current_destination;
+				int	result	=	vehicleController->getCurrentDestination(current_destination);
+				EXPECT_EQ(result,	0);
+				EXPECT_EQ(current_destination.x,	1);
+				EXPECT_EQ(current_destination.y,	3);
 }
 
diff --git a/trick_sims/SIM_wheelbot/models/Vehicle/src/vehicleOne.cpp b/trick_sims/SIM_wheelbot/models/Vehicle/src/vehicleOne.cpp
index ea3a41ea9..682cb8ae5 100644
--- a/trick_sims/SIM_wheelbot/models/Vehicle/src/vehicleOne.cpp
+++ b/trick_sims/SIM_wheelbot/models/Vehicle/src/vehicleOne.cpp
@@ -1,245 +1,245 @@
-/********************************* TRICK HEADER *******************************
-PURPOSE: ( Simulate a two wheeled robotic vehicle.)
-LIBRARY DEPENDENCY:
-    ((vehicleOne.o)
-     (Control/src/vehicleController.o)
-     (Control/src/differentialDriveController.o)
-     (Motor/src/DCMotorSpeedController.o)
-     (Motor/src/DCMotor.o))
+/*********************************	TRICK	HEADER	*******************************
+PURPOSE:	(	Simulate	a	two	wheeled	robotic	vehicle.)
+LIBRARY	DEPENDENCY:
+				((vehicleOne.o)
+					(Control/src/vehicleController.o)
+					(Control/src/differentialDriveController.o)
+					(Motor/src/DCMotorSpeedController.o)
+					(Motor/src/DCMotor.o))
 PROGRAMMERS:
-    (((John M. Penn) (L3 Communications) (June 2015) (Trick Refresher Project)))
+				(((John	M.	Penn)	(L3	Communications)	(June	2015)	(Trick	Refresher	Project)))
 *******************************************************************************/
-#include "Vehicle/include/vehicleOne.hh"
-#include <iostream>
-#include <math.h>
-
-int VehicleOne::default_data() {
-
-    distanceBetweenWheels = 0.183;
-    wheelRadius = 0.045;
-    vehicleMass  = 2.0;
-    double axelRadius = 0.5 * distanceBetweenWheels;
-    ZAxisMomentofInertia = 0.5 * vehicleMass * axelRadius * axelRadius;
-
-    // Vehicle Controller Parameters
-    slowDownDistance = 0.5;
-    arrivalDistance  = 0.1;
-    wheelSpeedLimit = 8.880;
-    headingRateLimit = M_PI/4;
-
-    // DCMotor Parameters
-    // At 5v the following parameters will result in a current of
-    // 0.5 amperes, and a torque of 0.5 x 0.15 = 0.075 Newton-meters.
-    DCMotorInternalResistance = 10.0; // Ohms
-    DCMotorTorqueConstant     = 0.15; // Newton-meters / Ampere
-
-   // Assuming torque = 0.075 Nm, then the wheel force due to
-   // torque = 0.075 Nm / 0.045 = 1.67N. If we want the wheel force
-   // to be 0 when wheel speed = 0.4 m/s
-   // 0.075 = wheelDragConstant * 0.4
-   // wheelDragConstant = 0.075/0.4 = 1.875
-    wheelDragConstant  = 1.875;
-    corningStiffness = 10.0;
-
-    // Dynamic State
-    position[0] = 0.0;
-    position[1] = 0.0;
-
-    velocity[0] = 0.0;
-    velocity[1] = 0.0;
-
-    acceleration[0] = 0.0;
-    acceleration[1] = 0.0;
-
-    heading     = 0.0;
-    headingRate = 0.0;
-    headingAccel = 0.0;
-
-    // Feedback to Motors
-    rightMotorSpeed = 0.0;
-    leftMotorSpeed  = 0.0;
-
-    batteryVoltage  = 5.0;
-
-    // Initialize homing variables
-    homeCommanded = 0;
-    endofHoming = false;
-
-    return 0;
+#include	"Vehicle/include/vehicleOne.hh"
+#include	<iostream>
+#include	<math.h>
+
+int	VehicleOne::default_data()	{
+
+				distanceBetweenWheels	=	0.183;
+				wheelRadius	=	0.045;
+				vehicleMass		=	2.0;
+				double	axelRadius	=	0.5	*	distanceBetweenWheels;
+				ZAxisMomentofInertia	=	0.5	*	vehicleMass	*	axelRadius	*	axelRadius;
+
+				//	Vehicle	Controller	Parameters
+				slowDownDistance	=	0.5;
+				arrivalDistance		=	0.1;
+				wheelSpeedLimit	=	8.880;
+				headingRateLimit	=	M_PI/4;
+
+				//	DCMotor	Parameters
+				//	At	5v	the	following	parameters	will	result	in	a	current	of
+				//	0.5	amperes,	and	a	torque	of	0.5	x	0.15	=	0.075	Newton-meters.
+				DCMotorInternalResistance	=	10.0;	//	Ohms
+				DCMotorTorqueConstant					=	0.15;	//	Newton-meters	/	Ampere
+
+			//	Assuming	torque	=	0.075	Nm,	then	the	wheel	force	due	to
+			//	torque	=	0.075	Nm	/	0.045	=	1.67N.	If	we	want	the	wheel	force
+			//	to	be	0	when	wheel	speed	=	0.4	m/s
+			//	0.075	=	wheelDragConstant	*	0.4
+			//	wheelDragConstant	=	0.075/0.4	=	1.875
+				wheelDragConstant		=	1.875;
+				corningStiffness	=	10.0;
+
+				//	Dynamic	State
+				position[0]	=	0.0;
+				position[1]	=	0.0;
+
+				velocity[0]	=	0.0;
+				velocity[1]	=	0.0;
+
+				acceleration[0]	=	0.0;
+				acceleration[1]	=	0.0;
+
+				heading					=	0.0;
+				headingRate	=	0.0;
+				headingAccel	=	0.0;
+
+				//	Feedback	to	Motors
+				rightMotorSpeed	=	0.0;
+				leftMotorSpeed		=	0.0;
+
+				batteryVoltage		=	5.0;
+
+				//	Initialize	homing	variables
+				homeCommanded	=	0;
+				endofHoming	=	false;
+
+				return	0;
 }
 
-int VehicleOne::state_init() {
+int	VehicleOne::state_init()	{
 
 
-    Point initLocation( position[0],
-                        position[1]);
+				Point	initLocation(	position[0],
+																								position[1]);
 
-    rightDCMotor = new DCMotor( DCMotorInternalResistance, DCMotorTorqueConstant );
-    leftDCMotor  = new DCMotor( DCMotorInternalResistance, DCMotorTorqueConstant );
+				rightDCMotor	=	new	DCMotor(	DCMotorInternalResistance,	DCMotorTorqueConstant	);
+				leftDCMotor		=	new	DCMotor(	DCMotorInternalResistance,	DCMotorTorqueConstant	);
 
-    // Note that right and left motor speeds are passed by reference.
-    rightMotorController = new DCMotorSpeedController(*rightDCMotor, .3, rightMotorSpeed, batteryVoltage );
-    leftMotorController  = new DCMotorSpeedController(*leftDCMotor,  .3, leftMotorSpeed,  batteryVoltage);
+				//	Note	that	right	and	left	motor	speeds	are	passed	by	reference.
+				rightMotorController	=	new	DCMotorSpeedController(*rightDCMotor,	.3,	rightMotorSpeed,	batteryVoltage	);
+				leftMotorController		=	new	DCMotorSpeedController(*leftDCMotor,		.3,	leftMotorSpeed,		batteryVoltage);
 
-    driveController =
-        new DifferentialDriveController(distanceBetweenWheels,
-                                        wheelRadius,
-                                        wheelSpeedLimit,
-                                        headingRateLimit,
-                                        slowDownDistance,
-                                        *rightMotorController,
-                                        *leftMotorController);
+				driveController	=
+								new	DifferentialDriveController(distanceBetweenWheels,
+																																								wheelRadius,
+																																								wheelSpeedLimit,
+																																								headingRateLimit,
+																																								slowDownDistance,
+																																								*rightMotorController,
+																																								*leftMotorController);
 
-    navigator =
-        new Navigator(heading, initLocation);
+				navigator	=
+								new	Navigator(heading,	initLocation);
 
-    vehicleController =
-        new VehicleController( &waypointQueue, *navigator, *driveController, arrivalDistance);
+				vehicleController	=
+								new	VehicleController(	&waypointQueue,	*navigator,	*driveController,	arrivalDistance);
 
-    return (0);
+				return	(0);
 }
 
-void VehicleOne::add_waypoint(double x, double y) {
-    Point wayPoint(x,y);
-    waypointQueue.push_back(wayPoint);
+void	VehicleOne::add_waypoint(double	x,	double	y)	{
+				Point	wayPoint(x,y);
+				waypointQueue.push_back(wayPoint);
 }
 
 
-void VehicleOne::control() {
+void	VehicleOne::control()	{
 
-    // Perfect Sensors for now.
-    navigator->setHeading(heading);
-    navigator->setLocation(position[0], position[1]);
+				//	Perfect	Sensors	for	now.
+				navigator->setHeading(heading);
+				navigator->setLocation(position[0],	position[1]);
 
-    // Check to see if the variable server client input for homeCommanded has been activated
-    // if so, go home and declare end of simulation
-    if (homeCommanded == 1 && endofHoming == false) {
-        vehicleController->gohome();
-        endofHoming = true;
-    }
-    vehicleController->update();
+				//	Check	to	see	if	the	variable	server	client	input	for	homeCommanded	has	been	activated
+				//	if	so,	go	home	and	declare	end	of	simulation
+				if	(homeCommanded	==	1	&&	endofHoming	==	false)	{
+								vehicleController->gohome();
+								endofHoming	=	true;
+				}
+				vehicleController->update();
 }
 
 
-int VehicleOne::state_deriv() {
+int	VehicleOne::state_deriv()	{
 
-   double speed = sqrt(velocity[0] * velocity[0] + velocity[1] * velocity[1]);
+			double	speed	=	sqrt(velocity[0]	*	velocity[0]	+	velocity[1]	*	velocity[1]);
 
-   // Direction that the vehicle is moving.
-   double velocity_unit[2];
-   velocity_unit[0] = velocity[0] / speed;
-   velocity_unit[1] = velocity[1] / speed;
+			//	Direction	that	the	vehicle	is	moving.
+			double	velocity_unit[2];
+			velocity_unit[0]	=	velocity[0]	/	speed;
+			velocity_unit[1]	=	velocity[1]	/	speed;
 
-   // Direction that the vehicle is pointing.
-   double heading_unit[2];
-   heading_unit[0] =  cos(heading);
-   heading_unit[1] =  sin(heading);
+			//	Direction	that	the	vehicle	is	pointing.
+			double	heading_unit[2];
+			heading_unit[0]	=		cos(heading);
+			heading_unit[1]	=		sin(heading);
 
-   // Meters/second, positive forward
-   double turningSpeed = 0.5 * distanceBetweenWheels * headingRate;
+			//	Meters/second,	positive	forward
+			double	turningSpeed	=	0.5	*	distanceBetweenWheels	*	headingRate;
 
-   // Motorspeed: (radians/second), positive counter-clockwise.
-   // Feedback to the motor controllers.
-   rightMotorSpeed = -(speed + turningSpeed) / wheelRadius;
-   leftMotorSpeed  =  (speed - turningSpeed) / wheelRadius;
+			//	Motorspeed:	(radians/second),	positive	counter-clockwise.
+			//	Feedback	to	the	motor	controllers.
+			rightMotorSpeed	=	-(speed	+	turningSpeed)	/	wheelRadius;
+			leftMotorSpeed		=		(speed	-	turningSpeed)	/	wheelRadius;
 
 
-   // Traction Force: Newtons positive forward
-   double leftWheelTractionForce  =  leftDCMotor->getTorque()  / wheelRadius;
-   double rightWheelTractionForce = -rightDCMotor->getTorque() / wheelRadius;
-   double driveForceMag = leftWheelTractionForce + rightWheelTractionForce;
+			//	Traction	Force:	Newtons	positive	forward
+			double	leftWheelTractionForce		=		leftDCMotor->getTorque()		/	wheelRadius;
+			double	rightWheelTractionForce	=	-rightDCMotor->getTorque()	/	wheelRadius;
+			double	driveForceMag	=	leftWheelTractionForce	+	rightWheelTractionForce;
 
-   // Traction Torque
-   vehicleZTorque = (rightWheelTractionForce - leftWheelTractionForce) * (0.5 * distanceBetweenWheels) ;
+			//	Traction	Torque
+			vehicleZTorque	=	(rightWheelTractionForce	-	leftWheelTractionForce)	*	(0.5	*	distanceBetweenWheels)	;
 
-   driveForce[0] = cos(heading) * driveForceMag;
-   driveForce[1] = sin(heading) * driveForceMag;
+			driveForce[0]	=	cos(heading)	*	driveForceMag;
+			driveForce[1]	=	sin(heading)	*	driveForceMag;
 
-   // Lateral Tire (Turning) Force
-   if (speed == 0.0) {
-       lateralTireForce[0] = 0.0;
-       lateralTireForce[1] = 0.0;
-   } else {
-       double tireSlip[2];
-       tireSlip[0] = heading_unit[0] - velocity_unit[0];
-       tireSlip[1] = heading_unit[1] - velocity_unit[1];
+			//	Lateral	Tire	(Turning)	Force
+			if	(speed	==	0.0)	{
+							lateralTireForce[0]	=	0.0;
+							lateralTireForce[1]	=	0.0;
+			}	else	{
+							double	tireSlip[2];
+							tireSlip[0]	=	heading_unit[0]	-	velocity_unit[0];
+							tireSlip[1]	=	heading_unit[1]	-	velocity_unit[1];
 
-       lateralTireForce[0] = corningStiffness * tireSlip[0];
-       lateralTireForce[1] = corningStiffness * tireSlip[1];
-   }
+							lateralTireForce[0]	=	corningStiffness	*	tireSlip[0];
+							lateralTireForce[1]	=	corningStiffness	*	tireSlip[1];
+			}
 
-   // Rolling Tire Resistance Force
-   rollingResistForce[0] = -velocity[0] * wheelDragConstant;
-   rollingResistForce[1] = -velocity[1] * wheelDragConstant;
+			//	Rolling	Tire	Resistance	Force
+			rollingResistForce[0]	=	-velocity[0]	*	wheelDragConstant;
+			rollingResistForce[1]	=	-velocity[1]	*	wheelDragConstant;
 
-   // Total Body Force
-   forceTotal[0] = driveForce[0] + lateralTireForce[0] + rollingResistForce[0];
-   forceTotal[1] = driveForce[1] + lateralTireForce[1] + rollingResistForce[1];
+			//	Total	Body	Force
+			forceTotal[0]	=	driveForce[0]	+	lateralTireForce[0]	+	rollingResistForce[0];
+			forceTotal[1]	=	driveForce[1]	+	lateralTireForce[1]	+	rollingResistForce[1];
 
-   // Body Rotational Acceleration
-   headingAccel = vehicleZTorque / ZAxisMomentofInertia;
+			//	Body	Rotational	Acceleration
+			headingAccel	=	vehicleZTorque	/	ZAxisMomentofInertia;
 
-   // If the simulation is at the end, the vehicle stops moving
-   if (vehicleController->getStatus() == true) {
-      forceTotal[0] = 0;
-      forceTotal[1] = 0;
-      rightMotorSpeed = 0;
-      leftMotorSpeed = 0;
-      velocity[0] = 0;
-      velocity[1] = 0;
-      headingRate = 0;
-      headingAccel = 0;
-   }
+			//	If	the	simulation	is	at	the	end,	the	vehicle	stops	moving
+			if	(vehicleController->getStatus()	==	true)	{
+						forceTotal[0]	=	0;
+						forceTotal[1]	=	0;
+						rightMotorSpeed	=	0;
+						leftMotorSpeed	=	0;
+						velocity[0]	=	0;
+						velocity[1]	=	0;
+						headingRate	=	0;
+						headingAccel	=	0;
+			}
 
-   // Body Linear Acceleration
-   acceleration[0] = forceTotal[0] / vehicleMass;
-   acceleration[1] = forceTotal[1] / vehicleMass;
+			//	Body	Linear	Acceleration
+			acceleration[0]	=	forceTotal[0]	/	vehicleMass;
+			acceleration[1]	=	forceTotal[1]	/	vehicleMass;
 
-   return 0;
+			return	0;
 }
 
-#include "trick/integrator_c_intf.h"
-
-int VehicleOne::state_integ() {
-    int integration_step;
-
-    load_state(
-                &heading,
-                &headingRate,
-                &position[0],
-                &position[1],
-                &velocity[0],
-                &velocity[1],
-                (double*)0
-              );
-
-    load_deriv(
-                &headingRate,
-                &headingAccel,
-                &velocity[0],
-                &velocity[1],
-                &acceleration[0],
-                &acceleration[1],
-                (double*)0
-              );
-
-    integration_step = integrate();
-
-    unload_state(
-                &heading,
-                &headingRate,
-                &position[0],
-                &position[1],
-                &velocity[0],
-                &velocity[1],
-                (double*)0
-              );
-
-    if (!integration_step) {
-        if (heading < -M_PI) heading +=  2*M_PI;
-        if (heading >  M_PI) heading += -2*M_PI;
-    }
-
-    return(integration_step);
+#include	"trick/integrator_c_intf.h"
+
+int	VehicleOne::state_integ()	{
+				int	integration_step;
+
+				load_state(
+																&heading,
+																&headingRate,
+																&position[0],
+																&position[1],
+																&velocity[0],
+																&velocity[1],
+																(double*)0
+														);
+
+				load_deriv(
+																&headingRate,
+																&headingAccel,
+																&velocity[0],
+																&velocity[1],
+																&acceleration[0],
+																&acceleration[1],
+																(double*)0
+														);
+
+				integration_step	=	integrate();
+
+				unload_state(
+																&heading,
+																&headingRate,
+																&position[0],
+																&position[1],
+																&velocity[0],
+																&velocity[1],
+																(double*)0
+														);
+
+				if	(!integration_step)	{
+								if	(heading	<	-M_PI)	heading	+=		2*M_PI;
+								if	(heading	>		M_PI)	heading	+=	-2*M_PI;
+				}
+
+				return(integration_step);
 
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/ClassTemplateVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/ClassTemplateVisitor.cpp
index bd36bf618..6917b6b87 100644
--- a/trick_source/codegen/Interface_Code_Gen/ClassTemplateVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ClassTemplateVisitor.cpp
@@ -1,103 +1,103 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "llvm/Support/CommandLine.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/AST/RecordLayout.h"
-#include "clang/AST/ASTContext.h"
+#include	"llvm/Support/CommandLine.h"
+#include	"clang/Basic/SourceManager.h"
+#include	"clang/Basic/FileManager.h"
+#include	"clang/AST/RecordLayout.h"
+#include	"clang/AST/ASTContext.h"
 
-#include "ClassTemplateVisitor.hh"
-#include "ClassVisitor.hh"
-#include "EnumVisitor.hh"
-#include "EnumValues.hh"
-#include "PrintAttributes.hh"
-#include "Utilities.hh"
+#include	"ClassTemplateVisitor.hh"
+#include	"ClassVisitor.hh"
+#include	"EnumVisitor.hh"
+#include	"EnumValues.hh"
+#include	"PrintAttributes.hh"
+#include	"Utilities.hh"
 
-extern llvm::cl::opt< int > debug_level ;
+extern	llvm::cl::opt<	int	>	debug_level	;
 
 ClassTemplateVisitor::ClassTemplateVisitor(
- clang::CompilerInstance & in_ci ,
- CommentSaver & in_cs ,
- HeaderSearchDirs & in_hsd,
- PrintAttributes & in_pa ) :
-  ci(in_ci) ,
-  cs(in_cs) ,
-  hsd(in_hsd),
-  pa(in_pa)
+	clang::CompilerInstance	&	in_ci	,
+	CommentSaver	&	in_cs	,
+	HeaderSearchDirs	&	in_hsd,
+	PrintAttributes	&	in_pa	)	:
+		ci(in_ci)	,
+		cs(in_cs)	,
+		hsd(in_hsd),
+		pa(in_pa)
 {}
 
-/* We want to process enumerations out of template definitions */
+/*	We	want	to	process	enumerations	out	of	template	definitions	*/
 
-bool ClassTemplateVisitor::TraverseDecl(clang::Decl *d) {
-    if (!d)
-        return true;
-    if (d->isImplicit())
-        return true;
+bool	ClassTemplateVisitor::TraverseDecl(clang::Decl	*d)	{
+				if	(!d)
+								return	true;
+				if	(d->isImplicit())
+								return	true;
 
-    if ( debug_level >=2 ) {
-        std::cout << "ClassTemplateVisitor TraverseDecl " << d->getDeclKindName() << std::endl ;
-    }
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"ClassTemplateVisitor	TraverseDecl	"	<<	d->getDeclKindName()	<<	std::endl	;
+				}
 
-    switch ( d->getKind() ) {
-        case clang::Decl::CXXRecord : {
-            TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
+				switch	(	d->getKind()	)	{
+								case	clang::Decl::CXXRecord	:	{
+												TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(d))	;
 
-            clang::CXXRecordDecl * crd = static_cast<clang::CXXRecordDecl *>(d) ;
-            /* The definition of the record must exist before we can process it.  The definition is
-               NULL when this is only a forward declaration of a class.  We also only want to
-               process embedded classes that have public access. */
-            clang::RecordDecl * rd = crd->getDefinition() ;
-            if ( rd != NULL ) {
-                //d->dump() ;
-                //std::cout << "access = " << rd->getAccess() << std::endl << std::endl ;
-                if ( rd->getAccess() == clang::AS_protected ||  rd->getAccess() == clang::AS_private ) {
-                    // protected and private embedded classes cannot be used outside of their class
-                    // in our auto-generated code.  Keep a set of all classes of this type so we can
-                    // test against them.
-                    ClassValues temp_cv ;
-                    temp_cv.getNamespacesAndClasses(crd->getDeclContext()) ;
-                    //std::cout << "marking private " << temp_cv.getFullyQualifiedName() + crd->getNameAsString() << std::endl ;
-                    CXXRecordVisitor::addPrivateEmbeddedClass(temp_cv.getFullyQualifiedName() + crd->getNameAsString()) ;
-                } else {
-                    TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
-                }
-            }
-        }
-        break ;
-        case clang::Decl::Enum : {
-            clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ;
-            /* This is an embedded enumeration within a class template.  Only process it if is public */
-            if ( ed->getAccess() == clang::AS_public ) {
-                if ( debug_level >=2 ) {
-                    ed->dump() ; std::cout << std::endl ;
-                }
-                EnumVisitor evis(ci, hsd) ;
-                evis.TraverseDecl(ed) ;
-                evis.get_enum_data()->setHasDefinition(false) ;
-                pa.printEnum(evis.get_enum_data()) ;
-            }
+												clang::CXXRecordDecl	*	crd	=	static_cast<clang::CXXRecordDecl	*>(d)	;
+												/*	The	definition	of	the	record	must	exist	before	we	can	process	it.		The	definition	is
+															NULL	when	this	is	only	a	forward	declaration	of	a	class.		We	also	only	want	to
+															process	embedded	classes	that	have	public	access.	*/
+												clang::RecordDecl	*	rd	=	crd->getDefinition()	;
+												if	(	rd	!=	NULL	)	{
+																//d->dump()	;
+																//std::cout	<<	"access	=	"	<<	rd->getAccess()	<<	std::endl	<<	std::endl	;
+																if	(	rd->getAccess()	==	clang::AS_protected	||		rd->getAccess()	==	clang::AS_private	)	{
+																				//	protected	and	private	embedded	classes	cannot	be	used	outside	of	their	class
+																				//	in	our	auto-generated	code.		Keep	a	set	of	all	classes	of	this	type	so	we	can
+																				//	test	against	them.
+																				ClassValues	temp_cv	;
+																				temp_cv.getNamespacesAndClasses(crd->getDeclContext())	;
+																				//std::cout	<<	"marking	private	"	<<	temp_cv.getFullyQualifiedName()	+	crd->getNameAsString()	<<	std::endl	;
+																				CXXRecordVisitor::addPrivateEmbeddedClass(temp_cv.getFullyQualifiedName()	+	crd->getNameAsString())	;
+																}	else	{
+																				TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(d))	;
+																}
+												}
+								}
+								break	;
+								case	clang::Decl::Enum	:	{
+												clang::EnumDecl	*	ed	=	static_cast<clang::EnumDecl	*>(d)	;
+												/*	This	is	an	embedded	enumeration	within	a	class	template.		Only	process	it	if	is	public	*/
+												if	(	ed->getAccess()	==	clang::AS_public	)	{
+																if	(	debug_level	>=2	)	{
+																				ed->dump()	;	std::cout	<<	std::endl	;
+																}
+																EnumVisitor	evis(ci,	hsd)	;
+																evis.TraverseDecl(ed)	;
+																evis.get_enum_data()->setHasDefinition(false)	;
+																pa.printEnum(evis.get_enum_data())	;
+												}
 
-        }
-        break ;
-        default :
-        break ;
-    }
-    return true ;
+								}
+								break	;
+								default	:
+								break	;
+				}
+				return	true	;
 }
 
-bool ClassTemplateVisitor::VisitDecl(clang::Decl *d) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nClassTemplateVisitor Decl = " << d->getDeclKindName() << std::endl ;
-    }
-    return true ;
+bool	ClassTemplateVisitor::VisitDecl(clang::Decl	*d)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nClassTemplateVisitor	Decl	=	"	<<	d->getDeclKindName()	<<	std::endl	;
+				}
+				return	true	;
 }
 
-bool ClassTemplateVisitor::VisitType(clang::Type *t) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nClassTemplateVisitor Type = " << t->getTypeClassName() << std::endl ;
-    }
-    return true;
+bool	ClassTemplateVisitor::VisitType(clang::Type	*t)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nClassTemplateVisitor	Type	=	"	<<	t->getTypeClassName()	<<	std::endl	;
+				}
+				return	true;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/ClassValues.cpp b/trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
index 105e04c84..59735cc43 100644
--- a/trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
@@ -1,299 +1,299 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
 
-#include "ClassValues.hh"
-#include "FieldDescription.hh"
+#include	"ClassValues.hh"
+#include	"FieldDescription.hh"
 
-#ifdef __APPLE__
-#include "llvm/Support/CommandLine.h"
-extern llvm::cl::opt< bool > global_compat15 ;
+#ifdef	__APPLE__
+#include	"llvm/Support/CommandLine.h"
+extern	llvm::cl::opt<	bool	>	global_compat15	;
 #endif
 
-ClassValues::ClassValues() :
-  has_init_attr_friend(false) ,
-  is_pod(false) ,
-  is_abstract(false) ,
-  has_default_constructor(false) ,
-  has_public_destructor(false),
-  compat15(false)
+ClassValues::ClassValues()	:
+		has_init_attr_friend(false)	,
+		is_pod(false)	,
+		is_abstract(false)	,
+		has_default_constructor(false)	,
+		has_public_destructor(false),
+		compat15(false)
 {}
 
-ClassValues::~ClassValues() {
-    std::vector<FieldDescription *>::iterator fdit ;
-    for ( fdit = field_descripts.begin() ; fdit != field_descripts.end() ; ++fdit ) {
-        delete (*fdit) ;
-    }
+ClassValues::~ClassValues()	{
+				std::vector<FieldDescription	*>::iterator	fdit	;
+				for	(	fdit	=	field_descripts.begin()	;	fdit	!=	field_descripts.end()	;	++fdit	)	{
+								delete	(*fdit)	;
+				}
 }
 
-void ClassValues::addFieldDescription(FieldDescription * in_fdes) {
-    field_descripts.push_back(in_fdes) ;
+void	ClassValues::addFieldDescription(FieldDescription	*	in_fdes)	{
+				field_descripts.push_back(in_fdes)	;
 
-#ifdef __APPLE__
-    if ( !global_compat15 and !compat15 ) {
+#ifdef	__APPLE__
+				if	(	!global_compat15	and	!compat15	)	{
 #else
-    {
+				{
 #endif
-        // Test to see if the new field overloads a field of the same name.  If it does
-        // then fully qualify the name of the inherited field (the one already in field_name_to_info).
-        std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_fdes->getName()) ;
-        if ( mit != field_name_to_info_map.end() ) {
-            // If the matched variable is inherited, qualify it with its container class name.
-            if ( (*mit).second->isInherited() ) {
-                (*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
-                field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
-                field_name_to_info_map.erase(mit) ;
-            }
-        }
-    }
-    field_name_to_info_map[in_fdes->getName()] = in_fdes ;
+								//	Test	to	see	if	the	new	field	overloads	a	field	of	the	same	name.		If	it	does
+								//	then	fully	qualify	the	name	of	the	inherited	field	(the	one	already	in	field_name_to_info).
+								std::map<	std::string	,	FieldDescription	*	>::iterator	mit	=	field_name_to_info_map.find(in_fdes->getName())	;
+								if	(	mit	!=	field_name_to_info_map.end()	)	{
+												//	If	the	matched	variable	is	inherited,	qualify	it	with	its	container	class	name.
+												if	(	(*mit).second->isInherited()	)	{
+																(*mit).second->setName(	(*mit).second->getContainerClass()	+	"::"	+	(*mit).second->getName()	)	;
+																field_name_to_info_map[(*mit).second->getName()]	=	(*mit).second	;
+																field_name_to_info_map.erase(mit)	;
+												}
+								}
+				}
+				field_name_to_info_map[in_fdes->getName()]	=	in_fdes	;
 }
 
-void ClassValues::addInheritedFieldDescriptions(std::vector<FieldDescription *> in_fdes,
-  unsigned int class_offset, bool virtual_inherited ) {
-    // Make a copy of all of the FieldDescription variables.
-    field_descripts.insert(field_descripts.end(), in_fdes.begin() , in_fdes.end()) ;
-
-    std::vector<FieldDescription *>::iterator fdit ;
-    // Loop through the incoming inherited variable names
-    for ( fdit = in_fdes.begin() ; fdit != in_fdes.end() ; ++fdit ) {
-
-        (*fdit)->setBaseClassOffset( class_offset ) ;
-        (*fdit)->setInherited( true ) ;
-        (*fdit)->setVirtualInherited( virtual_inherited ) ;
-        // Adds the class offset to the field offset giving the total offset to the inherited variable
-        // The offset is stored in bits so multiply class_offset by 8.
-        (*fdit)->addOffset( class_offset * 8 ) ;
-    }
-
-#ifdef __APPLE__
-    if ( !global_compat15 and !compat15 ) {
+void	ClassValues::addInheritedFieldDescriptions(std::vector<FieldDescription	*>	in_fdes,
+		unsigned	int	class_offset,	bool	virtual_inherited	)	{
+				//	Make	a	copy	of	all	of	the	FieldDescription	variables.
+				field_descripts.insert(field_descripts.end(),	in_fdes.begin()	,	in_fdes.end())	;
+
+				std::vector<FieldDescription	*>::iterator	fdit	;
+				//	Loop	through	the	incoming	inherited	variable	names
+				for	(	fdit	=	in_fdes.begin()	;	fdit	!=	in_fdes.end()	;	++fdit	)	{
+
+								(*fdit)->setBaseClassOffset(	class_offset	)	;
+								(*fdit)->setInherited(	true	)	;
+								(*fdit)->setVirtualInherited(	virtual_inherited	)	;
+								//	Adds	the	class	offset	to	the	field	offset	giving	the	total	offset	to	the	inherited	variable
+								//	The	offset	is	stored	in	bits	so	multiply	class_offset	by	8.
+								(*fdit)->addOffset(	class_offset	*	8	)	;
+				}
+
+#ifdef	__APPLE__
+				if	(	!global_compat15	and	!compat15	)	{
 #else
-    {
+				{
 #endif
-        for ( fdit = in_fdes.begin() ; fdit != in_fdes.end() ; ++fdit ) {
-
-            std::string in_name = (*fdit)->getName() ;
-            // search existing names for incoming inherited variable name.
-            std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_name) ;
-            // if the variable name already exists we have overloaded variable names.
-            if ( mit != field_name_to_info_map.end() ) {
-                // the incoming variable is known to be inherited.  Qualify it with its container class name.
-                (*fdit)->setName( (*fdit)->getContainerClass() + "::" + (*fdit)->getName() ) ;
-                field_name_to_info_map[(*fdit)->getName()] = *fdit ;
-
-                // If the matched variable is also inherited, qualify it with its container class name.
-                if ( (*mit).second->isInherited() ) {
-                    (*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
-                    field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
-                    field_name_to_info_map.erase(mit) ;
-                    // Mark this name is one that we always have to qualify.
-                    field_names_to_qualify.insert(in_name) ;
-                }
-            } else {
-                // incoming name did not match an existing variable name.
-                // Test to see if there variables of this name need to be qualified.
-                if ( field_names_to_qualify.find(in_name) == field_names_to_qualify.end() ) {
-                    // The name is not overloaded (yet), add the unqualified inherited name straight into map.
-                    field_name_to_info_map[in_name] = *fdit ;
-                    // Upgrade the inherited variable's container class to the current class.
-                    //(*fdit)->setContainerClass( name ) ;
-                } else {
-                    // The name is overloaded by other inherited variables... qualify the name.
-                    (*fdit)->setName( (*fdit)->getContainerClass() + "::" + (*fdit)->getName() ) ;
-                    field_name_to_info_map[(*fdit)->getName()] = *fdit ;
-                }
-            }
-        }
-    }
+								for	(	fdit	=	in_fdes.begin()	;	fdit	!=	in_fdes.end()	;	++fdit	)	{
+
+												std::string	in_name	=	(*fdit)->getName()	;
+												//	search	existing	names	for	incoming	inherited	variable	name.
+												std::map<	std::string	,	FieldDescription	*	>::iterator	mit	=	field_name_to_info_map.find(in_name)	;
+												//	if	the	variable	name	already	exists	we	have	overloaded	variable	names.
+												if	(	mit	!=	field_name_to_info_map.end()	)	{
+																//	the	incoming	variable	is	known	to	be	inherited.		Qualify	it	with	its	container	class	name.
+																(*fdit)->setName(	(*fdit)->getContainerClass()	+	"::"	+	(*fdit)->getName()	)	;
+																field_name_to_info_map[(*fdit)->getName()]	=	*fdit	;
+
+																//	If	the	matched	variable	is	also	inherited,	qualify	it	with	its	container	class	name.
+																if	(	(*mit).second->isInherited()	)	{
+																				(*mit).second->setName(	(*mit).second->getContainerClass()	+	"::"	+	(*mit).second->getName()	)	;
+																				field_name_to_info_map[(*mit).second->getName()]	=	(*mit).second	;
+																				field_name_to_info_map.erase(mit)	;
+																				//	Mark	this	name	is	one	that	we	always	have	to	qualify.
+																				field_names_to_qualify.insert(in_name)	;
+																}
+												}	else	{
+																//	incoming	name	did	not	match	an	existing	variable	name.
+																//	Test	to	see	if	there	variables	of	this	name	need	to	be	qualified.
+																if	(	field_names_to_qualify.find(in_name)	==	field_names_to_qualify.end()	)	{
+																				//	The	name	is	not	overloaded	(yet),	add	the	unqualified	inherited	name	straight	into	map.
+																				field_name_to_info_map[in_name]	=	*fdit	;
+																				//	Upgrade	the	inherited	variable's	container	class	to	the	current	class.
+																				//(*fdit)->setContainerClass(	name	)	;
+																}	else	{
+																				//	The	name	is	overloaded	by	other	inherited	variables...	qualify	the	name.
+																				(*fdit)->setName(	(*fdit)->getContainerClass()	+	"::"	+	(*fdit)->getName()	)	;
+																				field_name_to_info_map[(*fdit)->getName()]	=	*fdit	;
+																}
+												}
+								}
+				}
 
 }
 
-void ClassValues::saveInheritAncestry( ClassValues * in_cv  ) {
+void	ClassValues::saveInheritAncestry(	ClassValues	*	in_cv		)	{
 
-    std::map< std::string , unsigned int >::iterator mit ;
-    for ( mit = in_cv->all_inherited_class_names_map.begin() ; mit != in_cv->all_inherited_class_names_map.end() ; ++mit ) {
-        all_inherited_class_names_map[(*mit).first] +=  (*mit).second ;
-    }
+				std::map<	std::string	,	unsigned	int	>::iterator	mit	;
+				for	(	mit	=	in_cv->all_inherited_class_names_map.begin()	;	mit	!=	in_cv->all_inherited_class_names_map.end()	;	++mit	)	{
+								all_inherited_class_names_map[(*mit).first]	+=		(*mit).second	;
+				}
 
-    all_inherited_class_names_map[in_cv->getName()]++ ;
+				all_inherited_class_names_map[in_cv->getName()]++	;
 }
 
-void ClassValues::setContainerClassForFields() {
-    std::vector<FieldDescription *>::iterator fdit ;
-    // Loop through all fields
-    for ( fdit = field_descripts.begin() ; fdit != field_descripts.end() ; ++fdit ) {
-        // Prepend the field container class with the current class name.
-        (*fdit)->setContainerClass( name + "::" + (*fdit)->getContainerClass() ) ;
-    }
+void	ClassValues::setContainerClassForFields()	{
+				std::vector<FieldDescription	*>::iterator	fdit	;
+				//	Loop	through	all	fields
+				for	(	fdit	=	field_descripts.begin()	;	fdit	!=	field_descripts.end()	;	++fdit	)	{
+								//	Prepend	the	field	container	class	with	the	current	class	name.
+								(*fdit)->setContainerClass(	name	+	"::"	+	(*fdit)->getContainerClass()	)	;
+				}
 }
 
-void ClassValues::clearAmbiguousVariables() {
-
-    std::map< std::string , unsigned int >::iterator mit ;
-    std::vector<FieldDescription *>::iterator fdit ;
-
-    for ( mit = all_inherited_class_names_map.begin() ; mit != all_inherited_class_names_map.end() ; ++mit ) {
-        // If a class in inherited more than once we have a diamond.  We'll need to modify variables that were
-        // inherited from that class.
-        if ( (*mit).second > 1 ) {
-            std::string str = (*mit).first + "::" ;
-            // Loop through all fields testing for the diamond inherited class in the name.
-            for ( fdit = field_descripts.begin() ; fdit != field_descripts.end() ; ++fdit ) {
-                std::string fdit_name = (*fdit)->getName() ;
-                size_t f = fdit_name.find(str) ;
-                // If the variable contains the diamond class string, remove the diamond class qualification.
-                if ( f != std::string::npos ) {
-                    fdit_name.replace(f , str.length() , "") ;
-                    (*fdit)->setName(fdit_name) ;
-                }
-            }
-        }
-    }
-
-    // Removing diamond class qualifications possibly leaves fields with duplicate names.
-    // We want to remove the duplicated names.
-    std::set< std::string > field_names ;
-    fdit = field_descripts.begin() ;
-    while ( fdit != field_descripts.end() ) {
-        // test if the current field is in the list of field names processed.
-        if ( field_names.find( (*fdit)->getName() ) == field_names.end() ) {
-            // This name is new.
-            // Add the field to the test set
-            field_names.insert( (*fdit)->getName() ) ;
-            fdit++ ;
-        } else {
-            // This name was already present
-            // Free the field's memory.
-            delete (*fdit) ;
-            // Erase the field from the list. Move iterator to next field.
-            fdit = field_descripts.erase(fdit) ;
-
-        }
-    }
+void	ClassValues::clearAmbiguousVariables()	{
+
+				std::map<	std::string	,	unsigned	int	>::iterator	mit	;
+				std::vector<FieldDescription	*>::iterator	fdit	;
+
+				for	(	mit	=	all_inherited_class_names_map.begin()	;	mit	!=	all_inherited_class_names_map.end()	;	++mit	)	{
+								//	If	a	class	in	inherited	more	than	once	we	have	a	diamond.		We'll	need	to	modify	variables	that	were
+								//	inherited	from	that	class.
+								if	(	(*mit).second	>	1	)	{
+												std::string	str	=	(*mit).first	+	"::"	;
+												//	Loop	through	all	fields	testing	for	the	diamond	inherited	class	in	the	name.
+												for	(	fdit	=	field_descripts.begin()	;	fdit	!=	field_descripts.end()	;	++fdit	)	{
+																std::string	fdit_name	=	(*fdit)->getName()	;
+																size_t	f	=	fdit_name.find(str)	;
+																//	If	the	variable	contains	the	diamond	class	string,	remove	the	diamond	class	qualification.
+																if	(	f	!=	std::string::npos	)	{
+																				fdit_name.replace(f	,	str.length()	,	"")	;
+																				(*fdit)->setName(fdit_name)	;
+																}
+												}
+								}
+				}
+
+				//	Removing	diamond	class	qualifications	possibly	leaves	fields	with	duplicate	names.
+				//	We	want	to	remove	the	duplicated	names.
+				std::set<	std::string	>	field_names	;
+				fdit	=	field_descripts.begin()	;
+				while	(	fdit	!=	field_descripts.end()	)	{
+								//	test	if	the	current	field	is	in	the	list	of	field	names	processed.
+								if	(	field_names.find(	(*fdit)->getName()	)	==	field_names.end()	)	{
+												//	This	name	is	new.
+												//	Add	the	field	to	the	test	set
+												field_names.insert(	(*fdit)->getName()	)	;
+												fdit++	;
+								}	else	{
+												//	This	name	was	already	present
+												//	Free	the	field's	memory.
+												delete	(*fdit)	;
+												//	Erase	the	field	from	the	list.	Move	iterator	to	next	field.
+												fdit	=	field_descripts.erase(fdit)	;
+
+								}
+				}
 
 }
 
-void ClassValues::clearFieldDescription() {
-    field_descripts.clear() ;
+void	ClassValues::clearFieldDescription()	{
+				field_descripts.clear()	;
 }
 
-void ClassValues::addInheritedClass(std::string  class_name) {
-    inherited_classes.push_back(class_name) ;
+void	ClassValues::addInheritedClass(std::string		class_name)	{
+				inherited_classes.push_back(class_name)	;
 }
 
-void ClassValues::clearInheritedClass() {
-    inherited_classes.clear() ;
+void	ClassValues::clearInheritedClass()	{
+				inherited_classes.clear()	;
 }
 
-void ClassValues::setHasInitAttrFriend(bool in_val) {
-    has_init_attr_friend = in_val ;
+void	ClassValues::setHasInitAttrFriend(bool	in_val)	{
+				has_init_attr_friend	=	in_val	;
 }
 
-bool ClassValues::getHasInitAttrFriend() {
-    return has_init_attr_friend ;
+bool	ClassValues::getHasInitAttrFriend()	{
+				return	has_init_attr_friend	;
 }
 
-void ClassValues::setPOD(bool in_val) {
-    is_pod = in_val ;
+void	ClassValues::setPOD(bool	in_val)	{
+				is_pod	=	in_val	;
 }
 
-bool ClassValues::isPOD() {
-    return is_pod ;
+bool	ClassValues::isPOD()	{
+				return	is_pod	;
 }
 
-void ClassValues::setSize(unsigned int in_size) {
-    size = in_size ;
+void	ClassValues::setSize(unsigned	int	in_size)	{
+				size	=	in_size	;
 }
 
-unsigned int ClassValues::getSize() {
-    return size ;
+unsigned	int	ClassValues::getSize()	{
+				return	size	;
 }
 
-void ClassValues::setAbstract(bool in_val) {
-    is_abstract = in_val ;
+void	ClassValues::setAbstract(bool	in_val)	{
+				is_abstract	=	in_val	;
 }
 
-bool ClassValues::isAbstract() {
-    return is_abstract ;
+bool	ClassValues::isAbstract()	{
+				return	is_abstract	;
 }
 
-void ClassValues::setHasDefaultConstructor(bool in_val) {
-    has_default_constructor = in_val ;
+void	ClassValues::setHasDefaultConstructor(bool	in_val)	{
+				has_default_constructor	=	in_val	;
 }
 
-bool ClassValues::getHasDefaultConstructor() {
-    return has_default_constructor ;
+bool	ClassValues::getHasDefaultConstructor()	{
+				return	has_default_constructor	;
 }
 
-void ClassValues::setHasPublicDestructor(bool in_val) {
-    has_public_destructor = in_val ;
+void	ClassValues::setHasPublicDestructor(bool	in_val)	{
+				has_public_destructor	=	in_val	;
 }
 
-bool ClassValues::getHasPublicDestructor() {
-    return has_public_destructor ;
+bool	ClassValues::getHasPublicDestructor()	{
+				return	has_public_destructor	;
 }
 
-void ClassValues::setMangledTypeName( std::string in_val ) {
-    mangled_type_name = in_val ;
+void	ClassValues::setMangledTypeName(	std::string	in_val	)	{
+				mangled_type_name	=	in_val	;
 }
 
-std::string ClassValues::getMangledTypeName() {
-    if ( mangled_type_name.empty() ) {
-        return name ;
-    }
-    return mangled_type_name ;
+std::string	ClassValues::getMangledTypeName()	{
+				if	(	mangled_type_name.empty()	)	{
+								return	name	;
+				}
+				return	mangled_type_name	;
 }
 
-std::string ClassValues::getFullyQualifiedMangledTypeName(const std::string& delimiter) {
-    std::ostringstream oss ;
-    printNamespacesAndContainerClasses(oss, delimiter) ;
-    oss << getMangledTypeName() ;
-    return oss.str() ;
+std::string	ClassValues::getFullyQualifiedMangledTypeName(const	std::string&	delimiter)	{
+				std::ostringstream	oss	;
+				printNamespacesAndContainerClasses(oss,	delimiter)	;
+				oss	<<	getMangledTypeName()	;
+				return	oss.str()	;
 }
 
-std::string ClassValues::getFullyQualifiedNameIfEqual() {
-    std::string result;
-    if (getName() == getMangledTypeName()) {
-        result += getNamespacesAndContainerClasses();
-    }
-    result += getName();
-    return result;
+std::string	ClassValues::getFullyQualifiedNameIfEqual()	{
+				std::string	result;
+				if	(getName()	==	getMangledTypeName())	{
+								result	+=	getNamespacesAndContainerClasses();
+				}
+				result	+=	getName();
+				return	result;
 }
 
 
-void ClassValues::setCompat15(bool in_val) {
-    compat15 = in_val ;
+void	ClassValues::setCompat15(bool	in_val)	{
+				compat15	=	in_val	;
 }
 
-bool ClassValues::isCompat15() {
-    return compat15 ;
+bool	ClassValues::isCompat15()	{
+				return	compat15	;
 }
 
-bool ClassValues::isInStandardNamespace() {
-    return namespaces.size() && !namespaces[0].compare("std");
+bool	ClassValues::isInStandardNamespace()	{
+				return	namespaces.size()	&&	!namespaces[0].compare("std");
 }
 
-std::ostream & operator << (std::ostream & ostream, ClassValues & cv) {
-    ostream << "  name = " << cv.name << std::endl ;
-    ostream << "  mangled_name = " << cv.mangled_type_name << std::endl ;
-    ostream << "  file_name = " << cv.file_name << std::endl ;
-    ostream << "  namespaces =" ;
-    cv.printNamespaces(ostream) ;
-    ostream << std::endl ;
-    ostream << "  parent classes =" ;
-    cv.printContainerClasses(ostream) ;
-    ostream << std::endl ;
-    ostream << "  has_init_attr_friend = " << cv.has_init_attr_friend << std::endl ;
-    ostream << "  is_pod = " << cv.is_pod << std::endl ;
-    ostream << "  is_abstract = " << cv.is_abstract << std::endl ;
-    ostream << "  has_default_constructor = " << cv.has_default_constructor << std::endl ;
-    ostream << "  has_public_destructor = " << cv.has_public_destructor << std::endl ;
-
-    for (auto& field : cv.getFieldDescriptions()) {
-        ostream << field << std::endl ;
-    }
-
-    return ostream ;
+std::ostream	&	operator	<<	(std::ostream	&	ostream,	ClassValues	&	cv)	{
+				ostream	<<	"		name	=	"	<<	cv.name	<<	std::endl	;
+				ostream	<<	"		mangled_name	=	"	<<	cv.mangled_type_name	<<	std::endl	;
+				ostream	<<	"		file_name	=	"	<<	cv.file_name	<<	std::endl	;
+				ostream	<<	"		namespaces	="	;
+				cv.printNamespaces(ostream)	;
+				ostream	<<	std::endl	;
+				ostream	<<	"		parent	classes	="	;
+				cv.printContainerClasses(ostream)	;
+				ostream	<<	std::endl	;
+				ostream	<<	"		has_init_attr_friend	=	"	<<	cv.has_init_attr_friend	<<	std::endl	;
+				ostream	<<	"		is_pod	=	"	<<	cv.is_pod	<<	std::endl	;
+				ostream	<<	"		is_abstract	=	"	<<	cv.is_abstract	<<	std::endl	;
+				ostream	<<	"		has_default_constructor	=	"	<<	cv.has_default_constructor	<<	std::endl	;
+				ostream	<<	"		has_public_destructor	=	"	<<	cv.has_public_destructor	<<	std::endl	;
+
+				for	(auto&	field	:	cv.getFieldDescriptions())	{
+								ostream	<<	field	<<	std::endl	;
+				}
+
+				return	ostream	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
index c5ef77fc9..3df2a857a 100644
--- a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
@@ -1,421 +1,421 @@
 
-#include <iostream>
-#include <sstream>
-#include <stack>
-
-#include "llvm/Support/CommandLine.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/AST/RecordLayout.h"
-#include "clang/AST/ASTContext.h"
-
-#include "ClassVisitor.hh"
-#include "EnumVisitor.hh"
-#include "EnumValues.hh"
-#include "FieldVisitor.hh"
-#include "Utilities.hh"
-#include "CommentSaver.hh"
-#include "PrintAttributes.hh"
-#include "BraceMacro.hh"
-
-extern llvm::cl::opt< int > debug_level ;
+#include	<iostream>
+#include	<sstream>
+#include	<stack>
+
+#include	"llvm/Support/CommandLine.h"
+#include	"clang/Basic/SourceManager.h"
+#include	"clang/Basic/FileManager.h"
+#include	"clang/AST/RecordLayout.h"
+#include	"clang/AST/ASTContext.h"
+
+#include	"ClassVisitor.hh"
+#include	"EnumVisitor.hh"
+#include	"EnumValues.hh"
+#include	"FieldVisitor.hh"
+#include	"Utilities.hh"
+#include	"CommentSaver.hh"
+#include	"PrintAttributes.hh"
+#include	"BraceMacro.hh"
+
+extern	llvm::cl::opt<	int	>	debug_level	;
 
 CXXRecordVisitor::CXXRecordVisitor(
- clang::CompilerInstance & in_ci ,
- CommentSaver & in_cs ,
- HeaderSearchDirs & in_hsd ,
- PrintAttributes & in_pa ,
- bool in_include_virtual_base ) :
-  ci(in_ci) ,
-  cs(in_cs) ,
-  hsd(in_hsd) ,
-  pa(in_pa) ,
-  cval() ,
-  include_virtual_base(in_include_virtual_base) {}
-
-CXXRecordVisitor::~CXXRecordVisitor() {
+	clang::CompilerInstance	&	in_ci	,
+	CommentSaver	&	in_cs	,
+	HeaderSearchDirs	&	in_hsd	,
+	PrintAttributes	&	in_pa	,
+	bool	in_include_virtual_base	)	:
+		ci(in_ci)	,
+		cs(in_cs)	,
+		hsd(in_hsd)	,
+		pa(in_pa)	,
+		cval()	,
+		include_virtual_base(in_include_virtual_base)	{}
+
+CXXRecordVisitor::~CXXRecordVisitor()	{
 }
 
-bool CXXRecordVisitor::TraverseDecl(clang::Decl *d) {
-    if (!d)
-        return true;
-    if (d->isImplicit())
-        return true;
-
-    //std::cout << "CV " << d->getDeclKindName() << std::endl ;
-
-    switch ( d->getKind() ) {
-        case clang::Decl::ClassTemplateSpecialization : {
-            TraverseClassTemplateSpecializationDecl(static_cast<clang::ClassTemplateSpecializationDecl *>(d)) ;
-        }
-        break ;
-        case clang::Decl::CXXRecord : {
-            clang::CXXRecordDecl * crd = static_cast<clang::CXXRecordDecl *>(d) ;
-            /* The definition of the record must exist before we can process it.  The definition is
-               NULL when this is only a forward declaration of a class.  We also only want to
-               process embedded classes that have public access. */
-            clang::RecordDecl * rd = crd->getDefinition() ;
-            if ( rd != NULL ) {
-                if ( rd->getAccess() == clang::AS_public ) {
-                    if ( isInUserCode(ci , crd->RBRACELOC(), hsd) ) {
-                        CXXRecordVisitor embedded_cvis(ci , cs, hsd , pa, true) ;
-                        embedded_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
-                        pa.printClass(embedded_cvis.get_class_data()) ;
-                    }
-                } else {
-                    // protected and private embedded classes cannot be used outside of their class
-                    // in our auto-generated code.  Keep a set of all classes of this type so we can
-                    // test against them.
-                    ClassValues temp_cv ;
-                    temp_cv.getNamespacesAndClasses(crd->getDeclContext()) ;
-                    /*
-                    for (auto const &pec : private_embedded_classes) {
-                        std::cout << "===private_embedded_classes..." << pec << "===" << std::endl;
-                    }
-                    if (friend_classes.size() > 0) {
-                        for (auto const &fc : friend_classes) {
-                            std::cout << "===friend_classes..." << fc << "===" << std::endl;
-                        }
-                    }
-                    */
-                    std::string class_str = temp_cv.getFullyQualifiedName() + crd->getNameAsString();
-                    // Private embedded classes are not printed to io source unless they are friend classes.
-                    if (friend_classes.find(class_str) == friend_classes.end()) {
-                        private_embedded_classes.insert(class_str);
-                    }
-                }
-            }
-        }
-        break ;
-        case clang::Decl::Enum : {
-            clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ;
-            /* This is an embedded enumeration within a class.  Only process it if is public */
-            if ( ed->getAccess() == clang::AS_public ) {
-                EnumVisitor evis(ci, hsd) ;
-                // Before llvm 14, TraverseDecl also traversed the type.
-                // llvm believed this to be a bug, so now we call TraverseType
-                // in addition to TraverseDecl.
-                evis.TraverseDecl(ed) ;
-                #if (LIBCLANG_MAJOR >= 14)
-                evis.TraverseType(clang::QualType(ed->getTypeForDecl(), 0));
-                #endif
-                pa.printEnum(evis.get_enum_data()) ;
-            } else {
-                // protected and private embedded classes cannot be used outside of their class
-                // in our auto-generated code.  Keep a set of all classes of this type so we can
-                // test against them.
-                ClassValues temp_cv ;
-                temp_cv.getNamespacesAndClasses(ed->getDeclContext()) ;
-                private_embedded_classes.insert(temp_cv.getFullyQualifiedName() + ed->getNameAsString()) ;
-            }
-        }
-        break ;
-        case clang::Decl::Field : {
-            FieldVisitor fvis(ci , hsd , cs, pa, cval.getName()) ;
-            fvis.TraverseFieldDecl(static_cast<clang::FieldDecl *>(d)) ;
-            cval.addFieldDescription(fvis.get_field_data()) ;
-        }
-        break ;
-        case clang::Decl::Friend : {
-            ClassValues temp_cv ;
-            temp_cv.getNamespacesAndClasses(d->getDeclContext()) ;
-            clang::FriendDecl * fd = static_cast<clang::FriendDecl *>(d) ;
-            std::string class_str;
-
-            // Only use namespaces for identifying class name as the class name can't be the same within the same namespace.
-            if (fd->getFriendDecl() != NULL) {
-                class_str = temp_cv.getNameOnlyWithNamespaces() + fd->getFriendDecl()->getNameAsString();
-            } 
-            // For friend class, only need to get type here but the above getting class_str is for just in case needed.
-            if (fd->getFriendType() != NULL) {
-                class_str = temp_cv.getNameOnlyWithNamespaces() + fd->getFriendType()->getType().getAsString();
-            }
-            size_t pos;
-            // Only save class name to the friend class list
-            if ((pos = class_str.find("class ")) != std::string::npos ) {
-                class_str.erase(pos , 6) ;
-                friend_classes.insert(class_str);
-            }
-
-            TraverseFriendDecl(static_cast<clang::FriendDecl *>(d)) ;
-        }
-        break ;
-        case clang::Decl::Var : {
-            /* Static fields appear as vars. Treat it as a field. */
-            FieldVisitor fvis(ci , hsd , cs, pa, cval.getName()) ;
-            fvis.TraverseVarDecl(static_cast<clang::VarDecl *>(d)) ;
-            cval.addFieldDescription(fvis.get_field_data()) ;
-        }
-        break ;
-        default :
-        break ;
-    }
-    return true ;
+bool	CXXRecordVisitor::TraverseDecl(clang::Decl	*d)	{
+				if	(!d)
+								return	true;
+				if	(d->isImplicit())
+								return	true;
+
+				//std::cout	<<	"CV	"	<<	d->getDeclKindName()	<<	std::endl	;
+
+				switch	(	d->getKind()	)	{
+								case	clang::Decl::ClassTemplateSpecialization	:	{
+												TraverseClassTemplateSpecializationDecl(static_cast<clang::ClassTemplateSpecializationDecl	*>(d))	;
+								}
+								break	;
+								case	clang::Decl::CXXRecord	:	{
+												clang::CXXRecordDecl	*	crd	=	static_cast<clang::CXXRecordDecl	*>(d)	;
+												/*	The	definition	of	the	record	must	exist	before	we	can	process	it.		The	definition	is
+															NULL	when	this	is	only	a	forward	declaration	of	a	class.		We	also	only	want	to
+															process	embedded	classes	that	have	public	access.	*/
+												clang::RecordDecl	*	rd	=	crd->getDefinition()	;
+												if	(	rd	!=	NULL	)	{
+																if	(	rd->getAccess()	==	clang::AS_public	)	{
+																				if	(	isInUserCode(ci	,	crd->RBRACELOC(),	hsd)	)	{
+																								CXXRecordVisitor	embedded_cvis(ci	,	cs,	hsd	,	pa,	true)	;
+																								embedded_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(d))	;
+																								pa.printClass(embedded_cvis.get_class_data())	;
+																				}
+																}	else	{
+																				//	protected	and	private	embedded	classes	cannot	be	used	outside	of	their	class
+																				//	in	our	auto-generated	code.		Keep	a	set	of	all	classes	of	this	type	so	we	can
+																				//	test	against	them.
+																				ClassValues	temp_cv	;
+																				temp_cv.getNamespacesAndClasses(crd->getDeclContext())	;
+																				/*
+																				for	(auto	const	&pec	:	private_embedded_classes)	{
+																								std::cout	<<	"===private_embedded_classes..."	<<	pec	<<	"==="	<<	std::endl;
+																				}
+																				if	(friend_classes.size()	>	0)	{
+																								for	(auto	const	&fc	:	friend_classes)	{
+																												std::cout	<<	"===friend_classes..."	<<	fc	<<	"==="	<<	std::endl;
+																								}
+																				}
+																				*/
+																				std::string	class_str	=	temp_cv.getFullyQualifiedName()	+	crd->getNameAsString();
+																				//	Private	embedded	classes	are	not	printed	to	io	source	unless	they	are	friend	classes.
+																				if	(friend_classes.find(class_str)	==	friend_classes.end())	{
+																								private_embedded_classes.insert(class_str);
+																				}
+																}
+												}
+								}
+								break	;
+								case	clang::Decl::Enum	:	{
+												clang::EnumDecl	*	ed	=	static_cast<clang::EnumDecl	*>(d)	;
+												/*	This	is	an	embedded	enumeration	within	a	class.		Only	process	it	if	is	public	*/
+												if	(	ed->getAccess()	==	clang::AS_public	)	{
+																EnumVisitor	evis(ci,	hsd)	;
+																//	Before	llvm	14,	TraverseDecl	also	traversed	the	type.
+																//	llvm	believed	this	to	be	a	bug,	so	now	we	call	TraverseType
+																//	in	addition	to	TraverseDecl.
+																evis.TraverseDecl(ed)	;
+																#if	(LIBCLANG_MAJOR	>=	14)
+																evis.TraverseType(clang::QualType(ed->getTypeForDecl(),	0));
+																#endif
+																pa.printEnum(evis.get_enum_data())	;
+												}	else	{
+																//	protected	and	private	embedded	classes	cannot	be	used	outside	of	their	class
+																//	in	our	auto-generated	code.		Keep	a	set	of	all	classes	of	this	type	so	we	can
+																//	test	against	them.
+																ClassValues	temp_cv	;
+																temp_cv.getNamespacesAndClasses(ed->getDeclContext())	;
+																private_embedded_classes.insert(temp_cv.getFullyQualifiedName()	+	ed->getNameAsString())	;
+												}
+								}
+								break	;
+								case	clang::Decl::Field	:	{
+												FieldVisitor	fvis(ci	,	hsd	,	cs,	pa,	cval.getName())	;
+												fvis.TraverseFieldDecl(static_cast<clang::FieldDecl	*>(d))	;
+												cval.addFieldDescription(fvis.get_field_data())	;
+								}
+								break	;
+								case	clang::Decl::Friend	:	{
+												ClassValues	temp_cv	;
+												temp_cv.getNamespacesAndClasses(d->getDeclContext())	;
+												clang::FriendDecl	*	fd	=	static_cast<clang::FriendDecl	*>(d)	;
+												std::string	class_str;
+
+												//	Only	use	namespaces	for	identifying	class	name	as	the	class	name	can't	be	the	same	within	the	same	namespace.
+												if	(fd->getFriendDecl()	!=	NULL)	{
+																class_str	=	temp_cv.getNameOnlyWithNamespaces()	+	fd->getFriendDecl()->getNameAsString();
+												}	
+												//	For	friend	class,	only	need	to	get	type	here	but	the	above	getting	class_str	is	for	just	in	case	needed.
+												if	(fd->getFriendType()	!=	NULL)	{
+																class_str	=	temp_cv.getNameOnlyWithNamespaces()	+	fd->getFriendType()->getType().getAsString();
+												}
+												size_t	pos;
+												//	Only	save	class	name	to	the	friend	class	list
+												if	((pos	=	class_str.find("class	"))	!=	std::string::npos	)	{
+																class_str.erase(pos	,	6)	;
+																friend_classes.insert(class_str);
+												}
+
+												TraverseFriendDecl(static_cast<clang::FriendDecl	*>(d))	;
+								}
+								break	;
+								case	clang::Decl::Var	:	{
+												/*	Static	fields	appear	as	vars.	Treat	it	as	a	field.	*/
+												FieldVisitor	fvis(ci	,	hsd	,	cs,	pa,	cval.getName())	;
+												fvis.TraverseVarDecl(static_cast<clang::VarDecl	*>(d))	;
+												cval.addFieldDescription(fvis.get_field_data())	;
+								}
+								break	;
+								default	:
+								break	;
+				}
+				return	true	;
 }
 
-bool CXXRecordVisitor::VisitDecl(clang::Decl *d) {
-    if ( debug_level >=2 ) {
-        std::cout << "\n\033[34mCXXRecordVisitor VisitDecl Decl = " << d->getDeclKindName() << "\033[0m" << std::endl ;
-    }
-    return true ;
+bool	CXXRecordVisitor::VisitDecl(clang::Decl	*d)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\n\033[34mCXXRecordVisitor	VisitDecl	Decl	=	"	<<	d->getDeclKindName()	<<	"\033[0m"	<<	std::endl	;
+				}
+				return	true	;
 }
 
-bool CXXRecordVisitor::VisitType(clang::Type *t) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nCXXRecordVisitor Type = " << t->getTypeClassName() << std::endl ;
-    }
-    return true;
+bool	CXXRecordVisitor::VisitType(clang::Type	*t)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nCXXRecordVisitor	Type	=	"	<<	t->getTypeClassName()	<<	std::endl	;
+				}
+				return	true;
 }
 
-static bool isTypeTemplateSpecialization(const clang::Type * type_ptr) {
-    if ( type_ptr->getTypeClass() == clang::Type::TemplateSpecialization ) {
-        return true ;
-    } else if ( type_ptr->getTypeClass() == clang::Type::Elaborated ) {
-        const clang::ElaboratedType * et = type_ptr->getAs<clang::ElaboratedType>() ;
-        //std::cout << "\ninherited Type = " << et->getNamedType().getTypePtr()->getTypeClassName() << "" << std::endl ;
-        return et->getNamedType().getTypePtr()->getTypeClass() == clang::Type::TemplateSpecialization ;
-    }
-    return false ;
+static	bool	isTypeTemplateSpecialization(const	clang::Type	*	type_ptr)	{
+				if	(	type_ptr->getTypeClass()	==	clang::Type::TemplateSpecialization	)	{
+								return	true	;
+				}	else	if	(	type_ptr->getTypeClass()	==	clang::Type::Elaborated	)	{
+								const	clang::ElaboratedType	*	et	=	type_ptr->getAs<clang::ElaboratedType>()	;
+								//std::cout	<<	"\ninherited	Type	=	"	<<	et->getNamedType().getTypePtr()->getTypeClassName()	<<	""	<<	std::endl	;
+								return	et->getNamedType().getTypePtr()->getTypeClass()	==	clang::Type::TemplateSpecialization	;
+				}
+				return	false	;
 }
 
-bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
-    if ( debug_level >= 2 ) {
-        rec->dump() ; std::cout << std::endl ;
-    }
-
-    // Return false to stop processing if there is no definition of this class
-    if ( rec->getDefinition() == NULL ) {
-        return false ;
-    }
-
-    // Return false to stop processing if this header file is excluded by one of many reasons.
-    std::string header_file_name = getFileName(ci , rec->RBRACELOC(), hsd) ;
-    char * rp = almostRealPath(header_file_name.c_str()) ;
-    if ( rp == NULL || pa.isHeaderExcluded(header_file_name, false) ) {
-        // mark the header as visited so PrintAttributes doesn't process it during addEmptyFiles()
-        pa.markHeaderAsVisited(header_file_name);
-        return false ;
-    }
-    cval.setCompat15(hsd.isPathInCompat15(rp)) ;
-    free(rp) ;
-
-    // If we have trouble determining the containing namespace and classes skip this variable.
-    if ( !cval.getNamespacesAndClasses(rec->getDeclContext())) {
-        return false ;
-    }
-
-    // If this class needs a default constructor, then the complier will generate one and we can call it.
-    if ( rec->needsImplicitDefaultConstructor() ) {
-        cval.setHasDefaultConstructor(true) ;
-    } else {
-        // Test all constructors to see if any of those are the default and public
-        clang::CXXRecordDecl::ctor_iterator cit ;
-        for ( cit = rec->ctor_begin() ; cit != rec->ctor_end() ; ++cit ) {
-            if ( ( !(*cit)->isDeleted() ) and (*cit)->isDefaultConstructor() and (*cit)->getAccess() == clang::AS_public ) {
-                cval.setHasDefaultConstructor(true) ;
-            }
-        }
-    }
-
-    // Test to see there is no declared destructor or it is declared public
-    clang::CXXDestructorDecl * dd  = rec->getDestructor() ;
-    if ( dd == NULL or dd->getAccess() == clang::AS_public ) {
-        cval.setHasPublicDestructor(true) ;
-    }
-
-    cval.setFileName(header_file_name) ;
-    cval.setAbstract(rec->isAbstract()) ;
-    cval.setName(rec->getNameAsString()) ;
-    cval.setPOD(rec->isPOD()) ;
-
-    cval.setSize(rec->getASTContext().getASTRecordLayout(rec).getSize().getQuantity()) ;
-
-
-    //std::cout << "parsing " << cval.getName() << std::endl ;
-    //std::cout << "    processing inheritance " <<  rec->getNumBases() << " " << rec->getNumVBases() << "" << std::endl ;
-    clang::CXXRecordDecl::base_class_iterator bcii ;
-    for ( bcii = rec->bases_begin() ; bcii != rec->bases_end() ; ++bcii ) {
-        if ( !bcii->isVirtual() ) {
-            const clang::Type * temp = bcii->getType().getTypePtr() ;
-            //std::cout << "\ninherited Type = " << temp->getTypeClassName() << "" << std::endl ;
-            const clang::RecordType * rt = temp->getAs<clang::RecordType>() ;
-            if ( rt != NULL ) {
-                clang::RecordDecl * rd = rt->getDecl() ;
-                //std::cout << "    " << cval.getName() << " inherits from " << rd->getNameAsString() << "" << std::endl ;
-                //rd->dump() ; std::cout << std::endl ;
-                if ( isInUserOrTrickCode(ci , rd->RBRACELOC(), hsd) ) {
-                    const clang::ASTRecordLayout &record_layout = rec->getASTContext().getASTRecordLayout(rec);
-                    unsigned int inherit_class_offset ;
-
-                    inherit_class_offset = record_layout.getBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity() ;
-                    //std::cout << "    inherit_class_offset = " << inherit_class_offset << "" << std::endl ;
-                    //std::cout << "    " << getFileName(ci , rd->RBRACELOC(), hsd) << "" << std::endl ;
-                    CXXRecordVisitor inherit_cvis(ci , cs, hsd , pa, false) ;
-                    if (inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(rd))) {
-                        cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(), inherit_class_offset, false) ;
-                        // clear the field list in the inherited class so they are not freed when inherit_cvis
-                        // goes out of scope.
-                        inherit_cvis.get_class_data()->clearFieldDescription() ;
-                        // If we are inheriting from a template specialization, don't save the inherited class.  This list
-                        // is maintained to call init_attr of the inherited classes.  A template specialization does not
-                        // havethese attributes.
-                        if ( ! isTypeTemplateSpecialization(temp) ) {
-                            // We want to save the inherited class data, but it's going to go out of scope so we need
-                            // to make a copy of it.
-                            ClassValues * icv = new ClassValues(*(inherit_cvis.get_class_data())) ;
-                            // The inherited classes of this inherited class are not required in the copy,
-                            // and they are going out of scope
-                            cval.saveInheritAncestry(icv) ;
-                            icv->clearInheritedClass() ;
-
-                            // Save the copy of the inherited class to the current class
-                            cval.addInheritedClass(inherit_cvis.get_class_data()->getFullyQualifiedTypeName()) ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    //std::cout << "    end inheritance" << std::endl ;
-
-    // Virtual base classes are parsed once
-    // When processing inherited classes include_virtual_base will be set to true
-    // so we don't process virtual inherited classes multiple times.
-    if ( include_virtual_base ) {
-        for ( bcii = rec->vbases_begin() ; bcii != rec->vbases_end() ; ++bcii ) {
-            const clang::Type * temp = bcii->getType().getTypePtr() ;
-            //std::cout << "\ninherited Type = " << temp->getTypeClassName() << "" << std::endl ;
-            const clang::RecordType * rt = temp->getAs<clang::RecordType>() ;
-            if ( rt != NULL ) {
-                clang::RecordDecl * rd = rt->getDecl() ;
-                //std::cout << "    " << cval.getName() << " virtually inherits from "
-                // << rd->getNameAsString() << "" << std::endl ;
-                //rd->dump() ; std::cout << std::endl ;
-                if ( isInUserOrTrickCode(ci , rd->RBRACELOC(), hsd) ) {
-                    const clang::ASTRecordLayout &record_layout = rec->getASTContext().getASTRecordLayout(rec);
-                    unsigned int inherit_class_offset ;
-
-                    // Virtual base classes have a fixed offset that cannot be accessed at runtime.  We have clang's calculation
-                    // to where the base class will be.
-                    inherit_class_offset = record_layout.getVBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity() ;
-
-                    //std::cout << "    inherit_class_offset = " << inherit_class_offset << "" << std::endl ;
-                    //std::cout << "    " << getFileName(ci , rd->RBRACELOC(), hsd) << "" << std::endl ;
-                    CXXRecordVisitor inherit_cvis(ci , cs, hsd , pa, false) ;
-                    inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(rd)) ;
-                    cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(), inherit_class_offset, true) ;
-                    // clear the field list in the inherited class so they are not freed when inherit_cvis goes out of scope.
-                    inherit_cvis.get_class_data()->clearFieldDescription() ;
-                    // If we are inheriting from a template specialization, don't save the inherited class.  This list
-                    // is maintained to call init_attr of the inherited classes.  A template specialization does not have
-                    // these attributes.
-                    if ( ! isTypeTemplateSpecialization(temp) ) {
-                        ClassValues * icv = new ClassValues(*(inherit_cvis.get_class_data())) ;
-                        // The inherited classes of this inherted class are not required in the copy, and they are going out of scope
-                        icv->clearInheritedClass() ;
-
-                        // Save the copy of the inherited class to the current class
-                        cval.addInheritedClass(inherit_cvis.get_class_data()->getFullyQualifiedTypeName()) ;
-                    }
-                }
-            }
-        }
-    }
-
-    // clears obscured inherited variables caused by diamond inheritance
-    cval.clearAmbiguousVariables() ;
-
-    // sets the container class for all fields to the current class name
-    cval.setContainerClassForFields() ;
-
-    return true;
+bool	CXXRecordVisitor::VisitCXXRecordDecl(	clang::CXXRecordDecl	*rec	)	{
+				if	(	debug_level	>=	2	)	{
+								rec->dump()	;	std::cout	<<	std::endl	;
+				}
+
+				//	Return	false	to	stop	processing	if	there	is	no	definition	of	this	class
+				if	(	rec->getDefinition()	==	NULL	)	{
+								return	false	;
+				}
+
+				//	Return	false	to	stop	processing	if	this	header	file	is	excluded	by	one	of	many	reasons.
+				std::string	header_file_name	=	getFileName(ci	,	rec->RBRACELOC(),	hsd)	;
+				char	*	rp	=	almostRealPath(header_file_name.c_str())	;
+				if	(	rp	==	NULL	||	pa.isHeaderExcluded(header_file_name,	false)	)	{
+								//	mark	the	header	as	visited	so	PrintAttributes	doesn't	process	it	during	addEmptyFiles()
+								pa.markHeaderAsVisited(header_file_name);
+								return	false	;
+				}
+				cval.setCompat15(hsd.isPathInCompat15(rp))	;
+				free(rp)	;
+
+				//	If	we	have	trouble	determining	the	containing	namespace	and	classes	skip	this	variable.
+				if	(	!cval.getNamespacesAndClasses(rec->getDeclContext()))	{
+								return	false	;
+				}
+
+				//	If	this	class	needs	a	default	constructor,	then	the	complier	will	generate	one	and	we	can	call	it.
+				if	(	rec->needsImplicitDefaultConstructor()	)	{
+								cval.setHasDefaultConstructor(true)	;
+				}	else	{
+								//	Test	all	constructors	to	see	if	any	of	those	are	the	default	and	public
+								clang::CXXRecordDecl::ctor_iterator	cit	;
+								for	(	cit	=	rec->ctor_begin()	;	cit	!=	rec->ctor_end()	;	++cit	)	{
+												if	(	(	!(*cit)->isDeleted()	)	and	(*cit)->isDefaultConstructor()	and	(*cit)->getAccess()	==	clang::AS_public	)	{
+																cval.setHasDefaultConstructor(true)	;
+												}
+								}
+				}
+
+				//	Test	to	see	there	is	no	declared	destructor	or	it	is	declared	public
+				clang::CXXDestructorDecl	*	dd		=	rec->getDestructor()	;
+				if	(	dd	==	NULL	or	dd->getAccess()	==	clang::AS_public	)	{
+								cval.setHasPublicDestructor(true)	;
+				}
+
+				cval.setFileName(header_file_name)	;
+				cval.setAbstract(rec->isAbstract())	;
+				cval.setName(rec->getNameAsString())	;
+				cval.setPOD(rec->isPOD())	;
+
+				cval.setSize(rec->getASTContext().getASTRecordLayout(rec).getSize().getQuantity())	;
+
+
+				//std::cout	<<	"parsing	"	<<	cval.getName()	<<	std::endl	;
+				//std::cout	<<	"				processing	inheritance	"	<<		rec->getNumBases()	<<	"	"	<<	rec->getNumVBases()	<<	""	<<	std::endl	;
+				clang::CXXRecordDecl::base_class_iterator	bcii	;
+				for	(	bcii	=	rec->bases_begin()	;	bcii	!=	rec->bases_end()	;	++bcii	)	{
+								if	(	!bcii->isVirtual()	)	{
+												const	clang::Type	*	temp	=	bcii->getType().getTypePtr()	;
+												//std::cout	<<	"\ninherited	Type	=	"	<<	temp->getTypeClassName()	<<	""	<<	std::endl	;
+												const	clang::RecordType	*	rt	=	temp->getAs<clang::RecordType>()	;
+												if	(	rt	!=	NULL	)	{
+																clang::RecordDecl	*	rd	=	rt->getDecl()	;
+																//std::cout	<<	"				"	<<	cval.getName()	<<	"	inherits	from	"	<<	rd->getNameAsString()	<<	""	<<	std::endl	;
+																//rd->dump()	;	std::cout	<<	std::endl	;
+																if	(	isInUserOrTrickCode(ci	,	rd->RBRACELOC(),	hsd)	)	{
+																				const	clang::ASTRecordLayout	&record_layout	=	rec->getASTContext().getASTRecordLayout(rec);
+																				unsigned	int	inherit_class_offset	;
+
+																				inherit_class_offset	=	record_layout.getBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity()	;
+																				//std::cout	<<	"				inherit_class_offset	=	"	<<	inherit_class_offset	<<	""	<<	std::endl	;
+																				//std::cout	<<	"				"	<<	getFileName(ci	,	rd->RBRACELOC(),	hsd)	<<	""	<<	std::endl	;
+																				CXXRecordVisitor	inherit_cvis(ci	,	cs,	hsd	,	pa,	false)	;
+																				if	(inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(rd)))	{
+																								cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(),	inherit_class_offset,	false)	;
+																								//	clear	the	field	list	in	the	inherited	class	so	they	are	not	freed	when	inherit_cvis
+																								//	goes	out	of	scope.
+																								inherit_cvis.get_class_data()->clearFieldDescription()	;
+																								//	If	we	are	inheriting	from	a	template	specialization,	don't	save	the	inherited	class.		This	list
+																								//	is	maintained	to	call	init_attr	of	the	inherited	classes.		A	template	specialization	does	not
+																								//	havethese	attributes.
+																								if	(	!	isTypeTemplateSpecialization(temp)	)	{
+																												//	We	want	to	save	the	inherited	class	data,	but	it's	going	to	go	out	of	scope	so	we	need
+																												//	to	make	a	copy	of	it.
+																												ClassValues	*	icv	=	new	ClassValues(*(inherit_cvis.get_class_data()))	;
+																												//	The	inherited	classes	of	this	inherited	class	are	not	required	in	the	copy,
+																												//	and	they	are	going	out	of	scope
+																												cval.saveInheritAncestry(icv)	;
+																												icv->clearInheritedClass()	;
+
+																												//	Save	the	copy	of	the	inherited	class	to	the	current	class
+																												cval.addInheritedClass(inherit_cvis.get_class_data()->getFullyQualifiedTypeName())	;
+																								}
+																				}
+																}
+												}
+								}
+				}
+				//std::cout	<<	"				end	inheritance"	<<	std::endl	;
+
+				//	Virtual	base	classes	are	parsed	once
+				//	When	processing	inherited	classes	include_virtual_base	will	be	set	to	true
+				//	so	we	don't	process	virtual	inherited	classes	multiple	times.
+				if	(	include_virtual_base	)	{
+								for	(	bcii	=	rec->vbases_begin()	;	bcii	!=	rec->vbases_end()	;	++bcii	)	{
+												const	clang::Type	*	temp	=	bcii->getType().getTypePtr()	;
+												//std::cout	<<	"\ninherited	Type	=	"	<<	temp->getTypeClassName()	<<	""	<<	std::endl	;
+												const	clang::RecordType	*	rt	=	temp->getAs<clang::RecordType>()	;
+												if	(	rt	!=	NULL	)	{
+																clang::RecordDecl	*	rd	=	rt->getDecl()	;
+																//std::cout	<<	"				"	<<	cval.getName()	<<	"	virtually	inherits	from	"
+																//	<<	rd->getNameAsString()	<<	""	<<	std::endl	;
+																//rd->dump()	;	std::cout	<<	std::endl	;
+																if	(	isInUserOrTrickCode(ci	,	rd->RBRACELOC(),	hsd)	)	{
+																				const	clang::ASTRecordLayout	&record_layout	=	rec->getASTContext().getASTRecordLayout(rec);
+																				unsigned	int	inherit_class_offset	;
+
+																				//	Virtual	base	classes	have	a	fixed	offset	that	cannot	be	accessed	at	runtime.		We	have	clang's	calculation
+																				//	to	where	the	base	class	will	be.
+																				inherit_class_offset	=	record_layout.getVBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity()	;
+
+																				//std::cout	<<	"				inherit_class_offset	=	"	<<	inherit_class_offset	<<	""	<<	std::endl	;
+																				//std::cout	<<	"				"	<<	getFileName(ci	,	rd->RBRACELOC(),	hsd)	<<	""	<<	std::endl	;
+																				CXXRecordVisitor	inherit_cvis(ci	,	cs,	hsd	,	pa,	false)	;
+																				inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(rd))	;
+																				cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(),	inherit_class_offset,	true)	;
+																				//	clear	the	field	list	in	the	inherited	class	so	they	are	not	freed	when	inherit_cvis	goes	out	of	scope.
+																				inherit_cvis.get_class_data()->clearFieldDescription()	;
+																				//	If	we	are	inheriting	from	a	template	specialization,	don't	save	the	inherited	class.		This	list
+																				//	is	maintained	to	call	init_attr	of	the	inherited	classes.		A	template	specialization	does	not	have
+																				//	these	attributes.
+																				if	(	!	isTypeTemplateSpecialization(temp)	)	{
+																								ClassValues	*	icv	=	new	ClassValues(*(inherit_cvis.get_class_data()))	;
+																								//	The	inherited	classes	of	this	inherted	class	are	not	required	in	the	copy,	and	they	are	going	out	of	scope
+																								icv->clearInheritedClass()	;
+
+																								//	Save	the	copy	of	the	inherited	class	to	the	current	class
+																								cval.addInheritedClass(inherit_cvis.get_class_data()->getFullyQualifiedTypeName())	;
+																				}
+																}
+												}
+								}
+				}
+
+				//	clears	obscured	inherited	variables	caused	by	diamond	inheritance
+				cval.clearAmbiguousVariables()	;
+
+				//	sets	the	container	class	for	all	fields	to	the	current	class	name
+				cval.setContainerClassForFields()	;
+
+				return	true;
 }
 
-// Test if we have a friend with the name "init_attr<class_name>"
-bool CXXRecordVisitor::VisitFriendDecl( clang::FriendDecl *fd ) {
-    //std::cout << "    ClassVisitor::VisitFriendDecl" << std::endl ;
-    clang::TypeSourceInfo * tsi = fd->getFriendType() ;
-    if ( tsi == NULL ) {
-        clang::NamedDecl * nd = fd->getFriendDecl() ;
-        if ( nd != NULL and nd->getDeclName().isIdentifier()) {
-            //nd->dump() ;
-            std::string init_func = std::string("init_attr") ;
-            std::stringstream name_sp ;
-            cval.printNamespaces( name_sp , "__") ;
-            init_func += name_sp.str() + cval.getName() ;
-            std::string friend_str = nd->getName().str() ;
-            if ( ! friend_str.find(init_func) ) {
-                //std::cout << "        found a friend!" << std::endl ;
-                cval.setHasInitAttrFriend(true) ;
-            } else if ( ! friend_str.find("init_attr") ) {
-                std::cerr << bold(color(WARNING,"Warning")) << "    " << cval.getFileName() << ":" <<
-                 ci.getSourceManager().getSpellingLineNumber(fd->getSourceRange().getBegin()) << ":" << std::endl ;
-                std::cerr << "           friend " << friend_str << " does not match expected name " <<
-                  init_func << std::endl ;
-            }
-        }
-    }
-    return true ;
+//	Test	if	we	have	a	friend	with	the	name	"init_attr<class_name>"
+bool	CXXRecordVisitor::VisitFriendDecl(	clang::FriendDecl	*fd	)	{
+				//std::cout	<<	"				ClassVisitor::VisitFriendDecl"	<<	std::endl	;
+				clang::TypeSourceInfo	*	tsi	=	fd->getFriendType()	;
+				if	(	tsi	==	NULL	)	{
+								clang::NamedDecl	*	nd	=	fd->getFriendDecl()	;
+								if	(	nd	!=	NULL	and	nd->getDeclName().isIdentifier())	{
+												//nd->dump()	;
+												std::string	init_func	=	std::string("init_attr")	;
+												std::stringstream	name_sp	;
+												cval.printNamespaces(	name_sp	,	"__")	;
+												init_func	+=	name_sp.str()	+	cval.getName()	;
+												std::string	friend_str	=	nd->getName().str()	;
+												if	(	!	friend_str.find(init_func)	)	{
+																//std::cout	<<	"								found	a	friend!"	<<	std::endl	;
+																cval.setHasInitAttrFriend(true)	;
+												}	else	if	(	!	friend_str.find("init_attr")	)	{
+																std::cerr	<<	bold(color(WARNING,"Warning"))	<<	"				"	<<	cval.getFileName()	<<	":"	<<
+																	ci.getSourceManager().getSpellingLineNumber(fd->getSourceRange().getBegin())	<<	":"	<<	std::endl	;
+																std::cerr	<<	"											friend	"	<<	friend_str	<<	"	does	not	match	expected	name	"	<<
+																		init_func	<<	std::endl	;
+												}
+								}
+				}
+				return	true	;
 }
 
-ClassValues * CXXRecordVisitor::get_class_data() {
-    return &cval ;
+ClassValues	*	CXXRecordVisitor::get_class_data()	{
+				return	&cval	;
 }
 
-std::set<std::string> CXXRecordVisitor::private_embedded_classes ;
+std::set<std::string>	CXXRecordVisitor::private_embedded_classes	;
 
-std::set<std::string> CXXRecordVisitor::friend_classes ;
+std::set<std::string>	CXXRecordVisitor::friend_classes	;
 
-void CXXRecordVisitor::addPrivateEmbeddedClass( std::string in_name ) {
-    private_embedded_classes.insert(in_name) ;
+void	CXXRecordVisitor::addPrivateEmbeddedClass(	std::string	in_name	)	{
+				private_embedded_classes.insert(in_name)	;
 }
 
-bool CXXRecordVisitor::isPrivateEmbeddedClass( std::string in_name ) {
-    size_t pos ;
-    while ((pos = in_name.find("class ")) != std::string::npos ) {
-        in_name.erase(pos , 6) ;
-    }
-    while ((pos = in_name.find("struct ")) != std::string::npos ) {
-        in_name.erase(pos , 7) ;
-    }
-    while ((pos = in_name.find("enum ")) != std::string::npos ) {
-        in_name.erase(pos , 5) ;
-    }
-    while ((pos = in_name.find("const ")) != std::string::npos ) {
-        in_name.erase(pos , 6) ;
-    }
-    // remove any array or pointer dimensions.
-    if ( in_name.find_first_of("[*") != std::string::npos ) {
-        in_name.erase(in_name.find_first_of("[*")) ;
-    }
-    // remove trailing spaces
-    in_name.erase(std::find_if(in_name.rbegin(), in_name.rend(), 
-        [](int c) {return !std::isspace(c);}).base(), in_name.end());
-
-    // remove all template arguments "<text>"
-    bool template_arg_found ;
-    do {
-        template_arg_found = false ;
-        std::stack<int> bracket_pos ;
-        for ( int ii = 0 ; ii < in_name.length() ; ii++ ) {
-            if ( in_name[ii] == '<' ) {
-                bracket_pos.push(ii) ;
-            } else if ( in_name[ii] == '>' ) {
-                int begin = bracket_pos.top() ;
-                bracket_pos.pop() ;
-                if ( bracket_pos.empty() ) {
-                    template_arg_found = true ;
-                    in_name.erase(begin, ii - begin + 1) ;
-                    break ;
-                }
-            }
-        }
-    } while ( template_arg_found == true ) ;
-
-    std::set<std::string>::iterator it ;
-    it = private_embedded_classes.find(in_name) ;
-    if ( it != private_embedded_classes.end() ) {
-        return true ;
-    }
-    return false ;
+bool	CXXRecordVisitor::isPrivateEmbeddedClass(	std::string	in_name	)	{
+				size_t	pos	;
+				while	((pos	=	in_name.find("class	"))	!=	std::string::npos	)	{
+								in_name.erase(pos	,	6)	;
+				}
+				while	((pos	=	in_name.find("struct	"))	!=	std::string::npos	)	{
+								in_name.erase(pos	,	7)	;
+				}
+				while	((pos	=	in_name.find("enum	"))	!=	std::string::npos	)	{
+								in_name.erase(pos	,	5)	;
+				}
+				while	((pos	=	in_name.find("const	"))	!=	std::string::npos	)	{
+								in_name.erase(pos	,	6)	;
+				}
+				//	remove	any	array	or	pointer	dimensions.
+				if	(	in_name.find_first_of("[*")	!=	std::string::npos	)	{
+								in_name.erase(in_name.find_first_of("[*"))	;
+				}
+				//	remove	trailing	spaces
+				in_name.erase(std::find_if(in_name.rbegin(),	in_name.rend(),	
+								[](int	c)	{return	!std::isspace(c);}).base(),	in_name.end());
+
+				//	remove	all	template	arguments	"<text>"
+				bool	template_arg_found	;
+				do	{
+								template_arg_found	=	false	;
+								std::stack<int>	bracket_pos	;
+								for	(	int	ii	=	0	;	ii	<	in_name.length()	;	ii++	)	{
+												if	(	in_name[ii]	==	'<'	)	{
+																bracket_pos.push(ii)	;
+												}	else	if	(	in_name[ii]	==	'>'	)	{
+																int	begin	=	bracket_pos.top()	;
+																bracket_pos.pop()	;
+																if	(	bracket_pos.empty()	)	{
+																				template_arg_found	=	true	;
+																				in_name.erase(begin,	ii	-	begin	+	1)	;
+																				break	;
+																}
+												}
+								}
+				}	while	(	template_arg_found	==	true	)	;
+
+				std::set<std::string>::iterator	it	;
+				it	=	private_embedded_classes.find(in_name)	;
+				if	(	it	!=	private_embedded_classes.end()	)	{
+								return	true	;
+				}
+				return	false	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/CommentSaver.cpp b/trick_source/codegen/Interface_Code_Gen/CommentSaver.cpp
index 33e3b74b2..ec8a6879d 100644
--- a/trick_source/codegen/Interface_Code_Gen/CommentSaver.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/CommentSaver.cpp
@@ -1,271 +1,271 @@
 
-#include <iostream>
-#include <sstream>
-#include <regex.h>
-#include <algorithm>
+#include	<iostream>
+#include	<sstream>
+#include	<regex.h>
+#include	<algorithm>
 
-#include "clang/Basic/FileManager.h"
+#include	"clang/Basic/FileManager.h"
 
-#include "CommentSaver.hh"
-#include "Utilities.hh"
+#include	"CommentSaver.hh"
+#include	"Utilities.hh"
 
-CommentSaver::CommentSaver(clang::CompilerInstance & in_ci , HeaderSearchDirs & in_hsd ) : ci(in_ci) , hsd(in_hsd) {}
+CommentSaver::CommentSaver(clang::CompilerInstance	&	in_ci	,	HeaderSearchDirs	&	in_hsd	)	:	ci(in_ci)	,	hsd(in_hsd)	{}
 
-bool CommentSaver::HandleComment(clang::Preprocessor &PP, clang::SourceRange Comment) {
+bool	CommentSaver::HandleComment(clang::Preprocessor	&PP,	clang::SourceRange	Comment)	{
 
-    //Comment.getBegin().dump(sm) ;
-    if ( isInUserOrTrickCode( ci , Comment.getBegin() , hsd ) ) {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-        std::string file_name = ci.getSourceManager().getBufferName(Comment.getBegin()) ;
+				//Comment.getBegin().dump(sm)	;
+				if	(	isInUserOrTrickCode(	ci	,	Comment.getBegin()	,	hsd	)	)	{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+								std::string	file_name	=	ci.getSourceManager().getBufferName(Comment.getBegin())	;
 #else
-        std::string file_name = ci.getSourceManager().getBufferName(Comment.getBegin()).str() ;
+								std::string	file_name	=	ci.getSourceManager().getBufferName(Comment.getBegin()).str()	;
 #endif
-        char * resolved_path = almostRealPath( file_name.c_str() ) ;
-        if ( resolved_path != NULL ) {
-            unsigned int line_no = ci.getSourceManager().getSpellingLineNumber(Comment.getBegin()) ;
-            comment_map[std::string(resolved_path)][line_no] = Comment ;
-            free(resolved_path) ;
-        }
-    }
-
-    // returning false means we did not push any text back to the stream for further reads.
-    return false ;
+								char	*	resolved_path	=	almostRealPath(	file_name.c_str()	)	;
+								if	(	resolved_path	!=	NULL	)	{
+												unsigned	int	line_no	=	ci.getSourceManager().getSpellingLineNumber(Comment.getBegin())	;
+												comment_map[std::string(resolved_path)][line_no]	=	Comment	;
+												free(resolved_path)	;
+								}
+				}
+
+				//	returning	false	means	we	did	not	push	any	text	back	to	the	stream	for	further	reads.
+				return	false	;
 }
 
-std::string CommentSaver::getComment( clang::SourceRange sr ) {
+std::string	CommentSaver::getComment(	clang::SourceRange	sr	)	{
 
-    if ( sr.isValid() ) {
-        /* fsl_begin and fsl_end are two pointers into the header file.  We want the text between the two pointers. */
-        clang::FullSourceLoc fsl_begin(sr.getBegin() , ci.getSourceManager()) ;
-        clang::FullSourceLoc fsl_end(sr.getEnd() , ci.getSourceManager()) ;
-        std::string comment_text( fsl_begin.getCharacterData() ,
-         (size_t)(fsl_end.getCharacterData() - fsl_begin.getCharacterData())) ;
-        return comment_text ;
-    }
+				if	(	sr.isValid()	)	{
+								/*	fsl_begin	and	fsl_end	are	two	pointers	into	the	header	file.		We	want	the	text	between	the	two	pointers.	*/
+								clang::FullSourceLoc	fsl_begin(sr.getBegin()	,	ci.getSourceManager())	;
+								clang::FullSourceLoc	fsl_end(sr.getEnd()	,	ci.getSourceManager())	;
+								std::string	comment_text(	fsl_begin.getCharacterData()	,
+									(size_t)(fsl_end.getCharacterData()	-	fsl_begin.getCharacterData()))	;
+								return	comment_text	;
+				}
 
-    /* return an empty string if no comment found on this line of the file. */
-    return std::string() ;
+				/*	return	an	empty	string	if	no	comment	found	on	this	line	of	the	file.	*/
+				return	std::string()	;
 }
 
-std::string CommentSaver::getComment( std::string file_name , unsigned int line_no ) {
-    return getComment(comment_map[file_name][line_no]) ;
+std::string	CommentSaver::getComment(	std::string	file_name	,	unsigned	int	line_no	)	{
+				return	getComment(comment_map[file_name][line_no])	;
 }
 
-std::string CommentSaver::getTrickHeaderComment( std::string file_name ) {
-
-    std::map < unsigned int , clang::SourceRange >::iterator cit ;
-    std::string ret ;
-
-    char * resolved_path = almostRealPath( file_name.c_str() ) ;
-    if ( resolved_path != NULL ) {
-        if ( trick_header_comments.find(resolved_path) == trick_header_comments.end() ) {
-            trick_header_comments[resolved_path] = std::string() ;
-            for ( cit = comment_map[resolved_path].begin() ; cit != comment_map[resolved_path].end() ; ++cit ) {
-                std::string comment_str = getComment((*cit).second) ;
-                if ( comment_str.find("@trick_parse") != std::string::npos or
-                     comment_str.find("\\trick_parse") != std::string::npos ) {
-                    trick_header_comments[resolved_path] = getComment((*cit).second) ;
-                    break ;
-                } else {
-                    std::transform(comment_str.begin(), comment_str.end(), comment_str.begin(), ::toupper) ;
-                    if ( comment_str.find("PURPOSE") != std::string::npos ) {
-                        trick_header_comments[resolved_path] = getComment((*cit).second) ;
-                        break ;
-                    }
-                }
-            }
-        }
-        ret = trick_header_comments[resolved_path] ;
-        free(resolved_path) ;
-    }
-
-    return ret ;
+std::string	CommentSaver::getTrickHeaderComment(	std::string	file_name	)	{
+
+				std::map	<	unsigned	int	,	clang::SourceRange	>::iterator	cit	;
+				std::string	ret	;
+
+				char	*	resolved_path	=	almostRealPath(	file_name.c_str()	)	;
+				if	(	resolved_path	!=	NULL	)	{
+								if	(	trick_header_comments.find(resolved_path)	==	trick_header_comments.end()	)	{
+												trick_header_comments[resolved_path]	=	std::string()	;
+												for	(	cit	=	comment_map[resolved_path].begin()	;	cit	!=	comment_map[resolved_path].end()	;	++cit	)	{
+																std::string	comment_str	=	getComment((*cit).second)	;
+																if	(	comment_str.find("@trick_parse")	!=	std::string::npos	or
+																					comment_str.find("\\trick_parse")	!=	std::string::npos	)	{
+																				trick_header_comments[resolved_path]	=	getComment((*cit).second)	;
+																				break	;
+																}	else	{
+																				std::transform(comment_str.begin(),	comment_str.end(),	comment_str.begin(),	::toupper)	;
+																				if	(	comment_str.find("PURPOSE")	!=	std::string::npos	)	{
+																								trick_header_comments[resolved_path]	=	getComment((*cit).second)	;
+																								break	;
+																				}
+																}
+												}
+								}
+								ret	=	trick_header_comments[resolved_path]	;
+								free(resolved_path)	;
+				}
+
+				return	ret	;
 
 }
 
-void CommentSaver::getICGField( std::string file_name ) {
-
-    /* default the icg_no flags to false */
-    icg_no_found[file_name] = false ;
-    icg_no_comment_found[file_name] = false ;
-
-    std::string th_str = getTrickHeaderComment(file_name) ;
-    if ( ! th_str.empty() ) {
-
-        size_t trick_parse_keyword ;
-        if ( (trick_parse_keyword = th_str.find("trick_parse")) != std::string::npos ) {
-            size_t trick_parse_everything = th_str.find("everything", trick_parse_keyword) ;
-            size_t trick_parse_attributes = th_str.find("attributes", trick_parse_keyword) ;
-            size_t trick_parse_dep_only = th_str.find("dependencies_only", trick_parse_keyword) ;
-            size_t closing_brace = th_str.find("}", trick_parse_keyword) ;
-            if ( closing_brace != std::string::npos ) {
-                if ( trick_parse_everything != std::string::npos and
-                     trick_parse_everything < closing_brace ) {
-                    icg_no_comment_found[file_name] = false ;
-                    icg_no_found[file_name] = false ;
-                } else if ( trick_parse_attributes != std::string::npos and
-                     trick_parse_attributes < closing_brace ) {
-                    icg_no_comment_found[file_name] = true ;
-                    icg_no_found[file_name] = false ;
-                } else if ( trick_parse_dep_only != std::string::npos and
-                     trick_parse_dep_only < closing_brace ) {
-                    icg_no_comment_found[file_name] = false ;
-                    icg_no_found[file_name] = true ;
-                } else {
-                    std::cout << file_name << ": trick_parse directive found but no argument matched." << std::endl ;
-                    std::cout << "Valid arguments are (everything|attributes|dependencies_only)" << std::endl ;
-                    exit(-1) ;
-                }
-            }
-        } else {
-
-            std::transform(th_str.begin(), th_str.end(), th_str.begin(), ::toupper) ;
-            int ret ;
-            regex_t reg_expr ;
-            regmatch_t pmatch[10] ;
-            memset(pmatch , 0 , sizeof(pmatch)) ;
-
-            /* POSIX regular expressions are always greedy, making our job harder.
-               We have to use several regular expressions to get the types.  This was
-               so much easier in perl! */
-
-            /* find the ICG field */
-            regcomp( &reg_expr , "(ICG:)" , REG_EXTENDED | REG_ICASE ) ;
-            ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-            regfree(&reg_expr) ;
-            if ( ret != 0 ) {
-                return ;
-            }
-            th_str = th_str.substr(pmatch[1].rm_eo) ;
-
-            /* find the end of the ICG field */
-            memset(pmatch , 0 , sizeof(pmatch)) ;
-            regcomp( &reg_expr , "(\\))" , REG_EXTENDED ) ;
-            ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-            regfree(&reg_expr) ;
-
-            if ( ret != 0 ) {
-                return ;
-            }
-            th_str = th_str.substr(0 , pmatch[1].rm_so) ;
-
-            /* test for NoComment */
-            memset(pmatch , 0 , sizeof(pmatch)) ;
-            regcomp( &reg_expr , "(NOCOMMENT)$" , REG_EXTENDED ) ;
-            ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-            regfree(&reg_expr) ;
-
-            if ( ret == 0 ) {
-                icg_no_comment_found[file_name] = true ;
-            }
-
-            /* test for No */
-            memset(pmatch , 0 , sizeof(pmatch)) ;
-            regcomp( &reg_expr , "(NO)$" , REG_EXTENDED ) ;
-            ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-            regfree(&reg_expr) ;
-
-            if ( ret == 0 ) {
-                icg_no_found[file_name] = true ;
-                icg_no_comment_found[file_name] = true ;
-            }
-        }
-    }
+void	CommentSaver::getICGField(	std::string	file_name	)	{
+
+				/*	default	the	icg_no	flags	to	false	*/
+				icg_no_found[file_name]	=	false	;
+				icg_no_comment_found[file_name]	=	false	;
+
+				std::string	th_str	=	getTrickHeaderComment(file_name)	;
+				if	(	!	th_str.empty()	)	{
+
+								size_t	trick_parse_keyword	;
+								if	(	(trick_parse_keyword	=	th_str.find("trick_parse"))	!=	std::string::npos	)	{
+												size_t	trick_parse_everything	=	th_str.find("everything",	trick_parse_keyword)	;
+												size_t	trick_parse_attributes	=	th_str.find("attributes",	trick_parse_keyword)	;
+												size_t	trick_parse_dep_only	=	th_str.find("dependencies_only",	trick_parse_keyword)	;
+												size_t	closing_brace	=	th_str.find("}",	trick_parse_keyword)	;
+												if	(	closing_brace	!=	std::string::npos	)	{
+																if	(	trick_parse_everything	!=	std::string::npos	and
+																					trick_parse_everything	<	closing_brace	)	{
+																				icg_no_comment_found[file_name]	=	false	;
+																				icg_no_found[file_name]	=	false	;
+																}	else	if	(	trick_parse_attributes	!=	std::string::npos	and
+																					trick_parse_attributes	<	closing_brace	)	{
+																				icg_no_comment_found[file_name]	=	true	;
+																				icg_no_found[file_name]	=	false	;
+																}	else	if	(	trick_parse_dep_only	!=	std::string::npos	and
+																					trick_parse_dep_only	<	closing_brace	)	{
+																				icg_no_comment_found[file_name]	=	false	;
+																				icg_no_found[file_name]	=	true	;
+																}	else	{
+																				std::cout	<<	file_name	<<	":	trick_parse	directive	found	but	no	argument	matched."	<<	std::endl	;
+																				std::cout	<<	"Valid	arguments	are	(everything|attributes|dependencies_only)"	<<	std::endl	;
+																				exit(-1)	;
+																}
+												}
+								}	else	{
+
+												std::transform(th_str.begin(),	th_str.end(),	th_str.begin(),	::toupper)	;
+												int	ret	;
+												regex_t	reg_expr	;
+												regmatch_t	pmatch[10]	;
+												memset(pmatch	,	0	,	sizeof(pmatch))	;
+
+												/*	POSIX	regular	expressions	are	always	greedy,	making	our	job	harder.
+															We	have	to	use	several	regular	expressions	to	get	the	types.		This	was
+															so	much	easier	in	perl!	*/
+
+												/*	find	the	ICG	field	*/
+												regcomp(	&reg_expr	,	"(ICG:)"	,	REG_EXTENDED	|	REG_ICASE	)	;
+												ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+												regfree(&reg_expr)	;
+												if	(	ret	!=	0	)	{
+																return	;
+												}
+												th_str	=	th_str.substr(pmatch[1].rm_eo)	;
+
+												/*	find	the	end	of	the	ICG	field	*/
+												memset(pmatch	,	0	,	sizeof(pmatch))	;
+												regcomp(	&reg_expr	,	"(\\))"	,	REG_EXTENDED	)	;
+												ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+												regfree(&reg_expr)	;
+
+												if	(	ret	!=	0	)	{
+																return	;
+												}
+												th_str	=	th_str.substr(0	,	pmatch[1].rm_so)	;
+
+												/*	test	for	NoComment	*/
+												memset(pmatch	,	0	,	sizeof(pmatch))	;
+												regcomp(	&reg_expr	,	"(NOCOMMENT)$"	,	REG_EXTENDED	)	;
+												ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+												regfree(&reg_expr)	;
+
+												if	(	ret	==	0	)	{
+																icg_no_comment_found[file_name]	=	true	;
+												}
+
+												/*	test	for	No	*/
+												memset(pmatch	,	0	,	sizeof(pmatch))	;
+												regcomp(	&reg_expr	,	"(NO)$"	,	REG_EXTENDED	)	;
+												ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+												regfree(&reg_expr)	;
+
+												if	(	ret	==	0	)	{
+																icg_no_found[file_name]	=	true	;
+																icg_no_comment_found[file_name]	=	true	;
+												}
+								}
+				}
 
 }
 
-bool CommentSaver::hasTrickHeader( std::string file_name ) {
-    std::string th_str = getTrickHeaderComment(file_name) ;
-    return (! th_str.empty()) ;
+bool	CommentSaver::hasTrickHeader(	std::string	file_name	)	{
+				std::string	th_str	=	getTrickHeaderComment(file_name)	;
+				return	(!	th_str.empty())	;
 }
 
-bool CommentSaver::hasICGNo( std::string file_name ) {
+bool	CommentSaver::hasICGNo(	std::string	file_name	)	{
 
-    if ( icg_no_found.find(file_name) == icg_no_found.end() ) {
-        getICGField(file_name) ;
-    }
+				if	(	icg_no_found.find(file_name)	==	icg_no_found.end()	)	{
+								getICGField(file_name)	;
+				}
 
-    return icg_no_found[file_name] ;
+				return	icg_no_found[file_name]	;
 }
 
-bool CommentSaver::hasICGNoComment( std::string file_name ) {
+bool	CommentSaver::hasICGNoComment(	std::string	file_name	)	{
 
-    if ( icg_no_comment_found.find(file_name) == icg_no_comment_found.end() ) {
-        getICGField(file_name) ;
-    }
+				if	(	icg_no_comment_found.find(file_name)	==	icg_no_comment_found.end()	)	{
+								getICGField(file_name)	;
+				}
 
-    return icg_no_comment_found[file_name] ;
+				return	icg_no_comment_found[file_name]	;
 }
 
-std::set< std::string > CommentSaver::getIgnoreTypes( std::string file_name ) {
-    std::set< std::string > ignore_types ;
-    std::string th_str = getTrickHeaderComment(file_name) ;
-
-    if ( th_str.empty() ) {
-        return ignore_types;
-    }
-
-    int ret ;
-    regex_t reg_expr ;
-    regmatch_t pmatch[10] ;
-    //std::cout << "here in getIgnoreTypes\n" << th_str << std::endl ;
-
-    size_t start = 0 ;
-    start = th_str.find( "trick_exclude_typename") ;
-    while ( start != std::string::npos ) {
-        start += strlen("trick_exclude_typename") ;
-        std::string temp_str = th_str.substr(start) ;
-        memset(pmatch , 0 , sizeof(pmatch)) ;
-        regcomp( &reg_expr , "^\\s*\\{\\s*(\\S+)\\s*\\}" , REG_EXTENDED ) ;
-        ret = regexec( &reg_expr , temp_str.c_str() , 10 , pmatch , 0 ) ;
-        regfree(&reg_expr) ;
-        if ( ret == 0 ) {
-            std::string item = temp_str.substr(pmatch[1].rm_so, pmatch[1].rm_eo) ;
-            // regular expression leaving trailing space and brace. Why?
-            item.erase(item.find_first_of(" \t}")) ;
-            //std::cout << "icg_ignore_types " << item << std::endl ;
-            ignore_types.insert(item) ;
-        }
-        start = th_str.find( "trick_exclude_typename", start ) ;
-    }
-
-    //std::transform(th_str.begin(), th_str.end(), th_str.begin(), ::toupper) ;
-
-    memset(pmatch , 0 , sizeof(pmatch)) ;
-
-    /* POSIX regular expressions are always greedy, making our job harder.
-       We have to use several regular expressions to get the types.  This was
-       so much easier in perl! */
-
-    /* find the start of the ICG_IGNORE_TYPES field */
-    regcomp( &reg_expr , "(ICG[ _]IGNORE[ _]TYPE(S)?:)" , REG_EXTENDED | REG_ICASE ) ;
-    ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-    regfree(&reg_expr) ;
-    if ( !ret ) {
-        th_str = th_str.substr(pmatch[1].rm_eo) ;
-
-        /* find the end of the ICG_IGNORE_TYPES field */
-        memset(pmatch , 0 , sizeof(pmatch)) ;
-        regcomp( &reg_expr , "(\\)\\s*\\))" , REG_EXTENDED ) ;
-        ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
-        regfree(&reg_expr) ;
-        if ( !ret ) {
-            th_str = th_str.substr(0 , pmatch[1].rm_so) ;
-            std::replace( th_str.begin(), th_str.end(), '(', ' ');
-            std::replace( th_str.begin(), th_str.end(), ')', ' ');
-            std::replace( th_str.begin(), th_str.end(), '\n', ' ');
-
-            std::stringstream ss(th_str);
-            std::string item;
-            while (std::getline(ss, item, ' ')) {
-                if ( ! item.empty() ) {
-                    //std::cout << "icg_ignore_types " << item << std::endl ;
-                    ignore_types.insert(item) ;
-                }
-            }
-        }
-    }
-
-    return ignore_types ;
+std::set<	std::string	>	CommentSaver::getIgnoreTypes(	std::string	file_name	)	{
+				std::set<	std::string	>	ignore_types	;
+				std::string	th_str	=	getTrickHeaderComment(file_name)	;
+
+				if	(	th_str.empty()	)	{
+								return	ignore_types;
+				}
+
+				int	ret	;
+				regex_t	reg_expr	;
+				regmatch_t	pmatch[10]	;
+				//std::cout	<<	"here	in	getIgnoreTypes\n"	<<	th_str	<<	std::endl	;
+
+				size_t	start	=	0	;
+				start	=	th_str.find(	"trick_exclude_typename")	;
+				while	(	start	!=	std::string::npos	)	{
+								start	+=	strlen("trick_exclude_typename")	;
+								std::string	temp_str	=	th_str.substr(start)	;
+								memset(pmatch	,	0	,	sizeof(pmatch))	;
+								regcomp(	&reg_expr	,	"^\\s*\\{\\s*(\\S+)\\s*\\}"	,	REG_EXTENDED	)	;
+								ret	=	regexec(	&reg_expr	,	temp_str.c_str()	,	10	,	pmatch	,	0	)	;
+								regfree(&reg_expr)	;
+								if	(	ret	==	0	)	{
+												std::string	item	=	temp_str.substr(pmatch[1].rm_so,	pmatch[1].rm_eo)	;
+												//	regular	expression	leaving	trailing	space	and	brace.	Why?
+												item.erase(item.find_first_of("	\t}"))	;
+												//std::cout	<<	"icg_ignore_types	"	<<	item	<<	std::endl	;
+												ignore_types.insert(item)	;
+								}
+								start	=	th_str.find(	"trick_exclude_typename",	start	)	;
+				}
+
+				//std::transform(th_str.begin(),	th_str.end(),	th_str.begin(),	::toupper)	;
+
+				memset(pmatch	,	0	,	sizeof(pmatch))	;
+
+				/*	POSIX	regular	expressions	are	always	greedy,	making	our	job	harder.
+							We	have	to	use	several	regular	expressions	to	get	the	types.		This	was
+							so	much	easier	in	perl!	*/
+
+				/*	find	the	start	of	the	ICG_IGNORE_TYPES	field	*/
+				regcomp(	&reg_expr	,	"(ICG[	_]IGNORE[	_]TYPE(S)?:)"	,	REG_EXTENDED	|	REG_ICASE	)	;
+				ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+				regfree(&reg_expr)	;
+				if	(	!ret	)	{
+								th_str	=	th_str.substr(pmatch[1].rm_eo)	;
+
+								/*	find	the	end	of	the	ICG_IGNORE_TYPES	field	*/
+								memset(pmatch	,	0	,	sizeof(pmatch))	;
+								regcomp(	&reg_expr	,	"(\\)\\s*\\))"	,	REG_EXTENDED	)	;
+								ret	=	regexec(	&reg_expr	,	th_str.c_str()	,	10	,	pmatch	,	0	)	;
+								regfree(&reg_expr)	;
+								if	(	!ret	)	{
+												th_str	=	th_str.substr(0	,	pmatch[1].rm_so)	;
+												std::replace(	th_str.begin(),	th_str.end(),	'(',	'	');
+												std::replace(	th_str.begin(),	th_str.end(),	')',	'	');
+												std::replace(	th_str.begin(),	th_str.end(),	'\n',	'	');
+
+												std::stringstream	ss(th_str);
+												std::string	item;
+												while	(std::getline(ss,	item,	'	'))	{
+																if	(	!	item.empty()	)	{
+																				//std::cout	<<	"icg_ignore_types	"	<<	item	<<	std::endl	;
+																				ignore_types.insert(item)	;
+																}
+												}
+								}
+				}
+
+				return	ignore_types	;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/ConstructValues.cpp b/trick_source/codegen/Interface_Code_Gen/ConstructValues.cpp
index f4d43f526..663e78759 100644
--- a/trick_source/codegen/Interface_Code_Gen/ConstructValues.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ConstructValues.cpp
@@ -1,228 +1,228 @@
 
-#include <iostream>
-#include <sstream>
-#include <clang/AST/DeclTemplate.h>
+#include	<iostream>
+#include	<sstream>
+#include	<clang/AST/DeclTemplate.h>
 
-#include "ConstructValues.hh"
+#include	"ConstructValues.hh"
 
 //====================================================================================
 
-bool ConstructValues::ContainerClass::extractTemplateArgType(const clang::TemplateArgument& ta) {
-    clang::QualType qt = ta.getAsType() ;
-    const clang::Type * t = qt.getTypePtrOrNull() ;
-    if ( t != NULL ) {
-        ContainerClass inner_cc ;
-        if (t->getTypeClass() == clang::Type::Record and t->getAsCXXRecordDecl()) {
-            clang::CXXRecordDecl * crd = t->getAsCXXRecordDecl() ;
-            if ( clang::isa<clang::ClassTemplateSpecializationDecl>(crd) ) {
-                // template argument is a template specialization
-                if (!inner_cc.extractType(clang::cast<clang::ClassTemplateSpecializationDecl>(crd))) {
-                    return false ;
-                }
-            } else {
-                // template argument record type, but not a template specialization
-                inner_cc.name = qt.getAsString() ;
-            }
-        } else {
-            // template argument not a record type.
-            inner_cc.name = qt.getAsString() ;
-        }
-        template_args.push_back(inner_cc) ;
-    }
-    return true ;
-}
-
-bool ConstructValues::ContainerClass::extractType(const clang::RecordDecl * rd) {
-    if (! rd->getIdentifier()) {
-        return false ;
-    }
-    // Set the name of this type.
-    name = rd->getName().str() ;
-    // If this type is a template specialization we need to save the template argument types.
-    if (const clang::ClassTemplateSpecializationDecl *ctsd = clang::dyn_cast<clang::ClassTemplateSpecializationDecl>(rd)) {
-        for (const clang::TemplateArgument& ta : ctsd->getTemplateArgs().asArray()) {
-            if ( ta.getKind() == clang::TemplateArgument::Type ) {
-                // Class types and intrinsic types
-                if ( !extractTemplateArgType(ta) ) {
-                    return false ;
-                }
-            } else if ( ta.getKind() == clang::TemplateArgument::Pack ) {
-                // a Pack is the variables in a variadric template
-                for (const clang::TemplateArgument& pack_ta : ta.getPackAsArray()) {
-                    if ( pack_ta.getKind() == clang::TemplateArgument::Type ) {
-                        if ( !extractTemplateArgType(pack_ta) ) {
-                            return false ;
-                        }
-                    }
-                }
-            } else {
-                // This template argument is not a clang::TemplateArgument::Type.  We don't currently handle these.
-                return false ;
-            }
-        }
-    }
-    // if we reach the end then we can deal with the class name, return true.
-    return true ;
-}
-
-static void mangle_template_param(std::string &work_string, const std::string & delimiter) {
-    if ( !delimiter.compare("__") ) {
-        std::replace( work_string.begin(), work_string.end(), '*', '_') ;
-        std::replace( work_string.begin(), work_string.end(), '[', '_') ;
-        std::replace( work_string.begin(), work_string.end(), ']', '_') ;
-        std::replace( work_string.begin(), work_string.end(), ':', '_') ;
-        work_string.erase(std::remove_if(work_string.begin(), work_string.end(),
-        (int(*)(int))std::isspace), work_string.end()) ;
-    }
-}
-
-void ConstructValues::ContainerClass::printTemplateList(std::ostream& ostream, const std::string& delimiter) {
-    if ( template_args.size() ) {
-        std::string obracket("<"), comma(","), cbracket(">"), work_string ;
-        if ( !delimiter.compare("__") ) {
-             obracket = comma = cbracket = "_" ;
-        }
-        ostream << obracket ;
-        unsigned int arg_size = template_args.size() - 1 ;
-        for (unsigned int ii = 0 ; ii < arg_size ; ii++ ) {
-            work_string = template_args[ii].name ;
-            mangle_template_param(work_string, delimiter) ;
-            ostream << work_string ;
-            template_args[ii].printTemplateList(ostream, delimiter);
-            ostream << comma ;
-        }
-        work_string = template_args[arg_size].name ;
-        mangle_template_param(work_string, delimiter) ;
-        ostream << work_string ;
-        template_args[arg_size].printTemplateList(ostream, delimiter);
-        ostream << cbracket ;
-    }
-}
-
-void ConstructValues::ContainerClass::printContainerClass(std::ostream& ostream, const std::string& delimiter) {
-    ostream << name ;
-    printTemplateList(ostream, delimiter) ;
-    ostream << delimiter ;
+bool	ConstructValues::ContainerClass::extractTemplateArgType(const	clang::TemplateArgument&	ta)	{
+				clang::QualType	qt	=	ta.getAsType()	;
+				const	clang::Type	*	t	=	qt.getTypePtrOrNull()	;
+				if	(	t	!=	NULL	)	{
+								ContainerClass	inner_cc	;
+								if	(t->getTypeClass()	==	clang::Type::Record	and	t->getAsCXXRecordDecl())	{
+												clang::CXXRecordDecl	*	crd	=	t->getAsCXXRecordDecl()	;
+												if	(	clang::isa<clang::ClassTemplateSpecializationDecl>(crd)	)	{
+																//	template	argument	is	a	template	specialization
+																if	(!inner_cc.extractType(clang::cast<clang::ClassTemplateSpecializationDecl>(crd)))	{
+																				return	false	;
+																}
+												}	else	{
+																//	template	argument	record	type,	but	not	a	template	specialization
+																inner_cc.name	=	qt.getAsString()	;
+												}
+								}	else	{
+												//	template	argument	not	a	record	type.
+												inner_cc.name	=	qt.getAsString()	;
+								}
+								template_args.push_back(inner_cc)	;
+				}
+				return	true	;
+}
+
+bool	ConstructValues::ContainerClass::extractType(const	clang::RecordDecl	*	rd)	{
+				if	(!	rd->getIdentifier())	{
+								return	false	;
+				}
+				//	Set	the	name	of	this	type.
+				name	=	rd->getName().str()	;
+				//	If	this	type	is	a	template	specialization	we	need	to	save	the	template	argument	types.
+				if	(const	clang::ClassTemplateSpecializationDecl	*ctsd	=	clang::dyn_cast<clang::ClassTemplateSpecializationDecl>(rd))	{
+								for	(const	clang::TemplateArgument&	ta	:	ctsd->getTemplateArgs().asArray())	{
+												if	(	ta.getKind()	==	clang::TemplateArgument::Type	)	{
+																//	Class	types	and	intrinsic	types
+																if	(	!extractTemplateArgType(ta)	)	{
+																				return	false	;
+																}
+												}	else	if	(	ta.getKind()	==	clang::TemplateArgument::Pack	)	{
+																//	a	Pack	is	the	variables	in	a	variadric	template
+																for	(const	clang::TemplateArgument&	pack_ta	:	ta.getPackAsArray())	{
+																				if	(	pack_ta.getKind()	==	clang::TemplateArgument::Type	)	{
+																								if	(	!extractTemplateArgType(pack_ta)	)	{
+																												return	false	;
+																								}
+																				}
+																}
+												}	else	{
+																//	This	template	argument	is	not	a	clang::TemplateArgument::Type.		We	don't	currently	handle	these.
+																return	false	;
+												}
+								}
+				}
+				//	if	we	reach	the	end	then	we	can	deal	with	the	class	name,	return	true.
+				return	true	;
+}
+
+static	void	mangle_template_param(std::string	&work_string,	const	std::string	&	delimiter)	{
+				if	(	!delimiter.compare("__")	)	{
+								std::replace(	work_string.begin(),	work_string.end(),	'*',	'_')	;
+								std::replace(	work_string.begin(),	work_string.end(),	'[',	'_')	;
+								std::replace(	work_string.begin(),	work_string.end(),	']',	'_')	;
+								std::replace(	work_string.begin(),	work_string.end(),	':',	'_')	;
+								work_string.erase(std::remove_if(work_string.begin(),	work_string.end(),
+								(int(*)(int))std::isspace),	work_string.end())	;
+				}
+}
+
+void	ConstructValues::ContainerClass::printTemplateList(std::ostream&	ostream,	const	std::string&	delimiter)	{
+				if	(	template_args.size()	)	{
+								std::string	obracket("<"),	comma(","),	cbracket(">"),	work_string	;
+								if	(	!delimiter.compare("__")	)	{
+													obracket	=	comma	=	cbracket	=	"_"	;
+								}
+								ostream	<<	obracket	;
+								unsigned	int	arg_size	=	template_args.size()	-	1	;
+								for	(unsigned	int	ii	=	0	;	ii	<	arg_size	;	ii++	)	{
+												work_string	=	template_args[ii].name	;
+												mangle_template_param(work_string,	delimiter)	;
+												ostream	<<	work_string	;
+												template_args[ii].printTemplateList(ostream,	delimiter);
+												ostream	<<	comma	;
+								}
+								work_string	=	template_args[arg_size].name	;
+								mangle_template_param(work_string,	delimiter)	;
+								ostream	<<	work_string	;
+								template_args[arg_size].printTemplateList(ostream,	delimiter);
+								ostream	<<	cbracket	;
+				}
+}
+
+void	ConstructValues::ContainerClass::printContainerClass(std::ostream&	ostream,	const	std::string&	delimiter)	{
+				ostream	<<	name	;
+				printTemplateList(ostream,	delimiter)	;
+				ostream	<<	delimiter	;
 }
 
 //====================================================================================
 
-ConstructValues::ConstructValues() {}
+ConstructValues::ConstructValues()	{}
 
-void ConstructValues::setName(std::string in_name) {
-    name = in_name ;
+void	ConstructValues::setName(std::string	in_name)	{
+				name	=	in_name	;
 }
 
-std::string ConstructValues::getName() {
-    return name ;
+std::string	ConstructValues::getName()	{
+				return	name	;
 }
 
-void ConstructValues::setFileName(std::string in_name) {
-    file_name = in_name ;
+void	ConstructValues::setFileName(std::string	in_name)	{
+				file_name	=	in_name	;
 }
 
-std::string ConstructValues::getFileName() {
-    return file_name ;
+std::string	ConstructValues::getFileName()	{
+				return	file_name	;
 }
 
-void ConstructValues::clearNamespacesAndClasses() {
-    namespaces.clear() ;
-    container_classes.clear() ;
+void	ConstructValues::clearNamespacesAndClasses()	{
+				namespaces.clear()	;
+				container_classes.clear()	;
 }
 
-bool ConstructValues::getNamespacesAndClasses( const clang::DeclContext * Ctx ) {
-    // Save container namespaces and classes.
-    typedef clang::SmallVector<const clang::DeclContext *, 8> ContextsTy;
-    ContextsTy Contexts;
-    // Collect contexts.
-    while (Ctx && clang::isa<clang::NamedDecl>(Ctx)) {
-        Contexts.push_back(Ctx);
-        Ctx = Ctx->getParent();
-    };
-    for (ContextsTy::reverse_iterator I = Contexts.rbegin(), E = Contexts.rend(); I != E; ++I) {
-        if (const clang::NamespaceDecl *nd = clang::dyn_cast<clang::NamespaceDecl>(*I)) {
-            if (! nd->isAnonymousNamespace()) {
-                //std::cout << "namespace " << nd->getIdentifier()->getName().str() << std::endl ;
-                std::string temp_name = nd->getIdentifier()->getName().str() ;
-                if ( temp_name.compare("std") and temp_name.compare("__1")) {
-                    namespaces.push_back(nd->getIdentifier()->getName().str()) ;
-                }
-            }
-        } else if (const clang::RecordDecl *rd = clang::dyn_cast<clang::RecordDecl>(*I)) {
-            ContainerClass cc ;
-            if (!cc.extractType(rd)) {
-                return false ;
-            }
-            container_classes.push_back(cc) ;
-        }
-    }
-    return true ;
+bool	ConstructValues::getNamespacesAndClasses(	const	clang::DeclContext	*	Ctx	)	{
+				//	Save	container	namespaces	and	classes.
+				typedef	clang::SmallVector<const	clang::DeclContext	*,	8>	ContextsTy;
+				ContextsTy	Contexts;
+				//	Collect	contexts.
+				while	(Ctx	&&	clang::isa<clang::NamedDecl>(Ctx))	{
+								Contexts.push_back(Ctx);
+								Ctx	=	Ctx->getParent();
+				};
+				for	(ContextsTy::reverse_iterator	I	=	Contexts.rbegin(),	E	=	Contexts.rend();	I	!=	E;	++I)	{
+								if	(const	clang::NamespaceDecl	*nd	=	clang::dyn_cast<clang::NamespaceDecl>(*I))	{
+												if	(!	nd->isAnonymousNamespace())	{
+																//std::cout	<<	"namespace	"	<<	nd->getIdentifier()->getName().str()	<<	std::endl	;
+																std::string	temp_name	=	nd->getIdentifier()->getName().str()	;
+																if	(	temp_name.compare("std")	and	temp_name.compare("__1"))	{
+																				namespaces.push_back(nd->getIdentifier()->getName().str())	;
+																}
+												}
+								}	else	if	(const	clang::RecordDecl	*rd	=	clang::dyn_cast<clang::RecordDecl>(*I))	{
+												ContainerClass	cc	;
+												if	(!cc.extractType(rd))	{
+																return	false	;
+												}
+												container_classes.push_back(cc)	;
+								}
+				}
+				return	true	;
 }
 
-std::string ConstructValues::getFullyQualifiedName(const std::string& delimiter) {
-    std::ostringstream oss;
-    printNamespaces(oss, delimiter);
-    printContainerClasses(oss, delimiter);
-    oss << name;
-    return oss.str();
+std::string	ConstructValues::getFullyQualifiedName(const	std::string&	delimiter)	{
+				std::ostringstream	oss;
+				printNamespaces(oss,	delimiter);
+				printContainerClasses(oss,	delimiter);
+				oss	<<	name;
+				return	oss.str();
 }
 
-bool ConstructValues::isNameOrFileNameEmpty() {
-    return name.empty() or file_name.empty();
+bool	ConstructValues::isNameOrFileNameEmpty()	{
+				return	name.empty()	or	file_name.empty();
 }
 
-void ConstructValues::printOpenNamespaceBlocks(std::ostream& ostream) {
-    for (auto name : namespaces) {
-        ostream << "namespace " << name << " {" << std::endl;
-    }
+void	ConstructValues::printOpenNamespaceBlocks(std::ostream&	ostream)	{
+				for	(auto	name	:	namespaces)	{
+								ostream	<<	"namespace	"	<<	name	<<	"	{"	<<	std::endl;
+				}
 }
 
-void ConstructValues::printCloseNamespaceBlocks(std::ostream& ostream) {
-    for (auto name : namespaces) {
-        ostream << "}" << std::endl;
-    }
+void	ConstructValues::printCloseNamespaceBlocks(std::ostream&	ostream)	{
+				for	(auto	name	:	namespaces)	{
+								ostream	<<	"}"	<<	std::endl;
+				}
 }
 
-void ConstructValues::printNamespaces(std::ostream& ostream, const std::string& delimiter) {
-    for (auto name : namespaces) {
-        ostream << name << delimiter;
-    }
+void	ConstructValues::printNamespaces(std::ostream&	ostream,	const	std::string&	delimiter)	{
+				for	(auto	name	:	namespaces)	{
+								ostream	<<	name	<<	delimiter;
+				}
 }
 
-void ConstructValues::printContainerClasses(std::ostream& ostream, const std::string& delimiter) {
-    for (auto c : container_classes) {
-        c.printContainerClass(ostream, delimiter);
-    }
+void	ConstructValues::printContainerClasses(std::ostream&	ostream,	const	std::string&	delimiter)	{
+				for	(auto	c	:	container_classes)	{
+								c.printContainerClass(ostream,	delimiter);
+				}
 }
 
-void ConstructValues::printNamespacesAndContainerClasses(std::ostream& ostream, const std::string& delimiter) {
-    printNamespaces(ostream, delimiter);
-    printContainerClasses(ostream, delimiter);
+void	ConstructValues::printNamespacesAndContainerClasses(std::ostream&	ostream,	const	std::string&	delimiter)	{
+				printNamespaces(ostream,	delimiter);
+				printContainerClasses(ostream,	delimiter);
 }
 
-std::string ConstructValues::getNamespacesAndContainerClasses(const std::string& delimiter) {
-    std::string result = "";
-    for (auto name : namespaces) {
-        result += name + delimiter;
-    }
-    for (auto c : container_classes) {
-        std::stringstream ss ;
-        c.printContainerClass(ss, delimiter);
-        result += ss.str() ;
-    }
-    return result;
+std::string	ConstructValues::getNamespacesAndContainerClasses(const	std::string&	delimiter)	{
+				std::string	result	=	"";
+				for	(auto	name	:	namespaces)	{
+								result	+=	name	+	delimiter;
+				}
+				for	(auto	c	:	container_classes)	{
+								std::stringstream	ss	;
+								c.printContainerClass(ss,	delimiter);
+								result	+=	ss.str()	;
+				}
+				return	result;
 }
 
-std::string ConstructValues::getFullyQualifiedTypeName(const std::string& delimiter) {
-    std::ostringstream oss ;
-    printNamespacesAndContainerClasses(oss, delimiter) ;
-    oss << name ;
-    return oss.str() ;
+std::string	ConstructValues::getFullyQualifiedTypeName(const	std::string&	delimiter)	{
+				std::ostringstream	oss	;
+				printNamespacesAndContainerClasses(oss,	delimiter)	;
+				oss	<<	name	;
+				return	oss.str()	;
 }
 
-std::string ConstructValues::getNameOnlyWithNamespaces(const std::string& delimiter) {
-    std::ostringstream oss ;
-    printNamespaces(oss, delimiter) ;
-    oss << name ;
-    return oss.str() ;
+std::string	ConstructValues::getNameOnlyWithNamespaces(const	std::string&	delimiter)	{
+				std::ostringstream	oss	;
+				printNamespaces(oss,	delimiter)	;
+				oss	<<	name	;
+				return	oss.str()	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/EnumValues.cpp b/trick_source/codegen/Interface_Code_Gen/EnumValues.cpp
index 7a0d122ce..bfb27bccf 100644
--- a/trick_source/codegen/Interface_Code_Gen/EnumValues.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/EnumValues.cpp
@@ -1,42 +1,42 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "EnumValues.hh"
+#include	"EnumValues.hh"
 
-EnumValues::EnumValues() : has_definition(true) {}
+EnumValues::EnumValues()	:	has_definition(true)	{}
 
-void EnumValues::addEnum( std::string in_name , long long in_val ) {
-    std::pair< std::string , long long > new_enum(in_name, in_val) ;
-    enum_values.push_back(new_enum) ;
+void	EnumValues::addEnum(	std::string	in_name	,	long	long	in_val	)	{
+				std::pair<	std::string	,	long	long	>	new_enum(in_name,	in_val)	;
+				enum_values.push_back(new_enum)	;
 }
 
-void EnumValues::addFullyQualifiedEnum( std::string in_name , long long in_val ) {
-    std::pair< std::string , long long > new_enum(in_name, in_val) ;
-    fully_qualified_enum_values.push_back(new_enum) ;
+void	EnumValues::addFullyQualifiedEnum(	std::string	in_name	,	long	long	in_val	)	{
+				std::pair<	std::string	,	long	long	>	new_enum(in_name,	in_val)	;
+				fully_qualified_enum_values.push_back(new_enum)	;
 }
 
 
-void EnumValues::setHasDefinition( bool in ) {
-    has_definition = in ;
+void	EnumValues::setHasDefinition(	bool	in	)	{
+				has_definition	=	in	;
 }
 
-bool EnumValues::getHasDefinition() {
-    return has_definition ;
+bool	EnumValues::getHasDefinition()	{
+				return	has_definition	;
 }
 
-std::ostream & operator << (std::ostream & ostream , EnumValues & ev ) {
-    ostream << "    name = " << ev.name << std::endl ;
-    ostream << "    file_name = " << ev.file_name << std::endl ;
-    ostream << "    namespaces =" ;
-    ev.printNamespaces(ostream) ;
-    ostream << std::endl ;
-    ostream << "    parent classes =" ;
-    ev.printContainerClasses(ostream) ;
-    ostream << std::endl ;
-
-    for (auto& pair : ev.getPairs()) {
-        ostream << "      " << pair.first << " " << pair.second << std::endl ;
-    }
-
-    return ostream ;
+std::ostream	&	operator	<<	(std::ostream	&	ostream	,	EnumValues	&	ev	)	{
+				ostream	<<	"				name	=	"	<<	ev.name	<<	std::endl	;
+				ostream	<<	"				file_name	=	"	<<	ev.file_name	<<	std::endl	;
+				ostream	<<	"				namespaces	="	;
+				ev.printNamespaces(ostream)	;
+				ostream	<<	std::endl	;
+				ostream	<<	"				parent	classes	="	;
+				ev.printContainerClasses(ostream)	;
+				ostream	<<	std::endl	;
+
+				for	(auto&	pair	:	ev.getPairs())	{
+								ostream	<<	"						"	<<	pair.first	<<	"	"	<<	pair.second	<<	std::endl	;
+				}
+
+				return	ostream	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
index 4eefbdea5..b54f3c7cf 100644
--- a/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
@@ -1,83 +1,83 @@
 
-#include <iostream>
-#include <sstream>
-#include <algorithm>
+#include	<iostream>
+#include	<sstream>
+#include	<algorithm>
 
-#include "llvm/Support/CommandLine.h"
-#include "EnumVisitor.hh"
-#include "EnumValues.hh"
-#include "Utilities.hh"
-#include "BraceMacro.hh"
+#include	"llvm/Support/CommandLine.h"
+#include	"EnumVisitor.hh"
+#include	"EnumValues.hh"
+#include	"Utilities.hh"
+#include	"BraceMacro.hh"
 
-extern llvm::cl::opt< int > debug_level ;
+extern	llvm::cl::opt<	int	>	debug_level	;
 
-EnumVisitor::EnumVisitor( clang::CompilerInstance & in_ci , HeaderSearchDirs & in_hsd ) :
- ci(in_ci) , hsd(in_hsd) {
-    //eval = new EnumValues() ;
+EnumVisitor::EnumVisitor(	clang::CompilerInstance	&	in_ci	,	HeaderSearchDirs	&	in_hsd	)	:
+	ci(in_ci)	,	hsd(in_hsd)	{
+				//eval	=	new	EnumValues()	;
 }
 
-bool EnumVisitor::VisitDecl(clang::Decl *d) {
-    //std::cout << "\nEnum Decl = " << d->getDeclKindName() << "" << std::endl ;
-    return true ;
+bool	EnumVisitor::VisitDecl(clang::Decl	*d)	{
+				//std::cout	<<	"\nEnum	Decl	=	"	<<	d->getDeclKindName()	<<	""	<<	std::endl	;
+				return	true	;
 }
 
-bool EnumVisitor::VisitType(clang::Type *t) {
-    //std::cout << "\nEnum Type = " << t->getTypeClassName() << "" << std::endl ;
-    return true;
+bool	EnumVisitor::VisitType(clang::Type	*t)	{
+				//std::cout	<<	"\nEnum	Type	=	"	<<	t->getTypeClassName()	<<	""	<<	std::endl	;
+				return	true;
 }
 
-bool EnumVisitor::VisitEnumDecl(clang::EnumDecl *ed) {
-    eval.setFileName(getFileName(ci , ed->RBRACELOC(), hsd)) ;
-    return true;
+bool	EnumVisitor::VisitEnumDecl(clang::EnumDecl	*ed)	{
+				eval.setFileName(getFileName(ci	,	ed->RBRACELOC(),	hsd))	;
+				return	true;
 }
 
-bool EnumVisitor::VisitEnumType(clang::EnumType *et) {
-
-    clang::TagDecl * td = et->getDecl() ;
-    eval.setName(td->getName().str()) ;
-    if ( debug_level >= 3 ) {
-        std::cout << "EnumVisitor VisitEnumType " << std::endl ;
-        std::cout << "eval.getName() = " << eval.getName() << std::endl ;
-        std::cout << "td->getName() = " << td->getName().str() << std::endl ;
-    }
-
-    if ( eval.getName().empty() ) {
-        std::string enum_type_name = et->desugar().getAsString() ;
-        size_t pos ;
-        // If this enumeration is anonymous return an error condition
-        if ((pos = enum_type_name.find("<anonymous")) != std::string::npos or
-            //(pos = enum_type_name.find("(anonymous")) != std::string::npos) {
-            (pos = enum_type_name.find("(anonymous")) != std::string::npos or
-            (pos = enum_type_name.find("(unnamed")) != std::string::npos) {
-            eval.setName("") ;
-            return false ;
-        }
-        if ((pos = enum_type_name.find("enum ")) != std::string::npos ) {
-            enum_type_name.erase(pos , 5) ;
-        }
-
-        // Strip off containing namespace/class names.  They will be added back later.
-        if ((pos = enum_type_name.find_last_of(":")) != std::string::npos ) {
-            eval.setName(enum_type_name.substr(pos + 1)) ;
-        } else {
-            eval.setName(enum_type_name) ;
-        }
-        //std::cout << "\nReplaced Enum name = " << eval->getName() << "" << std::endl ;
-    }
-
-    eval.getNamespacesAndClasses(td->getDeclContext()) ;
-    return true ;
+bool	EnumVisitor::VisitEnumType(clang::EnumType	*et)	{
+
+				clang::TagDecl	*	td	=	et->getDecl()	;
+				eval.setName(td->getName().str())	;
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"EnumVisitor	VisitEnumType	"	<<	std::endl	;
+								std::cout	<<	"eval.getName()	=	"	<<	eval.getName()	<<	std::endl	;
+								std::cout	<<	"td->getName()	=	"	<<	td->getName().str()	<<	std::endl	;
+				}
+
+				if	(	eval.getName().empty()	)	{
+								std::string	enum_type_name	=	et->desugar().getAsString()	;
+								size_t	pos	;
+								//	If	this	enumeration	is	anonymous	return	an	error	condition
+								if	((pos	=	enum_type_name.find("<anonymous"))	!=	std::string::npos	or
+												//(pos	=	enum_type_name.find("(anonymous"))	!=	std::string::npos)	{
+												(pos	=	enum_type_name.find("(anonymous"))	!=	std::string::npos	or
+												(pos	=	enum_type_name.find("(unnamed"))	!=	std::string::npos)	{
+												eval.setName("")	;
+												return	false	;
+								}
+								if	((pos	=	enum_type_name.find("enum	"))	!=	std::string::npos	)	{
+												enum_type_name.erase(pos	,	5)	;
+								}
+
+								//	Strip	off	containing	namespace/class	names.		They	will	be	added	back	later.
+								if	((pos	=	enum_type_name.find_last_of(":"))	!=	std::string::npos	)	{
+												eval.setName(enum_type_name.substr(pos	+	1))	;
+								}	else	{
+												eval.setName(enum_type_name)	;
+								}
+								//std::cout	<<	"\nReplaced	Enum	name	=	"	<<	eval->getName()	<<	""	<<	std::endl	;
+				}
+
+				eval.getNamespacesAndClasses(td->getDeclContext())	;
+				return	true	;
 }
 
-bool EnumVisitor::VisitEnumConstantDecl(clang::EnumConstantDecl *ecd) {
-    //std::cout << ecd->getName().str() << " = " << ecd->getInitVal().getSExtValue() << std::endl ;
-    eval.addEnum(ecd->getName().str() , ecd->getInitVal().getSExtValue()) ;
-    eval.addFullyQualifiedEnum(ecd->getQualifiedNameAsString(), ecd->getInitVal().getSExtValue());
-    return true ;
+bool	EnumVisitor::VisitEnumConstantDecl(clang::EnumConstantDecl	*ecd)	{
+				//std::cout	<<	ecd->getName().str()	<<	"	=	"	<<	ecd->getInitVal().getSExtValue()	<<	std::endl	;
+				eval.addEnum(ecd->getName().str()	,	ecd->getInitVal().getSExtValue())	;
+				eval.addFullyQualifiedEnum(ecd->getQualifiedNameAsString(),	ecd->getInitVal().getSExtValue());
+				return	true	;
 }
 
-EnumValues * EnumVisitor::get_enum_data() {
-    return &eval ;
+EnumValues	*	EnumVisitor::get_enum_data()	{
+				return	&eval	;
 }
 
 
diff --git a/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp b/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp
index 2fd8a0aaf..192005692 100644
--- a/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp
@@ -1,603 +1,603 @@
 
-#include <iostream>
-#include <algorithm>
-#include <sstream>
-#include <set>
-#include <stack>
+#include	<iostream>
+#include	<algorithm>
+#include	<sstream>
+#include	<set>
+#include	<stack>
 
-#include <libgen.h>
-#include <regex.h>
-#include <string.h>
+#include	<libgen.h>
+#include	<regex.h>
+#include	<string.h>
 
-#include "FieldDescription.hh"
-#include "Utilities.hh"
+#include	"FieldDescription.hh"
+#include	"Utilities.hh"
 
-// Provides units check capability.
-#include "trick/map_trick_units_to_udunits.hh"
+//	Provides	units	check	capability.
+#include	"trick/map_trick_units_to_udunits.hh"
 
-extern llvm::cl::opt< bool > units_truth_is_scary ;
-extern llvm::cl::opt< int > debug_level ;
+extern	llvm::cl::opt<	bool	>	units_truth_is_scary	;
+extern	llvm::cl::opt<	int	>	debug_level	;
 
-static ut_system * get_u_system() {
+static	ut_system	*	get_u_system()	{
 
-    ut_system * u_system ;
+				ut_system	*	u_system	;
 
-    /* Initialize the udunits-2 library */
-    ut_set_error_message_handler(ut_ignore) ;
-    if( (u_system = ut_read_xml( NULL )) == NULL ) {
-        std::cerr << "Error initializing udunits-2 unit system" << std::endl ;
-        exit(-1);
-    }
-    ut_set_error_message_handler(ut_write_to_stderr) ;
+				/*	Initialize	the	udunits-2	library	*/
+				ut_set_error_message_handler(ut_ignore)	;
+				if(	(u_system	=	ut_read_xml(	NULL	))	==	NULL	)	{
+								std::cerr	<<	"Error	initializing	udunits-2	unit	system"	<<	std::endl	;
+								exit(-1);
+				}
+				ut_set_error_message_handler(ut_write_to_stderr)	;
 
-    return u_system ;
+				return	u_system	;
 }
 
-ut_system * FieldDescription::u_system = get_u_system() ;
+ut_system	*	FieldDescription::u_system	=	get_u_system()	;
 
 FieldDescription::FieldDescription(
- std::string in_container_class ) :
-  container_class(in_container_class) ,
-  base_class_offset(0) ,
-  field_offset(0) ,
-  field_width(0) ,
-  inherited(false) ,
-  virtual_inherited(false) ,
-  units("1") ,
-  is_dashdash(false) ,
-  line_no(0) ,
-  io(15) ,
-  type_enum_string("TRICK_VOID") ,
-  is_bitfield(0) ,
-  bitfield_width(0) ,
-  bitfield_start_bit(0) ,
-  bitfield_word_offset(0) ,
-  is_enum(0) ,
-  is_record(0) ,
-  is_stl(0) ,
-  has_stl_clear(1) ,
-  is_static(0) ,
-  is_reference(0) ,
-  num_dims(0) ,
-  array_sizes() {} ;
-
-
-std::map<std::string , unsigned int > create_io_map() {
-    std::map<std::string , unsigned int > io_map ;
-    io_map[""] = 3 ;
-    io_map["o"] = 1 ;
-    io_map["*o"] = 1 ;
-    io_map["*i"] = 2 ;
-    io_map["i"] = 2 ;
-    io_map["*oi"] = 3 ;
-    io_map["oi"] = 3 ;
-    io_map["*io"] = 3 ;
-    io_map["io"] = 3 ;
-    io_map["**"] = 0 ;
-    // The "--" is a bad value, but we'll take it for now.
-    // TODO: Make this an error instead of being nice!
-    io_map["--"] = 4 ;
-    return io_map ;
-}
-
-std::map<std::string , unsigned int > FieldDescription::io_map = create_io_map() ;
-
-std::string FieldDescription::get_regex_field(std::string input , const char * expr , unsigned int index) {
-    int ret ;
-    regex_t reg_expr ;
-    regmatch_t pmatch[10] ;
-    memset(pmatch , 0 , sizeof(pmatch)) ;
-    regcomp( &reg_expr , expr , REG_EXTENDED ) ;
-    ret = regexec( &reg_expr , input.c_str() , 10 , pmatch , 0 ) ;
-    regfree(&reg_expr) ;
-    if ( ret == 0 ) {
-        if(debug_level >= 4) std::cout << "pmatch range = " << pmatch[index].rm_so << " " << pmatch[index].rm_eo << std::endl ;
-        if ( pmatch[index].rm_so != -1 ) {
-            return input.substr(pmatch[index].rm_so , pmatch[index].rm_eo - pmatch[index].rm_so ) ;
-        }
-    } else if (debug_level >= 4){
-        char error_msg[1024] ;
-        regerror( ret , &reg_expr , (char *)error_msg , 1024 ) ;
-        std::cerr << error_msg << std::endl ;
-    }
-    return std::string() ;
-}
-
-// global set of all units processed. hopefully saves time from reparsing same units strings over and over
-std::set< std::string > valid_units ;
-extern llvm::cl::opt< int > debug_level ;
-
-void FieldDescription::parseComment(std::string comment) {
-    std::string ret_str ;
-
-    bool units_found = false ;
-    bool io_found = false ;
-    bool chkpnt_io_found = false ;
-    unsigned int chkpnt_io ;
-
-    if ( comment.empty() ) {
-        // If the comment is empty default all I/O enabled.
-        io = 15 ;
-        return ;
-    }
-
-    if ( debug_level >= 5 ) {
-        std::cout << "comment before " << comment << std::endl ;
-    }
-
-    // remove open comment chars
-    comment = get_regex_field(comment , "^(//|/\\*)(.*)" , 2) ;
-    if(debug_level >= 4) std::cout << "1. " << comment << std::endl ;
-
-    // remove optional doxygen comment chars
-    // Note: I had to use [ \t\n\r] for \s because the Mac don't understand!
-    comment = get_regex_field(comment , "^((\\*|!)<)?[ \t\n\r]*(.*)" , 3) ;
-    if(debug_level >= 4) std::cout << "2. " << comment << std::endl ;
-
-    // remove optional doxygen keyword
-    comment = get_regex_field(comment , "(\\\\[a-zA-Z0-9]+)?[ \t\n\r]*(.*)" , 2) ;
-    if(debug_level >= 4) std::cout << "3. " << comment << std::endl ;
-
-    ret_str = get_regex_field(comment , "@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}]" , 1) ;
-    if ( ! ret_str.empty()) {
-        chkpnt_io = io_map[ret_str] ;
-        if(debug_level >= 4) std::cout << "go for trick_chkpnt_io " <<  io << std::endl ;
-        chkpnt_io_found = true ;
-        comment = get_regex_field(comment , "(.*)@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}]" , 1) +
-         get_regex_field(comment , "@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
-    }
-    ret_str = get_regex_field(comment , "@?cio[\\({]([^\\)}]+)[\\)}]" , 1) ;
-    if ( ! ret_str.empty()) {
-        chkpnt_io = io_map[ret_str] ;
-        if(debug_level >= 4) std::cout << "go for cio " <<  io << std::endl ;
-        chkpnt_io_found = true ;
-        comment = get_regex_field(comment , "(.*)@?cio[\\({]([^\\)}]+)[\\)}]" , 1) +
-         get_regex_field(comment , "@?cio[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
-    }
-
-    ret_str = get_regex_field(comment , "@?trick_io[\\({]([^\\)}]+)[\\)}]" , 1) ;
-    if ( ! ret_str.empty()) {
-        io = io_map[ret_str] ;
-        if(debug_level >= 4) std::cout << "go for trick_io " <<  io << std::endl ;
-        io_found = true ;
-        comment = get_regex_field(comment , "(.*)@?trick_io[\\({]([^\\)}]+)[\\)}]" , 1) +
-         get_regex_field(comment , "@?trick_io[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
-    }
-    ret_str = get_regex_field(comment , "@?io[\\({]([^\\)}]+)[\\)}]" , 1) ;
-    if ( ! ret_str.empty()) {
-        io = io_map[ret_str] ;
-        if(debug_level >= 4) std::cout << "go for io " <<  io << std::endl ;
-        io_found = true ;
-        comment = get_regex_field(comment , "(.*)@?io[\\({]([^\\)}]+)[\\)}]" , 1) +
-         get_regex_field(comment , "@?io[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
-    }
-
-    /*
-       Units can include parenthesis now.  We need to match the parenthesis in
-       trick_units() to get the whole units string.
-     */
-    std::size_t tu_string = comment.find("trick_units") ;
-    if ( tu_string != std::string::npos ) {
-        std::size_t ustart = tu_string + std::string("trick_units").length() ;
-        std::size_t uend = ustart + 1 ;
-        std::stack<char> parens ;
-        parens.push( comment[ustart]);
-        while ( ! parens.empty() and (uend < comment.length())) {
-            switch ( comment[uend] ) {
-                case '(':
-                    parens.push('(') ;
-                    break ;
-                case ')':
-                    if (parens.top() == '(') {
-                        parens.pop() ;
-                    }
-                    break ;
-                case '}':
-                    if (parens.top() == '{') {
-                        parens.pop() ;
-                    }
-                    break ;
-            }
-            uend++ ;
-        }
-        if ( parens.empty() ) {
-            units = comment.substr(ustart + 1 , uend - ustart - 2) ;
-            units_found = true ;
-            // If we have "@trick_units" include the "@" sign for erasure.
-            if ( tu_string > 0 and comment[tu_string-1] == '@' ) {
-                tu_string -= 1 ;
-            }
-            comment.erase(tu_string , uend - tu_string) ;
-        } else {
-            std::cout << "unmatched parenthesis for trick_units" << std::endl ;
-        }
-    }
-
-    if ( ! io_found ) {
-        // Note: I had to use [ \t\n\r] for \s because the Mac don't understand!
-        ret_str = get_regex_field(comment , "^[ \t\n\r]*(\\*io|\\*oi|\\*i|\\*o|\\*\\*)" , 1) ;
-        if(debug_level >= 4) std::cout << "3. " << ret_str << std::endl ;
-        if ( ! ret_str.empty()) {
-            io = io_map[ret_str] ;
-            if(debug_level >= 4) std::cout << "stand-alone io " <<  io << std::endl ;
-            io_found = true ;
-            comment = get_regex_field(comment , "^[ \t\n\r]*(\\*io|\\*oi|\\*i|\\*o|\\*\\*)[ \t\n\r]*(.*)" , 2) ;
-        }
-    }
-
-    if(debug_level >= 4) std::cout << "3. " << comment << std::endl ;
-    if ( ! units_found ) {
-        ret_str = get_regex_field(comment , "^[ \t\n\r]*\\(([^\\)]*)\\)" , 1) ;
-        if ( ! ret_str.empty()) {
-            units = ret_str ;
-            if(debug_level >= 4) std::cout << "stand-alone units " << units << std::endl ;
-            units_found = true ;
-            comment = get_regex_field(comment , "^[ \t\n\r]*\\(([^\\)]*)\\)(.*)" , 2) ;
-        } else {
-            ret_str = get_regex_field(comment , "^[ \t\n\r]*([^ \t\n\r)]*)" , 1) ;
-            if ( ! ret_str.empty()) {
-                units = ret_str ;
-                if(debug_level >= 4) std::cout << "stand-alone units " << units << " " << comment << std::endl ;
-                units_found = true ;
-                comment = get_regex_field(comment , "^[ \t\n\r]*([^ \t\n\r)]*)(.*)" , 2) ;
-            }
-        }
-    }
-
-
-    // Test if we have valid units.  We need to have found a units string and an io spec not zero
-    // Possible todo is to create a map of valid units so we don't have to retest each string.
-    if ( units_found and io != 0 and (valid_units.find(units) == valid_units.end())) {
-        // remove spaces
-        units.erase(remove_if(units.begin(), units.end(), isspace), units.end());
-        if ( !units.compare("--") ) {
-            units = "1" ;
-            is_dashdash = true ;
-        } else {
-            // map old unit names to new names
-            std::string new_units = map_trick_units_to_udunits(units) ;
-            if ( units.compare(new_units) ) {
-                std::cout << bold(color(WARNING, "Warning    ") + file_name + ":" + std::to_string(line_no)) << std::endl
-                    << "           Units converted from " << quote(units) << " to " << quote(new_units) << std::endl;
-                units = new_units ;
-            }
-            ut_unit * test_units = ut_parse(u_system, units.c_str() , UT_ASCII) ;
-            if ( test_units == NULL ) {
-                // If the units are invalid write an error message and change the units to "1"
-                std::cout << bold(color(WARNING, "Warning    ") + file_name + ":" + std::to_string(line_no)) << std::endl
-                    << "           Invalid units specification. Changing " << quote(units) << " to " << quote("1") << std::endl;
-                units = "1" ;
-            } else {
-                // If the units are valid, free the memory allocated by new_units.
-                ut_free(test_units) ;
-                valid_units.insert(units) ;
-            }
-        }
-    }
-
-    if ( io == 4 ) {
-        std::cout << bold(color(WARNING, "Warning    ") + file_name + ":" + std::to_string(line_no)) << std::endl
-            << "           -- is not a valid trick_io value. Setting to *io" << std::endl ;
-        io = 3 ;
-    }
-
-    if ( chkpnt_io_found == true ) {
-        // If a checkpoint I/O spec is found add it to the io field.
-        io = (chkpnt_io << 2 ) + ( io & 3 ) ;
-    } else if ( io_found == true ) {
-        // else duplicated the io field to the chkpnt io field.
-        io |= (io << 2 ) ;
-    }
-
-    // The rest of the comment is the description of the variable.
-
-    // remove the c comment end marker.
-    comment = get_regex_field(comment , "(.*)\\*/" , 1) ;
-
-    // posix c regular expressions are terrible. the regexes above will leave "@" signs because
-    // the regular expressions are so greedy.
-    comment = get_regex_field(comment , "^[ \t\n\r@]+(.*)" , 1) ;
-
-    // remove leading and trailing whitespace
-    comment = trim(comment) ;
+	std::string	in_container_class	)	:
+		container_class(in_container_class)	,
+		base_class_offset(0)	,
+		field_offset(0)	,
+		field_width(0)	,
+		inherited(false)	,
+		virtual_inherited(false)	,
+		units("1")	,
+		is_dashdash(false)	,
+		line_no(0)	,
+		io(15)	,
+		type_enum_string("TRICK_VOID")	,
+		is_bitfield(0)	,
+		bitfield_width(0)	,
+		bitfield_start_bit(0)	,
+		bitfield_word_offset(0)	,
+		is_enum(0)	,
+		is_record(0)	,
+		is_stl(0)	,
+		has_stl_clear(1)	,
+		is_static(0)	,
+		is_reference(0)	,
+		num_dims(0)	,
+		array_sizes()	{}	;
+
+
+std::map<std::string	,	unsigned	int	>	create_io_map()	{
+				std::map<std::string	,	unsigned	int	>	io_map	;
+				io_map[""]	=	3	;
+				io_map["o"]	=	1	;
+				io_map["*o"]	=	1	;
+				io_map["*i"]	=	2	;
+				io_map["i"]	=	2	;
+				io_map["*oi"]	=	3	;
+				io_map["oi"]	=	3	;
+				io_map["*io"]	=	3	;
+				io_map["io"]	=	3	;
+				io_map["**"]	=	0	;
+				//	The	"--"	is	a	bad	value,	but	we'll	take	it	for	now.
+				//	TODO:	Make	this	an	error	instead	of	being	nice!
+				io_map["--"]	=	4	;
+				return	io_map	;
+}
+
+std::map<std::string	,	unsigned	int	>	FieldDescription::io_map	=	create_io_map()	;
+
+std::string	FieldDescription::get_regex_field(std::string	input	,	const	char	*	expr	,	unsigned	int	index)	{
+				int	ret	;
+				regex_t	reg_expr	;
+				regmatch_t	pmatch[10]	;
+				memset(pmatch	,	0	,	sizeof(pmatch))	;
+				regcomp(	&reg_expr	,	expr	,	REG_EXTENDED	)	;
+				ret	=	regexec(	&reg_expr	,	input.c_str()	,	10	,	pmatch	,	0	)	;
+				regfree(&reg_expr)	;
+				if	(	ret	==	0	)	{
+								if(debug_level	>=	4)	std::cout	<<	"pmatch	range	=	"	<<	pmatch[index].rm_so	<<	"	"	<<	pmatch[index].rm_eo	<<	std::endl	;
+								if	(	pmatch[index].rm_so	!=	-1	)	{
+												return	input.substr(pmatch[index].rm_so	,	pmatch[index].rm_eo	-	pmatch[index].rm_so	)	;
+								}
+				}	else	if	(debug_level	>=	4){
+								char	error_msg[1024]	;
+								regerror(	ret	,	&reg_expr	,	(char	*)error_msg	,	1024	)	;
+								std::cerr	<<	error_msg	<<	std::endl	;
+				}
+				return	std::string()	;
+}
+
+//	global	set	of	all	units	processed.	hopefully	saves	time	from	reparsing	same	units	strings	over	and	over
+std::set<	std::string	>	valid_units	;
+extern	llvm::cl::opt<	int	>	debug_level	;
+
+void	FieldDescription::parseComment(std::string	comment)	{
+				std::string	ret_str	;
+
+				bool	units_found	=	false	;
+				bool	io_found	=	false	;
+				bool	chkpnt_io_found	=	false	;
+				unsigned	int	chkpnt_io	;
+
+				if	(	comment.empty()	)	{
+								//	If	the	comment	is	empty	default	all	I/O	enabled.
+								io	=	15	;
+								return	;
+				}
+
+				if	(	debug_level	>=	5	)	{
+								std::cout	<<	"comment	before	"	<<	comment	<<	std::endl	;
+				}
+
+				//	remove	open	comment	chars
+				comment	=	get_regex_field(comment	,	"^(//|/\\*)(.*)"	,	2)	;
+				if(debug_level	>=	4)	std::cout	<<	"1.	"	<<	comment	<<	std::endl	;
+
+				//	remove	optional	doxygen	comment	chars
+				//	Note:	I	had	to	use	[	\t\n\r]	for	\s	because	the	Mac	don't	understand!
+				comment	=	get_regex_field(comment	,	"^((\\*|!)<)?[	\t\n\r]*(.*)"	,	3)	;
+				if(debug_level	>=	4)	std::cout	<<	"2.	"	<<	comment	<<	std::endl	;
+
+				//	remove	optional	doxygen	keyword
+				comment	=	get_regex_field(comment	,	"(\\\\[a-zA-Z0-9]+)?[	\t\n\r]*(.*)"	,	2)	;
+				if(debug_level	>=	4)	std::cout	<<	"3.	"	<<	comment	<<	std::endl	;
+
+				ret_str	=	get_regex_field(comment	,	"@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}]"	,	1)	;
+				if	(	!	ret_str.empty())	{
+								chkpnt_io	=	io_map[ret_str]	;
+								if(debug_level	>=	4)	std::cout	<<	"go	for	trick_chkpnt_io	"	<<		io	<<	std::endl	;
+								chkpnt_io_found	=	true	;
+								comment	=	get_regex_field(comment	,	"(.*)@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}]"	,	1)	+
+									get_regex_field(comment	,	"@?trick_chkpnt_io[\\({]([^\\)}]+)[\\)}](.*)"	,	2)	;
+				}
+				ret_str	=	get_regex_field(comment	,	"@?cio[\\({]([^\\)}]+)[\\)}]"	,	1)	;
+				if	(	!	ret_str.empty())	{
+								chkpnt_io	=	io_map[ret_str]	;
+								if(debug_level	>=	4)	std::cout	<<	"go	for	cio	"	<<		io	<<	std::endl	;
+								chkpnt_io_found	=	true	;
+								comment	=	get_regex_field(comment	,	"(.*)@?cio[\\({]([^\\)}]+)[\\)}]"	,	1)	+
+									get_regex_field(comment	,	"@?cio[\\({]([^\\)}]+)[\\)}](.*)"	,	2)	;
+				}
+
+				ret_str	=	get_regex_field(comment	,	"@?trick_io[\\({]([^\\)}]+)[\\)}]"	,	1)	;
+				if	(	!	ret_str.empty())	{
+								io	=	io_map[ret_str]	;
+								if(debug_level	>=	4)	std::cout	<<	"go	for	trick_io	"	<<		io	<<	std::endl	;
+								io_found	=	true	;
+								comment	=	get_regex_field(comment	,	"(.*)@?trick_io[\\({]([^\\)}]+)[\\)}]"	,	1)	+
+									get_regex_field(comment	,	"@?trick_io[\\({]([^\\)}]+)[\\)}](.*)"	,	2)	;
+				}
+				ret_str	=	get_regex_field(comment	,	"@?io[\\({]([^\\)}]+)[\\)}]"	,	1)	;
+				if	(	!	ret_str.empty())	{
+								io	=	io_map[ret_str]	;
+								if(debug_level	>=	4)	std::cout	<<	"go	for	io	"	<<		io	<<	std::endl	;
+								io_found	=	true	;
+								comment	=	get_regex_field(comment	,	"(.*)@?io[\\({]([^\\)}]+)[\\)}]"	,	1)	+
+									get_regex_field(comment	,	"@?io[\\({]([^\\)}]+)[\\)}](.*)"	,	2)	;
+				}
+
+				/*
+							Units	can	include	parenthesis	now.		We	need	to	match	the	parenthesis	in
+							trick_units()	to	get	the	whole	units	string.
+					*/
+				std::size_t	tu_string	=	comment.find("trick_units")	;
+				if	(	tu_string	!=	std::string::npos	)	{
+								std::size_t	ustart	=	tu_string	+	std::string("trick_units").length()	;
+								std::size_t	uend	=	ustart	+	1	;
+								std::stack<char>	parens	;
+								parens.push(	comment[ustart]);
+								while	(	!	parens.empty()	and	(uend	<	comment.length()))	{
+												switch	(	comment[uend]	)	{
+																case	'(':
+																				parens.push('(')	;
+																				break	;
+																case	')':
+																				if	(parens.top()	==	'(')	{
+																								parens.pop()	;
+																				}
+																				break	;
+																case	'}':
+																				if	(parens.top()	==	'{')	{
+																								parens.pop()	;
+																				}
+																				break	;
+												}
+												uend++	;
+								}
+								if	(	parens.empty()	)	{
+												units	=	comment.substr(ustart	+	1	,	uend	-	ustart	-	2)	;
+												units_found	=	true	;
+												//	If	we	have	"@trick_units"	include	the	"@"	sign	for	erasure.
+												if	(	tu_string	>	0	and	comment[tu_string-1]	==	'@'	)	{
+																tu_string	-=	1	;
+												}
+												comment.erase(tu_string	,	uend	-	tu_string)	;
+								}	else	{
+												std::cout	<<	"unmatched	parenthesis	for	trick_units"	<<	std::endl	;
+								}
+				}
+
+				if	(	!	io_found	)	{
+								//	Note:	I	had	to	use	[	\t\n\r]	for	\s	because	the	Mac	don't	understand!
+								ret_str	=	get_regex_field(comment	,	"^[	\t\n\r]*(\\*io|\\*oi|\\*i|\\*o|\\*\\*)"	,	1)	;
+								if(debug_level	>=	4)	std::cout	<<	"3.	"	<<	ret_str	<<	std::endl	;
+								if	(	!	ret_str.empty())	{
+												io	=	io_map[ret_str]	;
+												if(debug_level	>=	4)	std::cout	<<	"stand-alone	io	"	<<		io	<<	std::endl	;
+												io_found	=	true	;
+												comment	=	get_regex_field(comment	,	"^[	\t\n\r]*(\\*io|\\*oi|\\*i|\\*o|\\*\\*)[	\t\n\r]*(.*)"	,	2)	;
+								}
+				}
+
+				if(debug_level	>=	4)	std::cout	<<	"3.	"	<<	comment	<<	std::endl	;
+				if	(	!	units_found	)	{
+								ret_str	=	get_regex_field(comment	,	"^[	\t\n\r]*\\(([^\\)]*)\\)"	,	1)	;
+								if	(	!	ret_str.empty())	{
+												units	=	ret_str	;
+												if(debug_level	>=	4)	std::cout	<<	"stand-alone	units	"	<<	units	<<	std::endl	;
+												units_found	=	true	;
+												comment	=	get_regex_field(comment	,	"^[	\t\n\r]*\\(([^\\)]*)\\)(.*)"	,	2)	;
+								}	else	{
+												ret_str	=	get_regex_field(comment	,	"^[	\t\n\r]*([^	\t\n\r)]*)"	,	1)	;
+												if	(	!	ret_str.empty())	{
+																units	=	ret_str	;
+																if(debug_level	>=	4)	std::cout	<<	"stand-alone	units	"	<<	units	<<	"	"	<<	comment	<<	std::endl	;
+																units_found	=	true	;
+																comment	=	get_regex_field(comment	,	"^[	\t\n\r]*([^	\t\n\r)]*)(.*)"	,	2)	;
+												}
+								}
+				}
+
+
+				//	Test	if	we	have	valid	units.		We	need	to	have	found	a	units	string	and	an	io	spec	not	zero
+				//	Possible	todo	is	to	create	a	map	of	valid	units	so	we	don't	have	to	retest	each	string.
+				if	(	units_found	and	io	!=	0	and	(valid_units.find(units)	==	valid_units.end()))	{
+								//	remove	spaces
+								units.erase(remove_if(units.begin(),	units.end(),	isspace),	units.end());
+								if	(	!units.compare("--")	)	{
+												units	=	"1"	;
+												is_dashdash	=	true	;
+								}	else	{
+												//	map	old	unit	names	to	new	names
+												std::string	new_units	=	map_trick_units_to_udunits(units)	;
+												if	(	units.compare(new_units)	)	{
+																std::cout	<<	bold(color(WARNING,	"Warning				")	+	file_name	+	":"	+	std::to_string(line_no))	<<	std::endl
+																				<<	"											Units	converted	from	"	<<	quote(units)	<<	"	to	"	<<	quote(new_units)	<<	std::endl;
+																units	=	new_units	;
+												}
+												ut_unit	*	test_units	=	ut_parse(u_system,	units.c_str()	,	UT_ASCII)	;
+												if	(	test_units	==	NULL	)	{
+																//	If	the	units	are	invalid	write	an	error	message	and	change	the	units	to	"1"
+																std::cout	<<	bold(color(WARNING,	"Warning				")	+	file_name	+	":"	+	std::to_string(line_no))	<<	std::endl
+																				<<	"											Invalid	units	specification.	Changing	"	<<	quote(units)	<<	"	to	"	<<	quote("1")	<<	std::endl;
+																units	=	"1"	;
+												}	else	{
+																//	If	the	units	are	valid,	free	the	memory	allocated	by	new_units.
+																ut_free(test_units)	;
+																valid_units.insert(units)	;
+												}
+								}
+				}
+
+				if	(	io	==	4	)	{
+								std::cout	<<	bold(color(WARNING,	"Warning				")	+	file_name	+	":"	+	std::to_string(line_no))	<<	std::endl
+												<<	"											--	is	not	a	valid	trick_io	value.	Setting	to	*io"	<<	std::endl	;
+								io	=	3	;
+				}
+
+				if	(	chkpnt_io_found	==	true	)	{
+								//	If	a	checkpoint	I/O	spec	is	found	add	it	to	the	io	field.
+								io	=	(chkpnt_io	<<	2	)	+	(	io	&	3	)	;
+				}	else	if	(	io_found	==	true	)	{
+								//	else	duplicated	the	io	field	to	the	chkpnt	io	field.
+								io	|=	(io	<<	2	)	;
+				}
+
+				//	The	rest	of	the	comment	is	the	description	of	the	variable.
+
+				//	remove	the	c	comment	end	marker.
+				comment	=	get_regex_field(comment	,	"(.*)\\*/"	,	1)	;
+
+				//	posix	c	regular	expressions	are	terrible.	the	regexes	above	will	leave	"@"	signs	because
+				//	the	regular	expressions	are	so	greedy.
+				comment	=	get_regex_field(comment	,	"^[	\t\n\r@]+(.*)"	,	1)	;
+
+				//	remove	leading	and	trailing	whitespace
+				comment	=	trim(comment)	;
 
-    // escape special characters, convert tabs and newlines to spaces, remove multiple spaces.
-    std::ostringstream ss ;
-    bool is_space = false ;
-    for (std::string::iterator it = comment.begin(); it != comment.end(); ++it) {
-        switch (*it) {
-            case '\\': ss << "\\\\"; is_space = false ; break;
-            case '"': ss << "\\\""; is_space = false ; break;
-            case '\b': ss << "\\b"; is_space = false ; break;
-            case '\f': ss << "\\f"; is_space = false ; break;
-            case '\n':
-            case '\r':
-            case '\t':
-            case ' ': if ( ! is_space ) ss << " "; is_space = true ; break;
-            default: ss << *it; is_space = false ; break;
-        }
-    }
+				//	escape	special	characters,	convert	tabs	and	newlines	to	spaces,	remove	multiple	spaces.
+				std::ostringstream	ss	;
+				bool	is_space	=	false	;
+				for	(std::string::iterator	it	=	comment.begin();	it	!=	comment.end();	++it)	{
+								switch	(*it)	{
+												case	'\\':	ss	<<	"\\\\";	is_space	=	false	;	break;
+												case	'"':	ss	<<	"\\\"";	is_space	=	false	;	break;
+												case	'\b':	ss	<<	"\\b";	is_space	=	false	;	break;
+												case	'\f':	ss	<<	"\\f";	is_space	=	false	;	break;
+												case	'\n':
+												case	'\r':
+												case	'\t':
+												case	'	':	if	(	!	is_space	)	ss	<<	"	";	is_space	=	true	;	break;
+												default:	ss	<<	*it;	is_space	=	false	;	break;
+								}
+				}
 
-    description = ss.str() ;
+				description	=	ss.str()	;
 
 }
 
-std::string FieldDescription::getContainerClass() {
-    return container_class ;
+std::string	FieldDescription::getContainerClass()	{
+				return	container_class	;
 }
 
-void FieldDescription::setContainerClass(std::string in_name ) {
-    container_class = in_name ;
+void	FieldDescription::setContainerClass(std::string	in_name	)	{
+				container_class	=	in_name	;
 }
 
-void FieldDescription::setBaseClassOffset(unsigned int in_offset) {
-    base_class_offset = in_offset ;
+void	FieldDescription::setBaseClassOffset(unsigned	int	in_offset)	{
+				base_class_offset	=	in_offset	;
 }
 
-unsigned int FieldDescription::getBaseClassOffset() {
-    return base_class_offset ;
+unsigned	int	FieldDescription::getBaseClassOffset()	{
+				return	base_class_offset	;
 }
 
-void FieldDescription::setFieldOffset(unsigned int in_offset) {
-    field_offset = in_offset ;
+void	FieldDescription::setFieldOffset(unsigned	int	in_offset)	{
+				field_offset	=	in_offset	;
 }
 
-unsigned int FieldDescription::getFieldOffset() {
-    return field_offset ;
+unsigned	int	FieldDescription::getFieldOffset()	{
+				return	field_offset	;
 }
 
-void FieldDescription::setFieldWidth(unsigned int in_width) {
-    field_width = in_width ;
+void	FieldDescription::setFieldWidth(unsigned	int	in_width)	{
+				field_width	=	in_width	;
 }
 
-unsigned int FieldDescription::getFieldWidth() {
-    return field_width ;
+unsigned	int	FieldDescription::getFieldWidth()	{
+				return	field_width	;
 }
 
-void FieldDescription::setNonCanonicalTypeName( std::string in_val ) {
-    non_canonical_type_name = in_val ;
+void	FieldDescription::setNonCanonicalTypeName(	std::string	in_val	)	{
+				non_canonical_type_name	=	in_val	;
 }
 
-std::string FieldDescription::getNonCanonicalTypeName() {
-    return non_canonical_type_name ;
+std::string	FieldDescription::getNonCanonicalTypeName()	{
+				return	non_canonical_type_name	;
 }
 
-void FieldDescription::setTypeName( std::string in_val ) {
-    type_name = in_val ;
+void	FieldDescription::setTypeName(	std::string	in_val	)	{
+				type_name	=	in_val	;
 }
 
-std::string FieldDescription::getTypeName() {
-    return type_name ;
+std::string	FieldDescription::getTypeName()	{
+				return	type_name	;
 }
 
-void FieldDescription::setLineNo( unsigned int in_val ) {
-    line_no = in_val ;
+void	FieldDescription::setLineNo(	unsigned	int	in_val	)	{
+				line_no	=	in_val	;
 }
 
-unsigned int FieldDescription::getLineNo() {
-    return line_no ;
+unsigned	int	FieldDescription::getLineNo()	{
+				return	line_no	;
 }
 
-void FieldDescription::setMangledTypeName( std::string in_val ) {
-    mangled_type_name = in_val ;
+void	FieldDescription::setMangledTypeName(	std::string	in_val	)	{
+				mangled_type_name	=	in_val	;
 }
 
-std::string FieldDescription::getMangledTypeName() {
-    if ( mangled_type_name.empty() ) {
-        return type_name ;
-    }
-    return mangled_type_name ;
+std::string	FieldDescription::getMangledTypeName()	{
+				if	(	mangled_type_name.empty()	)	{
+								return	type_name	;
+				}
+				return	mangled_type_name	;
 }
 
-std::string FieldDescription::getFullyQualifiedMangledTypeName(const std::string& delimiter) {
-    std::ostringstream oss ;
-    printNamespacesAndContainerClasses(oss, delimiter) ;
-    oss << getMangledTypeName() ;
-    return oss.str() ;
+std::string	FieldDescription::getFullyQualifiedMangledTypeName(const	std::string&	delimiter)	{
+				std::ostringstream	oss	;
+				printNamespacesAndContainerClasses(oss,	delimiter)	;
+				oss	<<	getMangledTypeName()	;
+				return	oss.str()	;
 }
 
-std::string FieldDescription::getUnits() {
-    return units ;
+std::string	FieldDescription::getUnits()	{
+				return	units	;
 }
 
-bool FieldDescription::isDashDashUnits() {
-    return is_dashdash ;
+bool	FieldDescription::isDashDashUnits()	{
+				return	is_dashdash	;
 }
 
-void FieldDescription::setIO(unsigned int in_io) {
-    io = in_io ;
+void	FieldDescription::setIO(unsigned	int	in_io)	{
+				io	=	in_io	;
 }
 
-unsigned int FieldDescription::getIO() {
-    return io ;
+unsigned	int	FieldDescription::getIO()	{
+				return	io	;
 }
 
-unsigned int FieldDescription::getChkpntIO() {
-    return io >> 2 & 3 ;
+unsigned	int	FieldDescription::getChkpntIO()	{
+				return	io	>>	2	&	3	;
 }
 
-bool FieldDescription::isWriteable() {
-    return io & 1;
+bool	FieldDescription::isWriteable()	{
+				return	io	&	1;
 }
 
-bool FieldDescription::isReadable() {
-    return io & 2;
+bool	FieldDescription::isReadable()	{
+				return	io	&	2;
 }
 
-bool FieldDescription::isCheckpointable() {
-    return io & 4;
+bool	FieldDescription::isCheckpointable()	{
+				return	io	&	4;
 }
 
-bool FieldDescription::isRestorable() {
-    return io & 8;
+bool	FieldDescription::isRestorable()	{
+				return	io	&	8;
 }
 
-std::string FieldDescription::getDescription() {
-    return description ;
+std::string	FieldDescription::getDescription()	{
+				return	description	;
 }
 
-void FieldDescription::setInherited(bool in_inherited) {
-    inherited = in_inherited ;
+void	FieldDescription::setInherited(bool	in_inherited)	{
+				inherited	=	in_inherited	;
 }
 
-bool FieldDescription::isInherited() {
-    return inherited ;
+bool	FieldDescription::isInherited()	{
+				return	inherited	;
 }
 
-void FieldDescription::setVirtualInherited(bool in_inherited) {
-    virtual_inherited = in_inherited ;
+void	FieldDescription::setVirtualInherited(bool	in_inherited)	{
+				virtual_inherited	=	in_inherited	;
 }
 
-bool FieldDescription::isVirtualInherited() {
-    return virtual_inherited ;
+bool	FieldDescription::isVirtualInherited()	{
+				return	virtual_inherited	;
 }
 
-void FieldDescription::setAccess( clang::AccessSpecifier in_val ) {
-    access = in_val ;
+void	FieldDescription::setAccess(	clang::AccessSpecifier	in_val	)	{
+				access	=	in_val	;
 }
 
-clang::AccessSpecifier FieldDescription::getAccess() {
-    return access ;
+clang::AccessSpecifier	FieldDescription::getAccess()	{
+				return	access	;
 }
 
-void FieldDescription::addOffset( unsigned int offset ) {
-    field_offset += offset ;
+void	FieldDescription::addOffset(	unsigned	int	offset	)	{
+				field_offset	+=	offset	;
 }
 
-void FieldDescription::setEnumString(std::string in_str) {
-    type_enum_string = in_str ;
+void	FieldDescription::setEnumString(std::string	in_str)	{
+				type_enum_string	=	in_str	;
 }
 
-std::string FieldDescription::getEnumString() {
-    return type_enum_string ;
+std::string	FieldDescription::getEnumString()	{
+				return	type_enum_string	;
 }
 
-void FieldDescription::setBitField(bool yes_no) {
-    is_bitfield = yes_no ;
+void	FieldDescription::setBitField(bool	yes_no)	{
+				is_bitfield	=	yes_no	;
 }
 
-bool FieldDescription::isBitField() {
-    return is_bitfield ;
+bool	FieldDescription::isBitField()	{
+				return	is_bitfield	;
 }
 
-void FieldDescription::setBitFieldWidth(unsigned int len) {
-    bitfield_width = len ;
+void	FieldDescription::setBitFieldWidth(unsigned	int	len)	{
+				bitfield_width	=	len	;
 }
 
-void FieldDescription::setBitFieldStart(unsigned int sb) {
-    bitfield_start_bit = sb ;
+void	FieldDescription::setBitFieldStart(unsigned	int	sb)	{
+				bitfield_start_bit	=	sb	;
 }
 
-void FieldDescription::setBitFieldByteOffset(unsigned int wo) {
-    bitfield_word_offset = wo ;
+void	FieldDescription::setBitFieldByteOffset(unsigned	int	wo)	{
+				bitfield_word_offset	=	wo	;
 }
 
-unsigned int FieldDescription::getBitFieldWidth() {
-    return bitfield_width ;
+unsigned	int	FieldDescription::getBitFieldWidth()	{
+				return	bitfield_width	;
 }
 
-unsigned int FieldDescription::getBitFieldStart() {
-    return bitfield_start_bit ;
+unsigned	int	FieldDescription::getBitFieldStart()	{
+				return	bitfield_start_bit	;
 }
 
-unsigned int FieldDescription::getBitFieldByteOffset() {
-    return bitfield_word_offset ;
+unsigned	int	FieldDescription::getBitFieldByteOffset()	{
+				return	bitfield_word_offset	;
 }
 
-void FieldDescription::setEnum(bool yes_no) {
-    is_enum = yes_no ;
+void	FieldDescription::setEnum(bool	yes_no)	{
+				is_enum	=	yes_no	;
 }
 
-bool FieldDescription::isEnum() {
-    return is_enum ;
+bool	FieldDescription::isEnum()	{
+				return	is_enum	;
 }
 
-void FieldDescription::setRecord(bool yes_no) {
-    is_record = yes_no ;
+void	FieldDescription::setRecord(bool	yes_no)	{
+				is_record	=	yes_no	;
 }
 
-bool FieldDescription::isRecord() {
-    return is_record ;
+bool	FieldDescription::isRecord()	{
+				return	is_record	;
 }
 
-void FieldDescription::setSTL(bool yes_no) {
-    is_stl = yes_no ;
+void	FieldDescription::setSTL(bool	yes_no)	{
+				is_stl	=	yes_no	;
 }
 
-bool FieldDescription::isSTL() {
-    return is_stl ;
+bool	FieldDescription::isSTL()	{
+				return	is_stl	;
 }
 
-void FieldDescription::setSTLClear(bool yes_no) {
-    has_stl_clear = yes_no ;
+void	FieldDescription::setSTLClear(bool	yes_no)	{
+				has_stl_clear	=	yes_no	;
 }
 
-bool FieldDescription::hasSTLClear() {
-    return has_stl_clear ;
+bool	FieldDescription::hasSTLClear()	{
+				return	has_stl_clear	;
 }
 
-void FieldDescription::setStatic(bool yes_no) {
-    is_static = yes_no ;
+void	FieldDescription::setStatic(bool	yes_no)	{
+				is_static	=	yes_no	;
 }
 
-bool FieldDescription::isStatic() {
-    return is_static ;
+bool	FieldDescription::isStatic()	{
+				return	is_static	;
 }
 
-void FieldDescription::setReference(bool yes_no) {
-    is_reference = yes_no ;
+void	FieldDescription::setReference(bool	yes_no)	{
+				is_reference	=	yes_no	;
 }
 
-bool FieldDescription::isReference() {
-    return is_reference ;
+bool	FieldDescription::isReference()	{
+				return	is_reference	;
 }
 
-unsigned int FieldDescription::getNumDims() {
-    return num_dims ;
+unsigned	int	FieldDescription::getNumDims()	{
+				return	num_dims	;
 }
 
-int FieldDescription::getArrayDim(unsigned int dim_num) {
-    if ( dim_num < 8 ) {
-        return array_sizes[dim_num] ;
-    }
-    return 0 ;
+int	FieldDescription::getArrayDim(unsigned	int	dim_num)	{
+				if	(	dim_num	<	8	)	{
+								return	array_sizes[dim_num]	;
+				}
+				return	0	;
 }
 
-void FieldDescription::addArrayDim( int in_dim ) {
-    array_sizes[num_dims++] = in_dim ;
+void	FieldDescription::addArrayDim(	int	in_dim	)	{
+				array_sizes[num_dims++]	=	in_dim	;
 }
 
-std::ostream & operator << (std::ostream & ostream , FieldDescription & fieldDescription ) {
-    ostream << "    name = " << fieldDescription.name << std::endl ;
-    ostream << "    file_name = " << fieldDescription.file_name << std::endl ;
-    ostream << "    namespaces =" ;
-    fieldDescription.printNamespaces(ostream) ;
-    ostream << std::endl ;
-    ostream << "    parent classes =" ;
-    fieldDescription.printContainerClasses(ostream) ;
-    ostream << std::endl ;
-    ostream << "    line_no = " << fieldDescription.line_no << std::endl ;
-    ostream << "    container_class = " << fieldDescription.container_class << std::endl ;
-    ostream << "    type_name = " << fieldDescription.type_name << std::endl ;
-    ostream << "    mangled_type_name = " << fieldDescription.mangled_type_name << std::endl ;
-    ostream << "    type_enum_string = " << fieldDescription.type_enum_string << std::endl ;
-    ostream << "    units = " << fieldDescription.units << std::endl ;
-    ostream << "    io = " << fieldDescription.io << std::endl ;
-    ostream << "    description = " << fieldDescription.description << std::endl ;
-    ostream << "    access = " << fieldDescription.access << std::endl ;
-    ostream << "    is_bitfield = " << fieldDescription.is_bitfield << std::endl ;
-    ostream << "    bitfield_width = " << fieldDescription.bitfield_width << std::endl ;
-    ostream << "    bitfield_start_bit = " << fieldDescription.bitfield_start_bit << std::endl ;
-    ostream << "    bitfield_word_offset = " << fieldDescription.bitfield_word_offset << std::endl ;
-    ostream << "    num_dims = " << fieldDescription.num_dims << std::endl ;
-    ostream << "    array_sizes =" ;
-    for( unsigned int ii = 0 ; ii < 8 ; ii++ ) {
-        ostream << " " << fieldDescription.array_sizes[ii] ;
-    }
-    ostream << std::endl ;
-    ostream << "    is_enum = " << fieldDescription.is_enum << std::endl ;
-    ostream << "    is_record = " << fieldDescription.is_record << std::endl ;
-    ostream << "    is_static = " << fieldDescription.is_static << std::endl ;
+std::ostream	&	operator	<<	(std::ostream	&	ostream	,	FieldDescription	&	fieldDescription	)	{
+				ostream	<<	"				name	=	"	<<	fieldDescription.name	<<	std::endl	;
+				ostream	<<	"				file_name	=	"	<<	fieldDescription.file_name	<<	std::endl	;
+				ostream	<<	"				namespaces	="	;
+				fieldDescription.printNamespaces(ostream)	;
+				ostream	<<	std::endl	;
+				ostream	<<	"				parent	classes	="	;
+				fieldDescription.printContainerClasses(ostream)	;
+				ostream	<<	std::endl	;
+				ostream	<<	"				line_no	=	"	<<	fieldDescription.line_no	<<	std::endl	;
+				ostream	<<	"				container_class	=	"	<<	fieldDescription.container_class	<<	std::endl	;
+				ostream	<<	"				type_name	=	"	<<	fieldDescription.type_name	<<	std::endl	;
+				ostream	<<	"				mangled_type_name	=	"	<<	fieldDescription.mangled_type_name	<<	std::endl	;
+				ostream	<<	"				type_enum_string	=	"	<<	fieldDescription.type_enum_string	<<	std::endl	;
+				ostream	<<	"				units	=	"	<<	fieldDescription.units	<<	std::endl	;
+				ostream	<<	"				io	=	"	<<	fieldDescription.io	<<	std::endl	;
+				ostream	<<	"				description	=	"	<<	fieldDescription.description	<<	std::endl	;
+				ostream	<<	"				access	=	"	<<	fieldDescription.access	<<	std::endl	;
+				ostream	<<	"				is_bitfield	=	"	<<	fieldDescription.is_bitfield	<<	std::endl	;
+				ostream	<<	"				bitfield_width	=	"	<<	fieldDescription.bitfield_width	<<	std::endl	;
+				ostream	<<	"				bitfield_start_bit	=	"	<<	fieldDescription.bitfield_start_bit	<<	std::endl	;
+				ostream	<<	"				bitfield_word_offset	=	"	<<	fieldDescription.bitfield_word_offset	<<	std::endl	;
+				ostream	<<	"				num_dims	=	"	<<	fieldDescription.num_dims	<<	std::endl	;
+				ostream	<<	"				array_sizes	="	;
+				for(	unsigned	int	ii	=	0	;	ii	<	8	;	ii++	)	{
+								ostream	<<	"	"	<<	fieldDescription.array_sizes[ii]	;
+				}
+				ostream	<<	std::endl	;
+				ostream	<<	"				is_enum	=	"	<<	fieldDescription.is_enum	<<	std::endl	;
+				ostream	<<	"				is_record	=	"	<<	fieldDescription.is_record	<<	std::endl	;
+				ostream	<<	"				is_static	=	"	<<	fieldDescription.is_static	<<	std::endl	;
 
-    return ostream ;
+				return	ostream	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
index e88d71d46..f05fc918f 100644
--- a/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/FieldVisitor.cpp
@@ -1,604 +1,604 @@
 
-#include <iostream>
-
-#include "llvm/Support/CommandLine.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/AST/RecordLayout.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Comment.h"
-#include "clang/Sema/Sema.h"
-
-#include "FieldVisitor.hh"
-#include "FieldDescription.hh"
-#include "ClassValues.hh"
-#include "EnumValues.hh"
-#include "ClassVisitor.hh"
-#include "CommentSaver.hh"
-#include "Utilities.hh"
-
-extern llvm::cl::opt< int > debug_level ;
-
-FieldVisitor::FieldVisitor(clang::CompilerInstance & in_ci ,
- HeaderSearchDirs & in_hsd ,
- CommentSaver & in_cs ,
- PrintAttributes & in_pa ,
- std::string container_class ) :
-  ci(in_ci) ,
-  hsd(in_hsd) ,
-  cs(in_cs) ,
-  pa(in_pa) {
-    fdes = new FieldDescription(container_class) ;
+#include	<iostream>
+
+#include	"llvm/Support/CommandLine.h"
+#include	"clang/Basic/SourceManager.h"
+#include	"clang/AST/RecordLayout.h"
+#include	"clang/AST/ASTContext.h"
+#include	"clang/AST/Comment.h"
+#include	"clang/Sema/Sema.h"
+
+#include	"FieldVisitor.hh"
+#include	"FieldDescription.hh"
+#include	"ClassValues.hh"
+#include	"EnumValues.hh"
+#include	"ClassVisitor.hh"
+#include	"CommentSaver.hh"
+#include	"Utilities.hh"
+
+extern	llvm::cl::opt<	int	>	debug_level	;
+
+FieldVisitor::FieldVisitor(clang::CompilerInstance	&	in_ci	,
+	HeaderSearchDirs	&	in_hsd	,
+	CommentSaver	&	in_cs	,
+	PrintAttributes	&	in_pa	,
+	std::string	container_class	)	:
+		ci(in_ci)	,
+		hsd(in_hsd)	,
+		cs(in_cs)	,
+		pa(in_pa)	{
+				fdes	=	new	FieldDescription(container_class)	;
 }
 
-bool FieldVisitor::VisitDecl(clang::Decl *d) {
-    if ( debug_level >= 4 ) {
-        std::cout << "\n\033[32mFieldVisitor VisitDecl Decl = " << d->getDeclKindName() << "\033[00m" << std::endl ;
-        d->dump() ;
-    }
-    return true ;
+bool	FieldVisitor::VisitDecl(clang::Decl	*d)	{
+				if	(	debug_level	>=	4	)	{
+								std::cout	<<	"\n\033[32mFieldVisitor	VisitDecl	Decl	=	"	<<	d->getDeclKindName()	<<	"\033[00m"	<<	std::endl	;
+								d->dump()	;
+				}
+				return	true	;
 }
 
-bool FieldVisitor::VisitType(clang::Type *t) {
-    if ( debug_level >= 4 ) {
-        std::cout << "FieldVisitor VisitType Type = " << t->getTypeClassName() << std::endl ;
-        t->dump() ;
-    }
-    if ( t->isReferenceType() ) {
-        if ( debug_level >= 3 ) {
-            std::cout << "FieldVisitor VisitType found reference, setIO = 3 " << std::endl ;
-        }
-        fdes->setIO(3) ;
-        fdes->setReference(true) ;
-    }
-    return true;
+bool	FieldVisitor::VisitType(clang::Type	*t)	{
+				if	(	debug_level	>=	4	)	{
+								std::cout	<<	"FieldVisitor	VisitType	Type	=	"	<<	t->getTypeClassName()	<<	std::endl	;
+								t->dump()	;
+				}
+				if	(	t->isReferenceType()	)	{
+								if	(	debug_level	>=	3	)	{
+												std::cout	<<	"FieldVisitor	VisitType	found	reference,	setIO	=	3	"	<<	std::endl	;
+								}
+								fdes->setIO(3)	;
+								fdes->setReference(true)	;
+				}
+				return	true;
 }
 
-bool FieldVisitor::VisitBuiltinType(clang::BuiltinType *bt) {
-
-    if ( debug_level >= 3 ) {
-        std::cout << "FieldVisitor::VisitBuiltinType " << bt->desugar().getAsString() << std::endl ;
-    }
-    fdes->setTypeName(bt->desugar().getAsString()) ;
-    if ( fdes->isBitField() ) {
-        if ( bt->isUnsignedInteger() ) {
-            fdes->setEnumString("TRICK_UNSIGNED_BITFIELD") ;
-        } else {
-            fdes->setEnumString("TRICK_BITFIELD") ;
-        }
-        if ( bt->getKind() == clang::BuiltinType::Bool ) {
-            fdes->setTypeName("bool") ;
-        }
-    } else {
-        switch ( bt->getKind() ) {
-            case clang::BuiltinType::Bool:
-                fdes->setEnumString("TRICK_BOOLEAN") ;
-                fdes->setTypeName("bool") ;
-                break ;
-            case clang::BuiltinType::Char_S:
-            case clang::BuiltinType::SChar:
-                fdes->setEnumString("TRICK_CHARACTER") ;
-                break ;
-            case clang::BuiltinType::UChar:
-            case clang::BuiltinType::Char_U:
-                fdes->setEnumString("TRICK_UNSIGNED_CHARACTER") ;
-                break ;
-            case clang::BuiltinType::WChar_U:
-            case clang::BuiltinType::WChar_S:
-                fdes->setEnumString("TRICK_WCHAR") ;
-                break ;
-            case clang::BuiltinType::Short:
-                fdes->setEnumString("TRICK_SHORT") ;
-                break ;
-            case clang::BuiltinType::UShort:
-            case clang::BuiltinType::Char16:
-                fdes->setEnumString("TRICK_UNSIGNED_SHORT") ;
-                break ;
-            case clang::BuiltinType::Int:
-                fdes->setEnumString("TRICK_INTEGER") ;
-                break ;
-            case clang::BuiltinType::UInt:
-                fdes->setEnumString("TRICK_UNSIGNED_INTEGER") ;
-                break ;
-            case clang::BuiltinType::Long:
-                fdes->setEnumString("TRICK_LONG") ;
-                break ;
-            case clang::BuiltinType::ULong:
-                fdes->setEnumString("TRICK_UNSIGNED_LONG") ;
-                break ;
-            case clang::BuiltinType::LongLong:
-                fdes->setEnumString("TRICK_LONG_LONG") ;
-                break ;
-            case clang::BuiltinType::ULongLong:
-                fdes->setEnumString("TRICK_UNSIGNED_LONG_LONG") ;
-                break ;
-            case clang::BuiltinType::Float:
-                fdes->setEnumString("TRICK_FLOAT") ;
-                break ;
-            case clang::BuiltinType::Double:
-                fdes->setEnumString("TRICK_DOUBLE") ;
-                break ;
-            default:
-                fdes->setEnumString("TRICK_VOID") ;
-                break ;
-        }
-    }
-    return false;
+bool	FieldVisitor::VisitBuiltinType(clang::BuiltinType	*bt)	{
+
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"FieldVisitor::VisitBuiltinType	"	<<	bt->desugar().getAsString()	<<	std::endl	;
+				}
+				fdes->setTypeName(bt->desugar().getAsString())	;
+				if	(	fdes->isBitField()	)	{
+								if	(	bt->isUnsignedInteger()	)	{
+												fdes->setEnumString("TRICK_UNSIGNED_BITFIELD")	;
+								}	else	{
+												fdes->setEnumString("TRICK_BITFIELD")	;
+								}
+								if	(	bt->getKind()	==	clang::BuiltinType::Bool	)	{
+												fdes->setTypeName("bool")	;
+								}
+				}	else	{
+								switch	(	bt->getKind()	)	{
+												case	clang::BuiltinType::Bool:
+																fdes->setEnumString("TRICK_BOOLEAN")	;
+																fdes->setTypeName("bool")	;
+																break	;
+												case	clang::BuiltinType::Char_S:
+												case	clang::BuiltinType::SChar:
+																fdes->setEnumString("TRICK_CHARACTER")	;
+																break	;
+												case	clang::BuiltinType::UChar:
+												case	clang::BuiltinType::Char_U:
+																fdes->setEnumString("TRICK_UNSIGNED_CHARACTER")	;
+																break	;
+												case	clang::BuiltinType::WChar_U:
+												case	clang::BuiltinType::WChar_S:
+																fdes->setEnumString("TRICK_WCHAR")	;
+																break	;
+												case	clang::BuiltinType::Short:
+																fdes->setEnumString("TRICK_SHORT")	;
+																break	;
+												case	clang::BuiltinType::UShort:
+												case	clang::BuiltinType::Char16:
+																fdes->setEnumString("TRICK_UNSIGNED_SHORT")	;
+																break	;
+												case	clang::BuiltinType::Int:
+																fdes->setEnumString("TRICK_INTEGER")	;
+																break	;
+												case	clang::BuiltinType::UInt:
+																fdes->setEnumString("TRICK_UNSIGNED_INTEGER")	;
+																break	;
+												case	clang::BuiltinType::Long:
+																fdes->setEnumString("TRICK_LONG")	;
+																break	;
+												case	clang::BuiltinType::ULong:
+																fdes->setEnumString("TRICK_UNSIGNED_LONG")	;
+																break	;
+												case	clang::BuiltinType::LongLong:
+																fdes->setEnumString("TRICK_LONG_LONG")	;
+																break	;
+												case	clang::BuiltinType::ULongLong:
+																fdes->setEnumString("TRICK_UNSIGNED_LONG_LONG")	;
+																break	;
+												case	clang::BuiltinType::Float:
+																fdes->setEnumString("TRICK_FLOAT")	;
+																break	;
+												case	clang::BuiltinType::Double:
+																fdes->setEnumString("TRICK_DOUBLE")	;
+																break	;
+												default:
+																fdes->setEnumString("TRICK_VOID")	;
+																break	;
+								}
+				}
+				return	false;
 }
 
-bool FieldVisitor::VisitConstantArrayType(clang::ConstantArrayType *cat) {
-    //cat->dump() ; std::cout << std::endl ;
-    fdes->addArrayDim(cat->getSize().getZExtValue()) ;
-    // If this field is an arrayed STL, skip it!
-    if ( fdes->isSTL() ) {
-        fdes->setIO(0) ;
-    }
-    return true;
+bool	FieldVisitor::VisitConstantArrayType(clang::ConstantArrayType	*cat)	{
+				//cat->dump()	;	std::cout	<<	std::endl	;
+				fdes->addArrayDim(cat->getSize().getZExtValue())	;
+				//	If	this	field	is	an	arrayed	STL,	skip	it!
+				if	(	fdes->isSTL()	)	{
+								fdes->setIO(0)	;
+				}
+				return	true;
 }
 
-/* Both FieldDecl and VarDecl derive from DeclaratorDecl.  We can do
-   common things to both node types in this function */
-bool FieldVisitor::VisitDeclaratorDecl( clang::DeclaratorDecl *dd ) {
-
-    fdes->setFileName(getFileName(ci , dd->getLocation(), hsd)) ;
-    fdes->setName(dd->getNameAsString()) ;
-    fdes->setAccess(dd->getAccess()) ;
-
-    /* Get the source location of this field.*/
-    clang::SourceRange dd_range = dd->getSourceRange() ;
-    clang::PresumedLoc PLoc = ci.getSourceManager().getPresumedLoc(dd_range.getEnd());
-    std::string file_name ;
-    if (!PLoc.isInvalid()) {
-        char * resolved_path = almostRealPath(PLoc.getFilename()) ;
-        if ( resolved_path != NULL ) {
-            file_name = std::string(resolved_path) ;
-            free(resolved_path) ;
-        }
-    }
-
-    if ( ! file_name.empty() ) {
-        if ( isInUserOrTrickCode( ci , dd_range.getEnd() , hsd ) ) {
-            fdes->setLineNo(ci.getSourceManager().getSpellingLineNumber(dd_range.getEnd())) ;
-            /* process comment if neither ICG:(No) or ICG:(NoComment) is present */
-            if (  cs.hasTrickHeader(file_name) and
-                 !cs.hasICGNoComment(file_name) and
-                 !hsd.isPathInICGNoComment(file_name) ) {
-                /* Get the possible comment on this line and parse it */
-                fdes->parseComment(cs.getComment(file_name , fdes->getLineNo())) ;
-            }
-        }
-    }
-
-    if ( debug_level >= 3 ) {
-        if ( ! ci.getSourceManager().isInSystemHeader(dd_range.getEnd()) ) {
-            std::cout << "FieldVisitor VisitDeclaratorDecl" << std::endl ;
-            std::cout << "    file_name = " << file_name << std::endl ;
-            std::cout << "    line num = " << fdes->getLineNo() << std::endl ;
-            std::cout << "    comment = " << cs.getComment(file_name , fdes->getLineNo()) << std::endl ;
-            std::cout << "    public/private = " << fdes->getAccess() << std::endl ;
-            std::cout << "    io = " << fdes->getIO() << std::endl ;
-        }
-    }
-
-    // returns true if any io is allowed. returning false will stop processing of this variable here.
-    return fdes->getIO() ;
+/*	Both	FieldDecl	and	VarDecl	derive	from	DeclaratorDecl.		We	can	do
+			common	things	to	both	node	types	in	this	function	*/
+bool	FieldVisitor::VisitDeclaratorDecl(	clang::DeclaratorDecl	*dd	)	{
+
+				fdes->setFileName(getFileName(ci	,	dd->getLocation(),	hsd))	;
+				fdes->setName(dd->getNameAsString())	;
+				fdes->setAccess(dd->getAccess())	;
+
+				/*	Get	the	source	location	of	this	field.*/
+				clang::SourceRange	dd_range	=	dd->getSourceRange()	;
+				clang::PresumedLoc	PLoc	=	ci.getSourceManager().getPresumedLoc(dd_range.getEnd());
+				std::string	file_name	;
+				if	(!PLoc.isInvalid())	{
+								char	*	resolved_path	=	almostRealPath(PLoc.getFilename())	;
+								if	(	resolved_path	!=	NULL	)	{
+												file_name	=	std::string(resolved_path)	;
+												free(resolved_path)	;
+								}
+				}
+
+				if	(	!	file_name.empty()	)	{
+								if	(	isInUserOrTrickCode(	ci	,	dd_range.getEnd()	,	hsd	)	)	{
+												fdes->setLineNo(ci.getSourceManager().getSpellingLineNumber(dd_range.getEnd()))	;
+												/*	process	comment	if	neither	ICG:(No)	or	ICG:(NoComment)	is	present	*/
+												if	(		cs.hasTrickHeader(file_name)	and
+																	!cs.hasICGNoComment(file_name)	and
+																	!hsd.isPathInICGNoComment(file_name)	)	{
+																/*	Get	the	possible	comment	on	this	line	and	parse	it	*/
+																fdes->parseComment(cs.getComment(file_name	,	fdes->getLineNo()))	;
+												}
+								}
+				}
+
+				if	(	debug_level	>=	3	)	{
+								if	(	!	ci.getSourceManager().isInSystemHeader(dd_range.getEnd())	)	{
+												std::cout	<<	"FieldVisitor	VisitDeclaratorDecl"	<<	std::endl	;
+												std::cout	<<	"				file_name	=	"	<<	file_name	<<	std::endl	;
+												std::cout	<<	"				line	num	=	"	<<	fdes->getLineNo()	<<	std::endl	;
+												std::cout	<<	"				comment	=	"	<<	cs.getComment(file_name	,	fdes->getLineNo())	<<	std::endl	;
+												std::cout	<<	"				public/private	=	"	<<	fdes->getAccess()	<<	std::endl	;
+												std::cout	<<	"				io	=	"	<<	fdes->getIO()	<<	std::endl	;
+								}
+				}
+
+				//	returns	true	if	any	io	is	allowed.	returning	false	will	stop	processing	of	this	variable	here.
+				return	fdes->getIO()	;
 }
 
-bool FieldVisitor::VisitEnumType( clang::EnumType *et ) {
-
-    std::string enum_type_name = et->desugar().getAsString() ;
-    if ( debug_level >= 3 ) {
-        std::cout << "\nFieldVisitor VisitEnumType" << std::endl ;
-        std::cout << et->desugar().getAsString() << std::endl ;
-    }
-    size_t pos ;
-    if ((pos = enum_type_name.find("enum ")) != std::string::npos ) {
-        enum_type_name.erase(pos , 5) ;
-    }
-    // If this enum is to an enumeration found inside a template, e.g. template<type>::enum_type ignore it.
-    // because there will not be enumeration attribute information generated for this enum.
-    if ((pos = enum_type_name.find("<")) != std::string::npos ) {
-        size_t last_pos = enum_type_name.find_last_of(">::") ;
-        enum_type_name.replace(pos, last_pos - pos + 1, "__") ;
-        //fdes->setIO(0) ;
-    }
-    fdes->setMangledTypeName("") ;
-    fdes->setTypeName(enum_type_name) ;
-    fdes->setEnumString("TRICK_ENUMERATED") ;
-    fdes->setEnum(true) ;
-    return true ;
+bool	FieldVisitor::VisitEnumType(	clang::EnumType	*et	)	{
+
+				std::string	enum_type_name	=	et->desugar().getAsString()	;
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"\nFieldVisitor	VisitEnumType"	<<	std::endl	;
+								std::cout	<<	et->desugar().getAsString()	<<	std::endl	;
+				}
+				size_t	pos	;
+				if	((pos	=	enum_type_name.find("enum	"))	!=	std::string::npos	)	{
+								enum_type_name.erase(pos	,	5)	;
+				}
+				//	If	this	enum	is	to	an	enumeration	found	inside	a	template,	e.g.	template<type>::enum_type	ignore	it.
+				//	because	there	will	not	be	enumeration	attribute	information	generated	for	this	enum.
+				if	((pos	=	enum_type_name.find("<"))	!=	std::string::npos	)	{
+								size_t	last_pos	=	enum_type_name.find_last_of(">::")	;
+								enum_type_name.replace(pos,	last_pos	-	pos	+	1,	"__")	;
+								//fdes->setIO(0)	;
+				}
+				fdes->setMangledTypeName("")	;
+				fdes->setTypeName(enum_type_name)	;
+				fdes->setEnumString("TRICK_ENUMERATED")	;
+				fdes->setEnum(true)	;
+				return	true	;
 }
 
-bool FieldVisitor::VisitFieldDecl( clang::FieldDecl *field ) {
-
-    clang::QualType qt = field->getType() ;
-
-    // set the offset and size field
-    fdes->setFieldOffset(field->getASTContext().getFieldOffset(field)) ;
-    fdes->setFieldWidth(field->getASTContext().getTypeSize(qt)) ;
-
-    if ( field->isBitField()) {
-        fdes->setBitField(true) ;
-        fdes->setBitFieldWidth(field->getBitWidthValue(field->getASTContext())) ;
-        unsigned int field_offset_bits = field->getASTContext().getFieldOffset(field) + fdes->getBaseClassOffset() * 8 ;
-        fdes->setBitFieldStart( 32 - (field_offset_bits % 32) - fdes->getBitFieldWidth()) ;
-        fdes->setBitFieldByteOffset((field_offset_bits / 32) * 4 ) ;
-    }
-
-    if ( debug_level >= 3 ) {
-        std::cout << "FieldVisitor VisitFieldDecl" << std::endl ;
-        std::cout << "    is_bitfield = " << fdes->isBitField() << std::endl ;
-        std::cout << "    is_canonical = " << qt.isCanonical() << std::endl ;
-        // isHidden() removed in clang 11.0
-        //std::cout << "    is_hidden = " << field->isHidden() << std::endl ;
-        //field->dump() ;
-    }
-
-    // If the current type is not canonical because of typedefs or template parameter substitution,
-    // traverse the canonical type
-    if ( !qt.isCanonical() ) {
-        fdes->setNonCanonicalTypeName(qt.getAsString()) ;
-        clang::QualType ct = qt.getCanonicalType() ;
-        if ( debug_level >= 3 ) {
-            std::cout << "\033[33mFieldVisitor VisitFieldDecl: Processing canonical type\033[00m" << std::endl ;
-            ct.dump() ;
-        }
-        TraverseType(ct) ;
-        // We have extracted the canonical type and everything else we need
-        // return false so we cut off processing of this AST branch
-        return false ;
-    }
-
-    return true ;
+bool	FieldVisitor::VisitFieldDecl(	clang::FieldDecl	*field	)	{
+
+				clang::QualType	qt	=	field->getType()	;
+
+				//	set	the	offset	and	size	field
+				fdes->setFieldOffset(field->getASTContext().getFieldOffset(field))	;
+				fdes->setFieldWidth(field->getASTContext().getTypeSize(qt))	;
+
+				if	(	field->isBitField())	{
+								fdes->setBitField(true)	;
+								fdes->setBitFieldWidth(field->getBitWidthValue(field->getASTContext()))	;
+								unsigned	int	field_offset_bits	=	field->getASTContext().getFieldOffset(field)	+	fdes->getBaseClassOffset()	*	8	;
+								fdes->setBitFieldStart(	32	-	(field_offset_bits	%	32)	-	fdes->getBitFieldWidth())	;
+								fdes->setBitFieldByteOffset((field_offset_bits	/	32)	*	4	)	;
+				}
+
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"FieldVisitor	VisitFieldDecl"	<<	std::endl	;
+								std::cout	<<	"				is_bitfield	=	"	<<	fdes->isBitField()	<<	std::endl	;
+								std::cout	<<	"				is_canonical	=	"	<<	qt.isCanonical()	<<	std::endl	;
+								//	isHidden()	removed	in	clang	11.0
+								//std::cout	<<	"				is_hidden	=	"	<<	field->isHidden()	<<	std::endl	;
+								//field->dump()	;
+				}
+
+				//	If	the	current	type	is	not	canonical	because	of	typedefs	or	template	parameter	substitution,
+				//	traverse	the	canonical	type
+				if	(	!qt.isCanonical()	)	{
+								fdes->setNonCanonicalTypeName(qt.getAsString())	;
+								clang::QualType	ct	=	qt.getCanonicalType()	;
+								if	(	debug_level	>=	3	)	{
+												std::cout	<<	"\033[33mFieldVisitor	VisitFieldDecl:	Processing	canonical	type\033[00m"	<<	std::endl	;
+												ct.dump()	;
+								}
+								TraverseType(ct)	;
+								//	We	have	extracted	the	canonical	type	and	everything	else	we	need
+								//	return	false	so	we	cut	off	processing	of	this	AST	branch
+								return	false	;
+				}
+
+				return	true	;
 }
 
-bool FieldVisitor::VisitPointerType(clang::PointerType *p) {
-    fdes->addArrayDim(-1) ;
-    // If this field is a pointer to an STL, skip it!
-    if ( fdes->isSTL() ) {
-        fdes->setIO(0) ;
-    }
-    return true;
+bool	FieldVisitor::VisitPointerType(clang::PointerType	*p)	{
+				fdes->addArrayDim(-1)	;
+				//	If	this	field	is	a	pointer	to	an	STL,	skip	it!
+				if	(	fdes->isSTL()	)	{
+								fdes->setIO(0)	;
+				}
+				return	true;
 }
 
-std::map < std::string , std::string > FieldVisitor::processed_templates ;
-
-bool FieldVisitor::ProcessTemplate(std::string in_name , clang::CXXRecordDecl * crd ) {
-
-    // Save container namespaces and classes.
-    // If we have trouble getting the namespaces and classes immediately return.
-    if ( !fdes->getNamespacesAndClasses(crd->getDeclContext())) {
-        fdes->setIO(0) ;
-        return false ;
-    }
-
-    // Check to see if we've processed this template before
-    // If not we need to create attributes for this template
-    if ( processed_templates.find(in_name) == processed_templates.end() ) {
-        std::string mangled_name = sanitize(in_name) ;
-
-        // save off the mangled name of this template to be used if another variable is the same template type
-        processed_templates[in_name] = fdes->getContainerClass() + "_" +
-         fdes->getName() + "_" + mangled_name ;
-
-        // Traverse the template declaration
-        CXXRecordVisitor template_spec_cvis(ci , cs, hsd , pa, true) ;
-        template_spec_cvis.get_class_data()->setMangledTypeName(processed_templates[in_name]) ;
-        template_spec_cvis.TraverseCXXRecordDecl(crd) ;
-
-        // Set the actual type name and file name. Print the attributes for this template type
-        template_spec_cvis.get_class_data()->setName(in_name) ;
-        template_spec_cvis.get_class_data()->setFileName(fdes->getFileName()) ;
-        pa.printClass(template_spec_cvis.get_class_data()) ;
-
-        if ( debug_level >= 4 ) {
-            std::cout << "Added template class from FieldVisitor ProcessTemplate " ;
-            std::cout << in_name << std::endl ;
-            std::cout << *fdes << std::endl ;
-        }
-    }
-
-    fdes->setMangledTypeName(processed_templates[in_name]) ;
-    fdes->setEnumString("TRICK_STRUCTURED") ;
-    fdes->setRecord(true) ;
-
-    // processing the template will process the type, return false to stop processing
-    return false ;
+std::map	<	std::string	,	std::string	>	FieldVisitor::processed_templates	;
+
+bool	FieldVisitor::ProcessTemplate(std::string	in_name	,	clang::CXXRecordDecl	*	crd	)	{
+
+				//	Save	container	namespaces	and	classes.
+				//	If	we	have	trouble	getting	the	namespaces	and	classes	immediately	return.
+				if	(	!fdes->getNamespacesAndClasses(crd->getDeclContext()))	{
+								fdes->setIO(0)	;
+								return	false	;
+				}
+
+				//	Check	to	see	if	we've	processed	this	template	before
+				//	If	not	we	need	to	create	attributes	for	this	template
+				if	(	processed_templates.find(in_name)	==	processed_templates.end()	)	{
+								std::string	mangled_name	=	sanitize(in_name)	;
+
+								//	save	off	the	mangled	name	of	this	template	to	be	used	if	another	variable	is	the	same	template	type
+								processed_templates[in_name]	=	fdes->getContainerClass()	+	"_"	+
+									fdes->getName()	+	"_"	+	mangled_name	;
+
+								//	Traverse	the	template	declaration
+								CXXRecordVisitor	template_spec_cvis(ci	,	cs,	hsd	,	pa,	true)	;
+								template_spec_cvis.get_class_data()->setMangledTypeName(processed_templates[in_name])	;
+								template_spec_cvis.TraverseCXXRecordDecl(crd)	;
+
+								//	Set	the	actual	type	name	and	file	name.	Print	the	attributes	for	this	template	type
+								template_spec_cvis.get_class_data()->setName(in_name)	;
+								template_spec_cvis.get_class_data()->setFileName(fdes->getFileName())	;
+								pa.printClass(template_spec_cvis.get_class_data())	;
+
+								if	(	debug_level	>=	4	)	{
+												std::cout	<<	"Added	template	class	from	FieldVisitor	ProcessTemplate	"	;
+												std::cout	<<	in_name	<<	std::endl	;
+												std::cout	<<	*fdes	<<	std::endl	;
+								}
+				}
+
+				fdes->setMangledTypeName(processed_templates[in_name])	;
+				fdes->setEnumString("TRICK_STRUCTURED")	;
+				fdes->setRecord(true)	;
+
+				//	processing	the	template	will	process	the	type,	return	false	to	stop	processing
+				return	false	;
 }
 
-static std::map<std::string, bool> init_stl_classes() {
-    std::map<std::string, bool> my_map ;
-    my_map.insert(std::pair<std::string, bool>("std::array", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::deque", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::list", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::map", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::multiset", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::multimap", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::pair", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::priority_queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::set", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::stack", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::vector", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::array", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::deque", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::list", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::map", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::multiset", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::multimap", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::pair", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::priority_queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::set", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::stack", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__1::vector", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::array", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::deque", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::list", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::map", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::multiset", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::multimap", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::pair", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::priority_queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::queue", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::set", 1)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::stack", 0)) ;
-    my_map.insert(std::pair<std::string, bool>("std::__cxx11::vector", 1)) ;
-    return my_map ;
+static	std::map<std::string,	bool>	init_stl_classes()	{
+				std::map<std::string,	bool>	my_map	;
+				my_map.insert(std::pair<std::string,	bool>("std::array",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::deque",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::list",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::map",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::multiset",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::multimap",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::pair",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::priority_queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::set",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::stack",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::vector",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::array",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::deque",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::list",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::map",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::multiset",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::multimap",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::pair",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::priority_queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::set",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::stack",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__1::vector",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::array",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::deque",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::list",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::map",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::multiset",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::multimap",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::pair",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::priority_queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::queue",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::set",	1))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::stack",	0))	;
+				my_map.insert(std::pair<std::string,	bool>("std::__cxx11::vector",	1))	;
+				return	my_map	;
 }
 
-static bool checkForPrivateTemplateArgs( clang::ClassTemplateSpecializationDecl * ctsd ) {
-    for (const clang::TemplateArgument& ta : ctsd->getTemplateArgs().asArray()) {
-        if ( ta.getKind() == clang::TemplateArgument::Type ) {
-            clang::QualType qt = ta.getAsType() ;
-            //std::cout << qt.getAsString() << std::endl ;
-            if ( CXXRecordVisitor::isPrivateEmbeddedClass(qt.getAsString()) ) {
-                //std::cout << "  is private embedded class" << std::endl ;
-                return true ;
-            } else {
-                //std::cout << "  is public embedded class" << std::endl ;
-                const clang::Type * t = qt.getTypePtrOrNull() ;
-                if ( t != NULL ) {
-                    if (t->getTypeClass() == clang::Type::Record ) {
-                        clang::CXXRecordDecl * crd = t->getAsCXXRecordDecl() ;
-                        if ( clang::isa<clang::ClassTemplateSpecializationDecl>(crd) ) {
-                            return checkForPrivateTemplateArgs(clang::cast<clang::ClassTemplateSpecializationDecl>(crd)) ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false ;
+static	bool	checkForPrivateTemplateArgs(	clang::ClassTemplateSpecializationDecl	*	ctsd	)	{
+				for	(const	clang::TemplateArgument&	ta	:	ctsd->getTemplateArgs().asArray())	{
+								if	(	ta.getKind()	==	clang::TemplateArgument::Type	)	{
+												clang::QualType	qt	=	ta.getAsType()	;
+												//std::cout	<<	qt.getAsString()	<<	std::endl	;
+												if	(	CXXRecordVisitor::isPrivateEmbeddedClass(qt.getAsString())	)	{
+																//std::cout	<<	"		is	private	embedded	class"	<<	std::endl	;
+																return	true	;
+												}	else	{
+																//std::cout	<<	"		is	public	embedded	class"	<<	std::endl	;
+																const	clang::Type	*	t	=	qt.getTypePtrOrNull()	;
+																if	(	t	!=	NULL	)	{
+																				if	(t->getTypeClass()	==	clang::Type::Record	)	{
+																								clang::CXXRecordDecl	*	crd	=	t->getAsCXXRecordDecl()	;
+																								if	(	clang::isa<clang::ClassTemplateSpecializationDecl>(crd)	)	{
+																												return	checkForPrivateTemplateArgs(clang::cast<clang::ClassTemplateSpecializationDecl>(crd))	;
+																								}
+																				}
+																}
+												}
+								}
+				}
+				return	false	;
 }
 
-static bool checkForConstTemplateArgs( clang::ClassTemplateSpecializationDecl * ctsd ) {
-    for (const clang::TemplateArgument& ta : ctsd->getTemplateArgs().asArray()) {
-        if ( ta.getKind() == clang::TemplateArgument::Type ) {
-            clang::QualType qt = ta.getAsType() ;
-            //std::cout << qt.getAsString() << std::endl ;
-            if ( qt.isConstQualified() ) {
-                //std::cout << "  is const qualified" << std::endl ;
-                return true ;
-            } else {
-                //std::cout << "  is public embedded class" << std::endl ;
-                const clang::Type * t = qt.getTypePtrOrNull() ;
-                if ( t != NULL ) {
-                    if (t->getTypeClass() == clang::Type::Record ) {
-                        clang::CXXRecordDecl * crd = t->getAsCXXRecordDecl() ;
-                        if ( clang::isa<clang::ClassTemplateSpecializationDecl>(crd) ) {
-                            return checkForConstTemplateArgs(clang::cast<clang::ClassTemplateSpecializationDecl>(crd)) ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false ;
+static	bool	checkForConstTemplateArgs(	clang::ClassTemplateSpecializationDecl	*	ctsd	)	{
+				for	(const	clang::TemplateArgument&	ta	:	ctsd->getTemplateArgs().asArray())	{
+								if	(	ta.getKind()	==	clang::TemplateArgument::Type	)	{
+												clang::QualType	qt	=	ta.getAsType()	;
+												//std::cout	<<	qt.getAsString()	<<	std::endl	;
+												if	(	qt.isConstQualified()	)	{
+																//std::cout	<<	"		is	const	qualified"	<<	std::endl	;
+																return	true	;
+												}	else	{
+																//std::cout	<<	"		is	public	embedded	class"	<<	std::endl	;
+																const	clang::Type	*	t	=	qt.getTypePtrOrNull()	;
+																if	(	t	!=	NULL	)	{
+																				if	(t->getTypeClass()	==	clang::Type::Record	)	{
+																								clang::CXXRecordDecl	*	crd	=	t->getAsCXXRecordDecl()	;
+																								if	(	clang::isa<clang::ClassTemplateSpecializationDecl>(crd)	)	{
+																												return	checkForConstTemplateArgs(clang::cast<clang::ClassTemplateSpecializationDecl>(crd))	;
+																								}
+																				}
+																}
+												}
+								}
+				}
+				return	false	;
 }
 
-static std::map<std::string, bool> stl_classes = init_stl_classes() ;
-
-bool FieldVisitor::VisitRecordType(clang::RecordType *rt) {
-    if ( debug_level >= 3 ) {
-        std::cout << "FieldVisitor VisitRecordType" << std::endl ;
-        std::cout << rt->getDecl()->getQualifiedNameAsString() << std::endl ;
-        rt->dump() ;
-    }
-    /* String types are typed as records but we treat them differently.
-       The attributes type is set to TRICK_STRING instead of TRICK_STRUCTURE.
-       The type is set to std::string.  We can return false here to stop processing of this type. */
-    std::string type_name = rt->getDecl()->getQualifiedNameAsString() ;
-    if ( ! type_name.compare("std::basic_string") || !type_name.compare("std::__1::basic_string") ||
-         ! type_name.compare("std::__cxx11::basic_string") ) {
-        fdes->setEnumString("TRICK_STRING") ;
-        fdes->setTypeName("std::string") ;
-        return false ;
-    }
-    // FILE * types resolve to these typenames.  We need to ignore them
-    if (!type_name.compare("__sFILE") ||
-        !type_name.compare("_IO_FILE") ||
-        !type_name.compare("__gnu_cxx::__normal_iterator")) {
-        fdes->setIO(0) ;
-        return false ;
-    }
-
-    std::string tst_string = rt->desugar().getAsString() ;
-    // remove class keyword if it exists
-    size_t pos ;
-    while ((pos = tst_string.find("class ")) != std::string::npos ) {
-        tst_string.erase(pos , 6) ;
-    }
-    while ((pos = tst_string.find("struct ")) != std::string::npos ) {
-        tst_string.erase(pos , 7) ;
-    }
-    // clang changes bool to _Bool.  We need to change it back
-    while ((pos = tst_string.find("<_Bool")) != std::string::npos ) {
-        tst_string.replace(pos , 6, "<bool") ;
-    }
-    while ((pos = tst_string.find(" _Bool")) != std::string::npos ) {
-        tst_string.replace(pos , 6, " bool") ;
-    }
-
-    // Test if we have some type from STL.
-    if (!tst_string.compare( 0 , 5 , "std::")) {
-        // If we have some type from std, figure out if it is one we support.
-        for ( std::map<std::string, bool>::iterator it = stl_classes.begin() ; it != stl_classes.end() ; ++it ) {
-            /* Mark STL types that are not strings and exit */
-            if (!tst_string.compare( 0 , (*it).first.size() , (*it).first)) {
-
-                clang::RecordDecl * rd = rt->getDecl()->getDefinition() ;
-                if ( rd != NULL and clang::ClassTemplateSpecializationDecl::classof(rd) ) {
-                    clang::ClassTemplateSpecializationDecl * ctsd ;
-                    ctsd = clang::cast<clang::ClassTemplateSpecializationDecl>(rd) ;
-
-                    // If a private embedded class is in an STL the resulting io_src code will not compile.
-                    // Search the template arguments for private embedded classes, if found remove io capabilites.
-                    if ( checkForPrivateTemplateArgs( ctsd )) {
-                        fdes->setIO(0) ;
-                    }
-
-                    // If the template is using a const type the STL checkpoint code will not compile,
-                    // we need to ignore the variable.
-                    if ( checkForConstTemplateArgs( ctsd )) {
-                        fdes->setIO(0) ;
-                    }
-
-                    fdes->setEnumString("TRICK_STL") ;
-                    fdes->setSTL(true) ;
-                    fdes->setTypeName(tst_string) ;
-                    fdes->setSTLClear((*it).second) ;
-                    // set the type name to the non canonical name, the name the user put in the header file
-                    // The typename is not used by STL variables, and it is nice to see the type that was
-                    // actually inputted by the user
-                    fdes->setMangledTypeName(fdes->getNonCanonicalTypeName()) ;
-                    return false ;
-                }
-            }
-        }
-        // If the record type is in std:: but not one we can process, set the I/O spec to zero and return.
-        fdes->setIO(0) ;
-        return false ;
-    }
-
-    // If the type is a private embedded class there will not be any io_src code for the type.  Don't create attributes
-    if ( CXXRecordVisitor::isPrivateEmbeddedClass(tst_string) ) {
-        //std::cout << "Type is a private embedded class!" << std::endl ;
-        fdes->setIO(0) ;
-        return false ;
-    }
-    /* Template specialization types will be processed here because the canonical type
-       will be typed as a record.  We test if we have a template specialization type.
-       If so process the template type and return */
-    clang::RecordDecl * rd = rt->getDecl()->getDefinition() ;
-    if ( rd != NULL ) {
-        if ( clang::ClassTemplateSpecializationDecl::classof(rd) ) {
-            if ( checkForPrivateTemplateArgs( clang::cast<clang::ClassTemplateSpecializationDecl>(rd)) ) {
-                fdes->setIO(0) ;
-                if ( debug_level >= 3 ) {
-                    std::cout << "    template using private/protected class as argument, not processing" << std::endl ;
-                }
-                return false ;
-            }
-            if ( debug_level >= 3 ) {
-                rd->dump() ;
-                std::cout << "    tst_string = " << tst_string << std::endl ;
-                std::cout << "    is_a_template_specialization" << std::endl ;
-            }
-            return ProcessTemplate(tst_string, clang::cast<clang::CXXRecordDecl>(rd)) ;
-        } else if (tst_string.find(">::") != std::string::npos) {
-            /* Hacky check to see if we are using an embedded class within a template definition.
-              template <class T> class A {
-                public: class B { T t ;} ;
-              };
-
-              class C {
-                public: A<int>::B ab ;    // This is the pattern we are looking for.
-              } ;
-               There must be a better way to determine this condition
-               We need to make attributes for th A<int>::B class.
-             */
-            return ProcessTemplate(tst_string, clang::cast<clang::CXXRecordDecl>(rd)) ;
-        }
-    }
-
-    /* Test to see if we have an embedded anonymous struct/union.  e.g. SB is anonymous below.
-       struct SA {
-          struct {
-             double d ;
-          } SB ;
-       } ;
-    */
-    //std::cout << "hasNameForLinkage " << rt->getDecl()->hasNameForLinkage() << std::endl ;
-    if ( rt->getDecl()->hasNameForLinkage() ) {
-        if ( rt->getDecl()->getDeclName() ) {
-            //std::cout << "getDeclName " << type_name << std::endl ;
-            fdes->setTypeName(type_name) ;
-        } else {
-            //std::cout << "getTypedefNameForAnonDecl " << rt->getDecl()->getTypedefNameForAnonDecl() << std::endl ;
-            fdes->setTypeName(rt->getDecl()->getTypedefNameForAnonDecl()->getQualifiedNameAsString()) ;
-        }
-    } else {
-        // io_src code not possible for anonymous struct/unions.  Set the I/O to 0 to ignore it.
-        if ( debug_level >= 3 ) {
-            std::cout << "FieldVisitor VisitRecordType found anonymous type, setIO = 0" << std::endl ;
-        }
-        fdes->setIO(0) ;
-    }
-
-    fdes->setEnumString("TRICK_STRUCTURED") ;
-    fdes->setRecord(true) ;
-    // We have our type, return false to stop processing this AST branch
-    return false;
+static	std::map<std::string,	bool>	stl_classes	=	init_stl_classes()	;
+
+bool	FieldVisitor::VisitRecordType(clang::RecordType	*rt)	{
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"FieldVisitor	VisitRecordType"	<<	std::endl	;
+								std::cout	<<	rt->getDecl()->getQualifiedNameAsString()	<<	std::endl	;
+								rt->dump()	;
+				}
+				/*	String	types	are	typed	as	records	but	we	treat	them	differently.
+							The	attributes	type	is	set	to	TRICK_STRING	instead	of	TRICK_STRUCTURE.
+							The	type	is	set	to	std::string.		We	can	return	false	here	to	stop	processing	of	this	type.	*/
+				std::string	type_name	=	rt->getDecl()->getQualifiedNameAsString()	;
+				if	(	!	type_name.compare("std::basic_string")	||	!type_name.compare("std::__1::basic_string")	||
+									!	type_name.compare("std::__cxx11::basic_string")	)	{
+								fdes->setEnumString("TRICK_STRING")	;
+								fdes->setTypeName("std::string")	;
+								return	false	;
+				}
+				//	FILE	*	types	resolve	to	these	typenames.		We	need	to	ignore	them
+				if	(!type_name.compare("__sFILE")	||
+								!type_name.compare("_IO_FILE")	||
+								!type_name.compare("__gnu_cxx::__normal_iterator"))	{
+								fdes->setIO(0)	;
+								return	false	;
+				}
+
+				std::string	tst_string	=	rt->desugar().getAsString()	;
+				//	remove	class	keyword	if	it	exists
+				size_t	pos	;
+				while	((pos	=	tst_string.find("class	"))	!=	std::string::npos	)	{
+								tst_string.erase(pos	,	6)	;
+				}
+				while	((pos	=	tst_string.find("struct	"))	!=	std::string::npos	)	{
+								tst_string.erase(pos	,	7)	;
+				}
+				//	clang	changes	bool	to	_Bool.		We	need	to	change	it	back
+				while	((pos	=	tst_string.find("<_Bool"))	!=	std::string::npos	)	{
+								tst_string.replace(pos	,	6,	"<bool")	;
+				}
+				while	((pos	=	tst_string.find("	_Bool"))	!=	std::string::npos	)	{
+								tst_string.replace(pos	,	6,	"	bool")	;
+				}
+
+				//	Test	if	we	have	some	type	from	STL.
+				if	(!tst_string.compare(	0	,	5	,	"std::"))	{
+								//	If	we	have	some	type	from	std,	figure	out	if	it	is	one	we	support.
+								for	(	std::map<std::string,	bool>::iterator	it	=	stl_classes.begin()	;	it	!=	stl_classes.end()	;	++it	)	{
+												/*	Mark	STL	types	that	are	not	strings	and	exit	*/
+												if	(!tst_string.compare(	0	,	(*it).first.size()	,	(*it).first))	{
+
+																clang::RecordDecl	*	rd	=	rt->getDecl()->getDefinition()	;
+																if	(	rd	!=	NULL	and	clang::ClassTemplateSpecializationDecl::classof(rd)	)	{
+																				clang::ClassTemplateSpecializationDecl	*	ctsd	;
+																				ctsd	=	clang::cast<clang::ClassTemplateSpecializationDecl>(rd)	;
+
+																				//	If	a	private	embedded	class	is	in	an	STL	the	resulting	io_src	code	will	not	compile.
+																				//	Search	the	template	arguments	for	private	embedded	classes,	if	found	remove	io	capabilites.
+																				if	(	checkForPrivateTemplateArgs(	ctsd	))	{
+																								fdes->setIO(0)	;
+																				}
+
+																				//	If	the	template	is	using	a	const	type	the	STL	checkpoint	code	will	not	compile,
+																				//	we	need	to	ignore	the	variable.
+																				if	(	checkForConstTemplateArgs(	ctsd	))	{
+																								fdes->setIO(0)	;
+																				}
+
+																				fdes->setEnumString("TRICK_STL")	;
+																				fdes->setSTL(true)	;
+																				fdes->setTypeName(tst_string)	;
+																				fdes->setSTLClear((*it).second)	;
+																				//	set	the	type	name	to	the	non	canonical	name,	the	name	the	user	put	in	the	header	file
+																				//	The	typename	is	not	used	by	STL	variables,	and	it	is	nice	to	see	the	type	that	was
+																				//	actually	inputted	by	the	user
+																				fdes->setMangledTypeName(fdes->getNonCanonicalTypeName())	;
+																				return	false	;
+																}
+												}
+								}
+								//	If	the	record	type	is	in	std::	but	not	one	we	can	process,	set	the	I/O	spec	to	zero	and	return.
+								fdes->setIO(0)	;
+								return	false	;
+				}
+
+				//	If	the	type	is	a	private	embedded	class	there	will	not	be	any	io_src	code	for	the	type.		Don't	create	attributes
+				if	(	CXXRecordVisitor::isPrivateEmbeddedClass(tst_string)	)	{
+								//std::cout	<<	"Type	is	a	private	embedded	class!"	<<	std::endl	;
+								fdes->setIO(0)	;
+								return	false	;
+				}
+				/*	Template	specialization	types	will	be	processed	here	because	the	canonical	type
+							will	be	typed	as	a	record.		We	test	if	we	have	a	template	specialization	type.
+							If	so	process	the	template	type	and	return	*/
+				clang::RecordDecl	*	rd	=	rt->getDecl()->getDefinition()	;
+				if	(	rd	!=	NULL	)	{
+								if	(	clang::ClassTemplateSpecializationDecl::classof(rd)	)	{
+												if	(	checkForPrivateTemplateArgs(	clang::cast<clang::ClassTemplateSpecializationDecl>(rd))	)	{
+																fdes->setIO(0)	;
+																if	(	debug_level	>=	3	)	{
+																				std::cout	<<	"				template	using	private/protected	class	as	argument,	not	processing"	<<	std::endl	;
+																}
+																return	false	;
+												}
+												if	(	debug_level	>=	3	)	{
+																rd->dump()	;
+																std::cout	<<	"				tst_string	=	"	<<	tst_string	<<	std::endl	;
+																std::cout	<<	"				is_a_template_specialization"	<<	std::endl	;
+												}
+												return	ProcessTemplate(tst_string,	clang::cast<clang::CXXRecordDecl>(rd))	;
+								}	else	if	(tst_string.find(">::")	!=	std::string::npos)	{
+												/*	Hacky	check	to	see	if	we	are	using	an	embedded	class	within	a	template	definition.
+														template	<class	T>	class	A	{
+																public:	class	B	{	T	t	;}	;
+														};
+
+														class	C	{
+																public:	A<int>::B	ab	;				//	This	is	the	pattern	we	are	looking	for.
+														}	;
+															There	must	be	a	better	way	to	determine	this	condition
+															We	need	to	make	attributes	for	th	A<int>::B	class.
+													*/
+												return	ProcessTemplate(tst_string,	clang::cast<clang::CXXRecordDecl>(rd))	;
+								}
+				}
+
+				/*	Test	to	see	if	we	have	an	embedded	anonymous	struct/union.		e.g.	SB	is	anonymous	below.
+							struct	SA	{
+										struct	{
+													double	d	;
+										}	SB	;
+							}	;
+				*/
+				//std::cout	<<	"hasNameForLinkage	"	<<	rt->getDecl()->hasNameForLinkage()	<<	std::endl	;
+				if	(	rt->getDecl()->hasNameForLinkage()	)	{
+								if	(	rt->getDecl()->getDeclName()	)	{
+												//std::cout	<<	"getDeclName	"	<<	type_name	<<	std::endl	;
+												fdes->setTypeName(type_name)	;
+								}	else	{
+												//std::cout	<<	"getTypedefNameForAnonDecl	"	<<	rt->getDecl()->getTypedefNameForAnonDecl()	<<	std::endl	;
+												fdes->setTypeName(rt->getDecl()->getTypedefNameForAnonDecl()->getQualifiedNameAsString())	;
+								}
+				}	else	{
+								//	io_src	code	not	possible	for	anonymous	struct/unions.		Set	the	I/O	to	0	to	ignore	it.
+								if	(	debug_level	>=	3	)	{
+												std::cout	<<	"FieldVisitor	VisitRecordType	found	anonymous	type,	setIO	=	0"	<<	std::endl	;
+								}
+								fdes->setIO(0)	;
+				}
+
+				fdes->setEnumString("TRICK_STRUCTURED")	;
+				fdes->setRecord(true)	;
+				//	We	have	our	type,	return	false	to	stop	processing	this	AST	branch
+				return	false;
 }
 
-bool FieldVisitor::VisitVarDecl( clang::VarDecl *v ) {
-
-    fdes->setStatic(v->isStaticDataMember()) ;
-    /* If we have a static const integer type with an initializer value, this variable will
-       not be instantiated by the compiler. The compiler substitutes in the value internally.
-       set the IO to 0 to stop attribute printing */
-    // Note: gcc allows an initializer for floating point types too.
-    if ( v->isStaticDataMember() and
-         v->getType().isConstQualified() and
-         v->hasInit() ) {
-        fdes->setIO(0) ;
-        return false ;
-    } else if ( v->isStaticDataMember() and
-         v->getType().isConstQualified() ) {
-        /* Static const members cannot be set through attributes code. Remove input
-           capabilities by taking current io specification & 1 */
-        fdes->setIO(fdes->getIO() & 1) ;
-    }
-    if ( debug_level >= 3 ) {
-        std::cout << "FieldVisitor VisitVarDecl " << fdes->getName() << std::endl ;
-        std::cout << "    is static = " << fdes->isStatic() << std::endl ;
-        std::cout << "    is const = " << v->getType().isConstQualified() << std::endl ;
-        std::cout << "    has initializer value = " << v->hasInit() << std::endl ;
-        std::cout << "    IO = " << fdes->getIO() << std::endl ;
-        //v->dump() ; std::cout << std::endl ;
-    }
-
-    clang::QualType qt = v->getType() ;
-    // If the current type is not canonical because of typedefs or template parameter substitution,
-    // traverse the canonical type
-    if ( !qt.isCanonical() ) {
-        fdes->setNonCanonicalTypeName(qt.getAsString()) ;
-        clang::QualType ct = qt.getCanonicalType() ;
-        std::string tst_string = ct.getAsString() ;
-        if ( debug_level >= 3 ) {
-            std::cout << "\033[33mFieldVisitor VisitVarDecl: Processing canonical type " << tst_string << "\033[00m" << std::endl ;
-            ct.dump() ;
-        }
-        TraverseType(ct) ;
-        // We have extracted the canonical type and everything else we need
-        // return false so we cut off processing of this AST branch
-        return false ;
-    }
-
-    return true ;
+bool	FieldVisitor::VisitVarDecl(	clang::VarDecl	*v	)	{
+
+				fdes->setStatic(v->isStaticDataMember())	;
+				/*	If	we	have	a	static	const	integer	type	with	an	initializer	value,	this	variable	will
+							not	be	instantiated	by	the	compiler.	The	compiler	substitutes	in	the	value	internally.
+							set	the	IO	to	0	to	stop	attribute	printing	*/
+				//	Note:	gcc	allows	an	initializer	for	floating	point	types	too.
+				if	(	v->isStaticDataMember()	and
+									v->getType().isConstQualified()	and
+									v->hasInit()	)	{
+								fdes->setIO(0)	;
+								return	false	;
+				}	else	if	(	v->isStaticDataMember()	and
+									v->getType().isConstQualified()	)	{
+								/*	Static	const	members	cannot	be	set	through	attributes	code.	Remove	input
+											capabilities	by	taking	current	io	specification	&	1	*/
+								fdes->setIO(fdes->getIO()	&	1)	;
+				}
+				if	(	debug_level	>=	3	)	{
+								std::cout	<<	"FieldVisitor	VisitVarDecl	"	<<	fdes->getName()	<<	std::endl	;
+								std::cout	<<	"				is	static	=	"	<<	fdes->isStatic()	<<	std::endl	;
+								std::cout	<<	"				is	const	=	"	<<	v->getType().isConstQualified()	<<	std::endl	;
+								std::cout	<<	"				has	initializer	value	=	"	<<	v->hasInit()	<<	std::endl	;
+								std::cout	<<	"				IO	=	"	<<	fdes->getIO()	<<	std::endl	;
+								//v->dump()	;	std::cout	<<	std::endl	;
+				}
+
+				clang::QualType	qt	=	v->getType()	;
+				//	If	the	current	type	is	not	canonical	because	of	typedefs	or	template	parameter	substitution,
+				//	traverse	the	canonical	type
+				if	(	!qt.isCanonical()	)	{
+								fdes->setNonCanonicalTypeName(qt.getAsString())	;
+								clang::QualType	ct	=	qt.getCanonicalType()	;
+								std::string	tst_string	=	ct.getAsString()	;
+								if	(	debug_level	>=	3	)	{
+												std::cout	<<	"\033[33mFieldVisitor	VisitVarDecl:	Processing	canonical	type	"	<<	tst_string	<<	"\033[00m"	<<	std::endl	;
+												ct.dump()	;
+								}
+								TraverseType(ct)	;
+								//	We	have	extracted	the	canonical	type	and	everything	else	we	need
+								//	return	false	so	we	cut	off	processing	of	this	AST	branch
+								return	false	;
+				}
+
+				return	true	;
 }
 
-FieldDescription * FieldVisitor::get_field_data() {
-    return fdes ;
+FieldDescription	*	FieldVisitor::get_field_data()	{
+				return	fdes	;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/FindTrickICG.cpp b/trick_source/codegen/Interface_Code_Gen/FindTrickICG.cpp
index 9501b1fc9..f702df119 100644
--- a/trick_source/codegen/Interface_Code_Gen/FindTrickICG.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/FindTrickICG.cpp
@@ -1,171 +1,171 @@
 
-#include <iostream>
-#include "clang/Lex/Token.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "FindTrickICG.hh"
-#include "Utilities.hh"
+#include	<iostream>
+#include	"clang/Lex/Token.h"
+#include	"clang/Basic/IdentifierTable.h"
+#include	"FindTrickICG.hh"
+#include	"Utilities.hh"
 
-FindTrickICG::FindTrickICG(clang::CompilerInstance & in_ci, HeaderSearchDirs & in_hsd , bool in_print_msgs )
- : ci(in_ci) , hsd(in_hsd) , print_msgs(in_print_msgs) , header_printed(false) { }
+FindTrickICG::FindTrickICG(clang::CompilerInstance	&	in_ci,	HeaderSearchDirs	&	in_hsd	,	bool	in_print_msgs	)
+	:	ci(in_ci)	,	hsd(in_hsd)	,	print_msgs(in_print_msgs)	,	header_printed(false)	{	}
 
-void FindTrickICG::FileChanged(clang::SourceLocation Loc, FileChangeReason Reason,
-                         clang::SrcMgr::CharacteristicKind FileType,
-                         clang::FileID PrevFID ) {
-    /*
-       We are interested when the file changes, specifically when we enter and exit a file.
-       We are maintaining a stack of file names.  When a file is entered the name is
-       pushed to the stack.  When a file is exited, we pop a name from the stack.
-    */
-    if ( Loc.isValid() and Loc.isFileID() ) {
-        clang::PresumedLoc PLoc = ci.getSourceManager().getPresumedLoc(Loc) ;
-        std::string loc_str ;
-        if ( ! PLoc.isInvalid()) {
-            loc_str = PLoc.getFilename() ;
-            switch (Reason) {
-                case EnterFile :
-                    included_files.push_back(loc_str) ;
-                    break ;
-                case ExitFile :
-                    included_files.pop_back() ;
-                    break ;
-                default:
-                    break ;
-            }
-        }
-    }
+void	FindTrickICG::FileChanged(clang::SourceLocation	Loc,	FileChangeReason	Reason,
+																									clang::SrcMgr::CharacteristicKind	FileType,
+																									clang::FileID	PrevFID	)	{
+				/*
+							We	are	interested	when	the	file	changes,	specifically	when	we	enter	and	exit	a	file.
+							We	are	maintaining	a	stack	of	file	names.		When	a	file	is	entered	the	name	is
+							pushed	to	the	stack.		When	a	file	is	exited,	we	pop	a	name	from	the	stack.
+				*/
+				if	(	Loc.isValid()	and	Loc.isFileID()	)	{
+								clang::PresumedLoc	PLoc	=	ci.getSourceManager().getPresumedLoc(Loc)	;
+								std::string	loc_str	;
+								if	(	!	PLoc.isInvalid())	{
+												loc_str	=	PLoc.getFilename()	;
+												switch	(Reason)	{
+																case	EnterFile	:
+																				included_files.push_back(loc_str)	;
+																				break	;
+																case	ExitFile	:
+																				included_files.pop_back()	;
+																				break	;
+																default:
+																				break	;
+												}
+								}
+				}
 }
 
-#if (LIBCLANG_MAJOR < 10) // TODO delete when RHEL 7 no longer supported
-void FindTrickICG::FileSkipped(const clang::FileEntry &SkippedFile,
-                           const clang::Token &FilenameTok,
-                           clang::SrcMgr::CharacteristicKind FileType) {
-    std::string file_name = SkippedFile.getName() ;
+#if	(LIBCLANG_MAJOR	<	10)	//	TODO	delete	when	RHEL	7	no	longer	supported
+void	FindTrickICG::FileSkipped(const	clang::FileEntry	&SkippedFile,
+																											const	clang::Token	&FilenameTok,
+																											clang::SrcMgr::CharacteristicKind	FileType)	{
+				std::string	file_name	=	SkippedFile.getName()	;
 #else
-void FindTrickICG::FileSkipped(const clang::FileEntryRef & SkippedFile, const clang::Token & FilenameTok,
-                        clang::SrcMgr::CharacteristicKind FileType) {
-    /* Files that have header guards are only preprocessed once because of an optimization.
-    We still need to add its include chain to compat15 if TRICK_ICG was found when it was
-    originally preprocessed */
-    std::string file_name = SkippedFile.getName().str() ;
+void	FindTrickICG::FileSkipped(const	clang::FileEntryRef	&	SkippedFile,	const	clang::Token	&	FilenameTok,
+																								clang::SrcMgr::CharacteristicKind	FileType)	{
+				/*	Files	that	have	header	guards	are	only	preprocessed	once	because	of	an	optimization.
+				We	still	need	to	add	its	include	chain	to	compat15	if	TRICK_ICG	was	found	when	it	was
+				originally	preprocessed	*/
+				std::string	file_name	=	SkippedFile.getName().str()	;
 #endif
-    std::string file_path;
-    {
-        char* path_cstr = almostRealPath(file_name.c_str());
-        if(path_cstr != NULL) {
-            file_path = std::string(path_cstr);
-            free(path_cstr);
-        }
-    }
+				std::string	file_path;
+				{
+								char*	path_cstr	=	almostRealPath(file_name.c_str());
+								if(path_cstr	!=	NULL)	{
+												file_path	=	std::string(path_cstr);
+												free(path_cstr);
+								}
+				}
 
-    // Check if skipped header is in Compat15
-    if(hsd.isPathInCompat15(file_path)) {
-        // for each header in the stack, mark them as being exposed to TRICK_ICG
-        for (std::string& file : included_files) {
-            hsd.addTrickICGFoundFile(file);
-        }
-    }
+				//	Check	if	skipped	header	is	in	Compat15
+				if(hsd.isPathInCompat15(file_path))	{
+								//	for	each	header	in	the	stack,	mark	them	as	being	exposed	to	TRICK_ICG
+								for	(std::string&	file	:	included_files)	{
+												hsd.addTrickICGFoundFile(file);
+								}
+				}
 }
 
 
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 5))
-void FindTrickICG::If(clang::SourceLocation Loc, clang::SourceRange ConditionRange, clang::PPCallbacks::ConditionValueKind ConditionValue)
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	5))
+void	FindTrickICG::If(clang::SourceLocation	Loc,	clang::SourceRange	ConditionRange,	clang::PPCallbacks::ConditionValueKind	ConditionValue)
 #else
-void FindTrickICG::If(clang::SourceLocation Loc, clang::SourceRange ConditionRange, bool ConditionValue)
+void	FindTrickICG::If(clang::SourceLocation	Loc,	clang::SourceRange	ConditionRange,	bool	ConditionValue)
 #endif
 {
-    if ( ConditionRange.isValid() ) {
-        // Get the full text of the if statement into a string
-        llvm::StringRef ref = clang::Lexer::getSourceText(clang::CharSourceRange::getCharRange(ConditionRange), ci.getSourceManager(), clang::LangOptions());
-        // if the if statement contains TRICK_ICG we need to mark it.
-        if ( ref.str().find("TRICK_ICG") != std::string::npos ) {
-            // for each header in the stack, mark them as being exposed to TRICK_ICG
-            std::vector<std::string>::iterator it ;
-            for ( it = included_files.begin() ; it != included_files.end() ; ++it ) {
-                hsd.addTrickICGFoundFile(*it) ;
-            }
-            // print warning messages.
-            if ( print_msgs ) {
-                print_header() ;
-                std::string loc_str = Loc.printToString(ci.getSourceManager()) ;
-                char * rpath = almostRealPath(loc_str.c_str()) ;
-                if ( rpath ) {
-                     std::cout << color(WARNING,
-                      std::string("Warning: TRICK_ICG used in preprocessor conditional ") + rpath) << std::endl ;
-                } else {
-                     std::cout << color(WARNING,
-                      std::string("Warning: TRICK_ICG used in preprocessor conditional ") + loc_str) << std::endl ;
-                }
-            }
-        }
-    }
+				if	(	ConditionRange.isValid()	)	{
+								//	Get	the	full	text	of	the	if	statement	into	a	string
+								llvm::StringRef	ref	=	clang::Lexer::getSourceText(clang::CharSourceRange::getCharRange(ConditionRange),	ci.getSourceManager(),	clang::LangOptions());
+								//	if	the	if	statement	contains	TRICK_ICG	we	need	to	mark	it.
+								if	(	ref.str().find("TRICK_ICG")	!=	std::string::npos	)	{
+												//	for	each	header	in	the	stack,	mark	them	as	being	exposed	to	TRICK_ICG
+												std::vector<std::string>::iterator	it	;
+												for	(	it	=	included_files.begin()	;	it	!=	included_files.end()	;	++it	)	{
+																hsd.addTrickICGFoundFile(*it)	;
+												}
+												//	print	warning	messages.
+												if	(	print_msgs	)	{
+																print_header()	;
+																std::string	loc_str	=	Loc.printToString(ci.getSourceManager())	;
+																char	*	rpath	=	almostRealPath(loc_str.c_str())	;
+																if	(	rpath	)	{
+																					std::cout	<<	color(WARNING,
+																						std::string("Warning:	TRICK_ICG	used	in	preprocessor	conditional	")	+	rpath)	<<	std::endl	;
+																}	else	{
+																					std::cout	<<	color(WARNING,
+																						std::string("Warning:	TRICK_ICG	used	in	preprocessor	conditional	")	+	loc_str)	<<	std::endl	;
+																}
+												}
+								}
+				}
 }
 
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 5))
-void FindTrickICG::ElIf(clang::SourceLocation Loc, clang::SourceRange ConditionRange, clang::PPCallbacks::ConditionValueKind ConditionValue)
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	5))
+void	FindTrickICG::ElIf(clang::SourceLocation	Loc,	clang::SourceRange	ConditionRange,	clang::PPCallbacks::ConditionValueKind	ConditionValue)
 #else
-void FindTrickICG::ElIf(clang::SourceLocation Loc, clang::SourceRange ConditionRange, bool ConditionValue)
+void	FindTrickICG::ElIf(clang::SourceLocation	Loc,	clang::SourceRange	ConditionRange,	bool	ConditionValue)
 #endif
 {
-    // Do the same processing for an #elif statement as an #if statement.
-    If(Loc,ConditionRange,ConditionValue) ;
+				//	Do	the	same	processing	for	an	#elif	statement	as	an	#if	statement.
+				If(Loc,ConditionRange,ConditionValue)	;
 }
 
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 7))
-void FindTrickICG::Ifdef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, const clang::MacroDefinition &MD)
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	7))
+void	FindTrickICG::Ifdef(clang::SourceLocation	Loc,	const	clang::Token	&MacroNameTok,	const	clang::MacroDefinition	&MD)
 #else
-void FindTrickICG::Ifdef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, const clang::MacroDirective *MD)
+void	FindTrickICG::Ifdef(clang::SourceLocation	Loc,	const	clang::Token	&MacroNameTok,	const	clang::MacroDirective	*MD)
 #endif
 {
-    // Get the token name that is being tested.
-    std::string name = MacroNameTok.getIdentifierInfo()->getName().str() ;
-    if ( ! name.compare("TRICK_ICG") ) {
-        std::string loc_str = Loc.printToString(ci.getSourceManager()) ;
-        // There is a singular ifdef TRICK_ICG in S_source.hh we need to ignore.
-        if ( (loc_str.find("S_source.hh") == std::string::npos) ) {
-            // for each header in the stack, mark them as being exposed to TRICK_ICG
-            std::vector<std::string>::iterator it ;
-            for ( it = included_files.begin() ; it != included_files.end() ; ++it ) {
-                hsd.addTrickICGFoundFile(*it) ;
-            }
-            // print warning messages.
-            if ( print_msgs ) {
-                print_header() ;
-                std::cout << color(WARNING,std::string("Warning: ifdef TRICK_ICG found ") + loc_str) << std::endl ;
-            }
-        }
-    }
+				//	Get	the	token	name	that	is	being	tested.
+				std::string	name	=	MacroNameTok.getIdentifierInfo()->getName().str()	;
+				if	(	!	name.compare("TRICK_ICG")	)	{
+								std::string	loc_str	=	Loc.printToString(ci.getSourceManager())	;
+								//	There	is	a	singular	ifdef	TRICK_ICG	in	S_source.hh	we	need	to	ignore.
+								if	(	(loc_str.find("S_source.hh")	==	std::string::npos)	)	{
+												//	for	each	header	in	the	stack,	mark	them	as	being	exposed	to	TRICK_ICG
+												std::vector<std::string>::iterator	it	;
+												for	(	it	=	included_files.begin()	;	it	!=	included_files.end()	;	++it	)	{
+																hsd.addTrickICGFoundFile(*it)	;
+												}
+												//	print	warning	messages.
+												if	(	print_msgs	)	{
+																print_header()	;
+																std::cout	<<	color(WARNING,std::string("Warning:	ifdef	TRICK_ICG	found	")	+	loc_str)	<<	std::endl	;
+												}
+								}
+				}
 
 }
 
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 7))
-void FindTrickICG::Ifndef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, const clang::MacroDefinition &MD)
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	7))
+void	FindTrickICG::Ifndef(clang::SourceLocation	Loc,	const	clang::Token	&MacroNameTok,	const	clang::MacroDefinition	&MD)
 #else
-void FindTrickICG::Ifndef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, const clang::MacroDirective *MD)
+void	FindTrickICG::Ifndef(clang::SourceLocation	Loc,	const	clang::Token	&MacroNameTok,	const	clang::MacroDirective	*MD)
 #endif
 {
-    // Get the token name that is being tested.
-    std::string name = MacroNameTok.getIdentifierInfo()->getName().str() ;
-    if ( ! name.compare("TRICK_ICG") ) {
-        std::string loc_str = Loc.printToString(ci.getSourceManager()) ;
-        // for each header in the stack, mark them as being exposed to TRICK_ICG
-        std::vector<std::string>::iterator it ;
-        for ( it = included_files.begin() ; it != included_files.end() ; ++it ) {
-            hsd.addTrickICGFoundFile(*it) ;
-        }
-        // print warning messages.
-        if ( print_msgs ) {
-            print_header() ;
-            std::cout << color(WARNING, std::string("Warning: ifndef TRICK_ICG found ") + loc_str) << std::endl ;
-        }
-    }
+				//	Get	the	token	name	that	is	being	tested.
+				std::string	name	=	MacroNameTok.getIdentifierInfo()->getName().str()	;
+				if	(	!	name.compare("TRICK_ICG")	)	{
+								std::string	loc_str	=	Loc.printToString(ci.getSourceManager())	;
+								//	for	each	header	in	the	stack,	mark	them	as	being	exposed	to	TRICK_ICG
+								std::vector<std::string>::iterator	it	;
+								for	(	it	=	included_files.begin()	;	it	!=	included_files.end()	;	++it	)	{
+												hsd.addTrickICGFoundFile(*it)	;
+								}
+								//	print	warning	messages.
+								if	(	print_msgs	)	{
+												print_header()	;
+												std::cout	<<	color(WARNING,	std::string("Warning:	ifndef	TRICK_ICG	found	")	+	loc_str)	<<	std::endl	;
+								}
+				}
 }
 
-void FindTrickICG::print_header() {
-    // Print the warning message once.
-    if ( ! header_printed ) {
-        std::cout << color(WARNING, std::string(
-         "Warning: TRICK_ICG found in one or more header files.  The use of TRICK_ICG precludes the use of\n"
-         "some C++ class/structures in these headers.  Consider removing the TRICK_ICG preprocessor conditionals\n")) ;
-        header_printed = true ;
-    }
+void	FindTrickICG::print_header()	{
+				//	Print	the	warning	message	once.
+				if	(	!	header_printed	)	{
+								std::cout	<<	color(WARNING,	std::string(
+									"Warning:	TRICK_ICG	found	in	one	or	more	header	files.		The	use	of	TRICK_ICG	precludes	the	use	of\n"
+									"some	C++	class/structures	in	these	headers.		Consider	removing	the	TRICK_ICG	preprocessor	conditionals\n"))	;
+								header_printed	=	true	;
+				}
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
index 347c277e1..658539eda 100644
--- a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
@@ -1,407 +1,407 @@
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <libgen.h>
-
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Frontend/Utils.h"
-
-#include "HeaderSearchDirs.hh"
-#include "Utilities.hh"
-
-HeaderSearchDirs::HeaderSearchDirs(clang::HeaderSearch & in_hs ,
- clang::HeaderSearchOptions & in_hso ,
- clang::Preprocessor & in_pp ,
- bool in_sim_services ) :
-  hs(in_hs) ,
-  hso(in_hso) ,
-  pp(in_pp) ,
-  sim_services(in_sim_services) {} ;
-
-void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () {
-
-    FILE * fp ;
-    char * lineptr = NULL ;
-    char line[1024] ;
-    size_t n = 0 ;
-    ssize_t num_read ;
-    const bool IsUserSupplied = false;
-    const bool IsFramework = false;
-    const bool IsSysRootRelative = true;
-
-    // Add clang specific include directory first.  Only required on linux systems. :(
-    // This is so that ICG will find clang friendly headers first.  gcc headers cause
-    // all kinds of problems.  On macs all headers are clang friendly.
-#if __linux
-    std::stringstream icg_dir ;
-    icg_dir << LLVM_HOME << "/lib/clang/" ;
-    icg_dir << LIBCLANG_MAJOR << "." << LIBCLANG_MINOR ;
-#ifdef LIBCLANG_PATCHLEVEL
-    icg_dir << "." << LIBCLANG_PATCHLEVEL ;
+#include	<iostream>
+#include	<sstream>
+#include	<fstream>
+#include	<stdio.h>
+#include	<errno.h>
+#include	<limits.h>
+#include	<stdlib.h>
+#include	<libgen.h>
+
+#include	"clang/Basic/TargetInfo.h"
+#include	"clang/Frontend/Utils.h"
+
+#include	"HeaderSearchDirs.hh"
+#include	"Utilities.hh"
+
+HeaderSearchDirs::HeaderSearchDirs(clang::HeaderSearch	&	in_hs	,
+	clang::HeaderSearchOptions	&	in_hso	,
+	clang::Preprocessor	&	in_pp	,
+	bool	in_sim_services	)	:
+		hs(in_hs)	,
+		hso(in_hso)	,
+		pp(in_pp)	,
+		sim_services(in_sim_services)	{}	;
+
+void	HeaderSearchDirs::AddCompilerBuiltInSearchDirs	()	{
+
+				FILE	*	fp	;
+				char	*	lineptr	=	NULL	;
+				char	line[1024]	;
+				size_t	n	=	0	;
+				ssize_t	num_read	;
+				const	bool	IsUserSupplied	=	false;
+				const	bool	IsFramework	=	false;
+				const	bool	IsSysRootRelative	=	true;
+
+				//	Add	clang	specific	include	directory	first.		Only	required	on	linux	systems.	:(
+				//	This	is	so	that	ICG	will	find	clang	friendly	headers	first.		gcc	headers	cause
+				//	all	kinds	of	problems.		On	macs	all	headers	are	clang	friendly.
+#if	__linux
+				std::stringstream	icg_dir	;
+				icg_dir	<<	LLVM_HOME	<<	"/lib/clang/"	;
+				icg_dir	<<	LIBCLANG_MAJOR	<<	"."	<<	LIBCLANG_MINOR	;
+#ifdef	LIBCLANG_PATCHLEVEL
+				icg_dir	<<	"."	<<	LIBCLANG_PATCHLEVEL	;
 #endif
-    icg_dir << "/include" ;
-    char * resolved_path = realpath(icg_dir.str().c_str(), NULL ) ;
-    if ( resolved_path != NULL ) {
-        hso.AddPath(resolved_path , clang::frontend::System, IsFramework, IsSysRootRelative);
-    }
+				icg_dir	<<	"/include"	;
+				char	*	resolved_path	=	realpath(icg_dir.str().c_str(),	NULL	)	;
+				if	(	resolved_path	!=	NULL	)	{
+								hso.AddPath(resolved_path	,	clang::frontend::System,	IsFramework,	IsSysRootRelative);
+				}
 #endif
 
-    fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CXX" , "r") ;
-    fgets(line , sizeof(line) , fp) ;
-    pclose(fp) ;
-    std::string trick_cppc = std::string(line) ;
-    std::string command ;
-    trick_cppc.erase(trick_cppc.find_last_not_of(" \n\r\t")+1) ;
-    //std::cout << "TRICK_CXX = " << trick_cppc << std::endl ;
-    command = std::string("echo | ") + trick_cppc + std::string(" -v -xc++ -E - 2>&1") ;
-    //std::cout << "command = " << command << std::endl ;
-
-    fp = popen(command.c_str() , "r") ;
-    bool dir_line = false ;
-
-    while (fgets( line , sizeof(line) , fp ) != NULL ) {
-        if ( !strncmp( line, "End of search list.", 19 )) {
-            break ;
-        } else if ( dir_line == true ) {
-            //std::cout << "lineptr = " << lineptr << std::endl ;
-            char * resolved_path = NULL ;
-            std::string dir = std::string(line) ;
-            dir.erase(dir.find_last_not_of(" \n\r\t\f\v") + 1) ;
-            dir.erase(0, dir.find_first_not_of(" ")) ;
-            if ( (n = dir.find(" (framework")) != std::string::npos ) {
-                dir.erase(n) ;
-            }
-            resolved_path = almostRealPath(dir.c_str()) ;
-            //std::cout << "dir = " << dir << std::endl ;
-            if ( resolved_path != NULL ) {
-                //std::cout << "gcc resolved_path = " << resolved_path << std::endl ;
-                hso.AddPath(resolved_path , clang::frontend::System, IsFramework, IsSysRootRelative);
-                free(resolved_path) ;
-            }
-        } else if ( !strncmp( line, "#include <...>", 14 )) {
-            dir_line = true ;
-        }
-    }
-    pclose(fp) ;
-
-    // Homebrew on Macs puts everything in /usr/local/Cellar.
-    hso.AddPath("/usr/local/Cellar" , clang::frontend::System, IsFramework, IsSysRootRelative);
-
-    // Fink on Macs puts everything in /sw.
-    hso.AddPath("/sw" , clang::frontend::System, IsFramework, IsSysRootRelative);
+				fp	=	popen("${TRICK_HOME}/bin/trick-gte	TRICK_CXX"	,	"r")	;
+				fgets(line	,	sizeof(line)	,	fp)	;
+				pclose(fp)	;
+				std::string	trick_cppc	=	std::string(line)	;
+				std::string	command	;
+				trick_cppc.erase(trick_cppc.find_last_not_of("	\n\r\t")+1)	;
+				//std::cout	<<	"TRICK_CXX	=	"	<<	trick_cppc	<<	std::endl	;
+				command	=	std::string("echo	|	")	+	trick_cppc	+	std::string("	-v	-xc++	-E	-	2>&1")	;
+				//std::cout	<<	"command	=	"	<<	command	<<	std::endl	;
+
+				fp	=	popen(command.c_str()	,	"r")	;
+				bool	dir_line	=	false	;
+
+				while	(fgets(	line	,	sizeof(line)	,	fp	)	!=	NULL	)	{
+								if	(	!strncmp(	line,	"End	of	search	list.",	19	))	{
+												break	;
+								}	else	if	(	dir_line	==	true	)	{
+												//std::cout	<<	"lineptr	=	"	<<	lineptr	<<	std::endl	;
+												char	*	resolved_path	=	NULL	;
+												std::string	dir	=	std::string(line)	;
+												dir.erase(dir.find_last_not_of("	\n\r\t\f\v")	+	1)	;
+												dir.erase(0,	dir.find_first_not_of("	"))	;
+												if	(	(n	=	dir.find("	(framework"))	!=	std::string::npos	)	{
+																dir.erase(n)	;
+												}
+												resolved_path	=	almostRealPath(dir.c_str())	;
+												//std::cout	<<	"dir	=	"	<<	dir	<<	std::endl	;
+												if	(	resolved_path	!=	NULL	)	{
+																//std::cout	<<	"gcc	resolved_path	=	"	<<	resolved_path	<<	std::endl	;
+																hso.AddPath(resolved_path	,	clang::frontend::System,	IsFramework,	IsSysRootRelative);
+																free(resolved_path)	;
+												}
+								}	else	if	(	!strncmp(	line,	"#include	<...>",	14	))	{
+												dir_line	=	true	;
+								}
+				}
+				pclose(fp)	;
+
+				//	Homebrew	on	Macs	puts	everything	in	/usr/local/Cellar.
+				hso.AddPath("/usr/local/Cellar"	,	clang::frontend::System,	IsFramework,	IsSysRootRelative);
+
+				//	Fink	on	Macs	puts	everything	in	/sw.
+				hso.AddPath("/sw"	,	clang::frontend::System,	IsFramework,	IsSysRootRelative);
 
 }
 
-void HeaderSearchDirs::AddUserSearchDirs ( std::vector<std::string> & include_dirs ) {
-    //std::cout << "num include dirs " << include_dirs.size() << std::endl ;
-    int ii ;
-
-    for  ( ii = 0 ; ii < include_dirs.size() ; ii++ ) {
-        //std::cout << "include dirs " << include_dirs[ii] << std::endl ;
-        char * resolved_path = almostRealPath(include_dirs[ii].c_str()) ;
-        if ( resolved_path != NULL ) {
-            //std::cout << "adding resolved_path = " << resolved_path << std::endl ;
-            hso.AddPath(resolved_path , clang::frontend::Angled, false, true);
-        }
-    }
+void	HeaderSearchDirs::AddUserSearchDirs	(	std::vector<std::string>	&	include_dirs	)	{
+				//std::cout	<<	"num	include	dirs	"	<<	include_dirs.size()	<<	std::endl	;
+				int	ii	;
+
+				for		(	ii	=	0	;	ii	<	include_dirs.size()	;	ii++	)	{
+								//std::cout	<<	"include	dirs	"	<<	include_dirs[ii]	<<	std::endl	;
+								char	*	resolved_path	=	almostRealPath(include_dirs[ii].c_str())	;
+								if	(	resolved_path	!=	NULL	)	{
+												//std::cout	<<	"adding	resolved_path	=	"	<<	resolved_path	<<	std::endl	;
+												hso.AddPath(resolved_path	,	clang::frontend::Angled,	false,	true);
+								}
+				}
 }
 
-void HeaderSearchDirs::AddSystemSearchDirs ( std::vector<std::string> & isystem_dirs ) {
-    //std::cout << "num isystem dirs " << isystem_dirs.size() << std::endl ;
-    int ii ;
-
-    for  ( ii = 0 ; ii < isystem_dirs.size() ; ii++ ) {
-        //std::cout << "isystem dirs " << isystem_dirs[ii] << std::endl ;
-        char * resolved_path = almostRealPath(isystem_dirs[ii].c_str()) ;
-        if ( resolved_path != NULL ) {
-            //std::cout << "adding resolved_path = " << resolved_path << std::endl ;
-            hso.AddPath(resolved_path , clang::frontend::System, false, true);
-        }
-    }
+void	HeaderSearchDirs::AddSystemSearchDirs	(	std::vector<std::string>	&	isystem_dirs	)	{
+				//std::cout	<<	"num	isystem	dirs	"	<<	isystem_dirs.size()	<<	std::endl	;
+				int	ii	;
+
+				for		(	ii	=	0	;	ii	<	isystem_dirs.size()	;	ii++	)	{
+								//std::cout	<<	"isystem	dirs	"	<<	isystem_dirs[ii]	<<	std::endl	;
+								char	*	resolved_path	=	almostRealPath(isystem_dirs[ii].c_str())	;
+								if	(	resolved_path	!=	NULL	)	{
+												//std::cout	<<	"adding	resolved_path	=	"	<<	resolved_path	<<	std::endl	;
+												hso.AddPath(resolved_path	,	clang::frontend::System,	false,	true);
+								}
+				}
 }
 
-void HeaderSearchDirs::AddTrickSearchDirs () {
-    char * trick_home = getenv("TRICK_HOME") ;
-
-    if ( trick_home != NULL ) {
-        std::string temp_dir = std::string(trick_home) + "/include/trick" ;
-        char * resolved_path = almostRealPath(temp_dir.c_str() ) ;
-        hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
-        //trick_include_dir = std::string(resolved_path) ;
-        free(resolved_path) ;
-
-        temp_dir = std::string(trick_home) + "/include/er7_utils" ;
-        resolved_path = almostRealPath(temp_dir.c_str() ) ;
-        hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
-        free(resolved_path) ;
-
-        temp_dir = std::string(trick_home) + "/trick_source" ;
-        resolved_path = almostRealPath(temp_dir.c_str() ) ;
-        hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
-        trick_source_dir = std::string(resolved_path) ;
-        free(resolved_path) ;
-
-        temp_dir = std::string(trick_home) + "/include" ;
-        resolved_path = almostRealPath(temp_dir.c_str() ) ;
-        trick_include_dir = std::string(resolved_path) ;
-    }
+void	HeaderSearchDirs::AddTrickSearchDirs	()	{
+				char	*	trick_home	=	getenv("TRICK_HOME")	;
+
+				if	(	trick_home	!=	NULL	)	{
+								std::string	temp_dir	=	std::string(trick_home)	+	"/include/trick"	;
+								char	*	resolved_path	=	almostRealPath(temp_dir.c_str()	)	;
+								hso.AddPath(resolved_path	,	clang::frontend::Quoted,	false,	true);
+								//trick_include_dir	=	std::string(resolved_path)	;
+								free(resolved_path)	;
+
+								temp_dir	=	std::string(trick_home)	+	"/include/er7_utils"	;
+								resolved_path	=	almostRealPath(temp_dir.c_str()	)	;
+								hso.AddPath(resolved_path	,	clang::frontend::Quoted,	false,	true);
+								free(resolved_path)	;
+
+								temp_dir	=	std::string(trick_home)	+	"/trick_source"	;
+								resolved_path	=	almostRealPath(temp_dir.c_str()	)	;
+								hso.AddPath(resolved_path	,	clang::frontend::Quoted,	false,	true);
+								trick_source_dir	=	std::string(resolved_path)	;
+								free(resolved_path)	;
+
+								temp_dir	=	std::string(trick_home)	+	"/include"	;
+								resolved_path	=	almostRealPath(temp_dir.c_str()	)	;
+								trick_include_dir	=	std::string(resolved_path)	;
+				}
 }
 
-void HeaderSearchDirs::AddDirsAndFiles(std::string env_var, std::vector<std::string> & var_list) {
-
-    char * env_var_contents = getenv(env_var.c_str()) ;
-
-    if( env_var_contents != NULL ) {
-        std::string s = std::string(env_var_contents) ;
-        std::stringstream ss(s);
-        std::string item;
-        while(std::getline(ss, item, ':')) {
-            item = trim(item) ;
-            if ( ! item.empty() ) {
-                char * resolved_path = realpath(item.c_str(), NULL) ;
-                if ( resolved_path ) {
-                    std::ifstream file_or_dir(resolved_path) ;
-                    file_or_dir.seekg(0, std::ios::end) ;
-                    if ( !file_or_dir.good()) {
-                        var_list.push_back(std::string(resolved_path) + "/");
-                    } else {
-                        var_list.push_back(std::string(resolved_path));
-                    }
-                    free(resolved_path);
-                } else {
-                    std::cout << bold(color(WARNING, "Warning")) << "    Cannot find " <<
-                     env_var << " path " << quote(bold(item)) << std::endl ;
-                }
-            }
-        }
-    }
+void	HeaderSearchDirs::AddDirsAndFiles(std::string	env_var,	std::vector<std::string>	&	var_list)	{
+
+				char	*	env_var_contents	=	getenv(env_var.c_str())	;
+
+				if(	env_var_contents	!=	NULL	)	{
+								std::string	s	=	std::string(env_var_contents)	;
+								std::stringstream	ss(s);
+								std::string	item;
+								while(std::getline(ss,	item,	':'))	{
+												item	=	trim(item)	;
+												if	(	!	item.empty()	)	{
+																char	*	resolved_path	=	realpath(item.c_str(),	NULL)	;
+																if	(	resolved_path	)	{
+																				std::ifstream	file_or_dir(resolved_path)	;
+																				file_or_dir.seekg(0,	std::ios::end)	;
+																				if	(	!file_or_dir.good())	{
+																								var_list.push_back(std::string(resolved_path)	+	"/");
+																				}	else	{
+																								var_list.push_back(std::string(resolved_path));
+																				}
+																				free(resolved_path);
+																}	else	{
+																				std::cout	<<	bold(color(WARNING,	"Warning"))	<<	"				Cannot	find	"	<<
+																					env_var	<<	"	path	"	<<	quote(bold(item))	<<	std::endl	;
+																}
+												}
+								}
+				}
 }
 
-void HeaderSearchDirs::ApplyHeaderSearchOptions () {
+void	HeaderSearchDirs::ApplyHeaderSearchOptions	()	{
 
-    clang::ApplyHeaderSearchOptions( hs , hso , pp.getLangOpts() , pp.getTargetInfo().getTriple() ) ;
-    //clang::HeaderSearch::search_dir_iterator sdi ;
+				clang::ApplyHeaderSearchOptions(	hs	,	hso	,	pp.getLangOpts()	,	pp.getTargetInfo().getTriple()	)	;
+				//clang::HeaderSearch::search_dir_iterator	sdi	;
 /*
-    for ( sdi = hs.quoted_dir_begin() ; sdi != hs.quoted_dir_end() ; ++sdi ) {
-       std::cout << "quoted dir " << (*sdi).getName() << std::endl ;
-    }
-    for ( sdi = hs.angled_dir_begin() ; sdi != hs.angled_dir_end() ; ++sdi ) {
-       std::cout << "angled dir " << (*sdi).getName() << std::endl ;
-    }
-    for ( sdi = hs.system_dir_begin() ; sdi != hs.system_dir_end() ; ++sdi ) {
-       std::cout << "system dir " << (*sdi).getName() << std::endl ;
-    }
+				for	(	sdi	=	hs.quoted_dir_begin()	;	sdi	!=	hs.quoted_dir_end()	;	++sdi	)	{
+							std::cout	<<	"quoted	dir	"	<<	(*sdi).getName()	<<	std::endl	;
+				}
+				for	(	sdi	=	hs.angled_dir_begin()	;	sdi	!=	hs.angled_dir_end()	;	++sdi	)	{
+							std::cout	<<	"angled	dir	"	<<	(*sdi).getName()	<<	std::endl	;
+				}
+				for	(	sdi	=	hs.system_dir_begin()	;	sdi	!=	hs.system_dir_end()	;	++sdi	)	{
+							std::cout	<<	"system	dir	"	<<	(*sdi).getName()	<<	std::endl	;
+				}
 */
 }
 
-void HeaderSearchDirs::addSearchDirs ( std::vector<std::string> & include_dirs,
-                                       std::vector<std::string> & isystem_dirs) {
-    AddUserSearchDirs( include_dirs ) ;
-    AddSystemSearchDirs( isystem_dirs ) ;
-    AddTrickSearchDirs() ;
-    AddCompilerBuiltInSearchDirs() ;
-    ApplyHeaderSearchOptions() ;
-    AddDirsAndFiles("TRICK_ICG_EXCLUDE", icg_exclude_dirs) ;
-    AddDirsAndFiles("TRICK_SYSTEM_ICG_EXCLUDE", icg_exclude_dirs) ;
-    AddDirsAndFiles("TRICK_EXCLUDE", exclude_dirs) ;
-    AddDirsAndFiles("TRICK_EXT_LIB_DIRS", ext_lib_dirs) ;
-    AddDirsAndFiles("TRICK_ICG_NOCOMMENT", icg_nocomment_dirs) ;
-
-    char * compat15_contents = getenv("TRICK_ICG_COMPAT15") ;
-    if ( compat15_contents != NULL ) {
-        std::string s(compat15_contents) ;
-        if ( s.length() > 0 ) {
-            s += std::string(":./S_source.hh") ;
-            setenv("TRICK_ICG_COMPAT15",s.c_str(),1) ;
-        }
-    }
-
-    AddDirsAndFiles("TRICK_ICG_COMPAT15", compat15_dirs) ;
+void	HeaderSearchDirs::addSearchDirs	(	std::vector<std::string>	&	include_dirs,
+																																							std::vector<std::string>	&	isystem_dirs)	{
+				AddUserSearchDirs(	include_dirs	)	;
+				AddSystemSearchDirs(	isystem_dirs	)	;
+				AddTrickSearchDirs()	;
+				AddCompilerBuiltInSearchDirs()	;
+				ApplyHeaderSearchOptions()	;
+				AddDirsAndFiles("TRICK_ICG_EXCLUDE",	icg_exclude_dirs)	;
+				AddDirsAndFiles("TRICK_SYSTEM_ICG_EXCLUDE",	icg_exclude_dirs)	;
+				AddDirsAndFiles("TRICK_EXCLUDE",	exclude_dirs)	;
+				AddDirsAndFiles("TRICK_EXT_LIB_DIRS",	ext_lib_dirs)	;
+				AddDirsAndFiles("TRICK_ICG_NOCOMMENT",	icg_nocomment_dirs)	;
+
+				char	*	compat15_contents	=	getenv("TRICK_ICG_COMPAT15")	;
+				if	(	compat15_contents	!=	NULL	)	{
+								std::string	s(compat15_contents)	;
+								if	(	s.length()	>	0	)	{
+												s	+=	std::string(":./S_source.hh")	;
+												setenv("TRICK_ICG_COMPAT15",s.c_str(),1)	;
+								}
+				}
+
+				AddDirsAndFiles("TRICK_ICG_COMPAT15",	compat15_dirs)	;
 }
 
-bool HeaderSearchDirs::isPathInUserDir (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInUserDir	(const	std::string&	in_dir	)	{
 
-#if (LIBCLANG_MAJOR >= 15)
-    for ( clang::ConstSearchDirIterator sdi = hs.system_dir_begin() ; sdi != hs.system_dir_end() ; sdi = std::next(sdi) )
+#if	(LIBCLANG_MAJOR	>=	15)
+				for	(	clang::ConstSearchDirIterator	sdi	=	hs.system_dir_begin()	;	sdi	!=	hs.system_dir_end()	;	sdi	=	std::next(sdi)	)
 #else
-    clang::HeaderSearch::search_dir_iterator sdi ;
-    for ( sdi = hs.system_dir_begin() ; sdi != hs.system_dir_end() ; ++sdi )
+				clang::HeaderSearch::search_dir_iterator	sdi	;
+				for	(	sdi	=	hs.system_dir_begin()	;	sdi	!=	hs.system_dir_end()	;	++sdi	)
 #endif
-    {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-       std::string curr_dir = (*sdi).getName() ;
+				{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+							std::string	curr_dir	=	(*sdi).getName()	;
 #else
-       std::string curr_dir = (*sdi).getName().str() ;
+							std::string	curr_dir	=	(*sdi).getName().str()	;
 #endif
-        if ( ! in_dir.compare(0, curr_dir.size(), curr_dir)) {
-            return false ;
-        }
-    }
-    if ( ! sim_services and
-         (! in_dir.compare(0, trick_source_dir.size(), trick_source_dir) or
-          ! in_dir.compare(0, trick_include_dir.size(), trick_include_dir)) ) {
-        return false ;
-    }
-
-    return true ;
+								if	(	!	in_dir.compare(0,	curr_dir.size(),	curr_dir))	{
+												return	false	;
+								}
+				}
+				if	(	!	sim_services	and
+									(!	in_dir.compare(0,	trick_source_dir.size(),	trick_source_dir)	or
+										!	in_dir.compare(0,	trick_include_dir.size(),	trick_include_dir))	)	{
+								return	false	;
+				}
+
+				return	true	;
 }
 
-bool HeaderSearchDirs::isPathInUserOrTrickDir (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInUserOrTrickDir	(const	std::string&	in_dir	)	{
 
-    const std::string trick_home{getenv("TRICK_HOME")};
-    if ( ! in_dir.compare(0, trick_home.size(), trick_home)) {
-        return true ;
-    }
+				const	std::string	trick_home{getenv("TRICK_HOME")};
+				if	(	!	in_dir.compare(0,	trick_home.size(),	trick_home))	{
+								return	true	;
+				}
 
-#if (LIBCLANG_MAJOR >= 15)
-    for ( clang::ConstSearchDirIterator sdi = hs.system_dir_begin() ; sdi != hs.system_dir_end() ; sdi = std::next(sdi) )
+#if	(LIBCLANG_MAJOR	>=	15)
+				for	(	clang::ConstSearchDirIterator	sdi	=	hs.system_dir_begin()	;	sdi	!=	hs.system_dir_end()	;	sdi	=	std::next(sdi)	)
 #else
-    clang::HeaderSearch::search_dir_iterator sdi ;
-    for ( sdi = hs.system_dir_begin() ; sdi != hs.system_dir_end() ; ++sdi )
+				clang::HeaderSearch::search_dir_iterator	sdi	;
+				for	(	sdi	=	hs.system_dir_begin()	;	sdi	!=	hs.system_dir_end()	;	++sdi	)
 #endif
-    {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-       std::string curr_dir = (*sdi).getName() ;
+				{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+							std::string	curr_dir	=	(*sdi).getName()	;
 #else
-       std::string curr_dir = (*sdi).getName().str() ;
+							std::string	curr_dir	=	(*sdi).getName().str()	;
 #endif
-        if ( ! in_dir.compare(0, curr_dir.size(), curr_dir)) {
-            return false ;
-        }
-    }
-    return true ;
+								if	(	!	in_dir.compare(0,	curr_dir.size(),	curr_dir))	{
+												return	false	;
+								}
+				}
+				return	true	;
 }
 
-bool HeaderSearchDirs::isPathInExclude (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInExclude	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = exclude_dirs.begin() ; vit != exclude_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return true ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	exclude_dirs.begin()	;	vit	!=	exclude_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	true	;
+								}
+				}
 
-    return false ;
+				return	false	;
 }
 
-bool HeaderSearchDirs::isPathInICGExclude (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInICGExclude	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = icg_exclude_dirs.begin() ; vit != icg_exclude_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return true ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	icg_exclude_dirs.begin()	;	vit	!=	icg_exclude_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	true	;
+								}
+				}
 
-    return false ;
+				return	false	;
 }
 
-bool HeaderSearchDirs::isPathInExtLib (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInExtLib	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = ext_lib_dirs.begin() ; vit != ext_lib_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return true ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	ext_lib_dirs.begin()	;	vit	!=	ext_lib_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	true	;
+								}
+				}
 
-    return false ;
+				return	false	;
 }
 
-bool HeaderSearchDirs::isPathInICGNoComment (const std::string& in_dir ) {
-    if ( icg_nocomment_files.find(in_dir) != icg_nocomment_files.end() ) {
-        return icg_nocomment_files[in_dir] ;
-    }
-    else {
-        std::vector<std::string>::iterator vit ;
-        for ( vit = icg_nocomment_dirs.begin() ; vit != icg_nocomment_dirs.end() ; ++vit ) {
-            if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-                icg_nocomment_files[in_dir] = true ;
-                return true;
-            }
-        }
-        icg_nocomment_files[in_dir] = false ;
-        return false;
-    }   
+bool	HeaderSearchDirs::isPathInICGNoComment	(const	std::string&	in_dir	)	{
+				if	(	icg_nocomment_files.find(in_dir)	!=	icg_nocomment_files.end()	)	{
+								return	icg_nocomment_files[in_dir]	;
+				}
+				else	{
+								std::vector<std::string>::iterator	vit	;
+								for	(	vit	=	icg_nocomment_dirs.begin()	;	vit	!=	icg_nocomment_dirs.end()	;	++vit	)	{
+												if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+																icg_nocomment_files[in_dir]	=	true	;
+																return	true;
+												}
+								}
+								icg_nocomment_files[in_dir]	=	false	;
+								return	false;
+				}			
 }
 
-bool HeaderSearchDirs::isPathInCompat15 (const std::string& in_dir ) {
+bool	HeaderSearchDirs::isPathInCompat15	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = compat15_dirs.begin() ; vit != compat15_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return true ;
-        }
-    }
-    if ( trick_icg_present.find(in_dir) != trick_icg_present.end() ) {
-        return true ;
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	compat15_dirs.begin()	;	vit	!=	compat15_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	true	;
+								}
+				}
+				if	(	trick_icg_present.find(in_dir)	!=	trick_icg_present.end()	)	{
+								return	true	;
+				}
 
-    return false ;
+				return	false	;
 }
 
-std::string HeaderSearchDirs::getPathInExclude (const std::string& in_dir ) {
+std::string	HeaderSearchDirs::getPathInExclude	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = exclude_dirs.begin() ; vit != exclude_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return (*vit) ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	exclude_dirs.begin()	;	vit	!=	exclude_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	(*vit)	;
+								}
+				}
 
-    return std::string() ;
+				return	std::string()	;
 }
 
-std::string HeaderSearchDirs::getPathInICGExclude (const std::string& in_dir ) {
+std::string	HeaderSearchDirs::getPathInICGExclude	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = icg_exclude_dirs.begin() ; vit != icg_exclude_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return (*vit) ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	icg_exclude_dirs.begin()	;	vit	!=	icg_exclude_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	(*vit)	;
+								}
+				}
 
-    return std::string() ;
+				return	std::string()	;
 }
 
-std::string HeaderSearchDirs::getPathInExtLib (const std::string& in_dir ) {
+std::string	HeaderSearchDirs::getPathInExtLib	(const	std::string&	in_dir	)	{
 
-    std::vector<std::string>::iterator vit ;
-    for ( vit = ext_lib_dirs.begin() ; vit != ext_lib_dirs.end() ; ++vit ) {
-        if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
-            return (*vit) ;
-        }
-    }
+				std::vector<std::string>::iterator	vit	;
+				for	(	vit	=	ext_lib_dirs.begin()	;	vit	!=	ext_lib_dirs.end()	;	++vit	)	{
+								if	(	!	in_dir.compare(0,	(*vit).size(),	(*vit)))	{
+												return	(*vit)	;
+								}
+				}
 
-    return std::string() ;
+				return	std::string()	;
 }
 
-void HeaderSearchDirs::addDefines ( std::vector<std::string> & defines ) {
-
-    // Add -D command line arguments as well as "#define TRICK_ICG" to the preprocessor
-    unsigned int ii ;
-    std::string predefines("#define TRICK_ICG\n");
-    predefines += "#define __STRICT_ANSI__\n";
-    for ( ii = 0 ; ii < defines.size() ; ii++ ) {
-        size_t found = defines[ii].find("=") ;
-        if ( found != defines[ii].npos ) {
-            defines[ii].replace( found , 1 , " " ) ;
-        } else {
-            defines[ii] += " 1" ;
-        }
-        predefines += std::string("#define ") + defines[ii] + "\n" ;
-    }
-    pp.setPredefines(pp.getPredefines() + "\n" + predefines) ;
+void	HeaderSearchDirs::addDefines	(	std::vector<std::string>	&	defines	)	{
+
+				//	Add	-D	command	line	arguments	as	well	as	"#define	TRICK_ICG"	to	the	preprocessor
+				unsigned	int	ii	;
+				std::string	predefines("#define	TRICK_ICG\n");
+				predefines	+=	"#define	__STRICT_ANSI__\n";
+				for	(	ii	=	0	;	ii	<	defines.size()	;	ii++	)	{
+								size_t	found	=	defines[ii].find("=")	;
+								if	(	found	!=	defines[ii].npos	)	{
+												defines[ii].replace(	found	,	1	,	"	"	)	;
+								}	else	{
+												defines[ii]	+=	"	1"	;
+								}
+								predefines	+=	std::string("#define	")	+	defines[ii]	+	"\n"	;
+				}
+				pp.setPredefines(pp.getPredefines()	+	"\n"	+	predefines)	;
 }
 
-void HeaderSearchDirs::addTrickICGFoundFile ( std::string file_name ) {
-    char * rp = almostRealPath(file_name.c_str()) ;
-    if ( rp != NULL ) {
-        trick_icg_present.insert(rp) ;
-        free(rp) ;
-    }
+void	HeaderSearchDirs::addTrickICGFoundFile	(	std::string	file_name	)	{
+				char	*	rp	=	almostRealPath(file_name.c_str())	;
+				if	(	rp	!=	NULL	)	{
+								trick_icg_present.insert(rp)	;
+								free(rp)	;
+				}
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/ICGASTConsumer.cpp b/trick_source/codegen/Interface_Code_Gen/ICGASTConsumer.cpp
index d4e30419a..83228bb83 100644
--- a/trick_source/codegen/Interface_Code_Gen/ICGASTConsumer.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ICGASTConsumer.cpp
@@ -1,21 +1,21 @@
 
-#include <iostream>
-#include "clang/AST/ASTContext.h"
-#include "ICGASTConsumer.hh"
+#include	<iostream>
+#include	"clang/AST/ASTContext.h"
+#include	"ICGASTConsumer.hh"
 
-ICGASTConsumer::ICGASTConsumer( clang::CompilerInstance & in_ci , HeaderSearchDirs & in_hsd ,
- CommentSaver & in_cs , PrintAttributes & in_pa ) :
- ci(in_ci) , hsd(in_hsd) , tuv(in_ci, in_hsd, in_cs, in_pa) {}
+ICGASTConsumer::ICGASTConsumer(	clang::CompilerInstance	&	in_ci	,	HeaderSearchDirs	&	in_hsd	,
+	CommentSaver	&	in_cs	,	PrintAttributes	&	in_pa	)	:
+	ci(in_ci)	,	hsd(in_hsd)	,	tuv(in_ci,	in_hsd,	in_cs,	in_pa)	{}
 
-TranslationUnitVisitor & ICGASTConsumer::getTranslationUnitVisitor() {
-    return tuv ;
+TranslationUnitVisitor	&	ICGASTConsumer::getTranslationUnitVisitor()	{
+				return	tuv	;
 }
 
 /**
 @details
--# Traverse the translation unit declaration and everything it contains.
+-#	Traverse	the	translation	unit	declaration	and	everything	it	contains.
 */
-void ICGASTConsumer::HandleTranslationUnit(clang::ASTContext &Ctx) {
-    tuv.TraverseDecl(Ctx.getTranslationUnitDecl());
+void	ICGASTConsumer::HandleTranslationUnit(clang::ASTContext	&Ctx)	{
+				tuv.TraverseDecl(Ctx.getTranslationUnitDecl());
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/ICGDiagnosticConsumer.cpp b/trick_source/codegen/Interface_Code_Gen/ICGDiagnosticConsumer.cpp
index f753ab558..ddf91e07a 100644
--- a/trick_source/codegen/Interface_Code_Gen/ICGDiagnosticConsumer.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ICGDiagnosticConsumer.cpp
@@ -1,39 +1,39 @@
-#include <iostream>
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/SourceLocation.h"
+#include	<iostream>
+#include	"clang/Basic/SourceManager.h"
+#include	"clang/Basic/SourceLocation.h"
 
-#include "ICGDiagnosticConsumer.hh"
-#include "HeaderSearchDirs.hh"
-#include "Utilities.hh"
+#include	"ICGDiagnosticConsumer.hh"
+#include	"HeaderSearchDirs.hh"
+#include	"Utilities.hh"
 
 
-ICGDiagnosticConsumer::ICGDiagnosticConsumer(llvm::raw_ostream &os, clang::DiagnosticOptions *diags, clang::CompilerInstance &in_ci, HeaderSearchDirs &in_hsd) 
-                                                : clang::TextDiagnosticPrinter(os, diags), ci(in_ci), hsd(in_hsd) {
-    error_in_user_code = false;
+ICGDiagnosticConsumer::ICGDiagnosticConsumer(llvm::raw_ostream	&os,	clang::DiagnosticOptions	*diags,	clang::CompilerInstance	&in_ci,	HeaderSearchDirs	&in_hsd)	
+																																																:	clang::TextDiagnosticPrinter(os,	diags),	ci(in_ci),	hsd(in_hsd)	{
+				error_in_user_code	=	false;
 };
-ICGDiagnosticConsumer::~ICGDiagnosticConsumer() {
+ICGDiagnosticConsumer::~ICGDiagnosticConsumer()	{
 
 };
 
 
 /**
- * @details
- * -# Check the diagnostic level to see if an error is from user code. 
- * -# Terminate the build if yes, continue otherwise.
+	*	@details
+	*	-#	Check	the	diagnostic	level	to	see	if	an	error	is	from	user	code.	
+	*	-#	Terminate	the	build	if	yes,	continue	otherwise.
 */
-void ICGDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level DiagLevel, const clang::Diagnostic &Info) {
-    // Use TextDiagnosticPrinter to handle diagnostic if the code is user code.
-    // Otherwise use base DiagnosticConsumer to handle diagnostic for system code.
-    if (isInUserCode(ci , Info.getLocation(), hsd)) {
-        // Parent class implementation for handling diagnostic
-        clang::TextDiagnosticPrinter::HandleDiagnostic(DiagLevel, Info);
+void	ICGDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level	DiagLevel,	const	clang::Diagnostic	&Info)	{
+				//	Use	TextDiagnosticPrinter	to	handle	diagnostic	if	the	code	is	user	code.
+				//	Otherwise	use	base	DiagnosticConsumer	to	handle	diagnostic	for	system	code.
+				if	(isInUserCode(ci	,	Info.getLocation(),	hsd))	{
+								//	Parent	class	implementation	for	handling	diagnostic
+								clang::TextDiagnosticPrinter::HandleDiagnostic(DiagLevel,	Info);
 
-        // Flag it if an error is from user code
-        if (DiagLevel == clang::DiagnosticsEngine::Level::Fatal || DiagLevel == clang::DiagnosticsEngine::Level::Error) {
-            error_in_user_code = true;
-        }
-    } else {
-        // Base class implementation for handling diagnostic
-        clang::DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
-    }
+								//	Flag	it	if	an	error	is	from	user	code
+								if	(DiagLevel	==	clang::DiagnosticsEngine::Level::Fatal	||	DiagLevel	==	clang::DiagnosticsEngine::Level::Error)	{
+												error_in_user_code	=	true;
+								}
+				}	else	{
+								//	Base	class	implementation	for	handling	diagnostic
+								clang::DiagnosticConsumer::HandleDiagnostic(DiagLevel,	Info);
+				}
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
index 758a84cd9..b016ff175 100644
--- a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
@@ -1,648 +1,648 @@
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <libgen.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <limits.h>
-
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Basic/FileManager.h"
-
-#include "PrintAttributes.hh"
-#include "PrintFileContentsBase.hh"
-#include "PrintFileContents10.hh"
-#include "FieldDescription.hh"
-#include "HeaderSearchDirs.hh"
-#include "CommentSaver.hh"
-#include "ClassValues.hh"
-#include "EnumValues.hh"
-#include "Utilities.hh"
-
-PrintAttributes::PrintAttributes(int in_attr_version , HeaderSearchDirs & in_hsd ,
-  CommentSaver & in_cs , clang::CompilerInstance & in_ci, bool in_force , bool in_sim_services_flag ,
-  std::string in_output_dir ) :
-   hsd(in_hsd) ,
-   cs(in_cs) ,
-   ci(in_ci) ,
-   force(in_force) ,
-   sim_services_flag( in_sim_services_flag ) ,
-   output_dir( in_output_dir )
+#include	<iostream>
+#include	<fstream>
+#include	<sstream>
+#include	<libgen.h>
+#include	<unistd.h>
+#include	<stdlib.h>
+#include	<sys/stat.h>
+#include	<stdio.h>
+#include	<limits.h>
+
+#include	"clang/Frontend/CompilerInstance.h"
+#include	"clang/Basic/FileManager.h"
+
+#include	"PrintAttributes.hh"
+#include	"PrintFileContentsBase.hh"
+#include	"PrintFileContents10.hh"
+#include	"FieldDescription.hh"
+#include	"HeaderSearchDirs.hh"
+#include	"CommentSaver.hh"
+#include	"ClassValues.hh"
+#include	"EnumValues.hh"
+#include	"Utilities.hh"
+
+PrintAttributes::PrintAttributes(int	in_attr_version	,	HeaderSearchDirs	&	in_hsd	,
+		CommentSaver	&	in_cs	,	clang::CompilerInstance	&	in_ci,	bool	in_force	,	bool	in_sim_services_flag	,
+		std::string	in_output_dir	)	:
+			hsd(in_hsd)	,
+			cs(in_cs)	,
+			ci(in_ci)	,
+			force(in_force)	,
+			sim_services_flag(	in_sim_services_flag	)	,
+			output_dir(	in_output_dir	)
 {
-    printer = new PrintFileContents10() ;
+				printer	=	new	PrintFileContents10()	;
 }
 
-void PrintAttributes::addIgnoreTypes() {
-
-    char * env_var_contents = getenv("TRICK_ICG_IGNORE_TYPES") ;
-
-    if( env_var_contents != NULL ) {
-        std::string s = std::string(env_var_contents) ;
-        std::stringstream ss(s);
-        std::string item;
-        while(std::getline(ss, item, ';')) {
-            item = trim(item) ;
-            if ( ! item.empty() ) {
-                global_ignore_types.insert(item) ;
-            }
-        }
-    }
+void	PrintAttributes::addIgnoreTypes()	{
+
+				char	*	env_var_contents	=	getenv("TRICK_ICG_IGNORE_TYPES")	;
+
+				if(	env_var_contents	!=	NULL	)	{
+								std::string	s	=	std::string(env_var_contents)	;
+								std::stringstream	ss(s);
+								std::string	item;
+								while(std::getline(ss,	item,	';'))	{
+												item	=	trim(item)	;
+												if	(	!	item.empty()	)	{
+																global_ignore_types.insert(item)	;
+												}
+								}
+				}
 }
 
 /**
 @details
 
-In order for us to create an io_src file for an include the header must:
+In	order	for	us	to	create	an	io_src	file	for	an	include	the	header	must:
 
-1.  Reside in a user directory ( not system dirs like /usr/include
-2.  Not reside in an excluded directory
-3.  Not have ICG: (No) present in the Trick header
+1.		Reside	in	a	user	directory	(	not	system	dirs	like	/usr/include
+2.		Not	reside	in	an	excluded	directory
+3.		Not	have	ICG:	(No)	present	in	the	Trick	header
 
-If the header file meets all of these conditions, a PrintFileContentsBase
-instance is created for that file name.
+If	the	header	file	meets	all	of	these	conditions,	a	PrintFileContentsBase
+instance	is	created	for	that	file	name.
 
- */
+	*/
 
-bool PrintAttributes::isIOFileOutOfDate(std::string header_file_name, std::string io_file_name) {
-    struct stat header_stat ;
-    struct stat io_stat ;
-    int ret ;
+bool	PrintAttributes::isIOFileOutOfDate(std::string	header_file_name,	std::string	io_file_name)	{
+				struct	stat	header_stat	;
+				struct	stat	io_stat	;
+				int	ret	;
 
-    stat( header_file_name.c_str() , &header_stat ) ;
-    ret = stat( io_file_name.c_str() , &io_stat ) ;
+				stat(	header_file_name.c_str()	,	&header_stat	)	;
+				ret	=	stat(	io_file_name.c_str()	,	&io_stat	)	;
 
-    if ( ret == 0 ) {
-        // If the force flag is true, return that the io file is out of date.
-        // Otherise test if the header is newer than the io file.
-        return ( force || (header_stat.st_mtime > io_stat.st_mtime) ) ;
-    }
-    return true ;
+				if	(	ret	==	0	)	{
+								//	If	the	force	flag	is	true,	return	that	the	io	file	is	out	of	date.
+								//	Otherise	test	if	the	header	is	newer	than	the	io	file.
+								return	(	force	||	(header_stat.st_mtime	>	io_stat.st_mtime)	)	;
+				}
+				return	true	;
 }
 
-static void _mkdir(const char *dir) {
-    char tmp[PATH_MAX];
-    char *p = NULL;
-    struct stat buf ;
-    size_t len;
-
-    snprintf(tmp, sizeof(tmp),"%s",dir);
-    len = strlen(tmp);
-    if(tmp[len - 1] == '/') {
-        tmp[len - 1] = 0;
-    }
-    for(p = tmp + 1; *p; p++)
-        if(*p == '/') {
-            *p = 0;
-            if ( stat( tmp , &buf ) != 0 ) {
-                int returnValue = mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO);
-                if (returnValue) {
-                    std::cerr << bold(color(ERROR, "Error")) << "      Unable to create " << quote(bold(tmp)) << " for writing: " << strerror(errno) << std::endl;
-                    return ;
-                }
-            }
-            *p = '/';
-        }
-    if ( stat( tmp , &buf ) != 0 ) {
-        int returnValue = mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO);
-        if (returnValue) {
-            std::cerr << bold(color(ERROR, "Error")) << "      Unable to create " << quote(bold(tmp)) << " for writing: " << strerror(errno) << std::endl;
-            return ;
-        }
-    }
+static	void	_mkdir(const	char	*dir)	{
+				char	tmp[PATH_MAX];
+				char	*p	=	NULL;
+				struct	stat	buf	;
+				size_t	len;
+
+				snprintf(tmp,	sizeof(tmp),"%s",dir);
+				len	=	strlen(tmp);
+				if(tmp[len	-	1]	==	'/')	{
+								tmp[len	-	1]	=	0;
+				}
+				for(p	=	tmp	+	1;	*p;	p++)
+								if(*p	==	'/')	{
+												*p	=	0;
+												if	(	stat(	tmp	,	&buf	)	!=	0	)	{
+																int	returnValue	=	mkdir(tmp,	S_IRWXU	|	S_IRWXG	|	S_IRWXO);
+																if	(returnValue)	{
+																				std::cerr	<<	bold(color(ERROR,	"Error"))	<<	"						Unable	to	create	"	<<	quote(bold(tmp))	<<	"	for	writing:	"	<<	strerror(errno)	<<	std::endl;
+																				return	;
+																}
+												}
+												*p	=	'/';
+								}
+				if	(	stat(	tmp	,	&buf	)	!=	0	)	{
+								int	returnValue	=	mkdir(tmp,	S_IRWXU	|	S_IRWXG	|	S_IRWXO);
+								if	(returnValue)	{
+												std::cerr	<<	bold(color(ERROR,	"Error"))	<<	"						Unable	to	create	"	<<	quote(bold(tmp))	<<	"	for	writing:	"	<<	strerror(errno)	<<	std::endl;
+												return	;
+								}
+				}
 }
 
-bool PrintAttributes::openIOFile(const std::string& header_file_name) {
-    /**
-     * There are a lot of conditions to be met in order to open an IO file.  We store the headers
-     * we have visited so we don't have to retest the them each time a new class/enum is processed.
-     */
-    if (visited_files.find(header_file_name) != visited_files.end()) {
-        // We have visited this header before. If there is a valid name, append to the existing IO file.
-        if (out_of_date_io_files.find(header_file_name) != out_of_date_io_files.end()) {
-            outfile.open(out_of_date_io_files[header_file_name].c_str(), std::fstream::app);
-            return true ;
-        }
-        return false;
-    }
-
-    visited_files.insert(header_file_name) ;
-
-    if (isHeaderExcluded(header_file_name)) {
-        return false;
-    }
-
-    // map the header to its IO file
-    char* realPath  = almostRealPath(header_file_name.c_str());
-    const std::string io_file_name = createIOFileName(realPath) ;
-    all_io_files[header_file_name] = io_file_name ;
-
-    // make the parent directories
-    char* name = strdup(io_file_name.c_str());
-    _mkdir(dirname(name));
-    free(name);
-
-    // no further processing is required if it's not out of date
-    if (!isIOFileOutOfDate(realPath, io_file_name)) {
-        free(realPath);
-        return false;
-    }
-    free(realPath);
-
-    // add it to the map of out of date IO files
-    out_of_date_io_files[header_file_name] = io_file_name ;
-
-    // write header information
-    std::cout << color(INFO, "Writing    ") << out_of_date_io_files[header_file_name] << std::endl;
-    outfile.open(out_of_date_io_files[header_file_name].c_str());
-    printer->printIOHeader(outfile, header_file_name);
-    if (!cs.hasTrickHeader(header_file_name) ) {
-        std::cout << bold(color(WARNING, "Warning    ") + header_file_name) << std::endl
-            << "           No Trick header comment found" << std::endl;
-    }
-
-    return true ;
+bool	PrintAttributes::openIOFile(const	std::string&	header_file_name)	{
+				/**
+					*	There	are	a	lot	of	conditions	to	be	met	in	order	to	open	an	IO	file.		We	store	the	headers
+					*	we	have	visited	so	we	don't	have	to	retest	the	them	each	time	a	new	class/enum	is	processed.
+					*/
+				if	(visited_files.find(header_file_name)	!=	visited_files.end())	{
+								//	We	have	visited	this	header	before.	If	there	is	a	valid	name,	append	to	the	existing	IO	file.
+								if	(out_of_date_io_files.find(header_file_name)	!=	out_of_date_io_files.end())	{
+												outfile.open(out_of_date_io_files[header_file_name].c_str(),	std::fstream::app);
+												return	true	;
+								}
+								return	false;
+				}
+
+				visited_files.insert(header_file_name)	;
+
+				if	(isHeaderExcluded(header_file_name))	{
+								return	false;
+				}
+
+				//	map	the	header	to	its	IO	file
+				char*	realPath		=	almostRealPath(header_file_name.c_str());
+				const	std::string	io_file_name	=	createIOFileName(realPath)	;
+				all_io_files[header_file_name]	=	io_file_name	;
+
+				//	make	the	parent	directories
+				char*	name	=	strdup(io_file_name.c_str());
+				_mkdir(dirname(name));
+				free(name);
+
+				//	no	further	processing	is	required	if	it's	not	out	of	date
+				if	(!isIOFileOutOfDate(realPath,	io_file_name))	{
+								free(realPath);
+								return	false;
+				}
+				free(realPath);
+
+				//	add	it	to	the	map	of	out	of	date	IO	files
+				out_of_date_io_files[header_file_name]	=	io_file_name	;
+
+				//	write	header	information
+				std::cout	<<	color(INFO,	"Writing				")	<<	out_of_date_io_files[header_file_name]	<<	std::endl;
+				outfile.open(out_of_date_io_files[header_file_name].c_str());
+				printer->printIOHeader(outfile,	header_file_name);
+				if	(!cs.hasTrickHeader(header_file_name)	)	{
+								std::cout	<<	bold(color(WARNING,	"Warning				")	+	header_file_name)	<<	std::endl
+												<<	"											No	Trick	header	comment	found"	<<	std::endl;
+				}
+
+				return	true	;
 }
 
-/** Determines the io_file_name based on the given header file name */
-std::string PrintAttributes::createIOFileName(std::string header_file_name) {
-    std::string dir_name ;
-    std::string base_name ;
-    std::string io_file_name ;
-    size_t found ;
-    char cwd[1024] ;
-    char * temp_str = strdup(header_file_name.c_str()) ;
-
-    base_name = std::string(basename(temp_str)) ;
-    found = base_name.find_last_of(".") ;
-    base_name = std::string("io_") + base_name.substr(0,found) + std::string(".cpp") ;
-
-    dir_name = std::string(dirname(temp_str)) ;
-    if ( ! dir_name.compare(".") ) {
-        dir_name = std::string(getcwd(cwd, 1024)) ;
-    } else if ( ! dir_name.compare(0, 1, ".") ) {
-        dir_name = std::string(getcwd(cwd, 1024)) + std::string("/") + dir_name ;
-    }
-
-    free(temp_str) ;
-
-    if ( hsd.isPathInUserDir( dir_name ) ) {
-        if ( ! output_dir.empty() ) {
-            io_file_name = output_dir + "/" + base_name ;
-        } else {
-            // Put all of the sim_services io_files in ${TRICK_HOME}/trick_source/sim_services/include/io_src unless
-            // it is in er7_utils.  The er7_utils io_files have duplicate file names so the overwrite each other
-            // leave those in their respective directories.
-            if ( sim_services_flag ) {
-                if ( dir_name.length() >= 8 and ! dir_name.compare(dir_name.size() - 8 , dir_name.size() , "/include" )) {
-                    if ( dir_name.length() < 13 or dir_name.compare(dir_name.size() - 13 , dir_name.size() , "trick/include" )) {
-                        dir_name.replace(dir_name.size() - 8 , dir_name.size() , "") ;
-                    }
-                }
-                if ( dir_name.find("er7_utils") == std::string::npos ) {
-                    io_file_name = std::string(getenv("TRICK_HOME")) + "/trick_source/sim_services/include/io_src/" + base_name ;
-                } else {
-                    io_file_name = dir_name + "/io_src/" + base_name ;
-                }
-            } else {
-                //TODO: only use build directory if we are ICG'ing a sim
-                // All files go into a build directory based in the current directory.
-                io_file_name =  std::string("build") + dir_name + "/" + base_name ;
-            }
-        }
-        return io_file_name ;
-    }
-
-    return std::string() ;
+/**	Determines	the	io_file_name	based	on	the	given	header	file	name	*/
+std::string	PrintAttributes::createIOFileName(std::string	header_file_name)	{
+				std::string	dir_name	;
+				std::string	base_name	;
+				std::string	io_file_name	;
+				size_t	found	;
+				char	cwd[1024]	;
+				char	*	temp_str	=	strdup(header_file_name.c_str())	;
+
+				base_name	=	std::string(basename(temp_str))	;
+				found	=	base_name.find_last_of(".")	;
+				base_name	=	std::string("io_")	+	base_name.substr(0,found)	+	std::string(".cpp")	;
+
+				dir_name	=	std::string(dirname(temp_str))	;
+				if	(	!	dir_name.compare(".")	)	{
+								dir_name	=	std::string(getcwd(cwd,	1024))	;
+				}	else	if	(	!	dir_name.compare(0,	1,	".")	)	{
+								dir_name	=	std::string(getcwd(cwd,	1024))	+	std::string("/")	+	dir_name	;
+				}
+
+				free(temp_str)	;
+
+				if	(	hsd.isPathInUserDir(	dir_name	)	)	{
+								if	(	!	output_dir.empty()	)	{
+												io_file_name	=	output_dir	+	"/"	+	base_name	;
+								}	else	{
+												//	Put	all	of	the	sim_services	io_files	in	${TRICK_HOME}/trick_source/sim_services/include/io_src	unless
+												//	it	is	in	er7_utils.		The	er7_utils	io_files	have	duplicate	file	names	so	the	overwrite	each	other
+												//	leave	those	in	their	respective	directories.
+												if	(	sim_services_flag	)	{
+																if	(	dir_name.length()	>=	8	and	!	dir_name.compare(dir_name.size()	-	8	,	dir_name.size()	,	"/include"	))	{
+																				if	(	dir_name.length()	<	13	or	dir_name.compare(dir_name.size()	-	13	,	dir_name.size()	,	"trick/include"	))	{
+																								dir_name.replace(dir_name.size()	-	8	,	dir_name.size()	,	"")	;
+																				}
+																}
+																if	(	dir_name.find("er7_utils")	==	std::string::npos	)	{
+																				io_file_name	=	std::string(getenv("TRICK_HOME"))	+	"/trick_source/sim_services/include/io_src/"	+	base_name	;
+																}	else	{
+																				io_file_name	=	dir_name	+	"/io_src/"	+	base_name	;
+																}
+												}	else	{
+																//TODO:	only	use	build	directory	if	we	are	ICG'ing	a	sim
+																//	All	files	go	into	a	build	directory	based	in	the	current	directory.
+																io_file_name	=		std::string("build")	+	dir_name	+	"/"	+	base_name	;
+												}
+								}
+								return	io_file_name	;
+				}
+
+				return	std::string()	;
 }
 
-void PrintAttributes::printClass( ClassValues * cv ) {
-    ClassValues& classValues = *cv;
+void	PrintAttributes::printClass(	ClassValues	*	cv	)	{
+				ClassValues&	classValues	=	*cv;
 
-    if (classValues.isNameOrFileNameEmpty()) {
-        return;
-    }
+				if	(classValues.isNameOrFileNameEmpty())	{
+								return;
+				}
 
-    if (hasBeenProcessed(classValues)) {
-        return;
-    }
+				if	(hasBeenProcessed(classValues))	{
+								return;
+				}
 
-    if (isIgnored(classValues)) {
-        return;
-    }
+				if	(isIgnored(classValues))	{
+								return;
+				}
 
-    const std::string& fileName = classValues.getFileName();
-    if (openIOFile(fileName)) {
-        printer->printClass(outfile, cv);
-        outfile.close();
-        printSieClass(cv);
-    }
+				const	std::string&	fileName	=	classValues.getFileName();
+				if	(openIOFile(fileName))	{
+								printer->printClass(outfile,	cv);
+								outfile.close();
+								printSieClass(cv);
+				}
 
-    if (!isHeaderExcluded(fileName, false)) {
-         printer->printClassMap(class_map_outfile, cv);
-    }
+				if	(!isHeaderExcluded(fileName,	false))	{
+									printer->printClassMap(class_map_outfile,	cv);
+				}
 }
 
-void PrintAttributes::printEnum(EnumValues* ev) {
-    EnumValues& enumValues = *ev;
-
-    if (enumValues.isNameOrFileNameEmpty()) {
-        return;
-    }
-
-    if (hasBeenProcessed(enumValues)) {
-        return;
-    }
-
-    if (isIgnored(enumValues)) {
-        return;
-    }
-
-    const std::string& fileName = enumValues.getFileName();
-    if (openIOFile(fileName)) {
-        printer->printEnum(outfile, ev) ;
-        outfile.close() ;
-        printSieEnum(&enumValues) ;
-    }
-    
-    if (!isHeaderExcluded(fileName, false)) {
-         printer->printEnumMap(enum_map_outfile, ev);
-    }
+void	PrintAttributes::printEnum(EnumValues*	ev)	{
+				EnumValues&	enumValues	=	*ev;
+
+				if	(enumValues.isNameOrFileNameEmpty())	{
+								return;
+				}
+
+				if	(hasBeenProcessed(enumValues))	{
+								return;
+				}
+
+				if	(isIgnored(enumValues))	{
+								return;
+				}
+
+				const	std::string&	fileName	=	enumValues.getFileName();
+				if	(openIOFile(fileName))	{
+								printer->printEnum(outfile,	ev)	;
+								outfile.close()	;
+								printSieEnum(&enumValues)	;
+				}
+				
+				if	(!isHeaderExcluded(fileName,	false))	{
+									printer->printEnumMap(enum_map_outfile,	ev);
+				}
 }
 
 
-void PrintAttributes::printSieClass( ClassValues * cv ) {
-    std::string xmlFileName;
-    if(sim_services_flag) {
-    #ifdef EXTERNAL_BUILD
-        xmlFileName = output_dir + "/sim_services_classes.resource";
-    #else
-        xmlFileName = std::string(getenv("TRICK_HOME")) + "/share/trick/xml/sim_services_classes.resource";
-    #endif
-    } else {
-        xmlFileName = "build/classes.resource";
-    }
-    std::ofstream ostream(xmlFileName, std::ofstream::app);
-    ostream << "  <class name=\"" << sanitize(cv->getFullyQualifiedMangledTypeName("__")) << "\">\n";
-    for (FieldDescription* fdes : printer->getPrintableFields(*cv)) {
-        std::string type = fdes->getFullyQualifiedMangledTypeName("__");
-        std::replace(type.begin(), type.end(), ':', '_');
-        ostream << "    <member\n"
-                << "      name=\"" << fdes->getName() << "\"\n"
-                << "      type=\"" << replace_special_chars(type) << "\"\n"
-                << "      io_attributes=\"" << fdes->getIO()  << "\"\n"
-                << "      units=\"";
-        if(fdes->isDashDashUnits()) {
-            ostream <<  "--\"" ;
-        } else {
-            ostream << fdes->getUnits()  << "\"" ;
-        }
-        std::string description = fdes->getDescription();
-        if(!description.empty()) {
-            ostream << "\n      description=\"" << replace_special_chars(description) << "\"";
-        }
-        ostream << ">\n" ;
-        for(int i = 0; i < fdes->getNumDims(); i++) {
-            ostream
-                << "      <dimension>" << (fdes->getArrayDim(i) != -1 ? fdes->getArrayDim(i) : 0) << "</dimension>\n";
-        }
-        ostream << "    </member>\n";
-    }
-    ostream << "  </class>\n" << std::endl;
-    ostream.close();
+void	PrintAttributes::printSieClass(	ClassValues	*	cv	)	{
+				std::string	xmlFileName;
+				if(sim_services_flag)	{
+				#ifdef	EXTERNAL_BUILD
+								xmlFileName	=	output_dir	+	"/sim_services_classes.resource";
+				#else
+								xmlFileName	=	std::string(getenv("TRICK_HOME"))	+	"/share/trick/xml/sim_services_classes.resource";
+				#endif
+				}	else	{
+								xmlFileName	=	"build/classes.resource";
+				}
+				std::ofstream	ostream(xmlFileName,	std::ofstream::app);
+				ostream	<<	"		<class	name=\""	<<	sanitize(cv->getFullyQualifiedMangledTypeName("__"))	<<	"\">\n";
+				for	(FieldDescription*	fdes	:	printer->getPrintableFields(*cv))	{
+								std::string	type	=	fdes->getFullyQualifiedMangledTypeName("__");
+								std::replace(type.begin(),	type.end(),	':',	'_');
+								ostream	<<	"				<member\n"
+																<<	"						name=\""	<<	fdes->getName()	<<	"\"\n"
+																<<	"						type=\""	<<	replace_special_chars(type)	<<	"\"\n"
+																<<	"						io_attributes=\""	<<	fdes->getIO()		<<	"\"\n"
+																<<	"						units=\"";
+								if(fdes->isDashDashUnits())	{
+												ostream	<<		"--\""	;
+								}	else	{
+												ostream	<<	fdes->getUnits()		<<	"\""	;
+								}
+								std::string	description	=	fdes->getDescription();
+								if(!description.empty())	{
+												ostream	<<	"\n						description=\""	<<	replace_special_chars(description)	<<	"\"";
+								}
+								ostream	<<	">\n"	;
+								for(int	i	=	0;	i	<	fdes->getNumDims();	i++)	{
+												ostream
+																<<	"						<dimension>"	<<	(fdes->getArrayDim(i)	!=	-1	?	fdes->getArrayDim(i)	:	0)	<<	"</dimension>\n";
+								}
+								ostream	<<	"				</member>\n";
+				}
+				ostream	<<	"		</class>\n"	<<	std::endl;
+				ostream.close();
 }
 
-void PrintAttributes::printSieEnum( EnumValues * ev ) {
-    std::string xmlFileName;
-    if(sim_services_flag) {
-    #ifdef EXTERNAL_BUILD
-        xmlFileName = output_dir + "/sim_services_classes.resource";
-    #else
-        xmlFileName = std::string(getenv("TRICK_HOME")) + "/share/trick/xml/include/sim_services_classes.resource";
-    #endif
-
-    } else {
-        xmlFileName = "build/classes.resource";
-    }
-    std::ofstream ostream(xmlFileName, std::ofstream::app);
-    ostream << "  <enumeration name=\"" << sanitize(ev->getFullyQualifiedTypeName("__")) << "\">\n";
-    for(EnumValues::NameValuePair nvp : ev->getFullyQualifiedPairs()) {
-        ostream << "    <pair label =\"" << nvp.first << "\" value=\"" << nvp.second << "\"/>\n";
-    }
-    ostream << "  </enumeration>\n" << std::endl;
-    ostream.close();
+void	PrintAttributes::printSieEnum(	EnumValues	*	ev	)	{
+				std::string	xmlFileName;
+				if(sim_services_flag)	{
+				#ifdef	EXTERNAL_BUILD
+								xmlFileName	=	output_dir	+	"/sim_services_classes.resource";
+				#else
+								xmlFileName	=	std::string(getenv("TRICK_HOME"))	+	"/share/trick/xml/include/sim_services_classes.resource";
+				#endif
+
+				}	else	{
+								xmlFileName	=	"build/classes.resource";
+				}
+				std::ofstream	ostream(xmlFileName,	std::ofstream::app);
+				ostream	<<	"		<enumeration	name=\""	<<	sanitize(ev->getFullyQualifiedTypeName("__"))	<<	"\">\n";
+				for(EnumValues::NameValuePair	nvp	:	ev->getFullyQualifiedPairs())	{
+								ostream	<<	"				<pair	label	=\""	<<	nvp.first	<<	"\"	value=\""	<<	nvp.second	<<	"\"/>\n";
+				}
+				ostream	<<	"		</enumeration>\n"	<<	std::endl;
+				ostream.close();
 }
 
-void PrintAttributes::createMapFiles() {
-    struct stat buf ;
-    std::string class_map_function_name ;
-    std::string enum_map_function_name ;
+void	PrintAttributes::createMapFiles()	{
+				struct	stat	buf	;
+				std::string	class_map_function_name	;
+				std::string	enum_map_function_name	;
 
-    if ( sim_services_flag ) {
-#ifdef EXTERNAL_BUILD
-        map_dir = output_dir ;
+				if	(	sim_services_flag	)	{
+#ifdef	EXTERNAL_BUILD
+								map_dir	=	output_dir	;
 #else
-        map_dir = "trick_source/sim_services/include/io_src" ;
+								map_dir	=	"trick_source/sim_services/include/io_src"	;
 #endif
-        class_map_function_name = "populate_sim_services_class_map" ;
-        enum_map_function_name = "populate_sim_services_enum_map" ;
-    } else {
-        map_dir = "build" ;
-        class_map_function_name = "populate_class_map" ;
-        enum_map_function_name = "populate_enum_map" ;
-    }
-
-    if ( stat( map_dir.c_str() , &buf ) != 0 ) {
-        if ( mkdir( map_dir.c_str() , 0755 ) != 0 ) {
-            // dir does not exist and cannot make the directory.
-            std::cout << bold(color(WARNING, "Warning")) << "    Unable to create " << quote(bold(map_dir)) << " for writing" << std::endl ;
-        }
-    }
-
-    // Write processed code to temporary files
-    class_map_outfile.open(std::string(map_dir + "/.class_map.cpp").c_str()) ;
-    printer->printClassMapHeader(class_map_outfile, class_map_function_name ) ;
-    enum_map_outfile.open(std::string(map_dir + "/.enum_map.cpp").c_str()) ;
-    printer->printEnumMapHeader(enum_map_outfile, enum_map_function_name ) ;
+								class_map_function_name	=	"populate_sim_services_class_map"	;
+								enum_map_function_name	=	"populate_sim_services_enum_map"	;
+				}	else	{
+								map_dir	=	"build"	;
+								class_map_function_name	=	"populate_class_map"	;
+								enum_map_function_name	=	"populate_enum_map"	;
+				}
+
+				if	(	stat(	map_dir.c_str()	,	&buf	)	!=	0	)	{
+								if	(	mkdir(	map_dir.c_str()	,	0755	)	!=	0	)	{
+												//	dir	does	not	exist	and	cannot	make	the	directory.
+												std::cout	<<	bold(color(WARNING,	"Warning"))	<<	"				Unable	to	create	"	<<	quote(bold(map_dir))	<<	"	for	writing"	<<	std::endl	;
+								}
+				}
+
+				//	Write	processed	code	to	temporary	files
+				class_map_outfile.open(std::string(map_dir	+	"/.class_map.cpp").c_str())	;
+				printer->printClassMapHeader(class_map_outfile,	class_map_function_name	)	;
+				enum_map_outfile.open(std::string(map_dir	+	"/.enum_map.cpp").c_str())	;
+				printer->printEnumMapHeader(enum_map_outfile,	enum_map_function_name	)	;
 }
 
-void PrintAttributes::closeMapFiles() {
-    printer->printClassMapFooter(class_map_outfile) ;
-    class_map_outfile.close() ;
-
-    printer->printEnumMapFooter(enum_map_outfile) ;
-    enum_map_outfile.close() ;
-
-    // If we wrote any new io_src files, move the temporary class and enum map files to new location
-    if ( out_of_date_io_files.size() > 0 ) {
-        std::ifstream class_map(std::string(map_dir + "/.class_map.cpp").c_str()) ;
-        std::ifstream enum_map(std::string(map_dir + "/.enum_map.cpp").c_str()) ;
-        std::ofstream combined_map(std::string(map_dir + "/class_map.cpp").c_str()) ;
-        combined_map << class_map.rdbuf() << enum_map.rdbuf() ;
-    } else {
-        remove( std::string(map_dir + "/.class_map.cpp").c_str() ) ;
-        remove( std::string(map_dir + "/.enum_map.cpp").c_str() ) ;
-    }
+void	PrintAttributes::closeMapFiles()	{
+				printer->printClassMapFooter(class_map_outfile)	;
+				class_map_outfile.close()	;
+
+				printer->printEnumMapFooter(enum_map_outfile)	;
+				enum_map_outfile.close()	;
+
+				//	If	we	wrote	any	new	io_src	files,	move	the	temporary	class	and	enum	map	files	to	new	location
+				if	(	out_of_date_io_files.size()	>	0	)	{
+								std::ifstream	class_map(std::string(map_dir	+	"/.class_map.cpp").c_str())	;
+								std::ifstream	enum_map(std::string(map_dir	+	"/.enum_map.cpp").c_str())	;
+								std::ofstream	combined_map(std::string(map_dir	+	"/class_map.cpp").c_str())	;
+								combined_map	<<	class_map.rdbuf()	<<	enum_map.rdbuf()	;
+				}	else	{
+								remove(	std::string(map_dir	+	"/.class_map.cpp").c_str()	)	;
+								remove(	std::string(map_dir	+	"/.enum_map.cpp").c_str()	)	;
+				}
 }
 
-// Make a list of the empty files we processed.
-// This list is written to the ICG_processed file and used by other processors.
-std::set<std::string> PrintAttributes::getEmptyFiles() {
-    std::set<std::string> emptyFiles;
-    for (auto fi = ci.getSourceManager().fileinfo_begin() ; fi != ci.getSourceManager().fileinfo_end() ; ++fi ) {
-        const clang::FileEntry * fe = (*fi).first ;
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-        std::string header_file_name = fe->getName() ;
+//	Make	a	list	of	the	empty	files	we	processed.
+//	This	list	is	written	to	the	ICG_processed	file	and	used	by	other	processors.
+std::set<std::string>	PrintAttributes::getEmptyFiles()	{
+				std::set<std::string>	emptyFiles;
+				for	(auto	fi	=	ci.getSourceManager().fileinfo_begin()	;	fi	!=	ci.getSourceManager().fileinfo_end()	;	++fi	)	{
+								const	clang::FileEntry	*	fe	=	(*fi).first	;
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+								std::string	header_file_name	=	fe->getName()	;
 #else
-        std::string header_file_name = fe->getName().str() ;
+								std::string	header_file_name	=	fe->getName().str()	;
 #endif
 
-        if ( visited_files.find(header_file_name) != visited_files.end() ) {
-            continue;
-        }
+								if	(	visited_files.find(header_file_name)	!=	visited_files.end()	)	{
+												continue;
+								}
 
-        visited_files.insert(header_file_name) ;
+								visited_files.insert(header_file_name)	;
 
-        if (isHeaderExcluded(header_file_name)) {
-            continue;
-        }
+								if	(isHeaderExcluded(header_file_name))	{
+												continue;
+								}
 
-        char* path  = almostRealPath(header_file_name.c_str());
-        emptyFiles.insert(path);
-        free(path) ;
-    }
-    return emptyFiles;
+								char*	path		=	almostRealPath(header_file_name.c_str());
+								emptyFiles.insert(path);
+								free(path)	;
+				}
+				return	emptyFiles;
 }
 
-//TODO: Move this into PrintFileContents10.
-void PrintAttributes::printIOMakefile() {
-    std::ofstream makefile_io_src ;
-    std::ofstream makefile_ICG ;
-    std::ofstream io_link_list ;
-    std::ofstream trickify_io_link_list ;
-    std::ofstream ICG_processed ;
-    std::ofstream ext_lib ;
-
-    // Don't create a makefile if we didn't process any files.
-    if ( out_of_date_io_files.empty() ) {
-       return ;
-    }
-
-    std::cout << color(INFO, "Writing") << "    Makefile_io_src" << std::endl ;
-
-    makefile_io_src.open("build/Makefile_io_src") ;
-    makefile_io_src
-        << "TRICK_IO_CXXFLAGS += -Wno-invalid-offsetof -Wno-old-style-cast -Wno-write-strings -Wno-unused-variable" << std::endl
-        << std::endl
-        << "ifeq ($(IS_CC_CLANG), 0)" << std::endl
-        << "    TRICK_IO_CXXFLAGS += -Wno-unused-local-typedefs -Wno-unused-but-set-variable" << std::endl
-        << "    ifeq ($(shell test $(GCC_MAJOR) -lt 6; echo $$?), 0)" << std::endl
-        << "        TRICK_IO_CXXFLAGS += -std=c++11" << std::endl
-        << "    endif" << std::endl
-        << "endif" << std::endl
-        << "ifeq ($(IS_CC_CLANG), 1)" << std::endl
-        << "    TRICK_IO_CXXFLAGS += -std=c++14" << std::endl
-        << "endif" << std::endl
-        << std::endl
-        << "IO_OBJECTS =" ;
-
-    std::map< std::string , std::string >::iterator mit ;
-    for ( mit = all_io_files.begin() ; mit != all_io_files.end() ; ++mit ) {
-        size_t found ;
-        found = (*mit).second.find_last_of(".") ;
-        makefile_io_src << " \\\n    " << (*mit).second.substr(0,found) << ".o" ;
-    }
-
-    makefile_io_src << " \\\n    build/class_map.o" << std::endl
-        << std::endl
-        << "$(IO_OBJECTS): \%.o : \%.cpp | \%.d" << std::endl
-        << "\t$(PRINT_COMPILE)" << std::endl
-        << "\t$(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(TRICK_IO_CXXFLAGS) -MMD -MP -c -o $@ $<)" << std::endl
-        << std::endl
-        << "$(IO_OBJECTS:.o=.d): ;" << std::endl
-        << std::endl
-        << "-include $(IO_OBJECTS:.o=.d)" << std::endl
-        << std::endl
-        << "$(S_MAIN): $(IO_OBJECTS)" << std::endl
-        << std::endl
-        << "LINK_LISTS += $(LD_FILELIST)build/io_link_list" << std::endl;
-
-    makefile_io_src.close() ;
-
-    /*
-       Makefile_ICG lists all headers as dependencies of Makefile_io_src
-       causing ICG to run if any header file changes.
-
-       io_link_list lists all io object files to be linked.
-
-       trickify_io_link_list lists all io object files to be linked for a Trickified project.
-
-       ICG_process lists all header files to be used by SWIG.
-     */
-    makefile_ICG.open("build/Makefile_ICG") ;
-    io_link_list.open("build/io_link_list") ;
-    trickify_io_link_list.open("build/trickify_io_link_list") ;
-    ICG_processed.open("build/ICG_processed") ;
-
-    makefile_ICG << "build/Makefile_io_src:" ;
-    for ( mit = all_io_files.begin() ; mit != all_io_files.end() ; ++mit ) {
-        makefile_ICG << " \\\n    " << (*mit).first ;
-        size_t found ;
-        found = (*mit).second.find_last_of(".") ;
-        io_link_list << (*mit).second.substr(0,found) << ".o" << std::endl ;
-        trickify_io_link_list << (*mit).second.substr(0,found) << ".o" << std::endl ;
-        ICG_processed << (*mit).first << std::endl ;
-    }
-    makefile_ICG.close() ;
-
-    // Create the list of empty (of classes/enums) header files to be written to ICG_processed.
-    for ( auto& file : getEmptyFiles() ) {
-        ICG_processed << file << std::endl ;
-    }
-    ICG_processed.close() ;
-
-    io_link_list << "build/class_map.o" << std::endl ;
-    io_link_list.close() ;
-    trickify_io_link_list.close() ;
-
-    ext_lib.open("build/ICG_ext_lib") ;
-    for ( auto& file : ext_lib_io_files ) {
-        ext_lib << file << std::endl ;
-    }
-    ext_lib.close() ;
+//TODO:	Move	this	into	PrintFileContents10.
+void	PrintAttributes::printIOMakefile()	{
+				std::ofstream	makefile_io_src	;
+				std::ofstream	makefile_ICG	;
+				std::ofstream	io_link_list	;
+				std::ofstream	trickify_io_link_list	;
+				std::ofstream	ICG_processed	;
+				std::ofstream	ext_lib	;
+
+				//	Don't	create	a	makefile	if	we	didn't	process	any	files.
+				if	(	out_of_date_io_files.empty()	)	{
+							return	;
+				}
+
+				std::cout	<<	color(INFO,	"Writing")	<<	"				Makefile_io_src"	<<	std::endl	;
+
+				makefile_io_src.open("build/Makefile_io_src")	;
+				makefile_io_src
+								<<	"TRICK_IO_CXXFLAGS	+=	-Wno-invalid-offsetof	-Wno-old-style-cast	-Wno-write-strings	-Wno-unused-variable"	<<	std::endl
+								<<	std::endl
+								<<	"ifeq	($(IS_CC_CLANG),	0)"	<<	std::endl
+								<<	"				TRICK_IO_CXXFLAGS	+=	-Wno-unused-local-typedefs	-Wno-unused-but-set-variable"	<<	std::endl
+								<<	"				ifeq	($(shell	test	$(GCC_MAJOR)	-lt	6;	echo	$$?),	0)"	<<	std::endl
+								<<	"								TRICK_IO_CXXFLAGS	+=	-std=c++11"	<<	std::endl
+								<<	"				endif"	<<	std::endl
+								<<	"endif"	<<	std::endl
+								<<	"ifeq	($(IS_CC_CLANG),	1)"	<<	std::endl
+								<<	"				TRICK_IO_CXXFLAGS	+=	-std=c++14"	<<	std::endl
+								<<	"endif"	<<	std::endl
+								<<	std::endl
+								<<	"IO_OBJECTS	="	;
+
+				std::map<	std::string	,	std::string	>::iterator	mit	;
+				for	(	mit	=	all_io_files.begin()	;	mit	!=	all_io_files.end()	;	++mit	)	{
+								size_t	found	;
+								found	=	(*mit).second.find_last_of(".")	;
+								makefile_io_src	<<	"	\\\n				"	<<	(*mit).second.substr(0,found)	<<	".o"	;
+				}
+
+				makefile_io_src	<<	"	\\\n				build/class_map.o"	<<	std::endl
+								<<	std::endl
+								<<	"$(IO_OBJECTS):	\%.o	:	\%.cpp	|	\%.d"	<<	std::endl
+								<<	"\t$(PRINT_COMPILE)"	<<	std::endl
+								<<	"\t$(call	ECHO_AND_LOG,$(TRICK_CXX)	$(TRICK_CXXFLAGS)	$(TRICK_SYSTEM_CXXFLAGS)	$(TRICK_IO_CXXFLAGS)	-MMD	-MP	-c	-o	$@	$<)"	<<	std::endl
+								<<	std::endl
+								<<	"$(IO_OBJECTS:.o=.d):	;"	<<	std::endl
+								<<	std::endl
+								<<	"-include	$(IO_OBJECTS:.o=.d)"	<<	std::endl
+								<<	std::endl
+								<<	"$(S_MAIN):	$(IO_OBJECTS)"	<<	std::endl
+								<<	std::endl
+								<<	"LINK_LISTS	+=	$(LD_FILELIST)build/io_link_list"	<<	std::endl;
+
+				makefile_io_src.close()	;
+
+				/*
+							Makefile_ICG	lists	all	headers	as	dependencies	of	Makefile_io_src
+							causing	ICG	to	run	if	any	header	file	changes.
+
+							io_link_list	lists	all	io	object	files	to	be	linked.
+
+							trickify_io_link_list	lists	all	io	object	files	to	be	linked	for	a	Trickified	project.
+
+							ICG_process	lists	all	header	files	to	be	used	by	SWIG.
+					*/
+				makefile_ICG.open("build/Makefile_ICG")	;
+				io_link_list.open("build/io_link_list")	;
+				trickify_io_link_list.open("build/trickify_io_link_list")	;
+				ICG_processed.open("build/ICG_processed")	;
+
+				makefile_ICG	<<	"build/Makefile_io_src:"	;
+				for	(	mit	=	all_io_files.begin()	;	mit	!=	all_io_files.end()	;	++mit	)	{
+								makefile_ICG	<<	"	\\\n				"	<<	(*mit).first	;
+								size_t	found	;
+								found	=	(*mit).second.find_last_of(".")	;
+								io_link_list	<<	(*mit).second.substr(0,found)	<<	".o"	<<	std::endl	;
+								trickify_io_link_list	<<	(*mit).second.substr(0,found)	<<	".o"	<<	std::endl	;
+								ICG_processed	<<	(*mit).first	<<	std::endl	;
+				}
+				makefile_ICG.close()	;
+
+				//	Create	the	list	of	empty	(of	classes/enums)	header	files	to	be	written	to	ICG_processed.
+				for	(	auto&	file	:	getEmptyFiles()	)	{
+								ICG_processed	<<	file	<<	std::endl	;
+				}
+				ICG_processed.close()	;
+
+				io_link_list	<<	"build/class_map.o"	<<	std::endl	;
+				io_link_list.close()	;
+				trickify_io_link_list.close()	;
+
+				ext_lib.open("build/ICG_ext_lib")	;
+				for	(	auto&	file	:	ext_lib_io_files	)	{
+								ext_lib	<<	file	<<	std::endl	;
+				}
+				ext_lib.close()	;
 }
 
-void PrintAttributes::printICGNoFiles() {
-    if ( ! sim_services_flag ) {
-        std::vector< std::string >::iterator it ;
-        std::ofstream icg_no_outfile("build/ICG_no_found") ;
-        for ( it = icg_no_files.begin() ; it != icg_no_files.end() ; ++it ) {
-            icg_no_outfile << (*it) << std::endl ;
-        }
-        icg_no_outfile.close() ;
-    }
+void	PrintAttributes::printICGNoFiles()	{
+				if	(	!	sim_services_flag	)	{
+								std::vector<	std::string	>::iterator	it	;
+								std::ofstream	icg_no_outfile("build/ICG_no_found")	;
+								for	(	it	=	icg_no_files.begin()	;	it	!=	icg_no_files.end()	;	++it	)	{
+												icg_no_outfile	<<	(*it)	<<	std::endl	;
+								}
+								icg_no_outfile.close()	;
+				}
 }
 
-bool PrintAttributes::hasBeenProcessed(EnumValues& enumValues) {
-    return hasBeenProcessed(enumValues.getFullyQualifiedName(), processed_enums[enumValues.getFileName()]);
+bool	PrintAttributes::hasBeenProcessed(EnumValues&	enumValues)	{
+				return	hasBeenProcessed(enumValues.getFullyQualifiedName(),	processed_enums[enumValues.getFileName()]);
 }
 
-bool PrintAttributes::hasBeenProcessed(ClassValues& classValues) {
-    return hasBeenProcessed(classValues.getFullyQualifiedMangledTypeName(), processed_classes[classValues.getFileName()]);
+bool	PrintAttributes::hasBeenProcessed(ClassValues&	classValues)	{
+				return	hasBeenProcessed(classValues.getFullyQualifiedMangledTypeName(),	processed_classes[classValues.getFileName()]);
 }
 
-bool PrintAttributes::hasBeenProcessed(const std::string& name, std::set<std::string>& processedSet) {
-    bool processed = processedSet.find(name) != processedSet.end();
-    if (!processed) {
-        processedSet.insert(name);
-    }
-    return processed;
+bool	PrintAttributes::hasBeenProcessed(const	std::string&	name,	std::set<std::string>&	processedSet)	{
+				bool	processed	=	processedSet.find(name)	!=	processedSet.end();
+				if	(!processed)	{
+								processedSet.insert(name);
+				}
+				return	processed;
 }
 
-bool PrintAttributes::isIgnored(ConstructValues& constructValues) {
-    const std::string& fileName = constructValues.getFileName();
-    if (ignored_types.find(fileName) == ignored_types.end()) {
-        ignored_types[fileName] = cs.getIgnoreTypes(fileName) ;
-    }
+bool	PrintAttributes::isIgnored(ConstructValues&	constructValues)	{
+				const	std::string&	fileName	=	constructValues.getFileName();
+				if	(ignored_types.find(fileName)	==	ignored_types.end())	{
+								ignored_types[fileName]	=	cs.getIgnoreTypes(fileName)	;
+				}
 
-    std::set<std::string>& constructs = ignored_types[fileName];
+				std::set<std::string>&	constructs	=	ignored_types[fileName];
 
-    const bool ignored = constructs.find(constructValues.getName()) != constructs.end() or
-                         constructs.find(constructValues.getFullyQualifiedName()) != constructs.end() or
-                         global_ignore_types.find(constructValues.getName()) != global_ignore_types.end() or
-                         global_ignore_types.find(constructValues.getFullyQualifiedName()) != global_ignore_types.end();
+				const	bool	ignored	=	constructs.find(constructValues.getName())	!=	constructs.end()	or
+																									constructs.find(constructValues.getFullyQualifiedName())	!=	constructs.end()	or
+																									global_ignore_types.find(constructValues.getName())	!=	global_ignore_types.end()	or
+																									global_ignore_types.find(constructValues.getFullyQualifiedName())	!=	global_ignore_types.end();
 
-    if (ignored and verboseBuild) {
-        std::cout << skipping << "ICG Ignore Type: " << constructValues.getName() << " (from " << fileName << ")" << std::endl;
-    }
+				if	(ignored	and	verboseBuild)	{
+								std::cout	<<	skipping	<<	"ICG	Ignore	Type:	"	<<	constructValues.getName()	<<	"	(from	"	<<	fileName	<<	")"	<<	std::endl;
+				}
 
-    return ignored;
+				return	ignored;
 }
 
-bool PrintAttributes::isHeaderExcluded(const std::string& header, bool exclude_ext_libs) {
-    char* temp = almostRealPath(header.c_str());
-    if (!temp) {
-        return true;
-    }
-    const std::string path = std::string(temp);
-    free(temp);
-
-    /**
-     * Exclude files:
-     * - in system directories
-     * - in TRICK_EXCLUDE directories
-     * - in TRICK_ICG_EXCLUDE directories
-     * - in TRICK_EXT_LIB_DIRS directories (if requested)
-     * - whose Trick header comments preclude ICG
-     */
-    if (!hsd.isPathInUserDir(path)) {
-        return true;
-    }
-
-    if (hsd.isPathInExclude(path)) {
-        if (verboseBuild) {
-            std::cout << skipping << "TRICK_EXCLUDE: " << underline(path, hsd.getPathInExclude(path).size()) << std::endl;
-        }
-        return true;
-    }
-
-    if (hsd.isPathInICGExclude(path)) {
-        if (verboseBuild) {
-            std::cout << skipping << "TRICK_ICG_EXCLUDE: " << underline(path, hsd.getPathInICGExclude(path).size()) << std::endl;
-        }
-        return true;
-    }
-
-    if (hsd.isPathInExtLib(path) && exclude_ext_libs) {
-        if (verboseBuild) {
-            std::cout << skipping << "TRICK_EXT_LIB_DIRS: " << underline(path, hsd.getPathInExtLib(path).size()) << std::endl;
-        }
-        ext_lib_io_files.insert(header) ;
-        return true;
-    }
-
-    if (cs.hasICGNo(header)) {
-        if (verboseBuild) {
-            std::cout << skipping << "ICG: (NO): " << path << std::endl;
-        }
-        icg_no_files.push_back(path);
-        return true;
-    }
-
-    temp = realpath(header.c_str(), NULL);
-    if ( temp ) {
-        const std::string real_path = std::string(temp);
-        free(temp) ;
-        if ( real_path.compare(path) ) {
-            if (hsd.isPathInExclude(real_path)) {
-                if (verboseBuild) {
-                    std::cout << skipping << "TRICK_EXCLUDE: " << underline(real_path, hsd.getPathInExclude(real_path).size()) << std::endl;
-                }
-                return true;
-            }
-
-            if (hsd.isPathInICGExclude(real_path)) {
-                if (verboseBuild) {
-                    std::cout << skipping << "TRICK_ICG_EXCLUDE: " << underline(real_path, hsd.getPathInICGExclude(real_path).size()) << std::endl;
-                }
-                return true;
-            }
-
-            if (hsd.isPathInExtLib(real_path) && exclude_ext_libs) {
-                if (verboseBuild) {
-                    std::cout << skipping << "TRICK_EXT_LIB_DIRS: " << underline(real_path, hsd.getPathInExtLib(real_path).size()) << std::endl;
-                }
-                ext_lib_io_files.insert(header) ;
-                return true;
-            }
-        }
-    }
-
-    return false;
+bool	PrintAttributes::isHeaderExcluded(const	std::string&	header,	bool	exclude_ext_libs)	{
+				char*	temp	=	almostRealPath(header.c_str());
+				if	(!temp)	{
+								return	true;
+				}
+				const	std::string	path	=	std::string(temp);
+				free(temp);
+
+				/**
+					*	Exclude	files:
+					*	-	in	system	directories
+					*	-	in	TRICK_EXCLUDE	directories
+					*	-	in	TRICK_ICG_EXCLUDE	directories
+					*	-	in	TRICK_EXT_LIB_DIRS	directories	(if	requested)
+					*	-	whose	Trick	header	comments	preclude	ICG
+					*/
+				if	(!hsd.isPathInUserDir(path))	{
+								return	true;
+				}
+
+				if	(hsd.isPathInExclude(path))	{
+								if	(verboseBuild)	{
+												std::cout	<<	skipping	<<	"TRICK_EXCLUDE:	"	<<	underline(path,	hsd.getPathInExclude(path).size())	<<	std::endl;
+								}
+								return	true;
+				}
+
+				if	(hsd.isPathInICGExclude(path))	{
+								if	(verboseBuild)	{
+												std::cout	<<	skipping	<<	"TRICK_ICG_EXCLUDE:	"	<<	underline(path,	hsd.getPathInICGExclude(path).size())	<<	std::endl;
+								}
+								return	true;
+				}
+
+				if	(hsd.isPathInExtLib(path)	&&	exclude_ext_libs)	{
+								if	(verboseBuild)	{
+												std::cout	<<	skipping	<<	"TRICK_EXT_LIB_DIRS:	"	<<	underline(path,	hsd.getPathInExtLib(path).size())	<<	std::endl;
+								}
+								ext_lib_io_files.insert(header)	;
+								return	true;
+				}
+
+				if	(cs.hasICGNo(header))	{
+								if	(verboseBuild)	{
+												std::cout	<<	skipping	<<	"ICG:	(NO):	"	<<	path	<<	std::endl;
+								}
+								icg_no_files.push_back(path);
+								return	true;
+				}
+
+				temp	=	realpath(header.c_str(),	NULL);
+				if	(	temp	)	{
+								const	std::string	real_path	=	std::string(temp);
+								free(temp)	;
+								if	(	real_path.compare(path)	)	{
+												if	(hsd.isPathInExclude(real_path))	{
+																if	(verboseBuild)	{
+																				std::cout	<<	skipping	<<	"TRICK_EXCLUDE:	"	<<	underline(real_path,	hsd.getPathInExclude(real_path).size())	<<	std::endl;
+																}
+																return	true;
+												}
+
+												if	(hsd.isPathInICGExclude(real_path))	{
+																if	(verboseBuild)	{
+																				std::cout	<<	skipping	<<	"TRICK_ICG_EXCLUDE:	"	<<	underline(real_path,	hsd.getPathInICGExclude(real_path).size())	<<	std::endl;
+																}
+																return	true;
+												}
+
+												if	(hsd.isPathInExtLib(real_path)	&&	exclude_ext_libs)	{
+																if	(verboseBuild)	{
+																				std::cout	<<	skipping	<<	"TRICK_EXT_LIB_DIRS:	"	<<	underline(real_path,	hsd.getPathInExtLib(real_path).size())	<<	std::endl;
+																}
+																ext_lib_io_files.insert(header)	;
+																return	true;
+												}
+								}
+				}
+
+				return	false;
 }
 
-void PrintAttributes::markHeaderAsVisited(const std::string& header) {
-    visited_files.insert(header);
+void	PrintAttributes::markHeaderAsVisited(const	std::string&	header)	{
+				visited_files.insert(header);
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp b/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp
index 807fca922..c81d23a16 100644
--- a/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp
@@ -1,413 +1,413 @@
-#include <algorithm>
-#include <sstream>
-
-#include "PrintFileContents10.hh"
-#include "FieldDescription.hh"
-#include "ClassValues.hh"
-#include "EnumValues.hh"
-#include "Utilities.hh"
-
-extern llvm::cl::opt< bool > global_compat15 ;
-
-PrintFileContents10::PrintFileContents10() {}
-
-/** Prints the io_src header information */
-void PrintFileContents10::printIOHeader(std::ostream & ostream , std::string header_file_name) {
-
-     if ( ! header_file_name.compare("S_source.hh") ) {
-         header_file_name = "../S_source.hh" ;
-     } else {
-         header_file_name = almostRealPath(header_file_name.c_str()) ;
-     }
-     ostream << "/**\n"
-             << " * This file was automatically generated by the ICG based on the file:\n"
-             << " * " << header_file_name << "\n"
-             << " * This file contains database parameter declarations specific to the\n"
-             << " * data structures and enumerated types declared in the above file.\n"
-             << " * These database parameters are used by the Trick input and\n"
-             << " * data recording processors to gain access to important simulation\n"
-             << " * variable information.\n"
-             << " */\n"
-             << "\n"
-             << "#define TRICK_IN_IOSRC\n"
-             << "#include <stdlib.h>\n"
-             << "#include \"trick/MemoryManager.hh\"\n"
-             << "#include \"trick/attributes.h\"\n"
-             << "#include \"trick/parameter_types.h\"\n"
-             << "#include \"trick/ClassSizeCheck.hh\"\n"
-             << "#include \"trick/UnitsMap.hh\"\n"
-             << "#include \"trick/checkpoint_stl.hh\"\n"
-             << "#include \"" << header_file_name << "\"\n"
-             << "\n" ;
+#include	<algorithm>
+#include	<sstream>
+
+#include	"PrintFileContents10.hh"
+#include	"FieldDescription.hh"
+#include	"ClassValues.hh"
+#include	"EnumValues.hh"
+#include	"Utilities.hh"
+
+extern	llvm::cl::opt<	bool	>	global_compat15	;
+
+PrintFileContents10::PrintFileContents10()	{}
+
+/**	Prints	the	io_src	header	information	*/
+void	PrintFileContents10::printIOHeader(std::ostream	&	ostream	,	std::string	header_file_name)	{
+
+					if	(	!	header_file_name.compare("S_source.hh")	)	{
+									header_file_name	=	"../S_source.hh"	;
+					}	else	{
+									header_file_name	=	almostRealPath(header_file_name.c_str())	;
+					}
+					ostream	<<	"/**\n"
+													<<	"	*	This	file	was	automatically	generated	by	the	ICG	based	on	the	file:\n"
+													<<	"	*	"	<<	header_file_name	<<	"\n"
+													<<	"	*	This	file	contains	database	parameter	declarations	specific	to	the\n"
+													<<	"	*	data	structures	and	enumerated	types	declared	in	the	above	file.\n"
+													<<	"	*	These	database	parameters	are	used	by	the	Trick	input	and\n"
+													<<	"	*	data	recording	processors	to	gain	access	to	important	simulation\n"
+													<<	"	*	variable	information.\n"
+													<<	"	*/\n"
+													<<	"\n"
+													<<	"#define	TRICK_IN_IOSRC\n"
+													<<	"#include	<stdlib.h>\n"
+													<<	"#include	\"trick/MemoryManager.hh\"\n"
+													<<	"#include	\"trick/attributes.h\"\n"
+													<<	"#include	\"trick/parameter_types.h\"\n"
+													<<	"#include	\"trick/ClassSizeCheck.hh\"\n"
+													<<	"#include	\"trick/UnitsMap.hh\"\n"
+													<<	"#include	\"trick/checkpoint_stl.hh\"\n"
+													<<	"#include	\""	<<	header_file_name	<<	"\"\n"
+													<<	"\n"	;
 }
 
-/** Prints enumeration attributes */
-void PrintFileContents10::print_enum_attr(std::ostream & ostream , EnumValues * e ) {
-    print_open_extern_c(ostream) ;
-    ostream << "ENUM_ATTR enum" << e->getFullyQualifiedTypeName("__") << "[] = {\n" ;
-    std::string name = e->getNamespacesAndContainerClasses();
-    for (auto& pair : e->getPairs()) {
-        ostream << "{\"" << name << pair.first << "\", " << pair.second << ", 0x0},\n" ;
-    }
-    ostream << "{\"\", 0, 0x0}\n};\n" ;
-    print_close_extern_c(ostream) ;
+/**	Prints	enumeration	attributes	*/
+void	PrintFileContents10::print_enum_attr(std::ostream	&	ostream	,	EnumValues	*	e	)	{
+				print_open_extern_c(ostream)	;
+				ostream	<<	"ENUM_ATTR	enum"	<<	e->getFullyQualifiedTypeName("__")	<<	"[]	=	{\n"	;
+				std::string	name	=	e->getNamespacesAndContainerClasses();
+				for	(auto&	pair	:	e->getPairs())	{
+								ostream	<<	"{\""	<<	name	<<	pair.first	<<	"\",	"	<<	pair.second	<<	",	0x0},\n"	;
+				}
+				ostream	<<	"{\"\",	0,	0x0}\n};\n"	;
+				print_close_extern_c(ostream)	;
 }
 
-/** Prints attributes for a field */
-void PrintFileContents10::print_field_attr(std::ostream & ostream ,  FieldDescription & fdes ) {
-    int array_dim ;
-
-    ostream << "{\"" << fdes.getName() << "\""                               // name
-            << ", \"" << fdes.getFullyQualifiedMangledTypeName("__") << "\"" // type_name
-            << ", \"" << fdes.getUnits() << "\""                             // units
-            << ", \"\", \"\"," << std::endl                                   // alias, user_defined
-            << "  \"" << fdes.getDescription() << "\"," << std::endl         // description
-            << "  " << fdes.getIO()                                          // io
-            << "," << fdes.getEnumString() ;                                 // type
-    // There are several cases when printing the size of a variable.
-    if ( fdes.isBitField() ) {
-        // bitfields are handled in 4 byte (32 bit) chunks
-        ostream << ", 4" ;
-    } else if (  fdes.isRecord() or fdes.isEnum() or fdes.getTypeName().empty() ) {
-        // records enums use io_src_get_size. The sentinel has no typename
-        ostream << ", 0" ;
-    } else {
-        // print size of the underlying type
-        ostream << ", sizeof(" << fdes.getTypeName() << ")" ;
-    }
-    ostream << ", 0, 0, Language_CPP" ; // range_min, range_max, language
-    // mods (see attributes.h for descriptions)
-    ostream << ", " << fdes.isReference() + (fdes.isStatic() << 1) + (fdes.isDashDashUnits() << 2) + (fdes.isReference() ? (((fdes.getFieldWidth() / 8) & 0x3F) << 3) : 0) << "," << std::endl ; // mods
-    if ( fdes.isBitField() ) {
-        // For bitfields we need the offset to start on 4 byte boundaries because that is what our
-        // insert and extract bitfield routines work with.
-        ostream << "  " << (fdes.getFieldOffset() - (fdes.getFieldOffset() % 32)) / 8 ; // offset
-    } else {
-        ostream << "  " << (fdes.getFieldOffset() / 8) ; // offset
-    }
-    ostream << ", NULL" ; // attr
-    ostream << ", " << fdes.getNumDims() ;                // num_index
-
-    ostream << ", {" ;
-    if ( fdes.isBitField() ) {
-        ostream << "{" << fdes.getBitFieldWidth() ; // size of bitfield
-        ostream << ", " << 32 - (fdes.getFieldOffset() % 32) - fdes.getBitFieldWidth() << "}" ; // start bit
-    } else {
-        array_dim = fdes.getArrayDim(0) ;
-        if ( array_dim < 0 ) array_dim = 0 ;
-        ostream << "{" << array_dim << ", 0}" ; // index 0
-    }
-    unsigned int ii ;
-    for ( ii = 1 ; ii < 8 ; ii++ ) {
-        array_dim = fdes.getArrayDim(ii) ;
-        if ( array_dim < 0 ) array_dim = 0 ;
-        ostream << ", {" << array_dim << ", 0}" ; // indexes 1 through 7
-    }
-    ostream << "}," << std::endl ;
-    ostream << "  NULL, NULL, NULL, NULL" ;
-    ostream << "}" ;
+/**	Prints	attributes	for	a	field	*/
+void	PrintFileContents10::print_field_attr(std::ostream	&	ostream	,		FieldDescription	&	fdes	)	{
+				int	array_dim	;
+
+				ostream	<<	"{\""	<<	fdes.getName()	<<	"\""																															//	name
+												<<	",	\""	<<	fdes.getFullyQualifiedMangledTypeName("__")	<<	"\""	//	type_name
+												<<	",	\""	<<	fdes.getUnits()	<<	"\""																													//	units
+												<<	",	\"\",	\"\","	<<	std::endl																																			//	alias,	user_defined
+												<<	"		\""	<<	fdes.getDescription()	<<	"\","	<<	std::endl									//	description
+												<<	"		"	<<	fdes.getIO()																																										//	io
+												<<	","	<<	fdes.getEnumString()	;																																	//	type
+				//	There	are	several	cases	when	printing	the	size	of	a	variable.
+				if	(	fdes.isBitField()	)	{
+								//	bitfields	are	handled	in	4	byte	(32	bit)	chunks
+								ostream	<<	",	4"	;
+				}	else	if	(		fdes.isRecord()	or	fdes.isEnum()	or	fdes.getTypeName().empty()	)	{
+								//	records	enums	use	io_src_get_size.	The	sentinel	has	no	typename
+								ostream	<<	",	0"	;
+				}	else	{
+								//	print	size	of	the	underlying	type
+								ostream	<<	",	sizeof("	<<	fdes.getTypeName()	<<	")"	;
+				}
+				ostream	<<	",	0,	0,	Language_CPP"	;	//	range_min,	range_max,	language
+				//	mods	(see	attributes.h	for	descriptions)
+				ostream	<<	",	"	<<	fdes.isReference()	+	(fdes.isStatic()	<<	1)	+	(fdes.isDashDashUnits()	<<	2)	+	(fdes.isReference()	?	(((fdes.getFieldWidth()	/	8)	&	0x3F)	<<	3)	:	0)	<<	","	<<	std::endl	;	//	mods
+				if	(	fdes.isBitField()	)	{
+								//	For	bitfields	we	need	the	offset	to	start	on	4	byte	boundaries	because	that	is	what	our
+								//	insert	and	extract	bitfield	routines	work	with.
+								ostream	<<	"		"	<<	(fdes.getFieldOffset()	-	(fdes.getFieldOffset()	%	32))	/	8	;	//	offset
+				}	else	{
+								ostream	<<	"		"	<<	(fdes.getFieldOffset()	/	8)	;	//	offset
+				}
+				ostream	<<	",	NULL"	;	//	attr
+				ostream	<<	",	"	<<	fdes.getNumDims()	;																//	num_index
+
+				ostream	<<	",	{"	;
+				if	(	fdes.isBitField()	)	{
+								ostream	<<	"{"	<<	fdes.getBitFieldWidth()	;	//	size	of	bitfield
+								ostream	<<	",	"	<<	32	-	(fdes.getFieldOffset()	%	32)	-	fdes.getBitFieldWidth()	<<	"}"	;	//	start	bit
+				}	else	{
+								array_dim	=	fdes.getArrayDim(0)	;
+								if	(	array_dim	<	0	)	array_dim	=	0	;
+								ostream	<<	"{"	<<	array_dim	<<	",	0}"	;	//	index	0
+				}
+				unsigned	int	ii	;
+				for	(	ii	=	1	;	ii	<	8	;	ii++	)	{
+								array_dim	=	fdes.getArrayDim(ii)	;
+								if	(	array_dim	<	0	)	array_dim	=	0	;
+								ostream	<<	",	{"	<<	array_dim	<<	",	0}"	;	//	indexes	1	through	7
+				}
+				ostream	<<	"},"	<<	std::endl	;
+				ostream	<<	"		NULL,	NULL,	NULL,	NULL"	;
+				ostream	<<	"}"	;
 }
 
-/** Prints class attributes */
-void PrintFileContents10::print_class_attr(std::ostream & ostream , ClassValues * c ) {
+/**	Prints	class	attributes	*/
+void	PrintFileContents10::print_class_attr(std::ostream	&	ostream	,	ClassValues	*	c	)	{
 
-    print_open_extern_c(ostream) ;
-    ostream << "ATTRIBUTES attr" << c->getFullyQualifiedMangledTypeName("__") << "[] = {" << std::endl ;
+				print_open_extern_c(ostream)	;
+				ostream	<<	"ATTRIBUTES	attr"	<<	c->getFullyQualifiedMangledTypeName("__")	<<	"[]	=	{"	<<	std::endl	;
 
-    for (FieldDescription* fieldDescription : getPrintableFields(*c)) {
-            print_field_attr(ostream, *fieldDescription) ;
-            ostream << "," << std::endl ;
-    }
-    // Print an empty sentinel attribute at the end of the class.
-    FieldDescription new_fdes(std::string("")) ;
-    print_field_attr(ostream, new_fdes) ;
-    ostream << " };" << std::endl ;
+				for	(FieldDescription*	fieldDescription	:	getPrintableFields(*c))	{
+												print_field_attr(ostream,	*fieldDescription)	;
+												ostream	<<	","	<<	std::endl	;
+				}
+				//	Print	an	empty	sentinel	attribute	at	the	end	of	the	class.
+				FieldDescription	new_fdes(std::string(""))	;
+				print_field_attr(ostream,	new_fdes)	;
+				ostream	<<	"	};"	<<	std::endl	;
 
-    print_close_extern_c(ostream) ;
+				print_close_extern_c(ostream)	;
 }
 
-/** Prints init_attr function for each class */
-void PrintFileContents10::print_field_init_attr_stmts( std::ostream & ostream , FieldDescription * fdes ,
- ClassValues * cv , unsigned int index ) {
-
-    const std::string className = cv->getName();
-    const std::string mangledClassName = cv->getMangledTypeName();
-    const std::string fieldName = fdes->getName();
-    const std::string fullyQualifiedClassNameColons = cv->getFullyQualifiedTypeName();
-    const std::string fullyQualifiedMangledClassNameColons = cv->getFullyQualifiedMangledTypeName();
-    const std::string fullyQualifiedMangledClassNameUnderscores = cv->getFullyQualifiedMangledTypeName("__");
-    std::ostringstream oss;
-    oss << "    attr" << fullyQualifiedMangledClassNameUnderscores << "[" << index << "].";
-    const std::string prefix = oss.str();
-
-    if ( fdes->isStatic() ) {
-        ostream << prefix << "offset = (long)(void *)&" << fullyQualifiedClassNameColons << "::" << fieldName << " ;\n" ;
-    }
-    else if ( global_compat15 or cv->isCompat15() ) {
-        if ( fdes->isBitField() ) {
-            ostream << prefix << "offset = " << fdes->getBitFieldByteOffset() << " ;\n" ;
-            ostream << prefix << "size = sizeof(unsigned int) ;\n" ;
-        }
-        else if ( fdes->isVirtualInherited() ) {
-            ostream << prefix << "offset = " << fdes->getBaseClassOffset() << " + offsetof(" << fdes->getContainerClass() << ", " << fieldName << ") ;\n" ;
-        }
-        else if ( mangledClassName != className ) {
-            ostream << prefix << "offset = " << "offsetof(" << mangledClassName << ", " << fieldName << ") ;\n" ;
-        }
-        else {
-            ostream << prefix << "offset = " << "offsetof(" << fullyQualifiedMangledClassNameColons << ", " << fieldName << ") ;\n" ;
-        }
-    }
-
-    if ( fdes->isSTL() ) {
-        auto print = [&](const std::string& field) {
-            ostream << prefix << field << " = " << field << "_" << fullyQualifiedMangledClassNameUnderscores + "_" + sanitize(fieldName) + " ;\n";
-        };
-
-        if ( fdes->isCheckpointable() ) {
-            print("checkpoint_stl");
-            print("post_checkpoint_stl");
-        }
-
-        if ( fdes->isRestorable() ) {
-            print("restore_stl");
-            if ( fdes->hasSTLClear() ) {
-                print("clear_stl");
-            }
-        }
-    }
-
-    if ( fdes->isRecord() or fdes->isEnum() ) {
-        ostream << "    trick_MM->add_attr_info(std::string(attr" << fullyQualifiedMangledClassNameUnderscores << "[" << index << "].type_name) , &attr" << fullyQualifiedMangledClassNameUnderscores << "[" << index << "], __FILE__ , __LINE__ ) ;\n" ;
-    }
+/**	Prints	init_attr	function	for	each	class	*/
+void	PrintFileContents10::print_field_init_attr_stmts(	std::ostream	&	ostream	,	FieldDescription	*	fdes	,
+	ClassValues	*	cv	,	unsigned	int	index	)	{
+
+				const	std::string	className	=	cv->getName();
+				const	std::string	mangledClassName	=	cv->getMangledTypeName();
+				const	std::string	fieldName	=	fdes->getName();
+				const	std::string	fullyQualifiedClassNameColons	=	cv->getFullyQualifiedTypeName();
+				const	std::string	fullyQualifiedMangledClassNameColons	=	cv->getFullyQualifiedMangledTypeName();
+				const	std::string	fullyQualifiedMangledClassNameUnderscores	=	cv->getFullyQualifiedMangledTypeName("__");
+				std::ostringstream	oss;
+				oss	<<	"				attr"	<<	fullyQualifiedMangledClassNameUnderscores	<<	"["	<<	index	<<	"].";
+				const	std::string	prefix	=	oss.str();
+
+				if	(	fdes->isStatic()	)	{
+								ostream	<<	prefix	<<	"offset	=	(long)(void	*)&"	<<	fullyQualifiedClassNameColons	<<	"::"	<<	fieldName	<<	"	;\n"	;
+				}
+				else	if	(	global_compat15	or	cv->isCompat15()	)	{
+								if	(	fdes->isBitField()	)	{
+												ostream	<<	prefix	<<	"offset	=	"	<<	fdes->getBitFieldByteOffset()	<<	"	;\n"	;
+												ostream	<<	prefix	<<	"size	=	sizeof(unsigned	int)	;\n"	;
+								}
+								else	if	(	fdes->isVirtualInherited()	)	{
+												ostream	<<	prefix	<<	"offset	=	"	<<	fdes->getBaseClassOffset()	<<	"	+	offsetof("	<<	fdes->getContainerClass()	<<	",	"	<<	fieldName	<<	")	;\n"	;
+								}
+								else	if	(	mangledClassName	!=	className	)	{
+												ostream	<<	prefix	<<	"offset	=	"	<<	"offsetof("	<<	mangledClassName	<<	",	"	<<	fieldName	<<	")	;\n"	;
+								}
+								else	{
+												ostream	<<	prefix	<<	"offset	=	"	<<	"offsetof("	<<	fullyQualifiedMangledClassNameColons	<<	",	"	<<	fieldName	<<	")	;\n"	;
+								}
+				}
+
+				if	(	fdes->isSTL()	)	{
+								auto	print	=	[&](const	std::string&	field)	{
+												ostream	<<	prefix	<<	field	<<	"	=	"	<<	field	<<	"_"	<<	fullyQualifiedMangledClassNameUnderscores	+	"_"	+	sanitize(fieldName)	+	"	;\n";
+								};
+
+								if	(	fdes->isCheckpointable()	)	{
+												print("checkpoint_stl");
+												print("post_checkpoint_stl");
+								}
+
+								if	(	fdes->isRestorable()	)	{
+												print("restore_stl");
+												if	(	fdes->hasSTLClear()	)	{
+																print("clear_stl");
+												}
+								}
+				}
+
+				if	(	fdes->isRecord()	or	fdes->isEnum()	)	{
+								ostream	<<	"				trick_MM->add_attr_info(std::string(attr"	<<	fullyQualifiedMangledClassNameUnderscores	<<	"["	<<	index	<<	"].type_name)	,	&attr"	<<	fullyQualifiedMangledClassNameUnderscores	<<	"["	<<	index	<<	"],	__FILE__	,	__LINE__	)	;\n"	;
+				}
 }
 
-/** Prints add_attr_info statements for each inherited class */
-void PrintFileContents10::print_inherited_add_attr_info( std::ostream & ostream , ClassValues * cv ) {
-    auto inheritedClasses = cv->getInheritedClasses();
-    if ( inheritedClasses.size() > 0 ) {
-        ostream << "\n    ATTRIBUTES temp_attr ;\n\n" ;
-    }
-    for ( auto& inheritedClass : inheritedClasses ) {
-        ostream << "    trick_MM->add_attr_info( std::string(\"" << inheritedClass << "\"), &temp_attr , __FILE__ , __LINE__ ) ;\n" ;
-    }
+/**	Prints	add_attr_info	statements	for	each	inherited	class	*/
+void	PrintFileContents10::print_inherited_add_attr_info(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				auto	inheritedClasses	=	cv->getInheritedClasses();
+				if	(	inheritedClasses.size()	>	0	)	{
+								ostream	<<	"\n				ATTRIBUTES	temp_attr	;\n\n"	;
+				}
+				for	(	auto&	inheritedClass	:	inheritedClasses	)	{
+								ostream	<<	"				trick_MM->add_attr_info(	std::string(\""	<<	inheritedClass	<<	"\"),	&temp_attr	,	__FILE__	,	__LINE__	)	;\n"	;
+				}
 }
 
-/** Prints init_attr function for each class */
-void PrintFileContents10::print_init_attr_func( std::ostream & ostream , ClassValues * cv ) {
-    cv->printOpenNamespaceBlocks(ostream) ;
-    ostream << "\nvoid init_attr" << cv->getFullyQualifiedMangledTypeName("__") << "() {\n\n"
-            << "    static int initialized ;\n"
-            << "    if (initialized) {\n"
-            << "        return;\n"
-            << "    }\n"
-            << "    initialized = 1;\n\n" ;
-
-    unsigned int ii = 0;
-    for ( FieldDescription* field : getPrintableFields(*cv) ) {
-        print_field_init_attr_stmts(ostream, field, cv, ii++) ;
-    }
-    print_inherited_add_attr_info(ostream, cv ) ;
-    ostream << "}\n" ;
-    cv->printCloseNamespaceBlocks(ostream) ;
+/**	Prints	init_attr	function	for	each	class	*/
+void	PrintFileContents10::print_init_attr_func(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				cv->printOpenNamespaceBlocks(ostream)	;
+				ostream	<<	"\nvoid	init_attr"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"()	{\n\n"
+												<<	"				static	int	initialized	;\n"
+												<<	"				if	(initialized)	{\n"
+												<<	"								return;\n"
+												<<	"				}\n"
+												<<	"				initialized	=	1;\n\n"	;
+
+				unsigned	int	ii	=	0;
+				for	(	FieldDescription*	field	:	getPrintableFields(*cv)	)	{
+								print_field_init_attr_stmts(ostream,	field,	cv,	ii++)	;
+				}
+				print_inherited_add_attr_info(ostream,	cv	)	;
+				ostream	<<	"}\n"	;
+				cv->printCloseNamespaceBlocks(ostream)	;
 }
 
-/** Prints the io_src_sizeof function for enumerations */
-void PrintFileContents10::print_enum_io_src_sizeof( std::ostream & ostream , EnumValues * ev ) {
-    print_open_extern_c(ostream) ;
-    ostream << "size_t io_src_sizeof_" << ev->getFullyQualifiedName("__") << "( void ) {\n" ;
-    if ( ev->getHasDefinition() ) {
-        ostream << "    return sizeof(" << ev->getFullyQualifiedName() << ")" ;
-    } else {
-        ostream << "    return sizeof(int)" ;
-    }
-    ostream << ";\n}\n" ;
-    print_close_extern_c(ostream) ;
+/**	Prints	the	io_src_sizeof	function	for	enumerations	*/
+void	PrintFileContents10::print_enum_io_src_sizeof(	std::ostream	&	ostream	,	EnumValues	*	ev	)	{
+				print_open_extern_c(ostream)	;
+				ostream	<<	"size_t	io_src_sizeof_"	<<	ev->getFullyQualifiedName("__")	<<	"(	void	)	{\n"	;
+				if	(	ev->getHasDefinition()	)	{
+								ostream	<<	"				return	sizeof("	<<	ev->getFullyQualifiedName()	<<	")"	;
+				}	else	{
+								ostream	<<	"				return	sizeof(int)"	;
+				}
+				ostream	<<	";\n}\n"	;
+				print_close_extern_c(ostream)	;
 }
 
-/** Prints the C linkage init_attr function */
-void PrintFileContents10::print_init_attr_c_intf( std::ostream & ostream , ClassValues * cv ) {
-    ostream << "void init_attr" << cv->getFullyQualifiedMangledTypeName("__") << "_c_intf() {\n    " ;
-    cv->printNamespaces( ostream, "::" ) ;
-    ostream << "init_attr" << cv->getFullyQualifiedMangledTypeName("__") << "() ;\n"
-            << "}\n\n" ;
+/**	Prints	the	C	linkage	init_attr	function	*/
+void	PrintFileContents10::print_init_attr_c_intf(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				ostream	<<	"void	init_attr"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"_c_intf()	{\n				"	;
+				cv->printNamespaces(	ostream,	"::"	)	;
+				ostream	<<	"init_attr"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"()	;\n"
+												<<	"}\n\n"	;
 }
 
-/** Prints the io_src_sizeof function */
-void PrintFileContents10::print_io_src_sizeof( std::ostream & ostream , ClassValues * cv ) {
-    ostream << "size_t io_src_sizeof_" << cv->getFullyQualifiedMangledTypeName("__") << "() {\n" ;
-    ostream << "    return sizeof(" << cv->getFullyQualifiedNameIfEqual() << ") ;\n}\n\n" ;
+/**	Prints	the	io_src_sizeof	function	*/
+void	PrintFileContents10::print_io_src_sizeof(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				ostream	<<	"size_t	io_src_sizeof_"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"()	{\n"	;
+				ostream	<<	"				return	sizeof("	<<	cv->getFullyQualifiedNameIfEqual()	<<	")	;\n}\n\n"	;
 }
 
-/** Prints the io_src_allocate function */
-void PrintFileContents10::print_io_src_allocate( std::ostream & ostream , ClassValues * cv ) {
-    if ( cv->isPOD() or ( !cv->isAbstract() and cv->getHasDefaultConstructor()) ) {
-        const std::string name = cv->getFullyQualifiedNameIfEqual();
-        ostream << "void* io_src_allocate_" << cv->getFullyQualifiedMangledTypeName("__") <<  "(int num) {\n" ;
-        ostream << "    " << name << "* temp = (" << name << "*)calloc(num, sizeof(" << name << "));\n" ;
-        if ( ! cv->isPOD() ) {
-            ostream << "    for (int ii = 0; ii < num; ++ii) {\n" ;
-            ostream << "        new(&temp[ii]) " << name << "();\n    }\n" ;
-        }
-        ostream << "    return (void*)temp;\n" << "}\n\n" ;
-    }
+/**	Prints	the	io_src_allocate	function	*/
+void	PrintFileContents10::print_io_src_allocate(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				if	(	cv->isPOD()	or	(	!cv->isAbstract()	and	cv->getHasDefaultConstructor())	)	{
+								const	std::string	name	=	cv->getFullyQualifiedNameIfEqual();
+								ostream	<<	"void*	io_src_allocate_"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<		"(int	num)	{\n"	;
+								ostream	<<	"				"	<<	name	<<	"*	temp	=	("	<<	name	<<	"*)calloc(num,	sizeof("	<<	name	<<	"));\n"	;
+								if	(	!	cv->isPOD()	)	{
+												ostream	<<	"				for	(int	ii	=	0;	ii	<	num;	++ii)	{\n"	;
+												ostream	<<	"								new(&temp[ii])	"	<<	name	<<	"();\n				}\n"	;
+								}
+								ostream	<<	"				return	(void*)temp;\n"	<<	"}\n\n"	;
+				}
 }
 
-/** Prints the io_src_allocate function */
-void PrintFileContents10::print_io_src_destruct( std::ostream & ostream , ClassValues * cv ) {
-    if ( cv->getHasPublicDestructor() ) {
-        ostream << "void io_src_destruct_" << cv->getFullyQualifiedMangledTypeName("__") << "(void* address __attribute__((unused)), int num __attribute__((unused))) {\n" ;
-        if ( ! cv->isPOD() ) {
-            // Add a using statement so we can call the destructor without fully qualifying it.
-            auto namespaces = cv->getNamespaces();
-            if (namespaces.size()) {
-                ostream << "    using namespace " ;
-                auto last = namespaces[namespaces.size() - 1];
-                for (auto& name : namespaces) {
-                    ostream << name;
-                    if (name != last) {
-                        ostream << "::";
-                    }
-                }
-                ostream << ";\n    " ;
-            }
-
-            const std::string name = cv->getName();
-            const std::string qualifiedName = cv->getFullyQualifiedNameIfEqual();
-
-            ostream << qualifiedName << "* temp = (" << qualifiedName << "*)address;\n" ;
-            if ( cv->getMangledTypeName() == name ) {
-                ostream << "    for (int ii = 0; ii < num; ++ii) {\n"
-                        << "        temp[ii].~" << name << "();\n"
-                        << "    }\n" ;
-            }
-        }
-        ostream << "}\n\n" ;
-    }
+/**	Prints	the	io_src_allocate	function	*/
+void	PrintFileContents10::print_io_src_destruct(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				if	(	cv->getHasPublicDestructor()	)	{
+								ostream	<<	"void	io_src_destruct_"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"(void*	address	__attribute__((unused)),	int	num	__attribute__((unused)))	{\n"	;
+								if	(	!	cv->isPOD()	)	{
+												//	Add	a	using	statement	so	we	can	call	the	destructor	without	fully	qualifying	it.
+												auto	namespaces	=	cv->getNamespaces();
+												if	(namespaces.size())	{
+																ostream	<<	"				using	namespace	"	;
+																auto	last	=	namespaces[namespaces.size()	-	1];
+																for	(auto&	name	:	namespaces)	{
+																				ostream	<<	name;
+																				if	(name	!=	last)	{
+																								ostream	<<	"::";
+																				}
+																}
+																ostream	<<	";\n				"	;
+												}
+
+												const	std::string	name	=	cv->getName();
+												const	std::string	qualifiedName	=	cv->getFullyQualifiedNameIfEqual();
+
+												ostream	<<	qualifiedName	<<	"*	temp	=	("	<<	qualifiedName	<<	"*)address;\n"	;
+												if	(	cv->getMangledTypeName()	==	name	)	{
+																ostream	<<	"				for	(int	ii	=	0;	ii	<	num;	++ii)	{\n"
+																								<<	"								temp[ii].~"	<<	name	<<	"();\n"
+																								<<	"				}\n"	;
+												}
+								}
+								ostream	<<	"}\n\n"	;
+				}
 }
 
-void PrintFileContents10::print_io_src_delete( std::ostream & ostream , ClassValues * cv ) {
-    if ( cv->getHasPublicDestructor() ) {
-        ostream << "void io_src_delete_" << cv->getFullyQualifiedMangledTypeName("__") << "(void* address" ;
-        if ( ! cv->isPOD() ) {
-            ostream << ") {\n    delete (" << cv->getFullyQualifiedNameIfEqual() <<  "*)address;\n" ;
-        }
-        else {
-            ostream << " __attribute__((unused))) {" ;
-        }
-        ostream << "}\n" ;
-    }
+void	PrintFileContents10::print_io_src_delete(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				if	(	cv->getHasPublicDestructor()	)	{
+								ostream	<<	"void	io_src_delete_"	<<	cv->getFullyQualifiedMangledTypeName("__")	<<	"(void*	address"	;
+								if	(	!	cv->isPOD()	)	{
+												ostream	<<	")	{\n				delete	("	<<	cv->getFullyQualifiedNameIfEqual()	<<		"*)address;\n"	;
+								}
+								else	{
+												ostream	<<	"	__attribute__((unused)))	{"	;
+								}
+								ostream	<<	"}\n"	;
+				}
 }
 
-void PrintFileContents10::print_checkpoint_stl(std::ostream & ostream , FieldDescription * fdes , ClassValues * cv ) {
-    printStlFunction("checkpoint", "void* start_address, const char* obj_name , const char* var_name", "checkpoint_stl(*stl, obj_name, var_name)", ostream, *fdes, *cv);
+void	PrintFileContents10::print_checkpoint_stl(std::ostream	&	ostream	,	FieldDescription	*	fdes	,	ClassValues	*	cv	)	{
+				printStlFunction("checkpoint",	"void*	start_address,	const	char*	obj_name	,	const	char*	var_name",	"checkpoint_stl(*stl,	obj_name,	var_name)",	ostream,	*fdes,	*cv);
 }
 
-void PrintFileContents10::print_post_checkpoint_stl(std::ostream & ostream , FieldDescription * fdes , ClassValues * cv ) {
-    printStlFunction("post_checkpoint", "void* start_address, const char* obj_name , const char* var_name", "delete_stl(*stl, obj_name, var_name)", ostream, *fdes, *cv);
+void	PrintFileContents10::print_post_checkpoint_stl(std::ostream	&	ostream	,	FieldDescription	*	fdes	,	ClassValues	*	cv	)	{
+				printStlFunction("post_checkpoint",	"void*	start_address,	const	char*	obj_name	,	const	char*	var_name",	"delete_stl(*stl,	obj_name,	var_name)",	ostream,	*fdes,	*cv);
 }
 
-void PrintFileContents10::print_restore_stl(std::ostream & ostream , FieldDescription * fdes , ClassValues * cv ) {
-    printStlFunction("restore", "void* start_address, const char* obj_name , const char* var_name", "restore_stl(*stl, obj_name, var_name)",ostream, *fdes, *cv);
+void	PrintFileContents10::print_restore_stl(std::ostream	&	ostream	,	FieldDescription	*	fdes	,	ClassValues	*	cv	)	{
+				printStlFunction("restore",	"void*	start_address,	const	char*	obj_name	,	const	char*	var_name",	"restore_stl(*stl,	obj_name,	var_name)",ostream,	*fdes,	*cv);
 }
 
-void PrintFileContents10::print_clear_stl(std::ostream & ostream , FieldDescription * fdes , ClassValues * cv ) {
-    printStlFunction("clear", "void* start_address", "stl->clear()",ostream, *fdes, *cv);
+void	PrintFileContents10::print_clear_stl(std::ostream	&	ostream	,	FieldDescription	*	fdes	,	ClassValues	*	cv	)	{
+				printStlFunction("clear",	"void*	start_address",	"stl->clear()",ostream,	*fdes,	*cv);
 }
 
-void PrintFileContents10::print_stl_helper(std::ostream & ostream , ClassValues * cv ) {
-    std::vector<FieldDescription*> fieldDescriptions = getPrintableFields(*cv, 0x3 << 2);
-    fieldDescriptions.erase(std::remove_if(fieldDescriptions.begin(), fieldDescriptions.end(), [](FieldDescription* field) {return !field->isSTL();}), fieldDescriptions.end());
-
-    if (!fieldDescriptions.size()) {
-        return;
-    }
-
-    print_open_extern_c(ostream) ;
-
-    for (FieldDescription* field : fieldDescriptions) {
-        if (field->isCheckpointable()) {
-            print_checkpoint_stl(ostream, field, cv) ;
-            print_post_checkpoint_stl(ostream, field, cv) ;
-        }
-        if (field->isRestorable()) {
-            print_restore_stl(ostream, field, cv) ;
-            if (field->hasSTLClear()) {
-                print_clear_stl(ostream, field, cv) ;
-            }
-        }
-    }
-
-    print_close_extern_c(ostream) ;
+void	PrintFileContents10::print_stl_helper(std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				std::vector<FieldDescription*>	fieldDescriptions	=	getPrintableFields(*cv,	0x3	<<	2);
+				fieldDescriptions.erase(std::remove_if(fieldDescriptions.begin(),	fieldDescriptions.end(),	[](FieldDescription*	field)	{return	!field->isSTL();}),	fieldDescriptions.end());
+
+				if	(!fieldDescriptions.size())	{
+								return;
+				}
+
+				print_open_extern_c(ostream)	;
+
+				for	(FieldDescription*	field	:	fieldDescriptions)	{
+								if	(field->isCheckpointable())	{
+												print_checkpoint_stl(ostream,	field,	cv)	;
+												print_post_checkpoint_stl(ostream,	field,	cv)	;
+								}
+								if	(field->isRestorable())	{
+												print_restore_stl(ostream,	field,	cv)	;
+												if	(field->hasSTLClear())	{
+																print_clear_stl(ostream,	field,	cv)	;
+												}
+								}
+				}
+
+				print_close_extern_c(ostream)	;
 }
 
-void PrintFileContents10::printClass( std::ostream & ostream , ClassValues * cv ) {
-    print_class_attr(ostream, cv) ;
-    print_stl_helper(ostream, cv) ;
-    print_init_attr_func(ostream, cv) ;
-    ostream << std::endl;
-    print_open_extern_c(ostream) ;
-    print_init_attr_c_intf(ostream, cv) ;
-    print_io_src_sizeof(ostream, cv) ;
-    print_io_src_allocate(ostream, cv) ;
-    print_io_src_destruct(ostream, cv) ;
-    print_io_src_delete(ostream, cv) ;
-    print_close_extern_c(ostream) ;
-    print_units_map(ostream, cv) ;
+void	PrintFileContents10::printClass(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				print_class_attr(ostream,	cv)	;
+				print_stl_helper(ostream,	cv)	;
+				print_init_attr_func(ostream,	cv)	;
+				ostream	<<	std::endl;
+				print_open_extern_c(ostream)	;
+				print_init_attr_c_intf(ostream,	cv)	;
+				print_io_src_sizeof(ostream,	cv)	;
+				print_io_src_allocate(ostream,	cv)	;
+				print_io_src_destruct(ostream,	cv)	;
+				print_io_src_delete(ostream,	cv)	;
+				print_close_extern_c(ostream)	;
+				print_units_map(ostream,	cv)	;
 }
 
-void PrintFileContents10::printEnum( std::ostream & ostream , EnumValues * ev ) {
-    print_enum_attr(ostream, ev) ;
-    print_enum_io_src_sizeof(ostream, ev) ;
+void	PrintFileContents10::printEnum(	std::ostream	&	ostream	,	EnumValues	*	ev	)	{
+				print_enum_attr(ostream,	ev)	;
+				print_enum_io_src_sizeof(ostream,	ev)	;
 }
 
-void PrintFileContents10::printClassMapHeader( std::ostream & ostream , std::string function_name ) {
-     ostream <<
+void	PrintFileContents10::printClassMapHeader(	std::ostream	&	ostream	,	std::string	function_name	)	{
+					ostream	<<
 "/*\n"
-" * This file was automatically generated by the ICG\n"
-" * This file contains the map from class/struct names to attributes\n"
-" */\n\n"
-"#include <map>\n"
-"#include <string>\n\n"
-"#include \"trick/AttributesMap.hh\"\n"
-"#include \"trick/EnumAttributesMap.hh\"\n"
-"#include \"trick/attributes.h\"\n\n"
-"void " << function_name << "() {\n\n"
-"    Trick::AttributesMap * class_attribute_map = Trick::AttributesMap::attributes_map();\n\n" ;
+"	*	This	file	was	automatically	generated	by	the	ICG\n"
+"	*	This	file	contains	the	map	from	class/struct	names	to	attributes\n"
+"	*/\n\n"
+"#include	<map>\n"
+"#include	<string>\n\n"
+"#include	\"trick/AttributesMap.hh\"\n"
+"#include	\"trick/EnumAttributesMap.hh\"\n"
+"#include	\"trick/attributes.h\"\n\n"
+"void	"	<<	function_name	<<	"()	{\n\n"
+"				Trick::AttributesMap	*	class_attribute_map	=	Trick::AttributesMap::attributes_map();\n\n"	;
 }
 
-void PrintFileContents10::printClassMap( std::ostream & ostream , ClassValues * cv ) {
-    std::string name = cv->getFullyQualifiedMangledTypeName("__");
-    ostream << "    // " << cv->getFileName() << std::endl
-            << "    extern ATTRIBUTES  attr" << name << "[] ;" << std::endl
-            << "    class_attribute_map->add_attr(\"" << cv->getFullyQualifiedMangledTypeName() << "\" , attr" << name << ") ;" << std::endl ;
+void	PrintFileContents10::printClassMap(	std::ostream	&	ostream	,	ClassValues	*	cv	)	{
+				std::string	name	=	cv->getFullyQualifiedMangledTypeName("__");
+				ostream	<<	"				//	"	<<	cv->getFileName()	<<	std::endl
+												<<	"				extern	ATTRIBUTES		attr"	<<	name	<<	"[]	;"	<<	std::endl
+												<<	"				class_attribute_map->add_attr(\""	<<	cv->getFullyQualifiedMangledTypeName()	<<	"\"	,	attr"	<<	name	<<	")	;"	<<	std::endl	;
 }
 
-void PrintFileContents10::printClassMapFooter( std::ostream & ostream ) {
-     ostream << "}" << std::endl << std::endl ;
+void	PrintFileContents10::printClassMapFooter(	std::ostream	&	ostream	)	{
+					ostream	<<	"}"	<<	std::endl	<<	std::endl	;
 }
 
-void PrintFileContents10::printEnumMapHeader( std::ostream & ostream , std::string function_name ) {
-     ostream << "void " << function_name << "() {\n"
-             << "    Trick::EnumAttributesMap* enum_attribute_map __attribute__((unused)) = Trick::EnumAttributesMap::attributes_map();\n\n" ;
+void	PrintFileContents10::printEnumMapHeader(	std::ostream	&	ostream	,	std::string	function_name	)	{
+					ostream	<<	"void	"	<<	function_name	<<	"()	{\n"
+													<<	"				Trick::EnumAttributesMap*	enum_attribute_map	__attribute__((unused))	=	Trick::EnumAttributesMap::attributes_map();\n\n"	;
 }
 
-void PrintFileContents10::printEnumMap( std::ostream & ostream , EnumValues * ev ) {
-    std::string name = ev->getFullyQualifiedTypeName("__");
-    ostream << "    extern ENUM_ATTR enum" << name << "[];" << std::endl
-            << "    enum_attribute_map->add_attr(\"" << ev->getFullyQualifiedTypeName() << "\", enum" << name << ");" << std::endl ;
+void	PrintFileContents10::printEnumMap(	std::ostream	&	ostream	,	EnumValues	*	ev	)	{
+				std::string	name	=	ev->getFullyQualifiedTypeName("__");
+				ostream	<<	"				extern	ENUM_ATTR	enum"	<<	name	<<	"[];"	<<	std::endl
+												<<	"				enum_attribute_map->add_attr(\""	<<	ev->getFullyQualifiedTypeName()	<<	"\",	enum"	<<	name	<<	");"	<<	std::endl	;
 }
 
-void PrintFileContents10::printEnumMapFooter( std::ostream & ostream ) {
-     ostream << "}" << std::endl << std::endl ;
+void	PrintFileContents10::printEnumMapFooter(	std::ostream	&	ostream	)	{
+					ostream	<<	"}"	<<	std::endl	<<	std::endl	;
 }
 
-void PrintFileContents10::printStlFunction(const std::string& name, const std::string& parameters, const std::string& call, std::ostream& ostream, FieldDescription& fieldDescription, ClassValues& classValues) {
-    const std::string typeName = fieldDescription.getTypeName();
-    const std::string functionName = name + "_stl";
-    ostream << "void " << functionName << "_" << classValues.getFullyQualifiedMangledTypeName("__") << "_" << sanitize(fieldDescription.getName())
-            << "(" << parameters << ") {" << std::endl
-            << "    " << typeName << "* stl = reinterpret_cast<" << typeName << "*>(start_address);" << std::endl
-            << "    " << call << ";" << std::endl
-            << "}" << std::endl ;
+void	PrintFileContents10::printStlFunction(const	std::string&	name,	const	std::string&	parameters,	const	std::string&	call,	std::ostream&	ostream,	FieldDescription&	fieldDescription,	ClassValues&	classValues)	{
+				const	std::string	typeName	=	fieldDescription.getTypeName();
+				const	std::string	functionName	=	name	+	"_stl";
+				ostream	<<	"void	"	<<	functionName	<<	"_"	<<	classValues.getFullyQualifiedMangledTypeName("__")	<<	"_"	<<	sanitize(fieldDescription.getName())
+												<<	"("	<<	parameters	<<	")	{"	<<	std::endl
+												<<	"				"	<<	typeName	<<	"*	stl	=	reinterpret_cast<"	<<	typeName	<<	"*>(start_address);"	<<	std::endl
+												<<	"				"	<<	call	<<	";"	<<	std::endl
+												<<	"}"	<<	std::endl	;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/PrintFileContentsBase.cpp b/trick_source/codegen/Interface_Code_Gen/PrintFileContentsBase.cpp
index 25d656506..e1deda85c 100644
--- a/trick_source/codegen/Interface_Code_Gen/PrintFileContentsBase.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/PrintFileContentsBase.cpp
@@ -1,89 +1,89 @@
 
-#include <sys/stat.h>
-#include <libgen.h>
-#include <string.h>
-#include <iomanip>
-#include <sstream>
+#include	<sys/stat.h>
+#include	<libgen.h>
+#include	<string.h>
+#include	<iomanip>
+#include	<sstream>
 
-#include "llvm/Support/CommandLine.h"
+#include	"llvm/Support/CommandLine.h"
 
-#include "PrintFileContentsBase.hh"
-#include "FieldDescription.hh"
-#include "ClassValues.hh"
-#include "EnumValues.hh"
+#include	"PrintFileContentsBase.hh"
+#include	"FieldDescription.hh"
+#include	"ClassValues.hh"
+#include	"EnumValues.hh"
 
-extern llvm::cl::opt< bool > global_compat15 ;
+extern	llvm::cl::opt<	bool	>	global_compat15	;
 
-PrintFileContentsBase::PrintFileContentsBase() {}
+PrintFileContentsBase::PrintFileContentsBase()	{}
 
-// provide empty default implementation of these routines.
-void PrintFileContentsBase::printClassMapHeader(std::ostream & ostream, std::string function_name ) {}
-void PrintFileContentsBase::printClassMap(std::ostream & ostream, ClassValues * cv) {}
-void PrintFileContentsBase::printClassMapFooter(std::ostream & ostream) {}
+//	provide	empty	default	implementation	of	these	routines.
+void	PrintFileContentsBase::printClassMapHeader(std::ostream	&	ostream,	std::string	function_name	)	{}
+void	PrintFileContentsBase::printClassMap(std::ostream	&	ostream,	ClassValues	*	cv)	{}
+void	PrintFileContentsBase::printClassMapFooter(std::ostream	&	ostream)	{}
 
-void PrintFileContentsBase::printEnumMapHeader(std::ostream & ostream, std::string function_name ) {}
-void PrintFileContentsBase::printEnumMap(std::ostream & ostream, EnumValues * ev) {}
-void PrintFileContentsBase::printEnumMapFooter(std::ostream & ostream) {}
+void	PrintFileContentsBase::printEnumMapHeader(std::ostream	&	ostream,	std::string	function_name	)	{}
+void	PrintFileContentsBase::printEnumMap(std::ostream	&	ostream,	EnumValues	*	ev)	{}
+void	PrintFileContentsBase::printEnumMapFooter(std::ostream	&	ostream)	{}
 
-void PrintFileContentsBase::print_units_map(std::ostream & ostream, ClassValues * cv ) {
-    const std::string name = cv->getFullyQualifiedMangledTypeName("__");
-    ostream << "struct UnitsMap" << name << " {\n" ;
+void	PrintFileContentsBase::print_units_map(std::ostream	&	ostream,	ClassValues	*	cv	)	{
+				const	std::string	name	=	cv->getFullyQualifiedMangledTypeName("__");
+				ostream	<<	"struct	UnitsMap"	<<	name	<<	"	{\n"	;
 
-    auto fields = getPrintableFields(*cv);
-    if (fields.size()) {
-        ostream << "    UnitsMap" << name << "() {\n"
-                << "        Trick::UnitsMap* units_map_ptr = Trick::UnitsMap::units_map();\n" ;
-        for (auto& field : fields) {
-            ostream << "        units_map_ptr->add_param(\"" ;
-            cv->printContainerClasses(ostream, "__");
-            ostream << cv->getName() << "_" << field->getName() << "\", \"" << field->getUnits() << "\") ;\n" ;
-        }
-        ostream << "    }\n" ;
-    }
+				auto	fields	=	getPrintableFields(*cv);
+				if	(fields.size())	{
+								ostream	<<	"				UnitsMap"	<<	name	<<	"()	{\n"
+																<<	"								Trick::UnitsMap*	units_map_ptr	=	Trick::UnitsMap::units_map();\n"	;
+								for	(auto&	field	:	fields)	{
+												ostream	<<	"								units_map_ptr->add_param(\""	;
+												cv->printContainerClasses(ostream,	"__");
+												ostream	<<	cv->getName()	<<	"_"	<<	field->getName()	<<	"\",	\""	<<	field->getUnits()	<<	"\")	;\n"	;
+								}
+								ostream	<<	"				}\n"	;
+				}
 
-    ostream << "} um" << name << ";\n\n" ;
+				ostream	<<	"}	um"	<<	name	<<	";\n\n"	;
 }
 
-/* Utility routines for printing */
-void PrintFileContentsBase::print_open_extern_c(std::ostream & ostream) {
-    ostream << "extern \"C\" {\n\n" ;
+/*	Utility	routines	for	printing	*/
+void	PrintFileContentsBase::print_open_extern_c(std::ostream	&	ostream)	{
+				ostream	<<	"extern	\"C\"	{\n\n"	;
 }
 
-void PrintFileContentsBase::print_close_extern_c(std::ostream & ostream) {
-    ostream << "\n} //extern \"C\"\n\n" ;
+void	PrintFileContentsBase::print_close_extern_c(std::ostream	&	ostream)	{
+				ostream	<<	"\n}	//extern	\"C\"\n\n"	;
 }
 
-/* internal function determines if a particular field is printable based
-   on access to the field and the presense of init_attr friends.
+/*	internal	function	determines	if	a	particular	field	is	printable	based
+			on	access	to	the	field	and	the	presense	of	init_attr	friends.
 */
-bool PrintFileContentsBase::isPrintable( ClassValues * c , FieldDescription * fdes , unsigned int ioMask) {
-    if ( !(fdes->getIO() & ioMask) || !fdes->getTypeName().compare("void") || !fdes->getEnumString().compare("TRICK_VOID")) {
-        return false;
-    }
-    if ( fdes->isSTL() and fdes->getNumDims() ) {
-        return false;
-    }
-    /**
-     * It is not possible to take the address of a reference as the referred-to variable's address
-     * is always returned. As such, the init_attr function cannot obtain the absolute address for
-     * static reference variables.
-     */
-    if ( fdes->isStatic() && fdes->isReference() ) {
-        return false;
-    }
-    if ( fdes->getAccess() == clang::AS_public || (!fdes->isStatic() && !global_compat15 && !c->isCompat15())) {
-        return true;
-    }
-    return c->getHasInitAttrFriend() && ( !fdes->isInherited() || fdes->getAccess() == clang::AS_protected ) ;
+bool	PrintFileContentsBase::isPrintable(	ClassValues	*	c	,	FieldDescription	*	fdes	,	unsigned	int	ioMask)	{
+				if	(	!(fdes->getIO()	&	ioMask)	||	!fdes->getTypeName().compare("void")	||	!fdes->getEnumString().compare("TRICK_VOID"))	{
+								return	false;
+				}
+				if	(	fdes->isSTL()	and	fdes->getNumDims()	)	{
+								return	false;
+				}
+				/**
+					*	It	is	not	possible	to	take	the	address	of	a	reference	as	the	referred-to	variable's	address
+					*	is	always	returned.	As	such,	the	init_attr	function	cannot	obtain	the	absolute	address	for
+					*	static	reference	variables.
+					*/
+				if	(	fdes->isStatic()	&&	fdes->isReference()	)	{
+								return	false;
+				}
+				if	(	fdes->getAccess()	==	clang::AS_public	||	(!fdes->isStatic()	&&	!global_compat15	&&	!c->isCompat15()))	{
+								return	true;
+				}
+				return	c->getHasInitAttrFriend()	&&	(	!fdes->isInherited()	||	fdes->getAccess()	==	clang::AS_protected	)	;
 }
 
-std::vector<FieldDescription*> PrintFileContentsBase::getPrintableFields(ClassValues& classValues, unsigned int ioMask) {
-    std::vector<FieldDescription*> results;
-    for (auto& field : classValues.getFieldDescriptions()) {
-        if (isPrintable(&classValues, field)) {
-            results.push_back(field);
-        }
-    }
-    return results;
+std::vector<FieldDescription*>	PrintFileContentsBase::getPrintableFields(ClassValues&	classValues,	unsigned	int	ioMask)	{
+				std::vector<FieldDescription*>	results;
+				for	(auto&	field	:	classValues.getFieldDescriptions())	{
+								if	(isPrintable(&classValues,	field))	{
+												results.push_back(field);
+								}
+				}
+				return	results;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
index 086342909..0e27c6292 100644
--- a/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
@@ -1,152 +1,152 @@
 
-#include <iostream>
-#include <fstream>
-#include <libgen.h>
-#include <sys/stat.h>
+#include	<iostream>
+#include	<fstream>
+#include	<libgen.h>
+#include	<sys/stat.h>
 
-#include "clang/AST/RecordLayout.h"
-#include "clang/Basic/FileManager.h"
+#include	"clang/AST/RecordLayout.h"
+#include	"clang/Basic/FileManager.h"
 
-#include "TranslationUnitVisitor.hh"
-#include "HeaderSearchDirs.hh"
-#include "ClassTemplateVisitor.hh"
-#include "ClassValues.hh"
-#include "ClassVisitor.hh"
-#include "EnumValues.hh"
-#include "EnumVisitor.hh"
-#include "TypedefVisitor.hh"
-#include "VariableVisitor.hh"
-#include "Utilities.hh"
-#include "PrintAttributes.hh"
-#include "BraceMacro.hh"
+#include	"TranslationUnitVisitor.hh"
+#include	"HeaderSearchDirs.hh"
+#include	"ClassTemplateVisitor.hh"
+#include	"ClassValues.hh"
+#include	"ClassVisitor.hh"
+#include	"EnumValues.hh"
+#include	"EnumVisitor.hh"
+#include	"TypedefVisitor.hh"
+#include	"VariableVisitor.hh"
+#include	"Utilities.hh"
+#include	"PrintAttributes.hh"
+#include	"BraceMacro.hh"
 
-TranslationUnitVisitor::TranslationUnitVisitor(clang::CompilerInstance & in_ci , HeaderSearchDirs & in_hsd ,
-  CommentSaver & in_cs , PrintAttributes & in_pa ) :
-  ci(in_ci) , hsd(in_hsd) , cs(in_cs) , pa(in_pa) {}
+TranslationUnitVisitor::TranslationUnitVisitor(clang::CompilerInstance	&	in_ci	,	HeaderSearchDirs	&	in_hsd	,
+		CommentSaver	&	in_cs	,	PrintAttributes	&	in_pa	)	:
+		ci(in_ci)	,	hsd(in_hsd)	,	cs(in_cs)	,	pa(in_pa)	{}
 
-bool TranslationUnitVisitor::TraverseDecl(clang::Decl *d) {
-    if (!d)
-        return true;
-    if (d->isImplicit())
-        return true;
+bool	TranslationUnitVisitor::TraverseDecl(clang::Decl	*d)	{
+				if	(!d)
+								return	true;
+				if	(d->isImplicit())
+								return	true;
 
-    //std::cout << "\nTranslationUnitVisitor " << d->getDeclKindName() << std::endl ;
-    //d->dump() ;
+				//std::cout	<<	"\nTranslationUnitVisitor	"	<<	d->getDeclKindName()	<<	std::endl	;
+				//d->dump()	;
 
-    switch ( d->getKind() ) {
-        case clang::Decl::TranslationUnit : {
-            TraverseTranslationUnitDecl(static_cast<clang::TranslationUnitDecl *>(d)) ;
-        }
-        break ;
-        case clang::Decl::CXXRecord : {
-            clang::CXXRecordDecl * crd = static_cast<clang::CXXRecordDecl *>(d) ;
-            clang::RecordDecl * rd = crd->getDefinition() ;
-            bool is_forward_declaration = false;
+				switch	(	d->getKind()	)	{
+								case	clang::Decl::TranslationUnit	:	{
+												TraverseTranslationUnitDecl(static_cast<clang::TranslationUnitDecl	*>(d))	;
+								}
+								break	;
+								case	clang::Decl::CXXRecord	:	{
+												clang::CXXRecordDecl	*	crd	=	static_cast<clang::CXXRecordDecl	*>(d)	;
+												clang::RecordDecl	*	rd	=	crd->getDefinition()	;
+												bool	is_forward_declaration	=	false;
 
-            /* The definition of the record must exist before we can process it.  The definition is
-               NULL when this is only a forward declaration of a class */
-            if ( rd == NULL ) {
-                is_forward_declaration = true;
-            }
-            /* Sometimes rd is not NULL when we still only have a forward declaration because
-               the file that defines the class is included before processing this fwd declare.
-               In this case the CXXRecordDecl file name will not match the current file name, and is
-               in fact empty */
-            else {
-                std::string rd_file = getFileName(ci , rd->RBRACELOC(), hsd) ;
-                std::string crd_file = getFileName(ci , crd->RBRACELOC(), hsd) ;
-                if (crd_file.empty() || crd_file.compare(rd_file)) {
-                    is_forward_declaration = true;
-                }
-            }
+												/*	The	definition	of	the	record	must	exist	before	we	can	process	it.		The	definition	is
+															NULL	when	this	is	only	a	forward	declaration	of	a	class	*/
+												if	(	rd	==	NULL	)	{
+																is_forward_declaration	=	true;
+												}
+												/*	Sometimes	rd	is	not	NULL	when	we	still	only	have	a	forward	declaration	because
+															the	file	that	defines	the	class	is	included	before	processing	this	fwd	declare.
+															In	this	case	the	CXXRecordDecl	file	name	will	not	match	the	current	file	name,	and	is
+															in	fact	empty	*/
+												else	{
+																std::string	rd_file	=	getFileName(ci	,	rd->RBRACELOC(),	hsd)	;
+																std::string	crd_file	=	getFileName(ci	,	crd->RBRACELOC(),	hsd)	;
+																if	(crd_file.empty()	||	crd_file.compare(rd_file))	{
+																				is_forward_declaration	=	true;
+																}
+												}
 
-            if (is_forward_declaration) {
-                // These are forward declarations.  Insert this into the set of fwd declares keyed by the current file.
-                if ( ! crd->getNameAsString().empty() ) {
-                    fwd_declared_classes[getFileName(ci , d->GETLOCEND(), hsd)].insert(crd->getNameAsString()) ;
-                }
-            }
-            else {
-                //crd->dump() ; std::cout << std::endl ;
-                if ( isInUserCode(ci , crd->RBRACELOC(), hsd) ) {
-                    CXXRecordVisitor cvis(ci , cs, hsd , pa, true) ;
+												if	(is_forward_declaration)	{
+																//	These	are	forward	declarations.		Insert	this	into	the	set	of	fwd	declares	keyed	by	the	current	file.
+																if	(	!	crd->getNameAsString().empty()	)	{
+																				fwd_declared_classes[getFileName(ci	,	d->GETLOCEND(),	hsd)].insert(crd->getNameAsString())	;
+																}
+												}
+												else	{
+																//crd->dump()	;	std::cout	<<	std::endl	;
+																if	(	isInUserCode(ci	,	crd->RBRACELOC(),	hsd)	)	{
+																				CXXRecordVisitor	cvis(ci	,	cs,	hsd	,	pa,	true)	;
 
-                    cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
-                    pa.printClass(cvis.get_class_data()) ;
+																				cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl	*>(d))	;
+																				pa.printClass(cvis.get_class_data())	;
 
-                    /* Check to see if the struct/class is forward declared in the same file.
-                       If it is, then remove the notation that it is forward declared.  This
-                       is to allow C structs to be forward declared and typedeffed and io_src
-                       code will be generated for both the original structure name and typedeffed
-                       name.
+																				/*	Check	to	see	if	the	struct/class	is	forward	declared	in	the	same	file.
+																							If	it	is,	then	remove	the	notation	that	it	is	forward	declared.		This
+																							is	to	allow	C	structs	to	be	forward	declared	and	typedeffed	and	io_src
+																							code	will	be	generated	for	both	the	original	structure	name	and	typedeffed
+																							name.
 
-                       struct Astruct ;
-                       typedef struct Astruct {} Bstruct ;
-                    */
-                    std::set< std::string >::iterator it ;
-                    std::string file_name = getFileName(ci , d->GETLOCEND(), hsd) ;
-                    std::string source_type = cvis.get_class_data()->getName() ;
-                    it = fwd_declared_classes[file_name].find(source_type) ;
-                    if ( it != fwd_declared_classes[file_name].end() ) {
-                        fwd_declared_classes[file_name].erase(it) ;
-                    }
-                }
-            }
-        }
-        break ;
-        case clang::Decl::Enum : {
-            clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ;
-            if ( isInUserCode(ci , ed->RBRACELOC(), hsd) ) {
-                EnumVisitor evis(ci, hsd) ;
-                // Before llvm 14, TraverseDecl also traversed the type.
-                // llvm believed this to be a bug, so now we call TraverseType
-                // in addition to TraverseDecl.
-                evis.TraverseDecl(ed) ;
-                #if (LIBCLANG_MAJOR >= 14)
-                evis.TraverseType(clang::QualType(ed->getTypeForDecl(), 0));
-                #endif
-                //if ( evis.get_enum_data() != NULL ) {
-                    pa.printEnum(evis.get_enum_data()) ;
-                //}
-            }
-        }
-        break ;
-        case clang::Decl::LinkageSpec : {
-            // This is an extern "C" block, traverse the node and the contents within the extern "C" block.
-            TraverseLinkageSpecDecl(static_cast<clang::LinkageSpecDecl *>(d)) ;
-        }
-        break ;
-        case clang::Decl::Namespace : {
-            TraverseNamespaceDecl(static_cast<clang::NamespaceDecl *>(d)) ;
-        }
-        break ;
-        case clang::Decl::ClassTemplate : {
-            clang::ClassTemplateDecl * ctd = static_cast<clang::ClassTemplateDecl *>(d) ;
-            if ( isInUserCode(ci, ctd->getSourceRange().getBegin(), hsd) ) {
-                clang::CXXRecordDecl * rd = ctd->getTemplatedDecl() ;
-                ClassTemplateVisitor ctvis(ci, cs, hsd, pa) ;
-                ctvis.TraverseDecl(rd) ;
-            }
-        }
-        break ;
-        case clang::Decl::Typedef : {
-            clang::TypedefDecl * td = static_cast<clang::TypedefDecl *>(d) ;
-            if ( isInUserCode(ci, td->getSourceRange().getBegin(), hsd) ) {
-                TypedefVisitor tv(ci , cs, hsd, pa, fwd_declared_classes[getFileName(ci , d->GETLOCEND(), hsd)]) ;
-                tv.TraverseDecl(d) ;
-            }
-        }
-        break ;
-        case clang::Decl::Var : {
-            if ( isInUserCode(ci, d->getSourceRange().getBegin(), hsd) ) {
-                VariableVisitor tv(ci , cs, hsd, pa, fwd_declared_classes[getFileName(ci , d->GETLOCEND(), hsd)]) ;
-                tv.TraverseDecl(d) ;
-            }
-        }
-        break ;
-        default :
-        break ;
-    }
-    return true ;
+																							struct	Astruct	;
+																							typedef	struct	Astruct	{}	Bstruct	;
+																				*/
+																				std::set<	std::string	>::iterator	it	;
+																				std::string	file_name	=	getFileName(ci	,	d->GETLOCEND(),	hsd)	;
+																				std::string	source_type	=	cvis.get_class_data()->getName()	;
+																				it	=	fwd_declared_classes[file_name].find(source_type)	;
+																				if	(	it	!=	fwd_declared_classes[file_name].end()	)	{
+																								fwd_declared_classes[file_name].erase(it)	;
+																				}
+																}
+												}
+								}
+								break	;
+								case	clang::Decl::Enum	:	{
+												clang::EnumDecl	*	ed	=	static_cast<clang::EnumDecl	*>(d)	;
+												if	(	isInUserCode(ci	,	ed->RBRACELOC(),	hsd)	)	{
+																EnumVisitor	evis(ci,	hsd)	;
+																//	Before	llvm	14,	TraverseDecl	also	traversed	the	type.
+																//	llvm	believed	this	to	be	a	bug,	so	now	we	call	TraverseType
+																//	in	addition	to	TraverseDecl.
+																evis.TraverseDecl(ed)	;
+																#if	(LIBCLANG_MAJOR	>=	14)
+																evis.TraverseType(clang::QualType(ed->getTypeForDecl(),	0));
+																#endif
+																//if	(	evis.get_enum_data()	!=	NULL	)	{
+																				pa.printEnum(evis.get_enum_data())	;
+																//}
+												}
+								}
+								break	;
+								case	clang::Decl::LinkageSpec	:	{
+												//	This	is	an	extern	"C"	block,	traverse	the	node	and	the	contents	within	the	extern	"C"	block.
+												TraverseLinkageSpecDecl(static_cast<clang::LinkageSpecDecl	*>(d))	;
+								}
+								break	;
+								case	clang::Decl::Namespace	:	{
+												TraverseNamespaceDecl(static_cast<clang::NamespaceDecl	*>(d))	;
+								}
+								break	;
+								case	clang::Decl::ClassTemplate	:	{
+												clang::ClassTemplateDecl	*	ctd	=	static_cast<clang::ClassTemplateDecl	*>(d)	;
+												if	(	isInUserCode(ci,	ctd->getSourceRange().getBegin(),	hsd)	)	{
+																clang::CXXRecordDecl	*	rd	=	ctd->getTemplatedDecl()	;
+																ClassTemplateVisitor	ctvis(ci,	cs,	hsd,	pa)	;
+																ctvis.TraverseDecl(rd)	;
+												}
+								}
+								break	;
+								case	clang::Decl::Typedef	:	{
+												clang::TypedefDecl	*	td	=	static_cast<clang::TypedefDecl	*>(d)	;
+												if	(	isInUserCode(ci,	td->getSourceRange().getBegin(),	hsd)	)	{
+																TypedefVisitor	tv(ci	,	cs,	hsd,	pa,	fwd_declared_classes[getFileName(ci	,	d->GETLOCEND(),	hsd)])	;
+																tv.TraverseDecl(d)	;
+												}
+								}
+								break	;
+								case	clang::Decl::Var	:	{
+												if	(	isInUserCode(ci,	d->getSourceRange().getBegin(),	hsd)	)	{
+																VariableVisitor	tv(ci	,	cs,	hsd,	pa,	fwd_declared_classes[getFileName(ci	,	d->GETLOCEND(),	hsd)])	;
+																tv.TraverseDecl(d)	;
+												}
+								}
+								break	;
+								default	:
+								break	;
+				}
+				return	true	;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/TypedefVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/TypedefVisitor.cpp
index 656b9e52e..1f6f475f6 100644
--- a/trick_source/codegen/Interface_Code_Gen/TypedefVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/TypedefVisitor.cpp
@@ -1,141 +1,141 @@
-#include <iostream>
-
-#include "llvm/Support/CommandLine.h"
-#include "ClassValues.hh"
-#include "TypedefVisitor.hh"
-#include "ClassVisitor.hh"
-#include "Utilities.hh"
-
-extern llvm::cl::opt< int > debug_level ;
-
-TypedefVisitor::TypedefVisitor(clang::CompilerInstance & in_ci , CommentSaver & in_cs ,
- HeaderSearchDirs & in_hsd , PrintAttributes & in_pa , std::set< std::string > & fdc ) :
-  ci(in_ci) ,
-  cs(in_cs) ,
-  hsd(in_hsd) ,
-  pa(in_pa) ,
-  fwd_declared_classes(fdc) ,
-  has_dims(false) ,
-  cval(NULL) {}
-
-bool TypedefVisitor::VisitDecl(clang::Decl *d) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nTypedefVisitor Decl = " << d->getDeclKindName() << std::endl ;
-    }
-    return true ;
+#include	<iostream>
+
+#include	"llvm/Support/CommandLine.h"
+#include	"ClassValues.hh"
+#include	"TypedefVisitor.hh"
+#include	"ClassVisitor.hh"
+#include	"Utilities.hh"
+
+extern	llvm::cl::opt<	int	>	debug_level	;
+
+TypedefVisitor::TypedefVisitor(clang::CompilerInstance	&	in_ci	,	CommentSaver	&	in_cs	,
+	HeaderSearchDirs	&	in_hsd	,	PrintAttributes	&	in_pa	,	std::set<	std::string	>	&	fdc	)	:
+		ci(in_ci)	,
+		cs(in_cs)	,
+		hsd(in_hsd)	,
+		pa(in_pa)	,
+		fwd_declared_classes(fdc)	,
+		has_dims(false)	,
+		cval(NULL)	{}
+
+bool	TypedefVisitor::VisitDecl(clang::Decl	*d)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nTypedefVisitor	Decl	=	"	<<	d->getDeclKindName()	<<	std::endl	;
+				}
+				return	true	;
 }
 
-bool TypedefVisitor::VisitType(clang::Type *t) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nTypedefVisitor Type = " << t->getTypeClassName() << std::endl ;
-    }
-    return true;
+bool	TypedefVisitor::VisitType(clang::Type	*t)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nTypedefVisitor	Type	=	"	<<	t->getTypeClassName()	<<	std::endl	;
+				}
+				return	true;
 }
 
-bool TypedefVisitor::VisitConstantArrayType(clang::ConstantArrayType *ct) {
-    has_dims = true ;
-    return true;
+bool	TypedefVisitor::VisitConstantArrayType(clang::ConstantArrayType	*ct)	{
+				has_dims	=	true	;
+				return	true;
 }
 
-bool TypedefVisitor::VisitElaboratedType(clang::ElaboratedType *et) {
-    // Test if this typedef is based on a forward declaration.  If it is then we do not
-    // need to print out attributes for the type.
-    std::string source_type = et->desugar().getAsString() ;
-    size_t pos ;
-    if ((pos = source_type.find("class ")) != std::string::npos ) {
-        source_type.erase(pos , 6) ;
-    }
-    if ((pos = source_type.find("struct ")) != std::string::npos ) {
-        source_type.erase(pos , 7) ;
-    }
-    std::set< std::string >::iterator it ;
-    it = fwd_declared_classes.find(source_type) ;
-    if ( it != fwd_declared_classes.end() ) {
-        return false;
-    }
-
-    return true;
+bool	TypedefVisitor::VisitElaboratedType(clang::ElaboratedType	*et)	{
+				//	Test	if	this	typedef	is	based	on	a	forward	declaration.		If	it	is	then	we	do	not
+				//	need	to	print	out	attributes	for	the	type.
+				std::string	source_type	=	et->desugar().getAsString()	;
+				size_t	pos	;
+				if	((pos	=	source_type.find("class	"))	!=	std::string::npos	)	{
+								source_type.erase(pos	,	6)	;
+				}
+				if	((pos	=	source_type.find("struct	"))	!=	std::string::npos	)	{
+								source_type.erase(pos	,	7)	;
+				}
+				std::set<	std::string	>::iterator	it	;
+				it	=	fwd_declared_classes.find(source_type)	;
+				if	(	it	!=	fwd_declared_classes.end()	)	{
+								return	false;
+				}
+
+				return	true;
 }
 
-bool TypedefVisitor::VisitPointerType(clang::PointerType *pt) {
-    has_dims = true ;
-    return true;
+bool	TypedefVisitor::VisitPointerType(clang::PointerType	*pt)	{
+				has_dims	=	true	;
+				return	true;
 }
 
-bool TypedefVisitor::VisitRecordType(clang::RecordType *rt) {
-    clang::RecordDecl * rd = rt->getDecl() ;
-    if ( debug_level >=2 ) {
-        std::cout << "\nTypedefVisitor VisitRecordType" << std::endl ;
-        rd->dump() ; std::cout << std::endl ;
-    }
-
-    if ( rd != NULL and ! has_dims ) {
-        CXXRecordVisitor cvis(ci, cs, hsd, pa, true) ;
-        cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(rd)) ;
-        /* Test to see if the typedef name and the struct/union have the same name.
-           If they do, we won't add the typedeffed record */
-        if ( typedef_name.compare(cvis.get_class_data()->getName()) ) {
-            cval = cvis.get_class_data() ;
-            cval->setName(typedef_name) ;
-            cval->clearNamespacesAndClasses() ;
-            cval->getNamespacesAndClasses(typedef_decl_context) ;
-            // Set the filename of the typedeffed target to the file where the typedef is.
-            cval->setFileName(getFileName( ci , typedef_location.getBegin() , hsd )) ;
-            pa.printClass(cval) ;
-        }
-    }
-    return true ;
+bool	TypedefVisitor::VisitRecordType(clang::RecordType	*rt)	{
+				clang::RecordDecl	*	rd	=	rt->getDecl()	;
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nTypedefVisitor	VisitRecordType"	<<	std::endl	;
+								rd->dump()	;	std::cout	<<	std::endl	;
+				}
+
+				if	(	rd	!=	NULL	and	!	has_dims	)	{
+								CXXRecordVisitor	cvis(ci,	cs,	hsd,	pa,	true)	;
+								cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(rd))	;
+								/*	Test	to	see	if	the	typedef	name	and	the	struct/union	have	the	same	name.
+											If	they	do,	we	won't	add	the	typedeffed	record	*/
+								if	(	typedef_name.compare(cvis.get_class_data()->getName())	)	{
+												cval	=	cvis.get_class_data()	;
+												cval->setName(typedef_name)	;
+												cval->clearNamespacesAndClasses()	;
+												cval->getNamespacesAndClasses(typedef_decl_context)	;
+												//	Set	the	filename	of	the	typedeffed	target	to	the	file	where	the	typedef	is.
+												cval->setFileName(getFileName(	ci	,	typedef_location.getBegin()	,	hsd	))	;
+												pa.printClass(cval)	;
+								}
+				}
+				return	true	;
 }
 
-bool TypedefVisitor::VisitTemplateSpecializationType(clang::TemplateSpecializationType *tst) {
-
-    clang::CXXRecordDecl *trec = tst->getAsCXXRecordDecl() ;
-
-    if ( debug_level >=2 ) {
-        std::cout << "\nTypedefVisitor VisitTemplateSpecializationType" << std::endl ;
-        trec->dump() ; std::cout << std::endl ;
-    }
-
-    /* The getDifinition() call retrieves the resolved template if it exists.  The call
-       returns NULL if the template was defined but never used */
-    clang::TagDecl * td = trec->getDefinition() ;
-
-    if ( td != NULL and ! has_dims ) {
-        if ( debug_level >=2 ) {
-            td->dump() ; std::cout << std::endl ;
-        }
-        CXXRecordVisitor cvis(ci, cs, hsd, pa, true) ;
-        cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(td)) ;
-        cval = cvis.get_class_data() ;
-
-        if (cval->isInStandardNamespace()) {
-            if ( debug_level >= 4 ) {
-                std::cout << "\nTypedefVisitor VisitTemplateSpecializationType not adding class" << std::endl ;
-            }
-            cval = NULL ;
-        } else {
-            cval->setName(typedef_name) ;
-            cval->clearNamespacesAndClasses() ;
-            cval->getNamespacesAndClasses(typedef_decl_context) ;
-            // Set the filename of the typedeffed target to the file where the typedef is.
-            cval->setFileName(getFileName( ci , typedef_location.getBegin() , hsd )) ;
-            pa.printClass(cval) ;
-        }
-    }
-
-    return true;
+bool	TypedefVisitor::VisitTemplateSpecializationType(clang::TemplateSpecializationType	*tst)	{
+
+				clang::CXXRecordDecl	*trec	=	tst->getAsCXXRecordDecl()	;
+
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nTypedefVisitor	VisitTemplateSpecializationType"	<<	std::endl	;
+								trec->dump()	;	std::cout	<<	std::endl	;
+				}
+
+				/*	The	getDifinition()	call	retrieves	the	resolved	template	if	it	exists.		The	call
+							returns	NULL	if	the	template	was	defined	but	never	used	*/
+				clang::TagDecl	*	td	=	trec->getDefinition()	;
+
+				if	(	td	!=	NULL	and	!	has_dims	)	{
+								if	(	debug_level	>=2	)	{
+												td->dump()	;	std::cout	<<	std::endl	;
+								}
+								CXXRecordVisitor	cvis(ci,	cs,	hsd,	pa,	true)	;
+								cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(td))	;
+								cval	=	cvis.get_class_data()	;
+
+								if	(cval->isInStandardNamespace())	{
+												if	(	debug_level	>=	4	)	{
+																std::cout	<<	"\nTypedefVisitor	VisitTemplateSpecializationType	not	adding	class"	<<	std::endl	;
+												}
+												cval	=	NULL	;
+								}	else	{
+												cval->setName(typedef_name)	;
+												cval->clearNamespacesAndClasses()	;
+												cval->getNamespacesAndClasses(typedef_decl_context)	;
+												//	Set	the	filename	of	the	typedeffed	target	to	the	file	where	the	typedef	is.
+												cval->setFileName(getFileName(	ci	,	typedef_location.getBegin()	,	hsd	))	;
+												pa.printClass(cval)	;
+								}
+				}
+
+				return	true;
 }
 
-bool TypedefVisitor::VisitTypedefDecl(clang::TypedefDecl *td) {
-    if ( debug_level >=2 ) {
-        std::cout << "TypedefVisitior VisitTypedefDecl " << td->getName().str() << "\n" ;
-    }
-    /* Save the typedef name and location.  We substitute these into the targetted class/struct we parse */
+bool	TypedefVisitor::VisitTypedefDecl(clang::TypedefDecl	*td)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"TypedefVisitior	VisitTypedefDecl	"	<<	td->getName().str()	<<	"\n"	;
+				}
+				/*	Save	the	typedef	name	and	location.		We	substitute	these	into	the	targetted	class/struct	we	parse	*/
 
-    typedef_name = td->getName().str() ;
-    typedef_location = td->getSourceRange() ;
-    typedef_decl_context = td->getDeclContext() ;
+				typedef_name	=	td->getName().str()	;
+				typedef_location	=	td->getSourceRange()	;
+				typedef_decl_context	=	td->getDeclContext()	;
 
-    return true;
+				return	true;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/Utilities.cpp b/trick_source/codegen/Interface_Code_Gen/Utilities.cpp
index 39bec7d5a..01eeebc88 100644
--- a/trick_source/codegen/Interface_Code_Gen/Utilities.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/Utilities.cpp
@@ -1,231 +1,231 @@
 
-#include <stdio.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <sstream>
-#include <cstring>
-
-#include "Utilities.hh"
-
-std::string sanitize(const std::string& text) {
-    std::string result = text;
-    for (char c : {'<', '>', ' ', ',', ':', '*', '[', ']'}) {
-        std::replace(result.begin(), result.end(), c, '_');
-    }
-    // Catches templates with negative default values (iss #660)
-    for (char c : {'-'}) {
-        std::replace(result.begin(), result.end(), c, 'n');
-    }
-    return result ;
+#include	<stdio.h>
+#include	<libgen.h>
+#include	<stdlib.h>
+#include	<sstream>
+#include	<cstring>
+
+#include	"Utilities.hh"
+
+std::string	sanitize(const	std::string&	text)	{
+				std::string	result	=	text;
+				for	(char	c	:	{'<',	'>',	'	',	',',	':',	'*',	'[',	']'})	{
+								std::replace(result.begin(),	result.end(),	c,	'_');
+				}
+				//	Catches	templates	with	negative	default	values	(iss	#660)
+				for	(char	c	:	{'-'})	{
+								std::replace(result.begin(),	result.end(),	c,	'n');
+				}
+				return	result	;
 }
 
-// Replace special chars for xml output
-std::string & replace_special_chars( std::string & str) {
-
-    // escape &
-    size_t index = 0;
-    while (index != std::string::npos) {
-        index = str.find("&" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 1, "&amp;") ;
-            index += 5;
-        }
-    }
-
-    // escape "
-    index = 0;
-    while (index != std::string::npos) {
-        index = str.find("\\\"" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 2, "&quot;") ;
-        }
-    }
-
-    // escape <
-    index = 0;
-    while (index != std::string::npos) {
-        index = str.find("<" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 1, "&lt;") ;
-        }
-    }
-
-    return str;
+//	Replace	special	chars	for	xml	output
+std::string	&	replace_special_chars(	std::string	&	str)	{
+
+				//	escape	&
+				size_t	index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("&"	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	1,	"&amp;")	;
+												index	+=	5;
+								}
+				}
+
+				//	escape	"
+				index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("\\\""	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	2,	"&quot;")	;
+								}
+				}
+
+				//	escape	<
+				index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("<"	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	1,	"&lt;")	;
+								}
+				}
+
+				return	str;
 }
 
-// removes leading and trailing whitespace from a string
-std::string trim(const std::string& str, const std::string& whitespace ) {
-    size_t strBegin = str.find_first_not_of(whitespace);
-    if (strBegin == std::string::npos) {
-        return "";
-    }
-    size_t strEnd = str.find_last_not_of(whitespace);
-    size_t strRange = strEnd - strBegin + 1;
+//	removes	leading	and	trailing	whitespace	from	a	string
+std::string	trim(const	std::string&	str,	const	std::string&	whitespace	)	{
+				size_t	strBegin	=	str.find_first_not_of(whitespace);
+				if	(strBegin	==	std::string::npos)	{
+								return	"";
+				}
+				size_t	strEnd	=	str.find_last_not_of(whitespace);
+				size_t	strRange	=	strEnd	-	strBegin	+	1;
 
-    return str.substr(strBegin, strRange);
+				return	str.substr(strBegin,	strRange);
 }
 
-bool isInUserCode( clang::CompilerInstance & ci , clang::SourceLocation sl , HeaderSearchDirs & hsd ) {
-    clang::FileID fid = ci.getSourceManager().getFileID(sl) ;
-    bool ret = false ;
-    if ( ! fid.isInvalid() ) {
-        const clang::FileEntry * fe = ci.getSourceManager().getFileEntryForID(fid) ;
-        if ( fe != NULL ) {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-            char * resolved_path = almostRealPath( fe->getName() ) ;
+bool	isInUserCode(	clang::CompilerInstance	&	ci	,	clang::SourceLocation	sl	,	HeaderSearchDirs	&	hsd	)	{
+				clang::FileID	fid	=	ci.getSourceManager().getFileID(sl)	;
+				bool	ret	=	false	;
+				if	(	!	fid.isInvalid()	)	{
+								const	clang::FileEntry	*	fe	=	ci.getSourceManager().getFileEntryForID(fid)	;
+								if	(	fe	!=	NULL	)	{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+												char	*	resolved_path	=	almostRealPath(	fe->getName()	)	;
 #else
-            char * resolved_path = almostRealPath( fe->getName().str() ) ;
+												char	*	resolved_path	=	almostRealPath(	fe->getName().str()	)	;
 #endif
-            if ( resolved_path != NULL ) {
-                if ( hsd.isPathInUserDir(resolved_path)) {
-                    ret = true ;
-                }
-                free(resolved_path) ;
-            }
-        }
-    }
-    return ret ;
+												if	(	resolved_path	!=	NULL	)	{
+																if	(	hsd.isPathInUserDir(resolved_path))	{
+																				ret	=	true	;
+																}
+																free(resolved_path)	;
+												}
+								}
+				}
+				return	ret	;
 }
 
-bool isInUserOrTrickCode( clang::CompilerInstance & ci , clang::SourceLocation sl , HeaderSearchDirs & hsd ) {
-    clang::FileID fid = ci.getSourceManager().getFileID(sl) ;
-    bool ret = false ;
-    if ( ! fid.isInvalid() ) {
-        const clang::FileEntry * fe = ci.getSourceManager().getFileEntryForID(fid) ;
-        if ( fe != NULL ) {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-            char * resolved_path = almostRealPath( fe->getName() ) ;
+bool	isInUserOrTrickCode(	clang::CompilerInstance	&	ci	,	clang::SourceLocation	sl	,	HeaderSearchDirs	&	hsd	)	{
+				clang::FileID	fid	=	ci.getSourceManager().getFileID(sl)	;
+				bool	ret	=	false	;
+				if	(	!	fid.isInvalid()	)	{
+								const	clang::FileEntry	*	fe	=	ci.getSourceManager().getFileEntryForID(fid)	;
+								if	(	fe	!=	NULL	)	{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+												char	*	resolved_path	=	almostRealPath(	fe->getName()	)	;
 #else
-            char * resolved_path = almostRealPath( fe->getName().str() ) ;
+												char	*	resolved_path	=	almostRealPath(	fe->getName().str()	)	;
 #endif
-            if ( resolved_path != NULL ) {
-                if ( hsd.isPathInUserOrTrickDir(resolved_path)) {
-                    ret = true ;
-                }
-                free(resolved_path) ;
-            }
-        }
-    }
-    return ret ;
+												if	(	resolved_path	!=	NULL	)	{
+																if	(	hsd.isPathInUserOrTrickDir(resolved_path))	{
+																				ret	=	true	;
+																}
+																free(resolved_path)	;
+												}
+								}
+				}
+				return	ret	;
 }
 
-std::string getFileName( clang::CompilerInstance & ci , clang::SourceLocation sl , HeaderSearchDirs & hsd ) {
-    clang::FileID fid = ci.getSourceManager().getFileID(sl) ;
-    std::string file_name;
-    char* resolved_path;
-    if ( ! fid.isInvalid() ) {
-        const clang::FileEntry * fe = ci.getSourceManager().getFileEntryForID(fid) ;
-        if ( fe != NULL ) {
-#if (LIBCLANG_MAJOR < 4) // TODO delete when RHEL 7 no longer supported
-            char * resolved_path = almostRealPath( fe->getName() ) ;
+std::string	getFileName(	clang::CompilerInstance	&	ci	,	clang::SourceLocation	sl	,	HeaderSearchDirs	&	hsd	)	{
+				clang::FileID	fid	=	ci.getSourceManager().getFileID(sl)	;
+				std::string	file_name;
+				char*	resolved_path;
+				if	(	!	fid.isInvalid()	)	{
+								const	clang::FileEntry	*	fe	=	ci.getSourceManager().getFileEntryForID(fid)	;
+								if	(	fe	!=	NULL	)	{
+#if	(LIBCLANG_MAJOR	<	4)	//	TODO	delete	when	RHEL	7	no	longer	supported
+												char	*	resolved_path	=	almostRealPath(	fe->getName()	)	;
 #else
-            char * resolved_path = almostRealPath( fe->getName().str() ) ;
+												char	*	resolved_path	=	almostRealPath(	fe->getName().str()	)	;
 #endif
-            if ( resolved_path != NULL  and hsd.isPathInUserDir(resolved_path)) {
-                file_name.append(resolved_path);
-            }
-            free(resolved_path);
-        }
-    }
-    return file_name;
+												if	(	resolved_path	!=	NULL		and	hsd.isPathInUserDir(resolved_path))	{
+																file_name.append(resolved_path);
+												}
+												free(resolved_path);
+								}
+				}
+				return	file_name;
 }
 
-#include <iostream>
-char * almostRealPath( const std::string& in_path ) {
-    return almostRealPath(in_path.c_str());
+#include	<iostream>
+char	*	almostRealPath(	const	std::string&	in_path	)	{
+				return	almostRealPath(in_path.c_str());
 }
 
 /*
-   This function returns almost absolute path of the directory of the incoming path.
-   It does not follow the last symbolic link.
+			This	function	returns	almost	absolute	path	of	the	directory	of	the	incoming	path.
+			It	does	not	follow	the	last	symbolic	link.
 
-   dirname and basename may modify their argument, so make a copy of the path.
+			dirname	and	basename	may	modify	their	argument,	so	make	a	copy	of	the	path.
 */
-char * almostRealPath( const char * in_path ) {
-    char * file_copy_path = strdup(in_path) ;
-    char * dir_copy_path = strdup(in_path) ;
-    char * file = basename(file_copy_path) ;
-    char * dir = dirname(dir_copy_path) ;
-    char * resolved_path = NULL ;
-    char * final_path = NULL ;
-    resolved_path = realpath( dir , resolved_path) ;
-    if ( resolved_path != NULL ) {
-        size_t final_path_len = strlen(resolved_path) + strlen(file) + 2; 
-        final_path = (char *)malloc(final_path_len) ;
-        snprintf(final_path, final_path_len, "%s/%s", resolved_path , file ) ;
-        free(resolved_path) ;
-    }
-    free(file_copy_path) ;
-    free(dir_copy_path) ;
-
-    if (!final_path) {
-        std::cout << bold(color(WARNING, "Warning")) << "    ICG could not resolve realpath of " << quote(bold(in_path)) << std::endl;
-    }
-
-    return final_path ;
+char	*	almostRealPath(	const	char	*	in_path	)	{
+				char	*	file_copy_path	=	strdup(in_path)	;
+				char	*	dir_copy_path	=	strdup(in_path)	;
+				char	*	file	=	basename(file_copy_path)	;
+				char	*	dir	=	dirname(dir_copy_path)	;
+				char	*	resolved_path	=	NULL	;
+				char	*	final_path	=	NULL	;
+				resolved_path	=	realpath(	dir	,	resolved_path)	;
+				if	(	resolved_path	!=	NULL	)	{
+								size_t	final_path_len	=	strlen(resolved_path)	+	strlen(file)	+	2;	
+								final_path	=	(char	*)malloc(final_path_len)	;
+								snprintf(final_path,	final_path_len,	"%s/%s",	resolved_path	,	file	)	;
+								free(resolved_path)	;
+				}
+				free(file_copy_path)	;
+				free(dir_copy_path)	;
+
+				if	(!final_path)	{
+								std::cout	<<	bold(color(WARNING,	"Warning"))	<<	"				ICG	could	not	resolve	realpath	of	"	<<	quote(bold(in_path))	<<	std::endl;
+				}
+
+				return	final_path	;
 }
 
-static const std::string escapeSequence = "[";
-static const std::string defaultForegroundColorSequence = escapeSequence + "39m";
-static const std::string boldSequence = escapeSequence + "1m";
-static const std::string noBoldSequence = escapeSequence + "22m";
-static const std::string underlineSequence = escapeSequence + "4m";
-static const std::string noUnderlineSequence = escapeSequence + "24m";
-
-std::string color(const Color& color, const std::string& text) {
-    std::ostringstream oss;
-    oss << escapeSequence << color << "m" << text << defaultForegroundColorSequence;
-    return oss.str();
+static	const	std::string	escapeSequence	=	"[";
+static	const	std::string	defaultForegroundColorSequence	=	escapeSequence	+	"39m";
+static	const	std::string	boldSequence	=	escapeSequence	+	"1m";
+static	const	std::string	noBoldSequence	=	escapeSequence	+	"22m";
+static	const	std::string	underlineSequence	=	escapeSequence	+	"4m";
+static	const	std::string	noUnderlineSequence	=	escapeSequence	+	"24m";
+
+std::string	color(const	Color&	color,	const	std::string&	text)	{
+				std::ostringstream	oss;
+				oss	<<	escapeSequence	<<	color	<<	"m"	<<	text	<<	defaultForegroundColorSequence;
+				return	oss.str();
 }
 
-std::string bold(const std::string& text) {
-    return boldSequence + text + noBoldSequence;
+std::string	bold(const	std::string&	text)	{
+				return	boldSequence	+	text	+	noBoldSequence;
 }
 
-std::string underline(const std::string& text) {
-    return underlineSequence + text + noUnderlineSequence;
+std::string	underline(const	std::string&	text)	{
+				return	underlineSequence	+	text	+	noUnderlineSequence;
 }
 
-std::string underline(const std::string& text, unsigned length) {
-    return underline(text.substr(0, length)) + text.substr(length);
+std::string	underline(const	std::string&	text,	unsigned	length)	{
+				return	underline(text.substr(0,	length))	+	text.substr(length);
 }
 
-std::string quote(const std::string& text) {
-    return "\"" + text + "\"";
+std::string	quote(const	std::string&	text)	{
+				return	"\""	+	text	+	"\"";
 }
 
 
-// This function will accept version numbers with Major, Major.Minor, or Major.Minor.Patch. 
-// It removes non-numerical prefixes or postfixes to the version number. The return value
-// is an int with the format MMmmpp, which is what llvm LangOpts.gnucversion expects.
-// If there is a problem or no verno is provided, it returns the default value. 
-int gccVersionToIntOrDefault(const char* verno, int def) {
-    const int buffersize = 32;
-    // need mutable characters for strtok
-    char verbuf[buffersize];
-    if(verno == nullptr || verno[0] == '\0' || strlen(verno) >= buffersize) {
-        // Invalid GCC version string, returning default GCC version
-        return def;
-    }
-    strcpy(verbuf, verno);
-    const int len = strlen(verbuf);
-    const char* majMinPatch[3] = {"0", "0", "0"};
-    // Setting non-numerals to the delimeter (might catch vernos with prefix or postfix)
-    for(int i = 0; i < len; i++) {
-        if(verbuf[i] < '0' || verbuf[i] > '9') {
-            verbuf[i] = '.';
-        }
-    }
-    char* next = strtok(verbuf, ".");
-    for(int i = 0; next != nullptr && i < 3; i++) {
-        majMinPatch[i] = next;
-        next = strtok(nullptr, ".");
-    }
-    // This is the format that LLVM expects for the version number
-    int result = 10000*atoi(majMinPatch[0]) + 100*atoi(majMinPatch[1]) + atoi(majMinPatch[2]);
-    if(result > 999999) {
-        std::cerr << "Warning: GCC_VERSION is invalid version number: " << result << ". Setting ICG to use default GCC version: " << def << std::endl;
-        return def;
-    }
-    return result;
+//	This	function	will	accept	version	numbers	with	Major,	Major.Minor,	or	Major.Minor.Patch.	
+//	It	removes	non-numerical	prefixes	or	postfixes	to	the	version	number.	The	return	value
+//	is	an	int	with	the	format	MMmmpp,	which	is	what	llvm	LangOpts.gnucversion	expects.
+//	If	there	is	a	problem	or	no	verno	is	provided,	it	returns	the	default	value.	
+int	gccVersionToIntOrDefault(const	char*	verno,	int	def)	{
+				const	int	buffersize	=	32;
+				//	need	mutable	characters	for	strtok
+				char	verbuf[buffersize];
+				if(verno	==	nullptr	||	verno[0]	==	'\0'	||	strlen(verno)	>=	buffersize)	{
+								//	Invalid	GCC	version	string,	returning	default	GCC	version
+								return	def;
+				}
+				strcpy(verbuf,	verno);
+				const	int	len	=	strlen(verbuf);
+				const	char*	majMinPatch[3]	=	{"0",	"0",	"0"};
+				//	Setting	non-numerals	to	the	delimeter	(might	catch	vernos	with	prefix	or	postfix)
+				for(int	i	=	0;	i	<	len;	i++)	{
+								if(verbuf[i]	<	'0'	||	verbuf[i]	>	'9')	{
+												verbuf[i]	=	'.';
+								}
+				}
+				char*	next	=	strtok(verbuf,	".");
+				for(int	i	=	0;	next	!=	nullptr	&&	i	<	3;	i++)	{
+								majMinPatch[i]	=	next;
+								next	=	strtok(nullptr,	".");
+				}
+				//	This	is	the	format	that	LLVM	expects	for	the	version	number
+				int	result	=	10000*atoi(majMinPatch[0])	+	100*atoi(majMinPatch[1])	+	atoi(majMinPatch[2]);
+				if(result	>	999999)	{
+								std::cerr	<<	"Warning:	GCC_VERSION	is	invalid	version	number:	"	<<	result	<<	".	Setting	ICG	to	use	default	GCC	version:	"	<<	def	<<	std::endl;
+								return	def;
+				}
+				return	result;
 }
diff --git a/trick_source/codegen/Interface_Code_Gen/VariableVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/VariableVisitor.cpp
index bbb342f06..ec20cfe26 100644
--- a/trick_source/codegen/Interface_Code_Gen/VariableVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/VariableVisitor.cpp
@@ -1,92 +1,92 @@
-#include <iostream>
-#include <algorithm>
-
-#include "llvm/Support/CommandLine.h"
-#include "ClassValues.hh"
-#include "VariableVisitor.hh"
-#include "ClassVisitor.hh"
-#include "Utilities.hh"
-
-extern llvm::cl::opt< int > debug_level ;
-
-VariableVisitor::VariableVisitor(clang::CompilerInstance & in_ci , CommentSaver & in_cs ,
- HeaderSearchDirs & in_hsd , PrintAttributes & in_pa , std::set< std::string > & fdc ) :
-  ci(in_ci) ,
-  cs(in_cs) ,
-  hsd(in_hsd) ,
-  pa(in_pa) ,
-  fwd_declared_classes(fdc) ,
-  has_dims(false) ,
-  cval(NULL) {}
-
-bool VariableVisitor::VisitDecl(clang::Decl *d) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nVariableVisitor Decl = " << d->getDeclKindName() << std::endl ;
-    }
-    return true ;
+#include	<iostream>
+#include	<algorithm>
+
+#include	"llvm/Support/CommandLine.h"
+#include	"ClassValues.hh"
+#include	"VariableVisitor.hh"
+#include	"ClassVisitor.hh"
+#include	"Utilities.hh"
+
+extern	llvm::cl::opt<	int	>	debug_level	;
+
+VariableVisitor::VariableVisitor(clang::CompilerInstance	&	in_ci	,	CommentSaver	&	in_cs	,
+	HeaderSearchDirs	&	in_hsd	,	PrintAttributes	&	in_pa	,	std::set<	std::string	>	&	fdc	)	:
+		ci(in_ci)	,
+		cs(in_cs)	,
+		hsd(in_hsd)	,
+		pa(in_pa)	,
+		fwd_declared_classes(fdc)	,
+		has_dims(false)	,
+		cval(NULL)	{}
+
+bool	VariableVisitor::VisitDecl(clang::Decl	*d)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nVariableVisitor	Decl	=	"	<<	d->getDeclKindName()	<<	std::endl	;
+				}
+				return	true	;
 }
 
-bool VariableVisitor::VisitType(clang::Type *t) {
-    if ( debug_level >=2 ) {
-        std::cout << "\nVariableVisitor Type = " << t->getTypeClassName() << std::endl ;
-    }
-    return true;
+bool	VariableVisitor::VisitType(clang::Type	*t)	{
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nVariableVisitor	Type	=	"	<<	t->getTypeClassName()	<<	std::endl	;
+				}
+				return	true;
 }
 
 /**
-We are only interested in global variable declarations that are template class types.
-If it is a template class we may have to create IO code for the class.
+We	are	only	interested	in	global	variable	declarations	that	are	template	class	types.
+If	it	is	a	template	class	we	may	have	to	create	IO	code	for	the	class.
 
 @details
 */
 
-bool VariableVisitor::VisitTemplateSpecializationType(clang::TemplateSpecializationType *tst) {
-
-    clang::CXXRecordDecl *trec = tst->getAsCXXRecordDecl() ;
-
-    if ( debug_level >=2 ) {
-        std::cout << "\nVariableVisitor VisitTemplateSpecializationType" << std::endl ;
-        trec->dump() ; std::cout << std::endl ;
-    }
-
-    /* The getDifinition() call retrieves the resolved template if it exists.  The call
-       returns NULL if the template was defined but never used */
-    clang::TagDecl * td = trec->getDefinition() ;
-
-    if ( td != NULL and ! has_dims ) {
-        if ( debug_level >=2 ) {
-            td->dump() ; std::cout << std::endl ;
-        }
-        CXXRecordVisitor cvis(ci, cs, hsd, pa, true) ;
-        cval = cvis.get_class_data() ;
-        cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(td)) ;
-
-        if (cval->isInStandardNamespace()) {
-            if ( debug_level >=4 ) {
-                std::cout << "\nTypedefVisitor VisitTemplateSpecializationType not adding class" << std::endl ;
-            }
-            cval = NULL ;
-        } else {
-            std::string mangled_name = tst->desugar().getAsString() ;
-            size_t pos ;
-            if ((pos = mangled_name.find("class ")) != std::string::npos ) {
-                mangled_name.erase(pos , 6) ;
-            }
-            cval->setName(mangled_name) ;
-
-            mangled_name.erase(remove_if(mangled_name.begin(), mangled_name.end(), isspace), mangled_name.end());
-            std::replace( mangled_name.begin(), mangled_name.end(), '<', '_') ;
-            std::replace( mangled_name.begin(), mangled_name.end(), '>', '_') ;
-            std::replace( mangled_name.begin(), mangled_name.end(), ' ', '_') ;
-            std::replace( mangled_name.begin(), mangled_name.end(), ',', '_') ;
-            std::replace( mangled_name.begin(), mangled_name.end(), ':', '_') ;
-            std::replace( mangled_name.begin(), mangled_name.end(), '*', '_') ;
-            cval->setMangledTypeName(mangled_name) ;
-
-            pa.printClass(cval) ;
-        }
-    }
-
-    return true;
+bool	VariableVisitor::VisitTemplateSpecializationType(clang::TemplateSpecializationType	*tst)	{
+
+				clang::CXXRecordDecl	*trec	=	tst->getAsCXXRecordDecl()	;
+
+				if	(	debug_level	>=2	)	{
+								std::cout	<<	"\nVariableVisitor	VisitTemplateSpecializationType"	<<	std::endl	;
+								trec->dump()	;	std::cout	<<	std::endl	;
+				}
+
+				/*	The	getDifinition()	call	retrieves	the	resolved	template	if	it	exists.		The	call
+							returns	NULL	if	the	template	was	defined	but	never	used	*/
+				clang::TagDecl	*	td	=	trec->getDefinition()	;
+
+				if	(	td	!=	NULL	and	!	has_dims	)	{
+								if	(	debug_level	>=2	)	{
+												td->dump()	;	std::cout	<<	std::endl	;
+								}
+								CXXRecordVisitor	cvis(ci,	cs,	hsd,	pa,	true)	;
+								cval	=	cvis.get_class_data()	;
+								cvis.TraverseCXXRecordDecl(clang::cast<clang::CXXRecordDecl>(td))	;
+
+								if	(cval->isInStandardNamespace())	{
+												if	(	debug_level	>=4	)	{
+																std::cout	<<	"\nTypedefVisitor	VisitTemplateSpecializationType	not	adding	class"	<<	std::endl	;
+												}
+												cval	=	NULL	;
+								}	else	{
+												std::string	mangled_name	=	tst->desugar().getAsString()	;
+												size_t	pos	;
+												if	((pos	=	mangled_name.find("class	"))	!=	std::string::npos	)	{
+																mangled_name.erase(pos	,	6)	;
+												}
+												cval->setName(mangled_name)	;
+
+												mangled_name.erase(remove_if(mangled_name.begin(),	mangled_name.end(),	isspace),	mangled_name.end());
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	'<',	'_')	;
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	'>',	'_')	;
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	'	',	'_')	;
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	',',	'_')	;
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	':',	'_')	;
+												std::replace(	mangled_name.begin(),	mangled_name.end(),	'*',	'_')	;
+												cval->setMangledTypeName(mangled_name)	;
+
+												pa.printClass(cval)	;
+								}
+				}
+
+				return	true;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/main.cpp b/trick_source/codegen/Interface_Code_Gen/main.cpp
index 843803291..4d8381c47 100644
--- a/trick_source/codegen/Interface_Code_Gen/main.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/main.cpp
@@ -1,349 +1,349 @@
-#include <iostream>
-#include <sstream>
-#include <libgen.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-// `llvm/Support/Host.h` is deprecated in favour of `llvm/TargetParser/Host.h` since clang 17
-#if LIBCLANG_MAJOR > 16
-#include "llvm/TargetParser/Host.h"
+#include	<iostream>
+#include	<sstream>
+#include	<libgen.h>
+#include	<string.h>
+#include	<stdio.h>
+#include	<sys/stat.h>
+#include	<unistd.h>
+
+//	`llvm/Support/Host.h`	is	deprecated	in	favour	of	`llvm/TargetParser/Host.h`	since	clang	17
+#if	LIBCLANG_MAJOR	>	16
+#include	"llvm/TargetParser/Host.h"
 #else
-#include "llvm/Support/Host.h"
+#include	"llvm/Support/Host.h"
 #endif
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "clang/Basic/Builtins.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Parse/ParseAST.h"
-
-#include "ICGDiagnosticConsumer.hh"
-#include "ICGASTConsumer.hh"
-#include "HeaderSearchDirs.hh"
-#include "CommentSaver.hh"
-#include "TranslationUnitVisitor.hh"
-#include "PrintAttributes.hh"
-#include "Utilities.hh"
-#include "FindTrickICG.hh"
-
-/* Command line arguments.  These work better as globals, as suggested in llvm/CommandLine documentation */
-llvm::cl::list<std::string> include_dirs("I", llvm::cl::Prefix, llvm::cl::desc("Include directory"), llvm::cl::value_desc("directory"));
-llvm::cl::list<std::string> f_options("f", llvm::cl::Prefix, llvm::cl::desc("Compiler options that have f prefix"), llvm::cl::value_desc("option"));
-llvm::cl::list<std::string> isystem_dirs("isystem", llvm::cl::Prefix, llvm::cl::desc("Include directory, suppress all warnings"), llvm::cl::value_desc("directory"));
-llvm::cl::list<std::string> defines("D", llvm::cl::Prefix, llvm::cl::desc("Defines"), llvm::cl::value_desc("define"));
-// TODO: remove units_truth_is_scary in 2021.
-llvm::cl::opt<bool> units_truth_is_scary("units-truth-is-scary", llvm::cl::desc("DEPRECATED: Don't print units conversion messages"));
-llvm::cl::opt<bool> sim_services_flag("sim_services", llvm::cl::desc("Gernerate io_src for Trick core headers"));
-llvm::cl::opt<bool> force("force", llvm::cl::desc("Force all io_src files to be generated"));
-llvm::cl::opt<int> attr_version("v", llvm::cl::desc("Select version of attributes to produce.  10 and 13 are valid"), llvm::cl::init(10));
-llvm::cl::opt<std::string> standard_version("icg-std", llvm::cl::desc("Set the C++ standard to use when parsing. c++11, c++14, c++17, and c++20 are valid. Default is c++17 or the newest supported by your LLVM version."), llvm::cl::init(""), llvm::cl::ZeroOrMore);
-llvm::cl::opt<int> debug_level("d", llvm::cl::desc("Set debug level"), llvm::cl::init(0), llvm::cl::ZeroOrMore);
-llvm::cl::opt<bool> create_map("m", llvm::cl::desc("Create map files"), llvm::cl::init(false));
-llvm::cl::opt<std::string> output_dir("o", llvm::cl::desc("Output directory"));
-llvm::cl::list<std::string> input_file_names(llvm::cl::Positional, llvm::cl::desc("<input_file>"), llvm::cl::ZeroOrMore);
-llvm::cl::list<std::string> sink(llvm::cl::Sink, llvm::cl::ZeroOrMore);
-llvm::cl::list<std::string> pre_compiled_headers("include", llvm::cl::Prefix, llvm::cl::desc("pre-compiled headers"), llvm::cl::value_desc("pre_compiled_headers"));
-
-llvm::cl::opt<bool> global_compat15("c", llvm::cl::desc("Print the offsetof calculations in attributes")) ;
-llvm::cl::opt<llvm::cl::boolOrDefault> print_trick_icg("print-TRICK-ICG", llvm::cl::desc("Print warnings where TRICK_ICG may cause io_src inconsistencies")) ;
-llvm::cl::alias compat15_alias ("compat15" , llvm::cl::desc("Alias for -c") , llvm::cl::aliasopt(global_compat15)) ;
-llvm::cl::opt<bool> m32("m32", llvm::cl::desc("Generate io code for use with 32bit mode"), llvm::cl::init(false), llvm::cl::ZeroOrMore) ;
-
-
-void set_lang_opts(clang::CompilerInstance & ci) {
-    ci.getLangOpts().CXXExceptions = true ;
-    // Activate C++11 parsing
-    ci.getLangOpts().Bool = true ;
-    ci.getLangOpts().WChar = true ;
-    ci.getLangOpts().CPlusPlus = true ;
-    ci.getLangOpts().CXXOperatorNames = true ;
-
-    // Always use at least C++11
-    ci.getLangOpts().CPlusPlus11 = true ;
-
-
-#if (LIBCLANG_MAJOR < 6)
-    // Check if standard_version was specified and if it's a version that is supported by this libclang
-    if (standard_version != "") {
-        if (standard_version == "c++11") {
-            // Nothing to be done here really
-        } else if (standard_version == "c++14" || standard_version == "c++17" || standard_version == "c++20") {
-            std::cerr << "C++ standard " << standard_version << " is not supported by this version of Clang." << std::endl;
-        } else {
-            std::cerr << "Invalid C++ standard version specified:" << standard_version << std::endl;
-        }
-    }
+#include	"llvm/Support/CommandLine.h"
+#include	"llvm/Support/raw_ostream.h"
+
+#include	"clang/Basic/Builtins.h"
+#include	"clang/Frontend/CompilerInstance.h"
+#include	"clang/Basic/TargetOptions.h"
+#include	"clang/Basic/TargetInfo.h"
+#include	"clang/Basic/FileManager.h"
+#include	"clang/Lex/Preprocessor.h"
+#include	"clang/Lex/PreprocessorOptions.h"
+#include	"clang/Basic/Diagnostic.h"
+#include	"clang/Parse/ParseAST.h"
+
+#include	"ICGDiagnosticConsumer.hh"
+#include	"ICGASTConsumer.hh"
+#include	"HeaderSearchDirs.hh"
+#include	"CommentSaver.hh"
+#include	"TranslationUnitVisitor.hh"
+#include	"PrintAttributes.hh"
+#include	"Utilities.hh"
+#include	"FindTrickICG.hh"
+
+/*	Command	line	arguments.		These	work	better	as	globals,	as	suggested	in	llvm/CommandLine	documentation	*/
+llvm::cl::list<std::string>	include_dirs("I",	llvm::cl::Prefix,	llvm::cl::desc("Include	directory"),	llvm::cl::value_desc("directory"));
+llvm::cl::list<std::string>	f_options("f",	llvm::cl::Prefix,	llvm::cl::desc("Compiler	options	that	have	f	prefix"),	llvm::cl::value_desc("option"));
+llvm::cl::list<std::string>	isystem_dirs("isystem",	llvm::cl::Prefix,	llvm::cl::desc("Include	directory,	suppress	all	warnings"),	llvm::cl::value_desc("directory"));
+llvm::cl::list<std::string>	defines("D",	llvm::cl::Prefix,	llvm::cl::desc("Defines"),	llvm::cl::value_desc("define"));
+//	TODO:	remove	units_truth_is_scary	in	2021.
+llvm::cl::opt<bool>	units_truth_is_scary("units-truth-is-scary",	llvm::cl::desc("DEPRECATED:	Don't	print	units	conversion	messages"));
+llvm::cl::opt<bool>	sim_services_flag("sim_services",	llvm::cl::desc("Gernerate	io_src	for	Trick	core	headers"));
+llvm::cl::opt<bool>	force("force",	llvm::cl::desc("Force	all	io_src	files	to	be	generated"));
+llvm::cl::opt<int>	attr_version("v",	llvm::cl::desc("Select	version	of	attributes	to	produce.		10	and	13	are	valid"),	llvm::cl::init(10));
+llvm::cl::opt<std::string>	standard_version("icg-std",	llvm::cl::desc("Set	the	C++	standard	to	use	when	parsing.	c++11,	c++14,	c++17,	and	c++20	are	valid.	Default	is	c++17	or	the	newest	supported	by	your	LLVM	version."),	llvm::cl::init(""),	llvm::cl::ZeroOrMore);
+llvm::cl::opt<int>	debug_level("d",	llvm::cl::desc("Set	debug	level"),	llvm::cl::init(0),	llvm::cl::ZeroOrMore);
+llvm::cl::opt<bool>	create_map("m",	llvm::cl::desc("Create	map	files"),	llvm::cl::init(false));
+llvm::cl::opt<std::string>	output_dir("o",	llvm::cl::desc("Output	directory"));
+llvm::cl::list<std::string>	input_file_names(llvm::cl::Positional,	llvm::cl::desc("<input_file>"),	llvm::cl::ZeroOrMore);
+llvm::cl::list<std::string>	sink(llvm::cl::Sink,	llvm::cl::ZeroOrMore);
+llvm::cl::list<std::string>	pre_compiled_headers("include",	llvm::cl::Prefix,	llvm::cl::desc("pre-compiled	headers"),	llvm::cl::value_desc("pre_compiled_headers"));
+
+llvm::cl::opt<bool>	global_compat15("c",	llvm::cl::desc("Print	the	offsetof	calculations	in	attributes"))	;
+llvm::cl::opt<llvm::cl::boolOrDefault>	print_trick_icg("print-TRICK-ICG",	llvm::cl::desc("Print	warnings	where	TRICK_ICG	may	cause	io_src	inconsistencies"))	;
+llvm::cl::alias	compat15_alias	("compat15"	,	llvm::cl::desc("Alias	for	-c")	,	llvm::cl::aliasopt(global_compat15))	;
+llvm::cl::opt<bool>	m32("m32",	llvm::cl::desc("Generate	io	code	for	use	with	32bit	mode"),	llvm::cl::init(false),	llvm::cl::ZeroOrMore)	;
+
+
+void	set_lang_opts(clang::CompilerInstance	&	ci)	{
+				ci.getLangOpts().CXXExceptions	=	true	;
+				//	Activate	C++11	parsing
+				ci.getLangOpts().Bool	=	true	;
+				ci.getLangOpts().WChar	=	true	;
+				ci.getLangOpts().CPlusPlus	=	true	;
+				ci.getLangOpts().CXXOperatorNames	=	true	;
+
+				//	Always	use	at	least	C++11
+				ci.getLangOpts().CPlusPlus11	=	true	;
+
+
+#if	(LIBCLANG_MAJOR	<	6)
+				//	Check	if	standard_version	was	specified	and	if	it's	a	version	that	is	supported	by	this	libclang
+				if	(standard_version	!=	"")	{
+								if	(standard_version	==	"c++11")	{
+												//	Nothing	to	be	done	here	really
+								}	else	if	(standard_version	==	"c++14"	||	standard_version	==	"c++17"	||	standard_version	==	"c++20")	{
+												std::cerr	<<	"C++	standard	"	<<	standard_version	<<	"	is	not	supported	by	this	version	of	Clang."	<<	std::endl;
+								}	else	{
+												std::cerr	<<	"Invalid	C++	standard	version	specified:"	<<	standard_version	<<	std::endl;
+								}
+				}
 #endif
 
-    // Activate C++14 parsing
-#if (LIBCLANG_MAJOR >= 6)
-    ci.getLangOpts().CPlusPlus14 = true ;
-    ci.getLangOpts().DoubleSquareBracketAttributes = true ;    
+				//	Activate	C++14	parsing
+#if	(LIBCLANG_MAJOR	>=	6)
+				ci.getLangOpts().CPlusPlus14	=	true	;
+				ci.getLangOpts().DoubleSquareBracketAttributes	=	true	;				
 #endif
 
-#if (LIBCLANG_MAJOR >= 6 && LIBCLANG_MAJOR < 10)
-    // Check if standard_version was specified and if it's a version that is supported by this libclang
-    if (standard_version != "") {
-        if (standard_version == "c++11") {
-            // Turn off c++14, c++11 is already on
-            ci.getLangOpts().CPlusPlus14 = false ;
-        } else if (standard_version == "c++14") {
-            // Nothing to be done here
-        }else if (standard_version == "c++17" || standard_version == "c++20") {
-            std::cerr << "C++ standard " << standard_version << " is not supported by this version of Clang." << std::endl;
-        } else {
-            std::cerr << "Invalid C++ standard version specified:" << standard_version << std::endl;
-        }
-    }
+#if	(LIBCLANG_MAJOR	>=	6	&&	LIBCLANG_MAJOR	<	10)
+				//	Check	if	standard_version	was	specified	and	if	it's	a	version	that	is	supported	by	this	libclang
+				if	(standard_version	!=	"")	{
+								if	(standard_version	==	"c++11")	{
+												//	Turn	off	c++14,	c++11	is	already	on
+												ci.getLangOpts().CPlusPlus14	=	false	;
+								}	else	if	(standard_version	==	"c++14")	{
+												//	Nothing	to	be	done	here
+								}else	if	(standard_version	==	"c++17"	||	standard_version	==	"c++20")	{
+												std::cerr	<<	"C++	standard	"	<<	standard_version	<<	"	is	not	supported	by	this	version	of	Clang."	<<	std::endl;
+								}	else	{
+												std::cerr	<<	"Invalid	C++	standard	version	specified:"	<<	standard_version	<<	std::endl;
+								}
+				}
 #endif
 
 
-    // Activate C++17 parsing
-#ifdef TRICK_GCC_VERSION
-const char * gcc_version = TRICK_GCC_VERSION;
+				//	Activate	C++17	parsing
+#ifdef	TRICK_GCC_VERSION
+const	char	*	gcc_version	=	TRICK_GCC_VERSION;
 #else
-const char * gcc_version = "";
+const	char	*	gcc_version	=	"";
 #endif
 
 
 
-#if (LIBCLANG_MAJOR >= 10)
-    ci.getLangOpts().GNUCVersion = gccVersionToIntOrDefault(gcc_version, 40805);
-    ci.getLangOpts().CPlusPlus17 = true ;
-
-    // Check if standard_version was specified and if it's a version that is supported by this libclang
-    if (standard_version != "") {
-        if (standard_version == "c++11") {
-            ci.getLangOpts().CPlusPlus14 = false ;
-            ci.getLangOpts().CPlusPlus17 = false ;
-        } else if (standard_version == "c++14") {
-            ci.getLangOpts().CPlusPlus17 = false ;
-        } else if (standard_version == "c++17" ) {
-            // Nothing to do here
-        } else if (standard_version == "c++20") {
-            #if (LIBCLANG_MAJOR == 10)
-            // https://github.com/nasa/trick/issues/1519
-            // Before LLVM 11, the flag was named CPlusPlus2a
-            ci.getLangOpts().CPlusPlus2a = true ;
-            #else 
-            ci.getLangOpts().CPlusPlus20 = true ;
-            #endif
-        } else {
-            std::cerr << "Invalid C++ standard version specified:" << standard_version << std::endl;
-        }
-    }
+#if	(LIBCLANG_MAJOR	>=	10)
+				ci.getLangOpts().GNUCVersion	=	gccVersionToIntOrDefault(gcc_version,	40805);
+				ci.getLangOpts().CPlusPlus17	=	true	;
+
+				//	Check	if	standard_version	was	specified	and	if	it's	a	version	that	is	supported	by	this	libclang
+				if	(standard_version	!=	"")	{
+								if	(standard_version	==	"c++11")	{
+												ci.getLangOpts().CPlusPlus14	=	false	;
+												ci.getLangOpts().CPlusPlus17	=	false	;
+								}	else	if	(standard_version	==	"c++14")	{
+												ci.getLangOpts().CPlusPlus17	=	false	;
+								}	else	if	(standard_version	==	"c++17"	)	{
+												//	Nothing	to	do	here
+								}	else	if	(standard_version	==	"c++20")	{
+												#if	(LIBCLANG_MAJOR	==	10)
+												//	https://github.com/nasa/trick/issues/1519
+												//	Before	LLVM	11,	the	flag	was	named	CPlusPlus2a
+												ci.getLangOpts().CPlusPlus2a	=	true	;
+												#else	
+												ci.getLangOpts().CPlusPlus20	=	true	;
+												#endif
+								}	else	{
+												std::cerr	<<	"Invalid	C++	standard	version	specified:"	<<	standard_version	<<	std::endl;
+								}
+				}
 #endif
 }
 /**
-Most of the main program is pieced together from examples on the web. We are doing the following:
-
--# Creating lists of include directories, defines, and input files from the command line arguments.
--# Initializing the compiler to read C++ code, and setting the compiler to think we are creating code for the default target architecture.
--# Creating the necessary source and file managers as well as the preprocessor.
--# Adding search directories and creating #define statements for -D command line arguments.
--# Telling clang to use our ICGASTConsumer as an ASTConsumer.
--# Parsing the input file.
+Most	of	the	main	program	is	pieced	together	from	examples	on	the	web.	We	are	doing	the	following:
+
+-#	Creating	lists	of	include	directories,	defines,	and	input	files	from	the	command	line	arguments.
+-#	Initializing	the	compiler	to	read	C++	code,	and	setting	the	compiler	to	think	we	are	creating	code	for	the	default	target	architecture.
+-#	Creating	the	necessary	source	and	file	managers	as	well	as	the	preprocessor.
+-#	Adding	search	directories	and	creating	#define	statements	for	-D	command	line	arguments.
+-#	Telling	clang	to	use	our	ICGASTConsumer	as	an	ASTConsumer.
+-#	Parsing	the	input	file.
 */
-int main(int argc, char * argv[]) {
-    llvm::cl::SetVersionPrinter([]
-#if (LIBCLANG_MAJOR >= 6)
-        (llvm::raw_ostream& stream) {stream
+int	main(int	argc,	char	*	argv[])	{
+				llvm::cl::SetVersionPrinter([]
+#if	(LIBCLANG_MAJOR	>=	6)
+								(llvm::raw_ostream&	stream)	{stream
 #else
-        {std::cout
+								{std::cout
 #endif
-            << "Trick Interface Code Generator (trick-ICG) " << TRICK_VERSION << '\n';}
-    );
-
-    /**
-     * Gather all of the command line arguments into lists of include directories, defines, and input files.
-     * All other arguments will be ignored.
-     *
-     * Filter out -W because of LLVM cl option that has been enabled and cannot be disabled in LLVM 10 when linking libclang-cpp.so.
-     * TODO: Troubleshoot or contact LLVM for a fix.  
-     */
-    std::vector<const char *> filtered_args;
-    for ( unsigned int ii = 0;  ii < argc ; ii++ ) {
-        if( strncmp(argv[ii], "-W", 2) ) {
-            filtered_args.push_back(argv[ii]);
-        }
-    }
-    
-    llvm::cl::ParseCommandLineOptions(filtered_args.size(), filtered_args.data());
-
-    if (input_file_names.empty()) {
-        std::cerr << "No header file specified" << std::endl;
-        return 1;
-    }
-    clang::CompilerInstance ci ;
-#if (LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR < 9)
-    clang::CompilerInvocation::setLangDefaults(ci.getLangOpts() , clang::IK_CXX) ;
+												<<	"Trick	Interface	Code	Generator	(trick-ICG)	"	<<	TRICK_VERSION	<<	'\n';}
+				);
+
+				/**
+					*	Gather	all	of	the	command	line	arguments	into	lists	of	include	directories,	defines,	and	input	files.
+					*	All	other	arguments	will	be	ignored.
+					*
+					*	Filter	out	-W	because	of	LLVM	cl	option	that	has	been	enabled	and	cannot	be	disabled	in	LLVM	10	when	linking	libclang-cpp.so.
+					*	TODO:	Troubleshoot	or	contact	LLVM	for	a	fix.		
+					*/
+				std::vector<const	char	*>	filtered_args;
+				for	(	unsigned	int	ii	=	0;		ii	<	argc	;	ii++	)	{
+								if(	strncmp(argv[ii],	"-W",	2)	)	{
+												filtered_args.push_back(argv[ii]);
+								}
+				}
+				
+				llvm::cl::ParseCommandLineOptions(filtered_args.size(),	filtered_args.data());
+
+				if	(input_file_names.empty())	{
+								std::cerr	<<	"No	header	file	specified"	<<	std::endl;
+								return	1;
+				}
+				clang::CompilerInstance	ci	;
+#if	(LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	<	9)
+				clang::CompilerInvocation::setLangDefaults(ci.getLangOpts()	,	clang::IK_CXX)	;
 #endif
 
-    ci.createDiagnostics();
-    ci.getDiagnosticOpts().ShowColors = 1 ;
-    ci.getDiagnostics().setIgnoreAllWarnings(true) ;
-    set_lang_opts(ci);
-
-    // Create all of the necessary managers.
-    ci.createFileManager();
-    ci.createSourceManager(ci.getFileManager());
-
-    // Tell the preprocessor to use its default predefines
-    clang::PreprocessorOptions & ppo = ci.getPreprocessorOpts() ;
-    ppo.UsePredefines = true;
-
-    // Set the default target architecture
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 5))
-    clang::TargetOptions to;
-    if ( m32 ) {
-        to.Triple = llvm::Triple(llvm::sys::getDefaultTargetTriple()).get32BitArchVariant().str();
-    } else {
-        to.Triple = llvm::sys::getDefaultTargetTriple();
-    }
-    std::shared_ptr<clang::TargetOptions> shared_to  = std::make_shared<clang::TargetOptions>(to) ;
-    clang::TargetInfo *pti = clang::TargetInfo::CreateTargetInfo(ci.getDiagnostics(), shared_to);
-    ci.setTarget(pti);
-    ci.createPreprocessor(clang::TU_Complete);
+				ci.createDiagnostics();
+				ci.getDiagnosticOpts().ShowColors	=	1	;
+				ci.getDiagnostics().setIgnoreAllWarnings(true)	;
+				set_lang_opts(ci);
+
+				//	Create	all	of	the	necessary	managers.
+				ci.createFileManager();
+				ci.createSourceManager(ci.getFileManager());
+
+				//	Tell	the	preprocessor	to	use	its	default	predefines
+				clang::PreprocessorOptions	&	ppo	=	ci.getPreprocessorOpts()	;
+				ppo.UsePredefines	=	true;
+
+				//	Set	the	default	target	architecture
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	5))
+				clang::TargetOptions	to;
+				if	(	m32	)	{
+								to.Triple	=	llvm::Triple(llvm::sys::getDefaultTargetTriple()).get32BitArchVariant().str();
+				}	else	{
+								to.Triple	=	llvm::sys::getDefaultTargetTriple();
+				}
+				std::shared_ptr<clang::TargetOptions>	shared_to		=	std::make_shared<clang::TargetOptions>(to)	;
+				clang::TargetInfo	*pti	=	clang::TargetInfo::CreateTargetInfo(ci.getDiagnostics(),	shared_to);
+				ci.setTarget(pti);
+				ci.createPreprocessor(clang::TU_Complete);
 #else
-    clang::TargetOptions * to = new clang::TargetOptions() ;
-    if ( m32 ) {
-        to->Triple = llvm::Triple(llvm::sys::getDefaultTargetTriple()).get32BitArchVariant().str();
-    } else {
-        to->Triple = llvm::sys::getDefaultTargetTriple();
-    }
-    clang::TargetInfo *pti = clang::TargetInfo::CreateTargetInfo(ci.getDiagnostics(), to);
-    ci.setTarget(pti);
-    ci.createPreprocessor();
+				clang::TargetOptions	*	to	=	new	clang::TargetOptions()	;
+				if	(	m32	)	{
+								to->Triple	=	llvm::Triple(llvm::sys::getDefaultTargetTriple()).get32BitArchVariant().str();
+				}	else	{
+								to->Triple	=	llvm::sys::getDefaultTargetTriple();
+				}
+				clang::TargetInfo	*pti	=	clang::TargetInfo::CreateTargetInfo(ci.getDiagnostics(),	to);
+				ci.setTarget(pti);
+				ci.createPreprocessor();
 #endif
 
-    // Set all of the defaults to c++
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 9))
-    llvm::Triple trip (to.Triple) ;
-#if (LIBCLANG_MAJOR >= 15)
-    //clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::Language::CXX, trip, ppo.Includes) ;
-#elif (LIBCLANG_MAJOR >= 12)
-    clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::Language::CXX, trip, ppo.Includes) ;
-#elif (LIBCLANG_MAJOR >= 10)
-    clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::Language::CXX, trip, ppo) ;
-#elif (LIBCLANG_MAJOR >= 5)
-    clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::InputKind::CXX, trip, ppo) ;
+				//	Set	all	of	the	defaults	to	c++
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	9))
+				llvm::Triple	trip	(to.Triple)	;
+#if	(LIBCLANG_MAJOR	>=	15)
+				//clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(),	clang::Language::CXX,	trip,	ppo.Includes)	;
+#elif	(LIBCLANG_MAJOR	>=	12)
+				clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(),	clang::Language::CXX,	trip,	ppo.Includes)	;
+#elif	(LIBCLANG_MAJOR	>=	10)
+				clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(),	clang::Language::CXX,	trip,	ppo)	;
+#elif	(LIBCLANG_MAJOR	>=	5)
+				clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(),	clang::InputKind::CXX,	trip,	ppo)	;
 #else
-    clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::IK_CXX, trip, ppo) ;
+				clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(),	clang::IK_CXX,	trip,	ppo)	;
 #endif
 
-    // setting the language defaults clears some of the language opts, set them again.
-    set_lang_opts(ci);
+				//	setting	the	language	defaults	clears	some	of	the	language	opts,	set	them	again.
+				set_lang_opts(ci);
 
 #endif
-    clang::Preprocessor& pp = ci.getPreprocessor();
+				clang::Preprocessor&	pp	=	ci.getPreprocessor();
 
-#if (LIBCLANG_MAJOR >= 10) && (LIBCLANG_MAJOR < 18)
-    clang::InitializePreprocessor(pp, ppo, ci.getPCHContainerReader(), ci.getFrontendOpts());
-#elif (LIBCLANG_MAJOR >= 18)
-    clang::InitializePreprocessor(pp, ppo, ci.getPCHContainerReader(), ci.getFrontendOpts(), ci.getCodeGenOpts());
+#if	(LIBCLANG_MAJOR	>=	10)	&&	(LIBCLANG_MAJOR	<	18)
+				clang::InitializePreprocessor(pp,	ppo,	ci.getPCHContainerReader(),	ci.getFrontendOpts());
+#elif	(LIBCLANG_MAJOR	>=	18)
+				clang::InitializePreprocessor(pp,	ppo,	ci.getPCHContainerReader(),	ci.getFrontendOpts(),	ci.getCodeGenOpts());
 #endif
 
-    // Add all of the include directories to the preprocessor
-    HeaderSearchDirs hsd(ci.getPreprocessor().getHeaderSearchInfo(), ci.getHeaderSearchOpts(), pp, sim_services_flag);
-    hsd.addSearchDirs(include_dirs, isystem_dirs);
+				//	Add	all	of	the	include	directories	to	the	preprocessor
+				HeaderSearchDirs	hsd(ci.getPreprocessor().getHeaderSearchInfo(),	ci.getHeaderSearchOpts(),	pp,	sim_services_flag);
+				hsd.addSearchDirs(include_dirs,	isystem_dirs);
 
-    // Add a preprocessor callback to search for TRICK_ICG
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 6))
-    std::unique_ptr<FindTrickICG> ftg(new FindTrickICG(ci, hsd, print_trick_icg != llvm::cl::BOU_FALSE )) ;
-    pp.addPPCallbacks(std::move(ftg)) ;
+				//	Add	a	preprocessor	callback	to	search	for	TRICK_ICG
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	6))
+				std::unique_ptr<FindTrickICG>	ftg(new	FindTrickICG(ci,	hsd,	print_trick_icg	!=	llvm::cl::BOU_FALSE	))	;
+				pp.addPPCallbacks(std::move(ftg))	;
 #else
-    FindTrickICG * ftg = new FindTrickICG(ci, hsd, print_trick_icg != llvm::cl::BOU_FALSE ) ;
-    pp.addPPCallbacks(ftg) ;
+				FindTrickICG	*	ftg	=	new	FindTrickICG(ci,	hsd,	print_trick_icg	!=	llvm::cl::BOU_FALSE	)	;
+				pp.addPPCallbacks(ftg)	;
 #endif
 
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 8))
-    pp.getBuiltinInfo().initializeBuiltins(pp.getIdentifierTable(), pp.getLangOpts());
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	8))
+				pp.getBuiltinInfo().initializeBuiltins(pp.getIdentifierTable(),	pp.getLangOpts());
 #else
-    pp.getBuiltinInfo().InitializeBuiltins(pp.getIdentifierTable(), pp.getLangOpts());
+				pp.getBuiltinInfo().InitializeBuiltins(pp.getIdentifierTable(),	pp.getLangOpts());
 #endif
-    // Add all of the #define from the command line to the default predefines
-    hsd.addDefines(defines);
+				//	Add	all	of	the	#define	from	the	command	line	to	the	default	predefines
+				hsd.addDefines(defines);
 
-    // Add our comment saver as a comment handler in the preprocessor
-    CommentSaver cs(ci, hsd);
-    pp.addCommentHandler(&cs);
+				//	Add	our	comment	saver	as	a	comment	handler	in	the	preprocessor
+				CommentSaver	cs(ci,	hsd);
+				pp.addCommentHandler(&cs);
 
-    PrintAttributes printAttributes(attr_version, hsd, cs, ci, force, sim_services_flag, output_dir);
+				PrintAttributes	printAttributes(attr_version,	hsd,	cs,	ci,	force,	sim_services_flag,	output_dir);
 
-    printAttributes.addIgnoreTypes() ;
-    // Create new class and enum map files
-    if (create_map) {
-        printAttributes.createMapFiles();
-    }
+				printAttributes.addIgnoreTypes()	;
+				//	Create	new	class	and	enum	map	files
+				if	(create_map)	{
+								printAttributes.createMapFiles();
+				}
 
-    // Tell the compiler to use our ICGASTconsumer
-    ICGASTConsumer* astConsumer = new ICGASTConsumer(ci, hsd, cs, printAttributes);
-#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 6))
-    ci.setASTConsumer(std::move(std::unique_ptr<clang::ASTConsumer>(astConsumer)));
+				//	Tell	the	compiler	to	use	our	ICGASTconsumer
+				ICGASTConsumer*	astConsumer	=	new	ICGASTConsumer(ci,	hsd,	cs,	printAttributes);
+#if	(LIBCLANG_MAJOR	>	3)	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	6))
+				ci.setASTConsumer(std::move(std::unique_ptr<clang::ASTConsumer>(astConsumer)));
 #else
-    ci.setASTConsumer(astConsumer);
+				ci.setASTConsumer(astConsumer);
 #endif
-    ci.createASTContext();
-    ci.createSema(clang::TU_Complete, NULL);
-
-    // Get the full path of the file to be read
-    char buffer[input_file_names[0].size() + 1];
-    strcpy(buffer, input_file_names[0].c_str());
-    std::string path(dirname(buffer));
-    path += "/";
-    strcpy(buffer, input_file_names[0].c_str());
-    path += basename(buffer);
-    char* inputFilePath = almostRealPath(path);
-
-    struct stat dummy;
-    if (stat(inputFilePath, &dummy)) {
-        std::cerr << "Could not open file " << inputFilePath << std::endl;
-        exit(-1);
-    }
-    // Open up the input file and parse it
-#if (LIBCLANG_MAJOR >= 10 && LIBCLANG_MAJOR < 18)
-    const clang::FileEntry* fileEntry = ci.getFileManager().getFile(inputFilePath).get();
-#elif (LIBCLANG_MAJOR >= 18)
-    clang::FileEntryRef fileEntryRef = llvm::cantFail(ci.getFileManager().getFileRef(inputFilePath));
+				ci.createASTContext();
+				ci.createSema(clang::TU_Complete,	NULL);
+
+				//	Get	the	full	path	of	the	file	to	be	read
+				char	buffer[input_file_names[0].size()	+	1];
+				strcpy(buffer,	input_file_names[0].c_str());
+				std::string	path(dirname(buffer));
+				path	+=	"/";
+				strcpy(buffer,	input_file_names[0].c_str());
+				path	+=	basename(buffer);
+				char*	inputFilePath	=	almostRealPath(path);
+
+				struct	stat	dummy;
+				if	(stat(inputFilePath,	&dummy))	{
+								std::cerr	<<	"Could	not	open	file	"	<<	inputFilePath	<<	std::endl;
+								exit(-1);
+				}
+				//	Open	up	the	input	file	and	parse	it
+#if	(LIBCLANG_MAJOR	>=	10	&&	LIBCLANG_MAJOR	<	18)
+				const	clang::FileEntry*	fileEntry	=	ci.getFileManager().getFile(inputFilePath).get();
+#elif	(LIBCLANG_MAJOR	>=	18)
+				clang::FileEntryRef	fileEntryRef	=	llvm::cantFail(ci.getFileManager().getFileRef(inputFilePath));
 #else
-    const clang::FileEntry* fileEntry = ci.getFileManager().getFile(inputFilePath);
+				const	clang::FileEntry*	fileEntry	=	ci.getFileManager().getFile(inputFilePath);
 #endif
-    free(inputFilePath);
-#if ((LIBCLANG_MAJOR > 3 && LIBCLANG_MAJOR < 18)) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 5))
-    ci.getSourceManager().setMainFileID(ci.getSourceManager().createFileID(fileEntry, clang::SourceLocation(), clang::SrcMgr::C_User));
-#elif (LIBCLANG_MAJOR >= 18)
-    ci.getSourceManager().setMainFileID(ci.getSourceManager().createFileID(fileEntryRef, clang::SourceLocation(), clang::SrcMgr::C_User));
+				free(inputFilePath);
+#if	((LIBCLANG_MAJOR	>	3	&&	LIBCLANG_MAJOR	<	18))	||	((LIBCLANG_MAJOR	==	3)	&&	(LIBCLANG_MINOR	>=	5))
+				ci.getSourceManager().setMainFileID(ci.getSourceManager().createFileID(fileEntry,	clang::SourceLocation(),	clang::SrcMgr::C_User));
+#elif	(LIBCLANG_MAJOR	>=	18)
+				ci.getSourceManager().setMainFileID(ci.getSourceManager().createFileID(fileEntryRef,	clang::SourceLocation(),	clang::SrcMgr::C_User));
 #else
-    ci.getSourceManager().createMainFileID(fileEntry);
+				ci.getSourceManager().createMainFileID(fileEntry);
 #endif
-    ICGDiagnosticConsumer *icgDiagConsumer = new ICGDiagnosticConsumer(llvm::errs(), &ci.getDiagnosticOpts(), ci, hsd);
-    ci.getDiagnostics().setClient(icgDiagConsumer);
-    ci.getDiagnosticClient().BeginSourceFile(ci.getLangOpts(), &ci.getPreprocessor());
-    clang::ParseAST(ci.getSema());
-    ci.getDiagnosticClient().EndSourceFile();
+				ICGDiagnosticConsumer	*icgDiagConsumer	=	new	ICGDiagnosticConsumer(llvm::errs(),	&ci.getDiagnosticOpts(),	ci,	hsd);
+				ci.getDiagnostics().setClient(icgDiagConsumer);
+				ci.getDiagnosticClient().BeginSourceFile(ci.getLangOpts(),	&ci.getPreprocessor());
+				clang::ParseAST(ci.getSema());
+				ci.getDiagnosticClient().EndSourceFile();
 
-    if (!sim_services_flag) {
-        printAttributes.printIOMakefile();
-    }
+				if	(!sim_services_flag)	{
+								printAttributes.printIOMakefile();
+				}
 
-    // Close the map files
-    printAttributes.closeMapFiles();
+				//	Close	the	map	files
+				printAttributes.closeMapFiles();
 
-    // Print the list of headers that have the ICG:(No) comment
-    printAttributes.printICGNoFiles();
+				//	Print	the	list	of	headers	that	have	the	ICG:(No)	comment
+				printAttributes.printICGNoFiles();
 
-    if (icgDiagConsumer->error_in_user_code) {
-        std::cout << color(ERROR, "Trick build was terminated due to error in user code!") << std::endl;
-        exit(-1);
-    }
+				if	(icgDiagConsumer->error_in_user_code)	{
+								std::cout	<<	color(ERROR,	"Trick	build	was	terminated	due	to	error	in	user	code!")	<<	std::endl;
+								exit(-1);
+				}
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp b/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
index 9b82e866c..cbf63e634 100644
--- a/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
+++ b/trick_source/data_products/Apps/Trk2csv/trk2ascii.cpp
@@ -1,262 +1,262 @@
 
-#include <vector>
-#include <iostream>
-#include "Log/TrickBinary.hh"
-#include <string.h>
-#include <stdlib.h>
+#include	<vector>
+#include	<iostream>
+#include	"Log/TrickBinary.hh"
+#include	<string.h>
+#include	<stdlib.h>
 
-static const char *usage_doc[] = {
+static	const	char	*usage_doc[]	=	{
 "----------------------------------------------------------------------------",
-" trk2ascii -                                                                ",
-"                                                                            ",
-" USAGE:  trk2ascii <ascii_format [output_file_name]> <trk_file_name> [args] ",
-" Options:                                                                   ",
-"     -help                Print this message and exit.                      ",
-"     -csv, -ascii         Generates a comma-separated value (CSV) file from ",
-"                          a Trick binary data file. CSV files are a common  ",
-"                          means of sharing data between applications.       ",
-"     -fix                 Generatse a fixed cloumn width ascii file from a  ",
-"                          Trick binary data files                            ",
-"     -xml                 Generates an extensible markup language (XML)     ",
-"                          file from a Trick binary data file. XML files may ",
-"                          be used for sharing data between NExIOM devices.  ",
-"     delimiter=\"<_delimit_string_>\"                                         ",
-"                          Change the default delimiter used in 'csv' & 'fix'",
-"                          ascii formats from comma separated \",\" to another ",
-"                          string (Note: do not use spaces before quotes).   ",
-"                                                                            ",
+"	trk2ascii	-																																																																",
+"																																																																												",
+"	USAGE:		trk2ascii	<ascii_format	[output_file_name]>	<trk_file_name>	[args]	",
+"	Options:																																																																			",
+"					-help																Print	this	message	and	exit.																						",
+"					-csv,	-ascii									Generates	a	comma-separated	value	(CSV)	file	from	",
+"																										a	Trick	binary	data	file.	CSV	files	are	a	common		",
+"																										means	of	sharing	data	between	applications.							",
+"					-fix																	Generatse	a	fixed	cloumn	width	ascii	file	from	a		",
+"																										Trick	binary	data	files																												",
+"					-xml																	Generates	an	extensible	markup	language	(XML)					",
+"																										file	from	a	Trick	binary	data	file.	XML	files	may	",
+"																										be	used	for	sharing	data	between	NExIOM	devices.		",
+"					delimiter=\"<_delimit_string_>\"																																									",
+"																										Change	the	default	delimiter	used	in	'csv'	&	'fix'",
+"																										ascii	formats	from	comma	separated	\",\"	to	another	",
+"																										string	(Note:	do	not	use	spaces	before	quotes).			",
+"																																																																												",
 "----------------------------------------------------------------------------"};
-#define N_USAGE_LINES (sizeof(usage_doc)/sizeof(usage_doc[0]))
+#define	N_USAGE_LINES	(sizeof(usage_doc)/sizeof(usage_doc[0]))
 
-void print_doc(char *doc[], int nlines) {
-    int i;
-    for (i=0; i < nlines; i++) {
-        cerr << doc[i] << '\n';
-    }
-    cerr.flush();
+void	print_doc(char	*doc[],	int	nlines)	{
+				int	i;
+				for	(i=0;	i	<	nlines;	i++)	{
+								cerr	<<	doc[i]	<<	'\n';
+				}
+				cerr.flush();
 }
 
-void usage() {
-    print_doc((char **)usage_doc,N_USAGE_LINES);
+void	usage()	{
+				print_doc((char	**)usage_doc,N_USAGE_LINES);
 }
 
-int main(int argc, char* argv[])
+int	main(int	argc,	char*	argv[])
 {
-    double t, y ;
-    char *trk_file_name = NULL;
-    char *ascii_file_name = NULL;
-    FILE *fp;
+				double	t,	y	;
+				char	*trk_file_name	=	NULL;
+				char	*ascii_file_name	=	NULL;
+				FILE	*fp;
 
-    int number_of_parameters;
-    char ** param_names;
-    char ** param_units;
-    enum {CSV, FIX, XML};
-    int Format=0;  /* default to csv */
-    string delimiter(",");  /* default delimter */
+				int	number_of_parameters;
+				char	**	param_names;
+				char	**	param_units;
+				enum	{CSV,	FIX,	XML};
+				int	Format=0;		/*	default	to	csv	*/
+				string	delimiter(",");		/*	default	delimter	*/
 
-    int i, done;
-    char *prog_name = argv[0];
+				int	i,	done;
+				char	*prog_name	=	argv[0];
 
-    DataStream* each_ds;
-    vector <DataStream*> ds_list;
-    // idx is used when comparing with the size() of the vector
-    vector <DataStream*>::size_type idx;
+				DataStream*	each_ds;
+				vector	<DataStream*>	ds_list;
+				//	idx	is	used	when	comparing	with	the	size()	of	the	vector
+				vector	<DataStream*>::size_type	idx;
 
-    if (argc <= 1 ) {
-        cerr << prog_name << ": No arguments were supplied.\n";
-        cerr.flush();
-        usage();
-        exit(EXIT_FAILURE);
-    } else {
-        int i = 1;
-        string option, next_option;
-        int found_it;
-        while ( i < argc ) {
-            option = argv[i++];
-            if (i<argc) next_option = argv[i];
+				if	(argc	<=	1	)	{
+								cerr	<<	prog_name	<<	":	No	arguments	were	supplied.\n";
+								cerr.flush();
+								usage();
+								exit(EXIT_FAILURE);
+				}	else	{
+								int	i	=	1;
+								string	option,	next_option;
+								int	found_it;
+								while	(	i	<	argc	)	{
+												option	=	argv[i++];
+												if	(i<argc)	next_option	=	argv[i];
 
-            if (option == "-help") {
-                usage();
-                exit(EXIT_SUCCESS);
-            } else if (option == "-csv"  ||  option == "-ascii") {
-                Format = CSV;
-                if (i<argc  &&  (next_option.find(".trk") == string::npos)) {
-                    ascii_file_name = argv[i++];
-                }
-            } else if (option == "-fix") {
-                Format = FIX;
-                if (i<argc  &&  (next_option.find(".trk") == string::npos)) {
-                    ascii_file_name = argv[i++];
-                }
-            } else if (option == "-xml") {
-                Format = XML;
-                if (i<argc  &&  (next_option.find(".trk") == string::npos)) {
-                    ascii_file_name = argv[i++];
-                }
-            } else if (option.find(".trk") != string::npos) {
-                trk_file_name = strdup( option.c_str() );
-            } else if (option.find("delim") != string::npos) {
-                found_it = option.find_first_of("=");
-                if (found_it>=0) {
-                    delimiter = option.substr(found_it+1);
-                }
-            } else {
-                cerr << "\"" << option.c_str() << "\" is not a valid option.\n";
-                cerr.flush();
-                usage();
-                exit(EXIT_FAILURE);
-            }
-        }
-    }
+												if	(option	==	"-help")	{
+																usage();
+																exit(EXIT_SUCCESS);
+												}	else	if	(option	==	"-csv"		||		option	==	"-ascii")	{
+																Format	=	CSV;
+																if	(i<argc		&&		(next_option.find(".trk")	==	string::npos))	{
+																				ascii_file_name	=	argv[i++];
+																}
+												}	else	if	(option	==	"-fix")	{
+																Format	=	FIX;
+																if	(i<argc		&&		(next_option.find(".trk")	==	string::npos))	{
+																				ascii_file_name	=	argv[i++];
+																}
+												}	else	if	(option	==	"-xml")	{
+																Format	=	XML;
+																if	(i<argc		&&		(next_option.find(".trk")	==	string::npos))	{
+																				ascii_file_name	=	argv[i++];
+																}
+												}	else	if	(option.find(".trk")	!=	string::npos)	{
+																trk_file_name	=	strdup(	option.c_str()	);
+												}	else	if	(option.find("delim")	!=	string::npos)	{
+																found_it	=	option.find_first_of("=");
+																if	(found_it>=0)	{
+																				delimiter	=	option.substr(found_it+1);
+																}
+												}	else	{
+																cerr	<<	"\""	<<	option.c_str()	<<	"\"	is	not	a	valid	option.\n";
+																cerr.flush();
+																usage();
+																exit(EXIT_FAILURE);
+												}
+								}
+				}
 
-    if (trk_file_name == NULL) {
-        cerr << prog_name << ": No Trick binary data file name was supplied.\n";
-        cerr.flush();
-        usage();
-        exit(EXIT_FAILURE);
-    }
+				if	(trk_file_name	==	NULL)	{
+								cerr	<<	prog_name	<<	":	No	Trick	binary	data	file	name	was	supplied.\n";
+								cerr.flush();
+								usage();
+								exit(EXIT_FAILURE);
+				}
 
-    if (ascii_file_name != NULL) {
-        if (( fp = fopen(ascii_file_name, "w") ) == 0) {
-            cerr << "Couldn't open \" << ascii_file_name << \" for writing\n";
-            cerr.flush();
-            exit(EXIT_FAILURE);
-        }
-    } else {
-        fp = stdout;
-    }
+				if	(ascii_file_name	!=	NULL)	{
+								if	((	fp	=	fopen(ascii_file_name,	"w")	)	==	0)	{
+												cerr	<<	"Couldn't	open	\"	<<	ascii_file_name	<<	\"	for	writing\n";
+												cerr.flush();
+												exit(EXIT_FAILURE);
+								}
+				}	else	{
+								fp	=	stdout;
+				}
 
-    number_of_parameters = TrickBinaryGetNumVariables(trk_file_name);
+				number_of_parameters	=	TrickBinaryGetNumVariables(trk_file_name);
 
-    if (number_of_parameters == 0) {
-        cerr << "No parameters found in the Trk data log file.\n";
-        cerr.flush();
-        exit(EXIT_FAILURE);
-    }
+				if	(number_of_parameters	==	0)	{
+								cerr	<<	"No	parameters	found	in	the	Trk	data	log	file.\n";
+								cerr.flush();
+								exit(EXIT_FAILURE);
+				}
 
-    if (( param_names = TrickBinaryGetVariableNames(trk_file_name)) == NULL ) {
-        cerr << "Unable get parameter names from the Trk data log file.\n";
-        cerr.flush();
-        exit(EXIT_FAILURE);
-    }
+				if	((	param_names	=	TrickBinaryGetVariableNames(trk_file_name))	==	NULL	)	{
+								cerr	<<	"Unable	get	parameter	names	from	the	Trk	data	log	file.\n";
+								cerr.flush();
+								exit(EXIT_FAILURE);
+				}
 
-    if (( param_units = TrickBinaryGetVariableUnits(trk_file_name)) == NULL ) {
-        cerr << "Unable get parameter units from the Trk data log file.\n";
-        cerr.flush();
-        exit(EXIT_FAILURE);
-    }
+				if	((	param_units	=	TrickBinaryGetVariableUnits(trk_file_name))	==	NULL	)	{
+								cerr	<<	"Unable	get	parameter	units	from	the	Trk	data	log	file.\n";
+								cerr.flush();
+								exit(EXIT_FAILURE);
+				}
 
-    string ascii_title("Results");
-    if (ascii_file_name != NULL) {
-        ascii_title = ascii_file_name;
-    } else {
-        ascii_title = trk_file_name;
-    }
-    /* Strip off file extension */
-    ascii_title.erase(ascii_title.find_last_not_of(".trk")+1, ascii_title.length());
-    /* Strip off log_ prefix extension */
-    ascii_title.erase(ascii_title.find_first_of("log_"), (ascii_title.find_first_of("log_")+4));
+				string	ascii_title("Results");
+				if	(ascii_file_name	!=	NULL)	{
+								ascii_title	=	ascii_file_name;
+				}	else	{
+								ascii_title	=	trk_file_name;
+				}
+				/*	Strip	off	file	extension	*/
+				ascii_title.erase(ascii_title.find_last_not_of(".trk")+1,	ascii_title.length());
+				/*	Strip	off	log_	prefix	extension	*/
+				ascii_title.erase(ascii_title.find_first_of("log_"),	(ascii_title.find_first_of("log_")+4));
 
-    char buf[64] ;
-    string current_line;
-    switch ( Format ) {
-        case XML:
-            fprintf(fp,"<DataTable name=\"%s\">\n", ascii_title.c_str());
-            fprintf(fp,"%4s<Columns>\n", "");
-            for ( i=0; i<number_of_parameters; i++ ) {
-                fprintf(fp, "%8s<Column name=\"%s\" units=\"%s\" />\n", "", param_names[i], param_units[i]);
-                if (( each_ds = new TrickBinary(trk_file_name, param_names[i] )) == NULL) {
-                    cerr << ".\n";
-                    cerr.flush();
-                    exit(EXIT_FAILURE);
-                } else {
-                    ds_list.push_back(each_ds);
-                }
-            }
-            fprintf(fp,"%4s</Columns>\n", "");
+				char	buf[64]	;
+				string	current_line;
+				switch	(	Format	)	{
+								case	XML:
+												fprintf(fp,"<DataTable	name=\"%s\">\n",	ascii_title.c_str());
+												fprintf(fp,"%4s<Columns>\n",	"");
+												for	(	i=0;	i<number_of_parameters;	i++	)	{
+																fprintf(fp,	"%8s<Column	name=\"%s\"	units=\"%s\"	/>\n",	"",	param_names[i],	param_units[i]);
+																if	((	each_ds	=	new	TrickBinary(trk_file_name,	param_names[i]	))	==	NULL)	{
+																				cerr	<<	".\n";
+																				cerr.flush();
+																				exit(EXIT_FAILURE);
+																}	else	{
+																				ds_list.push_back(each_ds);
+																}
+												}
+												fprintf(fp,"%4s</Columns>\n",	"");
 
-            fprintf(fp,"%4s<Data>\n", "");
-            done = 0;
-            while ( !done ) {
-                current_line.clear();
-                snprintf(buf, sizeof(buf), "%8s<Row>", "");
-                current_line.append(buf);
-                for ( idx = 0; idx < ds_list.size(); idx++ ) {
-                    if ( ds_list[idx]->get( &t, &y) == 0 ) {
-                        done = 1;
-                        break;
-                    }
-                    snprintf(buf, sizeof(buf), "<Col>%.15G</Col>", y);
-                    current_line.append(buf);
-                }
-                current_line.append("</Row>");
-                if ( !done ) {
-                    fprintf(fp, "%s\n", current_line.c_str());
-                }
-            }
-            fprintf(fp,"%4s</Data>\n", "");
-            fprintf(fp,"</DataTable>\n");
-            break;
+												fprintf(fp,"%4s<Data>\n",	"");
+												done	=	0;
+												while	(	!done	)	{
+																current_line.clear();
+																snprintf(buf,	sizeof(buf),	"%8s<Row>",	"");
+																current_line.append(buf);
+																for	(	idx	=	0;	idx	<	ds_list.size();	idx++	)	{
+																				if	(	ds_list[idx]->get(	&t,	&y)	==	0	)	{
+																								done	=	1;
+																								break;
+																				}
+																				snprintf(buf,	sizeof(buf),	"<Col>%.15G</Col>",	y);
+																				current_line.append(buf);
+																}
+																current_line.append("</Row>");
+																if	(	!done	)	{
+																				fprintf(fp,	"%s\n",	current_line.c_str());
+																}
+												}
+												fprintf(fp,"%4s</Data>\n",	"");
+												fprintf(fp,"</DataTable>\n");
+												break;
 
-        case CSV:
-        case FIX:
-        default:
-            for ( i=0; i<number_of_parameters; i++ ) {
-                if (i == 0) {
-                    fprintf(fp,"%s {%s}",param_names[0], param_units[i]);
-                } else {
-                    fprintf(fp,"%s%s {%s}", delimiter.c_str(), param_names[i], param_units[i]);
-                }
+								case	CSV:
+								case	FIX:
+								default:
+												for	(	i=0;	i<number_of_parameters;	i++	)	{
+																if	(i	==	0)	{
+																				fprintf(fp,"%s	{%s}",param_names[0],	param_units[i]);
+																}	else	{
+																				fprintf(fp,"%s%s	{%s}",	delimiter.c_str(),	param_names[i],	param_units[i]);
+																}
 
-                if (( each_ds = new TrickBinary(trk_file_name, param_names[i] )) == NULL) {
-                    cerr << ".\n";
-                    cerr.flush();
-                    exit(EXIT_FAILURE);
-                } else {
-                    ds_list.push_back(each_ds);
-                }
-            }
+																if	((	each_ds	=	new	TrickBinary(trk_file_name,	param_names[i]	))	==	NULL)	{
+																				cerr	<<	".\n";
+																				cerr.flush();
+																				exit(EXIT_FAILURE);
+																}	else	{
+																				ds_list.push_back(each_ds);
+																}
+												}
 
-            fprintf(fp,"\n");
+												fprintf(fp,"\n");
 
-            done = 0;
-            while ( !done ) {
-                current_line.clear();
-                for ( idx = 0; idx < ds_list.size(); idx++ ) {
-                    if ( ds_list[idx]->get( &t, &y) == 0 ) {
-                        done = 1;
-                        break;
-                    }
-                    if ( idx != 0) {
-                        snprintf(buf, sizeof(buf), "%s", delimiter.c_str());
-                        current_line.append(buf);
-                    }
-                    if ( Format == FIX ) {
-                        snprintf(buf, sizeof(buf), "%20.16g", y);
-                        current_line.append(buf);
-                    } else {
-                        snprintf(buf, sizeof(buf), "%.15G", y);
-                        current_line.append(buf);
-                    }
-                }
-                if ( !done ) {
-                    fprintf(fp, "%s\n", current_line.c_str());
-                }
-            }
-            break;
-    }
+												done	=	0;
+												while	(	!done	)	{
+																current_line.clear();
+																for	(	idx	=	0;	idx	<	ds_list.size();	idx++	)	{
+																				if	(	ds_list[idx]->get(	&t,	&y)	==	0	)	{
+																								done	=	1;
+																								break;
+																				}
+																				if	(	idx	!=	0)	{
+																								snprintf(buf,	sizeof(buf),	"%s",	delimiter.c_str());
+																								current_line.append(buf);
+																				}
+																				if	(	Format	==	FIX	)	{
+																								snprintf(buf,	sizeof(buf),	"%20.16g",	y);
+																								current_line.append(buf);
+																				}	else	{
+																								snprintf(buf,	sizeof(buf),	"%.15G",	y);
+																								current_line.append(buf);
+																				}
+																}
+																if	(	!done	)	{
+																				fprintf(fp,	"%s\n",	current_line.c_str());
+																}
+												}
+												break;
+				}
 
-    // release memory for the DataStream list
-    // vector clear function won't delete objects created by new
-    for ( idx = 0; idx < ds_list.size(); idx++) {
-        delete ds_list[idx];
-    }
-    ds_list.clear();
+				//	release	memory	for	the	DataStream	list
+				//	vector	clear	function	won't	delete	objects	created	by	new
+				for	(	idx	=	0;	idx	<	ds_list.size();	idx++)	{
+								delete	ds_list[idx];
+				}
+				ds_list.clear();
 
-    // relese memory for the name list
-    for (i = 0; i < number_of_parameters; i ++) {
-        delete[] param_names[i];
-    }
+				//	relese	memory	for	the	name	list
+				for	(i	=	0;	i	<	number_of_parameters;	i	++)	{
+								delete[]	param_names[i];
+				}
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp b/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp
index 573dc8550..bb662dd4a 100644
--- a/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp
+++ b/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp
@@ -1,24 +1,24 @@
-#include "CSV_Formatter.hh"
-/* ================================================================================
- * CLASS: CSV_Formatter isa LogFormatter.
- * ================================================================================
- */
+#include	"CSV_Formatter.hh"
+/*	================================================================================
+	*	CLASS:	CSV_Formatter	isa	LogFormatter.
+	*	================================================================================
+	*/
 
-void CSV_Formatter::writeHeader(FILE* out_fp, int version, int endianness) {};
-void CSV_Formatter::writeColumnLabel(FILE* out_fp, const char* name, const char* units) {
-    fprintf(out_fp,"%s {%s}", name, units);
+void	CSV_Formatter::writeHeader(FILE*	out_fp,	int	version,	int	endianness)	{};
+void	CSV_Formatter::writeColumnLabel(FILE*	out_fp,	const	char*	name,	const	char*	units)	{
+				fprintf(out_fp,"%s	{%s}",	name,	units);
 }
-void CSV_Formatter::writeColumnLabelSeparator(FILE* out_fp)  { fprintf(out_fp,","); }
-void CSV_Formatter::writeDatumSeparator(FILE* out_fp)        { fprintf(out_fp,","); }
-void CSV_Formatter::writeRecordSeparator(FILE* out_fp)       { fprintf(out_fp,"\n"); }
-void CSV_Formatter::writeDatum(FILE* out_fp, int8_t datum)   { fprintf(out_fp,"%d", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, uint8_t datum)  { fprintf(out_fp,"%u", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, int16_t datum)  { fprintf(out_fp,"%d", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, uint16_t datum) { fprintf(out_fp,"%u", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, int32_t datum)  { fprintf(out_fp,"%d", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, uint32_t datum) { fprintf(out_fp,"%u", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, int64_t datum)  { fprintf(out_fp,"%ld", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, uint64_t datum) { fprintf(out_fp,"%lu", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, float datum)    { fprintf(out_fp,"%.7f", datum); }
-void CSV_Formatter::writeDatum(FILE* out_fp, double datum)   { fprintf(out_fp,"%.15g", datum); }
-const char* CSV_Formatter::extension() { return ".csv"; };
+void	CSV_Formatter::writeColumnLabelSeparator(FILE*	out_fp)		{	fprintf(out_fp,",");	}
+void	CSV_Formatter::writeDatumSeparator(FILE*	out_fp)								{	fprintf(out_fp,",");	}
+void	CSV_Formatter::writeRecordSeparator(FILE*	out_fp)							{	fprintf(out_fp,"\n");	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	int8_t	datum)			{	fprintf(out_fp,"%d",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	uint8_t	datum)		{	fprintf(out_fp,"%u",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	int16_t	datum)		{	fprintf(out_fp,"%d",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	uint16_t	datum)	{	fprintf(out_fp,"%u",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	int32_t	datum)		{	fprintf(out_fp,"%d",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	uint32_t	datum)	{	fprintf(out_fp,"%u",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	int64_t	datum)		{	fprintf(out_fp,"%ld",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	uint64_t	datum)	{	fprintf(out_fp,"%lu",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	float	datum)				{	fprintf(out_fp,"%.7f",	datum);	}
+void	CSV_Formatter::writeDatum(FILE*	out_fp,	double	datum)			{	fprintf(out_fp,"%.15g",	datum);	}
+const	char*	CSV_Formatter::extension()	{	return	".csv";	};
diff --git a/trick_source/data_products/Apps/trkConvert/DocWindow.cpp b/trick_source/data_products/Apps/trkConvert/DocWindow.cpp
index 29234ec49..013665d3f 100644
--- a/trick_source/data_products/Apps/trkConvert/DocWindow.cpp
+++ b/trick_source/data_products/Apps/trkConvert/DocWindow.cpp
@@ -1,204 +1,204 @@
-#include <QAction>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QWidget>
-#include <iostream>
+#include	<QAction>
+#include	<QFileDialog>
+#include	<QMenuBar>
+#include	<QPushButton>
+#include	<QVBoxLayout>
+#include	<QLineEdit>
+#include	<QWidget>
+#include	<iostream>
 
-#include <QTextStream>
+#include	<QTextStream>
 
-#include "DocWindow.h"
-#include "VarTableWidget.h"
-#include "CSV_Formatter.hh"
-#include "Varlist_Formatter.hh"
+#include	"DocWindow.h"
+#include	"VarTableWidget.h"
+#include	"CSV_Formatter.hh"
+#include	"Varlist_Formatter.hh"
 
-DocWindow::DocWindow(TRK_DataLog* data_log )
-    : QMainWindow( 0, 0) {
+DocWindow::DocWindow(TRK_DataLog*	data_log	)
+				:	QMainWindow(	0,	0)	{
 
-    QTextStream out(stdout);
+				QTextStream	out(stdout);
 
-    foundItemIndex = 0;
-    datalog = data_log;
+				foundItemIndex	=	0;
+				datalog	=	data_log;
 
-    // Build the FILE menu
+				//	Build	the	FILE	menu
 
-    QMenu *fileMenu = menuBar()->addMenu("&File");
+				QMenu	*fileMenu	=	menuBar()->addMenu("&File");
 
-    QAction * fileLoadAction = new QAction( "&Open File...", this );
-    fileLoadAction->setShortcut(tr("CTRL+O"));
-    fileMenu->addAction(fileLoadAction);
-    connect( fileLoadAction, &QAction::triggered , this, &DocWindow::load );
+				QAction	*	fileLoadAction	=	new	QAction(	"&Open	File...",	this	);
+				fileLoadAction->setShortcut(tr("CTRL+O"));
+				fileMenu->addAction(fileLoadAction);
+				connect(	fileLoadAction,	&QAction::triggered	,	this,	&DocWindow::load	);
 
-    fileMenu->addSeparator();
+				fileMenu->addSeparator();
 
-    QAction * csvSaveAction = new QAction( "&Export as CSV...", this );
-    fileMenu->addAction(csvSaveAction);
-    connect( csvSaveAction, &QAction::triggered, this, &DocWindow::saveAsCSV );
+				QAction	*	csvSaveAction	=	new	QAction(	"&Export	as	CSV...",	this	);
+				fileMenu->addAction(csvSaveAction);
+				connect(	csvSaveAction,	&QAction::triggered,	this,	&DocWindow::saveAsCSV	);
 
-    QAction * varListSaveAction = new QAction( "&Export as Variable List...", this );
-    fileMenu->addAction(varListSaveAction);
-    connect( varListSaveAction, &QAction::triggered, this, &DocWindow::saveAsVarList );
+				QAction	*	varListSaveAction	=	new	QAction(	"&Export	as	Variable	List...",	this	);
+				fileMenu->addAction(varListSaveAction);
+				connect(	varListSaveAction,	&QAction::triggered,	this,	&DocWindow::saveAsVarList	);
 
-    // Build the EDIT menu
+				//	Build	the	EDIT	menu
 
-    QMenu *editMenu = menuBar()->addMenu("&Edit");
+				QMenu	*editMenu	=	menuBar()->addMenu("&Edit");
 
-    QAction * editSelectAction = new QAction( "&Select All", this );
-    editSelectAction->setShortcut(tr("CTRL+A"));
-    editMenu->addAction(editSelectAction);
-    connect( editSelectAction, &QAction::triggered, this, &DocWindow::checkAll );
+				QAction	*	editSelectAction	=	new	QAction(	"&Select	All",	this	);
+				editSelectAction->setShortcut(tr("CTRL+A"));
+				editMenu->addAction(editSelectAction);
+				connect(	editSelectAction,	&QAction::triggered,	this,	&DocWindow::checkAll	);
 
-    QAction * editClearAction = new QAction( "&Clear All", this );
-    editMenu->addAction(editClearAction);
-    connect( editClearAction, &QAction::triggered, this, &DocWindow::unCheckAll );
+				QAction	*	editClearAction	=	new	QAction(	"&Clear	All",	this	);
+				editMenu->addAction(editClearAction);
+				connect(	editClearAction,	&QAction::triggered,	this,	&DocWindow::unCheckAll	);
 
-    // Build the search interface.
+				//	Build	the	search	interface.
 
-    QHBoxLayout *hbox = new QHBoxLayout();
+				QHBoxLayout	*hbox	=	new	QHBoxLayout();
 
-    QPushButton *backward = new QPushButton(QChar(0x25C0), this);
-    hbox->addWidget(backward);
-    connect( backward, &QPushButton::released, this, &DocWindow::findAgainBackward);
+				QPushButton	*backward	=	new	QPushButton(QChar(0x25C0),	this);
+				hbox->addWidget(backward);
+				connect(	backward,	&QPushButton::released,	this,	&DocWindow::findAgainBackward);
 
-    QPushButton *forward  = new QPushButton(QChar(0x25B6), this);
-    hbox->addWidget(forward);
-    connect( forward, &QPushButton::released, this, &DocWindow::findAgainForward);
+				QPushButton	*forward		=	new	QPushButton(QChar(0x25B6),	this);
+				hbox->addWidget(forward);
+				connect(	forward,	&QPushButton::released,	this,	&DocWindow::findAgainForward);
 
-    searchLineEdit = new QLineEdit;
-    searchLineEdit->setPlaceholderText("Search Pattern");
-    hbox->addWidget(searchLineEdit);
-    connect(searchLineEdit, SIGNAL(returnPressed()), this, SLOT(find()));
+				searchLineEdit	=	new	QLineEdit;
+				searchLineEdit->setPlaceholderText("Search	Pattern");
+				hbox->addWidget(searchLineEdit);
+				connect(searchLineEdit,	SIGNAL(returnPressed()),	this,	SLOT(find()));
 
-    QVBoxLayout *vbox = new QVBoxLayout();
+				QVBoxLayout	*vbox	=	new	QVBoxLayout();
 
-    // Build the Table Widget that displays the variable names, types, and units.
-    varTable = new VarTableWidget(this);
+				//	Build	the	Table	Widget	that	displays	the	variable	names,	types,	and	units.
+				varTable	=	new	VarTableWidget(this);
 
-    int recordCount = datalog->parameterCount();
-    for (int ii = 0; ii < recordCount; ii++) {
-        varTable->addRecord( Qt::Checked, 
-                             datalog->parameterName(ii),
-                             datalog->parameterType(ii),
-                             datalog->parameterUnits(ii));
-    }
+				int	recordCount	=	datalog->parameterCount();
+				for	(int	ii	=	0;	ii	<	recordCount;	ii++)	{
+								varTable->addRecord(	Qt::Checked,	
+																													datalog->parameterName(ii),
+																													datalog->parameterType(ii),
+																													datalog->parameterUnits(ii));
+				}
 
-    vbox->addWidget(varTable);
-    vbox->addLayout(hbox);
+				vbox->addWidget(varTable);
+				vbox->addLayout(hbox);
 
-    QWidget *window = new QWidget;
-    window->setLayout(vbox);
+				QWidget	*window	=	new	QWidget;
+				window->setLayout(vbox);
 
-    setCentralWidget(window);
+				setCentralWidget(window);
 }
 
-void DocWindow::load() {
+void	DocWindow::load()	{
 
-    QString newFileName; 
+				QString	newFileName;	
 
-    newFileName = QFileDialog::getOpenFileName(this,
-    tr("Open Data File"), ".", tr("Data Files (*.trk)"));
+				newFileName	=	QFileDialog::getOpenFileName(this,
+				tr("Open	Data	File"),	".",	tr("Data	Files	(*.trk)"));
 
-    QFileInfo trkFileInfo( newFileName);
-    TRK_DataLog* newdatalog = new TRK_DataLog( trkFileInfo.absoluteFilePath().toStdString());
+				QFileInfo	trkFileInfo(	newFileName);
+				TRK_DataLog*	newdatalog	=	new	TRK_DataLog(	trkFileInfo.absoluteFilePath().toStdString());
 
-    if (!newFileName.isEmpty()) {
-        DocWindow* w = new DocWindow(newdatalog);
-        w->setWindowTitle(newFileName);
-        w->resize(800, 500);
-        w->show();
-    }
+				if	(!newFileName.isEmpty())	{
+								DocWindow*	w	=	new	DocWindow(newdatalog);
+								w->setWindowTitle(newFileName);
+								w->resize(800,	500);
+								w->show();
+				}
 }
 
-void DocWindow::formattedSave(LogFormatter &formatter) {
-     
-    QFileInfo trkFileInfo( datalog->getFileName().c_str());
-
-    QString outFileName = trkFileInfo.canonicalPath();
-    outFileName += "/";
-    outFileName += trkFileInfo.completeBaseName();
-    outFileName += formatter.extension();
-
-    QTextStream out(stdout);
-    out << "outFileName = \"" << outFileName << "\"" << endl;
-
-    int count = varTable->recordCount();
-    for (int index=0 ; index<count ; index++) {
-        if (varTable->isChecked(index)) {
-            datalog->selectParameter(index);
-        } else {
-            datalog->deselectParameter(index);
-        }         
-    }
-
-    FILE *fp;
-    if (( fp = fopen(outFileName.toStdString().c_str(), "w") ) != NULL) {
-        datalog->formattedWrite(fp, &formatter);
-    }
+void	DocWindow::formattedSave(LogFormatter	&formatter)	{
+					
+				QFileInfo	trkFileInfo(	datalog->getFileName().c_str());
+
+				QString	outFileName	=	trkFileInfo.canonicalPath();
+				outFileName	+=	"/";
+				outFileName	+=	trkFileInfo.completeBaseName();
+				outFileName	+=	formatter.extension();
+
+				QTextStream	out(stdout);
+				out	<<	"outFileName	=	\""	<<	outFileName	<<	"\""	<<	endl;
+
+				int	count	=	varTable->recordCount();
+				for	(int	index=0	;	index<count	;	index++)	{
+								if	(varTable->isChecked(index))	{
+												datalog->selectParameter(index);
+								}	else	{
+												datalog->deselectParameter(index);
+								}									
+				}
+
+				FILE	*fp;
+				if	((	fp	=	fopen(outFileName.toStdString().c_str(),	"w")	)	!=	NULL)	{
+								datalog->formattedWrite(fp,	&formatter);
+				}
 }
 
-void DocWindow::saveAsCSV() {
-    CSV_Formatter csv_formatter;
-    formattedSave(csv_formatter);
+void	DocWindow::saveAsCSV()	{
+				CSV_Formatter	csv_formatter;
+				formattedSave(csv_formatter);
 }
 
-void DocWindow::saveAsVarList() {
-    Varlist_Formatter varlist_formatter;
-    formattedSave(varlist_formatter);
+void	DocWindow::saveAsVarList()	{
+				Varlist_Formatter	varlist_formatter;
+				formattedSave(varlist_formatter);
 }
 
-void DocWindow::checkAll() {
-    varTable->checkAll();
+void	DocWindow::checkAll()	{
+				varTable->checkAll();
 }
 
-void DocWindow::unCheckAll() {
-    varTable->unCheckAll();
+void	DocWindow::unCheckAll()	{
+				varTable->unCheckAll();
 }
 
-void DocWindow::findAgain(int direction) {
-    if (foundItemIndex >= 0) {
-        varTable->unHighLightRecord(foundItemIndex);      
-        int count = varTable->recordCount();
-        int startIndex = (count + foundItemIndex + direction) % count;
-        if ((foundItemIndex = textSearch(searchPattern, startIndex, direction)) >= 0) {
-            varTable->scrollToRecord(foundItemIndex);      
-            varTable->highLightRecord(foundItemIndex);      
-        }
-    }
+void	DocWindow::findAgain(int	direction)	{
+				if	(foundItemIndex	>=	0)	{
+								varTable->unHighLightRecord(foundItemIndex);						
+								int	count	=	varTable->recordCount();
+								int	startIndex	=	(count	+	foundItemIndex	+	direction)	%	count;
+								if	((foundItemIndex	=	textSearch(searchPattern,	startIndex,	direction))	>=	0)	{
+												varTable->scrollToRecord(foundItemIndex);						
+												varTable->highLightRecord(foundItemIndex);						
+								}
+				}
 }
 
-void DocWindow::findAgainForward() {
-    findAgain(1);
+void	DocWindow::findAgainForward()	{
+				findAgain(1);
 }
 
-void DocWindow::findAgainBackward() {
-    findAgain(-1);
+void	DocWindow::findAgainBackward()	{
+				findAgain(-1);
 }
 
-void DocWindow::find() {
-    searchPattern = searchLineEdit->text();
+void	DocWindow::find()	{
+				searchPattern	=	searchLineEdit->text();
 
-    if (foundItemIndex >= 0) {
-        varTable->unHighLightRecord(foundItemIndex);      
-    }
-    if ((foundItemIndex = textSearch(searchPattern, 0, 1)) >= 0) {
-        varTable->scrollToRecord(foundItemIndex);      
-        varTable->highLightRecord(foundItemIndex);      
-    }
+				if	(foundItemIndex	>=	0)	{
+								varTable->unHighLightRecord(foundItemIndex);						
+				}
+				if	((foundItemIndex	=	textSearch(searchPattern,	0,	1))	>=	0)	{
+								varTable->scrollToRecord(foundItemIndex);						
+								varTable->highLightRecord(foundItemIndex);						
+				}
 }
 
-int DocWindow::textSearch(QString pattern, int startIndex, int direction) {
-
-    QRegExp rx(pattern);
-    int count = varTable->recordCount();
-    int foundIx = -1;
-    for (int i=0 ; i<count ; i++) {
-        int index = (count + startIndex + direction * i) % count;
-        if ((rx.indexIn(datalog->parameterName(index),0)) >= 0) {
-            foundIx = index;
-            break;
-        }
-    }
-    return foundIx;
+int	DocWindow::textSearch(QString	pattern,	int	startIndex,	int	direction)	{
+
+				QRegExp	rx(pattern);
+				int	count	=	varTable->recordCount();
+				int	foundIx	=	-1;
+				for	(int	i=0	;	i<count	;	i++)	{
+								int	index	=	(count	+	startIndex	+	direction	*	i)	%	count;
+								if	((rx.indexIn(datalog->parameterName(index),0))	>=	0)	{
+												foundIx	=	index;
+												break;
+								}
+				}
+				return	foundIx;
 }
diff --git a/trick_source/data_products/Apps/trkConvert/ParamDescription.cpp b/trick_source/data_products/Apps/trkConvert/ParamDescription.cpp
index 2b2d78713..f9271fe0b 100644
--- a/trick_source/data_products/Apps/trkConvert/ParamDescription.cpp
+++ b/trick_source/data_products/Apps/trkConvert/ParamDescription.cpp
@@ -1,32 +1,32 @@
-#include <stdexcept>
-#include <stdint.h>
-#include "ParamDescription.hh"
+#include	<stdexcept>
+#include	<stdint.h>
+#include	"ParamDescription.hh"
 
-ParamDescription::ParamDescription(FILE* in_fp) {
+ParamDescription::ParamDescription(FILE*	in_fp)	{
 
-    int32_t nameStringLength;
-    if ( fread( &nameStringLength, 1, 4, in_fp) != 4)
-        throw std::runtime_error("fread() failed.");
+				int32_t	nameStringLength;
+				if	(	fread(	&nameStringLength,	1,	4,	in_fp)	!=	4)
+								throw	std::runtime_error("fread()	failed.");
 
-    parameterName = new char[nameStringLength+1];
-    if ( fread( parameterName, 1, nameStringLength, in_fp) != (size_t)nameStringLength)
-        throw std::runtime_error("fread() failed.");
+				parameterName	=	new	char[nameStringLength+1];
+				if	(	fread(	parameterName,	1,	nameStringLength,	in_fp)	!=	(size_t)nameStringLength)
+								throw	std::runtime_error("fread()	failed.");
 
-    parameterName[nameStringLength] = 0;
+				parameterName[nameStringLength]	=	0;
 
-    int32_t unitsStringLength;
-    if ( fread( &unitsStringLength, 1, 4 , in_fp) != 4)
-        throw std::runtime_error("fread() failed.");
+				int32_t	unitsStringLength;
+				if	(	fread(	&unitsStringLength,	1,	4	,	in_fp)	!=	4)
+								throw	std::runtime_error("fread()	failed.");
 
-    unitsName = new char[unitsStringLength+1];
-    if ( fread( unitsName, 1, unitsStringLength, in_fp) != (size_t)unitsStringLength)
-        throw std::runtime_error("fread() failed.");
+				unitsName	=	new	char[unitsStringLength+1];
+				if	(	fread(	unitsName,	1,	unitsStringLength,	in_fp)	!=	(size_t)unitsStringLength)
+								throw	std::runtime_error("fread()	failed.");
 
-    unitsName[unitsStringLength] = 0;
+				unitsName[unitsStringLength]	=	0;
 
-    if ( fread( &dataType, 1, 4, in_fp) != 4)
-        throw std::runtime_error("fread() failed.");
+				if	(	fread(	&dataType,	1,	4,	in_fp)	!=	4)
+								throw	std::runtime_error("fread()	failed.");
 
-    if ( fread( &dataSize, 1, 4, in_fp) != 4)
-        throw std::runtime_error("fread() failed.");
+				if	(	fread(	&dataSize,	1,	4,	in_fp)	!=	4)
+								throw	std::runtime_error("fread()	failed.");
 }
diff --git a/trick_source/data_products/Apps/trkConvert/TRK_DataLog.cpp b/trick_source/data_products/Apps/trkConvert/TRK_DataLog.cpp
index 5fcb359f7..2aeab637f 100644
--- a/trick_source/data_products/Apps/trkConvert/TRK_DataLog.cpp
+++ b/trick_source/data_products/Apps/trkConvert/TRK_DataLog.cpp
@@ -1,259 +1,259 @@
-#include "TRK_DataLog.hh"
-#include <iostream>
-#include <string.h>
-#include <cstring>
-#include <cstdlib>
-#include <stdexcept>
+#include	"TRK_DataLog.hh"
+#include	<iostream>
+#include	<string.h>
+#include	<cstring>
+#include	<cstdlib>
+#include	<stdexcept>
 
-typedef enum {
-    TRICK_VOID               =   0, /* No type */
-    TRICK_CHARACTER          =   1, /* (char) */
-    TRICK_UNSIGNED_CHARACTER =   2, /* (unsigned char) */
-    TRICK_STRING             =   3, /* (char *) */
-    TRICK_SHORT              =   4, /* (short) */
-    TRICK_UNSIGNED_SHORT     =   5, /* (unsigned short) */
-    TRICK_INTEGER            =   6, /* (int) */
-    TRICK_UNSIGNED_INTEGER   =   7, /* (unsigned int) */
-    TRICK_LONG               =   8, /* (long) */
-    TRICK_UNSIGNED_LONG      =   9, /* (unsigned long) */
-    TRICK_FLOAT              =  10, /* (float) */
-    TRICK_DOUBLE             =  11, /* (double) */
-    TRICK_BITFIELD           =  12, /* (signed int : 1) */
-    TRICK_UNSIGNED_BITFIELD  =  13, /* (unsigned int : 1) */
-    TRICK_LONG_LONG          =  14, /* (long long) */
-    TRICK_UNSIGNED_LONG_LONG =  15, /* (long long) */
-    TRICK_FILE_PTR           =  16, /* (file *) */
-    TRICK_BOOLEAN            =  17, /* (C++ boolean) */
-    TRICK_WCHAR              =  18, /* (wchar_t) */
-    TRICK_WSTRING            =  19, /* (wchar_t *) */
-    TRICK_VOID_PTR           =  20, /* an arbitrary address */
-    TRICK_ENUMERATED         =  21, /* User defined type (enumeration) */
-    TRICK_STRUCTURED         =  22, /* User defined type (struct/class) */
-    TRICK_OPAQUE_TYPE        =  23, /* User defined type (where type details are as yet unknown) */
-    TRICK_STL                =  24, /* Standard template library type */
-    TRICK_NUMBER_OF_TYPES
-} TRICK_TYPE ;
+typedef	enum	{
+				TRICK_VOID															=			0,	/*	No	type	*/
+				TRICK_CHARACTER										=			1,	/*	(char)	*/
+				TRICK_UNSIGNED_CHARACTER	=			2,	/*	(unsigned	char)	*/
+				TRICK_STRING													=			3,	/*	(char	*)	*/
+				TRICK_SHORT														=			4,	/*	(short)	*/
+				TRICK_UNSIGNED_SHORT					=			5,	/*	(unsigned	short)	*/
+				TRICK_INTEGER												=			6,	/*	(int)	*/
+				TRICK_UNSIGNED_INTEGER			=			7,	/*	(unsigned	int)	*/
+				TRICK_LONG															=			8,	/*	(long)	*/
+				TRICK_UNSIGNED_LONG						=			9,	/*	(unsigned	long)	*/
+				TRICK_FLOAT														=		10,	/*	(float)	*/
+				TRICK_DOUBLE													=		11,	/*	(double)	*/
+				TRICK_BITFIELD											=		12,	/*	(signed	int	:	1)	*/
+				TRICK_UNSIGNED_BITFIELD		=		13,	/*	(unsigned	int	:	1)	*/
+				TRICK_LONG_LONG										=		14,	/*	(long	long)	*/
+				TRICK_UNSIGNED_LONG_LONG	=		15,	/*	(long	long)	*/
+				TRICK_FILE_PTR											=		16,	/*	(file	*)	*/
+				TRICK_BOOLEAN												=		17,	/*	(C++	boolean)	*/
+				TRICK_WCHAR														=		18,	/*	(wchar_t)	*/
+				TRICK_WSTRING												=		19,	/*	(wchar_t	*)	*/
+				TRICK_VOID_PTR											=		20,	/*	an	arbitrary	address	*/
+				TRICK_ENUMERATED									=		21,	/*	User	defined	type	(enumeration)	*/
+				TRICK_STRUCTURED									=		22,	/*	User	defined	type	(struct/class)	*/
+				TRICK_OPAQUE_TYPE								=		23,	/*	User	defined	type	(where	type	details	are	as	yet	unknown)	*/
+				TRICK_STL																=		24,	/*	Standard	template	library	type	*/
+				TRICK_NUMBER_OF_TYPES
+}	TRICK_TYPE	;
 
-const char* TypeName[] = {
-    "--0--",
-    "char",
-    "unsigned char",
-    "--3--",
-    "short",
-    "unsigned short",
-    "int",
-    "unsigned int",
-    "long",
-    "unsigned long",
-    "float",
-    "double",
-    "--12--",
-    "--13--",
-    "long long",
-    "unsigned long long",
-    "--16--",
-    "bool",
-    "--18--",
-    "--19--",
-    "--20--",
-    "--21--",
-    "--22--",
-    "--23--",
-    "--24--"
+const	char*	TypeName[]	=	{
+				"--0--",
+				"char",
+				"unsigned	char",
+				"--3--",
+				"short",
+				"unsigned	short",
+				"int",
+				"unsigned	int",
+				"long",
+				"unsigned	long",
+				"float",
+				"double",
+				"--12--",
+				"--13--",
+				"long	long",
+				"unsigned	long	long",
+				"--16--",
+				"bool",
+				"--18--",
+				"--19--",
+				"--20--",
+				"--21--",
+				"--22--",
+				"--23--",
+				"--24--"
 };
 
-const int TRK_DataLog::LittleEndian = 1;
-const int TRK_DataLog::BigEndian    = 2;
+const	int	TRK_DataLog::LittleEndian	=	1;
+const	int	TRK_DataLog::BigEndian				=	2;
 
-TRK_DataLog::TRK_DataLog(std::string file_name) {
+TRK_DataLog::TRK_DataLog(std::string	file_name)	{
 
-    fileName = file_name;
-    in_fp = fopen(fileName.c_str(), "rb");
+				fileName	=	file_name;
+				in_fp	=	fopen(fileName.c_str(),	"rb");
 
-    if (in_fp != NULL) {
+				if	(in_fp	!=	NULL)	{
 
-        char trick_header_string[11];
-        if (fread( trick_header_string, 1, 10, in_fp) != 10)
-            throw std::runtime_error("fread() failed.");
-        trick_header_string[10] = 0;
+								char	trick_header_string[11];
+								if	(fread(	trick_header_string,	1,	10,	in_fp)	!=	10)
+												throw	std::runtime_error("fread()	failed.");
+								trick_header_string[10]	=	0;
 
-        if (!strncmp( trick_header_string, "Trick-", 6)) {
-             
-            char version_txt[3];   
-            memcpy(version_txt, &trick_header_string[6], 2) ;
-            version_txt[2] = 0;
-            version = atoi(version_txt);
+								if	(!strncmp(	trick_header_string,	"Trick-",	6))	{
+													
+												char	version_txt[3];			
+												memcpy(version_txt,	&trick_header_string[6],	2)	;
+												version_txt[2]	=	0;
+												version	=	atoi(version_txt);
 
-            char endian_txt[2];   
-            memcpy(endian_txt, &trick_header_string[9], 1) ;
-            endian_txt[1] = 0;
+												char	endian_txt[2];			
+												memcpy(endian_txt,	&trick_header_string[9],	1)	;
+												endian_txt[1]	=	0;
 
-            if (!strncmp( endian_txt, "L", 1)) {
-                endianness = LittleEndian;
-            } else if (!strncmp( endian_txt, "B", 1)) {
-                endianness = BigEndian;
-            } else {
-                fprintf (stderr, "Trick header error. Endianness should be \"L\" or \"B\".");
-            }
+												if	(!strncmp(	endian_txt,	"L",	1))	{
+																endianness	=	LittleEndian;
+												}	else	if	(!strncmp(	endian_txt,	"B",	1))	{
+																endianness	=	BigEndian;
+												}	else	{
+																fprintf	(stderr,	"Trick	header	error.	Endianness	should	be	\"L\"	or	\"B\".");
+												}
 
-            if (fread( &N_params, 1, 4, in_fp) != 4) 
-                throw std::runtime_error("fread() failed.");
+												if	(fread(	&N_params,	1,	4,	in_fp)	!=	4)	
+																throw	std::runtime_error("fread()	failed.");
 
-            dataRecordSize = 0;
-            for (int ii = 0 ; ii < (int)N_params ; ii++ ) {
-                ParamDescription* paramDescription = new ParamDescription(in_fp);
-                paramDescriptions.push_back(paramDescription);
-                paramOffsets.push_back(dataRecordSize);
-                paramSelected.push_back(false);
+												dataRecordSize	=	0;
+												for	(int	ii	=	0	;	ii	<	(int)N_params	;	ii++	)	{
+																ParamDescription*	paramDescription	=	new	ParamDescription(in_fp);
+																paramDescriptions.push_back(paramDescription);
+																paramOffsets.push_back(dataRecordSize);
+																paramSelected.push_back(false);
 
-                dataRecordSize += paramDescription->dataSize;
-            }
-            dataRecord = new char[dataRecordSize];
+																dataRecordSize	+=	paramDescription->dataSize;
+												}
+												dataRecord	=	new	char[dataRecordSize];
 
-            // Time should always be selected.
-            paramSelected[0] = true;
+												//	Time	should	always	be	selected.
+												paramSelected[0]	=	true;
 
-            if (fgetpos(in_fp, &dataPosition) != 0) {
-                fprintf (stderr, "fgetpos failure.\n");
-            }
-        } else {
-            std::cerr << "File \"" << fileName << "\" isn't a Trick binary log file." << std::endl;
-        }
-    } else {
-        std::cerr << "File \"" << fileName << "\" failed to open." << std::endl;
-    }
+												if	(fgetpos(in_fp,	&dataPosition)	!=	0)	{
+																fprintf	(stderr,	"fgetpos	failure.\n");
+												}
+								}	else	{
+												std::cerr	<<	"File	\""	<<	fileName	<<	"\"	isn't	a	Trick	binary	log	file."	<<	std::endl;
+								}
+				}	else	{
+								std::cerr	<<	"File	\""	<<	fileName	<<	"\"	failed	to	open."	<<	std::endl;
+				}
 }
 
-std::string TRK_DataLog::getFileName() const {
-    return fileName;
+std::string	TRK_DataLog::getFileName()	const	{
+				return	fileName;
 }
 
-int TRK_DataLog::parameterCount() const {
-    return (int)N_params;
+int	TRK_DataLog::parameterCount()	const	{
+				return	(int)N_params;
 }
 
-const char* TRK_DataLog::parameterName(unsigned int n) const {
-    if (n < N_params) 
-        return paramDescriptions[n]->parameterName;
-    else
-        return "BadIndex";
+const	char*	TRK_DataLog::parameterName(unsigned	int	n)	const	{
+				if	(n	<	N_params)	
+								return	paramDescriptions[n]->parameterName;
+				else
+								return	"BadIndex";
 }
 
-const char* TRK_DataLog::parameterUnits(unsigned int n) const {
-    if (n < N_params) 
-        return paramDescriptions[n]->unitsName;
-    else
-        return "BadIndex";
+const	char*	TRK_DataLog::parameterUnits(unsigned	int	n)	const	{
+				if	(n	<	N_params)	
+								return	paramDescriptions[n]->unitsName;
+				else
+								return	"BadIndex";
 }
 
-const char* TRK_DataLog::parameterType(unsigned int n) const {
-    if (n < N_params) 
-        return TypeName[ paramDescriptions[n]->dataType ];
-    else
-        return "BadIndex";
+const	char*	TRK_DataLog::parameterType(unsigned	int	n)	const	{
+				if	(n	<	N_params)	
+								return	TypeName[	paramDescriptions[n]->dataType	];
+				else
+								return	"BadIndex";
 }
 
 
-void TRK_DataLog::selectAllParameters() {
-    for (int ii = 1 ; ii < (int)N_params ; ii++ ) {
-        paramSelected[ii] = true;
-    }
+void	TRK_DataLog::selectAllParameters()	{
+				for	(int	ii	=	1	;	ii	<	(int)N_params	;	ii++	)	{
+								paramSelected[ii]	=	true;
+				}
 }
 
-void TRK_DataLog::selectParameter(unsigned int index) {
-    if ((index > 0) && (index < N_params)) {
-        paramSelected[index] = true;
-    }
+void	TRK_DataLog::selectParameter(unsigned	int	index)	{
+				if	((index	>	0)	&&	(index	<	N_params))	{
+								paramSelected[index]	=	true;
+				}
 }
 
-void TRK_DataLog::selectParameter(const char * paramName) {
-    bool found = false;
-    int ii = 1;
-    while ((ii < (int)N_params) && (found == false)) {
-        if ( !strcmp( paramName, paramDescriptions[ii]->parameterName )) {
-            paramSelected[ii] = true;
-            found = true;
-        }
-        ii ++;
-    }
+void	TRK_DataLog::selectParameter(const	char	*	paramName)	{
+				bool	found	=	false;
+				int	ii	=	1;
+				while	((ii	<	(int)N_params)	&&	(found	==	false))	{
+								if	(	!strcmp(	paramName,	paramDescriptions[ii]->parameterName	))	{
+												paramSelected[ii]	=	true;
+												found	=	true;
+								}
+								ii	++;
+				}
 }
 
-void TRK_DataLog::deselectParameter(unsigned int index) {
-    if ((index > 0) && (index < N_params)) {
-        paramSelected[index] = false;
-    }
+void	TRK_DataLog::deselectParameter(unsigned	int	index)	{
+				if	((index	>	0)	&&	(index	<	N_params))	{
+								paramSelected[index]	=	false;
+				}
 }
 
-void TRK_DataLog::formattedWrite(FILE* out_fp, LogFormatter* formatter) {
+void	TRK_DataLog::formattedWrite(FILE*	out_fp,	LogFormatter*	formatter)	{
 
-    formatter->writeHeader(out_fp, version, endianness);
-    formatter->writeColumnLabel(out_fp, paramDescriptions[0]->parameterName, paramDescriptions[0]->unitsName); 
-    for (int ii = 1; ii < (int)N_params ; ii++) {
-        if (paramSelected[ii]) {
-            formatter->writeColumnLabelSeparator(out_fp);
-            formatter->writeColumnLabel(out_fp, paramDescriptions[ii]->parameterName, paramDescriptions[ii]->unitsName); 
-        }
-    }
+				formatter->writeHeader(out_fp,	version,	endianness);
+				formatter->writeColumnLabel(out_fp,	paramDescriptions[0]->parameterName,	paramDescriptions[0]->unitsName);	
+				for	(int	ii	=	1;	ii	<	(int)N_params	;	ii++)	{
+								if	(paramSelected[ii])	{
+												formatter->writeColumnLabelSeparator(out_fp);
+												formatter->writeColumnLabel(out_fp,	paramDescriptions[ii]->parameterName,	paramDescriptions[ii]->unitsName);	
+								}
+				}
 
-    if ( fsetpos(in_fp, &dataPosition) != 0 ) {
-       fprintf(stderr,"fsetpos() error.\n");
-    }
-    while ( fread( dataRecord, 1, dataRecordSize, in_fp) == (size_t)dataRecordSize) {
-        formatter->writeRecordSeparator(out_fp);
-        formatter->writeDatum(out_fp, *(double*)&dataRecord[0]); // Time is always selected.
-        for (int ii = 1 ; ii < (int)N_params ; ii++ ) {
-            if (paramSelected[ii]) {
-                formatter->writeDatumSeparator(out_fp);
-                switch (paramDescriptions[ii]->dataType) {
-                    case TRICK_CHARACTER: { /*1*/
-                        formatter->writeDatum(out_fp, *(int8_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_UNSIGNED_CHARACTER: { /*2*/
-                        formatter->writeDatum(out_fp, *(uint8_t*)&dataRecord[paramOffsets[ii]]) ;
-                    } break;
-                    case TRICK_SHORT: { /*4*/
-                        formatter->writeDatum(out_fp, *(int16_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_UNSIGNED_SHORT: { /*5*/
-                        formatter->writeDatum(out_fp, *(uint16_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_INTEGER: {/*6*/
-                        formatter->writeDatum(out_fp, *(int32_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_UNSIGNED_INTEGER: {/*7*/
-                        formatter->writeDatum(out_fp, *(uint32_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_LONG: { /*8*/
-                        formatter->writeDatum(out_fp, *(int64_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_UNSIGNED_LONG: { /*9*/
-                        formatter->writeDatum(out_fp, *(uint64_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_FLOAT: {/*10*/
-                        formatter->writeDatum(out_fp, *(float*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_DOUBLE: {/*11*/
-                        formatter->writeDatum(out_fp, *(double*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_LONG_LONG: { /*14*/
-                        formatter->writeDatum(out_fp, *(int64_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_UNSIGNED_LONG_LONG: { /*15*/
-                        formatter->writeDatum(out_fp, *(uint64_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    case TRICK_BOOLEAN: { /*17*/
-                        formatter->writeDatum(out_fp, *(uint8_t*)&dataRecord[paramOffsets[ii]]);
-                    } break;
-                    default: {
-                        fprintf(stdout, "Unknown Data Type [%d] of size [%d] bytes.",
-                            paramDescriptions[ii]->dataType,
-                            paramDescriptions[ii]->dataSize);
-                        fflush(stdout);
-                        exit(1);
-                    }
-                }
-            }
-        }
-    }
-    formatter->writeRecordSeparator(out_fp);
+				if	(	fsetpos(in_fp,	&dataPosition)	!=	0	)	{
+							fprintf(stderr,"fsetpos()	error.\n");
+				}
+				while	(	fread(	dataRecord,	1,	dataRecordSize,	in_fp)	==	(size_t)dataRecordSize)	{
+								formatter->writeRecordSeparator(out_fp);
+								formatter->writeDatum(out_fp,	*(double*)&dataRecord[0]);	//	Time	is	always	selected.
+								for	(int	ii	=	1	;	ii	<	(int)N_params	;	ii++	)	{
+												if	(paramSelected[ii])	{
+																formatter->writeDatumSeparator(out_fp);
+																switch	(paramDescriptions[ii]->dataType)	{
+																				case	TRICK_CHARACTER:	{	/*1*/
+																								formatter->writeDatum(out_fp,	*(int8_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_UNSIGNED_CHARACTER:	{	/*2*/
+																								formatter->writeDatum(out_fp,	*(uint8_t*)&dataRecord[paramOffsets[ii]])	;
+																				}	break;
+																				case	TRICK_SHORT:	{	/*4*/
+																								formatter->writeDatum(out_fp,	*(int16_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_UNSIGNED_SHORT:	{	/*5*/
+																								formatter->writeDatum(out_fp,	*(uint16_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_INTEGER:	{/*6*/
+																								formatter->writeDatum(out_fp,	*(int32_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_UNSIGNED_INTEGER:	{/*7*/
+																								formatter->writeDatum(out_fp,	*(uint32_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_LONG:	{	/*8*/
+																								formatter->writeDatum(out_fp,	*(int64_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_UNSIGNED_LONG:	{	/*9*/
+																								formatter->writeDatum(out_fp,	*(uint64_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_FLOAT:	{/*10*/
+																								formatter->writeDatum(out_fp,	*(float*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_DOUBLE:	{/*11*/
+																								formatter->writeDatum(out_fp,	*(double*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_LONG_LONG:	{	/*14*/
+																								formatter->writeDatum(out_fp,	*(int64_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_UNSIGNED_LONG_LONG:	{	/*15*/
+																								formatter->writeDatum(out_fp,	*(uint64_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				case	TRICK_BOOLEAN:	{	/*17*/
+																								formatter->writeDatum(out_fp,	*(uint8_t*)&dataRecord[paramOffsets[ii]]);
+																				}	break;
+																				default:	{
+																								fprintf(stdout,	"Unknown	Data	Type	[%d]	of	size	[%d]	bytes.",
+																												paramDescriptions[ii]->dataType,
+																												paramDescriptions[ii]->dataSize);
+																								fflush(stdout);
+																								exit(1);
+																				}
+																}
+												}
+								}
+				}
+				formatter->writeRecordSeparator(out_fp);
 }
diff --git a/trick_source/data_products/Apps/trkConvert/VarTableWidget.cpp b/trick_source/data_products/Apps/trkConvert/VarTableWidget.cpp
index 60b5de810..0d3a58cd3 100644
--- a/trick_source/data_products/Apps/trkConvert/VarTableWidget.cpp
+++ b/trick_source/data_products/Apps/trkConvert/VarTableWidget.cpp
@@ -1,104 +1,104 @@
-#include <QTableWidgetItem>
-#include "VarTableWidget.h"
+#include	<QTableWidgetItem>
+#include	"VarTableWidget.h"
 
-VarTableWidget::VarTableWidget (QWidget* parent)
-  : QTableWidget(parent) {
+VarTableWidget::VarTableWidget	(QWidget*	parent)
+		:	QTableWidget(parent)	{
 
-  setRowCount(0);
-  setColumnCount(4);
+		setRowCount(0);
+		setColumnCount(4);
 
-  QStringList strList;
-  strList << "" << "Name" << "Type" << "Units";
-  setHorizontalHeaderLabels( strList);
+		QStringList	strList;
+		strList	<<	""	<<	"Name"	<<	"Type"	<<	"Units";
+		setHorizontalHeaderLabels(	strList);
 
-  setColumnWidth(0,25);
-  setColumnWidth(1,200);
-  setColumnWidth(2,80);
-  setColumnWidth(3,80);
+		setColumnWidth(0,25);
+		setColumnWidth(1,200);
+		setColumnWidth(2,80);
+		setColumnWidth(3,80);
 
-  setShowGrid(false);
+		setShowGrid(false);
 }
 
-void VarTableWidget::addRecord( Qt::CheckState checkState, 
-                                std::string nameStr,
-                                std::string typeStr,
-                                std::string unitsStr ) {
-
-// Consider cloning prototype items, as in this example:
-// https://stackoverflow.com/questions/15827886/set-default-alignment-for-cells-in-qtablewidget
-
-    int row = rowCount();
-    insertRow(row);
-
-    Qt::ItemFlags flags;
-
-    QTableWidgetItem * const selectItem = new QTableWidgetItem; 
-    flags = selectItem->flags();
-    flags &= ~Qt::ItemIsSelectable & ~Qt::ItemIsEditable;
-    if (row != 0)     // FIXME: This doesn't seem to work as expected. Row 0 still seems to be user editable.
-        flags |= Qt::ItemIsUserCheckable;
-    selectItem->setFlags(flags);
-    selectItem->setCheckState(checkState);
-    setItem(row, 0, selectItem);
-
-    QTableWidgetItem * const nameItem   = new QTableWidgetItem; 
-    flags = nameItem->flags();
-    flags &= ~Qt::ItemIsSelectable & ~Qt::ItemIsEditable;
-    nameItem->setFlags(flags);
-    nameItem->setText(nameStr.c_str());
-    setItem(row, 1, nameItem);
- 
-    QTableWidgetItem * const typeItem   = new QTableWidgetItem; 
-    flags = typeItem->flags();
-    flags &= ~Qt::ItemIsSelectable & ~Qt::ItemIsEditable;
-    typeItem->setFlags(flags);
-    typeItem->setTextAlignment(Qt::AlignCenter);
-    typeItem->setText(typeStr.c_str());
-    setItem(row, 2, typeItem);
-
-    QTableWidgetItem * const unitsItem  = new QTableWidgetItem; 
-    flags = unitsItem->flags();
-    flags &= ~Qt::ItemIsSelectable & ~Qt::ItemIsEditable;
-    unitsItem->setFlags(flags);
-    unitsItem->setTextAlignment(Qt::AlignCenter);
-    unitsItem->setText(unitsStr.c_str());
-    setItem(row, 3, unitsItem);
+void	VarTableWidget::addRecord(	Qt::CheckState	checkState,	
+																																std::string	nameStr,
+																																std::string	typeStr,
+																																std::string	unitsStr	)	{
+
+//	Consider	cloning	prototype	items,	as	in	this	example:
+//	https://stackoverflow.com/questions/15827886/set-default-alignment-for-cells-in-qtablewidget
+
+				int	row	=	rowCount();
+				insertRow(row);
+
+				Qt::ItemFlags	flags;
+
+				QTableWidgetItem	*	const	selectItem	=	new	QTableWidgetItem;	
+				flags	=	selectItem->flags();
+				flags	&=	~Qt::ItemIsSelectable	&	~Qt::ItemIsEditable;
+				if	(row	!=	0)					//	FIXME:	This	doesn't	seem	to	work	as	expected.	Row	0	still	seems	to	be	user	editable.
+								flags	|=	Qt::ItemIsUserCheckable;
+				selectItem->setFlags(flags);
+				selectItem->setCheckState(checkState);
+				setItem(row,	0,	selectItem);
+
+				QTableWidgetItem	*	const	nameItem			=	new	QTableWidgetItem;	
+				flags	=	nameItem->flags();
+				flags	&=	~Qt::ItemIsSelectable	&	~Qt::ItemIsEditable;
+				nameItem->setFlags(flags);
+				nameItem->setText(nameStr.c_str());
+				setItem(row,	1,	nameItem);
+	
+				QTableWidgetItem	*	const	typeItem			=	new	QTableWidgetItem;	
+				flags	=	typeItem->flags();
+				flags	&=	~Qt::ItemIsSelectable	&	~Qt::ItemIsEditable;
+				typeItem->setFlags(flags);
+				typeItem->setTextAlignment(Qt::AlignCenter);
+				typeItem->setText(typeStr.c_str());
+				setItem(row,	2,	typeItem);
+
+				QTableWidgetItem	*	const	unitsItem		=	new	QTableWidgetItem;	
+				flags	=	unitsItem->flags();
+				flags	&=	~Qt::ItemIsSelectable	&	~Qt::ItemIsEditable;
+				unitsItem->setFlags(flags);
+				unitsItem->setTextAlignment(Qt::AlignCenter);
+				unitsItem->setText(unitsStr.c_str());
+				setItem(row,	3,	unitsItem);
 
 }
 
-void VarTableWidget::highLightRecord(int index) {
-    QBrush brush(Qt::yellow);
-    item(index, 1)->setBackground(brush); 
+void	VarTableWidget::highLightRecord(int	index)	{
+				QBrush	brush(Qt::yellow);
+				item(index,	1)->setBackground(brush);	
 }
 
-void VarTableWidget::unHighLightRecord(int index) {
-    QBrush brush(Qt::white);
-    item(index, 1)->setBackground(brush); 
+void	VarTableWidget::unHighLightRecord(int	index)	{
+				QBrush	brush(Qt::white);
+				item(index,	1)->setBackground(brush);	
 }
 
-void VarTableWidget::scrollToRecord(int index) {
-    scrollToItem(item(index, 0));
+void	VarTableWidget::scrollToRecord(int	index)	{
+				scrollToItem(item(index,	0));
 }
 
-bool VarTableWidget::isChecked(int index) {
-    return (item(index, 0)->checkState() == Qt::Checked) ? true : false;
+bool	VarTableWidget::isChecked(int	index)	{
+				return	(item(index,	0)->checkState()	==	Qt::Checked)	?	true	:	false;
 }
 
-int VarTableWidget::recordCount() {
-    return rowCount();
+int	VarTableWidget::recordCount()	{
+				return	rowCount();
 }
 
-void VarTableWidget::checkAll() {
-    int num_rows = rowCount();
-    for (int i=0; i<num_rows; i++) {
-        item(i,0)->setCheckState(Qt::Checked);
-    }
+void	VarTableWidget::checkAll()	{
+				int	num_rows	=	rowCount();
+				for	(int	i=0;	i<num_rows;	i++)	{
+								item(i,0)->setCheckState(Qt::Checked);
+				}
 }
 
-void VarTableWidget::unCheckAll() {
-    int num_rows = rowCount();
-    // Note that we don't clear sys.exec.out.time
-    for (int i=1; i<num_rows; i++) {
-        item(i,0)->setCheckState(Qt::Unchecked);
-    }
+void	VarTableWidget::unCheckAll()	{
+				int	num_rows	=	rowCount();
+				//	Note	that	we	don't	clear	sys.exec.out.time
+				for	(int	i=1;	i<num_rows;	i++)	{
+								item(i,0)->setCheckState(Qt::Unchecked);
+				}
 }
diff --git a/trick_source/data_products/Apps/trkConvert/Varlist_Formatter.cpp b/trick_source/data_products/Apps/trkConvert/Varlist_Formatter.cpp
index 901e11970..b87199cec 100644
--- a/trick_source/data_products/Apps/trkConvert/Varlist_Formatter.cpp
+++ b/trick_source/data_products/Apps/trkConvert/Varlist_Formatter.cpp
@@ -1,25 +1,25 @@
-#include "Varlist_Formatter.hh"
-/* ================================================================================
- * CLASS: Varlist_Formatter isa LogFormatter.
- * ================================================================================
- */
+#include	"Varlist_Formatter.hh"
+/*	================================================================================
+	*	CLASS:	Varlist_Formatter	isa	LogFormatter.
+	*	================================================================================
+	*/
 
-    void Varlist_Formatter::writeHeader(FILE* out_fp, int version, int endianness) {};
-    void Varlist_Formatter::writeColumnLabel(FILE* out_fp, const char* name, const char* units) {
-        fprintf(out_fp,"%s {%s}", name, units);
-    }
-    void Varlist_Formatter::writeColumnLabelSeparator(FILE* out_fp)  { fprintf(out_fp,"\n"); }
-    void Varlist_Formatter::writeDatumSeparator(FILE* out_fp __attribute__((unused))) {}
-    void Varlist_Formatter::writeRecordSeparator(FILE* out_fp __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), int8_t   datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), uint8_t  datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), int16_t  datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), uint16_t datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), int32_t  datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), uint32_t datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), int64_t  datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), uint64_t datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), float    datum __attribute__((unused))) {}
-    void Varlist_Formatter::writeDatum(FILE* out_fp __attribute__((unused)), double   datum __attribute__((unused))) {}
+				void	Varlist_Formatter::writeHeader(FILE*	out_fp,	int	version,	int	endianness)	{};
+				void	Varlist_Formatter::writeColumnLabel(FILE*	out_fp,	const	char*	name,	const	char*	units)	{
+								fprintf(out_fp,"%s	{%s}",	name,	units);
+				}
+				void	Varlist_Formatter::writeColumnLabelSeparator(FILE*	out_fp)		{	fprintf(out_fp,"\n");	}
+				void	Varlist_Formatter::writeDatumSeparator(FILE*	out_fp	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeRecordSeparator(FILE*	out_fp	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	int8_t			datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	uint8_t		datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	int16_t		datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	uint16_t	datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	int32_t		datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	uint32_t	datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	int64_t		datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	uint64_t	datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	float				datum	__attribute__((unused)))	{}
+				void	Varlist_Formatter::writeDatum(FILE*	out_fp	__attribute__((unused)),	double			datum	__attribute__((unused)))	{}
 
-    const char* Varlist_Formatter::extension() { return ".varlist"; };
+				const	char*	Varlist_Formatter::extension()	{	return	".varlist";	};
diff --git a/trick_source/data_products/Apps/trkConvert/main.cpp b/trick_source/data_products/Apps/trkConvert/main.cpp
index 92279cbd0..0bd5e3de1 100644
--- a/trick_source/data_products/Apps/trkConvert/main.cpp
+++ b/trick_source/data_products/Apps/trkConvert/main.cpp
@@ -1,81 +1,81 @@
-#include <QApplication>
-#include <QListView>
-#include <QMenu>
-#include <QMenuBar>
-#include <QFileDialog>
-#include "DocWindow.h"
-#include <QTextStream>
-#include <QFileInfo>
+#include	<QApplication>
+#include	<QListView>
+#include	<QMenu>
+#include	<QMenuBar>
+#include	<QFileDialog>
+#include	"DocWindow.h"
+#include	<QTextStream>
+#include	<QFileInfo>
 
-#include <stdio.h>
-static const char *usage_doc[] = {
+#include	<stdio.h>
+static	const	char	*usage_doc[]	=	{
 "----------------------------------------------------------------------------",
-" trkConvert -                                                               ",
-"                                                                            ",
-" USAGE:  trkConvert -help                                                   ",
-"         trkConvert <trk_file_name>                                         ",
-" Options:                                                                   ",
-"     -help    Print this message and exit.                                  ",
+"	trkConvert	-																																																															",
+"																																																																												",
+"	USAGE:		trkConvert	-help																																																			",
+"									trkConvert	<trk_file_name>																																									",
+"	Options:																																																																			",
+"					-help				Print	this	message	and	exit.																																		",
 "----------------------------------------------------------------------------"};
-#define N_USAGE_LINES (sizeof(usage_doc)/sizeof(usage_doc[0]))
+#define	N_USAGE_LINES	(sizeof(usage_doc)/sizeof(usage_doc[0]))
 
-void print_doc(char *doc[], int nlines) {
-    int i;
-    for (i=0; i < nlines; i++) {
-        printf("%s\n",doc[i]);
-    }
-    fflush(stdout);
+void	print_doc(char	*doc[],	int	nlines)	{
+				int	i;
+				for	(i=0;	i	<	nlines;	i++)	{
+								printf("%s\n",doc[i]);
+				}
+				fflush(stdout);
 }
 
-void usage() {
-    print_doc((char **)usage_doc,N_USAGE_LINES);
+void	usage()	{
+				print_doc((char	**)usage_doc,N_USAGE_LINES);
 }
 
-int main(int argc, char *argv[]) {
+int	main(int	argc,	char	*argv[])	{
 
-    QTextStream out(stdout);
+				QTextStream	out(stdout);
 
-    QApplication app(argc, argv);
+				QApplication	app(argc,	argv);
 
-    QStringList args = app.arguments(); 
+				QStringList	args	=	app.arguments();	
 
-    QString programName = args.at(0);
-    QString trkFilePath;
-    QString outputName;
+				QString	programName	=	args.at(0);
+				QString	trkFilePath;
+				QString	outputName;
 
-    int i = 1;
-    QString arg;
-    while (i < argc) {
-        arg = args.at(i);
-        if ( (QString::compare(arg, "-help") == 0) |
-             (QString::compare(arg, "--help") == 0) ) {
-            usage();
-            exit(0);
-        } else if ((QString::compare(arg.right(4), ".trk") == 0)) {
-            trkFilePath = arg;
-        } else {
-            out << programName << ": Invalid argument \"" << arg << "\"." << endl;
-            usage(); 
-            exit(1);
-        }
-        i++;
-    }
+				int	i	=	1;
+				QString	arg;
+				while	(i	<	argc)	{
+								arg	=	args.at(i);
+								if	(	(QString::compare(arg,	"-help")	==	0)	|
+													(QString::compare(arg,	"--help")	==	0)	)	{
+												usage();
+												exit(0);
+								}	else	if	((QString::compare(arg.right(4),	".trk")	==	0))	{
+												trkFilePath	=	arg;
+								}	else	{
+												out	<<	programName	<<	":	Invalid	argument	\""	<<	arg	<<	"\"."	<<	endl;
+												usage();	
+												exit(1);
+								}
+								i++;
+				}
 
-    if (trkFilePath.isEmpty()) {
-        trkFilePath = QFileDialog::getOpenFileName(0, "Open Data File", ".", "Data Files (*.trk)");
-    }
+				if	(trkFilePath.isEmpty())	{
+								trkFilePath	=	QFileDialog::getOpenFileName(0,	"Open	Data	File",	".",	"Data	Files	(*.trk)");
+				}
 
-    if (!trkFilePath.isEmpty()) {
-        QFileInfo trkFileInfo( trkFilePath);
+				if	(!trkFilePath.isEmpty())	{
+								QFileInfo	trkFileInfo(	trkFilePath);
 
-        TRK_DataLog* datalog =
-            new TRK_DataLog( trkFileInfo.absoluteFilePath().toStdString().c_str() );
+								TRK_DataLog*	datalog	=
+												new	TRK_DataLog(	trkFileInfo.absoluteFilePath().toStdString().c_str()	);
 
-        DocWindow* w1 = new DocWindow(datalog); 
-        w1->setWindowTitle( trkFileInfo.fileName());
-        w1->resize(800, 500);
-        w1->show();
+								DocWindow*	w1	=	new	DocWindow(datalog);	
+								w1->setWindowTitle(	trkFileInfo.fileName());
+								w1->resize(800,	500);
+								w1->show();
 
-        return app.exec();
-    }
+								return	app.exec();
+				}
 }
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/curve_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/curve_view_node.cpp
index 0182fe7b1..e7a770aac 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/curve_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/curve_view_node.cpp
@@ -1,233 +1,233 @@
 
-#include <iostream>
-#include <string>
-
-#include "curve_view_node.hh"
-
-// used by render_curve
-const char* mark_style_name[XY_N_MARK_STYLES] = {
-    "none",          // XY_NO_MARK
-    "square",        // XY_SQUARE_MARK
-    "circle",        // XY_CIRCLE_MARK
-    "star",          // XY_STAR_MARK
-    "x",             // XY_X_MARK
-    "triangle",      // XY_TRIANGLE_MARK
-    "solid_square",  // XY_SOLID_SQUARE_MARK
-    "solid_circle",  // XY_SOLID_CIRCLE_MARK
-    "thick_square",  // XY_THICK_SQUARE_MARK
-    "thick_circle"   // XY_THICK_CIRCLE_MARK
+#include	<iostream>
+#include	<string>
+
+#include	"curve_view_node.hh"
+
+//	used	by	render_curve
+const	char*	mark_style_name[XY_N_MARK_STYLES]	=	{
+				"none",										//	XY_NO_MARK
+				"square",								//	XY_SQUARE_MARK
+				"circle",								//	XY_CIRCLE_MARK
+				"star",										//	XY_STAR_MARK
+				"x",													//	XY_X_MARK
+				"triangle",						//	XY_TRIANGLE_MARK
+				"solid_square",		//	XY_SOLID_SQUARE_MARK
+				"solid_circle",		//	XY_SOLID_CIRCLE_MARK
+				"thick_square",		//	XY_THICK_SQUARE_MARK
+				"thick_circle"			//	XY_THICK_CIRCLE_MARK
 };
 
-// used by render_curve
-static const char* mark_size_name[XY_N_MARK_SIZES] = {
-    "tiny",          // XY_TINY
-    "small",         // XY_SMALL
-    "medium",        // XY_MEDIUM
-    "large",         // XY_LARGE
+//	used	by	render_curve
+static	const	char*	mark_size_name[XY_N_MARK_SIZES]	=	{
+				"tiny",										//	XY_TINY
+				"small",									//	XY_SMALL
+				"medium",								//	XY_MEDIUM
+				"large",									//	XY_LARGE
 };
 
-// used by render_curve
-static const char*  line_style_name[XY_N_LINE_STYLES] = {
-    "no_line",       // XY_NO_LINE
-    "plain",         // XY_PLAIN_LINE
-    "fine_dash",     // XY_FINE_DASH
-    "med_fine_dash", // XY_MED_FINE_DASH
-    "dash",          // XY_DASH
-    "long_dash",     // XY_LONG_DASH
-    "x_long_dash",   // XY_X_LONG_DASH
-    "dot_dash",      // XY_1_DOT_DASH
-    "2_dot_dash",    // XY_2_DOT_DASH
-    "3_dot_dash",    // XY_3_DOT_DASH
-    "4_dot_dash",    // XY_4_DOT_DASH
-    "thick_line",    // XY_THICK_LINE
-    "x_thick_line",  // XY_X_THICK_LINE
+//	used	by	render_curve
+static	const	char*		line_style_name[XY_N_LINE_STYLES]	=	{
+				"no_line",							//	XY_NO_LINE
+				"plain",									//	XY_PLAIN_LINE
+				"fine_dash",					//	XY_FINE_DASH
+				"med_fine_dash",	//	XY_MED_FINE_DASH
+				"dash",										//	XY_DASH
+				"long_dash",					//	XY_LONG_DASH
+				"x_long_dash",			//	XY_X_LONG_DASH
+				"dot_dash",						//	XY_1_DOT_DASH
+				"2_dot_dash",				//	XY_2_DOT_DASH
+				"3_dot_dash",				//	XY_3_DOT_DASH
+				"4_dot_dash",				//	XY_4_DOT_DASH
+				"thick_line",				//	XY_THICK_LINE
+				"x_thick_line",		//	XY_X_THICK_LINE
 };
 
-// CLASS VARIABLE INITIALIZATION
-int CurveViewNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	CurveViewNode::instance_count	=	0;
 
-// DESTRUCTOR
-CurveViewNode::~CurveViewNode() {
+//	DESTRUCTOR
+CurveViewNode::~CurveViewNode()	{
 
-    std::cout << "CurveViewNode destructor." << std::endl;
+				std::cout	<<	"CurveViewNode	destructor."	<<	std::endl;
 
 }
 
-// CONSTRUCTOR
-CurveViewNode::CurveViewNode( Widget        Toplevel,
-                              XYCurve      *Fermi_curve,
-                              DPC_curve    *Curve) {
-
-    char x_label_work[256];
-    char y_label_work[256];
-
-    char curve_label[256];
-    const char * x_label;
-    const char * y_label;
-
-    const char * marker_style;
-    const char * marker_size;
-    const char * line_style;
-    const char * line_color;
-    const char * X_scale, * X_bias;
-    const char * Y_scale, * Y_bias;
-    double x_scale_val, x_bias_val;
-    double y_scale_val, y_bias_val;
-
-    const int NumberOfPointsPerMalloc = 1024;
-    int       n_allocated_points;
-    double    x, y;
-
-    toplevel = Toplevel;
-    dpc_curve = Curve;
-    fermi_curve = Fermi_curve;
-
-    //-------------------------------------------------------------------
-    // Build the label for this curve that will go into the plot's legend.
-    //-------------------------------------------------------------------
-    data_src_label = Curve->getDataSrcLbl();
-
-    if ((x_label = Curve->getXAttribute("label")) == NULL) {
-        const char * x_var_name = Curve->getXVarName();
-        const char * x_unitspec = Curve->getXUnits();
-        snprintf(x_label_work, sizeof(x_label_work)-1, "%s (%s)", x_var_name, x_unitspec);
-        x_label = x_label_work;
-    }
-
-    const char * y_var_name = Curve->getYVarName();
-    if ((y_label = Curve->getYAttribute("label")) == NULL) {
-        const char * y_unitspec = Curve->getYUnits();
-        snprintf(y_label_work, sizeof(y_label_work)-1, "%s (%s)", y_var_name, y_unitspec);
-        y_label = y_label_work;
-    }
-
-    snprintf(curve_label, sizeof(curve_label)-1, "%s VS. %s [%s]", y_label, x_label, data_src_label);
-
-    if (data_src_label != NULL) {
-    	fermi_curve->curve_id      = XmStringCreateLocalized((char*)data_src_label);
-    } else {
-    	fermi_curve->curve_id      = XmStringCreateLocalized((char*)y_var_name);
-    }
-
-    fermi_curve->name          = XmStringCreateLocalized(curve_label);
-
-    //------------------------------------------
-    // Set the XYCurve's markerStyle.
-    //------------------------------------------
-    fermi_curve->markerStyle   = XY_NO_MARK; // Default marker style
-    if ((marker_style = Curve->getYAttribute("symbol_style")) != NULL) {
-        int i;
-        for (i = 0 ; i < XY_N_MARK_STYLES ; i++) {
-            if (!strcasecmp(marker_style, mark_style_name[i])){
-                fermi_curve->markerStyle = (char)i;
-                break;
-            }
-        }
-    }
-
-    //------------------------------------------
-    // Set the XYCurve's markerSize.
-    //------------------------------------------
-    fermi_curve->markerSize = XY_MEDIUM; // Default marker size
-    if ((marker_size = Curve->getYAttribute("symbol_size")) != NULL) {
-        int i;
-        for (i=0 ; i<XY_N_MARK_SIZES ; i++) {
-            if (!strcasecmp(marker_size, mark_size_name[i])){
-                fermi_curve->markerSize = (char)i;
-                break;
-            }
-        }
-    }
-
-    //------------------------------------------
-    // Set the XYCurve's lineStyle.
-    //------------------------------------------
-    fermi_curve->lineStyle     = XY_PLAIN_LINE; // Default line style
-    if ((line_style = Curve->getYAttribute("line_style")) != NULL) {
-        int i;
-        for (i=0 ; i<XY_N_LINE_STYLES ; i++) {
-            if (!strcasecmp(line_style, line_style_name[i])){
-                fermi_curve->lineStyle = (char)i;
-                break;
-            }
-        }
-    }
-
-    //------------------------------------------------------------------
-    // Set the XYCurve's linePixel and markerPixel (i.e., their color's).
-    //------------------------------------------------------------------
-    if ((line_color = Curve->getYAttribute("line_color")) == NULL) {
-    // use black when user does not specify a color
-        fermi_curve->linePixel = BlackPixel(XtDisplay(toplevel),0); // Default
-    } else {
-    // user specified color
-        XColor color_def;
-        if (XParseColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), line_color, &color_def )) {
-            if ( XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                fermi_curve->linePixel = color_def.pixel;
-            }
-        }
-    }
-    fermi_curve->markerPixel   = fermi_curve->linePixel;
-
-    //------------------------------------------------------------------
-    // Set the XYCurve's scale and bias factors, if specified
-    //------------------------------------------------------------------
-    x_scale_val = y_scale_val = 1.0;
-    x_bias_val = y_bias_val = 0.0;
-    if ((X_scale = Curve->getXAttribute("scale")) != NULL) {
-        x_scale_val = strtod(X_scale, NULL);
-    }
-    if ((X_bias = Curve->getXAttribute("bias")) != NULL) {
-        x_bias_val = strtod(X_bias, NULL);
-    }
-    if ((Y_scale = Curve->getYAttribute("scale")) != NULL) {
-        y_scale_val = strtod(Y_scale, NULL);
-    }
-    if ((Y_bias = Curve->getYAttribute("bias")) != NULL) {
-        y_bias_val = strtod(Y_bias, NULL);
-    }
-
-    //------------------------------------------------------------------
-    // Set the XYCurve's data points (points) and number of points (nPoints)
-    //------------------------------------------------------------------
-    n_allocated_points = NumberOfPointsPerMalloc;
-
-    if ((fermi_curve->points =
-         (XYPoint *)malloc( n_allocated_points * sizeof(XYPoint))) == NULL) {
-        std::cerr << "OUT_OF_MEMORY in fermi_view::render_curve." << std::endl;
-    }
-
-    fermi_curve->nPoints = 0;
-
-    while ( Curve->getXY(&x, &y)) {
-        fermi_curve->points[ fermi_curve->nPoints ].x = (x * x_scale_val) + x_bias_val;
-        fermi_curve->points[ fermi_curve->nPoints ].y = (y * y_scale_val) + y_bias_val;
-
-        fermi_curve->nPoints ++;
-
-        // If we've run out of space to store our points, allocate more.
-        if ( fermi_curve->nPoints % NumberOfPointsPerMalloc == 0) {
-            n_allocated_points += NumberOfPointsPerMalloc;
-            if ((fermi_curve->points =
-                 (XYPoint *)realloc( fermi_curve->points, n_allocated_points * sizeof(XYPoint))) == NULL) {
-                std::cerr << "OUT_OF_MEMORY in fermi_view::render_curve." << std::endl;
-            }
-        }
-    }
-
-    // Save the final point from getXY
-    fermi_curve->points[ fermi_curve->nPoints ].x = (x * x_scale_val) + x_bias_val;
-    fermi_curve->points[ fermi_curve->nPoints ].y = (y * y_scale_val) + y_bias_val;
-    fermi_curve->nPoints ++;
-
-    //------------------------------------------------------------------
-    // Set the XYCurve's remaining elements.
-    //------------------------------------------------------------------
-    fermi_curve->horizBars     = NULL;
-    fermi_curve->vertBars      = NULL;
-    fermi_curve->flatline      = 0;
-    fermi_curve->flatlineValue = 0.0;
-
-    instance_count ++;
+//	CONSTRUCTOR
+CurveViewNode::CurveViewNode(	Widget								Toplevel,
+																														XYCurve						*Fermi_curve,
+																														DPC_curve				*Curve)	{
+
+				char	x_label_work[256];
+				char	y_label_work[256];
+
+				char	curve_label[256];
+				const	char	*	x_label;
+				const	char	*	y_label;
+
+				const	char	*	marker_style;
+				const	char	*	marker_size;
+				const	char	*	line_style;
+				const	char	*	line_color;
+				const	char	*	X_scale,	*	X_bias;
+				const	char	*	Y_scale,	*	Y_bias;
+				double	x_scale_val,	x_bias_val;
+				double	y_scale_val,	y_bias_val;
+
+				const	int	NumberOfPointsPerMalloc	=	1024;
+				int							n_allocated_points;
+				double				x,	y;
+
+				toplevel	=	Toplevel;
+				dpc_curve	=	Curve;
+				fermi_curve	=	Fermi_curve;
+
+				//-------------------------------------------------------------------
+				//	Build	the	label	for	this	curve	that	will	go	into	the	plot's	legend.
+				//-------------------------------------------------------------------
+				data_src_label	=	Curve->getDataSrcLbl();
+
+				if	((x_label	=	Curve->getXAttribute("label"))	==	NULL)	{
+								const	char	*	x_var_name	=	Curve->getXVarName();
+								const	char	*	x_unitspec	=	Curve->getXUnits();
+								snprintf(x_label_work,	sizeof(x_label_work)-1,	"%s	(%s)",	x_var_name,	x_unitspec);
+								x_label	=	x_label_work;
+				}
+
+				const	char	*	y_var_name	=	Curve->getYVarName();
+				if	((y_label	=	Curve->getYAttribute("label"))	==	NULL)	{
+								const	char	*	y_unitspec	=	Curve->getYUnits();
+								snprintf(y_label_work,	sizeof(y_label_work)-1,	"%s	(%s)",	y_var_name,	y_unitspec);
+								y_label	=	y_label_work;
+				}
+
+				snprintf(curve_label,	sizeof(curve_label)-1,	"%s	VS.	%s	[%s]",	y_label,	x_label,	data_src_label);
+
+				if	(data_src_label	!=	NULL)	{
+					fermi_curve->curve_id						=	XmStringCreateLocalized((char*)data_src_label);
+				}	else	{
+					fermi_curve->curve_id						=	XmStringCreateLocalized((char*)y_var_name);
+				}
+
+				fermi_curve->name										=	XmStringCreateLocalized(curve_label);
+
+				//------------------------------------------
+				//	Set	the	XYCurve's	markerStyle.
+				//------------------------------------------
+				fermi_curve->markerStyle			=	XY_NO_MARK;	//	Default	marker	style
+				if	((marker_style	=	Curve->getYAttribute("symbol_style"))	!=	NULL)	{
+								int	i;
+								for	(i	=	0	;	i	<	XY_N_MARK_STYLES	;	i++)	{
+												if	(!strcasecmp(marker_style,	mark_style_name[i])){
+																fermi_curve->markerStyle	=	(char)i;
+																break;
+												}
+								}
+				}
+
+				//------------------------------------------
+				//	Set	the	XYCurve's	markerSize.
+				//------------------------------------------
+				fermi_curve->markerSize	=	XY_MEDIUM;	//	Default	marker	size
+				if	((marker_size	=	Curve->getYAttribute("symbol_size"))	!=	NULL)	{
+								int	i;
+								for	(i=0	;	i<XY_N_MARK_SIZES	;	i++)	{
+												if	(!strcasecmp(marker_size,	mark_size_name[i])){
+																fermi_curve->markerSize	=	(char)i;
+																break;
+												}
+								}
+				}
+
+				//------------------------------------------
+				//	Set	the	XYCurve's	lineStyle.
+				//------------------------------------------
+				fermi_curve->lineStyle					=	XY_PLAIN_LINE;	//	Default	line	style
+				if	((line_style	=	Curve->getYAttribute("line_style"))	!=	NULL)	{
+								int	i;
+								for	(i=0	;	i<XY_N_LINE_STYLES	;	i++)	{
+												if	(!strcasecmp(line_style,	line_style_name[i])){
+																fermi_curve->lineStyle	=	(char)i;
+																break;
+												}
+								}
+				}
+
+				//------------------------------------------------------------------
+				//	Set	the	XYCurve's	linePixel	and	markerPixel	(i.e.,	their	color's).
+				//------------------------------------------------------------------
+				if	((line_color	=	Curve->getYAttribute("line_color"))	==	NULL)	{
+				//	use	black	when	user	does	not	specify	a	color
+								fermi_curve->linePixel	=	BlackPixel(XtDisplay(toplevel),0);	//	Default
+				}	else	{
+				//	user	specified	color
+								XColor	color_def;
+								if	(XParseColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	line_color,	&color_def	))	{
+												if	(	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																fermi_curve->linePixel	=	color_def.pixel;
+												}
+								}
+				}
+				fermi_curve->markerPixel			=	fermi_curve->linePixel;
+
+				//------------------------------------------------------------------
+				//	Set	the	XYCurve's	scale	and	bias	factors,	if	specified
+				//------------------------------------------------------------------
+				x_scale_val	=	y_scale_val	=	1.0;
+				x_bias_val	=	y_bias_val	=	0.0;
+				if	((X_scale	=	Curve->getXAttribute("scale"))	!=	NULL)	{
+								x_scale_val	=	strtod(X_scale,	NULL);
+				}
+				if	((X_bias	=	Curve->getXAttribute("bias"))	!=	NULL)	{
+								x_bias_val	=	strtod(X_bias,	NULL);
+				}
+				if	((Y_scale	=	Curve->getYAttribute("scale"))	!=	NULL)	{
+								y_scale_val	=	strtod(Y_scale,	NULL);
+				}
+				if	((Y_bias	=	Curve->getYAttribute("bias"))	!=	NULL)	{
+								y_bias_val	=	strtod(Y_bias,	NULL);
+				}
+
+				//------------------------------------------------------------------
+				//	Set	the	XYCurve's	data	points	(points)	and	number	of	points	(nPoints)
+				//------------------------------------------------------------------
+				n_allocated_points	=	NumberOfPointsPerMalloc;
+
+				if	((fermi_curve->points	=
+									(XYPoint	*)malloc(	n_allocated_points	*	sizeof(XYPoint)))	==	NULL)	{
+								std::cerr	<<	"OUT_OF_MEMORY	in	fermi_view::render_curve."	<<	std::endl;
+				}
+
+				fermi_curve->nPoints	=	0;
+
+				while	(	Curve->getXY(&x,	&y))	{
+								fermi_curve->points[	fermi_curve->nPoints	].x	=	(x	*	x_scale_val)	+	x_bias_val;
+								fermi_curve->points[	fermi_curve->nPoints	].y	=	(y	*	y_scale_val)	+	y_bias_val;
+
+								fermi_curve->nPoints	++;
+
+								//	If	we've	run	out	of	space	to	store	our	points,	allocate	more.
+								if	(	fermi_curve->nPoints	%	NumberOfPointsPerMalloc	==	0)	{
+												n_allocated_points	+=	NumberOfPointsPerMalloc;
+												if	((fermi_curve->points	=
+																	(XYPoint	*)realloc(	fermi_curve->points,	n_allocated_points	*	sizeof(XYPoint)))	==	NULL)	{
+																std::cerr	<<	"OUT_OF_MEMORY	in	fermi_view::render_curve."	<<	std::endl;
+												}
+								}
+				}
+
+				//	Save	the	final	point	from	getXY
+				fermi_curve->points[	fermi_curve->nPoints	].x	=	(x	*	x_scale_val)	+	x_bias_val;
+				fermi_curve->points[	fermi_curve->nPoints	].y	=	(y	*	y_scale_val)	+	y_bias_val;
+				fermi_curve->nPoints	++;
+
+				//------------------------------------------------------------------
+				//	Set	the	XYCurve's	remaining	elements.
+				//------------------------------------------------------------------
+				fermi_curve->horizBars					=	NULL;
+				fermi_curve->vertBars						=	NULL;
+				fermi_curve->flatline						=	0;
+				fermi_curve->flatlineValue	=	0.0;
+
+				instance_count	++;
 }
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/fermi_view.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/fermi_view.cpp
index 043a507c8..e3a784d74 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/fermi_view.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/fermi_view.cpp
@@ -1,353 +1,353 @@
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-#include <Xm/Xm.h>
+#include	<Xm/Xm.h>
 
-extern "C"{
-#include "XY.h"
+extern	"C"{
+#include	"XY.h"
 }
 
-#include <stdio.h>    // for snprintf
-#include <stdlib.h>   // for atoi
-#include <stdarg.h>   // for varargs stuff
-#include <strings.h>
-
-#include "fermi_view.hh"
-#include "parse_format.h"
-
-// CONSTRUCTOR
-fermi_view::fermi_view(Widget TopLevel) {
-    char applresdir[1024];
-    char *trick_home;
-
-    toplevel = TopLevel;
-    display  = XtDisplay(toplevel);
-    screen   = XtScreen(toplevel);
-    colormap = DefaultColormapOfScreen(screen);
-    xpos   = 400;
-    ypos   = 50;
-    width  = 600;
-    height = 700;
-
-    trick_home = getenv("TRICK_HOME");
-    if (trick_home != NULL) {
-         snprintf( applresdir,sizeof(applresdir), "%s/trick_source/data_products/DPX/APPS/FXPLOT",trick_home);
-         setenv("XAPPLRESDIR", applresdir, 0);
-    } else {
-         std::cerr << "ERROR: $TRICK_HOME is not set." << std::endl;
-    }
+#include	<stdio.h>				//	for	snprintf
+#include	<stdlib.h>			//	for	atoi
+#include	<stdarg.h>			//	for	varargs	stuff
+#include	<strings.h>
+
+#include	"fermi_view.hh"
+#include	"parse_format.h"
+
+//	CONSTRUCTOR
+fermi_view::fermi_view(Widget	TopLevel)	{
+				char	applresdir[1024];
+				char	*trick_home;
+
+				toplevel	=	TopLevel;
+				display		=	XtDisplay(toplevel);
+				screen			=	XtScreen(toplevel);
+				colormap	=	DefaultColormapOfScreen(screen);
+				xpos			=	400;
+				ypos			=	50;
+				width		=	600;
+				height	=	700;
+
+				trick_home	=	getenv("TRICK_HOME");
+				if	(trick_home	!=	NULL)	{
+									snprintf(	applresdir,sizeof(applresdir),	"%s/trick_source/data_products/DPX/APPS/FXPLOT",trick_home);
+									setenv("XAPPLRESDIR",	applresdir,	0);
+				}	else	{
+									std::cerr	<<	"ERROR:	$TRICK_HOME	is	not	set."	<<	std::endl;
+				}
 }
 
-// DESTRUCTOR
-fermi_view::~fermi_view() {
-    ProductViewNode *pvnode;
-    int n_pvnode, i;
+//	DESTRUCTOR
+fermi_view::~fermi_view()	{
+				ProductViewNode	*pvnode;
+				int	n_pvnode,	i;
 
-    n_pvnode = (int)product_node_list.size();
-    for (i=0 ; i<n_pvnode ; i++ ) {
-        pvnode = product_node_list[i];
-        if (pvnode) { delete pvnode; }
-    }
+				n_pvnode	=	(int)product_node_list.size();
+				for	(i=0	;	i<n_pvnode	;	i++	)	{
+								pvnode	=	product_node_list[i];
+								if	(pvnode)	{	delete	pvnode;	}
+				}
 }
 
-// MEMBER FUNCTION
-DPV_pointer fermi_view::render_product( DPC_product* product) {
+//	MEMBER	FUNCTION
+DPV_pointer	fermi_view::render_product(	DPC_product*	product)	{
 
-    ProductViewNode *product_view_node = new ProductViewNode(toplevel, product);
+				ProductViewNode	*product_view_node	=	new	ProductViewNode(toplevel,	product);
 
-    product_node_list.push_back( product_view_node);
+				product_node_list.push_back(	product_view_node);
 
-    return ( (DPV_pointer)product_view_node);
+				return	(	(DPV_pointer)product_view_node);
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer fermi_view::render_page( DPV_pointer parent_data,
-                                     DPC_page* page) {
-    PageViewNode *page_view_node;
-    ProductViewNode *product_view_node = (ProductViewNode *)parent_data;
+//	MEMBER	FUNCTION
+DPV_pointer	fermi_view::render_page(	DPV_pointer	parent_data,
+																																					DPC_page*	page)	{
+				PageViewNode	*page_view_node;
+				ProductViewNode	*product_view_node	=	(ProductViewNode	*)parent_data;
 
 
-    if ((xpos + width) >= WidthOfScreen( XtScreen(toplevel))) {
-      xpos = 100;
-    }
-    if ((ypos + height) >= HeightOfScreen( XtScreen(toplevel))) {
-      ypos = 100;
-    }
+				if	((xpos	+	width)	>=	WidthOfScreen(	XtScreen(toplevel)))	{
+						xpos	=	100;
+				}
+				if	((ypos	+	height)	>=	HeightOfScreen(	XtScreen(toplevel)))	{
+						ypos	=	100;
+				}
 
-    page_view_node = new PageViewNode(toplevel, page, xpos, ypos, width, height);
+				page_view_node	=	new	PageViewNode(toplevel,	page,	xpos,	ypos,	width,	height);
 
-    xpos += 20;
-    ypos += 20;
+				xpos	+=	20;
+				ypos	+=	20;
 
-    product_view_node->page_node_list.push_back(page_view_node);
+				product_view_node->page_node_list.push_back(page_view_node);
 
-    return( (DPV_pointer)page_view_node );
+				return(	(DPV_pointer)page_view_node	);
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer fermi_view::render_table( DPV_pointer parent_data,
-                                      DPC_table* table) {
+//	MEMBER	FUNCTION
+DPV_pointer	fermi_view::render_table(	DPV_pointer	parent_data,
+																																						DPC_table*	table)	{
 
-    TableViewNode *table_view_node;
+				TableViewNode	*table_view_node;
 
-    ProductViewNode *product_view_node = (ProductViewNode*)parent_data;
+				ProductViewNode	*product_view_node	=	(ProductViewNode*)parent_data;
 
-    if ((xpos + width) >= WidthOfScreen( XtScreen(toplevel))) {
-      xpos = 100;
-    }
-    if ((ypos + height) >= HeightOfScreen( XtScreen(toplevel))) {
-      ypos = 100;
-    }
+				if	((xpos	+	width)	>=	WidthOfScreen(	XtScreen(toplevel)))	{
+						xpos	=	100;
+				}
+				if	((ypos	+	height)	>=	HeightOfScreen(	XtScreen(toplevel)))	{
+						ypos	=	100;
+				}
 
-    table_view_node = new TableViewNode(toplevel, table, xpos, ypos, width, height);
+				table_view_node	=	new	TableViewNode(toplevel,	table,	xpos,	ypos,	width,	height);
 
-    xpos += 20;
-    ypos += 20;
+				xpos	+=	20;
+				ypos	+=	20;
 
-    product_view_node->table_node_list.push_back( table_view_node );
+				product_view_node->table_node_list.push_back(	table_view_node	);
 
-    return( (DPV_pointer)table_view_node);
+				return(	(DPV_pointer)table_view_node);
 }
 
-// MEMBER FUNCTION
-DPV_pointer fermi_view::render_plot( DPV_pointer parent_data,
-                                     DPC_plot* plot) {
-    PageViewNode *page_view_node;
-    PlotViewNode *plot_view_node;
+//	MEMBER	FUNCTION
+DPV_pointer	fermi_view::render_plot(	DPV_pointer	parent_data,
+																																					DPC_plot*	plot)	{
+				PageViewNode	*page_view_node;
+				PlotViewNode	*plot_view_node;
 
-    page_view_node = (PageViewNode*)parent_data;
+				page_view_node	=	(PageViewNode*)parent_data;
 
-    plot_view_node = new PlotViewNode( toplevel, page_view_node->plots_form_widget, plot);
+				plot_view_node	=	new	PlotViewNode(	toplevel,	page_view_node->plots_form_widget,	plot);
 
-    page_view_node->plot_node_list.push_back( plot_view_node );
+				page_view_node->plot_node_list.push_back(	plot_view_node	);
 
-    return( (DPV_pointer)plot_view_node);
+				return(	(DPV_pointer)plot_view_node);
 }
 
-DPV_pointer fermi_view::update_plot( DPV_pointer view_data,
-                                     DPC_plot* plot ) {
+DPV_pointer	fermi_view::update_plot(	DPV_pointer	view_data,
+																																					DPC_plot*	plot	)	{
 
-    PlotViewNode *plot_view_node = (PlotViewNode*) view_data;
+				PlotViewNode	*plot_view_node	=	(PlotViewNode*)	view_data;
 
-    // reset the curve counter to 0, so we can step through the curves again
-    plot_view_node->current = 0;
+				//	reset	the	curve	counter	to	0,	so	we	can	step	through	the	curves	again
+				plot_view_node->current	=	0;
 
-    return ((DPV_pointer)NULL) ;
+				return	((DPV_pointer)NULL)	;
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer fermi_view::render_curve( DPV_pointer parent_data,
-                                      DPC_curve* abstract_curve) {
+//	MEMBER	FUNCTION
+DPV_pointer	fermi_view::render_curve(	DPV_pointer	parent_data,
+																																						DPC_curve*	abstract_curve)	{
 
-    CurveViewNode *curve_view_node;
-    XYCurve * fermi_curve;
+				CurveViewNode	*curve_view_node;
+				XYCurve	*	fermi_curve;
 
-    // --------------------------------------------------------------------
-    // Cast our parent data pointer to what it really is: a PlotViewNode.
-    // --------------------------------------------------------------------
-    PlotViewNode *plot_view_node = (PlotViewNode*) parent_data;
+				//	--------------------------------------------------------------------
+				//	Cast	our	parent	data	pointer	to	what	it	really	is:	a	PlotViewNode.
+				//	--------------------------------------------------------------------
+				PlotViewNode	*plot_view_node	=	(PlotViewNode*)	parent_data;
 
-    // --------------------------------------------------------
-    // Get a reference to the particular XYCurve structure for
-    // this curve so we can populate it.
-    // --------------------------------------------------------
-    fermi_curve = &( plot_view_node->curves[plot_view_node->current] );
+				//	--------------------------------------------------------
+				//	Get	a	reference	to	the	particular	XYCurve	structure	for
+				//	this	curve	so	we	can	populate	it.
+				//	--------------------------------------------------------
+				fermi_curve	=	&(	plot_view_node->curves[plot_view_node->current]	);
 
-    // --------------------------------------------------------------------
-    // Save our reference to the DPC_curve object, so we can handle
-    // DATA_UPDATE notifications.
-    // --------------------------------------------------------------------
-    curve_view_node = new CurveViewNode(toplevel, fermi_curve, abstract_curve);
-    plot_view_node->curve_node_list.push_back( curve_view_node);
+				//	--------------------------------------------------------------------
+				//	Save	our	reference	to	the	DPC_curve	object,	so	we	can	handle
+				//	DATA_UPDATE	notifications.
+				//	--------------------------------------------------------------------
+				curve_view_node	=	new	CurveViewNode(toplevel,	fermi_curve,	abstract_curve);
+				plot_view_node->curve_node_list.push_back(	curve_view_node);
 
-    //------------------------------------------------------------------
-    // Now that we've populated the XYCurve element for this curve, update
-    // the CurrentCurve counter for the next one.
-    //------------------------------------------------------------------
-    plot_view_node->current ++;
+				//------------------------------------------------------------------
+				//	Now	that	we've	populated	the	XYCurve	element	for	this	curve,	update
+				//	the	CurrentCurve	counter	for	the	next	one.
+				//------------------------------------------------------------------
+				plot_view_node->current	++;
 
-    return ((DPV_pointer) NULL);
+				return	((DPV_pointer)	NULL);
 }
 
-// MEMBER FUNCTION
-int fermi_view::update_curve( DPV_pointer parent_data,
-                              DPC_curve* curve) {
+//	MEMBER	FUNCTION
+int	fermi_view::update_curve(	DPV_pointer	parent_data,
+																														DPC_curve*	curve)	{
 
-    XYCurve * fermi_curve;
+				XYCurve	*	fermi_curve;
 
-    double x, y;
+				double	x,	y;
 
-    // --------------------------------------------------------------------
-    // Cast our parent data pointer to what it really is: a PlotViewNode.
-    // --------------------------------------------------------------------
-    PlotViewNode *plot_view_node = (PlotViewNode*) parent_data;
+				//	--------------------------------------------------------------------
+				//	Cast	our	parent	data	pointer	to	what	it	really	is:	a	PlotViewNode.
+				//	--------------------------------------------------------------------
+				PlotViewNode	*plot_view_node	=	(PlotViewNode*)	parent_data;
 
-    // --------------------------------------------------------
-    // Get a reference to the particular XYCurve structure for
-    // this curve so we can populate it.
-    // --------------------------------------------------------
-    fermi_curve = &( plot_view_node->curves[plot_view_node->current] );
+				//	--------------------------------------------------------
+				//	Get	a	reference	to	the	particular	XYCurve	structure	for
+				//	this	curve	so	we	can	populate	it.
+				//	--------------------------------------------------------
+				fermi_curve	=	&(	plot_view_node->curves[plot_view_node->current]	);
 
-    //------------------------------------------------------------------
-    // Now that we've populated the XYCurve element for this curve, update
-    // the CurrentCurve counter for the next one.
-    //------------------------------------------------------------------
-    plot_view_node->current ++;
+				//------------------------------------------------------------------
+				//	Now	that	we've	populated	the	XYCurve	element	for	this	curve,	update
+				//	the	CurrentCurve	counter	for	the	next	one.
+				//------------------------------------------------------------------
+				plot_view_node->current	++;
 
-    if (curve->getXY(&x, &y)) {
+				if	(curve->getXY(&x,	&y))	{
 
-        if ( x != fermi_curve->points[ fermi_curve->nPoints - 1 ].x ) {
-            fermi_curve->points[ fermi_curve->nPoints ].x = x;
-            fermi_curve->points[ fermi_curve->nPoints ].y = y;
-            fermi_curve->nPoints ++;
+								if	(	x	!=	fermi_curve->points[	fermi_curve->nPoints	-	1	].x	)	{
+												fermi_curve->points[	fermi_curve->nPoints	].x	=	x;
+												fermi_curve->points[	fermi_curve->nPoints	].y	=	y;
+												fermi_curve->nPoints	++;
 
-            if ( x - fermi_curve->points[0].x > 30.0 ) {
-                //FIXME: terribly inefficient!!!
-                memmove(&fermi_curve->points[0] , &fermi_curve->points[1] , (fermi_curve->nPoints - 1) * sizeof(XYPoint)) ;
-                fermi_curve->nPoints --;
-            }
-        }
+												if	(	x	-	fermi_curve->points[0].x	>	30.0	)	{
+																//FIXME:	terribly	inefficient!!!
+																memmove(&fermi_curve->points[0]	,	&fermi_curve->points[1]	,	(fermi_curve->nPoints	-	1)	*	sizeof(XYPoint))	;
+																fermi_curve->nPoints	--;
+												}
+								}
 
-        return(1) ;
-    }
+								return(1)	;
+				}
 
-    return (0);
+				return	(0);
 }
 
-// MEMBER FUNCTION
-void fermi_view::finalize_page_view( DPV_pointer page_view ) {
+//	MEMBER	FUNCTION
+void	fermi_view::finalize_page_view(	DPV_pointer	page_view	)	{
 
-    PageViewNode* page_view_node = (PageViewNode *)page_view;
+				PageViewNode*	page_view_node	=	(PageViewNode	*)page_view;
 
-    page_view_node->finalize();
+				page_view_node->finalize();
 
 }
 
-// MEMBER FUNCTION
-void fermi_view::finalize_table_view( DPV_pointer table_view ) {
+//	MEMBER	FUNCTION
+void	fermi_view::finalize_table_view(	DPV_pointer	table_view	)	{
 
-    TableViewNode* table_view_node = (TableViewNode *)table_view;
+				TableViewNode*	table_view_node	=	(TableViewNode	*)table_view;
 
-    table_view_node->finalize();
+				table_view_node->finalize();
 
 }
 
-// MEMBER FUNCTION
-void fermi_view::finalize_plot_view( DPV_pointer plot_view ) {
+//	MEMBER	FUNCTION
+void	fermi_view::finalize_plot_view(	DPV_pointer	plot_view	)	{
 
-    PlotViewNode *plot_view_node = (PlotViewNode *)plot_view;
+				PlotViewNode	*plot_view_node	=	(PlotViewNode	*)plot_view;
 
-    plot_view_node->finalize();
+				plot_view_node->finalize();
 
 }
 
-// MEMBER FUNCTION
-void fermi_view::update_finalize_plot_view( DPV_pointer plot_view ) {
+//	MEMBER	FUNCTION
+void	fermi_view::update_finalize_plot_view(	DPV_pointer	plot_view	)	{
 
-    PlotViewNode *plot_view_node;
+				PlotViewNode	*plot_view_node;
 
-    plot_view_node = (PlotViewNode *)plot_view;
+				plot_view_node	=	(PlotViewNode	*)plot_view;
 
-    XYSetContents( plot_view_node->xy_widget,
-                   plot_view_node->curves,
-                   plot_view_node->n_curves,
-                   XY_RESCALE);
+				XYSetContents(	plot_view_node->xy_widget,
+																			plot_view_node->curves,
+																			plot_view_node->n_curves,
+																			XY_RESCALE);
 }
 
-// MEMBER FUNCTION
-void fermi_view::notify_product( DPV_pointer product_view, DPV_message msg ) {
+//	MEMBER	FUNCTION
+void	fermi_view::notify_product(	DPV_pointer	product_view,	DPV_message	msg	)	{
 
-    PageViewNode   *page_view_node;
-    TableViewNode  *table_view_node;
-    int i, n_pages, n_tables;
+				PageViewNode			*page_view_node;
+				TableViewNode		*table_view_node;
+				int	i,	n_pages,	n_tables;
 
-    ProductViewNode *product_view_node = (ProductViewNode *)product_view;
+				ProductViewNode	*product_view_node	=	(ProductViewNode	*)product_view;
 
-    n_pages = (int)product_view_node->page_node_list.size();
-    for (i=0 ; i<n_pages ; i++ ) {
-        page_view_node = product_view_node->page_node_list[i];
-        notify_page( (DPV_pointer)page_view_node, msg );
-    }
+				n_pages	=	(int)product_view_node->page_node_list.size();
+				for	(i=0	;	i<n_pages	;	i++	)	{
+								page_view_node	=	product_view_node->page_node_list[i];
+								notify_page(	(DPV_pointer)page_view_node,	msg	);
+				}
 
-    n_tables = (int)product_view_node->table_node_list.size();
-    for (i=0 ; i<n_tables ; i++ ) {
-        table_view_node = product_view_node->table_node_list[i];
-        notify_table( (DPV_pointer)table_view_node, msg );
-    }
+				n_tables	=	(int)product_view_node->table_node_list.size();
+				for	(i=0	;	i<n_tables	;	i++	)	{
+								table_view_node	=	product_view_node->table_node_list[i];
+								notify_table(	(DPV_pointer)table_view_node,	msg	);
+				}
 
 }
 
-// MEMBER FUNCTION
-void fermi_view::notify_page( DPV_pointer page_view, DPV_message msg ) {
-
-    Widget page_widget;
-    PageViewNode *page_view_node = (PageViewNode *)page_view;
-
-    if (msg == SHOW_WINDOW) {
-        page_widget = page_view_node->dialog_shell_widget;
-        if (page_widget != NULL ) {
-            XtPopup(page_widget, XtGrabNone);
-        }
-    } else if (msg == RAISE_WINDOW) {
-        page_widget = page_view_node->dialog_shell_widget;
-        if (page_widget != NULL ) {
-            XRaiseWindow( XtDisplay(page_widget), XtWindow(page_widget));
-        }
-    } else {
-        int i, n_plots;
-        // Propagate the notification to subordinate plots.
-        n_plots = (int)page_view_node->plot_node_list.size();
-        for (i=0 ; i<n_plots ; i++ ) {
-            PlotViewNode *plot_view_node;
-            plot_view_node = page_view_node->plot_node_list[i];
-            notify_plot( (DPV_pointer)plot_view_node, msg );
-        }
-    }
+//	MEMBER	FUNCTION
+void	fermi_view::notify_page(	DPV_pointer	page_view,	DPV_message	msg	)	{
+
+				Widget	page_widget;
+				PageViewNode	*page_view_node	=	(PageViewNode	*)page_view;
+
+				if	(msg	==	SHOW_WINDOW)	{
+								page_widget	=	page_view_node->dialog_shell_widget;
+								if	(page_widget	!=	NULL	)	{
+												XtPopup(page_widget,	XtGrabNone);
+								}
+				}	else	if	(msg	==	RAISE_WINDOW)	{
+								page_widget	=	page_view_node->dialog_shell_widget;
+								if	(page_widget	!=	NULL	)	{
+												XRaiseWindow(	XtDisplay(page_widget),	XtWindow(page_widget));
+								}
+				}	else	{
+								int	i,	n_plots;
+								//	Propagate	the	notification	to	subordinate	plots.
+								n_plots	=	(int)page_view_node->plot_node_list.size();
+								for	(i=0	;	i<n_plots	;	i++	)	{
+												PlotViewNode	*plot_view_node;
+												plot_view_node	=	page_view_node->plot_node_list[i];
+												notify_plot(	(DPV_pointer)plot_view_node,	msg	);
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void fermi_view::notify_table( DPV_pointer table_view, DPV_message msg ) {
-
-    Widget table_widget;
-    TableViewNode *table_view_node = (TableViewNode *)table_view;
-
-    if (msg == SHOW_WINDOW) {
-        table_widget = table_view_node->dialog_shell_widget;
-        if (table_widget != NULL ) {
-            XtPopup(table_widget, XtGrabNone);
-        }
-    } else if (msg == RAISE_WINDOW) {
-        table_widget = table_view_node->dialog_shell_widget;
-        if (table_widget != NULL ) {
-            XRaiseWindow( XtDisplay(table_widget), XtWindow(table_widget));
-        }
-    }
+//	MEMBER	FUNCTION
+void	fermi_view::notify_table(	DPV_pointer	table_view,	DPV_message	msg	)	{
+
+				Widget	table_widget;
+				TableViewNode	*table_view_node	=	(TableViewNode	*)table_view;
+
+				if	(msg	==	SHOW_WINDOW)	{
+								table_widget	=	table_view_node->dialog_shell_widget;
+								if	(table_widget	!=	NULL	)	{
+												XtPopup(table_widget,	XtGrabNone);
+								}
+				}	else	if	(msg	==	RAISE_WINDOW)	{
+								table_widget	=	table_view_node->dialog_shell_widget;
+								if	(table_widget	!=	NULL	)	{
+												XRaiseWindow(	XtDisplay(table_widget),	XtWindow(table_widget));
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void fermi_view::notify_plot( DPV_pointer plot_view, DPV_message msg ) {
-    PlotViewNode *plot_view_node = (PlotViewNode*) plot_view;
-
-    if (msg == DATA_UPDATE ) {
-        int i, n_curves;
-        // reset the curve counter to 0, so we can step through the curves again
-        plot_view_node->current = 0;
-        n_curves = (int)plot_view_node->curve_node_list.size();
-        for (i=0; i<n_curves; i++) {
-            CurveViewNode *curve_view_node;
-            curve_view_node = plot_view_node->curve_node_list[i];
-            update_curve( plot_view, curve_view_node->dpc_curve);
-        }
-        update_finalize_plot_view( plot_view );
-    }
+//	MEMBER	FUNCTION
+void	fermi_view::notify_plot(	DPV_pointer	plot_view,	DPV_message	msg	)	{
+				PlotViewNode	*plot_view_node	=	(PlotViewNode*)	plot_view;
+
+				if	(msg	==	DATA_UPDATE	)	{
+								int	i,	n_curves;
+								//	reset	the	curve	counter	to	0,	so	we	can	step	through	the	curves	again
+								plot_view_node->current	=	0;
+								n_curves	=	(int)plot_view_node->curve_node_list.size();
+								for	(i=0;	i<n_curves;	i++)	{
+												CurveViewNode	*curve_view_node;
+												curve_view_node	=	plot_view_node->curve_node_list[i];
+												update_curve(	plot_view,	curve_view_node->dpc_curve);
+								}
+								update_finalize_plot_view(	plot_view	);
+				}
 }
 
-// MEMBER FUNCTION
-void fermi_view::notify_curve( DPV_pointer curve_view, DPV_message msg ) {
-    // Nothing to do.
+//	MEMBER	FUNCTION
+void	fermi_view::notify_curve(	DPV_pointer	curve_view,	DPV_message	msg	)	{
+				//	Nothing	to	do.
 }
 
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
index c78e0af82..163a0126a 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
@@ -1,714 +1,714 @@
-#include <stdexcept>
-#include <iostream>
-#include <string>
-
-#include <stdio.h>
-#include <string.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-#include <Xm/MainW.h>
-#include <Xm/RowColumn.h>
-#include <Xm/List.h>
-#include <Xm/CascadeB.h>
-#include <Xm/PushBG.h>
-#include <Xm/SeparatoG.h>
-#include <Xm/MessageB.h>
-#include <Xm/Form.h>
-#include <Xm/LabelG.h>
-#include <Xm/ScrolledW.h>
-#include <Xm/Text.h>
-
-#include "DPC/DPC_product.hh"
-#include "DPM/DPM_parse_tree.hh"
-#include "DPM/DPM_session.hh"
-#include "fermi_view.hh"
-#include "post_dialog.h"
-
-// FIXME: Consider changing the ugly page/table/product selection lists with option menus.
-
-
-int eqp_errno; // to satisfy libeqparse.a
-int run_app = 1;
-
-Widget toplevel;
-Widget main_window;
-fermi_view *view;
-std::vector <DPC_product*> product_list;
-std::vector <ProductViewNode *> x_product_list;
-Widget product_list_widget;
-Widget page_list_widget;
-Widget table_list_widget;
-Widget make_pdf_button;
-Widget print_button;
-int selected_product_index = -1;
-int selected_page_index = -1;
-int selected_table_index = -1;
-
-
-int file_exists(const char *fname) {
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-        fclose(fp);
-        return(1);
-    } else {
-        return(0);
-    }
+#include	<stdexcept>
+#include	<iostream>
+#include	<string>
+
+#include	<stdio.h>
+#include	<string.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
+
+#include	<Xm/MainW.h>
+#include	<Xm/RowColumn.h>
+#include	<Xm/List.h>
+#include	<Xm/CascadeB.h>
+#include	<Xm/PushBG.h>
+#include	<Xm/SeparatoG.h>
+#include	<Xm/MessageB.h>
+#include	<Xm/Form.h>
+#include	<Xm/LabelG.h>
+#include	<Xm/ScrolledW.h>
+#include	<Xm/Text.h>
+
+#include	"DPC/DPC_product.hh"
+#include	"DPM/DPM_parse_tree.hh"
+#include	"DPM/DPM_session.hh"
+#include	"fermi_view.hh"
+#include	"post_dialog.h"
+
+//	FIXME:	Consider	changing	the	ugly	page/table/product	selection	lists	with	option	menus.
+
+
+int	eqp_errno;	//	to	satisfy	libeqparse.a
+int	run_app	=	1;
+
+Widget	toplevel;
+Widget	main_window;
+fermi_view	*view;
+std::vector	<DPC_product*>	product_list;
+std::vector	<ProductViewNode	*>	x_product_list;
+Widget	product_list_widget;
+Widget	page_list_widget;
+Widget	table_list_widget;
+Widget	make_pdf_button;
+Widget	print_button;
+int	selected_product_index	=	-1;
+int	selected_page_index	=	-1;
+int	selected_table_index	=	-1;
+
+
+int	file_exists(const	char	*fname)	{
+				FILE	*fp	=	fopen(fname,"r");
+				if	(fp)	{
+								fclose(fp);
+								return(1);
+				}	else	{
+								return(0);
+				}
 }
 
-void copy_prefix(char *dest, const char* src) {
-   size_t prefix_len;
-   char *base;
-   if ((base = (char *)strrchr( src,'/')) != NULL ) {
-       prefix_len = strlen(src) - strlen(base);
-       strncpy(dest, src, prefix_len);
-       dest[prefix_len] = '\0';
-   } else {
-       dest[0] = '\0';
-   }
+void	copy_prefix(char	*dest,	const	char*	src)	{
+			size_t	prefix_len;
+			char	*base;
+			if	((base	=	(char	*)strrchr(	src,'/'))	!=	NULL	)	{
+							prefix_len	=	strlen(src)	-	strlen(base);
+							strncpy(dest,	src,	prefix_len);
+							dest[prefix_len]	=	'\0';
+			}	else	{
+							dest[0]	=	'\0';
+			}
 }
 
-void select_page(int page_index) {
-    int n_products;
-    DPC_product *selected_product;
-    DPC_page    *selected_page;
-
-    n_products = (int)product_list.size();
-    if ((selected_product_index >= 0) && (selected_product_index < n_products)) {
-        int n_pages;
-        selected_product = product_list[selected_product_index];
-        n_pages = selected_product->NumberOfPages();
-        if ((page_index >= 0) && (page_index < n_pages)) {
-            selected_page_index = page_index;
-            selected_page = selected_product->getPage( selected_page_index);
-            selected_page->notify( view, fermi_view::RAISE_WINDOW );
-            XRaiseWindow( XtDisplay(main_window),XtWindow(main_window));
-        }
-    }
+void	select_page(int	page_index)	{
+				int	n_products;
+				DPC_product	*selected_product;
+				DPC_page				*selected_page;
+
+				n_products	=	(int)product_list.size();
+				if	((selected_product_index	>=	0)	&&	(selected_product_index	<	n_products))	{
+								int	n_pages;
+								selected_product	=	product_list[selected_product_index];
+								n_pages	=	selected_product->NumberOfPages();
+								if	((page_index	>=	0)	&&	(page_index	<	n_pages))	{
+												selected_page_index	=	page_index;
+												selected_page	=	selected_product->getPage(	selected_page_index);
+												selected_page->notify(	view,	fermi_view::RAISE_WINDOW	);
+												XRaiseWindow(	XtDisplay(main_window),XtWindow(main_window));
+								}
+				}
 }
 
-void select_table(int table_index) {
-    int n_products;
-    DPC_product *selected_product;
-    DPC_table   *selected_table;
-
-    n_products = (int)product_list.size();
-    if ((selected_product_index >= 0) && (selected_product_index < n_products)) {
-        int n_tables;
-        selected_product = product_list[selected_product_index];
-        n_tables = selected_product->NumberOfTables();
-        if ((table_index >= 0) && (table_index < n_tables)) {
-            selected_table_index = table_index;
-            selected_table = selected_product->getTable( selected_table_index);
-            selected_table->notify( view, fermi_view::RAISE_WINDOW );
-        }
-    }
+void	select_table(int	table_index)	{
+				int	n_products;
+				DPC_product	*selected_product;
+				DPC_table			*selected_table;
+
+				n_products	=	(int)product_list.size();
+				if	((selected_product_index	>=	0)	&&	(selected_product_index	<	n_products))	{
+								int	n_tables;
+								selected_product	=	product_list[selected_product_index];
+								n_tables	=	selected_product->NumberOfTables();
+								if	((table_index	>=	0)	&&	(table_index	<	n_tables))	{
+												selected_table_index	=	table_index;
+												selected_table	=	selected_product->getTable(	selected_table_index);
+												selected_table->notify(	view,	fermi_view::RAISE_WINDOW	);
+								}
+				}
 }
 
-void select_product(int product_index) {
-    int n_products;
-    DPC_product *selected_product;
-
-    n_products = (int)product_list.size();
-
-    if ((product_index >= 0) && (product_index < n_products)) {
-        int page_ix, table_ix;
-        int n_pages, n_tables;
-        selected_product_index = product_index;
-        selected_page_index = -1;
-        selected_table_index = -1;
-        selected_product = product_list[selected_product_index];
-        // Raise all of the windows associated with this product.
-        selected_product->notify( view, fermi_view::RAISE_WINDOW );
-
-        XmListDeleteAllItems( page_list_widget);
-
-        n_pages = selected_product->NumberOfPages();
-        for (page_ix=0; page_ix<n_pages; page_ix++ ) {
-            DPC_page *page;
-            char *temp_str;
-            const char *const_temp_str;
-            XmString temp_xm_str;
-
-            page = selected_product->getPage( page_ix);
-            if ((const_temp_str = page->getTitle()) == NULL) {
-                char charbuf[256];
-                snprintf( charbuf, sizeof(charbuf), "Page_%d", page_ix);
-                temp_str = strdup( charbuf);
-            } else {
-                temp_str = strdup( const_temp_str );
-            }
-            temp_xm_str = XmStringCreateLocalized( temp_str );
-            free(temp_str);
-            XmListAddItem(page_list_widget, temp_xm_str, 0);
-            XmStringFree(temp_xm_str);
-        }
-
-        XmListDeleteAllItems( table_list_widget);
-
-        n_tables = selected_product->NumberOfTables();
-        for (table_ix=0; table_ix<n_tables; table_ix++ ) {
-            DPC_table *table;
-            char *temp_str;
-            const char *const_temp_str;
-            XmString temp_xm_str;
-
-            table = selected_product->getTable( table_ix);
-            if ((const_temp_str = table->getTitle()) == NULL) {
-                char charbuf[256];
-                snprintf( charbuf, sizeof(charbuf), "Table_%d", table_ix);
-                temp_str = strdup( charbuf);
-            } else {
-                temp_str = strdup( const_temp_str );
-            }
-            temp_xm_str = XmStringCreateLocalized( temp_str );
-            free(temp_str);
-            XmListAddItem(table_list_widget, temp_xm_str, 0);
-            XmStringFree(temp_xm_str);
-        }
-    }
+void	select_product(int	product_index)	{
+				int	n_products;
+				DPC_product	*selected_product;
+
+				n_products	=	(int)product_list.size();
+
+				if	((product_index	>=	0)	&&	(product_index	<	n_products))	{
+								int	page_ix,	table_ix;
+								int	n_pages,	n_tables;
+								selected_product_index	=	product_index;
+								selected_page_index	=	-1;
+								selected_table_index	=	-1;
+								selected_product	=	product_list[selected_product_index];
+								//	Raise	all	of	the	windows	associated	with	this	product.
+								selected_product->notify(	view,	fermi_view::RAISE_WINDOW	);
+
+								XmListDeleteAllItems(	page_list_widget);
+
+								n_pages	=	selected_product->NumberOfPages();
+								for	(page_ix=0;	page_ix<n_pages;	page_ix++	)	{
+												DPC_page	*page;
+												char	*temp_str;
+												const	char	*const_temp_str;
+												XmString	temp_xm_str;
+
+												page	=	selected_product->getPage(	page_ix);
+												if	((const_temp_str	=	page->getTitle())	==	NULL)	{
+																char	charbuf[256];
+																snprintf(	charbuf,	sizeof(charbuf),	"Page_%d",	page_ix);
+																temp_str	=	strdup(	charbuf);
+												}	else	{
+																temp_str	=	strdup(	const_temp_str	);
+												}
+												temp_xm_str	=	XmStringCreateLocalized(	temp_str	);
+												free(temp_str);
+												XmListAddItem(page_list_widget,	temp_xm_str,	0);
+												XmStringFree(temp_xm_str);
+								}
+
+								XmListDeleteAllItems(	table_list_widget);
+
+								n_tables	=	selected_product->NumberOfTables();
+								for	(table_ix=0;	table_ix<n_tables;	table_ix++	)	{
+												DPC_table	*table;
+												char	*temp_str;
+												const	char	*const_temp_str;
+												XmString	temp_xm_str;
+
+												table	=	selected_product->getTable(	table_ix);
+												if	((const_temp_str	=	table->getTitle())	==	NULL)	{
+																char	charbuf[256];
+																snprintf(	charbuf,	sizeof(charbuf),	"Table_%d",	table_ix);
+																temp_str	=	strdup(	charbuf);
+												}	else	{
+																temp_str	=	strdup(	const_temp_str	);
+												}
+												temp_xm_str	=	XmStringCreateLocalized(	temp_str	);
+												free(temp_str);
+												XmListAddItem(table_list_widget,	temp_xm_str,	0);
+												XmStringFree(temp_xm_str);
+								}
+				}
 }
 
-void terminate_app_callback( Widget w, XtPointer client_data, XtPointer call_data) {
-    run_app = 0;
+void	terminate_app_callback(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				run_app	=	0;
 }
 
-void select_product_callback( Widget w, XtPointer client_data, XtPointer call_data) {
-    int product_index;
-    XmListCallbackStruct *cbs = (XmListCallbackStruct *)call_data;
-    product_index = cbs->item_position - 1;
-    select_product( product_index);
+void	select_product_callback(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				int	product_index;
+				XmListCallbackStruct	*cbs	=	(XmListCallbackStruct	*)call_data;
+				product_index	=	cbs->item_position	-	1;
+				select_product(	product_index);
 }
 
-void select_page_callback( Widget w, XtPointer client_data, XtPointer call_data) {
-    int page_index;
-    XmListCallbackStruct *cbs = (XmListCallbackStruct *)call_data;
-    page_index = cbs->item_position - 1;
-    select_page( page_index);
+void	select_page_callback(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				int	page_index;
+				XmListCallbackStruct	*cbs	=	(XmListCallbackStruct	*)call_data;
+				page_index	=	cbs->item_position	-	1;
+				select_page(	page_index);
 }
 
-void select_table_callback( Widget w, XtPointer client_data, XtPointer call_data) {
-    int table_index;
-    XmListCallbackStruct *cbs = (XmListCallbackStruct *)call_data;
-    table_index = cbs->item_position - 1;
-    select_table( table_index);
+void	select_table_callback(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				int	table_index;
+				XmListCallbackStruct	*cbs	=	(XmListCallbackStruct	*)call_data;
+				table_index	=	cbs->item_position	-	1;
+				select_table(	table_index);
 }
 
-void pdf_all(Widget w, XtPointer client_data, XtPointer call_data) {
-
-	char tmp_file[256];
-    int ii;
-
-    ProductViewNode *p_node;
-    int n_products = (int)x_product_list.size();
-
-    if (!access("/tmp", W_OK)) {
-        strncpy(tmp_file, "/tmp/fxplot_XXXXXX", sizeof(tmp_file));
-    } else if (!access("/var/tmp", W_OK)) {
-    	strncpy(tmp_file, "/var/tmp/fxplot_XXXXXX", sizeof(tmp_file));
-    } else {
-        post_dialog( toplevel, XmDIALOG_ERROR,
-        	         "Unable to access /tmp or /var/tmp, where a temporary\n"
-        	         "Postscript file (that represents your print out) needs\n"
-        	         "to be generated. Please check your file permissions.\n");
-        return;
-    }
-
-    if (mkstemp( tmp_file) < 0) {
-    	post_dialog( toplevel, XmDIALOG_ERROR, "Unable to generate a temporary file name for some mind boggling reason." );
-    	return;
-    }
-
-    for (ii = 0; ii < n_products; ii++) {
-    	p_node = x_product_list[ii];
-    	p_node->generate_PS(tmp_file);
-    }
-
-    // Changed back use ghostscript
-    int ret = system("gs -dQUIET -dNOPAUSE -sDEVICE=pdfwrite -dBATCH -sOutputFile=fxplot.PDF /tmp/fxplot_*");
-
-    if (ret != 0) {
-    	std::cout << "Couldn't find utility ghostscript. Can't make a PDF of all plots!\n";
-    } else {
-// show the generated PDF file
-#if __APPLE__
-    ret = system("open -a Preview fxplot.PDF &");
+void	pdf_all(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+
+	char	tmp_file[256];
+				int	ii;
+
+				ProductViewNode	*p_node;
+				int	n_products	=	(int)x_product_list.size();
+
+				if	(!access("/tmp",	W_OK))	{
+								strncpy(tmp_file,	"/tmp/fxplot_XXXXXX",	sizeof(tmp_file));
+				}	else	if	(!access("/var/tmp",	W_OK))	{
+					strncpy(tmp_file,	"/var/tmp/fxplot_XXXXXX",	sizeof(tmp_file));
+				}	else	{
+								post_dialog(	toplevel,	XmDIALOG_ERROR,
+																		"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+																		"Postscript	file	(that	represents	your	print	out)	needs\n"
+																		"to	be	generated.	Please	check	your	file	permissions.\n");
+								return;
+				}
+
+				if	(mkstemp(	tmp_file)	<	0)	{
+					post_dialog(	toplevel,	XmDIALOG_ERROR,	"Unable	to	generate	a	temporary	file	name	for	some	mind	boggling	reason."	);
+					return;
+				}
+
+				for	(ii	=	0;	ii	<	n_products;	ii++)	{
+					p_node	=	x_product_list[ii];
+					p_node->generate_PS(tmp_file);
+				}
+
+				//	Changed	back	use	ghostscript
+				int	ret	=	system("gs	-dQUIET	-dNOPAUSE	-sDEVICE=pdfwrite	-dBATCH	-sOutputFile=fxplot.PDF	/tmp/fxplot_*");
+
+				if	(ret	!=	0)	{
+					std::cout	<<	"Couldn't	find	utility	ghostscript.	Can't	make	a	PDF	of	all	plots!\n";
+				}	else	{
+//	show	the	generated	PDF	file
+#if	__APPLE__
+				ret	=	system("open	-a	Preview	fxplot.PDF	&");
 #else
-   	// check to see if xdg-open is available
-    ret = system("xdg-open --version > /dev/null 2>&1");
-    if (ret == 0) {
-        // xdg-open opens the file using the default associated application
-        system("xdg-open fxplot.PDF &");
-    } else {
-        std::cout << "Couldn't find a proper application to view the PDF file.\nThe PDF file of all plots is saved as fxplot.PDF!\n";
-    }
-        /*if (ret != 0) {
-    		ret = system("acroread fxplot.PDF &");
-    		if (ret != 0) {
-    			ret = system("xpdf fxplot.PDF &");
-    			if (ret != 0) {
-    				ret = system("kghostview fxplot.PDF &");
-    				if (ret != 0) {
-    					ret = system("kpdf fxplot.PDF &");
-    					std::cout << "Couldn't find a proper application to view the PDF file.\nThe PDF file of all plots is saved as fxplot.PDF!\n";
-    				}
-    			}
-    		}
-    	}*/
+				//	check	to	see	if	xdg-open	is	available
+				ret	=	system("xdg-open	--version	>	/dev/null	2>&1");
+				if	(ret	==	0)	{
+								//	xdg-open	opens	the	file	using	the	default	associated	application
+								system("xdg-open	fxplot.PDF	&");
+				}	else	{
+								std::cout	<<	"Couldn't	find	a	proper	application	to	view	the	PDF	file.\nThe	PDF	file	of	all	plots	is	saved	as	fxplot.PDF!\n";
+				}
+								/*if	(ret	!=	0)	{
+						ret	=	system("acroread	fxplot.PDF	&");
+						if	(ret	!=	0)	{
+							ret	=	system("xpdf	fxplot.PDF	&");
+							if	(ret	!=	0)	{
+								ret	=	system("kghostview	fxplot.PDF	&");
+								if	(ret	!=	0)	{
+									ret	=	system("kpdf	fxplot.PDF	&");
+									std::cout	<<	"Couldn't	find	a	proper	application	to	view	the	PDF	file.\nThe	PDF	file	of	all	plots	is	saved	as	fxplot.PDF!\n";
+								}
+							}
+						}
+					}*/
 #endif
-        system("rm -rf /tmp/fxplot_*");
-    }
+								system("rm	-rf	/tmp/fxplot_*");
+				}
 }
 
-void pdf_confirm(Widget w, XtPointer client_data, XtPointer call_data) {
+void	pdf_confirm(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    int nargs;
-    Arg wargs[1];
-    Widget w_pdf_confirm;
-    Widget w_help_button;
+				int	nargs;
+				Arg	wargs[1];
+				Widget	w_pdf_confirm;
+				Widget	w_help_button;
 
-    nargs = 0;
+				nargs	=	0;
 
-    XtSetArg(wargs[nargs], XmNmessageString, XmStringCreateLocalized((char *)"Make PDF of all plots?"));
+				XtSetArg(wargs[nargs],	XmNmessageString,	XmStringCreateLocalized((char	*)"Make	PDF	of	all	plots?"));
 
-    nargs++;
+				nargs++;
 
-    w_pdf_confirm = XmCreateQuestionDialog(toplevel, (char *)"dialog_confirmation", wargs, nargs);
+				w_pdf_confirm	=	XmCreateQuestionDialog(toplevel,	(char	*)"dialog_confirmation",	wargs,	nargs);
 
-    XtAddCallback(w_pdf_confirm, XmNokCallback, pdf_all, NULL);
+				XtAddCallback(w_pdf_confirm,	XmNokCallback,	pdf_all,	NULL);
 
-    XtManageChild(w_pdf_confirm);
+				XtManageChild(w_pdf_confirm);
 
-    w_help_button = XmMessageBoxGetChild(w_pdf_confirm, XmDIALOG_HELP_BUTTON);
+				w_help_button	=	XmMessageBoxGetChild(w_pdf_confirm,	XmDIALOG_HELP_BUTTON);
 
-    XtUnmanageChild(w_help_button);
+				XtUnmanageChild(w_help_button);
 }
 
-void print_all(Widget w, XtPointer client_data, XtPointer call_data) {
+void	print_all(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    int ii, jj;
-    ProductViewNode *p_node;
-    int n_products = (int)x_product_list.size();
+				int	ii,	jj;
+				ProductViewNode	*p_node;
+				int	n_products	=	(int)x_product_list.size();
 
-    for (ii = 0; ii < n_products; ii++) {
-        p_node = x_product_list[ii];
-        int n_pages = (int)p_node->page_node_list.size();
+				for	(ii	=	0;	ii	<	n_products;	ii++)	{
+								p_node	=	x_product_list[ii];
+								int	n_pages	=	(int)p_node->page_node_list.size();
 
-        // prints each page
-        for (jj = 0; jj < n_pages; jj++) {
-            p_node->page_node_list[jj]->print();
-        }
-    }
+								//	prints	each	page
+								for	(jj	=	0;	jj	<	n_pages;	jj++)	{
+												p_node->page_node_list[jj]->print();
+								}
+				}
 }
 
-void print_confirm(Widget w, XtPointer client_data, XtPointer call_data) {
+void	print_confirm(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    int nargs;
-    Arg wargs[1];
-    Widget w_print_confirm;
-    Widget w_help_button;
+				int	nargs;
+				Arg	wargs[1];
+				Widget	w_print_confirm;
+				Widget	w_help_button;
 
-    nargs = 0;
-    XtSetArg(wargs[nargs], XmNmessageString, XmStringCreateLocalized((char *)"Print -all- plots?"));
-    nargs++;
+				nargs	=	0;
+				XtSetArg(wargs[nargs],	XmNmessageString,	XmStringCreateLocalized((char	*)"Print	-all-	plots?"));
+				nargs++;
 
-    w_print_confirm = XmCreateQuestionDialog(toplevel, (char *)"dialog_confirmation", wargs, nargs);
+				w_print_confirm	=	XmCreateQuestionDialog(toplevel,	(char	*)"dialog_confirmation",	wargs,	nargs);
 
-    XtAddCallback(w_print_confirm, XmNokCallback, print_all, NULL);
+				XtAddCallback(w_print_confirm,	XmNokCallback,	print_all,	NULL);
 
-    XtManageChild(w_print_confirm);
+				XtManageChild(w_print_confirm);
 
-    w_help_button = XmMessageBoxGetChild(w_print_confirm, XmDIALOG_HELP_BUTTON);
-    XtUnmanageChild(w_help_button);
+				w_help_button	=	XmMessageBoxGetChild(w_print_confirm,	XmDIALOG_HELP_BUTTON);
+				XtUnmanageChild(w_help_button);
 }
 
 
-/* =========== */
-Widget Create_Main_Window( Widget top) {
-
-    Widget menu_bar;
-    Widget file_pull_down;
-    XmString label_str;
-    Widget exit_button;
-    Widget form_widget;
-
-    Widget label_widget_1;
-    Widget label_widget_2;
-    Widget label_widget_3;
-    Widget scrolled_w_widget_1;
-    Widget scrolled_w_widget_2;
-    Widget scrolled_w_widget_3;
-
-
-    main_window = XtVaCreateManagedWidget("main_w", xmMainWindowWidgetClass, top,
-                                          NULL);
-    menu_bar = XmCreateMenuBar(main_window, (char *)"Menu", NULL, 0);
-
-    file_pull_down = XmCreatePulldownMenu( menu_bar, (char *)"file_pull_down" , NULL, 0);
-
-    label_str= XmStringCreateLocalized((char *)"File");
-
-    XtVaCreateManagedWidget("file", xmCascadeButtonWidgetClass, menu_bar,
-                            XmNlabelString, label_str,
-                            XmNsubMenuId, file_pull_down,
-                            NULL);
-    XmStringFree(label_str);
-    print_button = XtVaCreateManagedWidget("Print", xmPushButtonGadgetClass, file_pull_down, NULL);
-    make_pdf_button  = XtVaCreateManagedWidget("Make PDF", xmPushButtonGadgetClass, file_pull_down, NULL);
-    XtVaCreateManagedWidget("separator", xmSeparatorGadgetClass, file_pull_down, NULL);
-
-    exit_button  = XtVaCreateManagedWidget("Exit", xmPushButtonGadgetClass, file_pull_down, NULL);
-
-    XtAddCallback( exit_button, XmNactivateCallback, terminate_app_callback, NULL);
-
-    XtManageChild( menu_bar);
-
-    form_widget =
-        XtVaCreateWidget( "topform",
-                          xmFormWidgetClass, main_window,
-                          XmNfractionBase, 3,
-                          XmNwidth,                 400,
-                          XmNheight,                200,
-                          NULL);
-
-    label_str= XmStringCreateLocalized((char *)"Products");
-    label_widget_1 =
-        XtVaCreateManagedWidget( "ProductListLabel",
-                                 xmLabelGadgetClass,  form_widget,
-                                 XmNlabelString,      label_str ,
-                                 XmNtopAttachment,    XmATTACH_FORM,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     0,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    1,
-                                 XmNbottomAttachment, XmATTACH_NONE,
-                                 NULL);
-    XmStringFree(label_str);
-
-    label_str= XmStringCreateLocalized((char *)"Pages");
-    label_widget_2 =
-        XtVaCreateManagedWidget( "PageListLabel",
-                                 xmLabelGadgetClass,  form_widget,
-                                 XmNlabelString,      label_str ,
-                                 XmNtopAttachment,    XmATTACH_FORM,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     1,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    2,
-                                 XmNbottomAttachment, XmATTACH_NONE,
-                                 NULL);
-    XmStringFree(label_str);
-
-    label_str= XmStringCreateLocalized((char *)"Tables");
-    label_widget_3 =
-        XtVaCreateManagedWidget( "TableListLabel",
-                                 xmLabelGadgetClass,  form_widget,
-                                 XmNlabelString,      label_str ,
-                                 XmNtopAttachment,    XmATTACH_FORM,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     2,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    3,
-                                 XmNbottomAttachment, XmATTACH_NONE,
-                                 NULL);
-    XmStringFree(label_str);
-
-    scrolled_w_widget_1 =
-        XtVaCreateManagedWidget( "scrolled_w_1",
-                                 xmScrolledWindowWidgetClass, form_widget,
-                                 XmNscrollingPolicy,  XmAUTOMATIC,
-                                 XmNtopAttachment,    XmATTACH_WIDGET,
-                                 XmNtopWidget,        label_widget_1,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     0,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    1,
-                                 XmNbottomAttachment, XmATTACH_FORM,
-                                 NULL);
-    scrolled_w_widget_2 =
-        XtVaCreateManagedWidget( "scrolled_w_2",
-                                 xmScrolledWindowWidgetClass, form_widget,
-                                 XmNscrollingPolicy,  XmAUTOMATIC,
-                                 XmNtopAttachment,    XmATTACH_WIDGET,
-                                 XmNtopWidget,        label_widget_2,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     1,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    2,
-                                 XmNbottomAttachment, XmATTACH_FORM,
-                                 NULL);
-    scrolled_w_widget_3 =
-        XtVaCreateManagedWidget( "scrolled_w_3",
-                                 xmScrolledWindowWidgetClass, form_widget,
-                                 XmNscrollingPolicy,  XmAUTOMATIC,
-                                 XmNtopAttachment,    XmATTACH_WIDGET,
-                                 XmNtopWidget,        label_widget_3,
-                                 XmNleftAttachment,   XmATTACH_POSITION,
-                                 XmNleftPosition,     2,
-                                 XmNrightAttachment,  XmATTACH_POSITION,
-                                 XmNrightPosition,    3,
-                                 XmNbottomAttachment, XmATTACH_FORM,
-                                 NULL);
-
-    product_list_widget =
-        XtVaCreateManagedWidget( "list_of_products",
-                                 xmListWidgetClass, scrolled_w_widget_1,
-                                 XmNselectionPolicy, XmSINGLE_SELECT,
-                                 XmNheight, 500,
-                                 NULL);
-
-    XtAddCallback( product_list_widget, XmNdefaultActionCallback, select_product_callback, NULL);
-    XtAddCallback( product_list_widget, XmNsingleSelectionCallback, select_product_callback, NULL);
-
-    page_list_widget =
-        XtVaCreateManagedWidget( "list_of_pages",
-                                 xmListWidgetClass, scrolled_w_widget_2,
-                                 XmNselectionPolicy, XmSINGLE_SELECT,
-                                 XmNheight, 500,
-                                 NULL);
-
-    XtAddCallback( page_list_widget, XmNdefaultActionCallback, select_page_callback, NULL);
-    XtAddCallback( page_list_widget, XmNsingleSelectionCallback, select_page_callback, NULL);
-
-    table_list_widget =
-        XtVaCreateManagedWidget( "list_of_tables",
-                                 xmListWidgetClass, scrolled_w_widget_3,
-                                 XmNselectionPolicy, XmSINGLE_SELECT,
-                                 XmNheight, 500,
-                                 NULL);
-
-    XtAddCallback( table_list_widget, XmNdefaultActionCallback, select_table_callback, NULL);
-    XtAddCallback( table_list_widget, XmNsingleSelectionCallback, select_table_callback, NULL);
-
-    XtManageChild(form_widget);
-
-    return( main_window);
+/*	===========	*/
+Widget	Create_Main_Window(	Widget	top)	{
+
+				Widget	menu_bar;
+				Widget	file_pull_down;
+				XmString	label_str;
+				Widget	exit_button;
+				Widget	form_widget;
+
+				Widget	label_widget_1;
+				Widget	label_widget_2;
+				Widget	label_widget_3;
+				Widget	scrolled_w_widget_1;
+				Widget	scrolled_w_widget_2;
+				Widget	scrolled_w_widget_3;
+
+
+				main_window	=	XtVaCreateManagedWidget("main_w",	xmMainWindowWidgetClass,	top,
+																																										NULL);
+				menu_bar	=	XmCreateMenuBar(main_window,	(char	*)"Menu",	NULL,	0);
+
+				file_pull_down	=	XmCreatePulldownMenu(	menu_bar,	(char	*)"file_pull_down"	,	NULL,	0);
+
+				label_str=	XmStringCreateLocalized((char	*)"File");
+
+				XtVaCreateManagedWidget("file",	xmCascadeButtonWidgetClass,	menu_bar,
+																												XmNlabelString,	label_str,
+																												XmNsubMenuId,	file_pull_down,
+																												NULL);
+				XmStringFree(label_str);
+				print_button	=	XtVaCreateManagedWidget("Print",	xmPushButtonGadgetClass,	file_pull_down,	NULL);
+				make_pdf_button		=	XtVaCreateManagedWidget("Make	PDF",	xmPushButtonGadgetClass,	file_pull_down,	NULL);
+				XtVaCreateManagedWidget("separator",	xmSeparatorGadgetClass,	file_pull_down,	NULL);
+
+				exit_button		=	XtVaCreateManagedWidget("Exit",	xmPushButtonGadgetClass,	file_pull_down,	NULL);
+
+				XtAddCallback(	exit_button,	XmNactivateCallback,	terminate_app_callback,	NULL);
+
+				XtManageChild(	menu_bar);
+
+				form_widget	=
+								XtVaCreateWidget(	"topform",
+																										xmFormWidgetClass,	main_window,
+																										XmNfractionBase,	3,
+																										XmNwidth,																	400,
+																										XmNheight,																200,
+																										NULL);
+
+				label_str=	XmStringCreateLocalized((char	*)"Products");
+				label_widget_1	=
+								XtVaCreateManagedWidget(	"ProductListLabel",
+																																	xmLabelGadgetClass,		form_widget,
+																																	XmNlabelString,						label_str	,
+																																	XmNtopAttachment,				XmATTACH_FORM,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					0,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				1,
+																																	XmNbottomAttachment,	XmATTACH_NONE,
+																																	NULL);
+				XmStringFree(label_str);
+
+				label_str=	XmStringCreateLocalized((char	*)"Pages");
+				label_widget_2	=
+								XtVaCreateManagedWidget(	"PageListLabel",
+																																	xmLabelGadgetClass,		form_widget,
+																																	XmNlabelString,						label_str	,
+																																	XmNtopAttachment,				XmATTACH_FORM,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					1,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				2,
+																																	XmNbottomAttachment,	XmATTACH_NONE,
+																																	NULL);
+				XmStringFree(label_str);
+
+				label_str=	XmStringCreateLocalized((char	*)"Tables");
+				label_widget_3	=
+								XtVaCreateManagedWidget(	"TableListLabel",
+																																	xmLabelGadgetClass,		form_widget,
+																																	XmNlabelString,						label_str	,
+																																	XmNtopAttachment,				XmATTACH_FORM,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					2,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				3,
+																																	XmNbottomAttachment,	XmATTACH_NONE,
+																																	NULL);
+				XmStringFree(label_str);
+
+				scrolled_w_widget_1	=
+								XtVaCreateManagedWidget(	"scrolled_w_1",
+																																	xmScrolledWindowWidgetClass,	form_widget,
+																																	XmNscrollingPolicy,		XmAUTOMATIC,
+																																	XmNtopAttachment,				XmATTACH_WIDGET,
+																																	XmNtopWidget,								label_widget_1,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					0,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				1,
+																																	XmNbottomAttachment,	XmATTACH_FORM,
+																																	NULL);
+				scrolled_w_widget_2	=
+								XtVaCreateManagedWidget(	"scrolled_w_2",
+																																	xmScrolledWindowWidgetClass,	form_widget,
+																																	XmNscrollingPolicy,		XmAUTOMATIC,
+																																	XmNtopAttachment,				XmATTACH_WIDGET,
+																																	XmNtopWidget,								label_widget_2,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					1,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				2,
+																																	XmNbottomAttachment,	XmATTACH_FORM,
+																																	NULL);
+				scrolled_w_widget_3	=
+								XtVaCreateManagedWidget(	"scrolled_w_3",
+																																	xmScrolledWindowWidgetClass,	form_widget,
+																																	XmNscrollingPolicy,		XmAUTOMATIC,
+																																	XmNtopAttachment,				XmATTACH_WIDGET,
+																																	XmNtopWidget,								label_widget_3,
+																																	XmNleftAttachment,			XmATTACH_POSITION,
+																																	XmNleftPosition,					2,
+																																	XmNrightAttachment,		XmATTACH_POSITION,
+																																	XmNrightPosition,				3,
+																																	XmNbottomAttachment,	XmATTACH_FORM,
+																																	NULL);
+
+				product_list_widget	=
+								XtVaCreateManagedWidget(	"list_of_products",
+																																	xmListWidgetClass,	scrolled_w_widget_1,
+																																	XmNselectionPolicy,	XmSINGLE_SELECT,
+																																	XmNheight,	500,
+																																	NULL);
+
+				XtAddCallback(	product_list_widget,	XmNdefaultActionCallback,	select_product_callback,	NULL);
+				XtAddCallback(	product_list_widget,	XmNsingleSelectionCallback,	select_product_callback,	NULL);
+
+				page_list_widget	=
+								XtVaCreateManagedWidget(	"list_of_pages",
+																																	xmListWidgetClass,	scrolled_w_widget_2,
+																																	XmNselectionPolicy,	XmSINGLE_SELECT,
+																																	XmNheight,	500,
+																																	NULL);
+
+				XtAddCallback(	page_list_widget,	XmNdefaultActionCallback,	select_page_callback,	NULL);
+				XtAddCallback(	page_list_widget,	XmNsingleSelectionCallback,	select_page_callback,	NULL);
+
+				table_list_widget	=
+								XtVaCreateManagedWidget(	"list_of_tables",
+																																	xmListWidgetClass,	scrolled_w_widget_3,
+																																	XmNselectionPolicy,	XmSINGLE_SELECT,
+																																	XmNheight,	500,
+																																	NULL);
+
+				XtAddCallback(	table_list_widget,	XmNdefaultActionCallback,	select_table_callback,	NULL);
+				XtAddCallback(	table_list_widget,	XmNsingleSelectionCallback,	select_table_callback,	NULL);
+
+				XtManageChild(form_widget);
+
+				return(	main_window);
 
 }
 
-class FplotArgs {
-    public:
-    const char* presentation;
-    char* device;
-    const char* session_file;
-
-    FplotArgs(int argc, char* argv[]) {
-        int ii;
-        char* cp ;
-
-        device = NULL;
-        session_file = NULL;
-
-        for ( ii = 1 ; ii < argc ; ii++ ) {
-            if ( ! strncmp( "-device", argv[ii], 7 ) ) {
-                cp = strchr( argv[ii], '=' ) ;
-                cp++ ;
-                device = strdup(cp);
-
-            } else {
-                session_file = argv[ii];
-                if ( access( session_file, R_OK|F_OK ) ) {
-                    if (session_file == NULL) {
-                        throw std::invalid_argument("Can't find/read session file.");
-                    }
-                }
-            }
-        }
-        if (session_file == NULL) {
-            throw std::invalid_argument("No session file specified.");
-        }
-
-    }
-
-    private:
-       FplotArgs() {};
+class	FplotArgs	{
+				public:
+				const	char*	presentation;
+				char*	device;
+				const	char*	session_file;
+
+				FplotArgs(int	argc,	char*	argv[])	{
+								int	ii;
+								char*	cp	;
+
+								device	=	NULL;
+								session_file	=	NULL;
+
+								for	(	ii	=	1	;	ii	<	argc	;	ii++	)	{
+												if	(	!	strncmp(	"-device",	argv[ii],	7	)	)	{
+																cp	=	strchr(	argv[ii],	'='	)	;
+																cp++	;
+																device	=	strdup(cp);
+
+												}	else	{
+																session_file	=	argv[ii];
+																if	(	access(	session_file,	R_OK|F_OK	)	)	{
+																				if	(session_file	==	NULL)	{
+																								throw	std::invalid_argument("Can't	find/read	session	file.");
+																				}
+																}
+												}
+								}
+								if	(session_file	==	NULL)	{
+												throw	std::invalid_argument("No	session	file	specified.");
+								}
+
+				}
+
+				private:
+							FplotArgs()	{};
 };
 
-void usage()
+void	usage()
 {
-    std::cout << "USAGE:" << std::endl
-              << "        fxplot [-device=terminal|printer|file:file_name] <session file>" << std::endl ;
-    std::cout.flush();
+				std::cout	<<	"USAGE:"	<<	std::endl
+														<<	"								fxplot	[-device=terminal|printer|file:file_name]	<session	file>"	<<	std::endl	;
+				std::cout.flush();
 }
 
-int main(int argc, char* argv[] ) {
+int	main(int	argc,	char*	argv[]	)	{
 
-    FplotArgs* fplot_args;
+				FplotArgs*	fplot_args;
 
-    XEvent event;
+				XEvent	event;
 
-    XtAppContext app;
-
-    DPM_parse_tree *session_parse_tree;
-    DPM_session *session;
-    xmlNode *root_node;
-
-    int n_product_files;
-    int n_products;
-    int product_ix;
-
-    const char *const_temp_str;
+				XtAppContext	app;
+
+				DPM_parse_tree	*session_parse_tree;
+				DPM_session	*session;
+				xmlNode	*root_node;
+
+				int	n_product_files;
+				int	n_products;
+				int	product_ix;
+
+				const	char	*const_temp_str;
 
-    try {
-        fplot_args = new FplotArgs(argc, argv);
-    } catch (std::invalid_argument) {
-        usage();
-        exit(1);
-    }
-
-    XtSetLanguageProc (NULL, NULL, NULL);
-
-    toplevel = XtVaAppInitialize (&app, "Fxplot", NULL, 0, &argc, argv, NULL, NULL );
-
-    main_window = Create_Main_Window( toplevel);
-
-    view = new fermi_view(toplevel);
-
-    // ============================================
-    // Create the DPM_session object.
-    // ============================================
-
-    try {
-        session_parse_tree = new DPM_parse_tree( fplot_args->session_file);
-    } catch (std::invalid_argument) {
-        std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
-        exit(1);
-    }
-
-    root_node = session_parse_tree->getRootNode();
-
-    try {
-        session = new DPM_session( NULL, root_node);
-    } catch (std::invalid_argument) {
-        std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
-        exit(1);
-    }
-
-    delete session_parse_tree;
-
-    // ============================================
-    // Create the data products listed in the DPM_session.
-    // ============================================
-    n_product_files = (int)session->product_file_list.size();
-
-    for (product_ix = 0; product_ix < n_product_files; product_ix++ ) {
-        DPC_product *product;
-        char product_file_fullname[1024];
-
-        const char *product_file_name = session->product_file_list[product_ix];
-
-        if (file_exists( product_file_name)) {
-             strcpy(product_file_fullname, product_file_name );
-        } else {
-             // Otherwise assume that the product file location is
-             // relative to that of the session file.
-             copy_prefix(product_file_fullname, fplot_args->session_file);
-             strcat(product_file_fullname, "/");
-             strcat(product_file_fullname, product_file_name);
-        }
-
-        try {
-            product = new DPC_product( session, product_file_fullname);
-        } catch  (std::invalid_argument) {
-            std::cerr << "ERROR: Unable to create the product specified by file: \"" <<
-                product_file_name << "\"" << std::endl;
-            product = NULL;
-        }
-
-        if (product != NULL) {
-            char *temp_str;
-            XmString product_xm_str;
-
-            product_list.push_back( product);
-
-            ProductViewNode* X_Product = (ProductViewNode*)product->render( view);
-            x_product_list.push_back(X_Product);
-
-            if ((const_temp_str = product->getTitle()) == NULL) {
-                char charbuf[256];
-                char *p;
-                snprintf( charbuf, sizeof(charbuf), "%s", product_file_name);
-                if ((p=(char *)strrchr( product_file_name,'/')) != NULL) {
-                    strncpy(charbuf, p+1, sizeof(charbuf)-(size_t)1);
-                } else {
-                    strncpy(charbuf, product_file_name, sizeof(charbuf)-(size_t)1);
-                }
-                temp_str = strdup( charbuf);
-            } else {
-                temp_str = strdup( const_temp_str );
-            }
-            product_xm_str = XmStringCreateLocalized( temp_str );
-            free(temp_str);
-            XmListAddItem(product_list_widget, product_xm_str, 0);
-        }
-    }
-
-    if (fplot_args->device) {
-        session->setDevice(fplot_args->device);
-    }
-
-    if ( session->getDevice() == DPM_session::PRINTER || session->getDevice() == DPM_session::FILE) {
-
-        n_products = (int)x_product_list.size();
-        for (product_ix = 0; product_ix < n_products; product_ix++ ) {
-            ProductViewNode *x_product;
-            x_product = x_product_list[product_ix];
-            if (session->getDevice() == DPM_session::PRINTER) {
-                x_product->print();
-            } else {
-                x_product->generate_PS(session->getDeviceFileName());
-            }
-        }
-
-    } else {
-        // Make the main app window visible.
-        XtRealizeWidget(toplevel);
-        XRaiseWindow( XtDisplay(main_window),XtWindow(main_window));
-
-        bool pages_exist = false;
-
-        // Make the pages and tables of each product visible.
-        n_products = (int)product_list.size();
-        for (product_ix = 0; product_ix < n_products; product_ix++ ) {
-            DPC_product *product;
-            product = product_list[product_ix];
-            product->notify( view, fermi_view::SHOW_WINDOW );
-            if (product->NumberOfPages() > 0) {
-            	pages_exist = true;
-            }
-        }
-
-        if (pages_exist) {
-        	// if there are plots, add the callback for the button
-        	XtAddCallback(make_pdf_button, XmNactivateCallback, pdf_confirm, NULL);
-        	XtAddCallback(print_button, XmNactivateCallback, print_confirm, NULL);
-        } else {
-        	// if there is no plot, don't manage this as it's only for plots not tables
-        	XtUnmanageChild(make_pdf_button);
-        	XtUnmanageChild(print_button);
-        }
-
-        while (run_app) {
-            XtAppNextEvent(app, &event);
-            XtDispatchEvent(&event);
-        }
-    }
-
-    // Delete the view and all of the viewable stuff that it created.
-    delete view;
-
-    // Delete the list of DPC_product objects
-    n_products = (int)product_list.size();
-    for (product_ix = 0; product_ix < n_products; product_ix++ ) {
-        DPC_product *product;
-        product = product_list[product_ix];
-        delete product;
-    }
-
-    // Since each ProductViewNode of x_product_list is not created by new here,
-    // only clearing the vector and underlying destructors should be called.
-    x_product_list.clear();
-
-    return 0;
+				try	{
+								fplot_args	=	new	FplotArgs(argc,	argv);
+				}	catch	(std::invalid_argument)	{
+								usage();
+								exit(1);
+				}
+
+				XtSetLanguageProc	(NULL,	NULL,	NULL);
+
+				toplevel	=	XtVaAppInitialize	(&app,	"Fxplot",	NULL,	0,	&argc,	argv,	NULL,	NULL	);
+
+				main_window	=	Create_Main_Window(	toplevel);
+
+				view	=	new	fermi_view(toplevel);
+
+				//	============================================
+				//	Create	the	DPM_session	object.
+				//	============================================
+
+				try	{
+								session_parse_tree	=	new	DPM_parse_tree(	fplot_args->session_file);
+				}	catch	(std::invalid_argument)	{
+								std::cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	std::endl;
+								exit(1);
+				}
+
+				root_node	=	session_parse_tree->getRootNode();
+
+				try	{
+								session	=	new	DPM_session(	NULL,	root_node);
+				}	catch	(std::invalid_argument)	{
+								std::cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	std::endl;
+								exit(1);
+				}
+
+				delete	session_parse_tree;
+
+				//	============================================
+				//	Create	the	data	products	listed	in	the	DPM_session.
+				//	============================================
+				n_product_files	=	(int)session->product_file_list.size();
+
+				for	(product_ix	=	0;	product_ix	<	n_product_files;	product_ix++	)	{
+								DPC_product	*product;
+								char	product_file_fullname[1024];
+
+								const	char	*product_file_name	=	session->product_file_list[product_ix];
+
+								if	(file_exists(	product_file_name))	{
+													strcpy(product_file_fullname,	product_file_name	);
+								}	else	{
+													//	Otherwise	assume	that	the	product	file	location	is
+													//	relative	to	that	of	the	session	file.
+													copy_prefix(product_file_fullname,	fplot_args->session_file);
+													strcat(product_file_fullname,	"/");
+													strcat(product_file_fullname,	product_file_name);
+								}
+
+								try	{
+												product	=	new	DPC_product(	session,	product_file_fullname);
+								}	catch		(std::invalid_argument)	{
+												std::cerr	<<	"ERROR:	Unable	to	create	the	product	specified	by	file:	\""	<<
+																product_file_name	<<	"\""	<<	std::endl;
+												product	=	NULL;
+								}
+
+								if	(product	!=	NULL)	{
+												char	*temp_str;
+												XmString	product_xm_str;
+
+												product_list.push_back(	product);
+
+												ProductViewNode*	X_Product	=	(ProductViewNode*)product->render(	view);
+												x_product_list.push_back(X_Product);
+
+												if	((const_temp_str	=	product->getTitle())	==	NULL)	{
+																char	charbuf[256];
+																char	*p;
+																snprintf(	charbuf,	sizeof(charbuf),	"%s",	product_file_name);
+																if	((p=(char	*)strrchr(	product_file_name,'/'))	!=	NULL)	{
+																				strncpy(charbuf,	p+1,	sizeof(charbuf)-(size_t)1);
+																}	else	{
+																				strncpy(charbuf,	product_file_name,	sizeof(charbuf)-(size_t)1);
+																}
+																temp_str	=	strdup(	charbuf);
+												}	else	{
+																temp_str	=	strdup(	const_temp_str	);
+												}
+												product_xm_str	=	XmStringCreateLocalized(	temp_str	);
+												free(temp_str);
+												XmListAddItem(product_list_widget,	product_xm_str,	0);
+								}
+				}
+
+				if	(fplot_args->device)	{
+								session->setDevice(fplot_args->device);
+				}
+
+				if	(	session->getDevice()	==	DPM_session::PRINTER	||	session->getDevice()	==	DPM_session::FILE)	{
+
+								n_products	=	(int)x_product_list.size();
+								for	(product_ix	=	0;	product_ix	<	n_products;	product_ix++	)	{
+												ProductViewNode	*x_product;
+												x_product	=	x_product_list[product_ix];
+												if	(session->getDevice()	==	DPM_session::PRINTER)	{
+																x_product->print();
+												}	else	{
+																x_product->generate_PS(session->getDeviceFileName());
+												}
+								}
+
+				}	else	{
+								//	Make	the	main	app	window	visible.
+								XtRealizeWidget(toplevel);
+								XRaiseWindow(	XtDisplay(main_window),XtWindow(main_window));
+
+								bool	pages_exist	=	false;
+
+								//	Make	the	pages	and	tables	of	each	product	visible.
+								n_products	=	(int)product_list.size();
+								for	(product_ix	=	0;	product_ix	<	n_products;	product_ix++	)	{
+												DPC_product	*product;
+												product	=	product_list[product_ix];
+												product->notify(	view,	fermi_view::SHOW_WINDOW	);
+												if	(product->NumberOfPages()	>	0)	{
+													pages_exist	=	true;
+												}
+								}
+
+								if	(pages_exist)	{
+									//	if	there	are	plots,	add	the	callback	for	the	button
+									XtAddCallback(make_pdf_button,	XmNactivateCallback,	pdf_confirm,	NULL);
+									XtAddCallback(print_button,	XmNactivateCallback,	print_confirm,	NULL);
+								}	else	{
+									//	if	there	is	no	plot,	don't	manage	this	as	it's	only	for	plots	not	tables
+									XtUnmanageChild(make_pdf_button);
+									XtUnmanageChild(print_button);
+								}
+
+								while	(run_app)	{
+												XtAppNextEvent(app,	&event);
+												XtDispatchEvent(&event);
+								}
+				}
+
+				//	Delete	the	view	and	all	of	the	viewable	stuff	that	it	created.
+				delete	view;
+
+				//	Delete	the	list	of	DPC_product	objects
+				n_products	=	(int)product_list.size();
+				for	(product_ix	=	0;	product_ix	<	n_products;	product_ix++	)	{
+								DPC_product	*product;
+								product	=	product_list[product_ix];
+								delete	product;
+				}
+
+				//	Since	each	ProductViewNode	of	x_product_list	is	not	created	by	new	here,
+				//	only	clearing	the	vector	and	underlying	destructors	should	be	called.
+				x_product_list.clear();
+
+				return	0;
 }
 
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
index f7b33c680..1f4fbae6b 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/page_view_node.cpp
@@ -1,572 +1,572 @@
 
-#include <Xm/Xm.h>
-#include <Xm/DialogS.h>
-#include <Xm/Form.h>
-#include <Xm/PushB.h>
-#include <Xm/ToggleBG.h>
-#include <Xm/LabelG.h>
-#include <Xm/FileSB.h>
-#include <Xm/SelectioB.h>
-#include <Xm/MessageB.h>
+#include	<Xm/Xm.h>
+#include	<Xm/DialogS.h>
+#include	<Xm/Form.h>
+#include	<Xm/PushB.h>
+#include	<Xm/ToggleBG.h>
+#include	<Xm/LabelG.h>
+#include	<Xm/FileSB.h>
+#include	<Xm/SelectioB.h>
+#include	<Xm/MessageB.h>
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-#include <stdio.h>    // for snprintf
-#include <stdlib.h>
+#include	<stdio.h>				//	for	snprintf
+#include	<stdlib.h>
 
-#include "page_view_node.hh"
-#include "post_dialog.h"
+#include	"page_view_node.hh"
+#include	"post_dialog.h"
 
-// FRACTION_BASE is used by form widgets. I chose 2520 because
-// it is evenly divisable by 10,9,8,7,6,5,4,3 and 2.
-#define FRACTION_BASE 2520
+//	FRACTION_BASE	is	used	by	form	widgets.	I	chose	2520	because
+//	it	is	evenly	divisable	by	10,9,8,7,6,5,4,3	and	2.
+#define	FRACTION_BASE	2520
 
-// CALLBACK
-static void print_page_cb(Widget w, XtPointer client_data, XtPointer call_data) {
+//	CALLBACK
+static	void	print_page_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    PageViewNode* page_view_node = (PageViewNode *)client_data;
-    page_view_node->print();
+				PageViewNode*	page_view_node	=	(PageViewNode	*)client_data;
+				page_view_node->print();
 
 }
 
-static void layout_page (PageViewNode* page_view_node ) {
-
-   int i,j;
-   int n_horizontal_cells, n_vertical_cells;
-   int cell_width, cell_height;
-   int number_of_plots;
-   int number_of_selected_plots = 0;
-   int number_of_display_plots = 0;
-
-   number_of_plots = (int)page_view_node->plot_node_list.size();
-
-   // Count the number of selected plots.
-   for (i=0; i<number_of_plots; i++) {
-        XtUnmanageChild( page_view_node->plot_node_list[i]->main_form_widget);
-        if ( page_view_node->plot_node_list[i]->selected ) {
-            number_of_selected_plots ++;
-        }
-   }
-
-   // If the user has not selected any plots
-   if ( number_of_selected_plots == 0) {
-       // then we want to display all of them
-       number_of_display_plots = number_of_plots;
-   } else {
-       // otherwise we want to display only the selected plots.
-       number_of_display_plots = number_of_selected_plots;
-   }
-
-   page_view_node->get_cell_geometry( number_of_display_plots, n_horizontal_cells, n_vertical_cells);
-
-   cell_width  = FRACTION_BASE / n_horizontal_cells;
-   cell_height = FRACTION_BASE / n_vertical_cells;
-
-   j=0;
-   for (i=0; i<number_of_plots; i++) {
-        PlotViewNode* plot_view_node;
-        int x,y;
-
-        plot_view_node = page_view_node->plot_node_list[i];
-
-        if ((number_of_selected_plots == 0) || plot_view_node->selected ) {
-             y = (j / n_horizontal_cells);
-             x = (j % n_horizontal_cells);
-
-             // if odd number of plots in 2 columns, span last plot over both columns (like Trick7)
-             int right_pos;
-             right_pos = (x+1) * cell_width;
-             if ( (n_horizontal_cells==2) && (number_of_plots % 2) && (j==number_of_plots-1) ) {
-                 right_pos = 2 * cell_width;
-             }
-
-             XtVaSetValues( plot_view_node->main_form_widget,
-                            XmNtopAttachment,    XmATTACH_POSITION,
-                            XmNtopPosition,      y * cell_height,
-                            XmNleftAttachment,   XmATTACH_POSITION,
-                            XmNleftPosition,     x * cell_width,
-                            XmNrightAttachment,  XmATTACH_POSITION,
-                            XmNrightPosition,    right_pos,
-                            XmNbottomAttachment, XmATTACH_POSITION,
-                            XmNbottomPosition,   (y+1) * cell_height,
-                            NULL);
-
-             XtManageChild( plot_view_node->main_form_widget);
-             j++;
-
-             plot_view_node->selected = 0;
-             XmToggleButtonGadgetSetState( plot_view_node->toggle4, False, False);
-         }
-    }
+static	void	layout_page	(PageViewNode*	page_view_node	)	{
+
+			int	i,j;
+			int	n_horizontal_cells,	n_vertical_cells;
+			int	cell_width,	cell_height;
+			int	number_of_plots;
+			int	number_of_selected_plots	=	0;
+			int	number_of_display_plots	=	0;
+
+			number_of_plots	=	(int)page_view_node->plot_node_list.size();
+
+			//	Count	the	number	of	selected	plots.
+			for	(i=0;	i<number_of_plots;	i++)	{
+								XtUnmanageChild(	page_view_node->plot_node_list[i]->main_form_widget);
+								if	(	page_view_node->plot_node_list[i]->selected	)	{
+												number_of_selected_plots	++;
+								}
+			}
+
+			//	If	the	user	has	not	selected	any	plots
+			if	(	number_of_selected_plots	==	0)	{
+							//	then	we	want	to	display	all	of	them
+							number_of_display_plots	=	number_of_plots;
+			}	else	{
+							//	otherwise	we	want	to	display	only	the	selected	plots.
+							number_of_display_plots	=	number_of_selected_plots;
+			}
+
+			page_view_node->get_cell_geometry(	number_of_display_plots,	n_horizontal_cells,	n_vertical_cells);
+
+			cell_width		=	FRACTION_BASE	/	n_horizontal_cells;
+			cell_height	=	FRACTION_BASE	/	n_vertical_cells;
+
+			j=0;
+			for	(i=0;	i<number_of_plots;	i++)	{
+								PlotViewNode*	plot_view_node;
+								int	x,y;
+
+								plot_view_node	=	page_view_node->plot_node_list[i];
+
+								if	((number_of_selected_plots	==	0)	||	plot_view_node->selected	)	{
+													y	=	(j	/	n_horizontal_cells);
+													x	=	(j	%	n_horizontal_cells);
+
+													//	if	odd	number	of	plots	in	2	columns,	span	last	plot	over	both	columns	(like	Trick7)
+													int	right_pos;
+													right_pos	=	(x+1)	*	cell_width;
+													if	(	(n_horizontal_cells==2)	&&	(number_of_plots	%	2)	&&	(j==number_of_plots-1)	)	{
+																	right_pos	=	2	*	cell_width;
+													}
+
+													XtVaSetValues(	plot_view_node->main_form_widget,
+																												XmNtopAttachment,				XmATTACH_POSITION,
+																												XmNtopPosition,						y	*	cell_height,
+																												XmNleftAttachment,			XmATTACH_POSITION,
+																												XmNleftPosition,					x	*	cell_width,
+																												XmNrightAttachment,		XmATTACH_POSITION,
+																												XmNrightPosition,				right_pos,
+																												XmNbottomAttachment,	XmATTACH_POSITION,
+																												XmNbottomPosition,			(y+1)	*	cell_height,
+																												NULL);
+
+													XtManageChild(	plot_view_node->main_form_widget);
+													j++;
+
+													plot_view_node->selected	=	0;
+													XmToggleButtonGadgetSetState(	plot_view_node->toggle4,	False,	False);
+									}
+				}
 }
 
-// CALLBACK
-static void expand_plot_cb(Widget w, XtPointer client_data, XtPointer call_data) {
+//	CALLBACK
+static	void	expand_plot_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    PageViewNode* page_view_node = (PageViewNode *)client_data;
-    layout_page ( page_view_node);
+				PageViewNode*	page_view_node	=	(PageViewNode	*)client_data;
+				layout_page	(	page_view_node);
 }
 
-// CALLBACK
-void PageViewNode::pdf_cb(Widget w, XtPointer client_data, XtPointer call_data) {
+//	CALLBACK
+void	PageViewNode::pdf_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-	Widget dialog ;
-	XmString msg ;
-	long pageIdx ;
-	int nargs ;
-	Arg wargs[5];
-	PageViewNode* page_view_node = (PageViewNode *)client_data;
-	// Make sure that user has ps2pdf
-	if ( ! page_view_node->exists_program( "ps2pdf" ) ) {
+	Widget	dialog	;
+	XmString	msg	;
+	long	pageIdx	;
+	int	nargs	;
+	Arg	wargs[5];
+	PageViewNode*	page_view_node	=	(PageViewNode	*)client_data;
+	//	Make	sure	that	user	has	ps2pdf
+	if	(	!	page_view_node->exists_program(	"ps2pdf"	)	)	{
 
-	    msg = XmStringCreateLocalized((char*)"Couldn't find utility ps2pdf. Can't create pdf files.");
+					msg	=	XmStringCreateLocalized((char*)"Couldn't	find	utility	ps2pdf.	Can't	create	pdf	files.");
 
-	    nargs = 0 ;
-	    XtSetArg(wargs[nargs], XmNmessageString, msg);
-	    nargs++ ;
+					nargs	=	0	;
+					XtSetArg(wargs[nargs],	XmNmessageString,	msg);
+					nargs++	;
 
-	    dialog = XmCreateErrorDialog( page_view_node->toplevel, (char*)"ps2pdf_not_found", wargs, nargs ) ;
+					dialog	=	XmCreateErrorDialog(	page_view_node->toplevel,	(char*)"ps2pdf_not_found",	wargs,	nargs	)	;
 
-	    XtUnmanageChild(XmMessageBoxGetChild( dialog, XmDIALOG_CANCEL_BUTTON));
-	    XtUnmanageChild(XmMessageBoxGetChild( dialog, XmDIALOG_HELP_BUTTON));
+					XtUnmanageChild(XmMessageBoxGetChild(	dialog,	XmDIALOG_CANCEL_BUTTON));
+					XtUnmanageChild(XmMessageBoxGetChild(	dialog,	XmDIALOG_HELP_BUTTON));
 
-	    XtManageChild(dialog);
+					XtManageChild(dialog);
 
-	    XmStringFree(msg);
+					XmStringFree(msg);
 
-	    return ;
-    }
+					return	;
+				}
 
-	// Pass page index down to selection pdfFileCB
-	XtVaGetValues(w, XmNuserData, (XtPointer *) & pageIdx, NULL);
-	nargs = 0 ;
-	XtSetArg(wargs[nargs], XmNuserData, (XtPointer)pageIdx);
-	nargs++ ;
+	//	Pass	page	index	down	to	selection	pdfFileCB
+	XtVaGetValues(w,	XmNuserData,	(XtPointer	*)	&	pageIdx,	NULL);
+	nargs	=	0	;
+	XtSetArg(wargs[nargs],	XmNuserData,	(XtPointer)pageIdx);
+	nargs++	;
 
-	dialog = XmCreateFileSelectionDialog(page_view_node->toplevel, (char*)"filesb", wargs, nargs);
+	dialog	=	XmCreateFileSelectionDialog(page_view_node->toplevel,	(char*)"filesb",	wargs,	nargs);
 
-	XtAddCallback(dialog, XmNcancelCallback, pdf_cancel_cb, (XtPointer) client_data);
-	XtAddCallback(dialog, XmNokCallback, pdf_file_cb, (XtPointer) client_data);
-	XtSetSensitive( XmSelectionBoxGetChild(dialog, XmDIALOG_HELP_BUTTON), False);
-    XtManageChild(dialog);
+	XtAddCallback(dialog,	XmNcancelCallback,	pdf_cancel_cb,	(XtPointer)	client_data);
+	XtAddCallback(dialog,	XmNokCallback,	pdf_file_cb,	(XtPointer)	client_data);
+	XtSetSensitive(	XmSelectionBoxGetChild(dialog,	XmDIALOG_HELP_BUTTON),	False);
+				XtManageChild(dialog);
 
 	return;
 }
 
 
-void PageViewNode::pdf_cancel_cb(Widget w, XtPointer client_data, XtPointer call_data) {
+void	PageViewNode::pdf_cancel_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    XtPopdown( XtParent( w ) ) ;
-    return ;
+				XtPopdown(	XtParent(	w	)	)	;
+				return	;
 }
 
-void PageViewNode::pdf_file_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-
-    char tmp_file[256];
-    char cmd[1024];
-    char* file_name ;
-    long long pageIdx;
-    PageViewNode* page_view_node = (PageViewNode *)client_data;
-    XmFileSelectionBoxCallbackStruct *cbs = (XmFileSelectionBoxCallbackStruct *) call_data ;
-
-    if ( ! XmStringGetLtoR(cbs->value, XmFONTLIST_DEFAULT_TAG, &file_name)){
-        // Internal error (p.182 Volume 6A in the X Bible!)
-        return ;
-    }
-
-    if ( !*file_name ) { /* Nothing typed */
-        XtFree(file_name);
-        return;
-    }
-
-    if (!access("/tmp", W_OK)) {
-        strncpy(tmp_file, "/tmp/dpx_postscript_XXXXXX", sizeof(tmp_file));
-    } else if (!access("/var/tmp", W_OK)) {
-        strncpy(tmp_file, "/var/tmp/dpx_postscript_XXXXXX", sizeof(tmp_file));
-    } else {
-        post_dialog( page_view_node->toplevel, XmDIALOG_ERROR,
-                "Unable to access /tmp or /var/tmp, where a temporary\n"
-                "Postscript file (that represents your print out) needs\n"
-                "to be generated. Please check your file permissions.\n");
-        return;
-    }
-
-    if (mkstemp( tmp_file) < 0) {
-        post_dialog( page_view_node->toplevel, XmDIALOG_ERROR,
-                "Unable to generate a temporary file name for some mind boggling reason." );
-        return;
-    }
-
-    // Get page index to create pdf file of
-    XtVaGetValues(w, XmNuserData, (XtPointer *) & pageIdx, NULL);
-
-    page_view_node->generate_PS(tmp_file);
-
-    // Convert PS tmp file to PDF
-    snprintf(cmd, sizeof(cmd), "ps2pdf %s %s", tmp_file, file_name);
-    system(cmd);
-
-    XtFree(file_name);
-
-    XtPopdown( XtParent( w ) ) ;
-
-    return ;
+void	PageViewNode::pdf_file_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+
+				char	tmp_file[256];
+				char	cmd[1024];
+				char*	file_name	;
+				long	long	pageIdx;
+				PageViewNode*	page_view_node	=	(PageViewNode	*)client_data;
+				XmFileSelectionBoxCallbackStruct	*cbs	=	(XmFileSelectionBoxCallbackStruct	*)	call_data	;
+
+				if	(	!	XmStringGetLtoR(cbs->value,	XmFONTLIST_DEFAULT_TAG,	&file_name)){
+								//	Internal	error	(p.182	Volume	6A	in	the	X	Bible!)
+								return	;
+				}
+
+				if	(	!*file_name	)	{	/*	Nothing	typed	*/
+								XtFree(file_name);
+								return;
+				}
+
+				if	(!access("/tmp",	W_OK))	{
+								strncpy(tmp_file,	"/tmp/dpx_postscript_XXXXXX",	sizeof(tmp_file));
+				}	else	if	(!access("/var/tmp",	W_OK))	{
+								strncpy(tmp_file,	"/var/tmp/dpx_postscript_XXXXXX",	sizeof(tmp_file));
+				}	else	{
+								post_dialog(	page_view_node->toplevel,	XmDIALOG_ERROR,
+																"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+																"Postscript	file	(that	represents	your	print	out)	needs\n"
+																"to	be	generated.	Please	check	your	file	permissions.\n");
+								return;
+				}
+
+				if	(mkstemp(	tmp_file)	<	0)	{
+								post_dialog(	page_view_node->toplevel,	XmDIALOG_ERROR,
+																"Unable	to	generate	a	temporary	file	name	for	some	mind	boggling	reason."	);
+								return;
+				}
+
+				//	Get	page	index	to	create	pdf	file	of
+				XtVaGetValues(w,	XmNuserData,	(XtPointer	*)	&	pageIdx,	NULL);
+
+				page_view_node->generate_PS(tmp_file);
+
+				//	Convert	PS	tmp	file	to	PDF
+				snprintf(cmd,	sizeof(cmd),	"ps2pdf	%s	%s",	tmp_file,	file_name);
+				system(cmd);
+
+				XtFree(file_name);
+
+				XtPopdown(	XtParent(	w	)	)	;
+
+				return	;
 }
 
-int PageViewNode::exists_program(const char *programName)
+int	PageViewNode::exists_program(const	char	*programName)
 {
-    char *getPath;
-    char path[1024];
-    char *tokptr;
-    char *strptr;
-    char *program;
-
-    // if string passed in is null, bail
-    if (programName == NULL) {
-        return (0);
-    }
-    // Search user $PATH for program
-    // (have to do this strange copy since getenv
-    // returns a pointer and strtok messes with environment)
-    getPath = getenv("PATH");
-    strcpy(path, getPath);
-
-    strptr = path;
-    while ((tokptr = strtok(strptr, ":")) != NULL) {
-        size_t program_len = strlen(tokptr) + strlen(programName) + 2;
-        program = (char *) malloc( program_len);
-        snprintf(program, program_len, "%s/%s", tokptr, programName);
-        if (access(program, F_OK | X_OK) == 0) {
-            free(program);
-            return (1);
-        }
-        free(program);
-        strptr = NULL;
-    }
-
-    // Found with out any need for $PATH
-    if (access(programName, F_OK | X_OK) == 0) {
-        return (1);
-    }
-    // Not found
-    return (0);
+				char	*getPath;
+				char	path[1024];
+				char	*tokptr;
+				char	*strptr;
+				char	*program;
+
+				//	if	string	passed	in	is	null,	bail
+				if	(programName	==	NULL)	{
+								return	(0);
+				}
+				//	Search	user	$PATH	for	program
+				//	(have	to	do	this	strange	copy	since	getenv
+				//	returns	a	pointer	and	strtok	messes	with	environment)
+				getPath	=	getenv("PATH");
+				strcpy(path,	getPath);
+
+				strptr	=	path;
+				while	((tokptr	=	strtok(strptr,	":"))	!=	NULL)	{
+								size_t	program_len	=	strlen(tokptr)	+	strlen(programName)	+	2;
+								program	=	(char	*)	malloc(	program_len);
+								snprintf(program,	program_len,	"%s/%s",	tokptr,	programName);
+								if	(access(program,	F_OK	|	X_OK)	==	0)	{
+												free(program);
+												return	(1);
+								}
+								free(program);
+								strptr	=	NULL;
+				}
+
+				//	Found	with	out	any	need	for	$PATH
+				if	(access(programName,	F_OK	|	X_OK)	==	0)	{
+								return	(1);
+				}
+				//	Not	found
+				return	(0);
 }
 
-// CLASS VARIABLE INITIALIZATION
-int PageViewNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	PageViewNode::instance_count	=	0;
 
 
-// DESTRUCTOR
-PageViewNode::~PageViewNode() {
+//	DESTRUCTOR
+PageViewNode::~PageViewNode()	{
 
-    PlotViewNode *plot_view_node;
-    int n,i;
+				PlotViewNode	*plot_view_node;
+				int	n,i;
 
-    #ifdef DEBUG
-    std::cout << "PageViewNode DESTRUCTOR." << std::endl;
-    #endif
+				#ifdef	DEBUG
+				std::cout	<<	"PageViewNode	DESTRUCTOR."	<<	std::endl;
+				#endif
 
-    n = (int)plot_node_list.size();
-    for (i=0 ; i<n; i++ ) {
-        plot_view_node = plot_node_list[i];
-        if (plot_view_node) { delete plot_view_node; }
-    }
+				n	=	(int)plot_node_list.size();
+				for	(i=0	;	i<n;	i++	)	{
+								plot_view_node	=	plot_node_list[i];
+								if	(plot_view_node)	{	delete	plot_view_node;	}
+				}
 
-    XtDestroyWidget(plots_form_widget);
-    XtDestroyWidget(trick_label);
-    XtDestroyWidget(expand_plot_button_widget);
-    XtDestroyWidget(print_button_widget);
-    XtDestroyWidget(pdf_button_widget);
-    XtDestroyWidget(ctrls_form_widget);
-    XtDestroyWidget(main_form_widget);
-    XtDestroyWidget(dialog_shell_widget);
+				XtDestroyWidget(plots_form_widget);
+				XtDestroyWidget(trick_label);
+				XtDestroyWidget(expand_plot_button_widget);
+				XtDestroyWidget(print_button_widget);
+				XtDestroyWidget(pdf_button_widget);
+				XtDestroyWidget(ctrls_form_widget);
+				XtDestroyWidget(main_form_widget);
+				XtDestroyWidget(dialog_shell_widget);
 
 }
 
 
-// CONSTRUCTOR
-PageViewNode::PageViewNode(Widget Toplevel, DPC_page* Page, int Xpos, int Ypos, int Width, int Height) {
-
-    Arg wargs[50];
-    int nargs;
-
-    const char *page_title;
-
-    char charbuf[256];
-    char default_page_title[256];
-
-    const char *ncells_s;
-    Pixel fg,bg;
-    Pixmap pixmap;
-
-    page = Page;
-    toplevel = Toplevel;
-
-    if ((ncells_s = Page->getAttribute("hcells")) != NULL) {
-        n_hcells = atoi(ncells_s);
-        if ((n_hcells < 0)||(n_hcells > 10)) {
-        post_dialog( toplevel, XmDIALOG_ERROR,
-            "Value for hcells attribute is out of range.\n"
-            "Valid range for hcells is 1 .. 10.\n"
-            "Ignoring hcells value.\n" );
-            n_hcells = 1;
-        }
-    } else {
-        n_hcells = 1;
-    }
-
-    if ((ncells_s = Page->getAttribute("vcells")) != NULL) {
-        n_vcells = atoi(ncells_s);
-        if ((n_vcells < 0)||(n_vcells > 10)) {
-        post_dialog( toplevel, XmDIALOG_ERROR,
-            "Value for vcells attribute is out of range.\n"
-            "Valid range for vcells is 1 .. 10.\n"
-            "Ignoring vcells value.\n");
-            n_vcells = 1;
-        }
-    } else {
-        n_vcells = 1;
-    }
-
-    if ((page_title = Page->getTitle()) == NULL ) {
-        snprintf( default_page_title, sizeof(default_page_title), "Page %d", instance_count);
-        page_title = default_page_title;
-    }
-    title = strdup(page_title);
-
-    // ---------------------------
-    // Create the page widget name.
-    // ---------------------------
-    snprintf( charbuf, sizeof(charbuf), "Page_dialog_%d", instance_count);
-
-    // --------------------------------------
-    // Create the dialog shell for this page.
-    // --------------------------------------
-    nargs = 0;
-    XtSetArg( wargs[nargs], XmNtitle, page_title ); nargs++;
-    XtSetArg( wargs[nargs], XmNmappedWhenManaged, False ); nargs++;
-    dialog_shell_widget = XmCreateDialogShell( toplevel, charbuf, wargs, nargs);
-
-    // ----------------------------------------------
-    // Create the form manager widget for this page.
-    // ----------------------------------------------
-    main_form_widget = XtVaCreateWidget( "PageForm", xmFormWidgetClass, dialog_shell_widget,
-                                    XmNresizePolicy, XmRESIZE_GROW,
-                                    XmNfractionBase, 10,
-                                    NULL);
-
-    ctrls_form_widget = XtVaCreateManagedWidget( "CtrlsForm", xmFormWidgetClass, main_form_widget,
-                                            XmNresizePolicy,     XmRESIZE_GROW,
-                                            XmNfractionBase,     10,
-                                            XmNtopAttachment,    XmATTACH_FORM,
-                                            XmNleftAttachment,   XmATTACH_FORM,
-                                            XmNrightAttachment,  XmATTACH_FORM,
-                                            XmNbottomAttachment, XmATTACH_NONE,
-                                            NULL);
-
-    XtVaGetValues (ctrls_form_widget, XmNforeground, &fg, XmNbackground, &bg, NULL);
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"print_page.xpm", fg, bg);
-
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        print_button_widget = XtVaCreateManagedWidget( "PrintPage", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNleftAttachment,   XmATTACH_FORM,
-                                                NULL);
-        XtVaSetValues(print_button_widget,
-                      XmNheight, 34,
-                      NULL);
-    } else {
-        print_button_widget = XtVaCreateManagedWidget( "PrintPage", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNleftAttachment,   XmATTACH_FORM,
-                                                XmNlabelType,        XmPIXMAP,
-                                                XmNlabelPixmap,      pixmap,
-                                                NULL);
-    }
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"expand.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        expand_plot_button_widget = XtVaCreateManagedWidget( "Expand", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNleftAttachment,   XmATTACH_WIDGET,
-                                                XmNleftWidget,       print_button_widget,
-                                                NULL);
-        XtVaSetValues(expand_plot_button_widget,
-            		  XmNheight, 34,
-            		  NULL);
-    } else {
-        expand_plot_button_widget = XtVaCreateManagedWidget( "Expand", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNleftAttachment,   XmATTACH_WIDGET,
-                                                XmNleftWidget,       print_button_widget,
-                                                XmNlabelType,        XmPIXMAP,
-                                                XmNlabelPixmap,      pixmap,
-                                                NULL);
-    }
-
-    pdf_button_widget = XtVaCreateManagedWidget( "PDF", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                    XmNleftAttachment,   XmATTACH_WIDGET,
-                                                    XmNleftWidget,       expand_plot_button_widget,
-                                                    NULL);
-    XtVaSetValues(pdf_button_widget,
-    		      XmNwidth, 34,
-    		      XmNheight, 34,
-    		      NULL);
-
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"trick_small.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-         trick_label = XtVaCreateManagedWidget( "Trick", xmLabelGadgetClass, ctrls_form_widget,
-                       XmNrightAttachment,  XmATTACH_FORM,
-                       NULL);
-    } else {
-         trick_label = XtVaCreateManagedWidget( "Trick", xmLabelGadgetClass, ctrls_form_widget,
-                       XmNrightAttachment,  XmATTACH_FORM,
-                       XmNlabelType,        XmPIXMAP,
-                       XmNlabelPixmap,      pixmap,
-                       NULL);
-    }
-
-    XtManageChild(ctrls_form_widget);
-
-    plots_form_widget = XtVaCreateManagedWidget( "PlotsForm", xmFormWidgetClass, main_form_widget,
-                                            XmNresizePolicy,     XmRESIZE_GROW,
-                                            XmNfractionBase,     FRACTION_BASE,
-                                            XmNtopAttachment,    XmATTACH_WIDGET,
-                                            XmNtopWidget,        ctrls_form_widget,
-                                            XmNleftAttachment,   XmATTACH_FORM,
-                                            XmNrightAttachment,  XmATTACH_FORM,
-                                            XmNbottomAttachment, XmATTACH_FORM,
-                                            NULL);
-
-    XtManageChild(main_form_widget);
-
-    XtAddCallback( print_button_widget, XmNactivateCallback, print_page_cb, (XtPointer)this);
-    XtAddCallback( expand_plot_button_widget, XmNactivateCallback, expand_plot_cb, (XtPointer)this);
-    XtAddCallback( pdf_button_widget, XmNactivateCallback, pdf_cb, (XtPointer)this);
-
-    XtVaSetValues(dialog_shell_widget,
-                  XmNx,       Xpos,
-                  XmNy,       Ypos,
-                  XmNwidth,   Width,
-                  XmNheight,  Height,
-                  NULL);
-
-    instance_count ++;
+//	CONSTRUCTOR
+PageViewNode::PageViewNode(Widget	Toplevel,	DPC_page*	Page,	int	Xpos,	int	Ypos,	int	Width,	int	Height)	{
+
+				Arg	wargs[50];
+				int	nargs;
+
+				const	char	*page_title;
+
+				char	charbuf[256];
+				char	default_page_title[256];
+
+				const	char	*ncells_s;
+				Pixel	fg,bg;
+				Pixmap	pixmap;
+
+				page	=	Page;
+				toplevel	=	Toplevel;
+
+				if	((ncells_s	=	Page->getAttribute("hcells"))	!=	NULL)	{
+								n_hcells	=	atoi(ncells_s);
+								if	((n_hcells	<	0)||(n_hcells	>	10))	{
+								post_dialog(	toplevel,	XmDIALOG_ERROR,
+												"Value	for	hcells	attribute	is	out	of	range.\n"
+												"Valid	range	for	hcells	is	1	..	10.\n"
+												"Ignoring	hcells	value.\n"	);
+												n_hcells	=	1;
+								}
+				}	else	{
+								n_hcells	=	1;
+				}
+
+				if	((ncells_s	=	Page->getAttribute("vcells"))	!=	NULL)	{
+								n_vcells	=	atoi(ncells_s);
+								if	((n_vcells	<	0)||(n_vcells	>	10))	{
+								post_dialog(	toplevel,	XmDIALOG_ERROR,
+												"Value	for	vcells	attribute	is	out	of	range.\n"
+												"Valid	range	for	vcells	is	1	..	10.\n"
+												"Ignoring	vcells	value.\n");
+												n_vcells	=	1;
+								}
+				}	else	{
+								n_vcells	=	1;
+				}
+
+				if	((page_title	=	Page->getTitle())	==	NULL	)	{
+								snprintf(	default_page_title,	sizeof(default_page_title),	"Page	%d",	instance_count);
+								page_title	=	default_page_title;
+				}
+				title	=	strdup(page_title);
+
+				//	---------------------------
+				//	Create	the	page	widget	name.
+				//	---------------------------
+				snprintf(	charbuf,	sizeof(charbuf),	"Page_dialog_%d",	instance_count);
+
+				//	--------------------------------------
+				//	Create	the	dialog	shell	for	this	page.
+				//	--------------------------------------
+				nargs	=	0;
+				XtSetArg(	wargs[nargs],	XmNtitle,	page_title	);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNmappedWhenManaged,	False	);	nargs++;
+				dialog_shell_widget	=	XmCreateDialogShell(	toplevel,	charbuf,	wargs,	nargs);
+
+				//	----------------------------------------------
+				//	Create	the	form	manager	widget	for	this	page.
+				//	----------------------------------------------
+				main_form_widget	=	XtVaCreateWidget(	"PageForm",	xmFormWidgetClass,	dialog_shell_widget,
+																																				XmNresizePolicy,	XmRESIZE_GROW,
+																																				XmNfractionBase,	10,
+																																				NULL);
+
+				ctrls_form_widget	=	XtVaCreateManagedWidget(	"CtrlsForm",	xmFormWidgetClass,	main_form_widget,
+																																												XmNresizePolicy,					XmRESIZE_GROW,
+																																												XmNfractionBase,					10,
+																																												XmNtopAttachment,				XmATTACH_FORM,
+																																												XmNleftAttachment,			XmATTACH_FORM,
+																																												XmNrightAttachment,		XmATTACH_FORM,
+																																												XmNbottomAttachment,	XmATTACH_NONE,
+																																												NULL);
+
+				XtVaGetValues	(ctrls_form_widget,	XmNforeground,	&fg,	XmNbackground,	&bg,	NULL);
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"print_page.xpm",	fg,	bg);
+
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								print_button_widget	=	XtVaCreateManagedWidget(	"PrintPage",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNleftAttachment,			XmATTACH_FORM,
+																																																NULL);
+								XtVaSetValues(print_button_widget,
+																						XmNheight,	34,
+																						NULL);
+				}	else	{
+								print_button_widget	=	XtVaCreateManagedWidget(	"PrintPage",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNleftAttachment,			XmATTACH_FORM,
+																																																XmNlabelType,								XmPIXMAP,
+																																																XmNlabelPixmap,						pixmap,
+																																																NULL);
+				}
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"expand.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								expand_plot_button_widget	=	XtVaCreateManagedWidget(	"Expand",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNleftAttachment,			XmATTACH_WIDGET,
+																																																XmNleftWidget,							print_button_widget,
+																																																NULL);
+								XtVaSetValues(expand_plot_button_widget,
+																XmNheight,	34,
+																NULL);
+				}	else	{
+								expand_plot_button_widget	=	XtVaCreateManagedWidget(	"Expand",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNleftAttachment,			XmATTACH_WIDGET,
+																																																XmNleftWidget,							print_button_widget,
+																																																XmNlabelType,								XmPIXMAP,
+																																																XmNlabelPixmap,						pixmap,
+																																																NULL);
+				}
+
+				pdf_button_widget	=	XtVaCreateManagedWidget(	"PDF",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																				XmNleftAttachment,			XmATTACH_WIDGET,
+																																																				XmNleftWidget,							expand_plot_button_widget,
+																																																				NULL);
+				XtVaSetValues(pdf_button_widget,
+												XmNwidth,	34,
+												XmNheight,	34,
+												NULL);
+
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"trick_small.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+									trick_label	=	XtVaCreateManagedWidget(	"Trick",	xmLabelGadgetClass,	ctrls_form_widget,
+																							XmNrightAttachment,		XmATTACH_FORM,
+																							NULL);
+				}	else	{
+									trick_label	=	XtVaCreateManagedWidget(	"Trick",	xmLabelGadgetClass,	ctrls_form_widget,
+																							XmNrightAttachment,		XmATTACH_FORM,
+																							XmNlabelType,								XmPIXMAP,
+																							XmNlabelPixmap,						pixmap,
+																							NULL);
+				}
+
+				XtManageChild(ctrls_form_widget);
+
+				plots_form_widget	=	XtVaCreateManagedWidget(	"PlotsForm",	xmFormWidgetClass,	main_form_widget,
+																																												XmNresizePolicy,					XmRESIZE_GROW,
+																																												XmNfractionBase,					FRACTION_BASE,
+																																												XmNtopAttachment,				XmATTACH_WIDGET,
+																																												XmNtopWidget,								ctrls_form_widget,
+																																												XmNleftAttachment,			XmATTACH_FORM,
+																																												XmNrightAttachment,		XmATTACH_FORM,
+																																												XmNbottomAttachment,	XmATTACH_FORM,
+																																												NULL);
+
+				XtManageChild(main_form_widget);
+
+				XtAddCallback(	print_button_widget,	XmNactivateCallback,	print_page_cb,	(XtPointer)this);
+				XtAddCallback(	expand_plot_button_widget,	XmNactivateCallback,	expand_plot_cb,	(XtPointer)this);
+				XtAddCallback(	pdf_button_widget,	XmNactivateCallback,	pdf_cb,	(XtPointer)this);
+
+				XtVaSetValues(dialog_shell_widget,
+																		XmNx,							Xpos,
+																		XmNy,							Ypos,
+																		XmNwidth,			Width,
+																		XmNheight,		Height,
+																		NULL);
+
+				instance_count	++;
 }
 
-void PageViewNode::finalize() {
+void	PageViewNode::finalize()	{
 
-    layout_page ( this);
+				layout_page	(	this);
 }
 
-void PageViewNode::print() {
-
-    char ps_file_name[256];
-    char system_cmd[256];
-    char *trick_print_cmd;
-    char *trick_printer_name;
-
-    if ((trick_print_cmd = getenv("TRICK_PRINT_CMD")) == NULL) {
-        trick_print_cmd = (char *)"lpr";
-    }
-    trick_printer_name = getenv("TRICK_PRINTER_NAME");
-
-    if (!access("/tmp", W_OK)) {
-        strncpy(ps_file_name, "/tmp/dpx_postscript_XXXXXX", sizeof(ps_file_name));
-    } else if (!access("/var/tmp", W_OK)) {
-        strncpy(ps_file_name, "/var/tmp/dpx_postscript_XXXXXX", sizeof(ps_file_name));
-    } else {
-        post_dialog( toplevel, XmDIALOG_ERROR,
-                "Unable to access /tmp or /var/tmp, where a temporary\n"
-                "Postscript file (that represents your print out) needs\n"
-                "to be generated. Please check your file permissions.\n");
-        return;
-    }
-
-    if (mkstemp( ps_file_name) < 0) {
-        post_dialog( toplevel, XmDIALOG_ERROR,
-                "Unable to generate a temporary file name for some mind boggling reason." );
-        return;
-    }
-
-    // Generate Postscript
-    generate_PS( ps_file_name);
-
-    if (!strcmp(trick_print_cmd, "lpr")) {
-        if ((trick_printer_name == NULL) || (strlen(trick_printer_name) == 0)) {
-            snprintf(system_cmd, sizeof(system_cmd), "%s %s", trick_print_cmd, ps_file_name);
-        } else {
-            snprintf(system_cmd, sizeof(system_cmd), "%s -P %s %s", trick_print_cmd, trick_printer_name, ps_file_name);
-        }
-    } else {
-        snprintf(system_cmd, sizeof(system_cmd), "%s %s", trick_print_cmd, ps_file_name);
-    }
-
-    std::cout << "Printing with command: " << system_cmd << std::endl;
-    system( system_cmd);
+void	PageViewNode::print()	{
+
+				char	ps_file_name[256];
+				char	system_cmd[256];
+				char	*trick_print_cmd;
+				char	*trick_printer_name;
+
+				if	((trick_print_cmd	=	getenv("TRICK_PRINT_CMD"))	==	NULL)	{
+								trick_print_cmd	=	(char	*)"lpr";
+				}
+				trick_printer_name	=	getenv("TRICK_PRINTER_NAME");
+
+				if	(!access("/tmp",	W_OK))	{
+								strncpy(ps_file_name,	"/tmp/dpx_postscript_XXXXXX",	sizeof(ps_file_name));
+				}	else	if	(!access("/var/tmp",	W_OK))	{
+								strncpy(ps_file_name,	"/var/tmp/dpx_postscript_XXXXXX",	sizeof(ps_file_name));
+				}	else	{
+								post_dialog(	toplevel,	XmDIALOG_ERROR,
+																"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+																"Postscript	file	(that	represents	your	print	out)	needs\n"
+																"to	be	generated.	Please	check	your	file	permissions.\n");
+								return;
+				}
+
+				if	(mkstemp(	ps_file_name)	<	0)	{
+								post_dialog(	toplevel,	XmDIALOG_ERROR,
+																"Unable	to	generate	a	temporary	file	name	for	some	mind	boggling	reason."	);
+								return;
+				}
+
+				//	Generate	Postscript
+				generate_PS(	ps_file_name);
+
+				if	(!strcmp(trick_print_cmd,	"lpr"))	{
+								if	((trick_printer_name	==	NULL)	||	(strlen(trick_printer_name)	==	0))	{
+												snprintf(system_cmd,	sizeof(system_cmd),	"%s	%s",	trick_print_cmd,	ps_file_name);
+								}	else	{
+												snprintf(system_cmd,	sizeof(system_cmd),	"%s	-P	%s	%s",	trick_print_cmd,	trick_printer_name,	ps_file_name);
+								}
+				}	else	{
+								snprintf(system_cmd,	sizeof(system_cmd),	"%s	%s",	trick_print_cmd,	ps_file_name);
+				}
+
+				std::cout	<<	"Printing	with	command:	"	<<	system_cmd	<<	std::endl;
+				system(	system_cmd);
 
 }
 
-void PageViewNode::generate_PS(const char* ps_file_name) {
+void	PageViewNode::generate_PS(const	char*	ps_file_name)	{
 
-    // Generate Postscript
-    int i, n_plots ;
-    int n_horizontal_cells, n_vertical_cells;
-    Widget *xy_widget_list;
-    n_plots = (int)plot_node_list.size();
+				//	Generate	Postscript
+				int	i,	n_plots	;
+				int	n_horizontal_cells,	n_vertical_cells;
+				Widget	*xy_widget_list;
+				n_plots	=	(int)plot_node_list.size();
 
-    xy_widget_list = (Widget *)calloc ((size_t)n_plots, sizeof(Widget));
+				xy_widget_list	=	(Widget	*)calloc	((size_t)n_plots,	sizeof(Widget));
 
-    for (i=0; i<n_plots; i++) {
-        PlotViewNode *plot_view_node = plot_node_list[i];
-        xy_widget_list[i] = plot_view_node->xy_widget;
-    }
+				for	(i=0;	i<n_plots;	i++)	{
+								PlotViewNode	*plot_view_node	=	plot_node_list[i];
+								xy_widget_list[i]	=	plot_view_node->xy_widget;
+				}
 
-    get_cell_geometry(n_plots, n_horizontal_cells, n_vertical_cells);
+				get_cell_geometry(n_plots,	n_horizontal_cells,	n_vertical_cells);
 
-    char unconst_filename[256];
-    strncpy( unconst_filename, ps_file_name, sizeof(unconst_filename));
+				char	unconst_filename[256];
+				strncpy(	unconst_filename,	ps_file_name,	sizeof(unconst_filename));
 
-    XYPrintMultiple( xy_widget_list,    /* XY widgets */
-                     0,                 /* landscape */
-                     n_plots,           /* number of plots */
-                     n_vertical_cells,  /* number of rows */
-                     n_horizontal_cells,/* number of columns */
-                     title,             /* page title */
-                     (char *)"",        /* page subtitle */
-                     False,             /* DestroyOldfile */
-                     unconst_filename); /* Postscript file name */
+				XYPrintMultiple(	xy_widget_list,				/*	XY	widgets	*/
+																					0,																	/*	landscape	*/
+																					n_plots,											/*	number	of	plots	*/
+																					n_vertical_cells,		/*	number	of	rows	*/
+																					n_horizontal_cells,/*	number	of	columns	*/
+																					title,													/*	page	title	*/
+																					(char	*)"",								/*	page	subtitle	*/
+																					False,													/*	DestroyOldfile	*/
+																					unconst_filename);	/*	Postscript	file	name	*/
 
-    free(xy_widget_list);
+				free(xy_widget_list);
 }
 
-void PageViewNode::get_cell_geometry( int  number_of_display_plots,
-                                      int& n_horizontal_cells,
-                                      int& n_vertical_cells ) {
-
-   // Set the table dimensions based on hcells and vcells
-   n_horizontal_cells = n_hcells;
-   n_vertical_cells   = n_vcells;
-
-   // If less than 9 plots, arrange them the same way Trick7 did it
-   // if ncells and vcells does not equal the number of plots
-   if (number_of_display_plots > (n_horizontal_cells * n_vertical_cells) ) {
-       if (number_of_display_plots < 9) {
-           if (number_of_display_plots==3) {
-               n_horizontal_cells = 1;
-               n_vertical_cells = 3;
-           } else if (number_of_display_plots==1) {
-               n_vertical_cells = 1;
-               n_horizontal_cells = 1;
-           } else {
-               n_vertical_cells = 2;
-               n_horizontal_cells = (number_of_display_plots / 2) + (number_of_display_plots % 2);
-           }
-       } else while((n_horizontal_cells * n_vertical_cells) < number_of_display_plots ) {
-           if (n_horizontal_cells <= n_vertical_cells) {
-               n_horizontal_cells++;
-           } else {
-               n_vertical_cells++;
-           }
-       }
-   }
+void	PageViewNode::get_cell_geometry(	int		number_of_display_plots,
+																																						int&	n_horizontal_cells,
+																																						int&	n_vertical_cells	)	{
+
+			//	Set	the	table	dimensions	based	on	hcells	and	vcells
+			n_horizontal_cells	=	n_hcells;
+			n_vertical_cells			=	n_vcells;
+
+			//	If	less	than	9	plots,	arrange	them	the	same	way	Trick7	did	it
+			//	if	ncells	and	vcells	does	not	equal	the	number	of	plots
+			if	(number_of_display_plots	>	(n_horizontal_cells	*	n_vertical_cells)	)	{
+							if	(number_of_display_plots	<	9)	{
+											if	(number_of_display_plots==3)	{
+															n_horizontal_cells	=	1;
+															n_vertical_cells	=	3;
+											}	else	if	(number_of_display_plots==1)	{
+															n_vertical_cells	=	1;
+															n_horizontal_cells	=	1;
+											}	else	{
+															n_vertical_cells	=	2;
+															n_horizontal_cells	=	(number_of_display_plots	/	2)	+	(number_of_display_plots	%	2);
+											}
+							}	else	while((n_horizontal_cells	*	n_vertical_cells)	<	number_of_display_plots	)	{
+											if	(n_horizontal_cells	<=	n_vertical_cells)	{
+															n_horizontal_cells++;
+											}	else	{
+															n_vertical_cells++;
+											}
+							}
+			}
 }
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
index da3d68c05..c9492e5be 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/plot_view_node.cpp
@@ -1,543 +1,543 @@
 
-#include <Xm/Xm.h>
-#include <Xm/Form.h>
-#include <Xm/PushB.h>
-#include <Xm/ToggleBG.h>
-#include <math.h>
+#include	<Xm/Xm.h>
+#include	<Xm/Form.h>
+#include	<Xm/PushB.h>
+#include	<Xm/ToggleBG.h>
+#include	<math.h>
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-#include <stdio.h>    // for snprintf
-#include <string.h>   // for strncpy, strcmp, strlen
-#include <stdlib.h>
-#include <unistd.h>
+#include	<stdio.h>				//	for	snprintf
+#include	<string.h>			//	for	strncpy,	strcmp,	strlen
+#include	<stdlib.h>
+#include	<unistd.h>
 
-#include "plot_view_node.hh"
-#include "post_dialog.h"
+#include	"plot_view_node.hh"
+#include	"post_dialog.h"
 
-#ifndef PI
-#define PI 3.1415926535
+#ifndef	PI
+#define	PI	3.1415926535
 #endif
 
-// our line colors for multiple curves on same plot
-#define NUM_COLORS 16
-static const char* colors[NUM_COLORS] = {
-    "#000000",       // black
-    "#ff0000",       // red
-    "#0000ff",       // blue
-    "#00ff00",       // green
-    "#ff00ff",       // magenta
-    "#ffff00",       // yellow
-    "#00ffff",       // cyan
-    "#cc3300",       // burnt orange
-    "#999999",       // gray
-    "#ff99cc",       // pink
-    "#6699ff",       // lt blue
-    "#669966",       // olive green
-    "#660066",       // purple
-    "#ffcc00",       // gold
-    "#ccff00",       // limegreen
-    "#996633",       // brown
+//	our	line	colors	for	multiple	curves	on	same	plot
+#define	NUM_COLORS	16
+static	const	char*	colors[NUM_COLORS]	=	{
+				"#000000",							//	black
+				"#ff0000",							//	red
+				"#0000ff",							//	blue
+				"#00ff00",							//	green
+				"#ff00ff",							//	magenta
+				"#ffff00",							//	yellow
+				"#00ffff",							//	cyan
+				"#cc3300",							//	burnt	orange
+				"#999999",							//	gray
+				"#ff99cc",							//	pink
+				"#6699ff",							//	lt	blue
+				"#669966",							//	olive	green
+				"#660066",							//	purple
+				"#ffcc00",							//	gold
+				"#ccff00",							//	limegreen
+				"#996633",							//	brown
 };
 
-static double dMin(double d1, double d2);
-static double dMax(double d1, double d2);
+static	double	dMin(double	d1,	double	d2);
+static	double	dMax(double	d1,	double	d2);
 
-// CALLBACK
-static void toggle_sel_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-    Boolean val ;
+//	CALLBACK
+static	void	toggle_sel_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				Boolean	val	;
 
-    PlotViewNode* plot_view_node = (PlotViewNode *)client_data;
-    XmToggleButtonCallbackStruct *toggle_data = (XmToggleButtonCallbackStruct *)call_data;
+				PlotViewNode*	plot_view_node	=	(PlotViewNode	*)client_data;
+				XmToggleButtonCallbackStruct	*toggle_data	=	(XmToggleButtonCallbackStruct	*)call_data;
 
-    val = (toggle_data->set != 0);
-    plot_view_node->selected = val;
+				val	=	(toggle_data->set	!=	0);
+				plot_view_node->selected	=	val;
 }
 
-// CALLBACK
-static void toggle_grid_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-    Boolean val ;
+//	CALLBACK
+static	void	toggle_grid_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				Boolean	val	;
 
-    PlotViewNode* plot_view_node = (PlotViewNode *)client_data;
-    XmToggleButtonCallbackStruct *toggle_data = (XmToggleButtonCallbackStruct *)call_data;
+				PlotViewNode*	plot_view_node	=	(PlotViewNode	*)client_data;
+				XmToggleButtonCallbackStruct	*toggle_data	=	(XmToggleButtonCallbackStruct	*)call_data;
 
-    val = (toggle_data->set != 0);
-    XtVaSetValues( plot_view_node->xy_widget, XmNshowGrid, val, NULL);
+				val	=	(toggle_data->set	!=	0);
+				XtVaSetValues(	plot_view_node->xy_widget,	XmNshowGrid,	val,	NULL);
 }
 
-// CALLBACK
-static void toggle_value_display_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-    Boolean val ;
-    PlotViewNode* plot_view_node = (PlotViewNode *)client_data;
-    XmToggleButtonCallbackStruct *toggle_data = (XmToggleButtonCallbackStruct *)call_data;
+//	CALLBACK
+static	void	toggle_value_display_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				Boolean	val	;
+				PlotViewNode*	plot_view_node	=	(PlotViewNode	*)client_data;
+				XmToggleButtonCallbackStruct	*toggle_data	=	(XmToggleButtonCallbackStruct	*)call_data;
 
-    val = (toggle_data->set != 0);
-    XtVaSetValues( plot_view_node->xy_widget, XmNValueDisplay, val, NULL);
+				val	=	(toggle_data->set	!=	0);
+				XtVaSetValues(	plot_view_node->xy_widget,	XmNValueDisplay,	val,	NULL);
 }
 
-// CALLBACK
-static void toggle_crosshairs_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-    Boolean val ;
-    PlotViewNode* plot_view_node = (PlotViewNode *)client_data;
-    XmToggleButtonCallbackStruct *toggle_data = (XmToggleButtonCallbackStruct *)call_data;
+//	CALLBACK
+static	void	toggle_crosshairs_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				Boolean	val	;
+				PlotViewNode*	plot_view_node	=	(PlotViewNode	*)client_data;
+				XmToggleButtonCallbackStruct	*toggle_data	=	(XmToggleButtonCallbackStruct	*)call_data;
 
-    val = (toggle_data->set != 0);
-    XtVaSetValues( plot_view_node->xy_widget, XmNenableCrosshairs, val, NULL);
+				val	=	(toggle_data->set	!=	0);
+				XtVaSetValues(	plot_view_node->xy_widget,	XmNenableCrosshairs,	val,	NULL);
 }
 
-// CALLBACK
-static void print_plot_cb(Widget w, XtPointer client_data, XtPointer call_data) {
-    char ps_file_name[256];
-    char system_cmd[256];
-    char *trick_print_cmd;
-    char *trick_printer_name;
-    int sys_ret;
-
-    PlotViewNode* plot_view_node = (PlotViewNode *)client_data;
-
-    if ((trick_print_cmd = getenv("TRICK_PRINT_CMD")) == NULL) {
-        trick_print_cmd = (char *)"lpr";
-    }
-    trick_printer_name = getenv("TRICK_PRINTER_NAME");
-
-    if (!access("/tmp", W_OK)) {
-        strncpy(ps_file_name, "/tmp/dpx_postscript_XXXXXX", sizeof(ps_file_name));
-    } else if (!access("/var/tmp", W_OK)) {
-        strncpy(ps_file_name, "/var/tmp/dpx_postscript_XXXXXX", sizeof(ps_file_name));
-    } else {
-
-        post_dialog( plot_view_node->toplevel, XmDIALOG_ERROR,
-            "Unable to access /tmp or /var/tmp,\n"
-            "where a temporary Postscript file\n"
-            "(that represents your print out)\n"
-            "needs to be generated. Please check\n"
-            "your file permissions.");
-
-        return;
-    }
-
-    if (mkstemp( ps_file_name) < 0) {
-        post_dialog( plot_view_node->toplevel, XmDIALOG_ERROR,
-            "Unable to generate a temporary file\n"
-            "name for some mind boggling reason." );
-
-        return;
-    }
-
-    XYPrintContents( plot_view_node->xy_widget, ps_file_name);
-
-    if (!strcmp(trick_print_cmd, "lpr")) {
-        if ((trick_printer_name == NULL) || (strlen(trick_printer_name) == 0)) {
-            snprintf(system_cmd, sizeof(system_cmd), "%s %s", trick_print_cmd, ps_file_name);
-        } else {
-            snprintf(system_cmd, sizeof(system_cmd), "%s -P %s %s", trick_print_cmd, trick_printer_name, ps_file_name);
-        }
-    } else {
-        snprintf(system_cmd, sizeof(system_cmd), "%s %s", trick_print_cmd, ps_file_name);
-    }
-
-    std::cout << "Printing with command: " << system_cmd << std::endl;
-    sys_ret = system( system_cmd);
-    std::cout << " System call returned: " << sys_ret << std::endl;
-    snprintf(system_cmd, sizeof(system_cmd), "rm %s", ps_file_name);
-    system( system_cmd);
+//	CALLBACK
+static	void	print_plot_cb(Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+				char	ps_file_name[256];
+				char	system_cmd[256];
+				char	*trick_print_cmd;
+				char	*trick_printer_name;
+				int	sys_ret;
+
+				PlotViewNode*	plot_view_node	=	(PlotViewNode	*)client_data;
+
+				if	((trick_print_cmd	=	getenv("TRICK_PRINT_CMD"))	==	NULL)	{
+								trick_print_cmd	=	(char	*)"lpr";
+				}
+				trick_printer_name	=	getenv("TRICK_PRINTER_NAME");
+
+				if	(!access("/tmp",	W_OK))	{
+								strncpy(ps_file_name,	"/tmp/dpx_postscript_XXXXXX",	sizeof(ps_file_name));
+				}	else	if	(!access("/var/tmp",	W_OK))	{
+								strncpy(ps_file_name,	"/var/tmp/dpx_postscript_XXXXXX",	sizeof(ps_file_name));
+				}	else	{
+
+								post_dialog(	plot_view_node->toplevel,	XmDIALOG_ERROR,
+												"Unable	to	access	/tmp	or	/var/tmp,\n"
+												"where	a	temporary	Postscript	file\n"
+												"(that	represents	your	print	out)\n"
+												"needs	to	be	generated.	Please	check\n"
+												"your	file	permissions.");
+
+								return;
+				}
+
+				if	(mkstemp(	ps_file_name)	<	0)	{
+								post_dialog(	plot_view_node->toplevel,	XmDIALOG_ERROR,
+												"Unable	to	generate	a	temporary	file\n"
+												"name	for	some	mind	boggling	reason."	);
+
+								return;
+				}
+
+				XYPrintContents(	plot_view_node->xy_widget,	ps_file_name);
+
+				if	(!strcmp(trick_print_cmd,	"lpr"))	{
+								if	((trick_printer_name	==	NULL)	||	(strlen(trick_printer_name)	==	0))	{
+												snprintf(system_cmd,	sizeof(system_cmd),	"%s	%s",	trick_print_cmd,	ps_file_name);
+								}	else	{
+												snprintf(system_cmd,	sizeof(system_cmd),	"%s	-P	%s	%s",	trick_print_cmd,	trick_printer_name,	ps_file_name);
+								}
+				}	else	{
+								snprintf(system_cmd,	sizeof(system_cmd),	"%s	%s",	trick_print_cmd,	ps_file_name);
+				}
+
+				std::cout	<<	"Printing	with	command:	"	<<	system_cmd	<<	std::endl;
+				sys_ret	=	system(	system_cmd);
+				std::cout	<<	"	System	call	returned:	"	<<	sys_ret	<<	std::endl;
+				snprintf(system_cmd,	sizeof(system_cmd),	"rm	%s",	ps_file_name);
+				system(	system_cmd);
 }
 
 
-// CLASS VARIABLE INITIALIZATION
-int PlotViewNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	PlotViewNode::instance_count	=	0;
 
 
-// DESTRUCTOR
-PlotViewNode::~PlotViewNode() {
+//	DESTRUCTOR
+PlotViewNode::~PlotViewNode()	{
 
-    #ifdef DEBUG
-    std::cout << "PlotViewNode DESTRUCTOR." << std::endl;
-    #endif
+				#ifdef	DEBUG
+				std::cout	<<	"PlotViewNode	DESTRUCTOR."	<<	std::endl;
+				#endif
 
-    delete curves;
-    XtDestroyWidget(xy_widget);
-    XtDestroyWidget(print_button);
-    XtDestroyWidget(toggle4);
-    XtDestroyWidget(toggle3);
-    XtDestroyWidget(toggle2);
-    XtDestroyWidget(toggle1);
-    XtDestroyWidget(ctrls_form_widget);
-    XtDestroyWidget(main_form_widget);
+				delete	curves;
+				XtDestroyWidget(xy_widget);
+				XtDestroyWidget(print_button);
+				XtDestroyWidget(toggle4);
+				XtDestroyWidget(toggle3);
+				XtDestroyWidget(toggle2);
+				XtDestroyWidget(toggle1);
+				XtDestroyWidget(ctrls_form_widget);
+				XtDestroyWidget(main_form_widget);
 }
 
 
-// CONSTRUCTOR
-PlotViewNode::PlotViewNode( Widget Toplevel, Widget Parent_form, DPC_plot* Plot ) {
-
-    XmString X_label, Y_label;
-    Pixel fg,bg;
-    Pixmap pixmap;
-
-    const char * show_grid;
-    const char * grid_color;
-    const char * foreground_color;
-    const char * background_color;
-    const char * font;
-
-    const char * const_temp_str;
-    char charbuf[256];
-
-    const char * X_min, * X_max;
-    const char * Y_min, * Y_max;
-    double x_min_val, x_max_val;
-    double y_min_val, y_max_val;
-
-    plot = Plot;
-
-    toplevel = Toplevel;
-
-    current  = 0;
-    selected = 0;
-
-    n_curves = plot->getNumCurves();
-    curves = new XYCurve[n_curves];
-
-    // X Axis label.
-    snprintf( charbuf, sizeof(charbuf), "%s", const_temp_str );
-    X_label = XmStringCreateLocalized( charbuf);
-
-    // Y Axis label.
-    snprintf( charbuf, sizeof(charbuf), "%s", const_temp_str );
-    Y_label = XmStringCreateLocalized( charbuf);
-
-    // ---------------------------
-    // Create the plot widget name.
-    // ---------------------------
-    snprintf( charbuf, sizeof(charbuf), "Plot_%d", instance_count);
-
-    // -----------------------
-    // Create the plot widget.
-    // -----------------------
-    main_form_widget = XtVaCreateWidget( "PlotForm",
-                                         xmFormWidgetClass,
-                                         Parent_form,
-                                         XmNresizePolicy, XmRESIZE_GROW,
-                                         XmNfractionBase, 10,
-                                         NULL);
-
-    ctrls_form_widget = XtVaCreateManagedWidget( "CtrlsForm",
-                                            xmFormWidgetClass,
-                                            main_form_widget,
-                                            XmNresizePolicy,     XmRESIZE_GROW,
-                                            XmNfractionBase,     10,
-                                            XmNtopAttachment,    XmATTACH_NONE,
-                                            XmNleftAttachment,   XmATTACH_FORM,
-                                            XmNrightAttachment,  XmATTACH_FORM,
-                                            XmNbottomAttachment, XmATTACH_FORM,
-                                            NULL);
-
-    XtVaGetValues (ctrls_form_widget, XmNforeground, &fg, XmNbackground, &bg, NULL);
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"toggle_xhairs.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        toggle1 = XtVaCreateManagedWidget( "X", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_FORM,
-                                           NULL);
-    } else {
-        toggle1 = XtVaCreateManagedWidget( "X", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_FORM,
-                                           XmNlabelType,        XmPIXMAP,
-                                           XmNlabelPixmap,      pixmap,
-                                           NULL);
-    }
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"toggle_values.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        toggle2 = XtVaCreateManagedWidget( "V", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle1,
-                                           NULL);
-    } else {
-        toggle2 = XtVaCreateManagedWidget( "V", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle1,
-                                           XmNlabelType,        XmPIXMAP,
-                                           XmNlabelPixmap,      pixmap,
-                                           NULL);
-    }
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"toggle_grid.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        toggle3 = XtVaCreateManagedWidget( "G", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle2,
-                                           NULL);
-    } else {
-        toggle3 = XtVaCreateManagedWidget( "G", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle2,
-                                           XmNlabelType,        XmPIXMAP,
-                                           XmNlabelPixmap,      pixmap,
-                                           NULL);
-    }
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"select.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        toggle4 = XtVaCreateManagedWidget( "Sel", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle3,
-                                           NULL);
-    } else {
-        toggle4 = XtVaCreateManagedWidget( "Sel", xmToggleButtonGadgetClass, ctrls_form_widget,
-                                           XmNleftAttachment,   XmATTACH_WIDGET,
-                                           XmNleftWidget,       toggle3,
-                                           XmNlabelType,        XmPIXMAP,
-                                           XmNlabelPixmap,      pixmap,
-                                           NULL);
-    }
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"print_plot.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-        print_button = XtVaCreateManagedWidget( "PrintPlot", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNrightAttachment,   XmATTACH_FORM,
-                                                NULL);
-    } else {
-        print_button = XtVaCreateManagedWidget( "PrintPlot", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                XmNleftAttachment,   XmATTACH_WIDGET,
-                                                XmNleftWidget,       toggle4,
-                                                XmNlabelType,        XmPIXMAP,
-                                                XmNlabelPixmap,      pixmap,
-                                                NULL);
-    }
-
-    XtManageChild(ctrls_form_widget);
-
-    xy_widget = XtVaCreateManagedWidget( charbuf,
-                                         xyWidgetClass,
-                                         main_form_widget,
-                                         XmNxAxisLabel, X_label,
-                                         XmNyAxisLabel, Y_label,
-                                         XmNshowLegend, 1,
-                                         XmNdoubleBuffer, 1,
-                                         XmNtopAttachment,    XmATTACH_FORM,
-                                         XmNleftAttachment,   XmATTACH_FORM,
-                                         XmNrightAttachment,  XmATTACH_FORM,
-                                         XmNbottomAttachment, XmATTACH_WIDGET,
-                                         XmNbottomWidget,     ctrls_form_widget,
-                                         NULL);
-
-    XmStringFree(X_label);
-    XmStringFree(Y_label);
-
-    // -------------------------------------------------------
-    // Set Y axis format if specified.
-    // -------------------------------------------------------
-    if (plot->getYFormat() != NULL && strcmp(plot->getYFormat(), "")) {
-        XtVaSetValues( xy_widget, XmNyAxisFormat, XmStringCreateLocalized((char *)plot->getYFormat()), NULL ) ;
-    }
-
-    // -------------------------------------------------------
-    // Set X axis scaling if specified.
-    // -------------------------------------------------------
-    if (plot->getAttribute("x_scale") != NULL && !strcmp(plot->getAttribute("x_scale"), "Log")) {
-        Boolean log = True ;
-        XtVaSetValues(xy_widget, XmNxLogScaling, log, NULL) ;
-    }
-
-    // -------------------------------------------------------
-    // Set Y axis scaling if specified.
-    // -------------------------------------------------------
-    if (plot->getAttribute("y_scale") != NULL && !strcmp(plot->getAttribute("y_scale"), "Log")) {
-        Boolean log = True ;
-        XtVaSetValues(xy_widget, XmNyLogScaling, log, NULL) ;
-    }
-
-    // -------------------------------------------------------
-    // Enable the plot grid if specified.
-    // -------------------------------------------------------
-    if ((show_grid = plot->getAttribute("grid")) != NULL) {
-       XmToggleButtonGadgetSetState( toggle3, True, False);
-       XtVaSetValues( xy_widget, XmNshowGrid, 1, NULL);
-    } else {
-       XtVaSetValues( xy_widget, XmNshowGrid, 0, NULL);
-    }
-
-    // -------------------------------------------------------
-    // Set the plot's grid color.
-    // -------------------------------------------------------
-    //XtVaSetValues( xy_widget, XmNgridColor, BlackPixel(XtDisplay(toplevel),0), NULL);
-    if ((grid_color = plot->getAttribute("grid_color")) != NULL) {
-        XColor color_def;
-        if ( XParseColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), grid_color, &color_def )) {
-            if ( XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                XtVaSetValues( xy_widget, XmNgridColor, color_def.pixel, NULL);
-            }
-        }
-    }
-
-    // -------------------------------------------------------
-    // Set the plot's foreground color.
-    // -------------------------------------------------------
-    //XtVaSetValues( xy_widget, XmNforeground, BlackPixel(XtDisplay(toplevel),0), NULL);
-    if ((foreground_color = plot->getAttribute("foreground_color")) != NULL) {
-        XColor color_def;
-        if ( XParseColor( XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), foreground_color, &color_def )) {
-            if ( XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                XtVaSetValues( xy_widget, XmNforeground, color_def.pixel, NULL);
-            }
-        }
-    }
-
-    // -------------------------------------------------------
-    // Set the plot's background color.
-    // -------------------------------------------------------
-    //XtVaSetValues( xy_widget, XmNbackground, WhitePixel( XtDisplay(toplevel),0), NULL);
-    if ((background_color = plot->getAttribute("background_color")) != NULL) {
-        XColor color_def;
-        if ( XParseColor( XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), background_color, &color_def )) {
-            if ( XAllocColor( XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                XtVaSetValues( xy_widget, XmNbackground, color_def.pixel, NULL);
-            }
-        }
-    }
-
-    // -------------------------------------------------------
-    // Set the plot's font.
-    // -------------------------------------------------------
-    if ((font = plot->getAttribute("font")) != NULL) {
-        XmRendition rendition;
-        XmRenderTable new_render_table;
-        Arg wargs[3];
-        int nargs = 0;
-        XtSetArg( wargs[nargs], XmNfontName, font);              nargs ++;
-        XtSetArg( wargs[nargs], XmNfontType, XmFONT_IS_FONT);    nargs ++;
-        XtSetArg( wargs[nargs], XmNloadModel, XmLOAD_IMMEDIATE); nargs ++;
-
-        rendition = XmRenditionCreate( xy_widget, XmFONTLIST_DEFAULT_TAG, wargs, nargs);
-        new_render_table = XmRenderTableAddRenditions( NULL, &rendition, 1, XmMERGE_REPLACE);
-        XtVaSetValues( xy_widget, XmNrenderTable, new_render_table, NULL);
-    }
-
-    // -------------------------------------------------------
-    // Set the plot's xmin, xmax, ymin, and ymax
-    // -------------------------------------------------------
-    if ((X_min = plot->getAttribute("xmin")) != NULL) {
-        x_min_val = strtod(X_min, NULL);
-        plot->setXMin(x_min_val);
-    }
-    if ((X_max = plot->getAttribute("xmax")) != NULL) {
-        x_max_val = strtod(X_max, NULL);
-        plot->setXMax(x_max_val);
-    }
-    if ((Y_min = plot->getAttribute("ymin")) != NULL) {
-        y_min_val = strtod(Y_min, NULL);
-        plot->setYMin(y_min_val);
-    }
-    if ((Y_max = plot->getAttribute("ymax")) != NULL) {
-        y_max_val = strtod(Y_max, NULL);
-        plot->setYMax(y_max_val);
-    }
-
-    //
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-
-    XtAddCallback( toggle1, XmNvalueChangedCallback, toggle_crosshairs_cb, (XtPointer)this);
-    XtAddCallback( toggle2, XmNvalueChangedCallback, toggle_value_display_cb, (XtPointer)this);
-    XtAddCallback( toggle3, XmNvalueChangedCallback, toggle_grid_cb, (XtPointer)this);
-    XtAddCallback( toggle4, XmNvalueChangedCallback, toggle_sel_cb, (XtPointer)this);
-    XtAddCallback( print_button, XmNactivateCallback, print_plot_cb, (XtPointer)this);
-
-    instance_count ++;
+//	CONSTRUCTOR
+PlotViewNode::PlotViewNode(	Widget	Toplevel,	Widget	Parent_form,	DPC_plot*	Plot	)	{
+
+				XmString	X_label,	Y_label;
+				Pixel	fg,bg;
+				Pixmap	pixmap;
+
+				const	char	*	show_grid;
+				const	char	*	grid_color;
+				const	char	*	foreground_color;
+				const	char	*	background_color;
+				const	char	*	font;
+
+				const	char	*	const_temp_str;
+				char	charbuf[256];
+
+				const	char	*	X_min,	*	X_max;
+				const	char	*	Y_min,	*	Y_max;
+				double	x_min_val,	x_max_val;
+				double	y_min_val,	y_max_val;
+
+				plot	=	Plot;
+
+				toplevel	=	Toplevel;
+
+				current		=	0;
+				selected	=	0;
+
+				n_curves	=	plot->getNumCurves();
+				curves	=	new	XYCurve[n_curves];
+
+				//	X	Axis	label.
+				snprintf(	charbuf,	sizeof(charbuf),	"%s",	const_temp_str	);
+				X_label	=	XmStringCreateLocalized(	charbuf);
+
+				//	Y	Axis	label.
+				snprintf(	charbuf,	sizeof(charbuf),	"%s",	const_temp_str	);
+				Y_label	=	XmStringCreateLocalized(	charbuf);
+
+				//	---------------------------
+				//	Create	the	plot	widget	name.
+				//	---------------------------
+				snprintf(	charbuf,	sizeof(charbuf),	"Plot_%d",	instance_count);
+
+				//	-----------------------
+				//	Create	the	plot	widget.
+				//	-----------------------
+				main_form_widget	=	XtVaCreateWidget(	"PlotForm",
+																																									xmFormWidgetClass,
+																																									Parent_form,
+																																									XmNresizePolicy,	XmRESIZE_GROW,
+																																									XmNfractionBase,	10,
+																																									NULL);
+
+				ctrls_form_widget	=	XtVaCreateManagedWidget(	"CtrlsForm",
+																																												xmFormWidgetClass,
+																																												main_form_widget,
+																																												XmNresizePolicy,					XmRESIZE_GROW,
+																																												XmNfractionBase,					10,
+																																												XmNtopAttachment,				XmATTACH_NONE,
+																																												XmNleftAttachment,			XmATTACH_FORM,
+																																												XmNrightAttachment,		XmATTACH_FORM,
+																																												XmNbottomAttachment,	XmATTACH_FORM,
+																																												NULL);
+
+				XtVaGetValues	(ctrls_form_widget,	XmNforeground,	&fg,	XmNbackground,	&bg,	NULL);
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"toggle_xhairs.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								toggle1	=	XtVaCreateManagedWidget(	"X",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_FORM,
+																																											NULL);
+				}	else	{
+								toggle1	=	XtVaCreateManagedWidget(	"X",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_FORM,
+																																											XmNlabelType,								XmPIXMAP,
+																																											XmNlabelPixmap,						pixmap,
+																																											NULL);
+				}
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"toggle_values.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								toggle2	=	XtVaCreateManagedWidget(	"V",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle1,
+																																											NULL);
+				}	else	{
+								toggle2	=	XtVaCreateManagedWidget(	"V",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle1,
+																																											XmNlabelType,								XmPIXMAP,
+																																											XmNlabelPixmap,						pixmap,
+																																											NULL);
+				}
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"toggle_grid.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								toggle3	=	XtVaCreateManagedWidget(	"G",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle2,
+																																											NULL);
+				}	else	{
+								toggle3	=	XtVaCreateManagedWidget(	"G",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle2,
+																																											XmNlabelType,								XmPIXMAP,
+																																											XmNlabelPixmap,						pixmap,
+																																											NULL);
+				}
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"select.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								toggle4	=	XtVaCreateManagedWidget(	"Sel",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle3,
+																																											NULL);
+				}	else	{
+								toggle4	=	XtVaCreateManagedWidget(	"Sel",	xmToggleButtonGadgetClass,	ctrls_form_widget,
+																																											XmNleftAttachment,			XmATTACH_WIDGET,
+																																											XmNleftWidget,							toggle3,
+																																											XmNlabelType,								XmPIXMAP,
+																																											XmNlabelPixmap,						pixmap,
+																																											NULL);
+				}
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"print_plot.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+								print_button	=	XtVaCreateManagedWidget(	"PrintPlot",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNrightAttachment,			XmATTACH_FORM,
+																																																NULL);
+				}	else	{
+								print_button	=	XtVaCreateManagedWidget(	"PrintPlot",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																XmNleftAttachment,			XmATTACH_WIDGET,
+																																																XmNleftWidget,							toggle4,
+																																																XmNlabelType,								XmPIXMAP,
+																																																XmNlabelPixmap,						pixmap,
+																																																NULL);
+				}
+
+				XtManageChild(ctrls_form_widget);
+
+				xy_widget	=	XtVaCreateManagedWidget(	charbuf,
+																																									xyWidgetClass,
+																																									main_form_widget,
+																																									XmNxAxisLabel,	X_label,
+																																									XmNyAxisLabel,	Y_label,
+																																									XmNshowLegend,	1,
+																																									XmNdoubleBuffer,	1,
+																																									XmNtopAttachment,				XmATTACH_FORM,
+																																									XmNleftAttachment,			XmATTACH_FORM,
+																																									XmNrightAttachment,		XmATTACH_FORM,
+																																									XmNbottomAttachment,	XmATTACH_WIDGET,
+																																									XmNbottomWidget,					ctrls_form_widget,
+																																									NULL);
+
+				XmStringFree(X_label);
+				XmStringFree(Y_label);
+
+				//	-------------------------------------------------------
+				//	Set	Y	axis	format	if	specified.
+				//	-------------------------------------------------------
+				if	(plot->getYFormat()	!=	NULL	&&	strcmp(plot->getYFormat(),	""))	{
+								XtVaSetValues(	xy_widget,	XmNyAxisFormat,	XmStringCreateLocalized((char	*)plot->getYFormat()),	NULL	)	;
+				}
+
+				//	-------------------------------------------------------
+				//	Set	X	axis	scaling	if	specified.
+				//	-------------------------------------------------------
+				if	(plot->getAttribute("x_scale")	!=	NULL	&&	!strcmp(plot->getAttribute("x_scale"),	"Log"))	{
+								Boolean	log	=	True	;
+								XtVaSetValues(xy_widget,	XmNxLogScaling,	log,	NULL)	;
+				}
+
+				//	-------------------------------------------------------
+				//	Set	Y	axis	scaling	if	specified.
+				//	-------------------------------------------------------
+				if	(plot->getAttribute("y_scale")	!=	NULL	&&	!strcmp(plot->getAttribute("y_scale"),	"Log"))	{
+								Boolean	log	=	True	;
+								XtVaSetValues(xy_widget,	XmNyLogScaling,	log,	NULL)	;
+				}
+
+				//	-------------------------------------------------------
+				//	Enable	the	plot	grid	if	specified.
+				//	-------------------------------------------------------
+				if	((show_grid	=	plot->getAttribute("grid"))	!=	NULL)	{
+							XmToggleButtonGadgetSetState(	toggle3,	True,	False);
+							XtVaSetValues(	xy_widget,	XmNshowGrid,	1,	NULL);
+				}	else	{
+							XtVaSetValues(	xy_widget,	XmNshowGrid,	0,	NULL);
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	plot's	grid	color.
+				//	-------------------------------------------------------
+				//XtVaSetValues(	xy_widget,	XmNgridColor,	BlackPixel(XtDisplay(toplevel),0),	NULL);
+				if	((grid_color	=	plot->getAttribute("grid_color"))	!=	NULL)	{
+								XColor	color_def;
+								if	(	XParseColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	grid_color,	&color_def	))	{
+												if	(	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																XtVaSetValues(	xy_widget,	XmNgridColor,	color_def.pixel,	NULL);
+												}
+								}
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	plot's	foreground	color.
+				//	-------------------------------------------------------
+				//XtVaSetValues(	xy_widget,	XmNforeground,	BlackPixel(XtDisplay(toplevel),0),	NULL);
+				if	((foreground_color	=	plot->getAttribute("foreground_color"))	!=	NULL)	{
+								XColor	color_def;
+								if	(	XParseColor(	XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	foreground_color,	&color_def	))	{
+												if	(	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																XtVaSetValues(	xy_widget,	XmNforeground,	color_def.pixel,	NULL);
+												}
+								}
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	plot's	background	color.
+				//	-------------------------------------------------------
+				//XtVaSetValues(	xy_widget,	XmNbackground,	WhitePixel(	XtDisplay(toplevel),0),	NULL);
+				if	((background_color	=	plot->getAttribute("background_color"))	!=	NULL)	{
+								XColor	color_def;
+								if	(	XParseColor(	XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	background_color,	&color_def	))	{
+												if	(	XAllocColor(	XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																XtVaSetValues(	xy_widget,	XmNbackground,	color_def.pixel,	NULL);
+												}
+								}
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	plot's	font.
+				//	-------------------------------------------------------
+				if	((font	=	plot->getAttribute("font"))	!=	NULL)	{
+								XmRendition	rendition;
+								XmRenderTable	new_render_table;
+								Arg	wargs[3];
+								int	nargs	=	0;
+								XtSetArg(	wargs[nargs],	XmNfontName,	font);														nargs	++;
+								XtSetArg(	wargs[nargs],	XmNfontType,	XmFONT_IS_FONT);				nargs	++;
+								XtSetArg(	wargs[nargs],	XmNloadModel,	XmLOAD_IMMEDIATE);	nargs	++;
+
+								rendition	=	XmRenditionCreate(	xy_widget,	XmFONTLIST_DEFAULT_TAG,	wargs,	nargs);
+								new_render_table	=	XmRenderTableAddRenditions(	NULL,	&rendition,	1,	XmMERGE_REPLACE);
+								XtVaSetValues(	xy_widget,	XmNrenderTable,	new_render_table,	NULL);
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	plot's	xmin,	xmax,	ymin,	and	ymax
+				//	-------------------------------------------------------
+				if	((X_min	=	plot->getAttribute("xmin"))	!=	NULL)	{
+								x_min_val	=	strtod(X_min,	NULL);
+								plot->setXMin(x_min_val);
+				}
+				if	((X_max	=	plot->getAttribute("xmax"))	!=	NULL)	{
+								x_max_val	=	strtod(X_max,	NULL);
+								plot->setXMax(x_max_val);
+				}
+				if	((Y_min	=	plot->getAttribute("ymin"))	!=	NULL)	{
+								y_min_val	=	strtod(Y_min,	NULL);
+								plot->setYMin(y_min_val);
+				}
+				if	((Y_max	=	plot->getAttribute("ymax"))	!=	NULL)	{
+								y_max_val	=	strtod(Y_max,	NULL);
+								plot->setYMax(y_max_val);
+				}
+
+				//
+				//	----------------------------------------------------------------------
+				//	----------------------------------------------------------------------
+
+				XtAddCallback(	toggle1,	XmNvalueChangedCallback,	toggle_crosshairs_cb,	(XtPointer)this);
+				XtAddCallback(	toggle2,	XmNvalueChangedCallback,	toggle_value_display_cb,	(XtPointer)this);
+				XtAddCallback(	toggle3,	XmNvalueChangedCallback,	toggle_grid_cb,	(XtPointer)this);
+				XtAddCallback(	toggle4,	XmNvalueChangedCallback,	toggle_sel_cb,	(XtPointer)this);
+				XtAddCallback(	print_button,	XmNactivateCallback,	print_plot_cb,	(XtPointer)this);
+
+				instance_count	++;
 }
 
 
-void PlotViewNode::finalize() {
-
-    XmString plot_title;
-    char charbuf[256];
-    const char *data_src_label;
-    const char *title;
-    double cxmin, cxmax, cymin, cymax;
-
-    if (n_curves == 1) {
-        data_src_label = curve_node_list[0]->data_src_label;
-    } else {
-        data_src_label = NULL;
-    }
-
-    title = plot->getTitle();
-
-    // Construct the Plot title.
-    if ( title != NULL) {
-        if (strcmp(title, "Contrast")==0) {
-            // special case for Contrast session: 1st plot is Compare, 2nd plot is Difference
-            if (instance_count==1) {
-                snprintf( charbuf, sizeof(charbuf), "Plot\n(Compare)");
-            } else  {
-                snprintf( charbuf, sizeof(charbuf), "Plot\n(Difference)");
-            }
-        } else if ( data_src_label != NULL) {
-            snprintf( charbuf, sizeof(charbuf), "%s\n(%s)", title, data_src_label);
-        } else {
-            snprintf( charbuf, sizeof(charbuf), "%s", title);
-        }
-    } else {
-        if ( data_src_label != NULL) {
-            snprintf( charbuf, sizeof(charbuf), "(%s)", data_src_label);
-        } else {
-            charbuf[0] = '\0';
-        }
-    }
-
-    plot_title = XmStringCreateLocalized( charbuf);
-    XtVaSetValues( xy_widget, XmNplotTitle, plot_title, NULL);
-    XmStringFree(plot_title);
-
-    // Turn off the legend when it gets too big because of multiple curves
-    // TODO: should this be a user settable variable?
-    if (n_curves > 20) {
-        XtVaSetValues( xy_widget, XmNshowLegend, False, NULL);
-    }
-
-    //if ((n_curves > 1) && (XmStringCompare(curves[0].curve_id, curves[1].curve_id))) {
-    if (n_curves > 1) {
-        // Color each curve when plotting multiple curves
-        XColor color_def;
-        int curv_ix;
-        for (curv_ix=0 ; curv_ix< n_curves ; curv_ix++) {
-            const char * line_color = colors[curv_ix % NUM_COLORS];
-            if (XParseColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), line_color, &color_def )) {
-                // only use our color if the curve's line_color was not set by user
-                if ( (curves[curv_ix].linePixel==0) && XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                    curves[curv_ix].linePixel = color_def.pixel;
-                }
-            }
-        }
-    }
-
-    XYSetContents( xy_widget,
-                   curves,
-                   n_curves,
-                   XY_RESCALE);
-
-    XYGetVisibleRange(xy_widget, &cxmin, &cymin, &cxmax, &cymax);
-
-    XYSetVisibleRange(xy_widget,
-    		          dMax(cxmin, plot->getXMin()),
-    		          dMax(cymin, plot->getYMin()),
-    		          dMin(cxmax, plot->getXMax()),
-    		          dMin(cymax, plot->getYMax()));
+void	PlotViewNode::finalize()	{
+
+				XmString	plot_title;
+				char	charbuf[256];
+				const	char	*data_src_label;
+				const	char	*title;
+				double	cxmin,	cxmax,	cymin,	cymax;
+
+				if	(n_curves	==	1)	{
+								data_src_label	=	curve_node_list[0]->data_src_label;
+				}	else	{
+								data_src_label	=	NULL;
+				}
+
+				title	=	plot->getTitle();
+
+				//	Construct	the	Plot	title.
+				if	(	title	!=	NULL)	{
+								if	(strcmp(title,	"Contrast")==0)	{
+												//	special	case	for	Contrast	session:	1st	plot	is	Compare,	2nd	plot	is	Difference
+												if	(instance_count==1)	{
+																snprintf(	charbuf,	sizeof(charbuf),	"Plot\n(Compare)");
+												}	else		{
+																snprintf(	charbuf,	sizeof(charbuf),	"Plot\n(Difference)");
+												}
+								}	else	if	(	data_src_label	!=	NULL)	{
+												snprintf(	charbuf,	sizeof(charbuf),	"%s\n(%s)",	title,	data_src_label);
+								}	else	{
+												snprintf(	charbuf,	sizeof(charbuf),	"%s",	title);
+								}
+				}	else	{
+								if	(	data_src_label	!=	NULL)	{
+												snprintf(	charbuf,	sizeof(charbuf),	"(%s)",	data_src_label);
+								}	else	{
+												charbuf[0]	=	'\0';
+								}
+				}
+
+				plot_title	=	XmStringCreateLocalized(	charbuf);
+				XtVaSetValues(	xy_widget,	XmNplotTitle,	plot_title,	NULL);
+				XmStringFree(plot_title);
+
+				//	Turn	off	the	legend	when	it	gets	too	big	because	of	multiple	curves
+				//	TODO:	should	this	be	a	user	settable	variable?
+				if	(n_curves	>	20)	{
+								XtVaSetValues(	xy_widget,	XmNshowLegend,	False,	NULL);
+				}
+
+				//if	((n_curves	>	1)	&&	(XmStringCompare(curves[0].curve_id,	curves[1].curve_id)))	{
+				if	(n_curves	>	1)	{
+								//	Color	each	curve	when	plotting	multiple	curves
+								XColor	color_def;
+								int	curv_ix;
+								for	(curv_ix=0	;	curv_ix<	n_curves	;	curv_ix++)	{
+												const	char	*	line_color	=	colors[curv_ix	%	NUM_COLORS];
+												if	(XParseColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	line_color,	&color_def	))	{
+																//	only	use	our	color	if	the	curve's	line_color	was	not	set	by	user
+																if	(	(curves[curv_ix].linePixel==0)	&&	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																				curves[curv_ix].linePixel	=	color_def.pixel;
+																}
+												}
+								}
+				}
+
+				XYSetContents(	xy_widget,
+																			curves,
+																			n_curves,
+																			XY_RESCALE);
+
+				XYGetVisibleRange(xy_widget,	&cxmin,	&cymin,	&cxmax,	&cymax);
+
+				XYSetVisibleRange(xy_widget,
+																dMax(cxmin,	plot->getXMin()),
+																dMax(cymin,	plot->getYMin()),
+																dMin(cxmax,	plot->getXMax()),
+																dMin(cymax,	plot->getYMax()));
 }
 
-// return the minimum number
-static double dMin(double d1, double d2) {
-    if (d2 < d1)
-        return d2;
-    else
-        return d1;
+//	return	the	minimum	number
+static	double	dMin(double	d1,	double	d2)	{
+				if	(d2	<	d1)
+								return	d2;
+				else
+								return	d1;
 }
 
-// return the maximum number
-static double dMax(double d1, double d2) {
-    if (d2 > d1)
-        return d2;
-    else
-        return d1;
+//	return	the	maximum	number
+static	double	dMax(double	d1,	double	d2)	{
+				if	(d2	>	d1)
+								return	d2;
+				else
+								return	d1;
 }
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/product_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/product_view_node.cpp
index 0541271e0..6f0a7f8a8 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/product_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/product_view_node.cpp
@@ -1,81 +1,81 @@
 
-#include <iostream>
-#include <string>
-#include "product_view_node.hh"
+#include	<iostream>
+#include	<string>
+#include	"product_view_node.hh"
 
-extern "C"{
-#include <X11/Intrinsic.h>
+extern	"C"{
+#include	<X11/Intrinsic.h>
 }
 
-int ProductViewNode::dpIndex = 0;
+int	ProductViewNode::dpIndex	=	0;
 
-ProductViewNode::ProductViewNode(Widget Toplevel, DPC_product* Product) {
+ProductViewNode::ProductViewNode(Widget	Toplevel,	DPC_product*	Product)	{
 
-    product = Product;
-    toplevel = Toplevel;
+				product	=	Product;
+				toplevel	=	Toplevel;
 }
 
 
 //DESTRUCTOR
-ProductViewNode::~ProductViewNode() {
-
-    #ifdef DEBUG
-    std::cout << "ProductViewNode DESTRUCTOR." << std::endl;
-    #endif
-
-    PageViewNode  *page_view_node;
-    TableViewNode *table_view_node;
-    int n,i;
-
-    n = (int)page_node_list.size();
-    for (i=0 ; i<n; i++ ) {
-        page_view_node = page_node_list[i];
-        if (page_view_node) { delete page_view_node; }
-    }
-
-    n = (int)table_node_list.size();
-    for (i=0 ; i<n ; i++ ) {
-        table_view_node = table_node_list[i];
-        if (table_view_node) { delete table_view_node; }
-    }
+ProductViewNode::~ProductViewNode()	{
+
+				#ifdef	DEBUG
+				std::cout	<<	"ProductViewNode	DESTRUCTOR."	<<	std::endl;
+				#endif
+
+				PageViewNode		*page_view_node;
+				TableViewNode	*table_view_node;
+				int	n,i;
+
+				n	=	(int)page_node_list.size();
+				for	(i=0	;	i<n;	i++	)	{
+								page_view_node	=	page_node_list[i];
+								if	(page_view_node)	{	delete	page_view_node;	}
+				}
+
+				n	=	(int)table_node_list.size();
+				for	(i=0	;	i<n	;	i++	)	{
+								table_view_node	=	table_node_list[i];
+								if	(table_view_node)	{	delete	table_view_node;	}
+				}
 }
 
-void ProductViewNode::generate_PS(const char* file_name) {
-    dpIndex++;
-    int ii;
-    int n = (int)page_node_list.size();
-    std::string::size_type idx ;
-    std::string file_name_str ;
-    char indexedFileName[1024];
-    file_name_str = file_name ;
-
-    // as the file_name is already provided with .ps extension,
-    // remove it for adding the index for multiple pages and
-    // the .ps extension will be appended when file is generated.
-    idx = file_name_str.rfind('.');
-    if ( idx != string::npos ) {
-        if (file_name_str.substr(idx) == ".ps") {
-            file_name_str.erase(idx);
-        }
-    }
-
-    for (ii=0 ; ii<n; ii++ ) {
-        if (n > 1) {
-            snprintf(indexedFileName, sizeof(indexedFileName), "%s.%d.%d.ps", file_name_str.c_str(), dpIndex, ii+1);
-        } else {
-            snprintf(indexedFileName, sizeof(indexedFileName), "%s.%d.ps", file_name_str.c_str(), dpIndex);
-        }
-        page_node_list[ii]->generate_PS(indexedFileName);
-        std::cout << "Generating " << indexedFileName << " ..." << std::endl;
-    }
+void	ProductViewNode::generate_PS(const	char*	file_name)	{
+				dpIndex++;
+				int	ii;
+				int	n	=	(int)page_node_list.size();
+				std::string::size_type	idx	;
+				std::string	file_name_str	;
+				char	indexedFileName[1024];
+				file_name_str	=	file_name	;
+
+				//	as	the	file_name	is	already	provided	with	.ps	extension,
+				//	remove	it	for	adding	the	index	for	multiple	pages	and
+				//	the	.ps	extension	will	be	appended	when	file	is	generated.
+				idx	=	file_name_str.rfind('.');
+				if	(	idx	!=	string::npos	)	{
+								if	(file_name_str.substr(idx)	==	".ps")	{
+												file_name_str.erase(idx);
+								}
+				}
+
+				for	(ii=0	;	ii<n;	ii++	)	{
+								if	(n	>	1)	{
+												snprintf(indexedFileName,	sizeof(indexedFileName),	"%s.%d.%d.ps",	file_name_str.c_str(),	dpIndex,	ii+1);
+								}	else	{
+												snprintf(indexedFileName,	sizeof(indexedFileName),	"%s.%d.ps",	file_name_str.c_str(),	dpIndex);
+								}
+								page_node_list[ii]->generate_PS(indexedFileName);
+								std::cout	<<	"Generating	"	<<	indexedFileName	<<	"	..."	<<	std::endl;
+				}
 
 }
 
-void ProductViewNode::print() {
-    int ii;
-    int n = (int)page_node_list.size();
+void	ProductViewNode::print()	{
+				int	ii;
+				int	n	=	(int)page_node_list.size();
 
-    for (ii = 0; ii < n; ii++) {
-        page_node_list[ii]->print();
-    }
+				for	(ii	=	0;	ii	<	n;	ii++)	{
+								page_node_list[ii]->print();
+				}
 }
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/table_view_node.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/table_view_node.cpp
index 94b89a395..a758f566a 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/table_view_node.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/table_view_node.cpp
@@ -1,411 +1,411 @@
 
-#include <Xm/Xm.h>
-#include <Xm/DialogS.h>
-#include <Xm/Form.h>
-#include <Xm/PushB.h>
-#include <Xm/LabelG.h>
-#include <Xm/Text.h>
-#include <Xm/FileSB.h>
-
-#include <iostream>
-#include <string>
-
-#include <stdio.h>    // for snprintf
-#include <string.h>   // for strcpy, strlen, strdup
-#include <libgen.h>   // for dirname, basename
-#include <unistd.h>   // for access
-#include <fcntl.h>    // for open, write, close
-
-#define exists(filename) (!access(filename, F_OK))
-
-#include "table_view_node.hh"
-#include "parse_format.h"
-#include "post_dialog.h"
-
-#define BYTES_PER_MALLOC 0xFFFF
-
-// CALLBACK
-static void FSB_cb( Widget w, XtPointer client_data, XtPointer call_data) {
-
-    char *filename;
-    XmFileSelectionBoxCallbackStruct *cbs =
-        (XmFileSelectionBoxCallbackStruct *) call_data;
-
-    TableViewNode* table_view_node = (TableViewNode *)client_data;
-
-    if (cbs->reason == XmCR_OK) {
-
-        // Get the filename
-        if (!XmStringGetLtoR (cbs->value, XmFONTLIST_DEFAULT_TAG, &filename))
-            return;
-
-        if (!*filename) {
-            post_dialog( table_view_node->toplevel, XmDIALOG_ERROR, "No file selected.");
-        } else if (exists (filename)) {
-            post_dialog( table_view_node->toplevel, XmDIALOG_ERROR, "File already exists.");
-        } else {
-            int fd;
-            if ((fd = creat(filename, 0660)) < 0 ) {
-                post_dialog( table_view_node->toplevel, XmDIALOG_ERROR, "Error occured attempting to create file.");
-            } else {
-                write(fd, table_view_node->table_text_buf, table_view_node->table_buf_size );
-                close(fd);
-                XtDestroyWidget(w);
-            }
-        }
-        XtFree( filename);
-
-    } else {
-        XtDestroyWidget(w);
-    }
+#include	<Xm/Xm.h>
+#include	<Xm/DialogS.h>
+#include	<Xm/Form.h>
+#include	<Xm/PushB.h>
+#include	<Xm/LabelG.h>
+#include	<Xm/Text.h>
+#include	<Xm/FileSB.h>
+
+#include	<iostream>
+#include	<string>
+
+#include	<stdio.h>				//	for	snprintf
+#include	<string.h>			//	for	strcpy,	strlen,	strdup
+#include	<libgen.h>			//	for	dirname,	basename
+#include	<unistd.h>			//	for	access
+#include	<fcntl.h>				//	for	open,	write,	close
+
+#define	exists(filename)	(!access(filename,	F_OK))
+
+#include	"table_view_node.hh"
+#include	"parse_format.h"
+#include	"post_dialog.h"
+
+#define	BYTES_PER_MALLOC	0xFFFF
+
+//	CALLBACK
+static	void	FSB_cb(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
+
+				char	*filename;
+				XmFileSelectionBoxCallbackStruct	*cbs	=
+								(XmFileSelectionBoxCallbackStruct	*)	call_data;
+
+				TableViewNode*	table_view_node	=	(TableViewNode	*)client_data;
+
+				if	(cbs->reason	==	XmCR_OK)	{
+
+								//	Get	the	filename
+								if	(!XmStringGetLtoR	(cbs->value,	XmFONTLIST_DEFAULT_TAG,	&filename))
+												return;
+
+								if	(!*filename)	{
+												post_dialog(	table_view_node->toplevel,	XmDIALOG_ERROR,	"No	file	selected.");
+								}	else	if	(exists	(filename))	{
+												post_dialog(	table_view_node->toplevel,	XmDIALOG_ERROR,	"File	already	exists.");
+								}	else	{
+												int	fd;
+												if	((fd	=	creat(filename,	0660))	<	0	)	{
+																post_dialog(	table_view_node->toplevel,	XmDIALOG_ERROR,	"Error	occured	attempting	to	create	file.");
+												}	else	{
+																write(fd,	table_view_node->table_text_buf,	table_view_node->table_buf_size	);
+																close(fd);
+																XtDestroyWidget(w);
+												}
+								}
+								XtFree(	filename);
+
+				}	else	{
+								XtDestroyWidget(w);
+				}
 }
 
-// CALLBACK
-static void save_table_cb( Widget w, XtPointer client_data, XtPointer call_data) {
+//	CALLBACK
+static	void	save_table_cb(	Widget	w,	XtPointer	client_data,	XtPointer	call_data)	{
 
-    Widget dialog;
+				Widget	dialog;
 
-    TableViewNode* table_view_node = (TableViewNode *)client_data;
+				TableViewNode*	table_view_node	=	(TableViewNode	*)client_data;
 
-    dialog = XmCreateFileSelectionDialog(table_view_node->toplevel, (char *)"filesb", NULL, 0 );
-    XtAddCallback ( dialog, XmNokCallback, FSB_cb , (XtPointer)table_view_node);
-    XtAddCallback ( dialog, XmNcancelCallback, FSB_cb , (XtPointer)table_view_node);
+				dialog	=	XmCreateFileSelectionDialog(table_view_node->toplevel,	(char	*)"filesb",	NULL,	0	);
+				XtAddCallback	(	dialog,	XmNokCallback,	FSB_cb	,	(XtPointer)table_view_node);
+				XtAddCallback	(	dialog,	XmNcancelCallback,	FSB_cb	,	(XtPointer)table_view_node);
 
-    XtManageChild( dialog);
+				XtManageChild(	dialog);
 
 }
 
-static char* twprint( char* text_buf, size_t *text_buf_size, size_t *insertion_pos, char* format, ...) {
-    char message[4096];
-    va_list vargs;
-    size_t new_insertion_pos;
-    size_t message_len;
+static	char*	twprint(	char*	text_buf,	size_t	*text_buf_size,	size_t	*insertion_pos,	char*	format,	...)	{
+				char	message[4096];
+				va_list	vargs;
+				size_t	new_insertion_pos;
+				size_t	message_len;
 
-    va_start(vargs, format);
-    vsprintf(message, format, vargs); // vsnprint ??
-    va_end(vargs);
+				va_start(vargs,	format);
+				vsprintf(message,	format,	vargs);	//	vsnprint	??
+				va_end(vargs);
 
-    message_len = strlen(message);
-    new_insertion_pos = *insertion_pos + message_len;
+				message_len	=	strlen(message);
+				new_insertion_pos	=	*insertion_pos	+	message_len;
 
-    if (text_buf == NULL) {
-        text_buf = (char*)calloc(1, size_t(BYTES_PER_MALLOC));
-    }
+				if	(text_buf	==	NULL)	{
+								text_buf	=	(char*)calloc(1,	size_t(BYTES_PER_MALLOC));
+				}
 
-    while ( new_insertion_pos > *text_buf_size) {
-        *text_buf_size += (size_t)BYTES_PER_MALLOC;
-        if ((text_buf = (char *)realloc( text_buf, *text_buf_size )) == NULL) {
-            std::cerr << "OUT_OF_MEMORY in twprint." << std::endl;
-            exit(1);
-        }
-    }
+				while	(	new_insertion_pos	>	*text_buf_size)	{
+								*text_buf_size	+=	(size_t)BYTES_PER_MALLOC;
+								if	((text_buf	=	(char	*)realloc(	text_buf,	*text_buf_size	))	==	NULL)	{
+												std::cerr	<<	"OUT_OF_MEMORY	in	twprint."	<<	std::endl;
+												exit(1);
+								}
+				}
 
-    strcpy(&text_buf[*insertion_pos], message);
-    *insertion_pos = new_insertion_pos;
+				strcpy(&text_buf[*insertion_pos],	message);
+				*insertion_pos	=	new_insertion_pos;
 
-    return (text_buf);
+				return	(text_buf);
 }
 
-// CLASS VARIABLE INITIALIZATION
-int TableViewNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	TableViewNode::instance_count	=	0;
 
-// CONSTRUCTOR
-TableViewNode::TableViewNode( Widget Toplevel, DPC_table* Table, int Xpos, int Ypos, int Width, int Height) {
+//	CONSTRUCTOR
+TableViewNode::TableViewNode(	Widget	Toplevel,	DPC_table*	Table,	int	Xpos,	int	Ypos,	int	Width,	int	Height)	{
 
-    Arg wargs[50];
-    int nargs;
+				Arg	wargs[50];
+				int	nargs;
 
-    int           n_columns;
-    int           colix;
-    double        *row_values;
-    char          **column_heading_format;
-    char          **column_data_format;
-    int           *column_width;
-    int           total_column_width;
-    char          *heading_line_string;
-    double        time;
-
-    const char * foreground_color;
-    const char * background_color;
-    Pixel fg,bg;
-    Pixmap pixmap;
-
-    const char *table_title;
-    const char *run_dir;
-
-    char charbuf[256];
-    char default_table_title[256];
-
-    const char * var_scale, * var_bias;
-    double var_scale_val, var_bias_val;
-
-    table = Table;
-    toplevel = Toplevel;
-
-    table_text_buf = NULL;
-    table_insertion_pos = 0;
-    table_buf_size = 0;
-
-    // -----------------------------
-    // Create the table widget name.
-    // -----------------------------
-
-    snprintf( charbuf, sizeof(charbuf), "Table_Dialog_%d", instance_count);
-
-    // ---------------------------
-    //
-    // ---------------------------
-    if ((table_title = table->getTitle()) == NULL ) {
-        snprintf( default_table_title, sizeof(default_table_title), "Table %d", instance_count);
-        table_title = default_table_title;
-    }
-
-    //title = strdup(table_title);
-    run_dir = table->getRunDir();
-
-    // --------------------------------------
-    // Create the dialog shell for this page.
-    // --------------------------------------
-    nargs = 0;
-    XtSetArg( wargs[nargs], XmNtitle, table_title ); nargs++;
-    XtSetArg( wargs[nargs], XmNx, 100 ); nargs++;
-    XtSetArg( wargs[nargs], XmNy, 100 ); nargs++;
-    XtSetArg( wargs[nargs], XmNmappedWhenManaged, False ); nargs++;
-
-    dialog_shell_widget = XmCreateDialogShell( toplevel, charbuf, wargs, nargs);
-
-    // ---------------------------------------------------------------------------------
-    // Create the form manager widget for this table whose parent is the dialog shell.
-    // ---------------------------------------------------------------------------------
-    snprintf( charbuf, sizeof(charbuf), "FormForTable%d", instance_count);
-
-    main_form_widget =
-        XtVaCreateWidget( charbuf,
-                          xmFormWidgetClass, dialog_shell_widget,
-                          NULL);
-
-    XtVaGetValues (main_form_widget, XmNforeground, &fg, XmNbackground, &bg, NULL);
-
-    // -------------------------------------------------------
-    // Ctrls form
-    // -------------------------------------------------------
-
-    ctrls_form_widget = XtVaCreateManagedWidget( "CtrlsForm", xmFormWidgetClass, main_form_widget,
-                                            XmNresizePolicy,     XmRESIZE_GROW,
-                                            XmNfractionBase,     10,
-                                            XmNtopAttachment,    XmATTACH_FORM,
-                                            XmNleftAttachment,   XmATTACH_FORM,
-                                            XmNrightAttachment,  XmATTACH_FORM,
-                                            XmNbottomAttachment, XmATTACH_NONE,
-                                            NULL);
-
-    XtVaGetValues (ctrls_form_widget, XmNforeground, &fg, XmNbackground, &bg, NULL);
-
-
-    save_button_widget = XtVaCreateManagedWidget( "Save", xmPushButtonWidgetClass, ctrls_form_widget,
-                                                  XmNleftAttachment,   XmATTACH_FORM,
-                                                  NULL);
-
-    XtAddCallback( save_button_widget, XmNactivateCallback, save_table_cb, (XtPointer)this);
-
-
-    pixmap = XmGetPixmap( XtScreen(toplevel), (char *)"trick_small.xpm", fg, bg);
-    if (pixmap == XmUNSPECIFIED_PIXMAP) {
-         trick_label = XtVaCreateManagedWidget( "Trick", xmLabelGadgetClass, ctrls_form_widget,
-                       XmNrightAttachment,  XmATTACH_FORM,
-                       NULL);
-    } else {
-         trick_label = XtVaCreateManagedWidget( "Trick", xmLabelGadgetClass, ctrls_form_widget,
-                       XmNrightAttachment,  XmATTACH_FORM,
-                       XmNlabelType,        XmPIXMAP,
-                       XmNlabelPixmap,      pixmap,
-                       NULL);
-    }
-
-    // -------------------------------------------------------
-    // Text Widget
-    // -------------------------------------------------------
-    nargs = 0;
-    XtSetArg( wargs[nargs], XmNeditable, False ); nargs++;
-    XtSetArg( wargs[nargs], XmNeditMode, XmMULTI_LINE_EDIT); nargs++;
-    XtSetArg( wargs[nargs], XmNcursorPositionVisible, False); nargs++;
-
-    text_widget = XmCreateScrolledText(main_form_widget, (char *)"scrolledtext", wargs, nargs);
-
-    XtVaSetValues( XtParent(text_widget),
-                   XmNwidth,                 500,
-                   XmNheight,                400,
-                   XmNtopAttachment,            XmATTACH_WIDGET,
-                   XmNtopWidget,                ctrls_form_widget,
-                   XmNbottomAttachment,         XmATTACH_FORM,
-                   XmNrightAttachment,          XmATTACH_FORM,
-                   XmNleftAttachment,           XmATTACH_FORM,
-                   NULL);
-
-    XtManageChild (text_widget);
-    XtManageChild (main_form_widget);
-
-
-    // -------------------------------------------------------
-    // Set the table's foreground color.
-    // -------------------------------------------------------
-    //XtVaSetValues( text_widget, XmNforeground, BlackPixel(XtDisplay(toplevel),0), NULL);
-    if ((foreground_color = table->getAttribute("foreground_color")) != NULL) {
-        XColor color_def;
-        if ( XParseColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), foreground_color, &color_def )) {
-            if ( XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                XtVaSetValues( text_widget, XmNforeground, color_def.pixel, NULL);
-            }
-        }
-    }
-
-    // -------------------------------------------------------
-    // Set the table's background color.
-    // -------------------------------------------------------
-    //XtVaSetValues( text_widget, XmNbackground, BlackPixel(XtDisplay(toplevel),0), NULL);
-    if ((background_color = table->getAttribute("background_color")) != NULL) {
-        XColor color_def;
-        if ( XParseColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), background_color, &color_def )) {
-            if ( XAllocColor(XtDisplay(toplevel), DefaultColormapOfScreen(XtScreen(toplevel)), &color_def )) {
-                XtVaSetValues( text_widget, XmNbackground, color_def.pixel, NULL);
-            }
-        }
-    }
-
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                              (char *)"Title: %s\n", table_title);
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                              (char *)"Run: %s\n", run_dir);
-
-    n_columns = table->getNumColumns();
-
-    column_heading_format = (char **)calloc( (size_t)n_columns, sizeof(char*));
-    column_data_format = (char **)calloc( (size_t)n_columns, sizeof(char*));
-    column_width  = (int *)calloc( (size_t)n_columns, sizeof(int));
-    total_column_width = 0;
-
-    for (colix=0; colix < n_columns ; colix++) {
-        int sign, width, precision, conv_char;
-        const char *user_format = table->getColumnAttribute( colix,"format");
-
-        // Determine whether the print format string that the user specified
-        // is valid. If it is, we need the width that was specified in the format
-        // so that we can use it for the column headings. If the user specified
-        // format is invalid, then we must use a default.
-
-        if ( parse_format_string(user_format, &sign, &width, &precision, &conv_char) < 0 ) {
-            // User supplied format failed to parse, so use the default.
-            column_heading_format[colix] = (char *)"%+18s";
-            column_data_format[colix] = strdup("%18.6e");
-            column_width[colix] = 18;
-        } else {
-            // Parse succeeded.
-            char temp_s[32];
-            snprintf(temp_s, sizeof(temp_s), "%%+%ds",width);
-            column_heading_format[colix] = strdup(temp_s);
-            column_data_format[colix] = strdup(user_format);
-            column_width[colix] = width;
-        }
-        total_column_width += column_width[colix];
-    }
-
-    heading_line_string = (char *)calloc( (size_t)total_column_width+1, sizeof(char));
-    memset(heading_line_string,'-',total_column_width);
-
-    // Print a line of dashes over the column headings.
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos, (char *)"%s\n", heading_line_string);
-
-    // ----------------------------------------------------------------
-    // Print out the column heading labels.
-    // ----------------------------------------------------------------
-    for (colix=0; colix < n_columns ; colix++) {
-        std::string column_label = table->getColumnLabel(colix);
-        if (column_label.empty()) {
-            snprintf( charbuf, sizeof(charbuf), "Column_%d", colix);
-            table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                                      column_heading_format[colix], charbuf);
-        } else {
-            table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                                      column_heading_format[colix], column_label.c_str());
-        }
-    }
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos, (char *)"\n");
-
-    // ----------------------------------------------------------------
-    // Print out the column heading units
-    // ----------------------------------------------------------------
-    for (colix=0; colix < n_columns ; colix++) {
-        const char *col_units = table->getColumnUnits( colix);
-        table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                                  column_heading_format[colix], col_units);
-    }
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos, (char *)"\n");
-
-    // Print a line of dashes under the column headings.
-    table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos, (char *)"%s\n", heading_line_string);
-
-    free(heading_line_string);
-    // ----------------------------------------------------------------
-    // ----------------------------------------------------------------
-    row_values = new double[n_columns];
-
-    while (table->getRow(&time, row_values)) {
-
-        for (colix=0; colix < n_columns ; colix++) {
-
-        	var_scale_val = 1.0;
-        	var_bias_val = 0.0;
-        	if ((var_scale = table->getVarAttribute(colix, "scale")) != NULL) {
-        	    var_scale_val = strtod(var_scale, NULL);
-        	}
-        	if ((var_bias = table->getVarAttribute(colix, "bias")) != NULL) {
-        	    var_bias_val = strtod(var_bias, NULL);
-        	}
-
-            table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos,
-                                      column_data_format[colix], (row_values[colix]*var_scale_val + var_bias_val));
-        }
-        table_text_buf = twprint( table_text_buf, &table_buf_size, &table_insertion_pos, (char *)"\n");
-    }
-
-    // Free all the column building arrays.
-    free( column_heading_format);
-    free( column_data_format);
-    free( column_width);
-
-    XtVaSetValues( text_widget, XmNvalue, table_text_buf, NULL);
-
-    XtVaSetValues(dialog_shell_widget,
-                  XmNx,       Xpos,
-                  XmNy,       Ypos,
-                  XmNwidth,   Width,
-                  XmNheight,  Height,
-                  NULL);
-
-    instance_count ++;
+				int											n_columns;
+				int											colix;
+				double								*row_values;
+				char										**column_heading_format;
+				char										**column_data_format;
+				int											*column_width;
+				int											total_column_width;
+				char										*heading_line_string;
+				double								time;
+
+				const	char	*	foreground_color;
+				const	char	*	background_color;
+				Pixel	fg,bg;
+				Pixmap	pixmap;
+
+				const	char	*table_title;
+				const	char	*run_dir;
+
+				char	charbuf[256];
+				char	default_table_title[256];
+
+				const	char	*	var_scale,	*	var_bias;
+				double	var_scale_val,	var_bias_val;
+
+				table	=	Table;
+				toplevel	=	Toplevel;
+
+				table_text_buf	=	NULL;
+				table_insertion_pos	=	0;
+				table_buf_size	=	0;
+
+				//	-----------------------------
+				//	Create	the	table	widget	name.
+				//	-----------------------------
+
+				snprintf(	charbuf,	sizeof(charbuf),	"Table_Dialog_%d",	instance_count);
+
+				//	---------------------------
+				//
+				//	---------------------------
+				if	((table_title	=	table->getTitle())	==	NULL	)	{
+								snprintf(	default_table_title,	sizeof(default_table_title),	"Table	%d",	instance_count);
+								table_title	=	default_table_title;
+				}
+
+				//title	=	strdup(table_title);
+				run_dir	=	table->getRunDir();
+
+				//	--------------------------------------
+				//	Create	the	dialog	shell	for	this	page.
+				//	--------------------------------------
+				nargs	=	0;
+				XtSetArg(	wargs[nargs],	XmNtitle,	table_title	);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNx,	100	);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNy,	100	);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNmappedWhenManaged,	False	);	nargs++;
+
+				dialog_shell_widget	=	XmCreateDialogShell(	toplevel,	charbuf,	wargs,	nargs);
+
+				//	---------------------------------------------------------------------------------
+				//	Create	the	form	manager	widget	for	this	table	whose	parent	is	the	dialog	shell.
+				//	---------------------------------------------------------------------------------
+				snprintf(	charbuf,	sizeof(charbuf),	"FormForTable%d",	instance_count);
+
+				main_form_widget	=
+								XtVaCreateWidget(	charbuf,
+																										xmFormWidgetClass,	dialog_shell_widget,
+																										NULL);
+
+				XtVaGetValues	(main_form_widget,	XmNforeground,	&fg,	XmNbackground,	&bg,	NULL);
+
+				//	-------------------------------------------------------
+				//	Ctrls	form
+				//	-------------------------------------------------------
+
+				ctrls_form_widget	=	XtVaCreateManagedWidget(	"CtrlsForm",	xmFormWidgetClass,	main_form_widget,
+																																												XmNresizePolicy,					XmRESIZE_GROW,
+																																												XmNfractionBase,					10,
+																																												XmNtopAttachment,				XmATTACH_FORM,
+																																												XmNleftAttachment,			XmATTACH_FORM,
+																																												XmNrightAttachment,		XmATTACH_FORM,
+																																												XmNbottomAttachment,	XmATTACH_NONE,
+																																												NULL);
+
+				XtVaGetValues	(ctrls_form_widget,	XmNforeground,	&fg,	XmNbackground,	&bg,	NULL);
+
+
+				save_button_widget	=	XtVaCreateManagedWidget(	"Save",	xmPushButtonWidgetClass,	ctrls_form_widget,
+																																																		XmNleftAttachment,			XmATTACH_FORM,
+																																																		NULL);
+
+				XtAddCallback(	save_button_widget,	XmNactivateCallback,	save_table_cb,	(XtPointer)this);
+
+
+				pixmap	=	XmGetPixmap(	XtScreen(toplevel),	(char	*)"trick_small.xpm",	fg,	bg);
+				if	(pixmap	==	XmUNSPECIFIED_PIXMAP)	{
+									trick_label	=	XtVaCreateManagedWidget(	"Trick",	xmLabelGadgetClass,	ctrls_form_widget,
+																							XmNrightAttachment,		XmATTACH_FORM,
+																							NULL);
+				}	else	{
+									trick_label	=	XtVaCreateManagedWidget(	"Trick",	xmLabelGadgetClass,	ctrls_form_widget,
+																							XmNrightAttachment,		XmATTACH_FORM,
+																							XmNlabelType,								XmPIXMAP,
+																							XmNlabelPixmap,						pixmap,
+																							NULL);
+				}
+
+				//	-------------------------------------------------------
+				//	Text	Widget
+				//	-------------------------------------------------------
+				nargs	=	0;
+				XtSetArg(	wargs[nargs],	XmNeditable,	False	);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNeditMode,	XmMULTI_LINE_EDIT);	nargs++;
+				XtSetArg(	wargs[nargs],	XmNcursorPositionVisible,	False);	nargs++;
+
+				text_widget	=	XmCreateScrolledText(main_form_widget,	(char	*)"scrolledtext",	wargs,	nargs);
+
+				XtVaSetValues(	XtParent(text_widget),
+																			XmNwidth,																	500,
+																			XmNheight,																400,
+																			XmNtopAttachment,												XmATTACH_WIDGET,
+																			XmNtopWidget,																ctrls_form_widget,
+																			XmNbottomAttachment,									XmATTACH_FORM,
+																			XmNrightAttachment,										XmATTACH_FORM,
+																			XmNleftAttachment,											XmATTACH_FORM,
+																			NULL);
+
+				XtManageChild	(text_widget);
+				XtManageChild	(main_form_widget);
+
+
+				//	-------------------------------------------------------
+				//	Set	the	table's	foreground	color.
+				//	-------------------------------------------------------
+				//XtVaSetValues(	text_widget,	XmNforeground,	BlackPixel(XtDisplay(toplevel),0),	NULL);
+				if	((foreground_color	=	table->getAttribute("foreground_color"))	!=	NULL)	{
+								XColor	color_def;
+								if	(	XParseColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	foreground_color,	&color_def	))	{
+												if	(	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																XtVaSetValues(	text_widget,	XmNforeground,	color_def.pixel,	NULL);
+												}
+								}
+				}
+
+				//	-------------------------------------------------------
+				//	Set	the	table's	background	color.
+				//	-------------------------------------------------------
+				//XtVaSetValues(	text_widget,	XmNbackground,	BlackPixel(XtDisplay(toplevel),0),	NULL);
+				if	((background_color	=	table->getAttribute("background_color"))	!=	NULL)	{
+								XColor	color_def;
+								if	(	XParseColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	background_color,	&color_def	))	{
+												if	(	XAllocColor(XtDisplay(toplevel),	DefaultColormapOfScreen(XtScreen(toplevel)),	&color_def	))	{
+																XtVaSetValues(	text_widget,	XmNbackground,	color_def.pixel,	NULL);
+												}
+								}
+				}
+
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																														(char	*)"Title:	%s\n",	table_title);
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																														(char	*)"Run:	%s\n",	run_dir);
+
+				n_columns	=	table->getNumColumns();
+
+				column_heading_format	=	(char	**)calloc(	(size_t)n_columns,	sizeof(char*));
+				column_data_format	=	(char	**)calloc(	(size_t)n_columns,	sizeof(char*));
+				column_width		=	(int	*)calloc(	(size_t)n_columns,	sizeof(int));
+				total_column_width	=	0;
+
+				for	(colix=0;	colix	<	n_columns	;	colix++)	{
+								int	sign,	width,	precision,	conv_char;
+								const	char	*user_format	=	table->getColumnAttribute(	colix,"format");
+
+								//	Determine	whether	the	print	format	string	that	the	user	specified
+								//	is	valid.	If	it	is,	we	need	the	width	that	was	specified	in	the	format
+								//	so	that	we	can	use	it	for	the	column	headings.	If	the	user	specified
+								//	format	is	invalid,	then	we	must	use	a	default.
+
+								if	(	parse_format_string(user_format,	&sign,	&width,	&precision,	&conv_char)	<	0	)	{
+												//	User	supplied	format	failed	to	parse,	so	use	the	default.
+												column_heading_format[colix]	=	(char	*)"%+18s";
+												column_data_format[colix]	=	strdup("%18.6e");
+												column_width[colix]	=	18;
+								}	else	{
+												//	Parse	succeeded.
+												char	temp_s[32];
+												snprintf(temp_s,	sizeof(temp_s),	"%%+%ds",width);
+												column_heading_format[colix]	=	strdup(temp_s);
+												column_data_format[colix]	=	strdup(user_format);
+												column_width[colix]	=	width;
+								}
+								total_column_width	+=	column_width[colix];
+				}
+
+				heading_line_string	=	(char	*)calloc(	(size_t)total_column_width+1,	sizeof(char));
+				memset(heading_line_string,'-',total_column_width);
+
+				//	Print	a	line	of	dashes	over	the	column	headings.
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,	(char	*)"%s\n",	heading_line_string);
+
+				//	----------------------------------------------------------------
+				//	Print	out	the	column	heading	labels.
+				//	----------------------------------------------------------------
+				for	(colix=0;	colix	<	n_columns	;	colix++)	{
+								std::string	column_label	=	table->getColumnLabel(colix);
+								if	(column_label.empty())	{
+												snprintf(	charbuf,	sizeof(charbuf),	"Column_%d",	colix);
+												table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																																						column_heading_format[colix],	charbuf);
+								}	else	{
+												table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																																						column_heading_format[colix],	column_label.c_str());
+								}
+				}
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,	(char	*)"\n");
+
+				//	----------------------------------------------------------------
+				//	Print	out	the	column	heading	units
+				//	----------------------------------------------------------------
+				for	(colix=0;	colix	<	n_columns	;	colix++)	{
+								const	char	*col_units	=	table->getColumnUnits(	colix);
+								table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																																		column_heading_format[colix],	col_units);
+				}
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,	(char	*)"\n");
+
+				//	Print	a	line	of	dashes	under	the	column	headings.
+				table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,	(char	*)"%s\n",	heading_line_string);
+
+				free(heading_line_string);
+				//	----------------------------------------------------------------
+				//	----------------------------------------------------------------
+				row_values	=	new	double[n_columns];
+
+				while	(table->getRow(&time,	row_values))	{
+
+								for	(colix=0;	colix	<	n_columns	;	colix++)	{
+
+									var_scale_val	=	1.0;
+									var_bias_val	=	0.0;
+									if	((var_scale	=	table->getVarAttribute(colix,	"scale"))	!=	NULL)	{
+													var_scale_val	=	strtod(var_scale,	NULL);
+									}
+									if	((var_bias	=	table->getVarAttribute(colix,	"bias"))	!=	NULL)	{
+													var_bias_val	=	strtod(var_bias,	NULL);
+									}
+
+												table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,
+																																						column_data_format[colix],	(row_values[colix]*var_scale_val	+	var_bias_val));
+								}
+								table_text_buf	=	twprint(	table_text_buf,	&table_buf_size,	&table_insertion_pos,	(char	*)"\n");
+				}
+
+				//	Free	all	the	column	building	arrays.
+				free(	column_heading_format);
+				free(	column_data_format);
+				free(	column_width);
+
+				XtVaSetValues(	text_widget,	XmNvalue,	table_text_buf,	NULL);
+
+				XtVaSetValues(dialog_shell_widget,
+																		XmNx,							Xpos,
+																		XmNy,							Ypos,
+																		XmNwidth,			Width,
+																		XmNheight,		Height,
+																		NULL);
+
+				instance_count	++;
 }
 
 //DESTRUCTOR
-TableViewNode::~TableViewNode() {
-
-    #ifdef DEBUG
-    std::cout << "TableViewNode DESTRUCTOR." << std::endl;
-    #endif
-
-    if (table_text_buf != NULL) {
-        free(table_text_buf);
-    }
-    // FIXME: figure out how to destroy text_widget without
-    //        getting warning messages.
-    // XtDestroyWidget(text_widget);
-
-    XtDestroyWidget(trick_label);
-    XtDestroyWidget(save_button_widget);
-    XtDestroyWidget(ctrls_form_widget);
-    XtDestroyWidget(main_form_widget);
-    XtDestroyWidget(dialog_shell_widget);
+TableViewNode::~TableViewNode()	{
+
+				#ifdef	DEBUG
+				std::cout	<<	"TableViewNode	DESTRUCTOR."	<<	std::endl;
+				#endif
+
+				if	(table_text_buf	!=	NULL)	{
+								free(table_text_buf);
+				}
+				//	FIXME:	figure	out	how	to	destroy	text_widget	without
+				//								getting	warning	messages.
+				//	XtDestroyWidget(text_widget);
+
+				XtDestroyWidget(trick_label);
+				XtDestroyWidget(save_button_widget);
+				XtDestroyWidget(ctrls_form_widget);
+				XtDestroyWidget(main_form_widget);
+				XtDestroyWidget(dialog_shell_widget);
 }
 
-void TableViewNode::finalize() {
-    // Do Nothing.
+void	TableViewNode::finalize()	{
+				//	Do	Nothing.
 }
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_colors.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_colors.cpp
index 0db5c77ff..359a7347f 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_colors.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_colors.cpp
@@ -1,930 +1,930 @@
 
-#include <stdio.h>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <stdlib.h>
-#include <string.h>
+#include	<stdio.h>
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<fstream>
+#include	<stdlib.h>
+#include	<string.h>
 
-#include "gp_colors.hh"
-#include "gp_version.hh"
+#include	"gp_colors.hh"
+#include	"gp_version.hh"
 
-using namespace std;
+using	namespace	std;
 
 
-const COLOR_TRANS color_trans[] = {
-   {"AliceBlue"               , "xf0f8ff" , 0.941176 , 0.972549 , 1.000000} ,
-   {"AntiqueWhite"            , "xfaebd7" , 0.980392 , 0.921569 , 0.843137} ,
-   {"AntiqueWhite1"           , "xffefdb" , 1.000000 , 0.937255 , 0.858824} ,
-   {"AntiqueWhite2"           , "xeedfcc" , 0.933333 , 0.874510 , 0.800000} ,
-   {"AntiqueWhite3"           , "xcdc0b0" , 0.803922 , 0.752941 , 0.690196} ,
-   {"AntiqueWhite4"           , "x8b8378" , 0.545098 , 0.513725 , 0.470588} ,
-   {"BlanchedAlmond"          , "xffebcd" , 1.000000 , 0.921569 , 0.803922} ,
-   {"BlueViolet"              , "x8a2be2" , 0.541176 , 0.168627 , 0.886275} ,
-   {"CadetBlue"               , "x5f9ea0" , 0.372549 , 0.619608 , 0.627451} ,
-   {"CadetBlue1"              , "x98f5ff" , 0.596078 , 0.960784 , 1.000000} ,
-   {"CadetBlue2"              , "x8ee5ee" , 0.556863 , 0.898039 , 0.933333} ,
-   {"CadetBlue3"              , "x7ac5cd" , 0.478431 , 0.772549 , 0.803922} ,
-   {"CadetBlue4"              , "x53868b" , 0.325490 , 0.525490 , 0.545098} ,
-   {"CornflowerBlue"          , "x6495ed" , 0.392157 , 0.584314 , 0.929412} ,
-   {"DarkBlue"                , "x00008b" , 0.000000 , 0.000000 , 0.545098} ,
-   {"DarkCyan"                , "x008b8b" , 0.000000 , 0.545098 , 0.545098} ,
-   {"DarkGoldenrod"           , "xb8860b" , 0.721569 , 0.525490 , 0.043137} ,
-   {"DarkGoldenrod1"          , "xffb90f" , 1.000000 , 0.725490 , 0.058824} ,
-   {"DarkGoldenrod2"          , "xeead0e" , 0.933333 , 0.678431 , 0.054902} ,
-   {"DarkGoldenrod3"          , "xcd950c" , 0.803922 , 0.584314 , 0.047059} ,
-   {"DarkGoldenrod4"          , "x8b6508" , 0.545098 , 0.396078 , 0.031373} ,
-   {"DarkGray"                , "xa9a9a9" , 0.662745 , 0.662745 , 0.662745} ,
-   {"DarkGreen"               , "x006400" , 0.000000 , 0.392157 , 0.000000} ,
-   {"DarkGrey"                , "xa9a9a9" , 0.662745 , 0.662745 , 0.662745} ,
-   {"DarkKhaki"               , "xbdb76b" , 0.741176 , 0.717647 , 0.419608} ,
-   {"DarkMagenta"             , "x8b008b" , 0.545098 , 0.000000 , 0.545098} ,
-   {"DarkOliveGreen"          , "x556b2f" , 0.333333 , 0.419608 , 0.184314} ,
-   {"DarkOliveGreen1"         , "xcaff70" , 0.792157 , 1.000000 , 0.439216} ,
-   {"DarkOliveGreen2"         , "xbcee68" , 0.737255 , 0.933333 , 0.407843} ,
-   {"DarkOliveGreen3"         , "xa2cd5a" , 0.635294 , 0.803922 , 0.352941} ,
-   {"DarkOliveGreen4"         , "x6e8b3d" , 0.431373 , 0.545098 , 0.239216} ,
-   {"DarkOrange"              , "xff8c00" , 1.000000 , 0.549020 , 0.000000} ,
-   {"DarkOrange1"             , "xff7f00" , 1.000000 , 0.498039 , 0.000000} ,
-   {"DarkOrange2"             , "xee7600" , 0.933333 , 0.462745 , 0.000000} ,
-   {"DarkOrange3"             , "xcd6600" , 0.803922 , 0.400000 , 0.000000} ,
-   {"DarkOrange4"             , "x8b4500" , 0.545098 , 0.270588 , 0.000000} ,
-   {"DarkOrchid"              , "x9932cc" , 0.600000 , 0.196078 , 0.800000} ,
-   {"DarkOrchid1"             , "xbf3eff" , 0.749020 , 0.243137 , 1.000000} ,
-   {"DarkOrchid2"             , "xb23aee" , 0.698039 , 0.227451 , 0.933333} ,
-   {"DarkOrchid3"             , "x9a32cd" , 0.603922 , 0.196078 , 0.803922} ,
-   {"DarkOrchid4"             , "x68228b" , 0.407843 , 0.133333 , 0.545098} ,
-   {"DarkRed"                 , "x8b0000" , 0.545098 , 0.000000 , 0.000000} ,
-   {"DarkSalmon"              , "xe9967a" , 0.913725 , 0.588235 , 0.478431} ,
-   {"DarkSeaGreen"            , "x8fbc8f" , 0.560784 , 0.737255 , 0.560784} ,
-   {"DarkSeaGreen1"           , "xc1ffc1" , 0.756863 , 1.000000 , 0.756863} ,
-   {"DarkSeaGreen2"           , "xb4eeb4" , 0.705882 , 0.933333 , 0.705882} ,
-   {"DarkSeaGreen3"           , "x9bcd9b" , 0.607843 , 0.803922 , 0.607843} ,
-   {"DarkSeaGreen4"           , "x698b69" , 0.411765 , 0.545098 , 0.411765} ,
-   {"DarkSlateBlue"           , "x483d8b" , 0.282353 , 0.239216 , 0.545098} ,
-   {"DarkSlateGray"           , "x2f4f4f" , 0.184314 , 0.309804 , 0.309804} ,
-   {"DarkSlateGray1"          , "x97ffff" , 0.592157 , 1.000000 , 1.000000} ,
-   {"DarkSlateGray2"          , "x8deeee" , 0.552941 , 0.933333 , 0.933333} ,
-   {"DarkSlateGray3"          , "x79cdcd" , 0.474510 , 0.803922 , 0.803922} ,
-   {"DarkSlateGray4"          , "x528b8b" , 0.321569 , 0.545098 , 0.545098} ,
-   {"DarkSlateGrey"           , "x2f4f4f" , 0.184314 , 0.309804 , 0.309804} ,
-   {"DarkTurquoise"           , "x00ced1" , 0.000000 , 0.807843 , 0.819608} ,
-   {"DarkViolet"              , "x9400d3" , 0.580392 , 0.000000 , 0.827451} ,
-   {"DeepPink"                , "xff1493" , 1.000000 , 0.078431 , 0.576471} ,
-   {"DeepPink1"               , "xff1493" , 1.000000 , 0.078431 , 0.576471} ,
-   {"DeepPink2"               , "xee1289" , 0.933333 , 0.070588 , 0.537255} ,
-   {"DeepPink3"               , "xcd1076" , 0.803922 , 0.062745 , 0.462745} ,
-   {"DeepPink4"               , "x8b0a50" , 0.545098 , 0.039216 , 0.313725} ,
-   {"DeepSkyBlue"             , "x00bfff" , 0.000000 , 0.749020 , 1.000000} ,
-   {"DeepSkyBlue1"            , "x00bfff" , 0.000000 , 0.749020 , 1.000000} ,
-   {"DeepSkyBlue2"            , "x00b2ee" , 0.000000 , 0.698039 , 0.933333} ,
-   {"DeepSkyBlue3"            , "x009acd" , 0.000000 , 0.603922 , 0.803922} ,
-   {"DeepSkyBlue4"            , "x00688b" , 0.000000 , 0.407843 , 0.545098} ,
-   {"DimGray"                 , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"DimGrey"                 , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"DodgerBlue"              , "x1e90ff" , 0.117647 , 0.564706 , 1.000000} ,
-   {"DodgerBlue1"             , "x1e90ff" , 0.117647 , 0.564706 , 1.000000} ,
-   {"DodgerBlue2"             , "x1c86ee" , 0.109804 , 0.525490 , 0.933333} ,
-   {"DodgerBlue3"             , "x1874cd" , 0.094118 , 0.454902 , 0.803922} ,
-   {"DodgerBlue4"             , "x104e8b" , 0.062745 , 0.305882 , 0.545098} ,
-   {"FloralWhite"             , "xfffaf0" , 1.000000 , 0.980392 , 0.941176} ,
-   {"ForestGreen"             , "x228b22" , 0.133333 , 0.545098 , 0.133333} ,
-   {"GhostWhite"              , "xf8f8ff" , 0.972549 , 0.972549 , 1.000000} ,
-   {"GreenYellow"             , "xadff2f" , 0.678431 , 1.000000 , 0.184314} ,
-   {"HotPink"                 , "xff69b4" , 1.000000 , 0.411765 , 0.705882} ,
-   {"HotPink1"                , "xff6eb4" , 1.000000 , 0.431373 , 0.705882} ,
-   {"HotPink2"                , "xee6aa7" , 0.933333 , 0.415686 , 0.654902} ,
-   {"HotPink3"                , "xcd6090" , 0.803922 , 0.376471 , 0.564706} ,
-   {"HotPink4"                , "x8b3a62" , 0.545098 , 0.227451 , 0.384314} ,
-   {"IndianRed"               , "xcd5c5c" , 0.803922 , 0.360784 , 0.360784} ,
-   {"IndianRed1"              , "xff6a6a" , 1.000000 , 0.415686 , 0.415686} ,
-   {"IndianRed2"              , "xee6363" , 0.933333 , 0.388235 , 0.388235} ,
-   {"IndianRed3"              , "xcd5555" , 0.803922 , 0.333333 , 0.333333} ,
-   {"IndianRed4"              , "x8b3a3a" , 0.545098 , 0.227451 , 0.227451} ,
-   {"LavenderBlush"           , "xfff0f5" , 1.000000 , 0.941176 , 0.960784} ,
-   {"LavenderBlush1"          , "xfff0f5" , 1.000000 , 0.941176 , 0.960784} ,
-   {"LavenderBlush2"          , "xeee0e5" , 0.933333 , 0.878431 , 0.898039} ,
-   {"LavenderBlush3"          , "xcdc1c5" , 0.803922 , 0.756863 , 0.772549} ,
-   {"LavenderBlush4"          , "x8b8386" , 0.545098 , 0.513725 , 0.525490} ,
-   {"LawnGreen"               , "x7cfc00" , 0.486275 , 0.988235 , 0.000000} ,
-   {"LemonChiffon"            , "xfffacd" , 1.000000 , 0.980392 , 0.803922} ,
-   {"LemonChiffon1"           , "xfffacd" , 1.000000 , 0.980392 , 0.803922} ,
-   {"LemonChiffon2"           , "xeee9bf" , 0.933333 , 0.913725 , 0.749020} ,
-   {"LemonChiffon3"           , "xcdc9a5" , 0.803922 , 0.788235 , 0.647059} ,
-   {"LemonChiffon4"           , "x8b8970" , 0.545098 , 0.537255 , 0.439216} ,
-   {"LightBlue"               , "xadd8e6" , 0.678431 , 0.847059 , 0.901961} ,
-   {"LightBlue1"              , "xbfefff" , 0.749020 , 0.937255 , 1.000000} ,
-   {"LightBlue2"              , "xb2dfee" , 0.698039 , 0.874510 , 0.933333} ,
-   {"LightBlue3"              , "x9ac0cd" , 0.603922 , 0.752941 , 0.803922} ,
-   {"LightBlue4"              , "x68838b" , 0.407843 , 0.513725 , 0.545098} ,
-   {"LightCoral"              , "xf08080" , 0.941176 , 0.501961 , 0.501961} ,
-   {"LightCyan"               , "xe0ffff" , 0.878431 , 1.000000 , 1.000000} ,
-   {"LightCyan1"              , "xe0ffff" , 0.878431 , 1.000000 , 1.000000} ,
-   {"LightCyan2"              , "xd1eeee" , 0.819608 , 0.933333 , 0.933333} ,
-   {"LightCyan3"              , "xb4cdcd" , 0.705882 , 0.803922 , 0.803922} ,
-   {"LightCyan4"              , "x7a8b8b" , 0.478431 , 0.545098 , 0.545098} ,
-   {"LightGoldenrod"          , "xeedd82" , 0.933333 , 0.866667 , 0.509804} ,
-   {"LightGoldenrod1"         , "xffec8b" , 1.000000 , 0.925490 , 0.545098} ,
-   {"LightGoldenrod2"         , "xeedc82" , 0.933333 , 0.862745 , 0.509804} ,
-   {"LightGoldenrod3"         , "xcdbe70" , 0.803922 , 0.745098 , 0.439216} ,
-   {"LightGoldenrod4"         , "x8b814c" , 0.545098 , 0.505882 , 0.298039} ,
-   {"LightGoldenrodYellow"    , "xfafad2" , 0.980392 , 0.980392 , 0.823529} ,
-   {"LightGray"               , "xd3d3d3" , 0.827451 , 0.827451 , 0.827451} ,
-   {"LightGreen"              , "x90ee90" , 0.564706 , 0.933333 , 0.564706} ,
-   {"LightGrey"               , "xd3d3d3" , 0.827451 , 0.827451 , 0.827451} ,
-   {"LightPink"               , "xffb6c1" , 1.000000 , 0.713725 , 0.756863} ,
-   {"LightPink1"              , "xffaeb9" , 1.000000 , 0.682353 , 0.725490} ,
-   {"LightPink2"              , "xeea2ad" , 0.933333 , 0.635294 , 0.678431} ,
-   {"LightPink3"              , "xcd8c95" , 0.803922 , 0.549020 , 0.584314} ,
-   {"LightPink4"              , "x8b5f65" , 0.545098 , 0.372549 , 0.396078} ,
-   {"LightSalmon"             , "xffa07a" , 1.000000 , 0.627451 , 0.478431} ,
-   {"LightSalmon1"            , "xffa07a" , 1.000000 , 0.627451 , 0.478431} ,
-   {"LightSalmon2"            , "xee9572" , 0.933333 , 0.584314 , 0.447059} ,
-   {"LightSalmon3"            , "xcd8162" , 0.803922 , 0.505882 , 0.384314} ,
-   {"LightSalmon4"            , "x8b5742" , 0.545098 , 0.341176 , 0.258824} ,
-   {"LightSeaGreen"           , "x20b2aa" , 0.125490 , 0.698039 , 0.666667} ,
-   {"LightSkyBlue"            , "x87cefa" , 0.529412 , 0.807843 , 0.980392} ,
-   {"LightSkyBlue1"           , "xb0e2ff" , 0.690196 , 0.886275 , 1.000000} ,
-   {"LightSkyBlue2"           , "xa4d3ee" , 0.643137 , 0.827451 , 0.933333} ,
-   {"LightSkyBlue3"           , "x8db6cd" , 0.552941 , 0.713725 , 0.803922} ,
-   {"LightSkyBlue4"           , "x607b8b" , 0.376471 , 0.482353 , 0.545098} ,
-   {"LightSlateBlue"          , "x8470ff" , 0.517647 , 0.439216 , 1.000000} ,
-   {"LightSlateGray"          , "x778899" , 0.466667 , 0.533333 , 0.600000} ,
-   {"LightSlateGrey"          , "x778899" , 0.466667 , 0.533333 , 0.600000} ,
-   {"LightSteelBlue"          , "xb0c4de" , 0.690196 , 0.768627 , 0.870588} ,
-   {"LightSteelBlue1"         , "xcae1ff" , 0.792157 , 0.882353 , 1.000000} ,
-   {"LightSteelBlue2"         , "xbcd2ee" , 0.737255 , 0.823529 , 0.933333} ,
-   {"LightSteelBlue3"         , "xa2b5cd" , 0.635294 , 0.709804 , 0.803922} ,
-   {"LightSteelBlue4"         , "x6e7b8b" , 0.431373 , 0.482353 , 0.545098} ,
-   {"LightYellow"             , "xffffe0" , 1.000000 , 1.000000 , 0.878431} ,
-   {"LightYellow1"            , "xffffe0" , 1.000000 , 1.000000 , 0.878431} ,
-   {"LightYellow2"            , "xeeeed1" , 0.933333 , 0.933333 , 0.819608} ,
-   {"LightYellow3"            , "xcdcdb4" , 0.803922 , 0.803922 , 0.705882} ,
-   {"LightYellow4"            , "x8b8b7a" , 0.545098 , 0.545098 , 0.478431} ,
-   {"LimeGreen"               , "x32cd32" , 0.196078 , 0.803922 , 0.196078} ,
-   {"MediumAquamarine"        , "x66cdaa" , 0.400000 , 0.803922 , 0.666667} ,
-   {"MediumBlue"              , "x0000cd" , 0.000000 , 0.000000 , 0.803922} ,
-   {"MediumOrchid"            , "xba55d3" , 0.729412 , 0.333333 , 0.827451} ,
-   {"MediumOrchid1"           , "xe066ff" , 0.878431 , 0.400000 , 1.000000} ,
-   {"MediumOrchid2"           , "xd15fee" , 0.819608 , 0.372549 , 0.933333} ,
-   {"MediumOrchid3"           , "xb452cd" , 0.705882 , 0.321569 , 0.803922} ,
-   {"MediumOrchid4"           , "x7a378b" , 0.478431 , 0.215686 , 0.545098} ,
-   {"MediumPurple"            , "x9370db" , 0.576471 , 0.439216 , 0.858824} ,
-   {"MediumPurple1"           , "xab82ff" , 0.670588 , 0.509804 , 1.000000} ,
-   {"MediumPurple2"           , "x9f79ee" , 0.623529 , 0.474510 , 0.933333} ,
-   {"MediumPurple3"           , "x8968cd" , 0.537255 , 0.407843 , 0.803922} ,
-   {"MediumPurple4"           , "x5d478b" , 0.364706 , 0.278431 , 0.545098} ,
-   {"MediumSeaGreen"          , "x3cb371" , 0.235294 , 0.701961 , 0.443137} ,
-   {"MediumSlateBlue"         , "x7b68ee" , 0.482353 , 0.407843 , 0.933333} ,
-   {"MediumSpringGreen"       , "x00fa9a" , 0.000000 , 0.980392 , 0.603922} ,
-   {"MediumTurquoise"         , "x48d1cc" , 0.282353 , 0.819608 , 0.800000} ,
-   {"MediumVioletRed"         , "xc71585" , 0.780392 , 0.082353 , 0.521569} ,
-   {"MidnightBlue"            , "x191970" , 0.098039 , 0.098039 , 0.439216} ,
-   {"MintCream"               , "xf5fffa" , 0.960784 , 1.000000 , 0.980392} ,
-   {"MistyRose"               , "xffe4e1" , 1.000000 , 0.894118 , 0.882353} ,
-   {"MistyRose1"              , "xffe4e1" , 1.000000 , 0.894118 , 0.882353} ,
-   {"MistyRose2"              , "xeed5d2" , 0.933333 , 0.835294 , 0.823529} ,
-   {"MistyRose3"              , "xcdb7b5" , 0.803922 , 0.717647 , 0.709804} ,
-   {"MistyRose4"              , "x8b7d7b" , 0.545098 , 0.490196 , 0.482353} ,
-   {"NavajoWhite"             , "xffdead" , 1.000000 , 0.870588 , 0.678431} ,
-   {"NavajoWhite1"            , "xffdead" , 1.000000 , 0.870588 , 0.678431} ,
-   {"NavajoWhite2"            , "xeecfa1" , 0.933333 , 0.811765 , 0.631373} ,
-   {"NavajoWhite3"            , "xcdb38b" , 0.803922 , 0.701961 , 0.545098} ,
-   {"NavajoWhite4"            , "x8b795e" , 0.545098 , 0.474510 , 0.368627} ,
-   {"NavyBlue"                , "x000080" , 0.000000 , 0.000000 , 0.501961} ,
-   {"OldLace"                 , "xfdf5e6" , 0.992157 , 0.960784 , 0.901961} ,
-   {"OliveDrab"               , "x6b8e23" , 0.419608 , 0.556863 , 0.137255} ,
-   {"OliveDrab1"              , "xc0ff3e" , 0.752941 , 1.000000 , 0.243137} ,
-   {"OliveDrab2"              , "xb3ee3a" , 0.701961 , 0.933333 , 0.227451} ,
-   {"OliveDrab3"              , "x9acd32" , 0.603922 , 0.803922 , 0.196078} ,
-   {"OliveDrab4"              , "x698b22" , 0.411765 , 0.545098 , 0.133333} ,
-   {"OrangeRed"               , "xff4500" , 1.000000 , 0.270588 , 0.000000} ,
-   {"OrangeRed1"              , "xff4500" , 1.000000 , 0.270588 , 0.000000} ,
-   {"OrangeRed2"              , "xee4000" , 0.933333 , 0.250980 , 0.000000} ,
-   {"OrangeRed3"              , "xcd3700" , 0.803922 , 0.215686 , 0.000000} ,
-   {"OrangeRed4"              , "x8b2500" , 0.545098 , 0.145098 , 0.000000} ,
-   {"PaleGoldenrod"           , "xeee8aa" , 0.933333 , 0.909804 , 0.666667} ,
-   {"PaleGreen"               , "x98fb98" , 0.596078 , 0.984314 , 0.596078} ,
-   {"PaleGreen1"              , "x9aff9a" , 0.603922 , 1.000000 , 0.603922} ,
-   {"PaleGreen2"              , "x90ee90" , 0.564706 , 0.933333 , 0.564706} ,
-   {"PaleGreen3"              , "x7ccd7c" , 0.486275 , 0.803922 , 0.486275} ,
-   {"PaleGreen4"              , "x548b54" , 0.329412 , 0.545098 , 0.329412} ,
-   {"PaleTurquoise"           , "xafeeee" , 0.686275 , 0.933333 , 0.933333} ,
-   {"PaleTurquoise1"          , "xbbffff" , 0.733333 , 1.000000 , 1.000000} ,
-   {"PaleTurquoise2"          , "xaeeeee" , 0.682353 , 0.933333 , 0.933333} ,
-   {"PaleTurquoise3"          , "x96cdcd" , 0.588235 , 0.803922 , 0.803922} ,
-   {"PaleTurquoise4"          , "x668b8b" , 0.400000 , 0.545098 , 0.545098} ,
-   {"PaleVioletRed"           , "xdb7093" , 0.858824 , 0.439216 , 0.576471} ,
-   {"PaleVioletRed1"          , "xff82ab" , 1.000000 , 0.509804 , 0.670588} ,
-   {"PaleVioletRed2"          , "xee799f" , 0.933333 , 0.474510 , 0.623529} ,
-   {"PaleVioletRed3"          , "xcd6889" , 0.803922 , 0.407843 , 0.537255} ,
-   {"PaleVioletRed4"          , "x8b475d" , 0.545098 , 0.278431 , 0.364706} ,
-   {"PapayaWhip"              , "xffefd5" , 1.000000 , 0.937255 , 0.835294} ,
-   {"PeachPuff"               , "xffdab9" , 1.000000 , 0.854902 , 0.725490} ,
-   {"PeachPuff1"              , "xffdab9" , 1.000000 , 0.854902 , 0.725490} ,
-   {"PeachPuff2"              , "xeecbad" , 0.933333 , 0.796078 , 0.678431} ,
-   {"PeachPuff3"              , "xcdaf95" , 0.803922 , 0.686275 , 0.584314} ,
-   {"PeachPuff4"              , "x8b7765" , 0.545098 , 0.466667 , 0.396078} ,
-   {"PowderBlue"              , "xb0e0e6" , 0.690196 , 0.878431 , 0.901961} ,
-   {"RosyBrown"               , "xbc8f8f" , 0.737255 , 0.560784 , 0.560784} ,
-   {"RosyBrown1"              , "xffc1c1" , 1.000000 , 0.756863 , 0.756863} ,
-   {"RosyBrown2"              , "xeeb4b4" , 0.933333 , 0.705882 , 0.705882} ,
-   {"RosyBrown3"              , "xcd9b9b" , 0.803922 , 0.607843 , 0.607843} ,
-   {"RosyBrown4"              , "x8b6969" , 0.545098 , 0.411765 , 0.411765} ,
-   {"RoyalBlue"               , "x4169e1" , 0.254902 , 0.411765 , 0.882353} ,
-   {"RoyalBlue1"              , "x4876ff" , 0.282353 , 0.462745 , 1.000000} ,
-   {"RoyalBlue2"              , "x436eee" , 0.262745 , 0.431373 , 0.933333} ,
-   {"RoyalBlue3"              , "x3a5fcd" , 0.227451 , 0.372549 , 0.803922} ,
-   {"RoyalBlue4"              , "x27408b" , 0.152941 , 0.250980 , 0.545098} ,
-   {"SaddleBrown"             , "x8b4513" , 0.545098 , 0.270588 , 0.074510} ,
-   {"SandyBrown"              , "xf4a460" , 0.956863 , 0.643137 , 0.376471} ,
-   {"SeaGreen"                , "x2e8b57" , 0.180392 , 0.545098 , 0.341176} ,
-   {"SeaGreen1"               , "x54ff9f" , 0.329412 , 1.000000 , 0.623529} ,
-   {"SeaGreen2"               , "x4eee94" , 0.305882 , 0.933333 , 0.580392} ,
-   {"SeaGreen3"               , "x43cd80" , 0.262745 , 0.803922 , 0.501961} ,
-   {"SeaGreen4"               , "x2e8b57" , 0.180392 , 0.545098 , 0.341176} ,
-   {"SkyBlue"                 , "x87ceeb" , 0.529412 , 0.807843 , 0.921569} ,
-   {"SkyBlue1"                , "x87ceff" , 0.529412 , 0.807843 , 1.000000} ,
-   {"SkyBlue2"                , "x7ec0ee" , 0.494118 , 0.752941 , 0.933333} ,
-   {"SkyBlue3"                , "x6ca6cd" , 0.423529 , 0.650980 , 0.803922} ,
-   {"SkyBlue4"                , "x4a708b" , 0.290196 , 0.439216 , 0.545098} ,
-   {"SlateBlue"               , "x6a5acd" , 0.415686 , 0.352941 , 0.803922} ,
-   {"SlateBlue1"              , "x836fff" , 0.513725 , 0.435294 , 1.000000} ,
-   {"SlateBlue2"              , "x7a67ee" , 0.478431 , 0.403922 , 0.933333} ,
-   {"SlateBlue3"              , "x6959cd" , 0.411765 , 0.349020 , 0.803922} ,
-   {"SlateBlue4"              , "x473c8b" , 0.278431 , 0.235294 , 0.545098} ,
-   {"SlateGray"               , "x708090" , 0.439216 , 0.501961 , 0.564706} ,
-   {"SlateGray1"              , "xc6e2ff" , 0.776471 , 0.886275 , 1.000000} ,
-   {"SlateGray2"              , "xb9d3ee" , 0.725490 , 0.827451 , 0.933333} ,
-   {"SlateGray3"              , "x9fb6cd" , 0.623529 , 0.713725 , 0.803922} ,
-   {"SlateGray4"              , "x6c7b8b" , 0.423529 , 0.482353 , 0.545098} ,
-   {"SlateGrey"               , "x708090" , 0.439216 , 0.501961 , 0.564706} ,
-   {"SpringGreen"             , "x00ff7f" , 0.000000 , 1.000000 , 0.498039} ,
-   {"SpringGreen1"            , "x00ff7f" , 0.000000 , 1.000000 , 0.498039} ,
-   {"SpringGreen2"            , "x00ee76" , 0.000000 , 0.933333 , 0.462745} ,
-   {"SpringGreen3"            , "x00cd66" , 0.000000 , 0.803922 , 0.400000} ,
-   {"SpringGreen4"            , "x008b45" , 0.000000 , 0.545098 , 0.270588} ,
-   {"SteelBlue"               , "x4682b4" , 0.274510 , 0.509804 , 0.705882} ,
-   {"SteelBlue1"              , "x63b8ff" , 0.388235 , 0.721569 , 1.000000} ,
-   {"SteelBlue2"              , "x5cacee" , 0.360784 , 0.674510 , 0.933333} ,
-   {"SteelBlue3"              , "x4f94cd" , 0.309804 , 0.580392 , 0.803922} ,
-   {"SteelBlue4"              , "x36648b" , 0.211765 , 0.392157 , 0.545098} ,
-   {"VioletRed"               , "xd02090" , 0.815686 , 0.125490 , 0.564706} ,
-   {"VioletRed1"              , "xff3e96" , 1.000000 , 0.243137 , 0.588235} ,
-   {"VioletRed2"              , "xee3a8c" , 0.933333 , 0.227451 , 0.549020} ,
-   {"VioletRed3"              , "xcd3278" , 0.803922 , 0.196078 , 0.470588} ,
-   {"VioletRed4"              , "x8b2252" , 0.545098 , 0.133333 , 0.321569} ,
-   {"WhiteSmoke"              , "xf5f5f5" , 0.960784 , 0.960784 , 0.960784} ,
-   {"YellowGreen"             , "x9acd32" , 0.603922 , 0.803922 , 0.196078} ,
-   {"alice blue"              , "xf0f8ff" , 0.941176 , 0.972549 , 1.000000} ,
-   {"antique white"           , "xfaebd7" , 0.980392 , 0.921569 , 0.843137} ,
-   {"aquamarine"              , "x7fffd4" , 0.498039 , 1.000000 , 0.831373} ,
-   {"aquamarine1"             , "x7fffd4" , 0.498039 , 1.000000 , 0.831373} ,
-   {"aquamarine2"             , "x76eec6" , 0.462745 , 0.933333 , 0.776471} ,
-   {"aquamarine3"             , "x66cdaa" , 0.400000 , 0.803922 , 0.666667} ,
-   {"aquamarine4"             , "x458b74" , 0.270588 , 0.545098 , 0.454902} ,
-   {"azure"                   , "xf0ffff" , 0.941176 , 1.000000 , 1.000000} ,
-   {"azure1"                  , "xf0ffff" , 0.941176 , 1.000000 , 1.000000} ,
-   {"azure2"                  , "xe0eeee" , 0.878431 , 0.933333 , 0.933333} ,
-   {"azure3"                  , "xc1cdcd" , 0.756863 , 0.803922 , 0.803922} ,
-   {"azure4"                  , "x838b8b" , 0.513725 , 0.545098 , 0.545098} ,
-   {"beige"                   , "xf5f5dc" , 0.960784 , 0.960784 , 0.862745} ,
-   {"bisque"                  , "xffe4c4" , 1.000000 , 0.894118 , 0.768627} ,
-   {"bisque1"                 , "xffe4c4" , 1.000000 , 0.894118 , 0.768627} ,
-   {"bisque2"                 , "xeed5b7" , 0.933333 , 0.835294 , 0.717647} ,
-   {"bisque3"                 , "xcdb79e" , 0.803922 , 0.717647 , 0.619608} ,
-   {"bisque4"                 , "x8b7d6b" , 0.545098 , 0.490196 , 0.419608} ,
-   {"black"                   , "x000000" , 0.000000 , 0.000000 , 0.000000} ,
-   {"blanched almond"         , "xffebcd" , 1.000000 , 0.921569 , 0.803922} ,
-   {"blue violet"             , "x8a2be2" , 0.541176 , 0.168627 , 0.886275} ,
-   {"blue"                    , "x0000ff" , 0.000000 , 0.000000 , 1.000000} ,
-   {"blue1"                   , "x0000ff" , 0.000000 , 0.000000 , 1.000000} ,
-   {"blue2"                   , "x0000ee" , 0.000000 , 0.000000 , 0.933333} ,
-   {"blue3"                   , "x0000cd" , 0.000000 , 0.000000 , 0.803922} ,
-   {"blue4"                   , "x00008b" , 0.000000 , 0.000000 , 0.545098} ,
-   {"brown"                   , "xa52a2a" , 0.647059 , 0.164706 , 0.164706} ,
-   {"brown1"                  , "xff4040" , 1.000000 , 0.250980 , 0.250980} ,
-   {"brown2"                  , "xee3b3b" , 0.933333 , 0.231373 , 0.231373} ,
-   {"brown3"                  , "xcd3333" , 0.803922 , 0.200000 , 0.200000} ,
-   {"brown4"                  , "x8b2323" , 0.545098 , 0.137255 , 0.137255} ,
-   {"burlywood"               , "xdeb887" , 0.870588 , 0.721569 , 0.529412} ,
-   {"burlywood1"              , "xffd39b" , 1.000000 , 0.827451 , 0.607843} ,
-   {"burlywood2"              , "xeec591" , 0.933333 , 0.772549 , 0.568627} ,
-   {"burlywood3"              , "xcdaa7d" , 0.803922 , 0.666667 , 0.490196} ,
-   {"burlywood4"              , "x8b7355" , 0.545098 , 0.450980 , 0.333333} ,
-   {"cadet blue"              , "x5f9ea0" , 0.372549 , 0.619608 , 0.627451} ,
-   {"chartreuse"              , "x7fff00" , 0.498039 , 1.000000 , 0.000000} ,
-   {"chartreuse1"             , "x7fff00" , 0.498039 , 1.000000 , 0.000000} ,
-   {"chartreuse2"             , "x76ee00" , 0.462745 , 0.933333 , 0.000000} ,
-   {"chartreuse3"             , "x66cd00" , 0.400000 , 0.803922 , 0.000000} ,
-   {"chartreuse4"             , "x458b00" , 0.270588 , 0.545098 , 0.000000} ,
-   {"chocolate"               , "xd2691e" , 0.823529 , 0.411765 , 0.117647} ,
-   {"chocolate1"              , "xff7f24" , 1.000000 , 0.498039 , 0.141176} ,
-   {"chocolate2"              , "xee7621" , 0.933333 , 0.462745 , 0.129412} ,
-   {"chocolate3"              , "xcd661d" , 0.803922 , 0.400000 , 0.113725} ,
-   {"chocolate4"              , "x8b4513" , 0.545098 , 0.270588 , 0.074510} ,
-   {"coral"                   , "xff7f50" , 1.000000 , 0.498039 , 0.313725} ,
-   {"coral1"                  , "xff7256" , 1.000000 , 0.447059 , 0.337255} ,
-   {"coral2"                  , "xee6a50" , 0.933333 , 0.415686 , 0.313725} ,
-   {"coral3"                  , "xcd5b45" , 0.803922 , 0.356863 , 0.270588} ,
-   {"coral4"                  , "x8b3e2f" , 0.545098 , 0.243137 , 0.184314} ,
-   {"cornflower blue"         , "x6495ed" , 0.392157 , 0.584314 , 0.929412} ,
-   {"cornsilk"                , "xfff8dc" , 1.000000 , 0.972549 , 0.862745} ,
-   {"cornsilk1"               , "xfff8dc" , 1.000000 , 0.972549 , 0.862745} ,
-   {"cornsilk2"               , "xeee8cd" , 0.933333 , 0.909804 , 0.803922} ,
-   {"cornsilk3"               , "xcdc8b1" , 0.803922 , 0.784314 , 0.694118} ,
-   {"cornsilk4"               , "x8b8878" , 0.545098 , 0.533333 , 0.470588} ,
-   {"cyan"                    , "x00ffff" , 0.000000 , 1.000000 , 1.000000} ,
-   {"cyan1"                   , "x00ffff" , 0.000000 , 1.000000 , 1.000000} ,
-   {"cyan2"                   , "x00eeee" , 0.000000 , 0.933333 , 0.933333} ,
-   {"cyan3"                   , "x00cdcd" , 0.000000 , 0.803922 , 0.803922} ,
-   {"cyan4"                   , "x008b8b" , 0.000000 , 0.545098 , 0.545098} ,
-   {"dark blue"               , "x00008b" , 0.000000 , 0.000000 , 0.545098} ,
-   {"dark cyan"               , "x008b8b" , 0.000000 , 0.545098 , 0.545098} ,
-   {"dark goldenrod"          , "xb8860b" , 0.721569 , 0.525490 , 0.043137} ,
-   {"dark gray"               , "xa9a9a9" , 0.662745 , 0.662745 , 0.662745} ,
-   {"dark green"              , "x006400" , 0.000000 , 0.392157 , 0.000000} ,
-   {"dark grey"               , "xa9a9a9" , 0.662745 , 0.662745 , 0.662745} ,
-   {"dark khaki"              , "xbdb76b" , 0.741176 , 0.717647 , 0.419608} ,
-   {"dark magenta"            , "x8b008b" , 0.545098 , 0.000000 , 0.545098} ,
-   {"dark olive green"        , "x556b2f" , 0.333333 , 0.419608 , 0.184314} ,
-   {"dark orange"             , "xff8c00" , 1.000000 , 0.549020 , 0.000000} ,
-   {"dark orchid"             , "x9932cc" , 0.600000 , 0.196078 , 0.800000} ,
-   {"dark red"                , "x8b0000" , 0.545098 , 0.000000 , 0.000000} ,
-   {"dark salmon"             , "xe9967a" , 0.913725 , 0.588235 , 0.478431} ,
-   {"dark sea green"          , "x8fbc8f" , 0.560784 , 0.737255 , 0.560784} ,
-   {"dark slate blue"         , "x483d8b" , 0.282353 , 0.239216 , 0.545098} ,
-   {"dark slate gray"         , "x2f4f4f" , 0.184314 , 0.309804 , 0.309804} ,
-   {"dark slate grey"         , "x2f4f4f" , 0.184314 , 0.309804 , 0.309804} ,
-   {"dark turquoise"          , "x00ced1" , 0.000000 , 0.807843 , 0.819608} ,
-   {"dark violet"             , "x9400d3" , 0.580392 , 0.000000 , 0.827451} ,
-   {"deep pink"               , "xff1493" , 1.000000 , 0.078431 , 0.576471} ,
-   {"deep sky blue"           , "x00bfff" , 0.000000 , 0.749020 , 1.000000} ,
-   {"dim gray"                , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"dim grey"                , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"dodger blue"             , "x1e90ff" , 0.117647 , 0.564706 , 1.000000} ,
-   {"firebrick"               , "xb22222" , 0.698039 , 0.133333 , 0.133333} ,
-   {"firebrick1"              , "xff3030" , 1.000000 , 0.188235 , 0.188235} ,
-   {"firebrick2"              , "xee2c2c" , 0.933333 , 0.172549 , 0.172549} ,
-   {"firebrick3"              , "xcd2626" , 0.803922 , 0.149020 , 0.149020} ,
-   {"firebrick4"              , "x8b1a1a" , 0.545098 , 0.101961 , 0.101961} ,
-   {"floral white"            , "xfffaf0" , 1.000000 , 0.980392 , 0.941176} ,
-   {"forest green"            , "x228b22" , 0.133333 , 0.545098 , 0.133333} ,
-   {"gainsboro"               , "xdcdcdc" , 0.862745 , 0.862745 , 0.862745} ,
-   {"ghost white"             , "xf8f8ff" , 0.972549 , 0.972549 , 1.000000} ,
-   {"gold"                    , "xffd700" , 1.000000 , 0.843137 , 0.000000} ,
-   {"gold1"                   , "xffd700" , 1.000000 , 0.843137 , 0.000000} ,
-   {"gold2"                   , "xeec900" , 0.933333 , 0.788235 , 0.000000} ,
-   {"gold3"                   , "xcdad00" , 0.803922 , 0.678431 , 0.000000} ,
-   {"gold4"                   , "x8b7500" , 0.545098 , 0.458824 , 0.000000} ,
-   {"goldenrod"               , "xdaa520" , 0.854902 , 0.647059 , 0.125490} ,
-   {"goldenrod1"              , "xffc125" , 1.000000 , 0.756863 , 0.145098} ,
-   {"goldenrod2"              , "xeeb422" , 0.933333 , 0.705882 , 0.133333} ,
-   {"goldenrod3"              , "xcd9b1d" , 0.803922 , 0.607843 , 0.113725} ,
-   {"goldenrod4"              , "x8b6914" , 0.545098 , 0.411765 , 0.078431} ,
-   {"gray"                    , "xbebebe" , 0.745098 , 0.745098 , 0.745098} ,
-   {"gray0"                   , "x000000" , 0.000000 , 0.000000 , 0.000000} ,
-   {"gray1"                   , "x030303" , 0.011765 , 0.011765 , 0.011765} ,
-   {"gray10"                  , "x1a1a1a" , 0.101961 , 0.101961 , 0.101961} ,
-   {"gray100"                 , "xffffff" , 1.000000 , 1.000000 , 1.000000} ,
-   {"gray11"                  , "x1c1c1c" , 0.109804 , 0.109804 , 0.109804} ,
-   {"gray12"                  , "x1f1f1f" , 0.121569 , 0.121569 , 0.121569} ,
-   {"gray13"                  , "x212121" , 0.129412 , 0.129412 , 0.129412} ,
-   {"gray14"                  , "x242424" , 0.141176 , 0.141176 , 0.141176} ,
-   {"gray15"                  , "x262626" , 0.149020 , 0.149020 , 0.149020} ,
-   {"gray16"                  , "x292929" , 0.160784 , 0.160784 , 0.160784} ,
-   {"gray17"                  , "x2b2b2b" , 0.168627 , 0.168627 , 0.168627} ,
-   {"gray18"                  , "x2e2e2e" , 0.180392 , 0.180392 , 0.180392} ,
-   {"gray19"                  , "x303030" , 0.188235 , 0.188235 , 0.188235} ,
-   {"gray2"                   , "x050505" , 0.019608 , 0.019608 , 0.019608} ,
-   {"gray20"                  , "x333333" , 0.200000 , 0.200000 , 0.200000} ,
-   {"gray21"                  , "x363636" , 0.211765 , 0.211765 , 0.211765} ,
-   {"gray22"                  , "x383838" , 0.219608 , 0.219608 , 0.219608} ,
-   {"gray23"                  , "x3b3b3b" , 0.231373 , 0.231373 , 0.231373} ,
-   {"gray24"                  , "x3d3d3d" , 0.239216 , 0.239216 , 0.239216} ,
-   {"gray25"                  , "x404040" , 0.250980 , 0.250980 , 0.250980} ,
-   {"gray26"                  , "x424242" , 0.258824 , 0.258824 , 0.258824} ,
-   {"gray27"                  , "x454545" , 0.270588 , 0.270588 , 0.270588} ,
-   {"gray28"                  , "x474747" , 0.278431 , 0.278431 , 0.278431} ,
-   {"gray29"                  , "x4a4a4a" , 0.290196 , 0.290196 , 0.290196} ,
-   {"gray3"                   , "x080808" , 0.031373 , 0.031373 , 0.031373} ,
-   {"gray30"                  , "x4d4d4d" , 0.301961 , 0.301961 , 0.301961} ,
-   {"gray31"                  , "x4f4f4f" , 0.309804 , 0.309804 , 0.309804} ,
-   {"gray32"                  , "x525252" , 0.321569 , 0.321569 , 0.321569} ,
-   {"gray33"                  , "x545454" , 0.329412 , 0.329412 , 0.329412} ,
-   {"gray34"                  , "x575757" , 0.341176 , 0.341176 , 0.341176} ,
-   {"gray35"                  , "x595959" , 0.349020 , 0.349020 , 0.349020} ,
-   {"gray36"                  , "x5c5c5c" , 0.360784 , 0.360784 , 0.360784} ,
-   {"gray37"                  , "x5e5e5e" , 0.368627 , 0.368627 , 0.368627} ,
-   {"gray38"                  , "x616161" , 0.380392 , 0.380392 , 0.380392} ,
-   {"gray39"                  , "x636363" , 0.388235 , 0.388235 , 0.388235} ,
-   {"gray4"                   , "x0a0a0a" , 0.039216 , 0.039216 , 0.039216} ,
-   {"gray40"                  , "x666666" , 0.400000 , 0.400000 , 0.400000} ,
-   {"gray41"                  , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"gray42"                  , "x6b6b6b" , 0.419608 , 0.419608 , 0.419608} ,
-   {"gray43"                  , "x6e6e6e" , 0.431373 , 0.431373 , 0.431373} ,
-   {"gray44"                  , "x707070" , 0.439216 , 0.439216 , 0.439216} ,
-   {"gray45"                  , "x737373" , 0.450980 , 0.450980 , 0.450980} ,
-   {"gray46"                  , "x757575" , 0.458824 , 0.458824 , 0.458824} ,
-   {"gray47"                  , "x787878" , 0.470588 , 0.470588 , 0.470588} ,
-   {"gray48"                  , "x7a7a7a" , 0.478431 , 0.478431 , 0.478431} ,
-   {"gray49"                  , "x7d7d7d" , 0.490196 , 0.490196 , 0.490196} ,
-   {"gray5"                   , "x0d0d0d" , 0.050980 , 0.050980 , 0.050980} ,
-   {"gray50"                  , "x7f7f7f" , 0.498039 , 0.498039 , 0.498039} ,
-   {"gray51"                  , "x828282" , 0.509804 , 0.509804 , 0.509804} ,
-   {"gray52"                  , "x858585" , 0.521569 , 0.521569 , 0.521569} ,
-   {"gray53"                  , "x878787" , 0.529412 , 0.529412 , 0.529412} ,
-   {"gray54"                  , "x8a8a8a" , 0.541176 , 0.541176 , 0.541176} ,
-   {"gray55"                  , "x8c8c8c" , 0.549020 , 0.549020 , 0.549020} ,
-   {"gray56"                  , "x8f8f8f" , 0.560784 , 0.560784 , 0.560784} ,
-   {"gray57"                  , "x919191" , 0.568627 , 0.568627 , 0.568627} ,
-   {"gray58"                  , "x949494" , 0.580392 , 0.580392 , 0.580392} ,
-   {"gray59"                  , "x969696" , 0.588235 , 0.588235 , 0.588235} ,
-   {"gray6"                   , "x0f0f0f" , 0.058824 , 0.058824 , 0.058824} ,
-   {"gray60"                  , "x999999" , 0.600000 , 0.600000 , 0.600000} ,
-   {"gray61"                  , "x9c9c9c" , 0.611765 , 0.611765 , 0.611765} ,
-   {"gray62"                  , "x9e9e9e" , 0.619608 , 0.619608 , 0.619608} ,
-   {"gray63"                  , "xa1a1a1" , 0.631373 , 0.631373 , 0.631373} ,
-   {"gray64"                  , "xa3a3a3" , 0.639216 , 0.639216 , 0.639216} ,
-   {"gray65"                  , "xa6a6a6" , 0.650980 , 0.650980 , 0.650980} ,
-   {"gray66"                  , "xa8a8a8" , 0.658824 , 0.658824 , 0.658824} ,
-   {"gray67"                  , "xababab" , 0.670588 , 0.670588 , 0.670588} ,
-   {"gray68"                  , "xadadad" , 0.678431 , 0.678431 , 0.678431} ,
-   {"gray69"                  , "xb0b0b0" , 0.690196 , 0.690196 , 0.690196} ,
-   {"gray7"                   , "x121212" , 0.070588 , 0.070588 , 0.070588} ,
-   {"gray70"                  , "xb3b3b3" , 0.701961 , 0.701961 , 0.701961} ,
-   {"gray71"                  , "xb5b5b5" , 0.709804 , 0.709804 , 0.709804} ,
-   {"gray72"                  , "xb8b8b8" , 0.721569 , 0.721569 , 0.721569} ,
-   {"gray73"                  , "xbababa" , 0.729412 , 0.729412 , 0.729412} ,
-   {"gray74"                  , "xbdbdbd" , 0.741176 , 0.741176 , 0.741176} ,
-   {"gray75"                  , "xbfbfbf" , 0.749020 , 0.749020 , 0.749020} ,
-   {"gray76"                  , "xc2c2c2" , 0.760784 , 0.760784 , 0.760784} ,
-   {"gray77"                  , "xc4c4c4" , 0.768627 , 0.768627 , 0.768627} ,
-   {"gray78"                  , "xc7c7c7" , 0.780392 , 0.780392 , 0.780392} ,
-   {"gray79"                  , "xc9c9c9" , 0.788235 , 0.788235 , 0.788235} ,
-   {"gray8"                   , "x141414" , 0.078431 , 0.078431 , 0.078431} ,
-   {"gray80"                  , "xcccccc" , 0.800000 , 0.800000 , 0.800000} ,
-   {"gray81"                  , "xcfcfcf" , 0.811765 , 0.811765 , 0.811765} ,
-   {"gray82"                  , "xd1d1d1" , 0.819608 , 0.819608 , 0.819608} ,
-   {"gray83"                  , "xd4d4d4" , 0.831373 , 0.831373 , 0.831373} ,
-   {"gray84"                  , "xd6d6d6" , 0.839216 , 0.839216 , 0.839216} ,
-   {"gray85"                  , "xd9d9d9" , 0.850980 , 0.850980 , 0.850980} ,
-   {"gray86"                  , "xdbdbdb" , 0.858824 , 0.858824 , 0.858824} ,
-   {"gray87"                  , "xdedede" , 0.870588 , 0.870588 , 0.870588} ,
-   {"gray88"                  , "xe0e0e0" , 0.878431 , 0.878431 , 0.878431} ,
-   {"gray89"                  , "xe3e3e3" , 0.890196 , 0.890196 , 0.890196} ,
-   {"gray9"                   , "x171717" , 0.090196 , 0.090196 , 0.090196} ,
-   {"gray90"                  , "xe5e5e5" , 0.898039 , 0.898039 , 0.898039} ,
-   {"gray91"                  , "xe8e8e8" , 0.909804 , 0.909804 , 0.909804} ,
-   {"gray92"                  , "xebebeb" , 0.921569 , 0.921569 , 0.921569} ,
-   {"gray93"                  , "xededed" , 0.929412 , 0.929412 , 0.929412} ,
-   {"gray94"                  , "xf0f0f0" , 0.941176 , 0.941176 , 0.941176} ,
-   {"gray95"                  , "xf2f2f2" , 0.949020 , 0.949020 , 0.949020} ,
-   {"gray96"                  , "xf5f5f5" , 0.960784 , 0.960784 , 0.960784} ,
-   {"gray97"                  , "xf7f7f7" , 0.968627 , 0.968627 , 0.968627} ,
-   {"gray98"                  , "xfafafa" , 0.980392 , 0.980392 , 0.980392} ,
-   {"gray99"                  , "xfcfcfc" , 0.988235 , 0.988235 , 0.988235} ,
-   {"green yellow"            , "xadff2f" , 0.678431 , 1.000000 , 0.184314} ,
-   {"green"                   , "x00ff00" , 0.000000 , 1.000000 , 0.000000} ,
-   {"green1"                  , "x00ff00" , 0.000000 , 1.000000 , 0.000000} ,
-   {"green2"                  , "x00ee00" , 0.000000 , 0.933333 , 0.000000} ,
-   {"green3"                  , "x00cd00" , 0.000000 , 0.803922 , 0.000000} ,
-   {"green4"                  , "x008b00" , 0.000000 , 0.545098 , 0.000000} ,
-   {"grey"                    , "xbebebe" , 0.745098 , 0.745098 , 0.745098} ,
-   {"grey0"                   , "x000000" , 0.000000 , 0.000000 , 0.000000} ,
-   {"grey1"                   , "x030303" , 0.011765 , 0.011765 , 0.011765} ,
-   {"grey10"                  , "x1a1a1a" , 0.101961 , 0.101961 , 0.101961} ,
-   {"grey100"                 , "xffffff" , 1.000000 , 1.000000 , 1.000000} ,
-   {"grey11"                  , "x1c1c1c" , 0.109804 , 0.109804 , 0.109804} ,
-   {"grey12"                  , "x1f1f1f" , 0.121569 , 0.121569 , 0.121569} ,
-   {"grey13"                  , "x212121" , 0.129412 , 0.129412 , 0.129412} ,
-   {"grey14"                  , "x242424" , 0.141176 , 0.141176 , 0.141176} ,
-   {"grey15"                  , "x262626" , 0.149020 , 0.149020 , 0.149020} ,
-   {"grey16"                  , "x292929" , 0.160784 , 0.160784 , 0.160784} ,
-   {"grey17"                  , "x2b2b2b" , 0.168627 , 0.168627 , 0.168627} ,
-   {"grey18"                  , "x2e2e2e" , 0.180392 , 0.180392 , 0.180392} ,
-   {"grey19"                  , "x303030" , 0.188235 , 0.188235 , 0.188235} ,
-   {"grey2"                   , "x050505" , 0.019608 , 0.019608 , 0.019608} ,
-   {"grey20"                  , "x333333" , 0.200000 , 0.200000 , 0.200000} ,
-   {"grey21"                  , "x363636" , 0.211765 , 0.211765 , 0.211765} ,
-   {"grey22"                  , "x383838" , 0.219608 , 0.219608 , 0.219608} ,
-   {"grey23"                  , "x3b3b3b" , 0.231373 , 0.231373 , 0.231373} ,
-   {"grey24"                  , "x3d3d3d" , 0.239216 , 0.239216 , 0.239216} ,
-   {"grey25"                  , "x404040" , 0.250980 , 0.250980 , 0.250980} ,
-   {"grey26"                  , "x424242" , 0.258824 , 0.258824 , 0.258824} ,
-   {"grey27"                  , "x454545" , 0.270588 , 0.270588 , 0.270588} ,
-   {"grey28"                  , "x474747" , 0.278431 , 0.278431 , 0.278431} ,
-   {"grey29"                  , "x4a4a4a" , 0.290196 , 0.290196 , 0.290196} ,
-   {"grey3"                   , "x080808" , 0.031373 , 0.031373 , 0.031373} ,
-   {"grey30"                  , "x4d4d4d" , 0.301961 , 0.301961 , 0.301961} ,
-   {"grey31"                  , "x4f4f4f" , 0.309804 , 0.309804 , 0.309804} ,
-   {"grey32"                  , "x525252" , 0.321569 , 0.321569 , 0.321569} ,
-   {"grey33"                  , "x545454" , 0.329412 , 0.329412 , 0.329412} ,
-   {"grey34"                  , "x575757" , 0.341176 , 0.341176 , 0.341176} ,
-   {"grey35"                  , "x595959" , 0.349020 , 0.349020 , 0.349020} ,
-   {"grey36"                  , "x5c5c5c" , 0.360784 , 0.360784 , 0.360784} ,
-   {"grey37"                  , "x5e5e5e" , 0.368627 , 0.368627 , 0.368627} ,
-   {"grey38"                  , "x616161" , 0.380392 , 0.380392 , 0.380392} ,
-   {"grey39"                  , "x636363" , 0.388235 , 0.388235 , 0.388235} ,
-   {"grey4"                   , "x0a0a0a" , 0.039216 , 0.039216 , 0.039216} ,
-   {"grey40"                  , "x666666" , 0.400000 , 0.400000 , 0.400000} ,
-   {"grey41"                  , "x696969" , 0.411765 , 0.411765 , 0.411765} ,
-   {"grey42"                  , "x6b6b6b" , 0.419608 , 0.419608 , 0.419608} ,
-   {"grey43"                  , "x6e6e6e" , 0.431373 , 0.431373 , 0.431373} ,
-   {"grey44"                  , "x707070" , 0.439216 , 0.439216 , 0.439216} ,
-   {"grey45"                  , "x737373" , 0.450980 , 0.450980 , 0.450980} ,
-   {"grey46"                  , "x757575" , 0.458824 , 0.458824 , 0.458824} ,
-   {"grey47"                  , "x787878" , 0.470588 , 0.470588 , 0.470588} ,
-   {"grey48"                  , "x7a7a7a" , 0.478431 , 0.478431 , 0.478431} ,
-   {"grey49"                  , "x7d7d7d" , 0.490196 , 0.490196 , 0.490196} ,
-   {"grey5"                   , "x0d0d0d" , 0.050980 , 0.050980 , 0.050980} ,
-   {"grey50"                  , "x7f7f7f" , 0.498039 , 0.498039 , 0.498039} ,
-   {"grey51"                  , "x828282" , 0.509804 , 0.509804 , 0.509804} ,
-   {"grey52"                  , "x858585" , 0.521569 , 0.521569 , 0.521569} ,
-   {"grey53"                  , "x878787" , 0.529412 , 0.529412 , 0.529412} ,
-   {"grey54"                  , "x8a8a8a" , 0.541176 , 0.541176 , 0.541176} ,
-   {"grey55"                  , "x8c8c8c" , 0.549020 , 0.549020 , 0.549020} ,
-   {"grey56"                  , "x8f8f8f" , 0.560784 , 0.560784 , 0.560784} ,
-   {"grey57"                  , "x919191" , 0.568627 , 0.568627 , 0.568627} ,
-   {"grey58"                  , "x949494" , 0.580392 , 0.580392 , 0.580392} ,
-   {"grey59"                  , "x969696" , 0.588235 , 0.588235 , 0.588235} ,
-   {"grey6"                   , "x0f0f0f" , 0.058824 , 0.058824 , 0.058824} ,
-   {"grey60"                  , "x999999" , 0.600000 , 0.600000 , 0.600000} ,
-   {"grey61"                  , "x9c9c9c" , 0.611765 , 0.611765 , 0.611765} ,
-   {"grey62"                  , "x9e9e9e" , 0.619608 , 0.619608 , 0.619608} ,
-   {"grey63"                  , "xa1a1a1" , 0.631373 , 0.631373 , 0.631373} ,
-   {"grey64"                  , "xa3a3a3" , 0.639216 , 0.639216 , 0.639216} ,
-   {"grey65"                  , "xa6a6a6" , 0.650980 , 0.650980 , 0.650980} ,
-   {"grey66"                  , "xa8a8a8" , 0.658824 , 0.658824 , 0.658824} ,
-   {"grey67"                  , "xababab" , 0.670588 , 0.670588 , 0.670588} ,
-   {"grey68"                  , "xadadad" , 0.678431 , 0.678431 , 0.678431} ,
-   {"grey69"                  , "xb0b0b0" , 0.690196 , 0.690196 , 0.690196} ,
-   {"grey7"                   , "x121212" , 0.070588 , 0.070588 , 0.070588} ,
-   {"grey70"                  , "xb3b3b3" , 0.701961 , 0.701961 , 0.701961} ,
-   {"grey71"                  , "xb5b5b5" , 0.709804 , 0.709804 , 0.709804} ,
-   {"grey72"                  , "xb8b8b8" , 0.721569 , 0.721569 , 0.721569} ,
-   {"grey73"                  , "xbababa" , 0.729412 , 0.729412 , 0.729412} ,
-   {"grey74"                  , "xbdbdbd" , 0.741176 , 0.741176 , 0.741176} ,
-   {"grey75"                  , "xbfbfbf" , 0.749020 , 0.749020 , 0.749020} ,
-   {"grey76"                  , "xc2c2c2" , 0.760784 , 0.760784 , 0.760784} ,
-   {"grey77"                  , "xc4c4c4" , 0.768627 , 0.768627 , 0.768627} ,
-   {"grey78"                  , "xc7c7c7" , 0.780392 , 0.780392 , 0.780392} ,
-   {"grey79"                  , "xc9c9c9" , 0.788235 , 0.788235 , 0.788235} ,
-   {"grey8"                   , "x141414" , 0.078431 , 0.078431 , 0.078431} ,
-   {"grey80"                  , "xcccccc" , 0.800000 , 0.800000 , 0.800000} ,
-   {"grey81"                  , "xcfcfcf" , 0.811765 , 0.811765 , 0.811765} ,
-   {"grey82"                  , "xd1d1d1" , 0.819608 , 0.819608 , 0.819608} ,
-   {"grey83"                  , "xd4d4d4" , 0.831373 , 0.831373 , 0.831373} ,
-   {"grey84"                  , "xd6d6d6" , 0.839216 , 0.839216 , 0.839216} ,
-   {"grey85"                  , "xd9d9d9" , 0.850980 , 0.850980 , 0.850980} ,
-   {"grey86"                  , "xdbdbdb" , 0.858824 , 0.858824 , 0.858824} ,
-   {"grey87"                  , "xdedede" , 0.870588 , 0.870588 , 0.870588} ,
-   {"grey88"                  , "xe0e0e0" , 0.878431 , 0.878431 , 0.878431} ,
-   {"grey89"                  , "xe3e3e3" , 0.890196 , 0.890196 , 0.890196} ,
-   {"grey9"                   , "x171717" , 0.090196 , 0.090196 , 0.090196} ,
-   {"grey90"                  , "xe5e5e5" , 0.898039 , 0.898039 , 0.898039} ,
-   {"grey91"                  , "xe8e8e8" , 0.909804 , 0.909804 , 0.909804} ,
-   {"grey92"                  , "xebebeb" , 0.921569 , 0.921569 , 0.921569} ,
-   {"grey93"                  , "xededed" , 0.929412 , 0.929412 , 0.929412} ,
-   {"grey94"                  , "xf0f0f0" , 0.941176 , 0.941176 , 0.941176} ,
-   {"grey95"                  , "xf2f2f2" , 0.949020 , 0.949020 , 0.949020} ,
-   {"grey96"                  , "xf5f5f5" , 0.960784 , 0.960784 , 0.960784} ,
-   {"grey97"                  , "xf7f7f7" , 0.968627 , 0.968627 , 0.968627} ,
-   {"grey98"                  , "xfafafa" , 0.980392 , 0.980392 , 0.980392} ,
-   {"grey99"                  , "xfcfcfc" , 0.988235 , 0.988235 , 0.988235} ,
-   {"honeydew"                , "xf0fff0" , 0.941176 , 1.000000 , 0.941176} ,
-   {"honeydew1"               , "xf0fff0" , 0.941176 , 1.000000 , 0.941176} ,
-   {"honeydew2"               , "xe0eee0" , 0.878431 , 0.933333 , 0.878431} ,
-   {"honeydew3"               , "xc1cdc1" , 0.756863 , 0.803922 , 0.756863} ,
-   {"honeydew4"               , "x838b83" , 0.513725 , 0.545098 , 0.513725} ,
-   {"hot pink"                , "xff69b4" , 1.000000 , 0.411765 , 0.705882} ,
-   {"indian red"              , "xcd5c5c" , 0.803922 , 0.360784 , 0.360784} ,
-   {"ivory"                   , "xfffff0" , 1.000000 , 1.000000 , 0.941176} ,
-   {"ivory1"                  , "xfffff0" , 1.000000 , 1.000000 , 0.941176} ,
-   {"ivory2"                  , "xeeeee0" , 0.933333 , 0.933333 , 0.878431} ,
-   {"ivory3"                  , "xcdcdc1" , 0.803922 , 0.803922 , 0.756863} ,
-   {"ivory4"                  , "x8b8b83" , 0.545098 , 0.545098 , 0.513725} ,
-   {"khaki"                   , "xf0e68c" , 0.941176 , 0.901961 , 0.549020} ,
-   {"khaki1"                  , "xfff68f" , 1.000000 , 0.964706 , 0.560784} ,
-   {"khaki2"                  , "xeee685" , 0.933333 , 0.901961 , 0.521569} ,
-   {"khaki3"                  , "xcdc673" , 0.803922 , 0.776471 , 0.450980} ,
-   {"khaki4"                  , "x8b864e" , 0.545098 , 0.525490 , 0.305882} ,
-   {"lavender blush"          , "xfff0f5" , 1.000000 , 0.941176 , 0.960784} ,
-   {"lavender"                , "xe6e6fa" , 0.901961 , 0.901961 , 0.980392} ,
-   {"lawn green"              , "x7cfc00" , 0.486275 , 0.988235 , 0.000000} ,
-   {"lemon chiffon"           , "xfffacd" , 1.000000 , 0.980392 , 0.803922} ,
-   {"light blue"              , "xadd8e6" , 0.678431 , 0.847059 , 0.901961} ,
-   {"light coral"             , "xf08080" , 0.941176 , 0.501961 , 0.501961} ,
-   {"light cyan"              , "xe0ffff" , 0.878431 , 1.000000 , 1.000000} ,
-   {"light goldenrod yellow"  , "xfafad2" , 0.980392 , 0.980392 , 0.823529} ,
-   {"light goldenrod"         , "xeedd82" , 0.933333 , 0.866667 , 0.509804} ,
-   {"light gray"              , "xd3d3d3" , 0.827451 , 0.827451 , 0.827451} ,
-   {"light green"             , "x90ee90" , 0.564706 , 0.933333 , 0.564706} ,
-   {"light grey"              , "xd3d3d3" , 0.827451 , 0.827451 , 0.827451} ,
-   {"light pink"              , "xffb6c1" , 1.000000 , 0.713725 , 0.756863} ,
-   {"light salmon"            , "xffa07a" , 1.000000 , 0.627451 , 0.478431} ,
-   {"light sea green"         , "x20b2aa" , 0.125490 , 0.698039 , 0.666667} ,
-   {"light sky blue"          , "x87cefa" , 0.529412 , 0.807843 , 0.980392} ,
-   {"light slate blue"        , "x8470ff" , 0.517647 , 0.439216 , 1.000000} ,
-   {"light slate gray"        , "x778899" , 0.466667 , 0.533333 , 0.600000} ,
-   {"light slate grey"        , "x778899" , 0.466667 , 0.533333 , 0.600000} ,
-   {"light steel blue"        , "xb0c4de" , 0.690196 , 0.768627 , 0.870588} ,
-   {"light yellow"            , "xffffe0" , 1.000000 , 1.000000 , 0.878431} ,
-   {"lime green"              , "x32cd32" , 0.196078 , 0.803922 , 0.196078} ,
-   {"linen"                   , "xfaf0e6" , 0.980392 , 0.941176 , 0.901961} ,
-   {"magenta"                 , "xff00ff" , 1.000000 , 0.000000 , 1.000000} ,
-   {"magenta1"                , "xff00ff" , 1.000000 , 0.000000 , 1.000000} ,
-   {"magenta2"                , "xee00ee" , 0.933333 , 0.000000 , 0.933333} ,
-   {"magenta3"                , "xcd00cd" , 0.803922 , 0.000000 , 0.803922} ,
-   {"magenta4"                , "x8b008b" , 0.545098 , 0.000000 , 0.545098} ,
-   {"maroon"                  , "xb03060" , 0.690196 , 0.188235 , 0.376471} ,
-   {"maroon1"                 , "xff34b3" , 1.000000 , 0.203922 , 0.701961} ,
-   {"maroon2"                 , "xee30a7" , 0.933333 , 0.188235 , 0.654902} ,
-   {"maroon3"                 , "xcd2990" , 0.803922 , 0.160784 , 0.564706} ,
-   {"maroon4"                 , "x8b1c62" , 0.545098 , 0.109804 , 0.384314} ,
-   {"medium aquamarine"       , "x66cdaa" , 0.400000 , 0.803922 , 0.666667} ,
-   {"medium blue"             , "x0000cd" , 0.000000 , 0.000000 , 0.803922} ,
-   {"medium orchid"           , "xba55d3" , 0.729412 , 0.333333 , 0.827451} ,
-   {"medium purple"           , "x9370db" , 0.576471 , 0.439216 , 0.858824} ,
-   {"medium sea green"        , "x3cb371" , 0.235294 , 0.701961 , 0.443137} ,
-   {"medium slate blue"       , "x7b68ee" , 0.482353 , 0.407843 , 0.933333} ,
-   {"medium spring green"     , "x00fa9a" , 0.000000 , 0.980392 , 0.603922} ,
-   {"medium turquoise"        , "x48d1cc" , 0.282353 , 0.819608 , 0.800000} ,
-   {"medium violet red"       , "xc71585" , 0.780392 , 0.082353 , 0.521569} ,
-   {"midnight blue"           , "x191970" , 0.098039 , 0.098039 , 0.439216} ,
-   {"mint cream"              , "xf5fffa" , 0.960784 , 1.000000 , 0.980392} ,
-   {"misty rose"              , "xffe4e1" , 1.000000 , 0.894118 , 0.882353} ,
-   {"moccasin"                , "xffe4b5" , 1.000000 , 0.894118 , 0.709804} ,
-   {"navajo white"            , "xffdead" , 1.000000 , 0.870588 , 0.678431} ,
-   {"navy blue"               , "x000080" , 0.000000 , 0.000000 , 0.501961} ,
-   {"navy"                    , "x000080" , 0.000000 , 0.000000 , 0.501961} ,
-   {"old lace"                , "xfdf5e6" , 0.992157 , 0.960784 , 0.901961} ,
-   {"olive drab"              , "x6b8e23" , 0.419608 , 0.556863 , 0.137255} ,
-   {"orange red"              , "xff4500" , 1.000000 , 0.270588 , 0.000000} ,
-   {"orange"                  , "xffa500" , 1.000000 , 0.647059 , 0.000000} ,
-   {"orange1"                 , "xffa500" , 1.000000 , 0.647059 , 0.000000} ,
-   {"orange2"                 , "xee9a00" , 0.933333 , 0.603922 , 0.000000} ,
-   {"orange3"                 , "xcd8500" , 0.803922 , 0.521569 , 0.000000} ,
-   {"orange4"                 , "x8b5a00" , 0.545098 , 0.352941 , 0.000000} ,
-   {"orchid"                  , "xda70d6" , 0.854902 , 0.439216 , 0.839216} ,
-   {"orchid1"                 , "xff83fa" , 1.000000 , 0.513725 , 0.980392} ,
-   {"orchid2"                 , "xee7ae9" , 0.933333 , 0.478431 , 0.913725} ,
-   {"orchid3"                 , "xcd69c9" , 0.803922 , 0.411765 , 0.788235} ,
-   {"orchid4"                 , "x8b4789" , 0.545098 , 0.278431 , 0.537255} ,
-   {"pale goldenrod"          , "xeee8aa" , 0.933333 , 0.909804 , 0.666667} ,
-   {"pale green"              , "x98fb98" , 0.596078 , 0.984314 , 0.596078} ,
-   {"pale turquoise"          , "xafeeee" , 0.686275 , 0.933333 , 0.933333} ,
-   {"pale violet red"         , "xdb7093" , 0.858824 , 0.439216 , 0.576471} ,
-   {"papaya whip"             , "xffefd5" , 1.000000 , 0.937255 , 0.835294} ,
-   {"peach puff"              , "xffdab9" , 1.000000 , 0.854902 , 0.725490} ,
-   {"peru"                    , "xcd853f" , 0.803922 , 0.521569 , 0.247059} ,
-   {"pink"                    , "xffc0cb" , 1.000000 , 0.752941 , 0.796078} ,
-   {"pink1"                   , "xffb5c5" , 1.000000 , 0.709804 , 0.772549} ,
-   {"pink2"                   , "xeea9b8" , 0.933333 , 0.662745 , 0.721569} ,
-   {"pink3"                   , "xcd919e" , 0.803922 , 0.568627 , 0.619608} ,
-   {"pink4"                   , "x8b636c" , 0.545098 , 0.388235 , 0.423529} ,
-   {"plum"                    , "xdda0dd" , 0.866667 , 0.627451 , 0.866667} ,
-   {"plum1"                   , "xffbbff" , 1.000000 , 0.733333 , 1.000000} ,
-   {"plum2"                   , "xeeaeee" , 0.933333 , 0.682353 , 0.933333} ,
-   {"plum3"                   , "xcd96cd" , 0.803922 , 0.588235 , 0.803922} ,
-   {"plum4"                   , "x8b668b" , 0.545098 , 0.400000 , 0.545098} ,
-   {"powder blue"             , "xb0e0e6" , 0.690196 , 0.878431 , 0.901961} ,
-   {"purple"                  , "xa020f0" , 0.627451 , 0.125490 , 0.941176} ,
-   {"purple1"                 , "x9b30ff" , 0.607843 , 0.188235 , 1.000000} ,
-   {"purple2"                 , "x912cee" , 0.568627 , 0.172549 , 0.933333} ,
-   {"purple3"                 , "x7d26cd" , 0.490196 , 0.149020 , 0.803922} ,
-   {"purple4"                 , "x551a8b" , 0.333333 , 0.101961 , 0.545098} ,
-   {"red"                     , "xff0000" , 1.000000 , 0.000000 , 0.000000} ,
-   {"red1"                    , "xff0000" , 1.000000 , 0.000000 , 0.000000} ,
-   {"red2"                    , "xee0000" , 0.933333 , 0.000000 , 0.000000} ,
-   {"red3"                    , "xcd0000" , 0.803922 , 0.000000 , 0.000000} ,
-   {"red4"                    , "x8b0000" , 0.545098 , 0.000000 , 0.000000} ,
-   {"rosy brown"              , "xbc8f8f" , 0.737255 , 0.560784 , 0.560784} ,
-   {"royal blue"              , "x4169e1" , 0.254902 , 0.411765 , 0.882353} ,
-   {"saddle brown"            , "x8b4513" , 0.545098 , 0.270588 , 0.074510} ,
-   {"salmon"                  , "xfa8072" , 0.980392 , 0.501961 , 0.447059} ,
-   {"salmon1"                 , "xff8c69" , 1.000000 , 0.549020 , 0.411765} ,
-   {"salmon2"                 , "xee8262" , 0.933333 , 0.509804 , 0.384314} ,
-   {"salmon3"                 , "xcd7054" , 0.803922 , 0.439216 , 0.329412} ,
-   {"salmon4"                 , "x8b4c39" , 0.545098 , 0.298039 , 0.223529} ,
-   {"sandy brown"             , "xf4a460" , 0.956863 , 0.643137 , 0.376471} ,
-   {"sea green"               , "x2e8b57" , 0.180392 , 0.545098 , 0.341176} ,
-   {"seashell"                , "xfff5ee" , 1.000000 , 0.960784 , 0.933333} ,
-   {"seashell1"               , "xfff5ee" , 1.000000 , 0.960784 , 0.933333} ,
-   {"seashell2"               , "xeee5de" , 0.933333 , 0.898039 , 0.870588} ,
-   {"seashell3"               , "xcdc5bf" , 0.803922 , 0.772549 , 0.749020} ,
-   {"seashell4"               , "x8b8682" , 0.545098 , 0.525490 , 0.509804} ,
-   {"sienna"                  , "xa0522d" , 0.627451 , 0.321569 , 0.176471} ,
-   {"sienna1"                 , "xff8247" , 1.000000 , 0.509804 , 0.278431} ,
-   {"sienna2"                 , "xee7942" , 0.933333 , 0.474510 , 0.258824} ,
-   {"sienna3"                 , "xcd6839" , 0.803922 , 0.407843 , 0.223529} ,
-   {"sienna4"                 , "x8b4726" , 0.545098 , 0.278431 , 0.149020} ,
-   {"sky blue"                , "x87ceeb" , 0.529412 , 0.807843 , 0.921569} ,
-   {"slate blue"              , "x6a5acd" , 0.415686 , 0.352941 , 0.803922} ,
-   {"slate gray"              , "x708090" , 0.439216 , 0.501961 , 0.564706} ,
-   {"slate grey"              , "x708090" , 0.439216 , 0.501961 , 0.564706} ,
-   {"snow"                    , "xfffafa" , 1.000000 , 0.980392 , 0.980392} ,
-   {"snow1"                   , "xfffafa" , 1.000000 , 0.980392 , 0.980392} ,
-   {"snow2"                   , "xeee9e9" , 0.933333 , 0.913725 , 0.913725} ,
-   {"snow3"                   , "xcdc9c9" , 0.803922 , 0.788235 , 0.788235} ,
-   {"snow4"                   , "x8b8989" , 0.545098 , 0.537255 , 0.537255} ,
-   {"spring green"            , "x00ff7f" , 0.000000 , 1.000000 , 0.498039} ,
-   {"steel blue"              , "x4682b4" , 0.274510 , 0.509804 , 0.705882} ,
-   {"tan"                     , "xd2b48c" , 0.823529 , 0.705882 , 0.549020} ,
-   {"tan1"                    , "xffa54f" , 1.000000 , 0.647059 , 0.309804} ,
-   {"tan2"                    , "xee9a49" , 0.933333 , 0.603922 , 0.286275} ,
-   {"tan3"                    , "xcd853f" , 0.803922 , 0.521569 , 0.247059} ,
-   {"tan4"                    , "x8b5a2b" , 0.545098 , 0.352941 , 0.168627} ,
-   {"thistle"                 , "xd8bfd8" , 0.847059 , 0.749020 , 0.847059} ,
-   {"thistle1"                , "xffe1ff" , 1.000000 , 0.882353 , 1.000000} ,
-   {"thistle2"                , "xeed2ee" , 0.933333 , 0.823529 , 0.933333} ,
-   {"thistle3"                , "xcdb5cd" , 0.803922 , 0.709804 , 0.803922} ,
-   {"thistle4"                , "x8b7b8b" , 0.545098 , 0.482353 , 0.545098} ,
-   {"tomato"                  , "xff6347" , 1.000000 , 0.388235 , 0.278431} ,
-   {"tomato1"                 , "xff6347" , 1.000000 , 0.388235 , 0.278431} ,
-   {"tomato2"                 , "xee5c42" , 0.933333 , 0.360784 , 0.258824} ,
-   {"tomato3"                 , "xcd4f39" , 0.803922 , 0.309804 , 0.223529} ,
-   {"tomato4"                 , "x8b3626" , 0.545098 , 0.211765 , 0.149020} ,
-   {"turquoise"               , "x40e0d0" , 0.250980 , 0.878431 , 0.815686} ,
-   {"turquoise1"              , "x00f5ff" , 0.000000 , 0.960784 , 1.000000} ,
-   {"turquoise2"              , "x00e5ee" , 0.000000 , 0.898039 , 0.933333} ,
-   {"turquoise3"              , "x00c5cd" , 0.000000 , 0.772549 , 0.803922} ,
-   {"turquoise4"              , "x00868b" , 0.000000 , 0.525490 , 0.545098} ,
-   {"violet red"              , "xd02090" , 0.815686 , 0.125490 , 0.564706} ,
-   {"violet"                  , "xee82ee" , 0.933333 , 0.509804 , 0.933333} ,
-   {"wheat"                   , "xf5deb3" , 0.960784 , 0.870588 , 0.701961} ,
-   {"wheat1"                  , "xffe7ba" , 1.000000 , 0.905882 , 0.729412} ,
-   {"wheat2"                  , "xeed8ae" , 0.933333 , 0.847059 , 0.682353} ,
-   {"wheat3"                  , "xcdba96" , 0.803922 , 0.729412 , 0.588235} ,
-   {"wheat4"                  , "x8b7e66" , 0.545098 , 0.494118 , 0.400000} ,
-   {"white smoke"             , "xf5f5f5" , 0.960784 , 0.960784 , 0.960784} ,
-   {"white"                   , "xffffff" , 1.000000 , 1.000000 , 1.000000} ,
-   {"yellow green"            , "x9acd32" , 0.603922 , 0.803922 , 0.196078} ,
-   {"yellow"                  , "xffff00" , 1.000000 , 1.000000 , 0.000000} ,
-   {"yellow1"                 , "xffff00" , 1.000000 , 1.000000 , 0.000000} ,
-   {"yellow2"                 , "xeeee00" , 0.933333 , 0.933333 , 0.000000} ,
-   {"yellow3"                 , "xcdcd00" , 0.803922 , 0.803922 , 0.000000} ,
-   {"yellow4"                 , "x8b8b00" , 0.545098 , 0.545098 , 0.000000}
-} ;
-const int num_colors = sizeof(color_trans)/sizeof(color_trans[0]);
+const	COLOR_TRANS	color_trans[]	=	{
+			{"AliceBlue"															,	"xf0f8ff"	,	0.941176	,	0.972549	,	1.000000}	,
+			{"AntiqueWhite"												,	"xfaebd7"	,	0.980392	,	0.921569	,	0.843137}	,
+			{"AntiqueWhite1"											,	"xffefdb"	,	1.000000	,	0.937255	,	0.858824}	,
+			{"AntiqueWhite2"											,	"xeedfcc"	,	0.933333	,	0.874510	,	0.800000}	,
+			{"AntiqueWhite3"											,	"xcdc0b0"	,	0.803922	,	0.752941	,	0.690196}	,
+			{"AntiqueWhite4"											,	"x8b8378"	,	0.545098	,	0.513725	,	0.470588}	,
+			{"BlanchedAlmond"										,	"xffebcd"	,	1.000000	,	0.921569	,	0.803922}	,
+			{"BlueViolet"														,	"x8a2be2"	,	0.541176	,	0.168627	,	0.886275}	,
+			{"CadetBlue"															,	"x5f9ea0"	,	0.372549	,	0.619608	,	0.627451}	,
+			{"CadetBlue1"														,	"x98f5ff"	,	0.596078	,	0.960784	,	1.000000}	,
+			{"CadetBlue2"														,	"x8ee5ee"	,	0.556863	,	0.898039	,	0.933333}	,
+			{"CadetBlue3"														,	"x7ac5cd"	,	0.478431	,	0.772549	,	0.803922}	,
+			{"CadetBlue4"														,	"x53868b"	,	0.325490	,	0.525490	,	0.545098}	,
+			{"CornflowerBlue"										,	"x6495ed"	,	0.392157	,	0.584314	,	0.929412}	,
+			{"DarkBlue"																,	"x00008b"	,	0.000000	,	0.000000	,	0.545098}	,
+			{"DarkCyan"																,	"x008b8b"	,	0.000000	,	0.545098	,	0.545098}	,
+			{"DarkGoldenrod"											,	"xb8860b"	,	0.721569	,	0.525490	,	0.043137}	,
+			{"DarkGoldenrod1"										,	"xffb90f"	,	1.000000	,	0.725490	,	0.058824}	,
+			{"DarkGoldenrod2"										,	"xeead0e"	,	0.933333	,	0.678431	,	0.054902}	,
+			{"DarkGoldenrod3"										,	"xcd950c"	,	0.803922	,	0.584314	,	0.047059}	,
+			{"DarkGoldenrod4"										,	"x8b6508"	,	0.545098	,	0.396078	,	0.031373}	,
+			{"DarkGray"																,	"xa9a9a9"	,	0.662745	,	0.662745	,	0.662745}	,
+			{"DarkGreen"															,	"x006400"	,	0.000000	,	0.392157	,	0.000000}	,
+			{"DarkGrey"																,	"xa9a9a9"	,	0.662745	,	0.662745	,	0.662745}	,
+			{"DarkKhaki"															,	"xbdb76b"	,	0.741176	,	0.717647	,	0.419608}	,
+			{"DarkMagenta"													,	"x8b008b"	,	0.545098	,	0.000000	,	0.545098}	,
+			{"DarkOliveGreen"										,	"x556b2f"	,	0.333333	,	0.419608	,	0.184314}	,
+			{"DarkOliveGreen1"									,	"xcaff70"	,	0.792157	,	1.000000	,	0.439216}	,
+			{"DarkOliveGreen2"									,	"xbcee68"	,	0.737255	,	0.933333	,	0.407843}	,
+			{"DarkOliveGreen3"									,	"xa2cd5a"	,	0.635294	,	0.803922	,	0.352941}	,
+			{"DarkOliveGreen4"									,	"x6e8b3d"	,	0.431373	,	0.545098	,	0.239216}	,
+			{"DarkOrange"														,	"xff8c00"	,	1.000000	,	0.549020	,	0.000000}	,
+			{"DarkOrange1"													,	"xff7f00"	,	1.000000	,	0.498039	,	0.000000}	,
+			{"DarkOrange2"													,	"xee7600"	,	0.933333	,	0.462745	,	0.000000}	,
+			{"DarkOrange3"													,	"xcd6600"	,	0.803922	,	0.400000	,	0.000000}	,
+			{"DarkOrange4"													,	"x8b4500"	,	0.545098	,	0.270588	,	0.000000}	,
+			{"DarkOrchid"														,	"x9932cc"	,	0.600000	,	0.196078	,	0.800000}	,
+			{"DarkOrchid1"													,	"xbf3eff"	,	0.749020	,	0.243137	,	1.000000}	,
+			{"DarkOrchid2"													,	"xb23aee"	,	0.698039	,	0.227451	,	0.933333}	,
+			{"DarkOrchid3"													,	"x9a32cd"	,	0.603922	,	0.196078	,	0.803922}	,
+			{"DarkOrchid4"													,	"x68228b"	,	0.407843	,	0.133333	,	0.545098}	,
+			{"DarkRed"																	,	"x8b0000"	,	0.545098	,	0.000000	,	0.000000}	,
+			{"DarkSalmon"														,	"xe9967a"	,	0.913725	,	0.588235	,	0.478431}	,
+			{"DarkSeaGreen"												,	"x8fbc8f"	,	0.560784	,	0.737255	,	0.560784}	,
+			{"DarkSeaGreen1"											,	"xc1ffc1"	,	0.756863	,	1.000000	,	0.756863}	,
+			{"DarkSeaGreen2"											,	"xb4eeb4"	,	0.705882	,	0.933333	,	0.705882}	,
+			{"DarkSeaGreen3"											,	"x9bcd9b"	,	0.607843	,	0.803922	,	0.607843}	,
+			{"DarkSeaGreen4"											,	"x698b69"	,	0.411765	,	0.545098	,	0.411765}	,
+			{"DarkSlateBlue"											,	"x483d8b"	,	0.282353	,	0.239216	,	0.545098}	,
+			{"DarkSlateGray"											,	"x2f4f4f"	,	0.184314	,	0.309804	,	0.309804}	,
+			{"DarkSlateGray1"										,	"x97ffff"	,	0.592157	,	1.000000	,	1.000000}	,
+			{"DarkSlateGray2"										,	"x8deeee"	,	0.552941	,	0.933333	,	0.933333}	,
+			{"DarkSlateGray3"										,	"x79cdcd"	,	0.474510	,	0.803922	,	0.803922}	,
+			{"DarkSlateGray4"										,	"x528b8b"	,	0.321569	,	0.545098	,	0.545098}	,
+			{"DarkSlateGrey"											,	"x2f4f4f"	,	0.184314	,	0.309804	,	0.309804}	,
+			{"DarkTurquoise"											,	"x00ced1"	,	0.000000	,	0.807843	,	0.819608}	,
+			{"DarkViolet"														,	"x9400d3"	,	0.580392	,	0.000000	,	0.827451}	,
+			{"DeepPink"																,	"xff1493"	,	1.000000	,	0.078431	,	0.576471}	,
+			{"DeepPink1"															,	"xff1493"	,	1.000000	,	0.078431	,	0.576471}	,
+			{"DeepPink2"															,	"xee1289"	,	0.933333	,	0.070588	,	0.537255}	,
+			{"DeepPink3"															,	"xcd1076"	,	0.803922	,	0.062745	,	0.462745}	,
+			{"DeepPink4"															,	"x8b0a50"	,	0.545098	,	0.039216	,	0.313725}	,
+			{"DeepSkyBlue"													,	"x00bfff"	,	0.000000	,	0.749020	,	1.000000}	,
+			{"DeepSkyBlue1"												,	"x00bfff"	,	0.000000	,	0.749020	,	1.000000}	,
+			{"DeepSkyBlue2"												,	"x00b2ee"	,	0.000000	,	0.698039	,	0.933333}	,
+			{"DeepSkyBlue3"												,	"x009acd"	,	0.000000	,	0.603922	,	0.803922}	,
+			{"DeepSkyBlue4"												,	"x00688b"	,	0.000000	,	0.407843	,	0.545098}	,
+			{"DimGray"																	,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"DimGrey"																	,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"DodgerBlue"														,	"x1e90ff"	,	0.117647	,	0.564706	,	1.000000}	,
+			{"DodgerBlue1"													,	"x1e90ff"	,	0.117647	,	0.564706	,	1.000000}	,
+			{"DodgerBlue2"													,	"x1c86ee"	,	0.109804	,	0.525490	,	0.933333}	,
+			{"DodgerBlue3"													,	"x1874cd"	,	0.094118	,	0.454902	,	0.803922}	,
+			{"DodgerBlue4"													,	"x104e8b"	,	0.062745	,	0.305882	,	0.545098}	,
+			{"FloralWhite"													,	"xfffaf0"	,	1.000000	,	0.980392	,	0.941176}	,
+			{"ForestGreen"													,	"x228b22"	,	0.133333	,	0.545098	,	0.133333}	,
+			{"GhostWhite"														,	"xf8f8ff"	,	0.972549	,	0.972549	,	1.000000}	,
+			{"GreenYellow"													,	"xadff2f"	,	0.678431	,	1.000000	,	0.184314}	,
+			{"HotPink"																	,	"xff69b4"	,	1.000000	,	0.411765	,	0.705882}	,
+			{"HotPink1"																,	"xff6eb4"	,	1.000000	,	0.431373	,	0.705882}	,
+			{"HotPink2"																,	"xee6aa7"	,	0.933333	,	0.415686	,	0.654902}	,
+			{"HotPink3"																,	"xcd6090"	,	0.803922	,	0.376471	,	0.564706}	,
+			{"HotPink4"																,	"x8b3a62"	,	0.545098	,	0.227451	,	0.384314}	,
+			{"IndianRed"															,	"xcd5c5c"	,	0.803922	,	0.360784	,	0.360784}	,
+			{"IndianRed1"														,	"xff6a6a"	,	1.000000	,	0.415686	,	0.415686}	,
+			{"IndianRed2"														,	"xee6363"	,	0.933333	,	0.388235	,	0.388235}	,
+			{"IndianRed3"														,	"xcd5555"	,	0.803922	,	0.333333	,	0.333333}	,
+			{"IndianRed4"														,	"x8b3a3a"	,	0.545098	,	0.227451	,	0.227451}	,
+			{"LavenderBlush"											,	"xfff0f5"	,	1.000000	,	0.941176	,	0.960784}	,
+			{"LavenderBlush1"										,	"xfff0f5"	,	1.000000	,	0.941176	,	0.960784}	,
+			{"LavenderBlush2"										,	"xeee0e5"	,	0.933333	,	0.878431	,	0.898039}	,
+			{"LavenderBlush3"										,	"xcdc1c5"	,	0.803922	,	0.756863	,	0.772549}	,
+			{"LavenderBlush4"										,	"x8b8386"	,	0.545098	,	0.513725	,	0.525490}	,
+			{"LawnGreen"															,	"x7cfc00"	,	0.486275	,	0.988235	,	0.000000}	,
+			{"LemonChiffon"												,	"xfffacd"	,	1.000000	,	0.980392	,	0.803922}	,
+			{"LemonChiffon1"											,	"xfffacd"	,	1.000000	,	0.980392	,	0.803922}	,
+			{"LemonChiffon2"											,	"xeee9bf"	,	0.933333	,	0.913725	,	0.749020}	,
+			{"LemonChiffon3"											,	"xcdc9a5"	,	0.803922	,	0.788235	,	0.647059}	,
+			{"LemonChiffon4"											,	"x8b8970"	,	0.545098	,	0.537255	,	0.439216}	,
+			{"LightBlue"															,	"xadd8e6"	,	0.678431	,	0.847059	,	0.901961}	,
+			{"LightBlue1"														,	"xbfefff"	,	0.749020	,	0.937255	,	1.000000}	,
+			{"LightBlue2"														,	"xb2dfee"	,	0.698039	,	0.874510	,	0.933333}	,
+			{"LightBlue3"														,	"x9ac0cd"	,	0.603922	,	0.752941	,	0.803922}	,
+			{"LightBlue4"														,	"x68838b"	,	0.407843	,	0.513725	,	0.545098}	,
+			{"LightCoral"														,	"xf08080"	,	0.941176	,	0.501961	,	0.501961}	,
+			{"LightCyan"															,	"xe0ffff"	,	0.878431	,	1.000000	,	1.000000}	,
+			{"LightCyan1"														,	"xe0ffff"	,	0.878431	,	1.000000	,	1.000000}	,
+			{"LightCyan2"														,	"xd1eeee"	,	0.819608	,	0.933333	,	0.933333}	,
+			{"LightCyan3"														,	"xb4cdcd"	,	0.705882	,	0.803922	,	0.803922}	,
+			{"LightCyan4"														,	"x7a8b8b"	,	0.478431	,	0.545098	,	0.545098}	,
+			{"LightGoldenrod"										,	"xeedd82"	,	0.933333	,	0.866667	,	0.509804}	,
+			{"LightGoldenrod1"									,	"xffec8b"	,	1.000000	,	0.925490	,	0.545098}	,
+			{"LightGoldenrod2"									,	"xeedc82"	,	0.933333	,	0.862745	,	0.509804}	,
+			{"LightGoldenrod3"									,	"xcdbe70"	,	0.803922	,	0.745098	,	0.439216}	,
+			{"LightGoldenrod4"									,	"x8b814c"	,	0.545098	,	0.505882	,	0.298039}	,
+			{"LightGoldenrodYellow"				,	"xfafad2"	,	0.980392	,	0.980392	,	0.823529}	,
+			{"LightGray"															,	"xd3d3d3"	,	0.827451	,	0.827451	,	0.827451}	,
+			{"LightGreen"														,	"x90ee90"	,	0.564706	,	0.933333	,	0.564706}	,
+			{"LightGrey"															,	"xd3d3d3"	,	0.827451	,	0.827451	,	0.827451}	,
+			{"LightPink"															,	"xffb6c1"	,	1.000000	,	0.713725	,	0.756863}	,
+			{"LightPink1"														,	"xffaeb9"	,	1.000000	,	0.682353	,	0.725490}	,
+			{"LightPink2"														,	"xeea2ad"	,	0.933333	,	0.635294	,	0.678431}	,
+			{"LightPink3"														,	"xcd8c95"	,	0.803922	,	0.549020	,	0.584314}	,
+			{"LightPink4"														,	"x8b5f65"	,	0.545098	,	0.372549	,	0.396078}	,
+			{"LightSalmon"													,	"xffa07a"	,	1.000000	,	0.627451	,	0.478431}	,
+			{"LightSalmon1"												,	"xffa07a"	,	1.000000	,	0.627451	,	0.478431}	,
+			{"LightSalmon2"												,	"xee9572"	,	0.933333	,	0.584314	,	0.447059}	,
+			{"LightSalmon3"												,	"xcd8162"	,	0.803922	,	0.505882	,	0.384314}	,
+			{"LightSalmon4"												,	"x8b5742"	,	0.545098	,	0.341176	,	0.258824}	,
+			{"LightSeaGreen"											,	"x20b2aa"	,	0.125490	,	0.698039	,	0.666667}	,
+			{"LightSkyBlue"												,	"x87cefa"	,	0.529412	,	0.807843	,	0.980392}	,
+			{"LightSkyBlue1"											,	"xb0e2ff"	,	0.690196	,	0.886275	,	1.000000}	,
+			{"LightSkyBlue2"											,	"xa4d3ee"	,	0.643137	,	0.827451	,	0.933333}	,
+			{"LightSkyBlue3"											,	"x8db6cd"	,	0.552941	,	0.713725	,	0.803922}	,
+			{"LightSkyBlue4"											,	"x607b8b"	,	0.376471	,	0.482353	,	0.545098}	,
+			{"LightSlateBlue"										,	"x8470ff"	,	0.517647	,	0.439216	,	1.000000}	,
+			{"LightSlateGray"										,	"x778899"	,	0.466667	,	0.533333	,	0.600000}	,
+			{"LightSlateGrey"										,	"x778899"	,	0.466667	,	0.533333	,	0.600000}	,
+			{"LightSteelBlue"										,	"xb0c4de"	,	0.690196	,	0.768627	,	0.870588}	,
+			{"LightSteelBlue1"									,	"xcae1ff"	,	0.792157	,	0.882353	,	1.000000}	,
+			{"LightSteelBlue2"									,	"xbcd2ee"	,	0.737255	,	0.823529	,	0.933333}	,
+			{"LightSteelBlue3"									,	"xa2b5cd"	,	0.635294	,	0.709804	,	0.803922}	,
+			{"LightSteelBlue4"									,	"x6e7b8b"	,	0.431373	,	0.482353	,	0.545098}	,
+			{"LightYellow"													,	"xffffe0"	,	1.000000	,	1.000000	,	0.878431}	,
+			{"LightYellow1"												,	"xffffe0"	,	1.000000	,	1.000000	,	0.878431}	,
+			{"LightYellow2"												,	"xeeeed1"	,	0.933333	,	0.933333	,	0.819608}	,
+			{"LightYellow3"												,	"xcdcdb4"	,	0.803922	,	0.803922	,	0.705882}	,
+			{"LightYellow4"												,	"x8b8b7a"	,	0.545098	,	0.545098	,	0.478431}	,
+			{"LimeGreen"															,	"x32cd32"	,	0.196078	,	0.803922	,	0.196078}	,
+			{"MediumAquamarine"								,	"x66cdaa"	,	0.400000	,	0.803922	,	0.666667}	,
+			{"MediumBlue"														,	"x0000cd"	,	0.000000	,	0.000000	,	0.803922}	,
+			{"MediumOrchid"												,	"xba55d3"	,	0.729412	,	0.333333	,	0.827451}	,
+			{"MediumOrchid1"											,	"xe066ff"	,	0.878431	,	0.400000	,	1.000000}	,
+			{"MediumOrchid2"											,	"xd15fee"	,	0.819608	,	0.372549	,	0.933333}	,
+			{"MediumOrchid3"											,	"xb452cd"	,	0.705882	,	0.321569	,	0.803922}	,
+			{"MediumOrchid4"											,	"x7a378b"	,	0.478431	,	0.215686	,	0.545098}	,
+			{"MediumPurple"												,	"x9370db"	,	0.576471	,	0.439216	,	0.858824}	,
+			{"MediumPurple1"											,	"xab82ff"	,	0.670588	,	0.509804	,	1.000000}	,
+			{"MediumPurple2"											,	"x9f79ee"	,	0.623529	,	0.474510	,	0.933333}	,
+			{"MediumPurple3"											,	"x8968cd"	,	0.537255	,	0.407843	,	0.803922}	,
+			{"MediumPurple4"											,	"x5d478b"	,	0.364706	,	0.278431	,	0.545098}	,
+			{"MediumSeaGreen"										,	"x3cb371"	,	0.235294	,	0.701961	,	0.443137}	,
+			{"MediumSlateBlue"									,	"x7b68ee"	,	0.482353	,	0.407843	,	0.933333}	,
+			{"MediumSpringGreen"							,	"x00fa9a"	,	0.000000	,	0.980392	,	0.603922}	,
+			{"MediumTurquoise"									,	"x48d1cc"	,	0.282353	,	0.819608	,	0.800000}	,
+			{"MediumVioletRed"									,	"xc71585"	,	0.780392	,	0.082353	,	0.521569}	,
+			{"MidnightBlue"												,	"x191970"	,	0.098039	,	0.098039	,	0.439216}	,
+			{"MintCream"															,	"xf5fffa"	,	0.960784	,	1.000000	,	0.980392}	,
+			{"MistyRose"															,	"xffe4e1"	,	1.000000	,	0.894118	,	0.882353}	,
+			{"MistyRose1"														,	"xffe4e1"	,	1.000000	,	0.894118	,	0.882353}	,
+			{"MistyRose2"														,	"xeed5d2"	,	0.933333	,	0.835294	,	0.823529}	,
+			{"MistyRose3"														,	"xcdb7b5"	,	0.803922	,	0.717647	,	0.709804}	,
+			{"MistyRose4"														,	"x8b7d7b"	,	0.545098	,	0.490196	,	0.482353}	,
+			{"NavajoWhite"													,	"xffdead"	,	1.000000	,	0.870588	,	0.678431}	,
+			{"NavajoWhite1"												,	"xffdead"	,	1.000000	,	0.870588	,	0.678431}	,
+			{"NavajoWhite2"												,	"xeecfa1"	,	0.933333	,	0.811765	,	0.631373}	,
+			{"NavajoWhite3"												,	"xcdb38b"	,	0.803922	,	0.701961	,	0.545098}	,
+			{"NavajoWhite4"												,	"x8b795e"	,	0.545098	,	0.474510	,	0.368627}	,
+			{"NavyBlue"																,	"x000080"	,	0.000000	,	0.000000	,	0.501961}	,
+			{"OldLace"																	,	"xfdf5e6"	,	0.992157	,	0.960784	,	0.901961}	,
+			{"OliveDrab"															,	"x6b8e23"	,	0.419608	,	0.556863	,	0.137255}	,
+			{"OliveDrab1"														,	"xc0ff3e"	,	0.752941	,	1.000000	,	0.243137}	,
+			{"OliveDrab2"														,	"xb3ee3a"	,	0.701961	,	0.933333	,	0.227451}	,
+			{"OliveDrab3"														,	"x9acd32"	,	0.603922	,	0.803922	,	0.196078}	,
+			{"OliveDrab4"														,	"x698b22"	,	0.411765	,	0.545098	,	0.133333}	,
+			{"OrangeRed"															,	"xff4500"	,	1.000000	,	0.270588	,	0.000000}	,
+			{"OrangeRed1"														,	"xff4500"	,	1.000000	,	0.270588	,	0.000000}	,
+			{"OrangeRed2"														,	"xee4000"	,	0.933333	,	0.250980	,	0.000000}	,
+			{"OrangeRed3"														,	"xcd3700"	,	0.803922	,	0.215686	,	0.000000}	,
+			{"OrangeRed4"														,	"x8b2500"	,	0.545098	,	0.145098	,	0.000000}	,
+			{"PaleGoldenrod"											,	"xeee8aa"	,	0.933333	,	0.909804	,	0.666667}	,
+			{"PaleGreen"															,	"x98fb98"	,	0.596078	,	0.984314	,	0.596078}	,
+			{"PaleGreen1"														,	"x9aff9a"	,	0.603922	,	1.000000	,	0.603922}	,
+			{"PaleGreen2"														,	"x90ee90"	,	0.564706	,	0.933333	,	0.564706}	,
+			{"PaleGreen3"														,	"x7ccd7c"	,	0.486275	,	0.803922	,	0.486275}	,
+			{"PaleGreen4"														,	"x548b54"	,	0.329412	,	0.545098	,	0.329412}	,
+			{"PaleTurquoise"											,	"xafeeee"	,	0.686275	,	0.933333	,	0.933333}	,
+			{"PaleTurquoise1"										,	"xbbffff"	,	0.733333	,	1.000000	,	1.000000}	,
+			{"PaleTurquoise2"										,	"xaeeeee"	,	0.682353	,	0.933333	,	0.933333}	,
+			{"PaleTurquoise3"										,	"x96cdcd"	,	0.588235	,	0.803922	,	0.803922}	,
+			{"PaleTurquoise4"										,	"x668b8b"	,	0.400000	,	0.545098	,	0.545098}	,
+			{"PaleVioletRed"											,	"xdb7093"	,	0.858824	,	0.439216	,	0.576471}	,
+			{"PaleVioletRed1"										,	"xff82ab"	,	1.000000	,	0.509804	,	0.670588}	,
+			{"PaleVioletRed2"										,	"xee799f"	,	0.933333	,	0.474510	,	0.623529}	,
+			{"PaleVioletRed3"										,	"xcd6889"	,	0.803922	,	0.407843	,	0.537255}	,
+			{"PaleVioletRed4"										,	"x8b475d"	,	0.545098	,	0.278431	,	0.364706}	,
+			{"PapayaWhip"														,	"xffefd5"	,	1.000000	,	0.937255	,	0.835294}	,
+			{"PeachPuff"															,	"xffdab9"	,	1.000000	,	0.854902	,	0.725490}	,
+			{"PeachPuff1"														,	"xffdab9"	,	1.000000	,	0.854902	,	0.725490}	,
+			{"PeachPuff2"														,	"xeecbad"	,	0.933333	,	0.796078	,	0.678431}	,
+			{"PeachPuff3"														,	"xcdaf95"	,	0.803922	,	0.686275	,	0.584314}	,
+			{"PeachPuff4"														,	"x8b7765"	,	0.545098	,	0.466667	,	0.396078}	,
+			{"PowderBlue"														,	"xb0e0e6"	,	0.690196	,	0.878431	,	0.901961}	,
+			{"RosyBrown"															,	"xbc8f8f"	,	0.737255	,	0.560784	,	0.560784}	,
+			{"RosyBrown1"														,	"xffc1c1"	,	1.000000	,	0.756863	,	0.756863}	,
+			{"RosyBrown2"														,	"xeeb4b4"	,	0.933333	,	0.705882	,	0.705882}	,
+			{"RosyBrown3"														,	"xcd9b9b"	,	0.803922	,	0.607843	,	0.607843}	,
+			{"RosyBrown4"														,	"x8b6969"	,	0.545098	,	0.411765	,	0.411765}	,
+			{"RoyalBlue"															,	"x4169e1"	,	0.254902	,	0.411765	,	0.882353}	,
+			{"RoyalBlue1"														,	"x4876ff"	,	0.282353	,	0.462745	,	1.000000}	,
+			{"RoyalBlue2"														,	"x436eee"	,	0.262745	,	0.431373	,	0.933333}	,
+			{"RoyalBlue3"														,	"x3a5fcd"	,	0.227451	,	0.372549	,	0.803922}	,
+			{"RoyalBlue4"														,	"x27408b"	,	0.152941	,	0.250980	,	0.545098}	,
+			{"SaddleBrown"													,	"x8b4513"	,	0.545098	,	0.270588	,	0.074510}	,
+			{"SandyBrown"														,	"xf4a460"	,	0.956863	,	0.643137	,	0.376471}	,
+			{"SeaGreen"																,	"x2e8b57"	,	0.180392	,	0.545098	,	0.341176}	,
+			{"SeaGreen1"															,	"x54ff9f"	,	0.329412	,	1.000000	,	0.623529}	,
+			{"SeaGreen2"															,	"x4eee94"	,	0.305882	,	0.933333	,	0.580392}	,
+			{"SeaGreen3"															,	"x43cd80"	,	0.262745	,	0.803922	,	0.501961}	,
+			{"SeaGreen4"															,	"x2e8b57"	,	0.180392	,	0.545098	,	0.341176}	,
+			{"SkyBlue"																	,	"x87ceeb"	,	0.529412	,	0.807843	,	0.921569}	,
+			{"SkyBlue1"																,	"x87ceff"	,	0.529412	,	0.807843	,	1.000000}	,
+			{"SkyBlue2"																,	"x7ec0ee"	,	0.494118	,	0.752941	,	0.933333}	,
+			{"SkyBlue3"																,	"x6ca6cd"	,	0.423529	,	0.650980	,	0.803922}	,
+			{"SkyBlue4"																,	"x4a708b"	,	0.290196	,	0.439216	,	0.545098}	,
+			{"SlateBlue"															,	"x6a5acd"	,	0.415686	,	0.352941	,	0.803922}	,
+			{"SlateBlue1"														,	"x836fff"	,	0.513725	,	0.435294	,	1.000000}	,
+			{"SlateBlue2"														,	"x7a67ee"	,	0.478431	,	0.403922	,	0.933333}	,
+			{"SlateBlue3"														,	"x6959cd"	,	0.411765	,	0.349020	,	0.803922}	,
+			{"SlateBlue4"														,	"x473c8b"	,	0.278431	,	0.235294	,	0.545098}	,
+			{"SlateGray"															,	"x708090"	,	0.439216	,	0.501961	,	0.564706}	,
+			{"SlateGray1"														,	"xc6e2ff"	,	0.776471	,	0.886275	,	1.000000}	,
+			{"SlateGray2"														,	"xb9d3ee"	,	0.725490	,	0.827451	,	0.933333}	,
+			{"SlateGray3"														,	"x9fb6cd"	,	0.623529	,	0.713725	,	0.803922}	,
+			{"SlateGray4"														,	"x6c7b8b"	,	0.423529	,	0.482353	,	0.545098}	,
+			{"SlateGrey"															,	"x708090"	,	0.439216	,	0.501961	,	0.564706}	,
+			{"SpringGreen"													,	"x00ff7f"	,	0.000000	,	1.000000	,	0.498039}	,
+			{"SpringGreen1"												,	"x00ff7f"	,	0.000000	,	1.000000	,	0.498039}	,
+			{"SpringGreen2"												,	"x00ee76"	,	0.000000	,	0.933333	,	0.462745}	,
+			{"SpringGreen3"												,	"x00cd66"	,	0.000000	,	0.803922	,	0.400000}	,
+			{"SpringGreen4"												,	"x008b45"	,	0.000000	,	0.545098	,	0.270588}	,
+			{"SteelBlue"															,	"x4682b4"	,	0.274510	,	0.509804	,	0.705882}	,
+			{"SteelBlue1"														,	"x63b8ff"	,	0.388235	,	0.721569	,	1.000000}	,
+			{"SteelBlue2"														,	"x5cacee"	,	0.360784	,	0.674510	,	0.933333}	,
+			{"SteelBlue3"														,	"x4f94cd"	,	0.309804	,	0.580392	,	0.803922}	,
+			{"SteelBlue4"														,	"x36648b"	,	0.211765	,	0.392157	,	0.545098}	,
+			{"VioletRed"															,	"xd02090"	,	0.815686	,	0.125490	,	0.564706}	,
+			{"VioletRed1"														,	"xff3e96"	,	1.000000	,	0.243137	,	0.588235}	,
+			{"VioletRed2"														,	"xee3a8c"	,	0.933333	,	0.227451	,	0.549020}	,
+			{"VioletRed3"														,	"xcd3278"	,	0.803922	,	0.196078	,	0.470588}	,
+			{"VioletRed4"														,	"x8b2252"	,	0.545098	,	0.133333	,	0.321569}	,
+			{"WhiteSmoke"														,	"xf5f5f5"	,	0.960784	,	0.960784	,	0.960784}	,
+			{"YellowGreen"													,	"x9acd32"	,	0.603922	,	0.803922	,	0.196078}	,
+			{"alice	blue"														,	"xf0f8ff"	,	0.941176	,	0.972549	,	1.000000}	,
+			{"antique	white"											,	"xfaebd7"	,	0.980392	,	0.921569	,	0.843137}	,
+			{"aquamarine"														,	"x7fffd4"	,	0.498039	,	1.000000	,	0.831373}	,
+			{"aquamarine1"													,	"x7fffd4"	,	0.498039	,	1.000000	,	0.831373}	,
+			{"aquamarine2"													,	"x76eec6"	,	0.462745	,	0.933333	,	0.776471}	,
+			{"aquamarine3"													,	"x66cdaa"	,	0.400000	,	0.803922	,	0.666667}	,
+			{"aquamarine4"													,	"x458b74"	,	0.270588	,	0.545098	,	0.454902}	,
+			{"azure"																			,	"xf0ffff"	,	0.941176	,	1.000000	,	1.000000}	,
+			{"azure1"																		,	"xf0ffff"	,	0.941176	,	1.000000	,	1.000000}	,
+			{"azure2"																		,	"xe0eeee"	,	0.878431	,	0.933333	,	0.933333}	,
+			{"azure3"																		,	"xc1cdcd"	,	0.756863	,	0.803922	,	0.803922}	,
+			{"azure4"																		,	"x838b8b"	,	0.513725	,	0.545098	,	0.545098}	,
+			{"beige"																			,	"xf5f5dc"	,	0.960784	,	0.960784	,	0.862745}	,
+			{"bisque"																		,	"xffe4c4"	,	1.000000	,	0.894118	,	0.768627}	,
+			{"bisque1"																	,	"xffe4c4"	,	1.000000	,	0.894118	,	0.768627}	,
+			{"bisque2"																	,	"xeed5b7"	,	0.933333	,	0.835294	,	0.717647}	,
+			{"bisque3"																	,	"xcdb79e"	,	0.803922	,	0.717647	,	0.619608}	,
+			{"bisque4"																	,	"x8b7d6b"	,	0.545098	,	0.490196	,	0.419608}	,
+			{"black"																			,	"x000000"	,	0.000000	,	0.000000	,	0.000000}	,
+			{"blanched	almond"									,	"xffebcd"	,	1.000000	,	0.921569	,	0.803922}	,
+			{"blue	violet"													,	"x8a2be2"	,	0.541176	,	0.168627	,	0.886275}	,
+			{"blue"																				,	"x0000ff"	,	0.000000	,	0.000000	,	1.000000}	,
+			{"blue1"																			,	"x0000ff"	,	0.000000	,	0.000000	,	1.000000}	,
+			{"blue2"																			,	"x0000ee"	,	0.000000	,	0.000000	,	0.933333}	,
+			{"blue3"																			,	"x0000cd"	,	0.000000	,	0.000000	,	0.803922}	,
+			{"blue4"																			,	"x00008b"	,	0.000000	,	0.000000	,	0.545098}	,
+			{"brown"																			,	"xa52a2a"	,	0.647059	,	0.164706	,	0.164706}	,
+			{"brown1"																		,	"xff4040"	,	1.000000	,	0.250980	,	0.250980}	,
+			{"brown2"																		,	"xee3b3b"	,	0.933333	,	0.231373	,	0.231373}	,
+			{"brown3"																		,	"xcd3333"	,	0.803922	,	0.200000	,	0.200000}	,
+			{"brown4"																		,	"x8b2323"	,	0.545098	,	0.137255	,	0.137255}	,
+			{"burlywood"															,	"xdeb887"	,	0.870588	,	0.721569	,	0.529412}	,
+			{"burlywood1"														,	"xffd39b"	,	1.000000	,	0.827451	,	0.607843}	,
+			{"burlywood2"														,	"xeec591"	,	0.933333	,	0.772549	,	0.568627}	,
+			{"burlywood3"														,	"xcdaa7d"	,	0.803922	,	0.666667	,	0.490196}	,
+			{"burlywood4"														,	"x8b7355"	,	0.545098	,	0.450980	,	0.333333}	,
+			{"cadet	blue"														,	"x5f9ea0"	,	0.372549	,	0.619608	,	0.627451}	,
+			{"chartreuse"														,	"x7fff00"	,	0.498039	,	1.000000	,	0.000000}	,
+			{"chartreuse1"													,	"x7fff00"	,	0.498039	,	1.000000	,	0.000000}	,
+			{"chartreuse2"													,	"x76ee00"	,	0.462745	,	0.933333	,	0.000000}	,
+			{"chartreuse3"													,	"x66cd00"	,	0.400000	,	0.803922	,	0.000000}	,
+			{"chartreuse4"													,	"x458b00"	,	0.270588	,	0.545098	,	0.000000}	,
+			{"chocolate"															,	"xd2691e"	,	0.823529	,	0.411765	,	0.117647}	,
+			{"chocolate1"														,	"xff7f24"	,	1.000000	,	0.498039	,	0.141176}	,
+			{"chocolate2"														,	"xee7621"	,	0.933333	,	0.462745	,	0.129412}	,
+			{"chocolate3"														,	"xcd661d"	,	0.803922	,	0.400000	,	0.113725}	,
+			{"chocolate4"														,	"x8b4513"	,	0.545098	,	0.270588	,	0.074510}	,
+			{"coral"																			,	"xff7f50"	,	1.000000	,	0.498039	,	0.313725}	,
+			{"coral1"																		,	"xff7256"	,	1.000000	,	0.447059	,	0.337255}	,
+			{"coral2"																		,	"xee6a50"	,	0.933333	,	0.415686	,	0.313725}	,
+			{"coral3"																		,	"xcd5b45"	,	0.803922	,	0.356863	,	0.270588}	,
+			{"coral4"																		,	"x8b3e2f"	,	0.545098	,	0.243137	,	0.184314}	,
+			{"cornflower	blue"									,	"x6495ed"	,	0.392157	,	0.584314	,	0.929412}	,
+			{"cornsilk"																,	"xfff8dc"	,	1.000000	,	0.972549	,	0.862745}	,
+			{"cornsilk1"															,	"xfff8dc"	,	1.000000	,	0.972549	,	0.862745}	,
+			{"cornsilk2"															,	"xeee8cd"	,	0.933333	,	0.909804	,	0.803922}	,
+			{"cornsilk3"															,	"xcdc8b1"	,	0.803922	,	0.784314	,	0.694118}	,
+			{"cornsilk4"															,	"x8b8878"	,	0.545098	,	0.533333	,	0.470588}	,
+			{"cyan"																				,	"x00ffff"	,	0.000000	,	1.000000	,	1.000000}	,
+			{"cyan1"																			,	"x00ffff"	,	0.000000	,	1.000000	,	1.000000}	,
+			{"cyan2"																			,	"x00eeee"	,	0.000000	,	0.933333	,	0.933333}	,
+			{"cyan3"																			,	"x00cdcd"	,	0.000000	,	0.803922	,	0.803922}	,
+			{"cyan4"																			,	"x008b8b"	,	0.000000	,	0.545098	,	0.545098}	,
+			{"dark	blue"															,	"x00008b"	,	0.000000	,	0.000000	,	0.545098}	,
+			{"dark	cyan"															,	"x008b8b"	,	0.000000	,	0.545098	,	0.545098}	,
+			{"dark	goldenrod"										,	"xb8860b"	,	0.721569	,	0.525490	,	0.043137}	,
+			{"dark	gray"															,	"xa9a9a9"	,	0.662745	,	0.662745	,	0.662745}	,
+			{"dark	green"														,	"x006400"	,	0.000000	,	0.392157	,	0.000000}	,
+			{"dark	grey"															,	"xa9a9a9"	,	0.662745	,	0.662745	,	0.662745}	,
+			{"dark	khaki"														,	"xbdb76b"	,	0.741176	,	0.717647	,	0.419608}	,
+			{"dark	magenta"												,	"x8b008b"	,	0.545098	,	0.000000	,	0.545098}	,
+			{"dark	olive	green"								,	"x556b2f"	,	0.333333	,	0.419608	,	0.184314}	,
+			{"dark	orange"													,	"xff8c00"	,	1.000000	,	0.549020	,	0.000000}	,
+			{"dark	orchid"													,	"x9932cc"	,	0.600000	,	0.196078	,	0.800000}	,
+			{"dark	red"																,	"x8b0000"	,	0.545098	,	0.000000	,	0.000000}	,
+			{"dark	salmon"													,	"xe9967a"	,	0.913725	,	0.588235	,	0.478431}	,
+			{"dark	sea	green"										,	"x8fbc8f"	,	0.560784	,	0.737255	,	0.560784}	,
+			{"dark	slate	blue"									,	"x483d8b"	,	0.282353	,	0.239216	,	0.545098}	,
+			{"dark	slate	gray"									,	"x2f4f4f"	,	0.184314	,	0.309804	,	0.309804}	,
+			{"dark	slate	grey"									,	"x2f4f4f"	,	0.184314	,	0.309804	,	0.309804}	,
+			{"dark	turquoise"										,	"x00ced1"	,	0.000000	,	0.807843	,	0.819608}	,
+			{"dark	violet"													,	"x9400d3"	,	0.580392	,	0.000000	,	0.827451}	,
+			{"deep	pink"															,	"xff1493"	,	1.000000	,	0.078431	,	0.576471}	,
+			{"deep	sky	blue"											,	"x00bfff"	,	0.000000	,	0.749020	,	1.000000}	,
+			{"dim	gray"																,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"dim	grey"																,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"dodger	blue"													,	"x1e90ff"	,	0.117647	,	0.564706	,	1.000000}	,
+			{"firebrick"															,	"xb22222"	,	0.698039	,	0.133333	,	0.133333}	,
+			{"firebrick1"														,	"xff3030"	,	1.000000	,	0.188235	,	0.188235}	,
+			{"firebrick2"														,	"xee2c2c"	,	0.933333	,	0.172549	,	0.172549}	,
+			{"firebrick3"														,	"xcd2626"	,	0.803922	,	0.149020	,	0.149020}	,
+			{"firebrick4"														,	"x8b1a1a"	,	0.545098	,	0.101961	,	0.101961}	,
+			{"floral	white"												,	"xfffaf0"	,	1.000000	,	0.980392	,	0.941176}	,
+			{"forest	green"												,	"x228b22"	,	0.133333	,	0.545098	,	0.133333}	,
+			{"gainsboro"															,	"xdcdcdc"	,	0.862745	,	0.862745	,	0.862745}	,
+			{"ghost	white"													,	"xf8f8ff"	,	0.972549	,	0.972549	,	1.000000}	,
+			{"gold"																				,	"xffd700"	,	1.000000	,	0.843137	,	0.000000}	,
+			{"gold1"																			,	"xffd700"	,	1.000000	,	0.843137	,	0.000000}	,
+			{"gold2"																			,	"xeec900"	,	0.933333	,	0.788235	,	0.000000}	,
+			{"gold3"																			,	"xcdad00"	,	0.803922	,	0.678431	,	0.000000}	,
+			{"gold4"																			,	"x8b7500"	,	0.545098	,	0.458824	,	0.000000}	,
+			{"goldenrod"															,	"xdaa520"	,	0.854902	,	0.647059	,	0.125490}	,
+			{"goldenrod1"														,	"xffc125"	,	1.000000	,	0.756863	,	0.145098}	,
+			{"goldenrod2"														,	"xeeb422"	,	0.933333	,	0.705882	,	0.133333}	,
+			{"goldenrod3"														,	"xcd9b1d"	,	0.803922	,	0.607843	,	0.113725}	,
+			{"goldenrod4"														,	"x8b6914"	,	0.545098	,	0.411765	,	0.078431}	,
+			{"gray"																				,	"xbebebe"	,	0.745098	,	0.745098	,	0.745098}	,
+			{"gray0"																			,	"x000000"	,	0.000000	,	0.000000	,	0.000000}	,
+			{"gray1"																			,	"x030303"	,	0.011765	,	0.011765	,	0.011765}	,
+			{"gray10"																		,	"x1a1a1a"	,	0.101961	,	0.101961	,	0.101961}	,
+			{"gray100"																	,	"xffffff"	,	1.000000	,	1.000000	,	1.000000}	,
+			{"gray11"																		,	"x1c1c1c"	,	0.109804	,	0.109804	,	0.109804}	,
+			{"gray12"																		,	"x1f1f1f"	,	0.121569	,	0.121569	,	0.121569}	,
+			{"gray13"																		,	"x212121"	,	0.129412	,	0.129412	,	0.129412}	,
+			{"gray14"																		,	"x242424"	,	0.141176	,	0.141176	,	0.141176}	,
+			{"gray15"																		,	"x262626"	,	0.149020	,	0.149020	,	0.149020}	,
+			{"gray16"																		,	"x292929"	,	0.160784	,	0.160784	,	0.160784}	,
+			{"gray17"																		,	"x2b2b2b"	,	0.168627	,	0.168627	,	0.168627}	,
+			{"gray18"																		,	"x2e2e2e"	,	0.180392	,	0.180392	,	0.180392}	,
+			{"gray19"																		,	"x303030"	,	0.188235	,	0.188235	,	0.188235}	,
+			{"gray2"																			,	"x050505"	,	0.019608	,	0.019608	,	0.019608}	,
+			{"gray20"																		,	"x333333"	,	0.200000	,	0.200000	,	0.200000}	,
+			{"gray21"																		,	"x363636"	,	0.211765	,	0.211765	,	0.211765}	,
+			{"gray22"																		,	"x383838"	,	0.219608	,	0.219608	,	0.219608}	,
+			{"gray23"																		,	"x3b3b3b"	,	0.231373	,	0.231373	,	0.231373}	,
+			{"gray24"																		,	"x3d3d3d"	,	0.239216	,	0.239216	,	0.239216}	,
+			{"gray25"																		,	"x404040"	,	0.250980	,	0.250980	,	0.250980}	,
+			{"gray26"																		,	"x424242"	,	0.258824	,	0.258824	,	0.258824}	,
+			{"gray27"																		,	"x454545"	,	0.270588	,	0.270588	,	0.270588}	,
+			{"gray28"																		,	"x474747"	,	0.278431	,	0.278431	,	0.278431}	,
+			{"gray29"																		,	"x4a4a4a"	,	0.290196	,	0.290196	,	0.290196}	,
+			{"gray3"																			,	"x080808"	,	0.031373	,	0.031373	,	0.031373}	,
+			{"gray30"																		,	"x4d4d4d"	,	0.301961	,	0.301961	,	0.301961}	,
+			{"gray31"																		,	"x4f4f4f"	,	0.309804	,	0.309804	,	0.309804}	,
+			{"gray32"																		,	"x525252"	,	0.321569	,	0.321569	,	0.321569}	,
+			{"gray33"																		,	"x545454"	,	0.329412	,	0.329412	,	0.329412}	,
+			{"gray34"																		,	"x575757"	,	0.341176	,	0.341176	,	0.341176}	,
+			{"gray35"																		,	"x595959"	,	0.349020	,	0.349020	,	0.349020}	,
+			{"gray36"																		,	"x5c5c5c"	,	0.360784	,	0.360784	,	0.360784}	,
+			{"gray37"																		,	"x5e5e5e"	,	0.368627	,	0.368627	,	0.368627}	,
+			{"gray38"																		,	"x616161"	,	0.380392	,	0.380392	,	0.380392}	,
+			{"gray39"																		,	"x636363"	,	0.388235	,	0.388235	,	0.388235}	,
+			{"gray4"																			,	"x0a0a0a"	,	0.039216	,	0.039216	,	0.039216}	,
+			{"gray40"																		,	"x666666"	,	0.400000	,	0.400000	,	0.400000}	,
+			{"gray41"																		,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"gray42"																		,	"x6b6b6b"	,	0.419608	,	0.419608	,	0.419608}	,
+			{"gray43"																		,	"x6e6e6e"	,	0.431373	,	0.431373	,	0.431373}	,
+			{"gray44"																		,	"x707070"	,	0.439216	,	0.439216	,	0.439216}	,
+			{"gray45"																		,	"x737373"	,	0.450980	,	0.450980	,	0.450980}	,
+			{"gray46"																		,	"x757575"	,	0.458824	,	0.458824	,	0.458824}	,
+			{"gray47"																		,	"x787878"	,	0.470588	,	0.470588	,	0.470588}	,
+			{"gray48"																		,	"x7a7a7a"	,	0.478431	,	0.478431	,	0.478431}	,
+			{"gray49"																		,	"x7d7d7d"	,	0.490196	,	0.490196	,	0.490196}	,
+			{"gray5"																			,	"x0d0d0d"	,	0.050980	,	0.050980	,	0.050980}	,
+			{"gray50"																		,	"x7f7f7f"	,	0.498039	,	0.498039	,	0.498039}	,
+			{"gray51"																		,	"x828282"	,	0.509804	,	0.509804	,	0.509804}	,
+			{"gray52"																		,	"x858585"	,	0.521569	,	0.521569	,	0.521569}	,
+			{"gray53"																		,	"x878787"	,	0.529412	,	0.529412	,	0.529412}	,
+			{"gray54"																		,	"x8a8a8a"	,	0.541176	,	0.541176	,	0.541176}	,
+			{"gray55"																		,	"x8c8c8c"	,	0.549020	,	0.549020	,	0.549020}	,
+			{"gray56"																		,	"x8f8f8f"	,	0.560784	,	0.560784	,	0.560784}	,
+			{"gray57"																		,	"x919191"	,	0.568627	,	0.568627	,	0.568627}	,
+			{"gray58"																		,	"x949494"	,	0.580392	,	0.580392	,	0.580392}	,
+			{"gray59"																		,	"x969696"	,	0.588235	,	0.588235	,	0.588235}	,
+			{"gray6"																			,	"x0f0f0f"	,	0.058824	,	0.058824	,	0.058824}	,
+			{"gray60"																		,	"x999999"	,	0.600000	,	0.600000	,	0.600000}	,
+			{"gray61"																		,	"x9c9c9c"	,	0.611765	,	0.611765	,	0.611765}	,
+			{"gray62"																		,	"x9e9e9e"	,	0.619608	,	0.619608	,	0.619608}	,
+			{"gray63"																		,	"xa1a1a1"	,	0.631373	,	0.631373	,	0.631373}	,
+			{"gray64"																		,	"xa3a3a3"	,	0.639216	,	0.639216	,	0.639216}	,
+			{"gray65"																		,	"xa6a6a6"	,	0.650980	,	0.650980	,	0.650980}	,
+			{"gray66"																		,	"xa8a8a8"	,	0.658824	,	0.658824	,	0.658824}	,
+			{"gray67"																		,	"xababab"	,	0.670588	,	0.670588	,	0.670588}	,
+			{"gray68"																		,	"xadadad"	,	0.678431	,	0.678431	,	0.678431}	,
+			{"gray69"																		,	"xb0b0b0"	,	0.690196	,	0.690196	,	0.690196}	,
+			{"gray7"																			,	"x121212"	,	0.070588	,	0.070588	,	0.070588}	,
+			{"gray70"																		,	"xb3b3b3"	,	0.701961	,	0.701961	,	0.701961}	,
+			{"gray71"																		,	"xb5b5b5"	,	0.709804	,	0.709804	,	0.709804}	,
+			{"gray72"																		,	"xb8b8b8"	,	0.721569	,	0.721569	,	0.721569}	,
+			{"gray73"																		,	"xbababa"	,	0.729412	,	0.729412	,	0.729412}	,
+			{"gray74"																		,	"xbdbdbd"	,	0.741176	,	0.741176	,	0.741176}	,
+			{"gray75"																		,	"xbfbfbf"	,	0.749020	,	0.749020	,	0.749020}	,
+			{"gray76"																		,	"xc2c2c2"	,	0.760784	,	0.760784	,	0.760784}	,
+			{"gray77"																		,	"xc4c4c4"	,	0.768627	,	0.768627	,	0.768627}	,
+			{"gray78"																		,	"xc7c7c7"	,	0.780392	,	0.780392	,	0.780392}	,
+			{"gray79"																		,	"xc9c9c9"	,	0.788235	,	0.788235	,	0.788235}	,
+			{"gray8"																			,	"x141414"	,	0.078431	,	0.078431	,	0.078431}	,
+			{"gray80"																		,	"xcccccc"	,	0.800000	,	0.800000	,	0.800000}	,
+			{"gray81"																		,	"xcfcfcf"	,	0.811765	,	0.811765	,	0.811765}	,
+			{"gray82"																		,	"xd1d1d1"	,	0.819608	,	0.819608	,	0.819608}	,
+			{"gray83"																		,	"xd4d4d4"	,	0.831373	,	0.831373	,	0.831373}	,
+			{"gray84"																		,	"xd6d6d6"	,	0.839216	,	0.839216	,	0.839216}	,
+			{"gray85"																		,	"xd9d9d9"	,	0.850980	,	0.850980	,	0.850980}	,
+			{"gray86"																		,	"xdbdbdb"	,	0.858824	,	0.858824	,	0.858824}	,
+			{"gray87"																		,	"xdedede"	,	0.870588	,	0.870588	,	0.870588}	,
+			{"gray88"																		,	"xe0e0e0"	,	0.878431	,	0.878431	,	0.878431}	,
+			{"gray89"																		,	"xe3e3e3"	,	0.890196	,	0.890196	,	0.890196}	,
+			{"gray9"																			,	"x171717"	,	0.090196	,	0.090196	,	0.090196}	,
+			{"gray90"																		,	"xe5e5e5"	,	0.898039	,	0.898039	,	0.898039}	,
+			{"gray91"																		,	"xe8e8e8"	,	0.909804	,	0.909804	,	0.909804}	,
+			{"gray92"																		,	"xebebeb"	,	0.921569	,	0.921569	,	0.921569}	,
+			{"gray93"																		,	"xededed"	,	0.929412	,	0.929412	,	0.929412}	,
+			{"gray94"																		,	"xf0f0f0"	,	0.941176	,	0.941176	,	0.941176}	,
+			{"gray95"																		,	"xf2f2f2"	,	0.949020	,	0.949020	,	0.949020}	,
+			{"gray96"																		,	"xf5f5f5"	,	0.960784	,	0.960784	,	0.960784}	,
+			{"gray97"																		,	"xf7f7f7"	,	0.968627	,	0.968627	,	0.968627}	,
+			{"gray98"																		,	"xfafafa"	,	0.980392	,	0.980392	,	0.980392}	,
+			{"gray99"																		,	"xfcfcfc"	,	0.988235	,	0.988235	,	0.988235}	,
+			{"green	yellow"												,	"xadff2f"	,	0.678431	,	1.000000	,	0.184314}	,
+			{"green"																			,	"x00ff00"	,	0.000000	,	1.000000	,	0.000000}	,
+			{"green1"																		,	"x00ff00"	,	0.000000	,	1.000000	,	0.000000}	,
+			{"green2"																		,	"x00ee00"	,	0.000000	,	0.933333	,	0.000000}	,
+			{"green3"																		,	"x00cd00"	,	0.000000	,	0.803922	,	0.000000}	,
+			{"green4"																		,	"x008b00"	,	0.000000	,	0.545098	,	0.000000}	,
+			{"grey"																				,	"xbebebe"	,	0.745098	,	0.745098	,	0.745098}	,
+			{"grey0"																			,	"x000000"	,	0.000000	,	0.000000	,	0.000000}	,
+			{"grey1"																			,	"x030303"	,	0.011765	,	0.011765	,	0.011765}	,
+			{"grey10"																		,	"x1a1a1a"	,	0.101961	,	0.101961	,	0.101961}	,
+			{"grey100"																	,	"xffffff"	,	1.000000	,	1.000000	,	1.000000}	,
+			{"grey11"																		,	"x1c1c1c"	,	0.109804	,	0.109804	,	0.109804}	,
+			{"grey12"																		,	"x1f1f1f"	,	0.121569	,	0.121569	,	0.121569}	,
+			{"grey13"																		,	"x212121"	,	0.129412	,	0.129412	,	0.129412}	,
+			{"grey14"																		,	"x242424"	,	0.141176	,	0.141176	,	0.141176}	,
+			{"grey15"																		,	"x262626"	,	0.149020	,	0.149020	,	0.149020}	,
+			{"grey16"																		,	"x292929"	,	0.160784	,	0.160784	,	0.160784}	,
+			{"grey17"																		,	"x2b2b2b"	,	0.168627	,	0.168627	,	0.168627}	,
+			{"grey18"																		,	"x2e2e2e"	,	0.180392	,	0.180392	,	0.180392}	,
+			{"grey19"																		,	"x303030"	,	0.188235	,	0.188235	,	0.188235}	,
+			{"grey2"																			,	"x050505"	,	0.019608	,	0.019608	,	0.019608}	,
+			{"grey20"																		,	"x333333"	,	0.200000	,	0.200000	,	0.200000}	,
+			{"grey21"																		,	"x363636"	,	0.211765	,	0.211765	,	0.211765}	,
+			{"grey22"																		,	"x383838"	,	0.219608	,	0.219608	,	0.219608}	,
+			{"grey23"																		,	"x3b3b3b"	,	0.231373	,	0.231373	,	0.231373}	,
+			{"grey24"																		,	"x3d3d3d"	,	0.239216	,	0.239216	,	0.239216}	,
+			{"grey25"																		,	"x404040"	,	0.250980	,	0.250980	,	0.250980}	,
+			{"grey26"																		,	"x424242"	,	0.258824	,	0.258824	,	0.258824}	,
+			{"grey27"																		,	"x454545"	,	0.270588	,	0.270588	,	0.270588}	,
+			{"grey28"																		,	"x474747"	,	0.278431	,	0.278431	,	0.278431}	,
+			{"grey29"																		,	"x4a4a4a"	,	0.290196	,	0.290196	,	0.290196}	,
+			{"grey3"																			,	"x080808"	,	0.031373	,	0.031373	,	0.031373}	,
+			{"grey30"																		,	"x4d4d4d"	,	0.301961	,	0.301961	,	0.301961}	,
+			{"grey31"																		,	"x4f4f4f"	,	0.309804	,	0.309804	,	0.309804}	,
+			{"grey32"																		,	"x525252"	,	0.321569	,	0.321569	,	0.321569}	,
+			{"grey33"																		,	"x545454"	,	0.329412	,	0.329412	,	0.329412}	,
+			{"grey34"																		,	"x575757"	,	0.341176	,	0.341176	,	0.341176}	,
+			{"grey35"																		,	"x595959"	,	0.349020	,	0.349020	,	0.349020}	,
+			{"grey36"																		,	"x5c5c5c"	,	0.360784	,	0.360784	,	0.360784}	,
+			{"grey37"																		,	"x5e5e5e"	,	0.368627	,	0.368627	,	0.368627}	,
+			{"grey38"																		,	"x616161"	,	0.380392	,	0.380392	,	0.380392}	,
+			{"grey39"																		,	"x636363"	,	0.388235	,	0.388235	,	0.388235}	,
+			{"grey4"																			,	"x0a0a0a"	,	0.039216	,	0.039216	,	0.039216}	,
+			{"grey40"																		,	"x666666"	,	0.400000	,	0.400000	,	0.400000}	,
+			{"grey41"																		,	"x696969"	,	0.411765	,	0.411765	,	0.411765}	,
+			{"grey42"																		,	"x6b6b6b"	,	0.419608	,	0.419608	,	0.419608}	,
+			{"grey43"																		,	"x6e6e6e"	,	0.431373	,	0.431373	,	0.431373}	,
+			{"grey44"																		,	"x707070"	,	0.439216	,	0.439216	,	0.439216}	,
+			{"grey45"																		,	"x737373"	,	0.450980	,	0.450980	,	0.450980}	,
+			{"grey46"																		,	"x757575"	,	0.458824	,	0.458824	,	0.458824}	,
+			{"grey47"																		,	"x787878"	,	0.470588	,	0.470588	,	0.470588}	,
+			{"grey48"																		,	"x7a7a7a"	,	0.478431	,	0.478431	,	0.478431}	,
+			{"grey49"																		,	"x7d7d7d"	,	0.490196	,	0.490196	,	0.490196}	,
+			{"grey5"																			,	"x0d0d0d"	,	0.050980	,	0.050980	,	0.050980}	,
+			{"grey50"																		,	"x7f7f7f"	,	0.498039	,	0.498039	,	0.498039}	,
+			{"grey51"																		,	"x828282"	,	0.509804	,	0.509804	,	0.509804}	,
+			{"grey52"																		,	"x858585"	,	0.521569	,	0.521569	,	0.521569}	,
+			{"grey53"																		,	"x878787"	,	0.529412	,	0.529412	,	0.529412}	,
+			{"grey54"																		,	"x8a8a8a"	,	0.541176	,	0.541176	,	0.541176}	,
+			{"grey55"																		,	"x8c8c8c"	,	0.549020	,	0.549020	,	0.549020}	,
+			{"grey56"																		,	"x8f8f8f"	,	0.560784	,	0.560784	,	0.560784}	,
+			{"grey57"																		,	"x919191"	,	0.568627	,	0.568627	,	0.568627}	,
+			{"grey58"																		,	"x949494"	,	0.580392	,	0.580392	,	0.580392}	,
+			{"grey59"																		,	"x969696"	,	0.588235	,	0.588235	,	0.588235}	,
+			{"grey6"																			,	"x0f0f0f"	,	0.058824	,	0.058824	,	0.058824}	,
+			{"grey60"																		,	"x999999"	,	0.600000	,	0.600000	,	0.600000}	,
+			{"grey61"																		,	"x9c9c9c"	,	0.611765	,	0.611765	,	0.611765}	,
+			{"grey62"																		,	"x9e9e9e"	,	0.619608	,	0.619608	,	0.619608}	,
+			{"grey63"																		,	"xa1a1a1"	,	0.631373	,	0.631373	,	0.631373}	,
+			{"grey64"																		,	"xa3a3a3"	,	0.639216	,	0.639216	,	0.639216}	,
+			{"grey65"																		,	"xa6a6a6"	,	0.650980	,	0.650980	,	0.650980}	,
+			{"grey66"																		,	"xa8a8a8"	,	0.658824	,	0.658824	,	0.658824}	,
+			{"grey67"																		,	"xababab"	,	0.670588	,	0.670588	,	0.670588}	,
+			{"grey68"																		,	"xadadad"	,	0.678431	,	0.678431	,	0.678431}	,
+			{"grey69"																		,	"xb0b0b0"	,	0.690196	,	0.690196	,	0.690196}	,
+			{"grey7"																			,	"x121212"	,	0.070588	,	0.070588	,	0.070588}	,
+			{"grey70"																		,	"xb3b3b3"	,	0.701961	,	0.701961	,	0.701961}	,
+			{"grey71"																		,	"xb5b5b5"	,	0.709804	,	0.709804	,	0.709804}	,
+			{"grey72"																		,	"xb8b8b8"	,	0.721569	,	0.721569	,	0.721569}	,
+			{"grey73"																		,	"xbababa"	,	0.729412	,	0.729412	,	0.729412}	,
+			{"grey74"																		,	"xbdbdbd"	,	0.741176	,	0.741176	,	0.741176}	,
+			{"grey75"																		,	"xbfbfbf"	,	0.749020	,	0.749020	,	0.749020}	,
+			{"grey76"																		,	"xc2c2c2"	,	0.760784	,	0.760784	,	0.760784}	,
+			{"grey77"																		,	"xc4c4c4"	,	0.768627	,	0.768627	,	0.768627}	,
+			{"grey78"																		,	"xc7c7c7"	,	0.780392	,	0.780392	,	0.780392}	,
+			{"grey79"																		,	"xc9c9c9"	,	0.788235	,	0.788235	,	0.788235}	,
+			{"grey8"																			,	"x141414"	,	0.078431	,	0.078431	,	0.078431}	,
+			{"grey80"																		,	"xcccccc"	,	0.800000	,	0.800000	,	0.800000}	,
+			{"grey81"																		,	"xcfcfcf"	,	0.811765	,	0.811765	,	0.811765}	,
+			{"grey82"																		,	"xd1d1d1"	,	0.819608	,	0.819608	,	0.819608}	,
+			{"grey83"																		,	"xd4d4d4"	,	0.831373	,	0.831373	,	0.831373}	,
+			{"grey84"																		,	"xd6d6d6"	,	0.839216	,	0.839216	,	0.839216}	,
+			{"grey85"																		,	"xd9d9d9"	,	0.850980	,	0.850980	,	0.850980}	,
+			{"grey86"																		,	"xdbdbdb"	,	0.858824	,	0.858824	,	0.858824}	,
+			{"grey87"																		,	"xdedede"	,	0.870588	,	0.870588	,	0.870588}	,
+			{"grey88"																		,	"xe0e0e0"	,	0.878431	,	0.878431	,	0.878431}	,
+			{"grey89"																		,	"xe3e3e3"	,	0.890196	,	0.890196	,	0.890196}	,
+			{"grey9"																			,	"x171717"	,	0.090196	,	0.090196	,	0.090196}	,
+			{"grey90"																		,	"xe5e5e5"	,	0.898039	,	0.898039	,	0.898039}	,
+			{"grey91"																		,	"xe8e8e8"	,	0.909804	,	0.909804	,	0.909804}	,
+			{"grey92"																		,	"xebebeb"	,	0.921569	,	0.921569	,	0.921569}	,
+			{"grey93"																		,	"xededed"	,	0.929412	,	0.929412	,	0.929412}	,
+			{"grey94"																		,	"xf0f0f0"	,	0.941176	,	0.941176	,	0.941176}	,
+			{"grey95"																		,	"xf2f2f2"	,	0.949020	,	0.949020	,	0.949020}	,
+			{"grey96"																		,	"xf5f5f5"	,	0.960784	,	0.960784	,	0.960784}	,
+			{"grey97"																		,	"xf7f7f7"	,	0.968627	,	0.968627	,	0.968627}	,
+			{"grey98"																		,	"xfafafa"	,	0.980392	,	0.980392	,	0.980392}	,
+			{"grey99"																		,	"xfcfcfc"	,	0.988235	,	0.988235	,	0.988235}	,
+			{"honeydew"																,	"xf0fff0"	,	0.941176	,	1.000000	,	0.941176}	,
+			{"honeydew1"															,	"xf0fff0"	,	0.941176	,	1.000000	,	0.941176}	,
+			{"honeydew2"															,	"xe0eee0"	,	0.878431	,	0.933333	,	0.878431}	,
+			{"honeydew3"															,	"xc1cdc1"	,	0.756863	,	0.803922	,	0.756863}	,
+			{"honeydew4"															,	"x838b83"	,	0.513725	,	0.545098	,	0.513725}	,
+			{"hot	pink"																,	"xff69b4"	,	1.000000	,	0.411765	,	0.705882}	,
+			{"indian	red"														,	"xcd5c5c"	,	0.803922	,	0.360784	,	0.360784}	,
+			{"ivory"																			,	"xfffff0"	,	1.000000	,	1.000000	,	0.941176}	,
+			{"ivory1"																		,	"xfffff0"	,	1.000000	,	1.000000	,	0.941176}	,
+			{"ivory2"																		,	"xeeeee0"	,	0.933333	,	0.933333	,	0.878431}	,
+			{"ivory3"																		,	"xcdcdc1"	,	0.803922	,	0.803922	,	0.756863}	,
+			{"ivory4"																		,	"x8b8b83"	,	0.545098	,	0.545098	,	0.513725}	,
+			{"khaki"																			,	"xf0e68c"	,	0.941176	,	0.901961	,	0.549020}	,
+			{"khaki1"																		,	"xfff68f"	,	1.000000	,	0.964706	,	0.560784}	,
+			{"khaki2"																		,	"xeee685"	,	0.933333	,	0.901961	,	0.521569}	,
+			{"khaki3"																		,	"xcdc673"	,	0.803922	,	0.776471	,	0.450980}	,
+			{"khaki4"																		,	"x8b864e"	,	0.545098	,	0.525490	,	0.305882}	,
+			{"lavender	blush"										,	"xfff0f5"	,	1.000000	,	0.941176	,	0.960784}	,
+			{"lavender"																,	"xe6e6fa"	,	0.901961	,	0.901961	,	0.980392}	,
+			{"lawn	green"														,	"x7cfc00"	,	0.486275	,	0.988235	,	0.000000}	,
+			{"lemon	chiffon"											,	"xfffacd"	,	1.000000	,	0.980392	,	0.803922}	,
+			{"light	blue"														,	"xadd8e6"	,	0.678431	,	0.847059	,	0.901961}	,
+			{"light	coral"													,	"xf08080"	,	0.941176	,	0.501961	,	0.501961}	,
+			{"light	cyan"														,	"xe0ffff"	,	0.878431	,	1.000000	,	1.000000}	,
+			{"light	goldenrod	yellow"		,	"xfafad2"	,	0.980392	,	0.980392	,	0.823529}	,
+			{"light	goldenrod"									,	"xeedd82"	,	0.933333	,	0.866667	,	0.509804}	,
+			{"light	gray"														,	"xd3d3d3"	,	0.827451	,	0.827451	,	0.827451}	,
+			{"light	green"													,	"x90ee90"	,	0.564706	,	0.933333	,	0.564706}	,
+			{"light	grey"														,	"xd3d3d3"	,	0.827451	,	0.827451	,	0.827451}	,
+			{"light	pink"														,	"xffb6c1"	,	1.000000	,	0.713725	,	0.756863}	,
+			{"light	salmon"												,	"xffa07a"	,	1.000000	,	0.627451	,	0.478431}	,
+			{"light	sea	green"									,	"x20b2aa"	,	0.125490	,	0.698039	,	0.666667}	,
+			{"light	sky	blue"										,	"x87cefa"	,	0.529412	,	0.807843	,	0.980392}	,
+			{"light	slate	blue"								,	"x8470ff"	,	0.517647	,	0.439216	,	1.000000}	,
+			{"light	slate	gray"								,	"x778899"	,	0.466667	,	0.533333	,	0.600000}	,
+			{"light	slate	grey"								,	"x778899"	,	0.466667	,	0.533333	,	0.600000}	,
+			{"light	steel	blue"								,	"xb0c4de"	,	0.690196	,	0.768627	,	0.870588}	,
+			{"light	yellow"												,	"xffffe0"	,	1.000000	,	1.000000	,	0.878431}	,
+			{"lime	green"														,	"x32cd32"	,	0.196078	,	0.803922	,	0.196078}	,
+			{"linen"																			,	"xfaf0e6"	,	0.980392	,	0.941176	,	0.901961}	,
+			{"magenta"																	,	"xff00ff"	,	1.000000	,	0.000000	,	1.000000}	,
+			{"magenta1"																,	"xff00ff"	,	1.000000	,	0.000000	,	1.000000}	,
+			{"magenta2"																,	"xee00ee"	,	0.933333	,	0.000000	,	0.933333}	,
+			{"magenta3"																,	"xcd00cd"	,	0.803922	,	0.000000	,	0.803922}	,
+			{"magenta4"																,	"x8b008b"	,	0.545098	,	0.000000	,	0.545098}	,
+			{"maroon"																		,	"xb03060"	,	0.690196	,	0.188235	,	0.376471}	,
+			{"maroon1"																	,	"xff34b3"	,	1.000000	,	0.203922	,	0.701961}	,
+			{"maroon2"																	,	"xee30a7"	,	0.933333	,	0.188235	,	0.654902}	,
+			{"maroon3"																	,	"xcd2990"	,	0.803922	,	0.160784	,	0.564706}	,
+			{"maroon4"																	,	"x8b1c62"	,	0.545098	,	0.109804	,	0.384314}	,
+			{"medium	aquamarine"							,	"x66cdaa"	,	0.400000	,	0.803922	,	0.666667}	,
+			{"medium	blue"													,	"x0000cd"	,	0.000000	,	0.000000	,	0.803922}	,
+			{"medium	orchid"											,	"xba55d3"	,	0.729412	,	0.333333	,	0.827451}	,
+			{"medium	purple"											,	"x9370db"	,	0.576471	,	0.439216	,	0.858824}	,
+			{"medium	sea	green"								,	"x3cb371"	,	0.235294	,	0.701961	,	0.443137}	,
+			{"medium	slate	blue"							,	"x7b68ee"	,	0.482353	,	0.407843	,	0.933333}	,
+			{"medium	spring	green"					,	"x00fa9a"	,	0.000000	,	0.980392	,	0.603922}	,
+			{"medium	turquoise"								,	"x48d1cc"	,	0.282353	,	0.819608	,	0.800000}	,
+			{"medium	violet	red"							,	"xc71585"	,	0.780392	,	0.082353	,	0.521569}	,
+			{"midnight	blue"											,	"x191970"	,	0.098039	,	0.098039	,	0.439216}	,
+			{"mint	cream"														,	"xf5fffa"	,	0.960784	,	1.000000	,	0.980392}	,
+			{"misty	rose"														,	"xffe4e1"	,	1.000000	,	0.894118	,	0.882353}	,
+			{"moccasin"																,	"xffe4b5"	,	1.000000	,	0.894118	,	0.709804}	,
+			{"navajo	white"												,	"xffdead"	,	1.000000	,	0.870588	,	0.678431}	,
+			{"navy	blue"															,	"x000080"	,	0.000000	,	0.000000	,	0.501961}	,
+			{"navy"																				,	"x000080"	,	0.000000	,	0.000000	,	0.501961}	,
+			{"old	lace"																,	"xfdf5e6"	,	0.992157	,	0.960784	,	0.901961}	,
+			{"olive	drab"														,	"x6b8e23"	,	0.419608	,	0.556863	,	0.137255}	,
+			{"orange	red"														,	"xff4500"	,	1.000000	,	0.270588	,	0.000000}	,
+			{"orange"																		,	"xffa500"	,	1.000000	,	0.647059	,	0.000000}	,
+			{"orange1"																	,	"xffa500"	,	1.000000	,	0.647059	,	0.000000}	,
+			{"orange2"																	,	"xee9a00"	,	0.933333	,	0.603922	,	0.000000}	,
+			{"orange3"																	,	"xcd8500"	,	0.803922	,	0.521569	,	0.000000}	,
+			{"orange4"																	,	"x8b5a00"	,	0.545098	,	0.352941	,	0.000000}	,
+			{"orchid"																		,	"xda70d6"	,	0.854902	,	0.439216	,	0.839216}	,
+			{"orchid1"																	,	"xff83fa"	,	1.000000	,	0.513725	,	0.980392}	,
+			{"orchid2"																	,	"xee7ae9"	,	0.933333	,	0.478431	,	0.913725}	,
+			{"orchid3"																	,	"xcd69c9"	,	0.803922	,	0.411765	,	0.788235}	,
+			{"orchid4"																	,	"x8b4789"	,	0.545098	,	0.278431	,	0.537255}	,
+			{"pale	goldenrod"										,	"xeee8aa"	,	0.933333	,	0.909804	,	0.666667}	,
+			{"pale	green"														,	"x98fb98"	,	0.596078	,	0.984314	,	0.596078}	,
+			{"pale	turquoise"										,	"xafeeee"	,	0.686275	,	0.933333	,	0.933333}	,
+			{"pale	violet	red"									,	"xdb7093"	,	0.858824	,	0.439216	,	0.576471}	,
+			{"papaya	whip"													,	"xffefd5"	,	1.000000	,	0.937255	,	0.835294}	,
+			{"peach	puff"														,	"xffdab9"	,	1.000000	,	0.854902	,	0.725490}	,
+			{"peru"																				,	"xcd853f"	,	0.803922	,	0.521569	,	0.247059}	,
+			{"pink"																				,	"xffc0cb"	,	1.000000	,	0.752941	,	0.796078}	,
+			{"pink1"																			,	"xffb5c5"	,	1.000000	,	0.709804	,	0.772549}	,
+			{"pink2"																			,	"xeea9b8"	,	0.933333	,	0.662745	,	0.721569}	,
+			{"pink3"																			,	"xcd919e"	,	0.803922	,	0.568627	,	0.619608}	,
+			{"pink4"																			,	"x8b636c"	,	0.545098	,	0.388235	,	0.423529}	,
+			{"plum"																				,	"xdda0dd"	,	0.866667	,	0.627451	,	0.866667}	,
+			{"plum1"																			,	"xffbbff"	,	1.000000	,	0.733333	,	1.000000}	,
+			{"plum2"																			,	"xeeaeee"	,	0.933333	,	0.682353	,	0.933333}	,
+			{"plum3"																			,	"xcd96cd"	,	0.803922	,	0.588235	,	0.803922}	,
+			{"plum4"																			,	"x8b668b"	,	0.545098	,	0.400000	,	0.545098}	,
+			{"powder	blue"													,	"xb0e0e6"	,	0.690196	,	0.878431	,	0.901961}	,
+			{"purple"																		,	"xa020f0"	,	0.627451	,	0.125490	,	0.941176}	,
+			{"purple1"																	,	"x9b30ff"	,	0.607843	,	0.188235	,	1.000000}	,
+			{"purple2"																	,	"x912cee"	,	0.568627	,	0.172549	,	0.933333}	,
+			{"purple3"																	,	"x7d26cd"	,	0.490196	,	0.149020	,	0.803922}	,
+			{"purple4"																	,	"x551a8b"	,	0.333333	,	0.101961	,	0.545098}	,
+			{"red"																					,	"xff0000"	,	1.000000	,	0.000000	,	0.000000}	,
+			{"red1"																				,	"xff0000"	,	1.000000	,	0.000000	,	0.000000}	,
+			{"red2"																				,	"xee0000"	,	0.933333	,	0.000000	,	0.000000}	,
+			{"red3"																				,	"xcd0000"	,	0.803922	,	0.000000	,	0.000000}	,
+			{"red4"																				,	"x8b0000"	,	0.545098	,	0.000000	,	0.000000}	,
+			{"rosy	brown"														,	"xbc8f8f"	,	0.737255	,	0.560784	,	0.560784}	,
+			{"royal	blue"														,	"x4169e1"	,	0.254902	,	0.411765	,	0.882353}	,
+			{"saddle	brown"												,	"x8b4513"	,	0.545098	,	0.270588	,	0.074510}	,
+			{"salmon"																		,	"xfa8072"	,	0.980392	,	0.501961	,	0.447059}	,
+			{"salmon1"																	,	"xff8c69"	,	1.000000	,	0.549020	,	0.411765}	,
+			{"salmon2"																	,	"xee8262"	,	0.933333	,	0.509804	,	0.384314}	,
+			{"salmon3"																	,	"xcd7054"	,	0.803922	,	0.439216	,	0.329412}	,
+			{"salmon4"																	,	"x8b4c39"	,	0.545098	,	0.298039	,	0.223529}	,
+			{"sandy	brown"													,	"xf4a460"	,	0.956863	,	0.643137	,	0.376471}	,
+			{"sea	green"															,	"x2e8b57"	,	0.180392	,	0.545098	,	0.341176}	,
+			{"seashell"																,	"xfff5ee"	,	1.000000	,	0.960784	,	0.933333}	,
+			{"seashell1"															,	"xfff5ee"	,	1.000000	,	0.960784	,	0.933333}	,
+			{"seashell2"															,	"xeee5de"	,	0.933333	,	0.898039	,	0.870588}	,
+			{"seashell3"															,	"xcdc5bf"	,	0.803922	,	0.772549	,	0.749020}	,
+			{"seashell4"															,	"x8b8682"	,	0.545098	,	0.525490	,	0.509804}	,
+			{"sienna"																		,	"xa0522d"	,	0.627451	,	0.321569	,	0.176471}	,
+			{"sienna1"																	,	"xff8247"	,	1.000000	,	0.509804	,	0.278431}	,
+			{"sienna2"																	,	"xee7942"	,	0.933333	,	0.474510	,	0.258824}	,
+			{"sienna3"																	,	"xcd6839"	,	0.803922	,	0.407843	,	0.223529}	,
+			{"sienna4"																	,	"x8b4726"	,	0.545098	,	0.278431	,	0.149020}	,
+			{"sky	blue"																,	"x87ceeb"	,	0.529412	,	0.807843	,	0.921569}	,
+			{"slate	blue"														,	"x6a5acd"	,	0.415686	,	0.352941	,	0.803922}	,
+			{"slate	gray"														,	"x708090"	,	0.439216	,	0.501961	,	0.564706}	,
+			{"slate	grey"														,	"x708090"	,	0.439216	,	0.501961	,	0.564706}	,
+			{"snow"																				,	"xfffafa"	,	1.000000	,	0.980392	,	0.980392}	,
+			{"snow1"																			,	"xfffafa"	,	1.000000	,	0.980392	,	0.980392}	,
+			{"snow2"																			,	"xeee9e9"	,	0.933333	,	0.913725	,	0.913725}	,
+			{"snow3"																			,	"xcdc9c9"	,	0.803922	,	0.788235	,	0.788235}	,
+			{"snow4"																			,	"x8b8989"	,	0.545098	,	0.537255	,	0.537255}	,
+			{"spring	green"												,	"x00ff7f"	,	0.000000	,	1.000000	,	0.498039}	,
+			{"steel	blue"														,	"x4682b4"	,	0.274510	,	0.509804	,	0.705882}	,
+			{"tan"																					,	"xd2b48c"	,	0.823529	,	0.705882	,	0.549020}	,
+			{"tan1"																				,	"xffa54f"	,	1.000000	,	0.647059	,	0.309804}	,
+			{"tan2"																				,	"xee9a49"	,	0.933333	,	0.603922	,	0.286275}	,
+			{"tan3"																				,	"xcd853f"	,	0.803922	,	0.521569	,	0.247059}	,
+			{"tan4"																				,	"x8b5a2b"	,	0.545098	,	0.352941	,	0.168627}	,
+			{"thistle"																	,	"xd8bfd8"	,	0.847059	,	0.749020	,	0.847059}	,
+			{"thistle1"																,	"xffe1ff"	,	1.000000	,	0.882353	,	1.000000}	,
+			{"thistle2"																,	"xeed2ee"	,	0.933333	,	0.823529	,	0.933333}	,
+			{"thistle3"																,	"xcdb5cd"	,	0.803922	,	0.709804	,	0.803922}	,
+			{"thistle4"																,	"x8b7b8b"	,	0.545098	,	0.482353	,	0.545098}	,
+			{"tomato"																		,	"xff6347"	,	1.000000	,	0.388235	,	0.278431}	,
+			{"tomato1"																	,	"xff6347"	,	1.000000	,	0.388235	,	0.278431}	,
+			{"tomato2"																	,	"xee5c42"	,	0.933333	,	0.360784	,	0.258824}	,
+			{"tomato3"																	,	"xcd4f39"	,	0.803922	,	0.309804	,	0.223529}	,
+			{"tomato4"																	,	"x8b3626"	,	0.545098	,	0.211765	,	0.149020}	,
+			{"turquoise"															,	"x40e0d0"	,	0.250980	,	0.878431	,	0.815686}	,
+			{"turquoise1"														,	"x00f5ff"	,	0.000000	,	0.960784	,	1.000000}	,
+			{"turquoise2"														,	"x00e5ee"	,	0.000000	,	0.898039	,	0.933333}	,
+			{"turquoise3"														,	"x00c5cd"	,	0.000000	,	0.772549	,	0.803922}	,
+			{"turquoise4"														,	"x00868b"	,	0.000000	,	0.525490	,	0.545098}	,
+			{"violet	red"														,	"xd02090"	,	0.815686	,	0.125490	,	0.564706}	,
+			{"violet"																		,	"xee82ee"	,	0.933333	,	0.509804	,	0.933333}	,
+			{"wheat"																			,	"xf5deb3"	,	0.960784	,	0.870588	,	0.701961}	,
+			{"wheat1"																		,	"xffe7ba"	,	1.000000	,	0.905882	,	0.729412}	,
+			{"wheat2"																		,	"xeed8ae"	,	0.933333	,	0.847059	,	0.682353}	,
+			{"wheat3"																		,	"xcdba96"	,	0.803922	,	0.729412	,	0.588235}	,
+			{"wheat4"																		,	"x8b7e66"	,	0.545098	,	0.494118	,	0.400000}	,
+			{"white	smoke"													,	"xf5f5f5"	,	0.960784	,	0.960784	,	0.960784}	,
+			{"white"																			,	"xffffff"	,	1.000000	,	1.000000	,	1.000000}	,
+			{"yellow	green"												,	"x9acd32"	,	0.603922	,	0.803922	,	0.196078}	,
+			{"yellow"																		,	"xffff00"	,	1.000000	,	1.000000	,	0.000000}	,
+			{"yellow1"																	,	"xffff00"	,	1.000000	,	1.000000	,	0.000000}	,
+			{"yellow2"																	,	"xeeee00"	,	0.933333	,	0.933333	,	0.000000}	,
+			{"yellow3"																	,	"xcdcd00"	,	0.803922	,	0.803922	,	0.000000}	,
+			{"yellow4"																	,	"x8b8b00"	,	0.545098	,	0.545098	,	0.000000}
+}	;
+const	int	num_colors	=	sizeof(color_trans)/sizeof(color_trans[0]);
 
 /*!
- * A <color> is either a keyword or a numerical RGB specification.
- */
-int color_is_valid( string* color ) {
+	*	A	<color>	is	either	a	keyword	or	a	numerical	RGB	specification.
+	*/
+int	color_is_valid(	string*	color	)	{
 
-    string       color_orig = *color;
-    string       gnuplot_cmd_file_name = "/tmp/dpx_gp_commands.txt";
-    string       my_colors_file_name = "/tmp/dpx_gp_colornames.txt";
-    ofstream     tmp_file;
-    ifstream     known_color_names;
-    string       copy_of_txt_file_line;
-    string       tmp_string;
-    stringstream tmp_stream;
-    stringstream color_stream;
+				string							color_orig	=	*color;
+				string							gnuplot_cmd_file_name	=	"/tmp/dpx_gp_commands.txt";
+				string							my_colors_file_name	=	"/tmp/dpx_gp_colornames.txt";
+				ofstream					tmp_file;
+				ifstream					known_color_names;
+				string							copy_of_txt_file_line;
+				string							tmp_string;
+				stringstream	tmp_stream;
+				stringstream	color_stream;
 
-    //! Create a tmp file with gnuplot commands that find colornames.
-    tmp_file.open( gnuplot_cmd_file_name.c_str() );
-    tmp_file << "show palette colornames" ;
-    tmp_file.close();
-    //! Run gnuplot, save output to file
-    tmp_stream.str("");
-    tmp_stream << "gnuplot " << gnuplot_cmd_file_name << " >& " << my_colors_file_name ;
-    system( tmp_stream.str().c_str() );
-    //! Delete tmp file
-    tmp_stream.str("");
-    tmp_stream << "rm -f " << gnuplot_cmd_file_name << " &" ;
-    system( tmp_stream.str().c_str() );
+				//!	Create	a	tmp	file	with	gnuplot	commands	that	find	colornames.
+				tmp_file.open(	gnuplot_cmd_file_name.c_str()	);
+				tmp_file	<<	"show	palette	colornames"	;
+				tmp_file.close();
+				//!	Run	gnuplot,	save	output	to	file
+				tmp_stream.str("");
+				tmp_stream	<<	"gnuplot	"	<<	gnuplot_cmd_file_name	<<	"	>&	"	<<	my_colors_file_name	;
+				system(	tmp_stream.str().c_str()	);
+				//!	Delete	tmp	file
+				tmp_stream.str("");
+				tmp_stream	<<	"rm	-f	"	<<	gnuplot_cmd_file_name	<<	"	&"	;
+				system(	tmp_stream.str().c_str()	);
 
-    //! Create a list of defined color names
-    known_color_names.open( my_colors_file_name.c_str() );
-    if ( known_color_names.is_open() ) {
-        color_stream.str("");  //clear
-        while (! known_color_names.eof() )
-        {
-            getline( known_color_names, copy_of_txt_file_line );
-            color_stream << copy_of_txt_file_line << endl;
-        }
-        known_color_names.close() ;
-    }
-    //! Delete results file
-    tmp_stream.str("");
-    tmp_stream << "rm -f " << my_colors_file_name << " &" ;
-    system( tmp_stream.str().c_str() );
+				//!	Create	a	list	of	defined	color	names
+				known_color_names.open(	my_colors_file_name.c_str()	);
+				if	(	known_color_names.is_open()	)	{
+								color_stream.str("");		//clear
+								while	(!	known_color_names.eof()	)
+								{
+												getline(	known_color_names,	copy_of_txt_file_line	);
+												color_stream	<<	copy_of_txt_file_line	<<	endl;
+								}
+								known_color_names.close()	;
+				}
+				//!	Delete	results	file
+				tmp_stream.str("");
+				tmp_stream	<<	"rm	-f	"	<<	my_colors_file_name	<<	"	&"	;
+				system(	tmp_stream.str().c_str()	);
 
-    /*!
-     * Verify that the given color is in RGB format (i.e. begins
-     * with a pound "#"), or by determining if the name
-     * (e.g. "salmon") is recognizable by the gnuplot application.
-     */
-    tmp_string  = color_orig;
-    tmp_string += ' ';  // prevent false finds
-    if ( color_stream.str().find(tmp_string) != string::npos  ||
-         tmp_string.compare(0, 1, "#") == 0 ) {
+				/*!
+					*	Verify	that	the	given	color	is	in	RGB	format	(i.e.	begins
+					*	with	a	pound	"#"),	or	by	determining	if	the	name
+					*	(e.g.	"salmon")	is	recognizable	by	the	gnuplot	application.
+					*/
+				tmp_string		=	color_orig;
+				tmp_string	+=	'	';		//	prevent	false	finds
+				if	(	color_stream.str().find(tmp_string)	!=	string::npos		||
+									tmp_string.compare(0,	1,	"#")	==	0	)	{
 
-        //! This is a valid color name.
-        return(1) ;
+								//!	This	is	a	valid	color	name.
+								return(1)	;
 
-    } else if ( convert_to_hexcolor(color) != -1 ) {
+				}	else	if	(	convert_to_hexcolor(color)	!=	-1	)	{
 
-        //! Color name changed to a HEX color code.
-        return(1) ;
+								//!	Color	name	changed	to	a	HEX	color	code.
+								return(1)	;
 
-    } else {
+				}	else	{
 
-        cout << "warning: \"" << color_orig
-             << "\" is not a known color name in Gnuplot." << endl;
-        cout << "Please select another color, or use a hexadecimal "
-             << "color code instead" << endl;
-        cout << "(e.g. #FF0000 for red)." << endl;
-        return(0) ;
-    }
+								cout	<<	"warning:	\""	<<	color_orig
+													<<	"\"	is	not	a	known	color	name	in	Gnuplot."	<<	endl;
+								cout	<<	"Please	select	another	color,	or	use	a	hexadecimal	"
+													<<	"color	code	instead"	<<	endl;
+								cout	<<	"(e.g.	#FF0000	for	red)."	<<	endl;
+								return(0)	;
+				}
 }
 
-int color_is_valid( char* color ) {
-    string str_ = color;
-    return( color_is_valid(&str_) );
+int	color_is_valid(	char*	color	)	{
+				string	str_	=	color;
+				return(	color_is_valid(&str_)	);
 }
 
 /*!
- * Pass a pointer to a color variable, and have the function change
- * the variable's value from a colorname to a hexadeciaml color code.
- */
-int convert_to_hexcolor( string* color ) {
+	*	Pass	a	pointer	to	a	color	variable,	and	have	the	function	change
+	*	the	variable's	value	from	a	colorname	to	a	hexadeciaml	color	code.
+	*/
+int	convert_to_hexcolor(	string*	color	)	{
 
-    string color_orig = *color;
-    string duplicate = color_orig;
-    string tmp_string;
+				string	color_orig	=	*color;
+				string	duplicate	=	color_orig;
+				string	tmp_string;
 
-    //! Remove spaces from string
-    while ( duplicate.find(" ") != string::npos ) {
-        duplicate.erase(duplicate.find(" "),1);
-    }
+				//!	Remove	spaces	from	string
+				while	(	duplicate.find("	")	!=	string::npos	)	{
+								duplicate.erase(duplicate.find("	"),1);
+				}
 
-    for ( int i = 0;  i < num_colors;  i++ ) {
+				for	(	int	i	=	0;		i	<	num_colors;		i++	)	{
 
-        if ( strcasecmp(duplicate.c_str(), (const char*)color_trans[i].color) == 0 ) {
-            //! copy hexadecimal color code
-            tmp_string = color_trans[i].hex_color;
-            if ( tmp_string.find("x", 0, 1) != string::npos ) {
+								if	(	strcasecmp(duplicate.c_str(),	(const	char*)color_trans[i].color)	==	0	)	{
+												//!	copy	hexadecimal	color	code
+												tmp_string	=	color_trans[i].hex_color;
+												if	(	tmp_string.find("x",	0,	1)	!=	string::npos	)	{
 
-                //! replace "x" with pound "#"
-                tmp_string.replace(0, 1, "#");
-            }
-            cout << "gp_colors.cpp: converting \"" << color_orig
-                 << "\" to \"" << tmp_string << "\"." << endl;
-            *color = tmp_string;
-            return(0) ;
-        }
-    }
+																//!	replace	"x"	with	pound	"#"
+																tmp_string.replace(0,	1,	"#");
+												}
+												cout	<<	"gp_colors.cpp:	converting	\""	<<	color_orig
+																	<<	"\"	to	\""	<<	tmp_string	<<	"\"."	<<	endl;
+												*color	=	tmp_string;
+												return(0)	;
+								}
+				}
 
-    return(-1) ;
+				return(-1)	;
 }
 
-int convert_to_hexcolor( char* color ) {
-    string str_ = color;
-    return( convert_to_hexcolor(&str_) );
+int	convert_to_hexcolor(	char*	color	)	{
+				string	str_	=	color;
+				return(	convert_to_hexcolor(&str_)	);
 }
 
 /*!
- * Pass a pointer to a color variable, and have the function change the
- * variable's value from a colorname to a RGB value where colors are
- * specified as triples of floating point numbers between 0.0 and 1.0.
- */
-int convert_to_rgbcolor( string* color ) {
+	*	Pass	a	pointer	to	a	color	variable,	and	have	the	function	change	the
+	*	variable's	value	from	a	colorname	to	a	RGB	value	where	colors	are
+	*	specified	as	triples	of	floating	point	numbers	between	0.0	and	1.0.
+	*/
+int	convert_to_rgbcolor(	string*	color	)	{
 
-    string color_orig = *color;
-    string duplicate = color_orig;
-    string tmp_string;
-    stringstream tmp_stream;
-    string delim = " ";
+				string	color_orig	=	*color;
+				string	duplicate	=	color_orig;
+				string	tmp_string;
+				stringstream	tmp_stream;
+				string	delim	=	"	";
 
-    //! Remove spaces from string
-    while ( duplicate.find(" ") != string::npos ) {
-        duplicate.erase(duplicate.find(" "),1);
-    }
+				//!	Remove	spaces	from	string
+				while	(	duplicate.find("	")	!=	string::npos	)	{
+								duplicate.erase(duplicate.find("	"),1);
+				}
 
-    for ( int i = 0;  i < num_colors;  i++ ) {
+				for	(	int	i	=	0;		i	<	num_colors;		i++	)	{
 
-        if ( strcasecmp(duplicate.c_str(), (const char*)color_trans[i].color) == 0 ) {
-            tmp_stream.str(""); tmp_stream << color_trans[i].red ;
-            tmp_string  = tmp_stream.str();
-            tmp_string += delim;
-            tmp_stream.str(""); tmp_stream << color_trans[i].green ;
-            tmp_string += tmp_stream.str();
-            tmp_string += delim;
-            tmp_stream.str(""); tmp_stream << color_trans[i].blue ;
-            tmp_string += tmp_stream.str();
-            *color = tmp_string;
-            return(0) ;
-        }
-    }
+								if	(	strcasecmp(duplicate.c_str(),	(const	char*)color_trans[i].color)	==	0	)	{
+												tmp_stream.str("");	tmp_stream	<<	color_trans[i].red	;
+												tmp_string		=	tmp_stream.str();
+												tmp_string	+=	delim;
+												tmp_stream.str("");	tmp_stream	<<	color_trans[i].green	;
+												tmp_string	+=	tmp_stream.str();
+												tmp_string	+=	delim;
+												tmp_stream.str("");	tmp_stream	<<	color_trans[i].blue	;
+												tmp_string	+=	tmp_stream.str();
+												*color	=	tmp_string;
+												return(0)	;
+								}
+				}
 
-    return(-1) ;
+				return(-1)	;
 }
 
-int convert_to_rgbcolor( char* color ) {
-    string str_ = color;
-    return( convert_to_rgbcolor(&str_) );
+int	convert_to_rgbcolor(	char*	color	)	{
+				string	str_	=	color;
+				return(	convert_to_rgbcolor(&str_)	);
 }
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
index 2672115d3..b52232b81 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp
@@ -1,309 +1,309 @@
 
-#include <stdio.h>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <fstream>
+#include	<stdio.h>
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<fstream>
 
-#include "gp_utilities.hh"
-#include "DPV/UTILS/DPV_textbuffer.hh"
-#include "gp_colors.hh"
-#include "gp_view_page_node.hh"
+#include	"gp_utilities.hh"
+#include	"DPV/UTILS/DPV_textbuffer.hh"
+#include	"gp_colors.hh"
+#include	"gp_view_page_node.hh"
 
-using namespace std;
+using	namespace	std;
 
 
 /*!
- * Filter post script: make lines thinner etc...
- */
-int filterPostScriptBW( const char *psName )
+	*	Filter	post	script:	make	lines	thinner	etc...
+	*/
+int	filterPostScriptBW(	const	char	*psName	)
 {
-    DPV_TextBuffer buf;
+				DPV_TextBuffer	buf;
 
-    //! Populate buf with file content.
-    buf.readFile( psName );
+				//!	Populate	buf	with	file	content.
+				buf.readFile(	psName	);
 
-    //! If this is not a ps file, don't filter
-    if ( strncmp(buf.getText(), "%!PS-Adobe", 10) != 0 ) {
-        return (-1);
-    }
+				//!	If	this	is	not	a	ps	file,	don't	filter
+				if	(	strncmp(buf.getText(),	"%!PS-Adobe",	10)	!=	0	)	{
+								return	(-1);
+				}
 
-    //! Do the filtering
-    buf.subst_g("gnulinewidth 5.000 def", "gnulinewidth 2.000 def");
-    buf.subst_g("/LTa { AL [1 dl 2 dl]",
-                "/LTa { AL [1 dl 2 div 2 dl 2 div]");
-    buf.subst_g("/LTa { AL [1 udl mul 2 udl mul]",
-                "/LTa { AL [1 dl 2 div 2 dl 2 div]");
+				//!	Do	the	filtering
+				buf.subst_g("gnulinewidth	5.000	def",	"gnulinewidth	2.000	def");
+				buf.subst_g("/LTa	{	AL	[1	dl	2	dl]",
+																"/LTa	{	AL	[1	dl	2	div	2	dl	2	div]");
+				buf.subst_g("/LTa	{	AL	[1	udl	mul	2	udl	mul]",
+																"/LTa	{	AL	[1	dl	2	div	2	dl	2	div]");
 
-    //! Write buffer back out to file
-    return ( buf.writeFile(psName) );
+				//!	Write	buffer	back	out	to	file
+				return	(	buf.writeFile(psName)	);
 }
 
 /*!
- * Filter color post script:
- */
-int filterPostScriptColor( const char *psName, GPViewPageNode* gp_view_page_node )
+	*	Filter	color	post	script:
+	*/
+int	filterPostScriptColor(	const	char	*psName,	GPViewPageNode*	gp_view_page_node	)
 {
-    DPV_TextBuffer buf;
-    DPV_TextBuffer newBuf;
-    string tmp_string;
-    stringstream tmp_stream;
-    stringstream begin_stream;
-    string directive;
-    string page_fg_color = "";
-    string page_bg_color = "";
-    int i;
-    int total_num_curves = 0 ;
-    string next_lt ;
-    string new_buf_ptr ;
-    string line_color ;
-    unsigned int red , blue , green ;
-    int number_of_plots = (int)gp_view_page_node->plot_node_list.size();
-
-    //! Populate buf with file content.
-    buf.readFile( psName );
-
-    //! If this is not a ps file, don't filter
-    if ( strncmp(buf.getText(), "%!PS-Adobe", 10) != 0 ) {
-        return (-1);
-    }
-
-    //! Change the linewidth
-    buf.subst_g("gnulinewidth 5.000 def", "gnulinewidth 2.000 def");
-
-    //! Change the background color
-    if ( gp_view_page_node->page->getAttribute("background_color") ) {
-        page_bg_color = gp_view_page_node->page->getAttribute("background_color");
-    }
-    if ( ! page_bg_color.empty() ) {
-        if ( page_bg_color[0] == '#' ) {
-
-            sscanf( page_bg_color.c_str(), "#%02x%02x%02x", &red , &green , &blue );
-
-            if ( gp_view_page_node->terminalType == GPViewPageNode::PS_COLOR ) {
-                directive = "Page: 1 1" ;
-            } else {
-                directive = "EndProlog" ;
-            }
-            tmp_stream.str("");
-            tmp_stream << directive.c_str() << endl;
-            tmp_stream << " " << (float)red / 255 ;
-            tmp_stream << " " << (float)green / 255 ;
-            tmp_stream << " " << (float)blue / 255 ;
-            tmp_stream << " setrgbcolor" << endl;
-            tmp_stream << "clippath fill" ;
-
-            buf.subst_g( directive.c_str(), tmp_stream.str().c_str() );
-
-        } else {
-
-            for ( i = 0 ; i < num_colors ; i++ ) {
-
-                if ( page_bg_color.compare(color_trans[i].color) == 0 ) {
-
-                    if ( gp_view_page_node->terminalType == GPViewPageNode::PS_COLOR ) {
-                        directive = "Page: 1 1" ;
-                    } else {
-                        directive = "EndProlog" ;
-                    }
-                    tmp_stream.str("");
-                    tmp_stream << directive.c_str() << endl;
-                    tmp_stream << " " << color_trans[i].red ;
-                    tmp_stream << " " << color_trans[i].green ;
-                    tmp_stream << " " << color_trans[i].blue ;
-                    tmp_stream << " setrgbcolor" << endl;
-                    tmp_stream << "clippath fill" ;
-
-                    buf.subst_g( directive.c_str(), tmp_stream.str().c_str() );
-
-                    break ;
-                }
-            }
-        }
-    }
-
-    //! Change the foreground color
-    if ( gp_view_page_node->page->getAttribute("foreground_color") ) {
-        page_fg_color = gp_view_page_node->page->getAttribute("foreground_color");
-    }
-    if ( ! page_fg_color.empty() ) {
-        if ( page_fg_color[0] == '#' ) {
-
-            sscanf( page_fg_color.c_str(), "#%02x%02x%02x", &red , &green , &blue );
-
-            tmp_stream.str("");
-            tmp_stream << "/LTa { AL [1 dl 2 div 2 dl 2 div] 0 setdash" ;
-            tmp_stream << " " << (float)red / 255 ;
-            tmp_stream << " " << (float)green / 255 ;
-            tmp_stream << " " << (float)blue / 255 ;
-
-            buf.subst_g( "/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0",
-                         tmp_stream.str().c_str() );
-            buf.subst_g( "/LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0",
-                         tmp_stream.str().c_str() );
-
-            tmp_stream.str("");
-            tmp_stream << "/LTb { BL []" ;
-            tmp_stream << " " << (float)red / 255 ;
-            tmp_stream << " " << (float)green / 255 ;
-            tmp_stream << " " << (float)blue / 255 ;
-
-            buf.subst_g( "/LTb { BL [] 0 0 0", tmp_stream.str().c_str() );
-
-        } else {
-
-            for ( i = 0 ; i < num_colors ; i++ ) {
-
-                if ( page_fg_color.compare(color_trans[i].color) == 0 ) {
-
-                    tmp_stream.str("");
-                    tmp_stream << "/LTa { AL [1 dl 2 div 2 dl 2 div] 0 setdash";
-                    tmp_stream << " " << color_trans[i].red ;
-                    tmp_stream << " " << color_trans[i].green ;
-                    tmp_stream << " " << color_trans[i].blue ;
-
-                    buf.subst_g( "/LTa { AL [1 dl 2 dl] 0 setdash 0 0 0",
-                                tmp_stream.str().c_str() );
-                    buf.subst_g( "/LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0",
-                                tmp_stream.str().c_str() );
-
-                    tmp_stream.str("");
-                    tmp_stream << "/LTb { BL []";
-                    tmp_stream << " " << color_trans[i].red ;
-                    tmp_stream << " " << color_trans[i].green ;
-                    tmp_stream << " " << color_trans[i].blue ;
-
-                    buf.subst_g("/LTb { BL [] 0 0 0", tmp_stream.str().c_str());
-
-                    break ;
-                }
-            }
-        }
-    }
-
-    //! Change the line colors
-    tmp_stream.str("");
-    tmp_stream << buf.getText();
-    begin_stream.str("");
-    begin_stream << buf.getText();
-
-    for ( i = 0;  i < number_of_plots;  i++ ) {
-
-        GPViewPlotNode* gp_view_plot_node;
-
-        gp_view_plot_node = gp_view_page_node->plot_node_list[i];
-        total_num_curves += gp_view_plot_node->plot->getNumCurves();
-
-/*        for ( j = 0;  j < total_num_curves;  j++ ) {
-
-            //! find the next "^LT[0-8]" token
-            do {
-                next_lt = strstr(tmp_stream.str().c_str() , "Rshow\nLT") ;
-                if ( next_lt != NULL ) {
-                    //! move the tmp_stream past
-                    //! the found token for next check
-                    tmp_stream.str().c_str() = next_lt + 10 ;
-                }
-            } while ( next_lt != NULL && !isdigit(next_lt[8]) ) ;
-
-            if ( ! next_lt.empty() ) {
-
-                //! get the length of the crrent output string
-                old_len = strlen(new_buf_ptr) ;
-
-                //! copy the string from the beginning
-                //! of this string to just past the LT string
-                strncpy(&new_buf_ptr[old_len] ,
-                        begin_ptr , next_lt - begin_ptr + 10) ;
-
-                //! NULL terminate the string
-                //! and move the pointer
-                tmpInt = old_len + next_lt - begin_ptr + 10 ;
-                new_buf_ptr[tmpInt] = '\0' ;
-                new_buf_ptr += tmpInt ;
-
-                //! add a line color if there is one defined
-                line_color = plot->curves[j]->getLineColor() ;
-                line_color = gp_view_plot_node->plot->getNumCurves() ;
-                if ( ! line_color.empty() ) {
-                    if ( line_color[0] == '#' ) {
-                        sscanf( line_color, "#%02x%02x%02x",
-                                &red , &green , &blue ) ;
-
-                                new_buf.str("");
-                                new_buf << (float)red / 255 << " " ;
-                                new_buf << (float)green / 255 << " " ;
-                                new_buf << (float)blue / 255 << " " ;
-                                new_buf << "setrgbcolor" << endl;
-                    } else {
-                        for ( k = 0;  k < num_colors;  k++ ) {
-                            if ( strcasecmp(line_color,
-                                 color_trans[k].color) == 0 ) {
-
-                                new_buf.str("");
-                                new_buf << color_trans[k].red << " " ;
-                                new_buf << color_trans[k].green << " " ;
-                                new_buf << color_trans[k].blue << " " ;
-                                new_buf << "setrgbcolor" << endl;
-
-                                break ;
-                            }
-                        }
-                    }
-                }
-
-            }
-        }*/
-    }
-    //! Add the rest of the original file to new buffer
-//     new_buf << tmp_stream ;
-
-    //! Write buffer back out to file
-    return ( buf.writeFile(psName) );
+				DPV_TextBuffer	buf;
+				DPV_TextBuffer	newBuf;
+				string	tmp_string;
+				stringstream	tmp_stream;
+				stringstream	begin_stream;
+				string	directive;
+				string	page_fg_color	=	"";
+				string	page_bg_color	=	"";
+				int	i;
+				int	total_num_curves	=	0	;
+				string	next_lt	;
+				string	new_buf_ptr	;
+				string	line_color	;
+				unsigned	int	red	,	blue	,	green	;
+				int	number_of_plots	=	(int)gp_view_page_node->plot_node_list.size();
+
+				//!	Populate	buf	with	file	content.
+				buf.readFile(	psName	);
+
+				//!	If	this	is	not	a	ps	file,	don't	filter
+				if	(	strncmp(buf.getText(),	"%!PS-Adobe",	10)	!=	0	)	{
+								return	(-1);
+				}
+
+				//!	Change	the	linewidth
+				buf.subst_g("gnulinewidth	5.000	def",	"gnulinewidth	2.000	def");
+
+				//!	Change	the	background	color
+				if	(	gp_view_page_node->page->getAttribute("background_color")	)	{
+								page_bg_color	=	gp_view_page_node->page->getAttribute("background_color");
+				}
+				if	(	!	page_bg_color.empty()	)	{
+								if	(	page_bg_color[0]	==	'#'	)	{
+
+												sscanf(	page_bg_color.c_str(),	"#%02x%02x%02x",	&red	,	&green	,	&blue	);
+
+												if	(	gp_view_page_node->terminalType	==	GPViewPageNode::PS_COLOR	)	{
+																directive	=	"Page:	1	1"	;
+												}	else	{
+																directive	=	"EndProlog"	;
+												}
+												tmp_stream.str("");
+												tmp_stream	<<	directive.c_str()	<<	endl;
+												tmp_stream	<<	"	"	<<	(float)red	/	255	;
+												tmp_stream	<<	"	"	<<	(float)green	/	255	;
+												tmp_stream	<<	"	"	<<	(float)blue	/	255	;
+												tmp_stream	<<	"	setrgbcolor"	<<	endl;
+												tmp_stream	<<	"clippath	fill"	;
+
+												buf.subst_g(	directive.c_str(),	tmp_stream.str().c_str()	);
+
+								}	else	{
+
+												for	(	i	=	0	;	i	<	num_colors	;	i++	)	{
+
+																if	(	page_bg_color.compare(color_trans[i].color)	==	0	)	{
+
+																				if	(	gp_view_page_node->terminalType	==	GPViewPageNode::PS_COLOR	)	{
+																								directive	=	"Page:	1	1"	;
+																				}	else	{
+																								directive	=	"EndProlog"	;
+																				}
+																				tmp_stream.str("");
+																				tmp_stream	<<	directive.c_str()	<<	endl;
+																				tmp_stream	<<	"	"	<<	color_trans[i].red	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].green	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].blue	;
+																				tmp_stream	<<	"	setrgbcolor"	<<	endl;
+																				tmp_stream	<<	"clippath	fill"	;
+
+																				buf.subst_g(	directive.c_str(),	tmp_stream.str().c_str()	);
+
+																				break	;
+																}
+												}
+								}
+				}
+
+				//!	Change	the	foreground	color
+				if	(	gp_view_page_node->page->getAttribute("foreground_color")	)	{
+								page_fg_color	=	gp_view_page_node->page->getAttribute("foreground_color");
+				}
+				if	(	!	page_fg_color.empty()	)	{
+								if	(	page_fg_color[0]	==	'#'	)	{
+
+												sscanf(	page_fg_color.c_str(),	"#%02x%02x%02x",	&red	,	&green	,	&blue	);
+
+												tmp_stream.str("");
+												tmp_stream	<<	"/LTa	{	AL	[1	dl	2	div	2	dl	2	div]	0	setdash"	;
+												tmp_stream	<<	"	"	<<	(float)red	/	255	;
+												tmp_stream	<<	"	"	<<	(float)green	/	255	;
+												tmp_stream	<<	"	"	<<	(float)blue	/	255	;
+
+												buf.subst_g(	"/LTa	{	AL	[1	dl	2	dl]	0	setdash	0	0	0",
+																									tmp_stream.str().c_str()	);
+												buf.subst_g(	"/LTa	{	AL	[1	udl	mul	2	udl	mul]	0	setdash	0	0	0",
+																									tmp_stream.str().c_str()	);
+
+												tmp_stream.str("");
+												tmp_stream	<<	"/LTb	{	BL	[]"	;
+												tmp_stream	<<	"	"	<<	(float)red	/	255	;
+												tmp_stream	<<	"	"	<<	(float)green	/	255	;
+												tmp_stream	<<	"	"	<<	(float)blue	/	255	;
+
+												buf.subst_g(	"/LTb	{	BL	[]	0	0	0",	tmp_stream.str().c_str()	);
+
+								}	else	{
+
+												for	(	i	=	0	;	i	<	num_colors	;	i++	)	{
+
+																if	(	page_fg_color.compare(color_trans[i].color)	==	0	)	{
+
+																				tmp_stream.str("");
+																				tmp_stream	<<	"/LTa	{	AL	[1	dl	2	div	2	dl	2	div]	0	setdash";
+																				tmp_stream	<<	"	"	<<	color_trans[i].red	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].green	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].blue	;
+
+																				buf.subst_g(	"/LTa	{	AL	[1	dl	2	dl]	0	setdash	0	0	0",
+																																tmp_stream.str().c_str()	);
+																				buf.subst_g(	"/LTa	{	AL	[1	udl	mul	2	udl	mul]	0	setdash	0	0	0",
+																																tmp_stream.str().c_str()	);
+
+																				tmp_stream.str("");
+																				tmp_stream	<<	"/LTb	{	BL	[]";
+																				tmp_stream	<<	"	"	<<	color_trans[i].red	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].green	;
+																				tmp_stream	<<	"	"	<<	color_trans[i].blue	;
+
+																				buf.subst_g("/LTb	{	BL	[]	0	0	0",	tmp_stream.str().c_str());
+
+																				break	;
+																}
+												}
+								}
+				}
+
+				//!	Change	the	line	colors
+				tmp_stream.str("");
+				tmp_stream	<<	buf.getText();
+				begin_stream.str("");
+				begin_stream	<<	buf.getText();
+
+				for	(	i	=	0;		i	<	number_of_plots;		i++	)	{
+
+								GPViewPlotNode*	gp_view_plot_node;
+
+								gp_view_plot_node	=	gp_view_page_node->plot_node_list[i];
+								total_num_curves	+=	gp_view_plot_node->plot->getNumCurves();
+
+/*								for	(	j	=	0;		j	<	total_num_curves;		j++	)	{
+
+												//!	find	the	next	"^LT[0-8]"	token
+												do	{
+																next_lt	=	strstr(tmp_stream.str().c_str()	,	"Rshow\nLT")	;
+																if	(	next_lt	!=	NULL	)	{
+																				//!	move	the	tmp_stream	past
+																				//!	the	found	token	for	next	check
+																				tmp_stream.str().c_str()	=	next_lt	+	10	;
+																}
+												}	while	(	next_lt	!=	NULL	&&	!isdigit(next_lt[8])	)	;
+
+												if	(	!	next_lt.empty()	)	{
+
+																//!	get	the	length	of	the	crrent	output	string
+																old_len	=	strlen(new_buf_ptr)	;
+
+																//!	copy	the	string	from	the	beginning
+																//!	of	this	string	to	just	past	the	LT	string
+																strncpy(&new_buf_ptr[old_len]	,
+																								begin_ptr	,	next_lt	-	begin_ptr	+	10)	;
+
+																//!	NULL	terminate	the	string
+																//!	and	move	the	pointer
+																tmpInt	=	old_len	+	next_lt	-	begin_ptr	+	10	;
+																new_buf_ptr[tmpInt]	=	'\0'	;
+																new_buf_ptr	+=	tmpInt	;
+
+																//!	add	a	line	color	if	there	is	one	defined
+																line_color	=	plot->curves[j]->getLineColor()	;
+																line_color	=	gp_view_plot_node->plot->getNumCurves()	;
+																if	(	!	line_color.empty()	)	{
+																				if	(	line_color[0]	==	'#'	)	{
+																								sscanf(	line_color,	"#%02x%02x%02x",
+																																&red	,	&green	,	&blue	)	;
+
+																																new_buf.str("");
+																																new_buf	<<	(float)red	/	255	<<	"	"	;
+																																new_buf	<<	(float)green	/	255	<<	"	"	;
+																																new_buf	<<	(float)blue	/	255	<<	"	"	;
+																																new_buf	<<	"setrgbcolor"	<<	endl;
+																				}	else	{
+																								for	(	k	=	0;		k	<	num_colors;		k++	)	{
+																												if	(	strcasecmp(line_color,
+																																	color_trans[k].color)	==	0	)	{
+
+																																new_buf.str("");
+																																new_buf	<<	color_trans[k].red	<<	"	"	;
+																																new_buf	<<	color_trans[k].green	<<	"	"	;
+																																new_buf	<<	color_trans[k].blue	<<	"	"	;
+																																new_buf	<<	"setrgbcolor"	<<	endl;
+
+																																break	;
+																												}
+																								}
+																				}
+																}
+
+												}
+								}*/
+				}
+				//!	Add	the	rest	of	the	original	file	to	new	buffer
+//					new_buf	<<	tmp_stream	;
+
+				//!	Write	buffer	back	out	to	file
+				return	(	buf.writeFile(psName)	);
 }
 
 /*!
- * Generate and print postscript file.
- */
-int printPS( string psName )
+	*	Generate	and	print	postscript	file.
+	*/
+int	printPS(	string	psName	)
 {
 
-    string printerName;
-    string printCmd;
-    stringstream cmd;
-
-    //! Get print command
-    printCmd = getenv("TRICK_PRINT_CMD");
-    if ( printCmd.empty() ) {
-        cerr << "ERROR: Sorry env var TRICK_PRINT_CMD not set." << endl;
-        cerr << "       Cannot print until set." << endl;
-        return (-1);
-    }
-    //! Get printer name
-    printerName = getenv("TRICK_PRINTER_NAME");
-    if ( printerName.empty() ) {
-        cerr << "ERROR: Sorry env var TRICK_PRINTER_NAME not set." << endl;
-        cerr << "       Cannot print until set." << endl;
-        return (-1);
-    }
-    //! Build print command
-    if ( printCmd.compare("lpr") == 0 ) {
-        cmd << printCmd << " -P" << printerName << " " << psName;
-    } else if ( printCmd.compare("lp") == 0 ) {
-        cmd << printCmd << " -d" << printerName << " " << psName;
-    } else {
-        //! Assume print command is ready for printer name appendage.
-        cmd << printCmd << " " << printerName << " " << psName;
-    }
-
-    //! Actually print
-    cout << "Printing : " << psName << "..." << endl;
-    cout.flush();
-    return ( system(cmd.str().c_str()) );
+				string	printerName;
+				string	printCmd;
+				stringstream	cmd;
+
+				//!	Get	print	command
+				printCmd	=	getenv("TRICK_PRINT_CMD");
+				if	(	printCmd.empty()	)	{
+								cerr	<<	"ERROR:	Sorry	env	var	TRICK_PRINT_CMD	not	set."	<<	endl;
+								cerr	<<	"							Cannot	print	until	set."	<<	endl;
+								return	(-1);
+				}
+				//!	Get	printer	name
+				printerName	=	getenv("TRICK_PRINTER_NAME");
+				if	(	printerName.empty()	)	{
+								cerr	<<	"ERROR:	Sorry	env	var	TRICK_PRINTER_NAME	not	set."	<<	endl;
+								cerr	<<	"							Cannot	print	until	set."	<<	endl;
+								return	(-1);
+				}
+				//!	Build	print	command
+				if	(	printCmd.compare("lpr")	==	0	)	{
+								cmd	<<	printCmd	<<	"	-P"	<<	printerName	<<	"	"	<<	psName;
+				}	else	if	(	printCmd.compare("lp")	==	0	)	{
+								cmd	<<	printCmd	<<	"	-d"	<<	printerName	<<	"	"	<<	psName;
+				}	else	{
+								//!	Assume	print	command	is	ready	for	printer	name	appendage.
+								cmd	<<	printCmd	<<	"	"	<<	printerName	<<	"	"	<<	psName;
+				}
+
+				//!	Actually	print
+				cout	<<	"Printing	:	"	<<	psName	<<	"..."	<<	endl;
+				cout.flush();
+				return	(	system(cmd.str().c_str())	);
 
 }
 
-int printPS( const char *psName ) {
-    string str_ = psName;
-    return( printPS(str_) );
+int	printPS(	const	char	*psName	)	{
+				string	str_	=	psName;
+				return(	printPS(str_)	);
 }
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_version.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_version.cpp
index 627c6dfc8..1a538bcef 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_version.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_version.cpp
@@ -1,50 +1,50 @@
 
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
+#include	<iostream>
+#include	<stdio.h>
+#include	<stdlib.h>
 
-using namespace std;
+using	namespace	std;
 
-double GnuplotVersion() {
-        FILE* pipe ;
-        char buf[256] ;
-        double version = -1.0 ;
-        int ret ;
+double	GnuplotVersion()	{
+								FILE*	pipe	;
+								char	buf[256]	;
+								double	version	=	-1.0	;
+								int	ret	;
 
-        buf[0] = '\0' ;
+								buf[0]	=	'\0'	;
 
-        if ( (pipe = popen("gnuplot --version 2> /dev/null", "r")) != NULL ) {
-                fgets( buf, 255, pipe ) ;
+								if	(	(pipe	=	popen("gnuplot	--version	2>	/dev/null",	"r"))	!=	NULL	)	{
+																fgets(	buf,	255,	pipe	)	;
 
-                // In gnuplot 3.x, the gnuplot --version command
-                // causes an error, so return 3.0 if buf[0] != 'g'
-                if ( buf[0] != 'g' ) {
-                        pclose(pipe);
-                        return(3.0);
-                }
-                // Okay in 4.0
-                // %> gnuplot --version
-                // %> gnuplot 4.0 patchlevel 0
-                // For now assume it will stay like this
-                ret = sscanf(buf, "%*s %lf", &version);
-                if ( ret == 1 ) {
-                        pclose(pipe);
-                        return(version);
-                } else {
-                        cerr << "ERROR: getGnuplotVersion() : Died while "
-                             << "\" scanning gnuplot --version\".  Aborting."
-                             << endl ;
-                        exit(-1);
-                }
-        } else {
-                cerr << "ERROR: getGnuplotVersion() : Died while running "
-                     << "\"gnuplot --version\".  Aborting."
-                     << endl ;
-                pclose(pipe);
-                exit(-1);
-        }
-        // This just makes the compiler happy,
-        // it will not be executed
-        return( version ) ;
+																//	In	gnuplot	3.x,	the	gnuplot	--version	command
+																//	causes	an	error,	so	return	3.0	if	buf[0]	!=	'g'
+																if	(	buf[0]	!=	'g'	)	{
+																								pclose(pipe);
+																								return(3.0);
+																}
+																//	Okay	in	4.0
+																//	%>	gnuplot	--version
+																//	%>	gnuplot	4.0	patchlevel	0
+																//	For	now	assume	it	will	stay	like	this
+																ret	=	sscanf(buf,	"%*s	%lf",	&version);
+																if	(	ret	==	1	)	{
+																								pclose(pipe);
+																								return(version);
+																}	else	{
+																								cerr	<<	"ERROR:	getGnuplotVersion()	:	Died	while	"
+																													<<	"\"	scanning	gnuplot	--version\".		Aborting."
+																													<<	endl	;
+																								exit(-1);
+																}
+								}	else	{
+																cerr	<<	"ERROR:	getGnuplotVersion()	:	Died	while	running	"
+																					<<	"\"gnuplot	--version\".		Aborting."
+																					<<	endl	;
+																pclose(pipe);
+																exit(-1);
+								}
+								//	This	just	makes	the	compiler	happy,
+								//	it	will	not	be	executed
+								return(	version	)	;
 }
 
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view.cpp
index bf0469a1b..f0e74ec1a 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view.cpp
@@ -1,264 +1,264 @@
 
-#include <stdio.h>    // for snprintf
-#include <stdlib.h>   // for atoi
-#include <stdarg.h>   // for varargs stuff
-#include <strings.h>
-
-#include "gp_view.hh"
-#include "parse_format.h"
-
-// CONSTRUCTOR
-gnuplot_view::gnuplot_view(Widget TopLevel) {
-
-    toplevel = TopLevel;
-    display  = XtDisplay(toplevel);
-    screen   = XtScreen(toplevel);
-    colormap = DefaultColormapOfScreen(screen);
-    xpos   = 200;
-    ypos   = 50;
-    width  = 500;
-    height = 500;
+#include	<stdio.h>				//	for	snprintf
+#include	<stdlib.h>			//	for	atoi
+#include	<stdarg.h>			//	for	varargs	stuff
+#include	<strings.h>
+
+#include	"gp_view.hh"
+#include	"parse_format.h"
+
+//	CONSTRUCTOR
+gnuplot_view::gnuplot_view(Widget	TopLevel)	{
+
+				toplevel	=	TopLevel;
+				display		=	XtDisplay(toplevel);
+				screen			=	XtScreen(toplevel);
+				colormap	=	DefaultColormapOfScreen(screen);
+				xpos			=	200;
+				ypos			=	50;
+				width		=	500;
+				height	=	500;
 
 }
 
-// DESTRUCTOR
-gnuplot_view::~gnuplot_view() {
+//	DESTRUCTOR
+gnuplot_view::~gnuplot_view()	{
 
-    GPViewProductNode *pvnode;
-    int n_pvnode, i;
+				GPViewProductNode	*pvnode;
+				int	n_pvnode,	i;
 
-    n_pvnode = (int)product_node_list.size();
-    for (i=0 ; i<n_pvnode ; i++ ) {
-        pvnode = product_node_list[i];
-        if (pvnode) { delete pvnode; }
-    }
+				n_pvnode	=	(int)product_node_list.size();
+				for	(i=0	;	i<n_pvnode	;	i++	)	{
+								pvnode	=	product_node_list[i];
+								if	(pvnode)	{	delete	pvnode;	}
+				}
 }
 
-// MEMBER FUNCTION
-DPV_pointer gnuplot_view::render_product( DPC_product* product) {
+//	MEMBER	FUNCTION
+DPV_pointer	gnuplot_view::render_product(	DPC_product*	product)	{
 
 
-    GPViewProductNode *product_view_node = new GPViewProductNode(toplevel, product);
+				GPViewProductNode	*product_view_node	=	new	GPViewProductNode(toplevel,	product);
 
-    product_node_list.push_back( product_view_node);
+				product_node_list.push_back(	product_view_node);
 
-    return ( (DPV_pointer)product_view_node);
+				return	(	(DPV_pointer)product_view_node);
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer gnuplot_view::render_page( DPV_pointer parent_data,
-                                       DPC_page* page) {
-    GPViewPageNode *page_view_node;
-    //int             page_number;
+//	MEMBER	FUNCTION
+DPV_pointer	gnuplot_view::render_page(	DPV_pointer	parent_data,
+																																							DPC_page*	page)	{
+				GPViewPageNode	*page_view_node;
+				//int													page_number;
 
-    GPViewProductNode *product_view_node = (GPViewProductNode *)parent_data;
+				GPViewProductNode	*product_view_node	=	(GPViewProductNode	*)parent_data;
 
 
-    if ((xpos + width) >= WidthOfScreen( XtScreen(toplevel))) {
-      xpos = 100;
-    }
-    if ((ypos + height) >= HeightOfScreen( XtScreen(toplevel))) {
-      ypos = 100;
-    }
+				if	((xpos	+	width)	>=	WidthOfScreen(	XtScreen(toplevel)))	{
+						xpos	=	100;
+				}
+				if	((ypos	+	height)	>=	HeightOfScreen(	XtScreen(toplevel)))	{
+						ypos	=	100;
+				}
 
-    page_view_node = new GPViewPageNode(toplevel, page, xpos, ypos, width, height);
+				page_view_node	=	new	GPViewPageNode(toplevel,	page,	xpos,	ypos,	width,	height);
 
-    xpos += 20;
-    ypos += 20;
+				xpos	+=	20;
+				ypos	+=	20;
 
-    product_view_node->page_node_list.push_back( page_view_node );
+				product_view_node->page_node_list.push_back(	page_view_node	);
 
-    return( (DPV_pointer)page_view_node );
+				return(	(DPV_pointer)page_view_node	);
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer gnuplot_view::render_table( DPV_pointer parent_data,
-                                        DPC_table* table) {
-    return NULL;
+//	MEMBER	FUNCTION
+DPV_pointer	gnuplot_view::render_table(	DPV_pointer	parent_data,
+																																								DPC_table*	table)	{
+				return	NULL;
 }
 
-// MEMBER FUNCTION
-DPV_pointer gnuplot_view::render_plot( DPV_pointer parent_data,
-                                       DPC_plot* plot) {
-    GPViewPlotNode *plot_view_node;
-    int             plot_number;
+//	MEMBER	FUNCTION
+DPV_pointer	gnuplot_view::render_plot(	DPV_pointer	parent_data,
+																																							DPC_plot*	plot)	{
+				GPViewPlotNode	*plot_view_node;
+				int													plot_number;
 
-    GPViewPageNode *page_view_node = (GPViewPageNode*)parent_data;
+				GPViewPageNode	*page_view_node	=	(GPViewPageNode*)parent_data;
 
-    plot_number = (int)page_view_node->plot_node_list.size();
+				plot_number	=	(int)page_view_node->plot_node_list.size();
 
-    plot_view_node = new GPViewPlotNode( toplevel,
-                                        &page_view_node->textbuf,
-                                         plot,
-                                         plot_number);
+				plot_view_node	=	new	GPViewPlotNode(	toplevel,
+																																								&page_view_node->textbuf,
+																																									plot,
+																																									plot_number);
 
-    page_view_node->plot_node_list.push_back( plot_view_node );
+				page_view_node->plot_node_list.push_back(	plot_view_node	);
 
-    return( (DPV_pointer)plot_view_node);
+				return(	(DPV_pointer)plot_view_node);
 }
 
-DPV_pointer gnuplot_view::update_plot( DPV_pointer view_data,
-                                       DPC_plot* plot ) {
+DPV_pointer	gnuplot_view::update_plot(	DPV_pointer	view_data,
+																																							DPC_plot*	plot	)	{
 
-    GPViewPlotNode *plot_view_node = (GPViewPlotNode*) view_data;
+				GPViewPlotNode	*plot_view_node	=	(GPViewPlotNode*)	view_data;
 
-    // reset the curve counter to 0, so we can step through the curves again
-    plot_view_node->current = 0;
+				//	reset	the	curve	counter	to	0,	so	we	can	step	through	the	curves	again
+				plot_view_node->current	=	0;
 
-    return ((DPV_pointer)NULL) ;
+				return	((DPV_pointer)NULL)	;
 }
 
 
-// MEMBER FUNCTION
-DPV_pointer gnuplot_view::render_curve( DPV_pointer parent_data,
-                                        DPC_curve* abstract_curve) {
+//	MEMBER	FUNCTION
+DPV_pointer	gnuplot_view::render_curve(	DPV_pointer	parent_data,
+																																								DPC_curve*	abstract_curve)	{
 
-    GPViewCurveNode *curve_view_node;
-    int              curve_number;
+				GPViewCurveNode	*curve_view_node;
+				int														curve_number;
 
-    // --------------------------------------------------------------------
-    // Cast our parent data pointer to what it really is: a GPPlotViewNode.
-    // --------------------------------------------------------------------
-    GPViewPlotNode  *plot_view_node = (GPViewPlotNode*) parent_data;
+				//	--------------------------------------------------------------------
+				//	Cast	our	parent	data	pointer	to	what	it	really	is:	a	GPPlotViewNode.
+				//	--------------------------------------------------------------------
+				GPViewPlotNode		*plot_view_node	=	(GPViewPlotNode*)	parent_data;
 
-    // --------------------------------------------------------------------
-    // Save our reference to the DPC_curve object, so we can handle
-    // DATA_UPDATE notifications.
-    // --------------------------------------------------------------------
-    curve_number = (int)plot_view_node->curve_node_list.size();
-    curve_view_node = new GPViewCurveNode( toplevel,
-                                           plot_view_node->textbuf,
-                                           abstract_curve,
-                                           curve_number);
-    plot_view_node->curve_node_list.push_back( curve_view_node);
+				//	--------------------------------------------------------------------
+				//	Save	our	reference	to	the	DPC_curve	object,	so	we	can	handle
+				//	DATA_UPDATE	notifications.
+				//	--------------------------------------------------------------------
+				curve_number	=	(int)plot_view_node->curve_node_list.size();
+				curve_view_node	=	new	GPViewCurveNode(	toplevel,
+																																											plot_view_node->textbuf,
+																																											abstract_curve,
+																																											curve_number);
+				plot_view_node->curve_node_list.push_back(	curve_view_node);
 
-    //------------------------------------------------------------------
-    // Update the CurrentCurve counter for the next one.
-    //------------------------------------------------------------------
-    plot_view_node->current ++;
+				//------------------------------------------------------------------
+				//	Update	the	CurrentCurve	counter	for	the	next	one.
+				//------------------------------------------------------------------
+				plot_view_node->current	++;
 
-    return ((DPV_pointer) NULL);
+				return	((DPV_pointer)	NULL);
 }
 
-// MEMBER FUNCTION
-// FIXME: (Alex) What does this function do?  It doesn't do anything right now. (5/4/11)
-int gnuplot_view::update_curve( DPV_pointer parent_data,
-                                DPC_curve* curve) {
+//	MEMBER	FUNCTION
+//	FIXME:	(Alex)	What	does	this	function	do?		It	doesn't	do	anything	right	now.	(5/4/11)
+int	gnuplot_view::update_curve(	DPV_pointer	parent_data,
+																																DPC_curve*	curve)	{
 
-// (Alex, 9/24/13) commented out everything to suppress warnings about unused variables.
-#if 0
-    int    curve_number;
+//	(Alex,	9/24/13)	commented	out	everything	to	suppress	warnings	about	unused	variables.
+#if	0
+				int				curve_number;
 
-    // --------------------------------------------------------------------
-    // Cast our parent data pointer to what it really is: a GPViewPlotNode.
-    // --------------------------------------------------------------------
-    GPViewPlotNode *plot_view_node = (GPViewPlotNode*) parent_data;
+				//	--------------------------------------------------------------------
+				//	Cast	our	parent	data	pointer	to	what	it	really	is:	a	GPViewPlotNode.
+				//	--------------------------------------------------------------------
+				GPViewPlotNode	*plot_view_node	=	(GPViewPlotNode*)	parent_data;
 
-    curve_number = (int)plot_view_node->curve_node_list.size();
+				curve_number	=	(int)plot_view_node->curve_node_list.size();
 #endif
 
-    return (0);
+				return	(0);
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::finalize_page_view( DPV_pointer page_view ) {
+//	MEMBER	FUNCTION
+void	gnuplot_view::finalize_page_view(	DPV_pointer	page_view	)	{
 
-    GPViewPageNode* page_view_node = (GPViewPageNode *)page_view;
+				GPViewPageNode*	page_view_node	=	(GPViewPageNode	*)page_view;
 
-    page_view_node->finalize();
+				page_view_node->finalize();
 
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::finalize_table_view( DPV_pointer table_view ) { }
+//	MEMBER	FUNCTION
+void	gnuplot_view::finalize_table_view(	DPV_pointer	table_view	)	{	}
 
-// MEMBER FUNCTION
-void gnuplot_view::finalize_plot_view( DPV_pointer plot_view ) {
+//	MEMBER	FUNCTION
+void	gnuplot_view::finalize_plot_view(	DPV_pointer	plot_view	)	{
 
-    GPViewPlotNode *plot_view_node = (GPViewPlotNode *)plot_view;
+				GPViewPlotNode	*plot_view_node	=	(GPViewPlotNode	*)plot_view;
 
-    plot_view_node->finalize();
+				plot_view_node->finalize();
 
 }
-// MEMBER FUNCTION
-// FIXME: (Alex) What does this function do?  It doesn't do anything right now. (5/4/11)
-void gnuplot_view::update_finalize_plot_view( DPV_pointer plot_view ) {
+//	MEMBER	FUNCTION
+//	FIXME:	(Alex)	What	does	this	function	do?		It	doesn't	do	anything	right	now.	(5/4/11)
+void	gnuplot_view::update_finalize_plot_view(	DPV_pointer	plot_view	)	{
 
-// (Alex, 9/24/13) commented out everything to suppress warnings about unused variables.
-#if 0
-    GPViewPlotNode *plot_view_node;
+//	(Alex,	9/24/13)	commented	out	everything	to	suppress	warnings	about	unused	variables.
+#if	0
+				GPViewPlotNode	*plot_view_node;
 
-    plot_view_node = (GPViewPlotNode *)plot_view;
+				plot_view_node	=	(GPViewPlotNode	*)plot_view;
 #endif
 
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::notify_product( DPV_pointer product_view, DPV_message msg ) {
+//	MEMBER	FUNCTION
+void	gnuplot_view::notify_product(	DPV_pointer	product_view,	DPV_message	msg	)	{
 
-    GPViewPageNode *page_view_node;
-    int i, n_pages;
+				GPViewPageNode	*page_view_node;
+				int	i,	n_pages;
 
-    GPViewProductNode *product_view_node = (GPViewProductNode *)product_view;
+				GPViewProductNode	*product_view_node	=	(GPViewProductNode	*)product_view;
 
-    n_pages = (int)product_view_node->page_node_list.size();
-    for (i=0 ; i<n_pages ; i++ ) {
-        page_view_node = product_view_node->page_node_list[i];
-        notify_page( (DPV_pointer)page_view_node, msg );
-    }
+				n_pages	=	(int)product_view_node->page_node_list.size();
+				for	(i=0	;	i<n_pages	;	i++	)	{
+								page_view_node	=	product_view_node->page_node_list[i];
+								notify_page(	(DPV_pointer)page_view_node,	msg	);
+				}
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::notify_page( DPV_pointer page_view, DPV_message msg ) {
-
-    Widget page_widget;
-    GPViewPageNode *page_view_node = (GPViewPageNode *)page_view;
-
-    if (msg == RAISE_WINDOW) {
-        page_widget = page_view_node->dialog_shell_widget;
-        if (page_widget != NULL ) {
-            XRaiseWindow( XtDisplay(page_widget), XtWindow(page_widget));
-        }
-    } else {
-        int i, n_plots;
-        // Propagate the notification to subordinate plots.
-        n_plots = (int)page_view_node->plot_node_list.size();
-        for (i=0 ; i<n_plots ; i++ ) {
-            GPViewPlotNode *plot_view_node;
-            plot_view_node = page_view_node->plot_node_list[i];
-            notify_plot( (DPV_pointer)plot_view_node, msg );
-        }
-    }
+//	MEMBER	FUNCTION
+void	gnuplot_view::notify_page(	DPV_pointer	page_view,	DPV_message	msg	)	{
+
+				Widget	page_widget;
+				GPViewPageNode	*page_view_node	=	(GPViewPageNode	*)page_view;
+
+				if	(msg	==	RAISE_WINDOW)	{
+								page_widget	=	page_view_node->dialog_shell_widget;
+								if	(page_widget	!=	NULL	)	{
+												XRaiseWindow(	XtDisplay(page_widget),	XtWindow(page_widget));
+								}
+				}	else	{
+								int	i,	n_plots;
+								//	Propagate	the	notification	to	subordinate	plots.
+								n_plots	=	(int)page_view_node->plot_node_list.size();
+								for	(i=0	;	i<n_plots	;	i++	)	{
+												GPViewPlotNode	*plot_view_node;
+												plot_view_node	=	page_view_node->plot_node_list[i];
+												notify_plot(	(DPV_pointer)plot_view_node,	msg	);
+								}
+				}
 
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::notify_table( DPV_pointer table_view, DPV_message msg ) { }
+//	MEMBER	FUNCTION
+void	gnuplot_view::notify_table(	DPV_pointer	table_view,	DPV_message	msg	)	{	}
 
-// MEMBER FUNCTION
-void gnuplot_view::notify_plot( DPV_pointer plot_view, DPV_message msg ) {
+//	MEMBER	FUNCTION
+void	gnuplot_view::notify_plot(	DPV_pointer	plot_view,	DPV_message	msg	)	{
 
-    GPViewPlotNode *plot_view_node = (GPViewPlotNode*) plot_view;
+				GPViewPlotNode	*plot_view_node	=	(GPViewPlotNode*)	plot_view;
 
-    if (msg == DATA_UPDATE ) {
-        int i, n_curves;
-        // reset the curve counter to 0, so we can step through the curves again
-        plot_view_node->current = 0;
-        n_curves = (int)plot_view_node->curve_node_list.size();
-        for (i=0; i<n_curves; i++) {
-            GPViewCurveNode *curve_view_node;
-            curve_view_node = plot_view_node->curve_node_list[i];
-            update_curve( plot_view, curve_view_node->dpc_curve);
-        }
-        update_finalize_plot_view( plot_view );
-    }
+				if	(msg	==	DATA_UPDATE	)	{
+								int	i,	n_curves;
+								//	reset	the	curve	counter	to	0,	so	we	can	step	through	the	curves	again
+								plot_view_node->current	=	0;
+								n_curves	=	(int)plot_view_node->curve_node_list.size();
+								for	(i=0;	i<n_curves;	i++)	{
+												GPViewCurveNode	*curve_view_node;
+												curve_view_node	=	plot_view_node->curve_node_list[i];
+												update_curve(	plot_view,	curve_view_node->dpc_curve);
+								}
+								update_finalize_plot_view(	plot_view	);
+				}
 
 }
 
-// MEMBER FUNCTION
-void gnuplot_view::notify_curve( DPV_pointer curve_view, DPV_message msg ) {
-    // Nothing to do.
+//	MEMBER	FUNCTION
+void	gnuplot_view::notify_curve(	DPV_pointer	curve_view,	DPV_message	msg	)	{
+				//	Nothing	to	do.
 }
 
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
index f15cc6d21..162d39b20 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_curve_node.cpp
@@ -1,259 +1,259 @@
 
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <unistd.h>
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<fstream>
+#include	<unistd.h>
 
-#include "gp_view_curve_node.hh"
-#include "gp_version.hh"
-#include "gp_colors.hh"
+#include	"gp_view_curve_node.hh"
+#include	"gp_version.hh"
+#include	"gp_colors.hh"
 
-// CLASS VARIABLE INITIALIZATION
-int GPViewCurveNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	GPViewCurveNode::instance_count	=	0;
 
-// DESTRUCTOR
-GPViewCurveNode::~GPViewCurveNode() {
+//	DESTRUCTOR
+GPViewCurveNode::~GPViewCurveNode()	{
 
 }
 
-// CONSTRUCTOR
-GPViewCurveNode::GPViewCurveNode( Widget          Toplevel,
-                                  DPV_TextBuffer *Textbuf,
-                                  DPC_curve      *Curve,
-                                  int             Curve_number
-                                ) {
-
-    const char * presentation;
-    double    x, y;
-    std::string       curve_x_label;
-    std::string       curve_x_min_rng;
-    std::string       curve_x_max_rng;
-    std::string       curve_x_scale_factor;
-    std::string       curve_x_bias;
-    std::string       curve_y_label;
-    std::string       curve_y_min_rng;
-    std::string       curve_y_max_rng;
-    std::string       curve_y_scale_factor;
-    std::string       curve_y_bias;
-    std::string       curve_line_color;
-    std::string       curve_line_style;
-    std::string       curve_gp_line_style;
-    std::string       curve_symbol_style;
-    std::string       curve_symbol_size;
-    std::string       tmp_string;
-
-    toplevel = Toplevel;
-    dpc_curve = Curve;
-
-    data_src_label = (Curve->getDataSrcLbl()) ? Curve->getDataSrcLbl() : "" ;
-
-    /*
-     If present, the curves label is THE label of the curve. It represents what the
-     user wants to see and should not be altered. If it is not present, then a label
-     is generated from the variable name and the units.
-     */
-    if (Curve->getXAttribute("label")) {
-        curve_x_label = Curve->getXAttribute("label");
-    } else {
-        std::string curve_x_var_name = (dpc_curve->getXVarName()) ? dpc_curve->getXVarName() : "" ;
-        std::string curve_x_units    = (dpc_curve->getXAttribute("units")) ?  dpc_curve->getXAttribute("units") : "1";
-        curve_x_label    = curve_x_var_name + "(" + curve_x_units + ")";
-    }
-
-    std::string curve_y_var_name = (dpc_curve->getYVarName()) ? dpc_curve->getYVarName() : "" ;
-    if (Curve->getYAttribute("label")) {
-        curve_y_label = Curve->getYAttribute("label");
-    } else {
-        std::string curve_y_units    = (dpc_curve->getYAttribute("units")) ?  dpc_curve->getYAttribute("units") : "1";
-        curve_y_label    = curve_y_var_name + "(" + curve_y_units + ")";
-    }
-
-    std::string curve_title = curve_y_label + " VS. " + curve_x_label + " ["+data_src_label+"]";
-
-    /**!
-     * WARNING: getAttribute() returns a const char *, which may be null.
-     *          Assigning a null pointer to a string will crash the plot.
-     *          So, check the return value before making the assignment.
-     */
-    curve_x_min_rng      = (dpc_curve->getXAttribute("min")) ?  dpc_curve->getXAttribute("min") : "";
-    curve_x_max_rng      = (dpc_curve->getXAttribute("max")) ?  dpc_curve->getXAttribute("max") : "";
-    curve_x_scale_factor = (dpc_curve->getXAttribute("scale")) ?  dpc_curve->getXAttribute("scale") : "1.0";
-    curve_x_bias         = (dpc_curve->getXAttribute("bias")) ?  dpc_curve->getXAttribute("bias") : "0.0";
-    curve_y_min_rng      = (dpc_curve->getYAttribute("min")) ?  dpc_curve->getYAttribute("min") : "";
-    curve_y_max_rng      = (dpc_curve->getYAttribute("max")) ?  dpc_curve->getYAttribute("max") : "";
-    curve_y_scale_factor = (dpc_curve->getYAttribute("scale")) ?  dpc_curve->getYAttribute("scale") : "1.0";
-    curve_y_bias         = (dpc_curve->getYAttribute("bias")) ?  dpc_curve->getYAttribute("bias") : "0.0";
-    curve_line_color     = (dpc_curve->getYAttribute("line_color")) ?  dpc_curve->getYAttribute("line_color") : "";
-    curve_line_style     = (dpc_curve->getYAttribute("line_style")) ?  dpc_curve->getYAttribute("line_style") : "";
-    curve_gp_line_style  = (dpc_curve->getYAttribute("gnuplot_line_style")) ?  dpc_curve->getYAttribute("gnuplot_line_style") : "lines";
-    curve_symbol_style   = (dpc_curve->getYAttribute("symbol_style")) ?  dpc_curve->getYAttribute("symbol_style") : "";
-    curve_symbol_size    = (dpc_curve->getYAttribute("symbol_size")) ?  dpc_curve->getYAttribute("symbol_size") : "Small";
-
-    std::string save_template = "<SAVE_TMP_FILE_SPEC>";
-    std::string prev_TmpFileSpec = "";
-
-    //------------------------------------------------------------------
-    // Set the XYCurve's data points (points) and number of points (nPoints)
-    //------------------------------------------------------------------
-
-    presentation = Curve->getYAttribute("presentation") ;
-
-    if ( (presentation != NULL)  &&  strcasecmp(presentation, "stream") != 0 ) {
-
-        char curve_data_file_name[512];
-        FILE *curve_data_fp;
-
-        //! Figure out where we can create a temporary file.
-        if (!access("/tmp", W_OK)) {
-
-            strncpy(curve_data_file_name,
-                    "/tmp/dpx_gp_curve_XXXXXX", sizeof(curve_data_file_name));
-
-        } else if (!access("/var/tmp", W_OK)) {
-            strncpy(curve_data_file_name,
-                    "/var/tmp/dpx_gp_curve_XXXXXX", sizeof(curve_data_file_name));
-
-        } else {
-            std::cerr << "Unable to access /tmp or /var/tmp, where a temporary\n"
-                << "file (that represents gnuplot curve data) needs\n"
-                << "to be created. Please check your permissions." << std::endl ;
-            return;
-        }
-
-        //! Create a name for our temporary data file.
-        if (mkstemp( curve_data_file_name) < 0) {
-            std::cerr << "Unable to generate a temporary file"
-                << "name for some mind boggling reason." << std::endl ;
-            return;
-        }
-
-        //! Open the temporary data file.
-        if ((curve_data_fp = fopen( curve_data_file_name, "w")) == NULL) {
-            std::cerr << "Unable to open a temporary file." << std::endl ;
-            return;
-        }
-
-        //! Get the data for the curve.
-        while ( Curve->getXY(&x, &y)) {
-            fprintf( curve_data_fp,"%e\t%e\n",
-              ( x*atof(curve_x_scale_factor.c_str()) + atof(curve_x_bias.c_str()) ),
-              ( y*atof(curve_y_scale_factor.c_str()) + atof(curve_y_bias.c_str()) ) );
-        }
-        // Print the final point from getXY
-        fprintf( curve_data_fp,"%e\t%e\n",
-           ( x*atof(curve_x_scale_factor.c_str()) + atof(curve_x_bias.c_str()) ),
-           ( y*atof(curve_y_scale_factor.c_str()) + atof(curve_y_bias.c_str()) ) );
-        fclose(curve_data_fp);
-
-        if ( Curve_number == 0 ) {
-            /*!
-             * Set ranges as part of the plot command. A range given on the plot
-             * command will be used for all curves on that single graph only, &
-             * not for all subsequent graphs(e.g. plot [xmin:xmax] [ymin:ymax] )
-             */
-            //! Set each curve's X Var MIN RANGE.
-            if ( ! curve_x_min_rng.empty() ) {
-                Textbuf->print("[%d:", curve_x_min_rng.c_str());
-            } else {
-                Textbuf->print("[<PLOT_X_MIN_RNG>:");
-            }
-            //! Set each curve's X Var MAX RANGE.
-            if ( ! curve_x_max_rng.empty() ) {
-                Textbuf->print("%d]", curve_x_max_rng.c_str());
-            } else {
-                Textbuf->print("<PLOT_X_MAX_RNG>]");
-            }
-            //! Set each curve's Y Var MIN RANGE.
-            if ( ! curve_y_min_rng.empty() ) {
-                Textbuf->print("[%d:", curve_y_min_rng.c_str());
-            } else {
-                Textbuf->print("[<PLOT_Y_MIN_RNG>:");
-            }
-            //! Set each curve's Y Var MAX RANGE.
-            if ( ! curve_y_max_rng.empty() ) {
-                Textbuf->print("%d]", curve_y_max_rng.c_str());
-            } else {
-                Textbuf->print("<PLOT_Y_MAX_RNG>]");
-            }
-
-            Textbuf->print(" \\\n");
-
-        } else if ( Curve_number > 0 ) {
-            /* At this point, the `plot` command is drawing multiple
-             * lines (curves) onto the same graph.
-             * The `plot` command will not work if other non-plot text
-             * (i.e. system commands) exist within the curve info list.
-             * We need to save off all system commands from the buffer
-             * that delete the previous curves' temporary datafile(s).
-             * We will re-insert later once this curve's info is written.
-             */
-            tmp_string = Textbuf->getText();
-            int save_startPos = (int)tmp_string.find("\n"+save_template, 0);
-
-            prev_TmpFileSpec = tmp_string.substr( save_startPos, tmp_string.size() );
-
-            /* Remove previous system commands */
-            Textbuf->subst_g(prev_TmpFileSpec.c_str(), "");
-
-            //! insert a comma, space, backslash(\) & newline prior to next curve info
-            Textbuf->print(", \\\n", " ");
-        }
-
-        //! Indent 4 spaces then Populate the datafile name.
-        Textbuf->print("%4s\"%s\" using 1:2",  " ", curve_data_file_name);
-
-        //! Set each curve's TITLE.
-        Textbuf->print("  t \"%s\"", curve_title.c_str());
-
-        //! Set each curve's GP LINE STYLE.
-        Textbuf->print(" w %s", curve_gp_line_style.c_str());
-
-        if ( GnuplotVersion() >= 4.2 ) {
-            //! Default line definitions.
-            Textbuf->print(" lt line_type_%i", (Curve_number+1));
-            Textbuf->print(" lw 1.0");
-
-            //! Set each curve's LINE COLOR.
-            if ( ! curve_line_color.empty() ) {
-                if ( color_is_valid(&curve_line_color) ) {
-                    Textbuf->print(" lc rgb \"%s\"", curve_line_color.c_str());
-                }
-            }
-
-            //! POINT settings are applicable to points & linepoints only.
-            if ( curve_gp_line_style.find("point") != std::string::npos ) {
-                //! Set each curve's POINT TYPE.
-                if ( ! curve_symbol_style.empty() ) {
-                    Textbuf->print(" pt %s", curve_symbol_style.c_str());
-                } else {
-                    Textbuf->print(" pt point_shape_%i", (Curve_number+1));
-                }
-                //! Set each curve's POINT SIZE.
-                Textbuf->print(" ps %s", curve_symbol_size.c_str());
-            }
-        } else {
-            /*!
-             * Setting line color in gnuplot version 4.0 or older cannot be done
-             * on the fly. It must be set using a limited number of line styles
-             * or at startup (e.g. -xrm 'gnuplot*line1Color:black'...).
-             */
-            Textbuf->print(" linestyle %i", (Curve_number+1) );
-            if (!curve_line_color.empty()) {
-                std::cout << "note: Ignoring line color; " ;
-                std::cout << "feature only available in Gnuplot version 4.2 (or later)." << std::endl;
-            }
-        }
-
-        /* Re-insert previous system commands */
-        Textbuf->print("%s\n", prev_TmpFileSpec.c_str());
-        /*!
-         * After the command to plot the curve is processed, add
-         * a system command to delete the associated data file.
-         * Run the delete command in the background.
-         */
-        Textbuf->print("%ssystem \"rm -f %s &\"", save_template.c_str(), curve_data_file_name);
-    }
-
-    instance_count ++;
+//	CONSTRUCTOR
+GPViewCurveNode::GPViewCurveNode(	Widget										Toplevel,
+																																		DPV_TextBuffer	*Textbuf,
+																																		DPC_curve						*Curve,
+																																		int													Curve_number
+																																)	{
+
+				const	char	*	presentation;
+				double				x,	y;
+				std::string							curve_x_label;
+				std::string							curve_x_min_rng;
+				std::string							curve_x_max_rng;
+				std::string							curve_x_scale_factor;
+				std::string							curve_x_bias;
+				std::string							curve_y_label;
+				std::string							curve_y_min_rng;
+				std::string							curve_y_max_rng;
+				std::string							curve_y_scale_factor;
+				std::string							curve_y_bias;
+				std::string							curve_line_color;
+				std::string							curve_line_style;
+				std::string							curve_gp_line_style;
+				std::string							curve_symbol_style;
+				std::string							curve_symbol_size;
+				std::string							tmp_string;
+
+				toplevel	=	Toplevel;
+				dpc_curve	=	Curve;
+
+				data_src_label	=	(Curve->getDataSrcLbl())	?	Curve->getDataSrcLbl()	:	""	;
+
+				/*
+					If	present,	the	curves	label	is	THE	label	of	the	curve.	It	represents	what	the
+					user	wants	to	see	and	should	not	be	altered.	If	it	is	not	present,	then	a	label
+					is	generated	from	the	variable	name	and	the	units.
+					*/
+				if	(Curve->getXAttribute("label"))	{
+								curve_x_label	=	Curve->getXAttribute("label");
+				}	else	{
+								std::string	curve_x_var_name	=	(dpc_curve->getXVarName())	?	dpc_curve->getXVarName()	:	""	;
+								std::string	curve_x_units				=	(dpc_curve->getXAttribute("units"))	?		dpc_curve->getXAttribute("units")	:	"1";
+								curve_x_label				=	curve_x_var_name	+	"("	+	curve_x_units	+	")";
+				}
+
+				std::string	curve_y_var_name	=	(dpc_curve->getYVarName())	?	dpc_curve->getYVarName()	:	""	;
+				if	(Curve->getYAttribute("label"))	{
+								curve_y_label	=	Curve->getYAttribute("label");
+				}	else	{
+								std::string	curve_y_units				=	(dpc_curve->getYAttribute("units"))	?		dpc_curve->getYAttribute("units")	:	"1";
+								curve_y_label				=	curve_y_var_name	+	"("	+	curve_y_units	+	")";
+				}
+
+				std::string	curve_title	=	curve_y_label	+	"	VS.	"	+	curve_x_label	+	"	["+data_src_label+"]";
+
+				/**!
+					*	WARNING:	getAttribute()	returns	a	const	char	*,	which	may	be	null.
+					*										Assigning	a	null	pointer	to	a	string	will	crash	the	plot.
+					*										So,	check	the	return	value	before	making	the	assignment.
+					*/
+				curve_x_min_rng						=	(dpc_curve->getXAttribute("min"))	?		dpc_curve->getXAttribute("min")	:	"";
+				curve_x_max_rng						=	(dpc_curve->getXAttribute("max"))	?		dpc_curve->getXAttribute("max")	:	"";
+				curve_x_scale_factor	=	(dpc_curve->getXAttribute("scale"))	?		dpc_curve->getXAttribute("scale")	:	"1.0";
+				curve_x_bias									=	(dpc_curve->getXAttribute("bias"))	?		dpc_curve->getXAttribute("bias")	:	"0.0";
+				curve_y_min_rng						=	(dpc_curve->getYAttribute("min"))	?		dpc_curve->getYAttribute("min")	:	"";
+				curve_y_max_rng						=	(dpc_curve->getYAttribute("max"))	?		dpc_curve->getYAttribute("max")	:	"";
+				curve_y_scale_factor	=	(dpc_curve->getYAttribute("scale"))	?		dpc_curve->getYAttribute("scale")	:	"1.0";
+				curve_y_bias									=	(dpc_curve->getYAttribute("bias"))	?		dpc_curve->getYAttribute("bias")	:	"0.0";
+				curve_line_color					=	(dpc_curve->getYAttribute("line_color"))	?		dpc_curve->getYAttribute("line_color")	:	"";
+				curve_line_style					=	(dpc_curve->getYAttribute("line_style"))	?		dpc_curve->getYAttribute("line_style")	:	"";
+				curve_gp_line_style		=	(dpc_curve->getYAttribute("gnuplot_line_style"))	?		dpc_curve->getYAttribute("gnuplot_line_style")	:	"lines";
+				curve_symbol_style			=	(dpc_curve->getYAttribute("symbol_style"))	?		dpc_curve->getYAttribute("symbol_style")	:	"";
+				curve_symbol_size				=	(dpc_curve->getYAttribute("symbol_size"))	?		dpc_curve->getYAttribute("symbol_size")	:	"Small";
+
+				std::string	save_template	=	"<SAVE_TMP_FILE_SPEC>";
+				std::string	prev_TmpFileSpec	=	"";
+
+				//------------------------------------------------------------------
+				//	Set	the	XYCurve's	data	points	(points)	and	number	of	points	(nPoints)
+				//------------------------------------------------------------------
+
+				presentation	=	Curve->getYAttribute("presentation")	;
+
+				if	(	(presentation	!=	NULL)		&&		strcasecmp(presentation,	"stream")	!=	0	)	{
+
+								char	curve_data_file_name[512];
+								FILE	*curve_data_fp;
+
+								//!	Figure	out	where	we	can	create	a	temporary	file.
+								if	(!access("/tmp",	W_OK))	{
+
+												strncpy(curve_data_file_name,
+																				"/tmp/dpx_gp_curve_XXXXXX",	sizeof(curve_data_file_name));
+
+								}	else	if	(!access("/var/tmp",	W_OK))	{
+												strncpy(curve_data_file_name,
+																				"/var/tmp/dpx_gp_curve_XXXXXX",	sizeof(curve_data_file_name));
+
+								}	else	{
+												std::cerr	<<	"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+																<<	"file	(that	represents	gnuplot	curve	data)	needs\n"
+																<<	"to	be	created.	Please	check	your	permissions."	<<	std::endl	;
+												return;
+								}
+
+								//!	Create	a	name	for	our	temporary	data	file.
+								if	(mkstemp(	curve_data_file_name)	<	0)	{
+												std::cerr	<<	"Unable	to	generate	a	temporary	file"
+																<<	"name	for	some	mind	boggling	reason."	<<	std::endl	;
+												return;
+								}
+
+								//!	Open	the	temporary	data	file.
+								if	((curve_data_fp	=	fopen(	curve_data_file_name,	"w"))	==	NULL)	{
+												std::cerr	<<	"Unable	to	open	a	temporary	file."	<<	std::endl	;
+												return;
+								}
+
+								//!	Get	the	data	for	the	curve.
+								while	(	Curve->getXY(&x,	&y))	{
+												fprintf(	curve_data_fp,"%e\t%e\n",
+														(	x*atof(curve_x_scale_factor.c_str())	+	atof(curve_x_bias.c_str())	),
+														(	y*atof(curve_y_scale_factor.c_str())	+	atof(curve_y_bias.c_str())	)	);
+								}
+								//	Print	the	final	point	from	getXY
+								fprintf(	curve_data_fp,"%e\t%e\n",
+											(	x*atof(curve_x_scale_factor.c_str())	+	atof(curve_x_bias.c_str())	),
+											(	y*atof(curve_y_scale_factor.c_str())	+	atof(curve_y_bias.c_str())	)	);
+								fclose(curve_data_fp);
+
+								if	(	Curve_number	==	0	)	{
+												/*!
+													*	Set	ranges	as	part	of	the	plot	command.	A	range	given	on	the	plot
+													*	command	will	be	used	for	all	curves	on	that	single	graph	only,	&
+													*	not	for	all	subsequent	graphs(e.g.	plot	[xmin:xmax]	[ymin:ymax]	)
+													*/
+												//!	Set	each	curve's	X	Var	MIN	RANGE.
+												if	(	!	curve_x_min_rng.empty()	)	{
+																Textbuf->print("[%d:",	curve_x_min_rng.c_str());
+												}	else	{
+																Textbuf->print("[<PLOT_X_MIN_RNG>:");
+												}
+												//!	Set	each	curve's	X	Var	MAX	RANGE.
+												if	(	!	curve_x_max_rng.empty()	)	{
+																Textbuf->print("%d]",	curve_x_max_rng.c_str());
+												}	else	{
+																Textbuf->print("<PLOT_X_MAX_RNG>]");
+												}
+												//!	Set	each	curve's	Y	Var	MIN	RANGE.
+												if	(	!	curve_y_min_rng.empty()	)	{
+																Textbuf->print("[%d:",	curve_y_min_rng.c_str());
+												}	else	{
+																Textbuf->print("[<PLOT_Y_MIN_RNG>:");
+												}
+												//!	Set	each	curve's	Y	Var	MAX	RANGE.
+												if	(	!	curve_y_max_rng.empty()	)	{
+																Textbuf->print("%d]",	curve_y_max_rng.c_str());
+												}	else	{
+																Textbuf->print("<PLOT_Y_MAX_RNG>]");
+												}
+
+												Textbuf->print("	\\\n");
+
+								}	else	if	(	Curve_number	>	0	)	{
+												/*	At	this	point,	the	`plot`	command	is	drawing	multiple
+													*	lines	(curves)	onto	the	same	graph.
+													*	The	`plot`	command	will	not	work	if	other	non-plot	text
+													*	(i.e.	system	commands)	exist	within	the	curve	info	list.
+													*	We	need	to	save	off	all	system	commands	from	the	buffer
+													*	that	delete	the	previous	curves'	temporary	datafile(s).
+													*	We	will	re-insert	later	once	this	curve's	info	is	written.
+													*/
+												tmp_string	=	Textbuf->getText();
+												int	save_startPos	=	(int)tmp_string.find("\n"+save_template,	0);
+
+												prev_TmpFileSpec	=	tmp_string.substr(	save_startPos,	tmp_string.size()	);
+
+												/*	Remove	previous	system	commands	*/
+												Textbuf->subst_g(prev_TmpFileSpec.c_str(),	"");
+
+												//!	insert	a	comma,	space,	backslash(\)	&	newline	prior	to	next	curve	info
+												Textbuf->print(",	\\\n",	"	");
+								}
+
+								//!	Indent	4	spaces	then	Populate	the	datafile	name.
+								Textbuf->print("%4s\"%s\"	using	1:2",		"	",	curve_data_file_name);
+
+								//!	Set	each	curve's	TITLE.
+								Textbuf->print("		t	\"%s\"",	curve_title.c_str());
+
+								//!	Set	each	curve's	GP	LINE	STYLE.
+								Textbuf->print("	w	%s",	curve_gp_line_style.c_str());
+
+								if	(	GnuplotVersion()	>=	4.2	)	{
+												//!	Default	line	definitions.
+												Textbuf->print("	lt	line_type_%i",	(Curve_number+1));
+												Textbuf->print("	lw	1.0");
+
+												//!	Set	each	curve's	LINE	COLOR.
+												if	(	!	curve_line_color.empty()	)	{
+																if	(	color_is_valid(&curve_line_color)	)	{
+																				Textbuf->print("	lc	rgb	\"%s\"",	curve_line_color.c_str());
+																}
+												}
+
+												//!	POINT	settings	are	applicable	to	points	&	linepoints	only.
+												if	(	curve_gp_line_style.find("point")	!=	std::string::npos	)	{
+																//!	Set	each	curve's	POINT	TYPE.
+																if	(	!	curve_symbol_style.empty()	)	{
+																				Textbuf->print("	pt	%s",	curve_symbol_style.c_str());
+																}	else	{
+																				Textbuf->print("	pt	point_shape_%i",	(Curve_number+1));
+																}
+																//!	Set	each	curve's	POINT	SIZE.
+																Textbuf->print("	ps	%s",	curve_symbol_size.c_str());
+												}
+								}	else	{
+												/*!
+													*	Setting	line	color	in	gnuplot	version	4.0	or	older	cannot	be	done
+													*	on	the	fly.	It	must	be	set	using	a	limited	number	of	line	styles
+													*	or	at	startup	(e.g.	-xrm	'gnuplot*line1Color:black'...).
+													*/
+												Textbuf->print("	linestyle	%i",	(Curve_number+1)	);
+												if	(!curve_line_color.empty())	{
+																std::cout	<<	"note:	Ignoring	line	color;	"	;
+																std::cout	<<	"feature	only	available	in	Gnuplot	version	4.2	(or	later)."	<<	std::endl;
+												}
+								}
+
+								/*	Re-insert	previous	system	commands	*/
+								Textbuf->print("%s\n",	prev_TmpFileSpec.c_str());
+								/*!
+									*	After	the	command	to	plot	the	curve	is	processed,	add
+									*	a	system	command	to	delete	the	associated	data	file.
+									*	Run	the	delete	command	in	the	background.
+									*/
+								Textbuf->print("%ssystem	\"rm	-f	%s	&\"",	save_template.c_str(),	curve_data_file_name);
+				}
+
+				instance_count	++;
 }
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_page_node.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_page_node.cpp
index e5a75e1ef..6273b1cd6 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_page_node.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_page_node.cpp
@@ -1,887 +1,887 @@
 
-#include <stdio.h>    // for snprintf
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
+#include	<stdio.h>				//	for	snprintf
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
 
-#include "gp_view_page_node.hh"
-#include "gp_version.hh"
-#include "gp_colors.hh"
-#include "gp_utilities.hh"
+#include	"gp_view_page_node.hh"
+#include	"gp_version.hh"
+#include	"gp_colors.hh"
+#include	"gp_utilities.hh"
 
-//#define DEBUG 1
-// CLASS VARIABLE INITIALIZATION
-int GPViewPageNode::instance_count = 0;
+//#define	DEBUG	1
+//	CLASS	VARIABLE	INITIALIZATION
+int	GPViewPageNode::instance_count	=	0;
 
 
-// DESTRUCTOR
-GPViewPageNode::~GPViewPageNode() {
+//	DESTRUCTOR
+GPViewPageNode::~GPViewPageNode()	{
 
-    GPViewPlotNode *gp_view_plot_node;
-    int n,i;
+				GPViewPlotNode	*gp_view_plot_node;
+				int	n,i;
 
-    #ifdef DEBUG
-    cout << "GPViewPageNode DESTRUCTOR." << endl;
-    #endif
+				#ifdef	DEBUG
+				cout	<<	"GPViewPageNode	DESTRUCTOR."	<<	endl;
+				#endif
 
-    n = (int)plot_node_list.size();
-    for (i=0 ; i<n; i++ ) {
-        gp_view_plot_node = plot_node_list[i];
-        if (gp_view_plot_node) { delete gp_view_plot_node; }
-    }
+				n	=	(int)plot_node_list.size();
+				for	(i=0	;	i<n;	i++	)	{
+								gp_view_plot_node	=	plot_node_list[i];
+								if	(gp_view_plot_node)	{	delete	gp_view_plot_node;	}
+				}
 
 }
 
-// CONSTRUCTOR
-GPViewPageNode::GPViewPageNode(Widget Toplevel, DPC_page* Page, int Xpos, int Ypos, int Width, int Height) {
-
-    const char *separator = "#------------------------------------------------\n";
-    const char *new_section = "\n\n";
-    const char *ncells_s;
-
-    page = Page;
-    toplevel = Toplevel;
-    device = NOT_SET;
-    #ifdef DEBUG
-    save_tmp_files = true;
-    #endif
-
-    if ((ncells_s = Page->getAttribute("hcells")) != NULL) {
-        n_hcells = atoi(ncells_s);
-        if ((n_hcells < 0)||(n_hcells > 10)) {
-            std::cerr << "Value for hcells attribute is out of range.\n"
-             << "Valid range for hcells is 1 .. 10.\n"
-             << "Ignoring hcells value." << std::endl ;
-            n_hcells = 1;
-        }
-    } else {
-        n_hcells = 1;
-    }
-
-    if ((ncells_s = Page->getAttribute("vcells")) != NULL) {
-        n_vcells = atoi(ncells_s);
-        if ((n_vcells < 0)||(n_vcells > 10)) {
-           std::cerr << "Value for vcells attribute is out of range.\n"
-            << "Valid range for vcells is 1 .. 10.\n"
-            << "Ignoring vcells value.\n" << std::endl ;
-            n_vcells = 1;
-        }
-    } else {
-        n_vcells = 1;
-    }
-
-
-    //! Build the page part of the template.
-    textbuf.print("%s", separator);
-    textbuf.print("# (generated for GNUPLOT Version <GNUPLOT_VERSION>)\n");
-    textbuf.print("# To execute, run the following command:\n");
-    textbuf.print("# %% gnuplot -persist file_name [ENTER]\n");
-    textbuf.print("#\n");
-    textbuf.print("# Template:\n");
-    textbuf.print("%s", separator);
-    textbuf.print("set title \"<PAGE_TITLE>\"\n");
-
-    //! Terminal spec line
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("#  Set the output device\n");
-    textbuf.print("%s", separator);
-    if ( GnuplotVersion() >= 4.2 ) {
-        textbuf.print("set term <TERM_TYPE> <CANVAS_SIZE> <TERM_OPTIONS>\n");
-    } else if ( GnuplotVersion() >= 4.0 ) {
-        textbuf.print("set term <TERM_TYPE> <TERM_OPTIONS>\n");
-    } else {
-        textbuf.print("set term <TERM_TYPE>\n");
-    }
-
-    //! Page size for whole page
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("#  Set \"page\" size for whole plot\n");
-    textbuf.print("%s", separator);
-    textbuf.print("set size 1.0,1.0\n");
-    textbuf.print("set origin 0.0,0.0\n");
-
-    //! Default option for all plots
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("#  Set default options for all plots\n");
-    textbuf.print("%s", separator);
-    textbuf.print("<PAGE_GRID_SPEC> <PAGE_GRID_COLOR_SPEC>\n");
-    textbuf.print("set nolabel\n");
-    if ( GnuplotVersion() >= 4.0 ) {
-        textbuf.print("set mouse\n");
-        textbuf.print("set style data <STYLE_DATA_SPEC>\n");
-        textbuf.print("set style function <STYLE_FUNC_SPEC>\n");
-    }
-
-    /*!
-     * OPTIONAL PAGE SETTINGS
-     */
-    if ( GnuplotVersion() >= 4.0 ) {
-        textbuf.print("<PAGE_X_AXIS_SCALING_SPEC>");
-        textbuf.print("<PAGE_Y_AXIS_SCALING_SPEC>");
-    }
-    textbuf.print("<PAGE_Y_AXIS_FORMAT_SPEC>");
-    textbuf.print("<PAGE_FOREGROUND_SPEC>");
-    textbuf.print("<PAGE_BACKGROUND_SPEC>");
-    textbuf.print("<PAGE_KEY_SPEC>"); // key is the legend
-
-    //! Linestyles
-    char version_line_style[32] ;
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("#  Set linestyles\n");
-    textbuf.print("#  color scheme may differ if \"-xrm\" option was used\n");
-    textbuf.print("%s", separator);
-    textbuf.print("line_type_1  = <LINE_TYPE_1>\n");
-    textbuf.print("line_type_2  = <LINE_TYPE_2>\n");
-    textbuf.print("line_type_3  = <LINE_TYPE_3>\n");
-    textbuf.print("line_type_4  = <LINE_TYPE_4>\n");
-    textbuf.print("line_type_5  = <LINE_TYPE_5>\n");
-    textbuf.print("line_type_6  = <LINE_TYPE_6>\n");
-    textbuf.print("line_type_7  = <LINE_TYPE_7>\n");
-    textbuf.print("line_type_8  = <LINE_TYPE_8>\n");
-    textbuf.print("line_type_9  = <LINE_TYPE_9>\n");
-    textbuf.print("line_type_10 = <LINE_TYPE_10>\n");
-    textbuf.print("line_type_11 = <LINE_TYPE_11>\n");
-    textbuf.print("line_type_12 = <LINE_TYPE_12>\n");
-    textbuf.print("line_type_13 = <LINE_TYPE_13>\n");
-
-    textbuf.print("\n");
-    textbuf.print("point_shape_1  = <POINT_SHAPE_1>\n");
-    textbuf.print("point_shape_2  = <POINT_SHAPE_2>\n");
-    textbuf.print("point_shape_3  = <POINT_SHAPE_3>\n");
-    textbuf.print("point_shape_4  = <POINT_SHAPE_4>\n");
-    textbuf.print("point_shape_5  = <POINT_SHAPE_5>\n");
-    textbuf.print("point_shape_6  = <POINT_SHAPE_6>\n");
-    textbuf.print("point_shape_7  = <POINT_SHAPE_7>\n");
-    textbuf.print("point_shape_8  = <POINT_SHAPE_8>\n");
-    textbuf.print("point_shape_9  = <POINT_SHAPE_9>\n");
-    textbuf.print("point_shape_10 = <POINT_SHAPE_10>\n");
-    textbuf.print("point_shape_11 = <POINT_SHAPE_11>\n");
-    textbuf.print("point_shape_12 = <POINT_SHAPE_12>\n");
-    textbuf.print("point_shape_13 = <POINT_SHAPE_13>\n");
-
-    //!Map Symbol Style pulldown menu to internal gnuplot shape indexes
-    textbuf.print("\n");
-    textbuf.print("None          = -1\n");
-    textbuf.print("Square        = 4\n");
-    textbuf.print("Circle        = 6\n");
-    textbuf.print("Star          = 3\n");
-    textbuf.print("XX            = 2\n");
-    textbuf.print("Triangle      = 8\n");
-    textbuf.print("Solid_Square  = 5\n");
-    textbuf.print("Solid_Circle  = 7\n");
-    textbuf.print("Thick_Square  = 5\n");
-
-    //! Define a numerical value for the Symbol Size pulldown menu
-    textbuf.print("\n");
-    textbuf.print("Tiny   = 0.4\n");
-    textbuf.print("Small  = 0.8\n");
-    textbuf.print("Medium = 1.4\n");
-    textbuf.print("Large  = 3.0\n");
-
-    textbuf.print("\n");
-    if ( GnuplotVersion() >= 4.0 ) {
-            strcpy(version_line_style, "style line") ;
-    } else {
-            strcpy(version_line_style, "linestyle") ;
-    }
-    textbuf.print("set %s  1  <LINE_SPEC_1>  <LINE_COLOR_1>\n", version_line_style);
-    textbuf.print("set %s  2  <LINE_SPEC_2>  <LINE_COLOR_2>\n", version_line_style);
-    textbuf.print("set %s  3  <LINE_SPEC_3>  <LINE_COLOR_3>\n", version_line_style);
-    textbuf.print("set %s  4  <LINE_SPEC_4>  <LINE_COLOR_4>\n", version_line_style);
-    textbuf.print("set %s  5  <LINE_SPEC_5>  <LINE_COLOR_5>\n", version_line_style);
-    textbuf.print("set %s  6  <LINE_SPEC_6>  <LINE_COLOR_6>\n", version_line_style);
-    textbuf.print("set %s  7  <LINE_SPEC_7>  <LINE_COLOR_7>\n", version_line_style);
-    textbuf.print("set %s  8  <LINE_SPEC_8>  <LINE_COLOR_8>\n", version_line_style);
-    textbuf.print("set %s  9  <LINE_SPEC_9>  <LINE_COLOR_9>\n", version_line_style);
-    textbuf.print("set %s 10  <LINE_SPEC_10>  <LINE_COLOR_10>\n", version_line_style);
-    textbuf.print("set %s 11  <LINE_SPEC_11>  <LINE_COLOR_11>\n", version_line_style);
-    textbuf.print("set %s 12  <LINE_SPEC_12>  <LINE_COLOR_12>\n", version_line_style);
-    textbuf.print("set %s 13  <LINE_SPEC_13>  <LINE_COLOR_13>\n", version_line_style);
-
-    //! Y Axes alignment command
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("#  Force y-axes to align\n");
-    textbuf.print("%s", separator);
-    textbuf.print("set lmargin 7\n");
-
-    //! Titles for whole page
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("# Add title(s) for the whole page\n");
-    textbuf.print("%s", separator);
-
-
-    //! Page Title
-    textbuf.print("set label <LABEL_1_TAG> \\\n");
-    textbuf.print("    \"<LABEL_1_NAME>\" \\\n");
-    textbuf.print("    at screen <LABEL_1_XPOS>,\\\n");
-    textbuf.print("       screen <LABEL_1_YPOS>,\\\n");
-    textbuf.print("       screen 0.0 <LABEL_1_JUST> \\\n");
-    textbuf.print("       <PAGE_TEXT_COLOR_SPEC> \\\n");
-    textbuf.print("       font <LABEL_1_FONT>\n\n");
-
-    textbuf.print("set label <LABEL_2_TAG> \\\n");
-    textbuf.print("    \"<LABEL_2_NAME>\" \\\n");
-    textbuf.print("    at screen <LABEL_2_XPOS>,\\\n");
-    textbuf.print("       screen <LABEL_2_YPOS>,\\\n");
-    textbuf.print("       screen 0.0 <LABEL_2_JUST> \\\n");
-    textbuf.print("       <PAGE_TEXT_COLOR_SPEC> \\\n");
-    textbuf.print("       font <LABEL_2_FONT>\n\n");
-
-    //! Another title with Simname/Runname
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("# Add label(s) for the sim and run names\n");
-    textbuf.print("%s", separator);
-
-    textbuf.print("set label <LABEL_3_TAG> \\\n");
-    textbuf.print("    \"<LABEL_3_NAME>\" \\\n");
-    textbuf.print("    at screen <LABEL_3_XPOS>, \\\n");
-    textbuf.print("       screen <LABEL_3_YPOS>, \\\n");
-    textbuf.print("       screen 0.0 <LABEL_3_JUST> \\\n");
-    textbuf.print("       <PAGE_TEXT_COLOR_SPEC> \\\n");
-    textbuf.print("       font <LABEL_3_FONT>\n\n");
-
-    //! Date (i.e., 4/2/2009)
-    textbuf.print("set label <LABEL_4_TAG> \\\n");
-    textbuf.print("    \"<LABEL_4_NAME>\" \\\n");
-    textbuf.print("    at screen <LABEL_4_XPOS>, \\\n");
-    textbuf.print("       screen <LABEL_4_YPOS>, \\\n");
-    textbuf.print("       screen 0.0 <LABEL_4_JUST> \\\n");
-    textbuf.print("       <PAGE_TEXT_COLOR_SPEC> \\\n");
-    textbuf.print("       font <LABEL_4_FONT>\n\n");
-
-    //! Multiplot command
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("# Multiplot mode\n");
-    textbuf.print("%s", separator);
-    textbuf.print("set multiplot\n");
-
-    //! Plot sections
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("# Set defs for plot sizes and locations\n");
-    textbuf.print("%s", separator);
-    textbuf.print("plot_width  = <PLOT_WIDTH>\n");
-    textbuf.print("plot_height = <PLOT_HEIGHT>\n");
-    textbuf.print("plot_title_xpos = <PLOT_TITLE_XPOS>\n");
-    textbuf.print("plot_title_ypos = <PLOT_TITLE_YPOS>\n");
-
-    textbuf.print("\n");
-    textbuf.print("x_axis_label_xpos = <X_AXIS_LABEL_XPOS_DECL>\n");
-    textbuf.print("x_axis_label_ypos = <X_AXIS_LABEL_YPOS_DECL>\n");
-    textbuf.print("y_axis_label_xpos = <Y_AXIS_LABEL_XPOS_DECL>\n");
-    textbuf.print("y_axis_label_ypos = <Y_AXIS_LABEL_YPOS_DECL>\n");
-
-    // -----------------
-    instance_count ++;
+//	CONSTRUCTOR
+GPViewPageNode::GPViewPageNode(Widget	Toplevel,	DPC_page*	Page,	int	Xpos,	int	Ypos,	int	Width,	int	Height)	{
+
+				const	char	*separator	=	"#------------------------------------------------\n";
+				const	char	*new_section	=	"\n\n";
+				const	char	*ncells_s;
+
+				page	=	Page;
+				toplevel	=	Toplevel;
+				device	=	NOT_SET;
+				#ifdef	DEBUG
+				save_tmp_files	=	true;
+				#endif
+
+				if	((ncells_s	=	Page->getAttribute("hcells"))	!=	NULL)	{
+								n_hcells	=	atoi(ncells_s);
+								if	((n_hcells	<	0)||(n_hcells	>	10))	{
+												std::cerr	<<	"Value	for	hcells	attribute	is	out	of	range.\n"
+													<<	"Valid	range	for	hcells	is	1	..	10.\n"
+													<<	"Ignoring	hcells	value."	<<	std::endl	;
+												n_hcells	=	1;
+								}
+				}	else	{
+								n_hcells	=	1;
+				}
+
+				if	((ncells_s	=	Page->getAttribute("vcells"))	!=	NULL)	{
+								n_vcells	=	atoi(ncells_s);
+								if	((n_vcells	<	0)||(n_vcells	>	10))	{
+											std::cerr	<<	"Value	for	vcells	attribute	is	out	of	range.\n"
+												<<	"Valid	range	for	vcells	is	1	..	10.\n"
+												<<	"Ignoring	vcells	value.\n"	<<	std::endl	;
+												n_vcells	=	1;
+								}
+				}	else	{
+								n_vcells	=	1;
+				}
+
+
+				//!	Build	the	page	part	of	the	template.
+				textbuf.print("%s",	separator);
+				textbuf.print("#	(generated	for	GNUPLOT	Version	<GNUPLOT_VERSION>)\n");
+				textbuf.print("#	To	execute,	run	the	following	command:\n");
+				textbuf.print("#	%%	gnuplot	-persist	file_name	[ENTER]\n");
+				textbuf.print("#\n");
+				textbuf.print("#	Template:\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("set	title	\"<PAGE_TITLE>\"\n");
+
+				//!	Terminal	spec	line
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#		Set	the	output	device\n");
+				textbuf.print("%s",	separator);
+				if	(	GnuplotVersion()	>=	4.2	)	{
+								textbuf.print("set	term	<TERM_TYPE>	<CANVAS_SIZE>	<TERM_OPTIONS>\n");
+				}	else	if	(	GnuplotVersion()	>=	4.0	)	{
+								textbuf.print("set	term	<TERM_TYPE>	<TERM_OPTIONS>\n");
+				}	else	{
+								textbuf.print("set	term	<TERM_TYPE>\n");
+				}
+
+				//!	Page	size	for	whole	page
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#		Set	\"page\"	size	for	whole	plot\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("set	size	1.0,1.0\n");
+				textbuf.print("set	origin	0.0,0.0\n");
+
+				//!	Default	option	for	all	plots
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#		Set	default	options	for	all	plots\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("<PAGE_GRID_SPEC>	<PAGE_GRID_COLOR_SPEC>\n");
+				textbuf.print("set	nolabel\n");
+				if	(	GnuplotVersion()	>=	4.0	)	{
+								textbuf.print("set	mouse\n");
+								textbuf.print("set	style	data	<STYLE_DATA_SPEC>\n");
+								textbuf.print("set	style	function	<STYLE_FUNC_SPEC>\n");
+				}
+
+				/*!
+					*	OPTIONAL	PAGE	SETTINGS
+					*/
+				if	(	GnuplotVersion()	>=	4.0	)	{
+								textbuf.print("<PAGE_X_AXIS_SCALING_SPEC>");
+								textbuf.print("<PAGE_Y_AXIS_SCALING_SPEC>");
+				}
+				textbuf.print("<PAGE_Y_AXIS_FORMAT_SPEC>");
+				textbuf.print("<PAGE_FOREGROUND_SPEC>");
+				textbuf.print("<PAGE_BACKGROUND_SPEC>");
+				textbuf.print("<PAGE_KEY_SPEC>");	//	key	is	the	legend
+
+				//!	Linestyles
+				char	version_line_style[32]	;
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#		Set	linestyles\n");
+				textbuf.print("#		color	scheme	may	differ	if	\"-xrm\"	option	was	used\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("line_type_1		=	<LINE_TYPE_1>\n");
+				textbuf.print("line_type_2		=	<LINE_TYPE_2>\n");
+				textbuf.print("line_type_3		=	<LINE_TYPE_3>\n");
+				textbuf.print("line_type_4		=	<LINE_TYPE_4>\n");
+				textbuf.print("line_type_5		=	<LINE_TYPE_5>\n");
+				textbuf.print("line_type_6		=	<LINE_TYPE_6>\n");
+				textbuf.print("line_type_7		=	<LINE_TYPE_7>\n");
+				textbuf.print("line_type_8		=	<LINE_TYPE_8>\n");
+				textbuf.print("line_type_9		=	<LINE_TYPE_9>\n");
+				textbuf.print("line_type_10	=	<LINE_TYPE_10>\n");
+				textbuf.print("line_type_11	=	<LINE_TYPE_11>\n");
+				textbuf.print("line_type_12	=	<LINE_TYPE_12>\n");
+				textbuf.print("line_type_13	=	<LINE_TYPE_13>\n");
+
+				textbuf.print("\n");
+				textbuf.print("point_shape_1		=	<POINT_SHAPE_1>\n");
+				textbuf.print("point_shape_2		=	<POINT_SHAPE_2>\n");
+				textbuf.print("point_shape_3		=	<POINT_SHAPE_3>\n");
+				textbuf.print("point_shape_4		=	<POINT_SHAPE_4>\n");
+				textbuf.print("point_shape_5		=	<POINT_SHAPE_5>\n");
+				textbuf.print("point_shape_6		=	<POINT_SHAPE_6>\n");
+				textbuf.print("point_shape_7		=	<POINT_SHAPE_7>\n");
+				textbuf.print("point_shape_8		=	<POINT_SHAPE_8>\n");
+				textbuf.print("point_shape_9		=	<POINT_SHAPE_9>\n");
+				textbuf.print("point_shape_10	=	<POINT_SHAPE_10>\n");
+				textbuf.print("point_shape_11	=	<POINT_SHAPE_11>\n");
+				textbuf.print("point_shape_12	=	<POINT_SHAPE_12>\n");
+				textbuf.print("point_shape_13	=	<POINT_SHAPE_13>\n");
+
+				//!Map	Symbol	Style	pulldown	menu	to	internal	gnuplot	shape	indexes
+				textbuf.print("\n");
+				textbuf.print("None										=	-1\n");
+				textbuf.print("Square								=	4\n");
+				textbuf.print("Circle								=	6\n");
+				textbuf.print("Star										=	3\n");
+				textbuf.print("XX												=	2\n");
+				textbuf.print("Triangle						=	8\n");
+				textbuf.print("Solid_Square		=	5\n");
+				textbuf.print("Solid_Circle		=	7\n");
+				textbuf.print("Thick_Square		=	5\n");
+
+				//!	Define	a	numerical	value	for	the	Symbol	Size	pulldown	menu
+				textbuf.print("\n");
+				textbuf.print("Tiny			=	0.4\n");
+				textbuf.print("Small		=	0.8\n");
+				textbuf.print("Medium	=	1.4\n");
+				textbuf.print("Large		=	3.0\n");
+
+				textbuf.print("\n");
+				if	(	GnuplotVersion()	>=	4.0	)	{
+												strcpy(version_line_style,	"style	line")	;
+				}	else	{
+												strcpy(version_line_style,	"linestyle")	;
+				}
+				textbuf.print("set	%s		1		<LINE_SPEC_1>		<LINE_COLOR_1>\n",	version_line_style);
+				textbuf.print("set	%s		2		<LINE_SPEC_2>		<LINE_COLOR_2>\n",	version_line_style);
+				textbuf.print("set	%s		3		<LINE_SPEC_3>		<LINE_COLOR_3>\n",	version_line_style);
+				textbuf.print("set	%s		4		<LINE_SPEC_4>		<LINE_COLOR_4>\n",	version_line_style);
+				textbuf.print("set	%s		5		<LINE_SPEC_5>		<LINE_COLOR_5>\n",	version_line_style);
+				textbuf.print("set	%s		6		<LINE_SPEC_6>		<LINE_COLOR_6>\n",	version_line_style);
+				textbuf.print("set	%s		7		<LINE_SPEC_7>		<LINE_COLOR_7>\n",	version_line_style);
+				textbuf.print("set	%s		8		<LINE_SPEC_8>		<LINE_COLOR_8>\n",	version_line_style);
+				textbuf.print("set	%s		9		<LINE_SPEC_9>		<LINE_COLOR_9>\n",	version_line_style);
+				textbuf.print("set	%s	10		<LINE_SPEC_10>		<LINE_COLOR_10>\n",	version_line_style);
+				textbuf.print("set	%s	11		<LINE_SPEC_11>		<LINE_COLOR_11>\n",	version_line_style);
+				textbuf.print("set	%s	12		<LINE_SPEC_12>		<LINE_COLOR_12>\n",	version_line_style);
+				textbuf.print("set	%s	13		<LINE_SPEC_13>		<LINE_COLOR_13>\n",	version_line_style);
+
+				//!	Y	Axes	alignment	command
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#		Force	y-axes	to	align\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("set	lmargin	7\n");
+
+				//!	Titles	for	whole	page
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#	Add	title(s)	for	the	whole	page\n");
+				textbuf.print("%s",	separator);
+
+
+				//!	Page	Title
+				textbuf.print("set	label	<LABEL_1_TAG>	\\\n");
+				textbuf.print("				\"<LABEL_1_NAME>\"	\\\n");
+				textbuf.print("				at	screen	<LABEL_1_XPOS>,\\\n");
+				textbuf.print("							screen	<LABEL_1_YPOS>,\\\n");
+				textbuf.print("							screen	0.0	<LABEL_1_JUST>	\\\n");
+				textbuf.print("							<PAGE_TEXT_COLOR_SPEC>	\\\n");
+				textbuf.print("							font	<LABEL_1_FONT>\n\n");
+
+				textbuf.print("set	label	<LABEL_2_TAG>	\\\n");
+				textbuf.print("				\"<LABEL_2_NAME>\"	\\\n");
+				textbuf.print("				at	screen	<LABEL_2_XPOS>,\\\n");
+				textbuf.print("							screen	<LABEL_2_YPOS>,\\\n");
+				textbuf.print("							screen	0.0	<LABEL_2_JUST>	\\\n");
+				textbuf.print("							<PAGE_TEXT_COLOR_SPEC>	\\\n");
+				textbuf.print("							font	<LABEL_2_FONT>\n\n");
+
+				//!	Another	title	with	Simname/Runname
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#	Add	label(s)	for	the	sim	and	run	names\n");
+				textbuf.print("%s",	separator);
+
+				textbuf.print("set	label	<LABEL_3_TAG>	\\\n");
+				textbuf.print("				\"<LABEL_3_NAME>\"	\\\n");
+				textbuf.print("				at	screen	<LABEL_3_XPOS>,	\\\n");
+				textbuf.print("							screen	<LABEL_3_YPOS>,	\\\n");
+				textbuf.print("							screen	0.0	<LABEL_3_JUST>	\\\n");
+				textbuf.print("							<PAGE_TEXT_COLOR_SPEC>	\\\n");
+				textbuf.print("							font	<LABEL_3_FONT>\n\n");
+
+				//!	Date	(i.e.,	4/2/2009)
+				textbuf.print("set	label	<LABEL_4_TAG>	\\\n");
+				textbuf.print("				\"<LABEL_4_NAME>\"	\\\n");
+				textbuf.print("				at	screen	<LABEL_4_XPOS>,	\\\n");
+				textbuf.print("							screen	<LABEL_4_YPOS>,	\\\n");
+				textbuf.print("							screen	0.0	<LABEL_4_JUST>	\\\n");
+				textbuf.print("							<PAGE_TEXT_COLOR_SPEC>	\\\n");
+				textbuf.print("							font	<LABEL_4_FONT>\n\n");
+
+				//!	Multiplot	command
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#	Multiplot	mode\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("set	multiplot\n");
+
+				//!	Plot	sections
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#	Set	defs	for	plot	sizes	and	locations\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("plot_width		=	<PLOT_WIDTH>\n");
+				textbuf.print("plot_height	=	<PLOT_HEIGHT>\n");
+				textbuf.print("plot_title_xpos	=	<PLOT_TITLE_XPOS>\n");
+				textbuf.print("plot_title_ypos	=	<PLOT_TITLE_YPOS>\n");
+
+				textbuf.print("\n");
+				textbuf.print("x_axis_label_xpos	=	<X_AXIS_LABEL_XPOS_DECL>\n");
+				textbuf.print("x_axis_label_ypos	=	<X_AXIS_LABEL_YPOS_DECL>\n");
+				textbuf.print("y_axis_label_xpos	=	<Y_AXIS_LABEL_XPOS_DECL>\n");
+				textbuf.print("y_axis_label_ypos	=	<Y_AXIS_LABEL_YPOS_DECL>\n");
+
+				//	-----------------
+				instance_count	++;
 }
 
-static void layout_page (GPViewPageNode* gp_view_page_node ) {
+static	void	layout_page	(GPViewPageNode*	gp_view_page_node	)	{
 
-    int n_horizontal_cells, n_vertical_cells;
-    double cell_width, cell_height;
-    int number_of_plots;
-    int plot_ix;
-    char value_text[10];
+				int	n_horizontal_cells,	n_vertical_cells;
+				double	cell_width,	cell_height;
+				int	number_of_plots;
+				int	plot_ix;
+				char	value_text[10];
 
-    number_of_plots = (int)gp_view_page_node->plot_node_list.size();
+				number_of_plots	=	(int)gp_view_page_node->plot_node_list.size();
 
-    n_horizontal_cells = gp_view_page_node->n_hcells;
-    n_vertical_cells   = gp_view_page_node->n_vcells;
+				n_horizontal_cells	=	gp_view_page_node->n_hcells;
+				n_vertical_cells			=	gp_view_page_node->n_vcells;
 
-    while((n_horizontal_cells * n_vertical_cells) < number_of_plots ) {
-       if (n_horizontal_cells <= n_vertical_cells) {
-           n_horizontal_cells++;
-       } else {
-           n_vertical_cells++;
-       }
-    }
+				while((n_horizontal_cells	*	n_vertical_cells)	<	number_of_plots	)	{
+							if	(n_horizontal_cells	<=	n_vertical_cells)	{
+											n_horizontal_cells++;
+							}	else	{
+											n_vertical_cells++;
+							}
+				}
 
-    // CALCULATE PLOT WIDTH
-    cell_width  = 1.0 / n_horizontal_cells;
-    snprintf(value_text, sizeof(value_text), "%5.3f", cell_width);
-    gp_view_page_node->textbuf.subst("<PLOT_WIDTH>", value_text);
+				//	CALCULATE	PLOT	WIDTH
+				cell_width		=	1.0	/	n_horizontal_cells;
+				snprintf(value_text,	sizeof(value_text),	"%5.3f",	cell_width);
+				gp_view_page_node->textbuf.subst("<PLOT_WIDTH>",	value_text);
 
-    // CALCULATE PLOT HEIGHT
-    cell_height = 1.0 / n_vertical_cells;
-    snprintf(value_text, sizeof(value_text), "%5.3f", cell_height);
-    gp_view_page_node->textbuf.subst("<PLOT_HEIGHT>", value_text);
+				//	CALCULATE	PLOT	HEIGHT
+				cell_height	=	1.0	/	n_vertical_cells;
+				snprintf(value_text,	sizeof(value_text),	"%5.3f",	cell_height);
+				gp_view_page_node->textbuf.subst("<PLOT_HEIGHT>",	value_text);
 
-    for (plot_ix=0; plot_ix< number_of_plots; plot_ix++) {
-        float x,y;
-        char key_text[20];
+				for	(plot_ix=0;	plot_ix<	number_of_plots;	plot_ix++)	{
+								float	x,y;
+								char	key_text[20];
 
-        snprintf(key_text, sizeof(key_text), "<PLOT_ORIGIN_X_%d>", plot_ix);
-        x = (float)((plot_ix % n_horizontal_cells) * cell_width);
-        snprintf(value_text, sizeof(value_text), "%5.3f", x);
-        gp_view_page_node->textbuf.subst(key_text, value_text);
+								snprintf(key_text,	sizeof(key_text),	"<PLOT_ORIGIN_X_%d>",	plot_ix);
+								x	=	(float)((plot_ix	%	n_horizontal_cells)	*	cell_width);
+								snprintf(value_text,	sizeof(value_text),	"%5.3f",	x);
+								gp_view_page_node->textbuf.subst(key_text,	value_text);
 
 
-        snprintf(key_text, sizeof(key_text), "<PLOT_ORIGIN_Y_%d>", plot_ix);
-        y = (float)(1.0 - ((plot_ix / n_horizontal_cells) * cell_height + cell_height));
-        snprintf(value_text, sizeof(value_text), "%5.3f", y);
-        gp_view_page_node->textbuf.subst(key_text, value_text);
-    }
+								snprintf(key_text,	sizeof(key_text),	"<PLOT_ORIGIN_Y_%d>",	plot_ix);
+								y	=	(float)(1.0	-	((plot_ix	/	n_horizontal_cells)	*	cell_height	+	cell_height));
+								snprintf(value_text,	sizeof(value_text),	"%5.3f",	y);
+								gp_view_page_node->textbuf.subst(key_text,	value_text);
+				}
 }
 
-void GPViewPageNode::finalize() {
-
-    int ii;
-    const char *separator = "#------------------------------------------------\n";
-    const char *new_section = "\n\n";
-    string       page_title;
-    string       page_legend;
-    string       page_fg_color;
-    string       page_bg_color;
-    string       page_font; /* X11 font naming convention */
-    char gp_template_file_name[512];
-    char outFileName[512];
-    string tmp_string;
-    stringstream tmp_stream;
-    stringstream cmd;
-    string extension;
-    string::size_type idx;
-    int xx_geom = 850;  //default gnuplot window width
-    int yy_geom = 657;  //default gnuplot window height
-    int max_num_curves = 0;
-
-    /*!
-     * Gnuplot knows a limited number of color names.
-     * To see the list of known color names, run...
-     * % gnuplot -e 'show palette colornames'
-     */
-    string plotColors[]= { "black", "red", "blue", "green", "magenta",
-                           "yellow", "cyan", "pink", "dark-green",
-                           "light-blue",  "purple", "orange", "brown" };
-    int n_CustomColors = sizeof(plotColors)/sizeof(plotColors[0]);
-
-    /**!
-     * WARNING: getAttribute() returns a const char *, which may be null.
-     *          Assigning a null pointer to a string will crash the plot.
-     *          So, check the return value before making the assignment.
-     */
-    page_title       = (page->getTitle()) ?  page->getTitle() : "Page";
-    page_legend      = (page->getAttribute("legend")) ?  page->getAttribute("legend") : "";
-    page_bg_color    = (page->getAttribute("background_color")) ?  page->getAttribute("background_color") : "";
-    page_fg_color    = (page->getAttribute("foreground_color")) ?  page->getAttribute("foreground_color") : "";
-    page_font        = (page->getAttribute("font")) ?  page->getAttribute("font") : "";
-
-
-    //! Nomultiplot command
-    textbuf.print("\n");
-    textbuf.print("%s", new_section);
-    textbuf.print("%s", separator);
-    textbuf.print("# For some terminals, plots are not displayed\n");
-    textbuf.print("# until the command `unset multiplot` is given.\n");
-    textbuf.print("# Return to single plot mode to switch device\n");
-    textbuf.print("%s", separator);
-    textbuf.print("unset multiplot\n");
-
-
-    //! Get Gnuplot Terminal setting
-    terminalType_txt = (page->getAttribute("gnuplot_terminal")) ?  page->getAttribute("gnuplot_terminal") : "";
-    if ( strcasecmp(terminalType_txt.c_str(), "X11") == 0 ) {
-
-        terminalType = GPViewPageNode::X11;
-        terminalType_txt = "x11";
-
-    } else if ( strcasecmp(terminalType_txt.c_str(), "PS") == 0 ) {
-
-        terminalType = GPViewPageNode::PS;
-        terminalType_txt = "postscript";
-        extension = ".ps";
-
-    } else if ( strcasecmp(terminalType_txt.c_str(), "PS_COLOR") == 0 ) {
-
-        terminalType = GPViewPageNode::PS_COLOR;
-        terminalType_txt = "postscript";
-        extension = ".ps";
-
-    } else if ( strcasecmp(terminalType_txt.c_str(), "PNG") == 0 ) {
-
-        terminalType = GPViewPageNode::PNG;
-        terminalType_txt = "png";
-        extension = ".png";
-
-    } else if ( strcasecmp(terminalType_txt.c_str(), "EPS") == 0 ) {
-
-        terminalType = GPViewPageNode::EPS;
-        terminalType_txt = "eps";
-        extension = ".eps";
-
-    } else if ( strcasecmp(terminalType_txt.c_str(), "AQUA") == 0 ) {
-
-        terminalType = GPViewPageNode::AQUA;
-        terminalType_txt = "x11";
-
-    }  else {
-        cerr << "ERROR: Bad terminal-type spec: \"" << tmp_string << "\"" << endl;
-        cerr << "Defaulting terminal-type to \"x11.\"" << endl;
-        terminalType = GPViewPageNode::X11 ;
-        terminalType_txt = "x11";
-    }
-
-
-    //! Get Destination setting
-    device_txt = (page->getAttribute("device")) ?  page->getAttribute("device") : "";
-    if ( strcasecmp(device_txt.c_str(), "TERMINAL") == 0 ) {
-
-        device = GPViewPageNode::TERMINAL;
-
-    } else if ( strncasecmp(device_txt.c_str(), "FILE", 4) == 0 ) {
-
-        device = GPViewPageNode::DISK ;
-        //! copy from first space character to end of string
-        diskFileName = device_txt.substr( device_txt.find(" ") );
-
-        //! output may not redirect to file format with some terminal types
-        switch ( terminalType ) {
-            case GPViewPageNode::X11:
-            case GPViewPageNode::AQUA:
-                //! Force to a different format before going to file.
-                terminalType_txt = "postscript";
-                extension = ".ps";
-                break;
-            default:
-                break;
-        }
-
-    } else if ( strcasecmp(device_txt.c_str(), "PRINTER") == 0 ) {
-
-        device = GPViewPageNode::PRINTER;
-        terminalType_txt = "postscript";
-
-    }  else {
-        cerr << "ERROR: Bad device spec: \"" << device_txt << "\"" << endl;
-        cerr << "Defaulting device to \"Terminal.\"" << endl;
-        device = GPViewPageNode::TERMINAL;
-    }
-
-
-    // ==================================================
-    //                POPULATE THE TEMPLATE
-    // ==================================================
-    tmp_stream.str("");
-    tmp_stream << GnuplotVersion() ;
-    textbuf.subst_g("<GNUPLOT_VERSION>", tmp_stream.str().c_str() );
-    textbuf.subst_g("<PAGE_TITLE>", page_title.c_str());
-    textbuf.subst_g("<TERM_TYPE>", terminalType_txt.c_str());
-    if ( (plot_node_list.size()%5 == 2  ||  plot_node_list.size()%5 == 3)  &&
-          plot_node_list.size() > 2 ) {
-        xx_geom = 600;
-        yy_geom = 720;
-    }
-    tmp_stream.str("");
-    tmp_stream << "size " << xx_geom << "," << yy_geom ;
-    textbuf.subst_g("<CANVAS_SIZE>", tmp_stream.str().c_str() );
-    if ( strcasecmp(terminalType_txt.c_str(), "x11") == 0 ) {
-        if ( GnuplotVersion() >= 4.0 ) {
-            textbuf.subst_g("<TERM_OPTIONS>", "persist");
-        }
-    } else {
-        textbuf.subst_g("<TERM_OPTIONS>", "");
-    }
-
-    //! Enable/Disable Grid
-    textbuf.subst_g("<PAGE_GRID_SPEC>", "set grid");
-    if ( GnuplotVersion() >= 4.2  &&
-            ! page_fg_color.empty()  &&  color_is_valid(&page_fg_color) ) {
-        tmp_stream.str("");
-        tmp_stream << "linecolor rgb \"" << page_fg_color << "\"" ;
-        //! Also change border color to match grid color
-        tmp_stream << "\nset border linecolor rgb \"" << page_fg_color << "\"" ;
-        textbuf.subst_g( "<PAGE_GRID_COLOR_SPEC>", tmp_stream.str().c_str() );
-    } else {
-        textbuf.subst_g( "<PAGE_GRID_COLOR_SPEC>", "" );
-    }
-
-    //! plotting style for Data plots
-    textbuf.subst_g("<STYLE_DATA_SPEC>", "lines");
-    //! plotting style for Function plots
-    textbuf.subst_g("<STYLE_FUNC_SPEC>", "lines");
-
-    textbuf.subst_g("<PAGE_X_AXIS_SCALING_SPEC>", "unset logscale x\n");
-    textbuf.subst_g("<PAGE_Y_AXIS_FORMAT_SPEC>", "set format y\n");
-    textbuf.subst_g("<PAGE_Y_AXIS_SCALING_SPEC>", "unset logscale y\n");
-    textbuf.subst_g("<PAGE_FOREGROUND_SPEC>", "");
-    textbuf.subst_g("<PAGE_BACKGROUND_SPEC>", "");
-
-    //! Enable/Disable key (legend).
-    if ( page_legend.compare("No") == 0 ) {
-        if ( GnuplotVersion() >= 4.0 ) {
-                textbuf.subst_g("<PAGE_KEY_SPEC>", "set key off\n");
-        } else {
-                textbuf.subst_g("<PAGE_KEY_SPEC>", "set nokey\n");
-        }
-    } else {
-        string vert_spacing_ = "";
-        if ( GnuplotVersion() < 4.2 ) {
-            vert_spacing_ = " spacing 0.5";
-        }
-        tmp_stream.str("");
-        tmp_stream << "set key below Left reverse" << vert_spacing_ << "\n" ;
-        textbuf.subst_g( "<PAGE_KEY_SPEC>", tmp_stream.str().c_str() );
-
-        /* Increase window size so key doesn't cause graph to shrink */
-        for (ii = 0;  ii < (int)plot_node_list.size();  ii++) {
-            if ((int)plot_node_list[ii]->curve_node_list.size() > max_num_curves) {
-                max_num_curves = plot_node_list[ii]->curve_node_list.size();
-            }
-        }
-        yy_geom += max_num_curves*10;  // stretch 10 pixels per Y-var label
-    }
-
-    //! Set Font
-    if (  ! page_font.empty() ) {
-        tmp_stream.str("");
-        //! insert a backslash(\), newline & indent 4 spaces
-        tmp_stream << "\\\n    font \"" << page_font << "\"" ;
-        textbuf.subst_g( "<PAGE_FONT_SPEC>", tmp_stream.str().c_str() );
-    } else {
-        textbuf.subst_g("<PAGE_FONT_SPEC>", "\\\n    font <DEFAULT_FONT>");
-    }
-
-    textbuf.subst_g("<LINE_TYPE_1>",  "-1 #black");
-    textbuf.subst_g("<LINE_TYPE_2>",  " 1 #red");
-    textbuf.subst_g("<LINE_TYPE_3>",  " 3 #blue");
-    textbuf.subst_g("<LINE_TYPE_4>",  " 2 #green");
-    textbuf.subst_g("<LINE_TYPE_5>",  " 0 #magenta");
-    textbuf.subst_g("<LINE_TYPE_6>",  " 7 #yellow");
-    textbuf.subst_g("<LINE_TYPE_7>",  " 5 #cyan");
-    textbuf.subst_g("<LINE_TYPE_8>",  " 0 #pink");
-    textbuf.subst_g("<LINE_TYPE_9>",  " 0 #dark-green");
-    textbuf.subst_g("<LINE_TYPE_10>", " 0 #light-blue");
-    textbuf.subst_g("<LINE_TYPE_11>", " 4 #purple");
-    textbuf.subst_g("<LINE_TYPE_12>", " 8 #orange");
-    textbuf.subst_g("<LINE_TYPE_13>", " 6 #brown");
-
-    textbuf.subst_g("<POINT_SHAPE_1>",  " 1 #plus");
-    textbuf.subst_g("<POINT_SHAPE_2>",  " 2 #cross");
-    textbuf.subst_g("<POINT_SHAPE_3>",  " 3 #astrisk");
-    textbuf.subst_g("<POINT_SHAPE_4>",  " 4 #open_square");
-    textbuf.subst_g("<POINT_SHAPE_5>",  " 5 #filled_square");
-    textbuf.subst_g("<POINT_SHAPE_6>",  " 6 #open_circle");
-    textbuf.subst_g("<POINT_SHAPE_7>",  " 7 #filled_circle");
-    textbuf.subst_g("<POINT_SHAPE_8>",  " 8 #open_triangle");
-    textbuf.subst_g("<POINT_SHAPE_9>",  " 9 #filled_triangle");
-    textbuf.subst_g("<POINT_SHAPE_10>", "10 #open_inverse-triangle");
-    textbuf.subst_g("<POINT_SHAPE_11>", "11 #filled_inverse-triangle");
-    textbuf.subst_g("<POINT_SHAPE_12>", "12 #open_diamond");
-    textbuf.subst_g("<POINT_SHAPE_13>", "13 #filled_diamond");
-
-    textbuf.subst_g("<LINE_SPEC_1>", "lw 1.0  pt point_shape_1   ps Small");
-    textbuf.subst_g("<LINE_SPEC_2>", "lw 1.0  pt point_shape_2   ps Small");
-    textbuf.subst_g("<LINE_SPEC_3>", "lw 1.0  pt point_shape_3   ps Small");
-    textbuf.subst_g("<LINE_SPEC_4>", "lw 1.0  pt point_shape_4   ps Small");
-    textbuf.subst_g("<LINE_SPEC_5>", "lw 1.0  pt point_shape_5   ps Small");
-    textbuf.subst_g("<LINE_SPEC_6>", "lw 1.0  pt point_shape_6   ps Small");
-    textbuf.subst_g("<LINE_SPEC_7>", "lw 1.0  pt point_shape_7   ps Small");
-    textbuf.subst_g("<LINE_SPEC_8>", "lw 1.0  pt point_shape_8   ps Small");
-    textbuf.subst_g("<LINE_SPEC_9>", "lw 1.0  pt point_shape_9   ps Small");
-    textbuf.subst_g("<LINE_SPEC_10>","lw 1.0  pt point_shape_10  ps Small");
-    textbuf.subst_g("<LINE_SPEC_11>","lw 1.0  pt point_shape_11  ps Small");
-    textbuf.subst_g("<LINE_SPEC_12>","lw 1.0  pt point_shape_12  ps Small");
-    textbuf.subst_g("<LINE_SPEC_13>","lw 1.0  pt point_shape_13  ps Small");
-
-    if ( GnuplotVersion() >= 4.2 ) {
-        for (ii = 0;  ii < n_CustomColors;   ii++) {
-            //! build template (e.g. "<LINE_COLOR_1>")
-            tmp_stream.str("");
-            tmp_stream << "<LINE_COLOR_" << ii+1 << ">" ;
-            tmp_string = tmp_stream.str();
-            //! build string (e.g. "linecolor rgb \"black\"")
-            tmp_stream.str("");
-            tmp_stream << "linecolor rgb \"" << plotColors[ii] << "\"" ;
-            //! Replace template with string
-            textbuf.subst_g( tmp_string.c_str(), tmp_stream.str().c_str() );
-        }
-    } else {
-        /*!
-         * Change gnuplot's default line colors (1=red 2=green 3=blue
-         * 4=magenta 5=cyan 6=sienna 7=orange 8=coral) for plot.
-         * Note: This is only used when co-plotting multiple RUN_ dirs.
-         */
-        for (ii = 0;  ii < n_CustomColors;   ii++) {
-            tmp_stream.str("");
-            tmp_stream << "<LINE_COLOR_" << ii+1 << ">" ;
-            //! Clear template; use new line#Color definitions from "-xrm" options
-            textbuf.subst_g( tmp_stream.str().c_str(), "" );
-        }
-    }
-
-    tmp_stream.str("");
-    if ( GnuplotVersion() < 4.2  ||  page_fg_color.empty()  ||
-         !page_fg_color.empty() ) {
-        tmp_stream << "#" ;  /* comment out the textcolor command */
-    }
-    tmp_stream << "textcolor rgb \"" << page_fg_color << "\"" ;
-    textbuf.subst_g("<PAGE_TEXT_COLOR_SPEC>", tmp_stream.str().c_str());
-
-    textbuf.subst_g("<LABEL_1_TAG>", "1");
-    textbuf.subst_g("<LABEL_1_NAME>", page_title.c_str());
-    textbuf.subst_g("<LABEL_1_XPOS>", "0.51");
-    textbuf.subst_g("<LABEL_1_YPOS>", "0.97");
-    textbuf.subst_g("<LABEL_1_JUST>", "center");
-    textbuf.subst_g("<LABEL_1_FONT>", "\"Helvetica,14\"");
-
-    textbuf.subst_g("<LABEL_2_TAG>", "2");
-    textbuf.subst_g("<LABEL_2_NAME>", "");
-    textbuf.subst_g("<LABEL_2_XPOS>", "0.51");
-    textbuf.subst_g("<LABEL_2_YPOS>", "0.95");
-    textbuf.subst_g("<LABEL_2_JUST>", "center");
-    textbuf.subst_g("<LABEL_2_FONT>", "\"Helvetica,10\"");
-
-    textbuf.subst_g("<LABEL_3_TAG>", "3");
-    textbuf.subst_g("<LABEL_3_NAME>", "`whoami`");
-    textbuf.subst_g("<LABEL_3_XPOS>", "0.99");
-    textbuf.subst_g("<LABEL_3_YPOS>", "0.99");
-    textbuf.subst_g("<LABEL_3_JUST>", "right");
-    textbuf.subst_g("<LABEL_3_FONT>", "\"Helvetica,8\"");
-
-    textbuf.subst_g("<LABEL_4_TAG>", "4");
-    textbuf.subst_g("<LABEL_4_NAME>", "`date +%m/%d/%Y`");
-    textbuf.subst_g("<LABEL_4_XPOS>", "0.99");
-    textbuf.subst_g("<LABEL_4_YPOS>", "0.957");
-    textbuf.subst_g("<LABEL_4_JUST>", "right");
-    textbuf.subst_g("<LABEL_4_FONT>", "\"Helvetica,8\"");
-
-    textbuf.subst_g("<PLOT_TITLE_XPOS>", "0.0");
-    textbuf.subst_g("<PLOT_TITLE_YPOS>", "0.2");
-    textbuf.subst_g("<X_AXIS_LABEL_XPOS_DECL>", "0.0");
-    textbuf.subst_g("<X_AXIS_LABEL_YPOS_DECL>", "0.6");
-    if ( GnuplotVersion() < 4.2 ) {
-        textbuf.subst_g("<Y_AXIS_LABEL_XPOS_DECL>", "0.6");
-    } else {
-        textbuf.subst_g("<Y_AXIS_LABEL_XPOS_DECL>", "1.4");
-    }
-    textbuf.subst_g("<Y_AXIS_LABEL_YPOS_DECL>", "0.0");
-
-    textbuf.subst_g("<DEFAULT_FONT>",  "\"Helvetica,12\"");
-
-    layout_page ( this );
-
-    //! Figure out where we can create a temporary file.
-    if (!access("/tmp", W_OK)) {
-        strncpy(gp_template_file_name,
-                "/tmp/dpx_gp_page_XXXXXX", sizeof(gp_template_file_name));
-
-    } else if (!access("/var/tmp", W_OK)) {
-        strncpy(gp_template_file_name,
-                "/var/tmp/dpx_gp_page_XXXXXX", sizeof(gp_template_file_name));
-
-    } else {
-        std::cerr << "Unable to access /tmp or /var/tmp, where a temporary\n"
-            << "file (that represents gnuplot commands) needs\n"
-            << "to be created. Please check your permissions." << std::endl ;
-        return;
-    }
-
-    //! Create a name for our temporary gnuplot command file.
-    if (mkstemp( gp_template_file_name) < 0) {
-        std::cerr << "Unable to generate a temporary file"
-            << "name for some mind boggling reason." << std::endl ;
-        return;
-    }
-
-
-    if ( save_tmp_files ) {
-
-        cout << "Keeping data associated with this gnuplot file : " << gp_template_file_name << endl;
-
-        //! Comment out all commands that delete temp data files
-        textbuf.subst_g("<SAVE_TMP_FILE_SPEC>", "#");
-
-    } else {
-
-        //! Allow all temp data files to be deleted
-        textbuf.subst_g("<SAVE_TMP_FILE_SPEC>", "");
-
-    }
-
-
-    //! If user would like to see this template, print it to stdout
-    //if (args.generate_template) {
-    //    cout << textbuf.getText() << endl;
-    //}
-
-    /*!
-     * SAVE buffer TO FILE with given filename.
-     * Note: must save to file prior to sending to PRINTER device.
-     */
-    textbuf.writeFile( (const char*)gp_template_file_name );
-
-
-    cmd << "gnuplot";
-    if ( ! page_fg_color.empty()  &&  color_is_valid(&page_fg_color) ) {
-        cmd << " -xrm 'gnuplot*textColor:" << page_fg_color << "'" ;
-        cmd << " -xrm 'gnuplot*borderColor:" << page_fg_color << "'" ;
-        cmd << " -xrm 'gnuplot*axisColor:" << page_fg_color << "'" ;
-    }
-    if ( ! page_bg_color.empty()  &&  color_is_valid(&page_bg_color) ) {
-        cmd << " -xrm 'gnuplot*background:" << page_bg_color << "'" ;
-    }
-    /*!
-     * Set X11 line colors.
-     * Line colors are global per page in gnuplot.
-     * And there are at max 8 default colors. (%man gnuplot)
-     */
-    for (ii = 0;  ii < n_CustomColors;   ii++) {
-        cmd << " -xrm 'gnuplot*line" << ii+1 << "Color:" << plotColors[ii] << "'" ;
-    }
-
-    if ( device > GPViewPageNode::NOT_SET ) {
-            cerr    << "ERROR: GPViewPageNode::finalize() called with invalid device.\n"
-                    << "Example devices are TERMINAL, DISK and PRINTER.\n"
-                    << "It is an enumerated type in the GPViewPageNode class.\n" ;
-            exit(-1);
-    }
-
-    switch ( device ) {
-
-        case GPViewPageNode::DISK:
-
-            if ( diskFileName.empty() ) {
-                cerr << "ERROR: GPViewPageNode::finalize() called without "
-                     << "setting output file.  When you are sending data "
-                     << "to disk, you must set output file name."
-                     << endl ;
-                exit(-1);
-            }
-
-            //! Remove any quotes from string
-            while ( 1 ) {
-                idx = diskFileName.find('"');
-                if ( idx != string::npos ) {
-                    diskFileName.erase(idx,1);
-                } else {
-                    break ;
-                }
-            }
-
-            /*!
-             * The weird rfind(), substr() and erase() are used
-             * to make sure that if the outfile name already
-             * has an extension that we don't duplicate it
-             */
-            idx = diskFileName.rfind('.');
-            if ( idx != string::npos ) {
-                if (diskFileName.substr(idx) == extension) {
-                    diskFileName.erase(idx);
-                }
-            }
-
-            tmp_stream.str("");
-            tmp_stream << instance_count ;
-            diskFileName.append( tmp_stream.str() );
-            diskFileName.append( extension );
-
-            //! Complete command by generating an output file from the gnuplot file.
-            cmd << " " << gp_template_file_name << " >& " << diskFileName;
-            cout << "Generating " << diskFileName << "..." << endl;
-            cout.flush();
-            if ( system(cmd.str().c_str()) > -1 ) {
-                cout << "Done." << endl;
-            }
-
-            //! Run postscript file through a filter
-            if ( terminalType == PS ) {
-                filterPostScriptBW( diskFileName.c_str() );
-            } else if ( terminalType == PS_COLOR || terminalType == EPS) {
-                filterPostScriptColor( diskFileName.c_str(), this );
-            }
-
-            break;
-
-        case GPViewPageNode::PRINTER:
-
-            //! Figure out where we can create a temporary file.
-            if (!access("/tmp", W_OK)) {
-                strncpy(outFileName,
-                        "/tmp/dpx_gxplot_XXXXXX", sizeof(outFileName));
-
-            } else if (!access("/var/tmp", W_OK)) {
-                strncpy(outFileName,
-                        "/var/tmp/dpx_gxplot_XXXXXX", sizeof(outFileName));
-
-            } else {
-                std::cerr << "Unable to access /tmp or /var/tmp, where a temporary\n"
-                    << "file for printing needs to be created.\n"
-                    << "Please check your permissions." << std::endl ;
-                return;
-            }
-
-            //! Create a name for our temporary gnuplot command file.
-            if (mkstemp(outFileName) < 0) {
-                std::cerr << "Unable to generate a temporary file"
-                    << "name for some mind boggling reason." << std::endl ;
-                return;
-            }
-
-            //! Complete command by generating an output file from the gnuplot file.
-            cmd << " " << gp_template_file_name << " >& " << outFileName;
-            cout << "Generating output file : " << outFileName << "..." << endl;
-            if ( system(cmd.str().c_str()) > -1 ) {
-                cout << "Done." << endl;
-            }
-
-            //! Run postscript file through a filter
-            filterPostScriptBW(outFileName);
-
-            //! Print the file
-            if ( printPS((const char*)outFileName) > -1 ) {
-                cout << "Complete." << endl;
-                cout.flush();
-            }
-
-            if ( !save_tmp_files ) {
-                //! Clean up output file.
-                tmp_stream.str("");
-                tmp_stream << "rm -f " << outFileName ;
-                tmp_stream << "; rm -f " << gp_template_file_name;
-                system( tmp_stream.str().c_str() );
-            }
-
-            break;
-
-        case GPViewPageNode::NOT_SET:
-            break;
-
-        case GPViewPageNode::TERMINAL:
-        default:
-
-            cmd << " -persist";
-            cmd << " -geometry " << xx_geom << "x" << yy_geom ; //e.g. 850x657
-
-            //! Complete the command by providing the gnuplot file name.
-            cmd << " " << gp_template_file_name ;
-
-            if ( !save_tmp_files ) {
-                /*!
-                * After the plot is drawn, add another command to delete
-                * the temporary gnuplot file: '/tmp/dpx_gp_page_******'.
-                */
-                cmd << "; rm -f " << gp_template_file_name;
-            }
-
-            /*!
-             * Run the system command to create the plot.
-             * Example:
-             *    % "gnuplot -persist -geometry 850x657 \
-             *       -xrm 'gnuplot*textColor:black' /tmp/dpx_gp_page_******"
-             */
-            system( cmd.str().c_str() );
-
-            break;
-
-    }
+void	GPViewPageNode::finalize()	{
+
+				int	ii;
+				const	char	*separator	=	"#------------------------------------------------\n";
+				const	char	*new_section	=	"\n\n";
+				string							page_title;
+				string							page_legend;
+				string							page_fg_color;
+				string							page_bg_color;
+				string							page_font;	/*	X11	font	naming	convention	*/
+				char	gp_template_file_name[512];
+				char	outFileName[512];
+				string	tmp_string;
+				stringstream	tmp_stream;
+				stringstream	cmd;
+				string	extension;
+				string::size_type	idx;
+				int	xx_geom	=	850;		//default	gnuplot	window	width
+				int	yy_geom	=	657;		//default	gnuplot	window	height
+				int	max_num_curves	=	0;
+
+				/*!
+					*	Gnuplot	knows	a	limited	number	of	color	names.
+					*	To	see	the	list	of	known	color	names,	run...
+					*	%	gnuplot	-e	'show	palette	colornames'
+					*/
+				string	plotColors[]=	{	"black",	"red",	"blue",	"green",	"magenta",
+																											"yellow",	"cyan",	"pink",	"dark-green",
+																											"light-blue",		"purple",	"orange",	"brown"	};
+				int	n_CustomColors	=	sizeof(plotColors)/sizeof(plotColors[0]);
+
+				/**!
+					*	WARNING:	getAttribute()	returns	a	const	char	*,	which	may	be	null.
+					*										Assigning	a	null	pointer	to	a	string	will	crash	the	plot.
+					*										So,	check	the	return	value	before	making	the	assignment.
+					*/
+				page_title							=	(page->getTitle())	?		page->getTitle()	:	"Page";
+				page_legend						=	(page->getAttribute("legend"))	?		page->getAttribute("legend")	:	"";
+				page_bg_color				=	(page->getAttribute("background_color"))	?		page->getAttribute("background_color")	:	"";
+				page_fg_color				=	(page->getAttribute("foreground_color"))	?		page->getAttribute("foreground_color")	:	"";
+				page_font								=	(page->getAttribute("font"))	?		page->getAttribute("font")	:	"";
+
+
+				//!	Nomultiplot	command
+				textbuf.print("\n");
+				textbuf.print("%s",	new_section);
+				textbuf.print("%s",	separator);
+				textbuf.print("#	For	some	terminals,	plots	are	not	displayed\n");
+				textbuf.print("#	until	the	command	`unset	multiplot`	is	given.\n");
+				textbuf.print("#	Return	to	single	plot	mode	to	switch	device\n");
+				textbuf.print("%s",	separator);
+				textbuf.print("unset	multiplot\n");
+
+
+				//!	Get	Gnuplot	Terminal	setting
+				terminalType_txt	=	(page->getAttribute("gnuplot_terminal"))	?		page->getAttribute("gnuplot_terminal")	:	"";
+				if	(	strcasecmp(terminalType_txt.c_str(),	"X11")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::X11;
+								terminalType_txt	=	"x11";
+
+				}	else	if	(	strcasecmp(terminalType_txt.c_str(),	"PS")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::PS;
+								terminalType_txt	=	"postscript";
+								extension	=	".ps";
+
+				}	else	if	(	strcasecmp(terminalType_txt.c_str(),	"PS_COLOR")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::PS_COLOR;
+								terminalType_txt	=	"postscript";
+								extension	=	".ps";
+
+				}	else	if	(	strcasecmp(terminalType_txt.c_str(),	"PNG")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::PNG;
+								terminalType_txt	=	"png";
+								extension	=	".png";
+
+				}	else	if	(	strcasecmp(terminalType_txt.c_str(),	"EPS")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::EPS;
+								terminalType_txt	=	"eps";
+								extension	=	".eps";
+
+				}	else	if	(	strcasecmp(terminalType_txt.c_str(),	"AQUA")	==	0	)	{
+
+								terminalType	=	GPViewPageNode::AQUA;
+								terminalType_txt	=	"x11";
+
+				}		else	{
+								cerr	<<	"ERROR:	Bad	terminal-type	spec:	\""	<<	tmp_string	<<	"\""	<<	endl;
+								cerr	<<	"Defaulting	terminal-type	to	\"x11.\""	<<	endl;
+								terminalType	=	GPViewPageNode::X11	;
+								terminalType_txt	=	"x11";
+				}
+
+
+				//!	Get	Destination	setting
+				device_txt	=	(page->getAttribute("device"))	?		page->getAttribute("device")	:	"";
+				if	(	strcasecmp(device_txt.c_str(),	"TERMINAL")	==	0	)	{
+
+								device	=	GPViewPageNode::TERMINAL;
+
+				}	else	if	(	strncasecmp(device_txt.c_str(),	"FILE",	4)	==	0	)	{
+
+								device	=	GPViewPageNode::DISK	;
+								//!	copy	from	first	space	character	to	end	of	string
+								diskFileName	=	device_txt.substr(	device_txt.find("	")	);
+
+								//!	output	may	not	redirect	to	file	format	with	some	terminal	types
+								switch	(	terminalType	)	{
+												case	GPViewPageNode::X11:
+												case	GPViewPageNode::AQUA:
+																//!	Force	to	a	different	format	before	going	to	file.
+																terminalType_txt	=	"postscript";
+																extension	=	".ps";
+																break;
+												default:
+																break;
+								}
+
+				}	else	if	(	strcasecmp(device_txt.c_str(),	"PRINTER")	==	0	)	{
+
+								device	=	GPViewPageNode::PRINTER;
+								terminalType_txt	=	"postscript";
+
+				}		else	{
+								cerr	<<	"ERROR:	Bad	device	spec:	\""	<<	device_txt	<<	"\""	<<	endl;
+								cerr	<<	"Defaulting	device	to	\"Terminal.\""	<<	endl;
+								device	=	GPViewPageNode::TERMINAL;
+				}
+
+
+				//	==================================================
+				//																POPULATE	THE	TEMPLATE
+				//	==================================================
+				tmp_stream.str("");
+				tmp_stream	<<	GnuplotVersion()	;
+				textbuf.subst_g("<GNUPLOT_VERSION>",	tmp_stream.str().c_str()	);
+				textbuf.subst_g("<PAGE_TITLE>",	page_title.c_str());
+				textbuf.subst_g("<TERM_TYPE>",	terminalType_txt.c_str());
+				if	(	(plot_node_list.size()%5	==	2		||		plot_node_list.size()%5	==	3)		&&
+										plot_node_list.size()	>	2	)	{
+								xx_geom	=	600;
+								yy_geom	=	720;
+				}
+				tmp_stream.str("");
+				tmp_stream	<<	"size	"	<<	xx_geom	<<	","	<<	yy_geom	;
+				textbuf.subst_g("<CANVAS_SIZE>",	tmp_stream.str().c_str()	);
+				if	(	strcasecmp(terminalType_txt.c_str(),	"x11")	==	0	)	{
+								if	(	GnuplotVersion()	>=	4.0	)	{
+												textbuf.subst_g("<TERM_OPTIONS>",	"persist");
+								}
+				}	else	{
+								textbuf.subst_g("<TERM_OPTIONS>",	"");
+				}
+
+				//!	Enable/Disable	Grid
+				textbuf.subst_g("<PAGE_GRID_SPEC>",	"set	grid");
+				if	(	GnuplotVersion()	>=	4.2		&&
+												!	page_fg_color.empty()		&&		color_is_valid(&page_fg_color)	)	{
+								tmp_stream.str("");
+								tmp_stream	<<	"linecolor	rgb	\""	<<	page_fg_color	<<	"\""	;
+								//!	Also	change	border	color	to	match	grid	color
+								tmp_stream	<<	"\nset	border	linecolor	rgb	\""	<<	page_fg_color	<<	"\""	;
+								textbuf.subst_g(	"<PAGE_GRID_COLOR_SPEC>",	tmp_stream.str().c_str()	);
+				}	else	{
+								textbuf.subst_g(	"<PAGE_GRID_COLOR_SPEC>",	""	);
+				}
+
+				//!	plotting	style	for	Data	plots
+				textbuf.subst_g("<STYLE_DATA_SPEC>",	"lines");
+				//!	plotting	style	for	Function	plots
+				textbuf.subst_g("<STYLE_FUNC_SPEC>",	"lines");
+
+				textbuf.subst_g("<PAGE_X_AXIS_SCALING_SPEC>",	"unset	logscale	x\n");
+				textbuf.subst_g("<PAGE_Y_AXIS_FORMAT_SPEC>",	"set	format	y\n");
+				textbuf.subst_g("<PAGE_Y_AXIS_SCALING_SPEC>",	"unset	logscale	y\n");
+				textbuf.subst_g("<PAGE_FOREGROUND_SPEC>",	"");
+				textbuf.subst_g("<PAGE_BACKGROUND_SPEC>",	"");
+
+				//!	Enable/Disable	key	(legend).
+				if	(	page_legend.compare("No")	==	0	)	{
+								if	(	GnuplotVersion()	>=	4.0	)	{
+																textbuf.subst_g("<PAGE_KEY_SPEC>",	"set	key	off\n");
+								}	else	{
+																textbuf.subst_g("<PAGE_KEY_SPEC>",	"set	nokey\n");
+								}
+				}	else	{
+								string	vert_spacing_	=	"";
+								if	(	GnuplotVersion()	<	4.2	)	{
+												vert_spacing_	=	"	spacing	0.5";
+								}
+								tmp_stream.str("");
+								tmp_stream	<<	"set	key	below	Left	reverse"	<<	vert_spacing_	<<	"\n"	;
+								textbuf.subst_g(	"<PAGE_KEY_SPEC>",	tmp_stream.str().c_str()	);
+
+								/*	Increase	window	size	so	key	doesn't	cause	graph	to	shrink	*/
+								for	(ii	=	0;		ii	<	(int)plot_node_list.size();		ii++)	{
+												if	((int)plot_node_list[ii]->curve_node_list.size()	>	max_num_curves)	{
+																max_num_curves	=	plot_node_list[ii]->curve_node_list.size();
+												}
+								}
+								yy_geom	+=	max_num_curves*10;		//	stretch	10	pixels	per	Y-var	label
+				}
+
+				//!	Set	Font
+				if	(		!	page_font.empty()	)	{
+								tmp_stream.str("");
+								//!	insert	a	backslash(\),	newline	&	indent	4	spaces
+								tmp_stream	<<	"\\\n				font	\""	<<	page_font	<<	"\""	;
+								textbuf.subst_g(	"<PAGE_FONT_SPEC>",	tmp_stream.str().c_str()	);
+				}	else	{
+								textbuf.subst_g("<PAGE_FONT_SPEC>",	"\\\n				font	<DEFAULT_FONT>");
+				}
+
+				textbuf.subst_g("<LINE_TYPE_1>",		"-1	#black");
+				textbuf.subst_g("<LINE_TYPE_2>",		"	1	#red");
+				textbuf.subst_g("<LINE_TYPE_3>",		"	3	#blue");
+				textbuf.subst_g("<LINE_TYPE_4>",		"	2	#green");
+				textbuf.subst_g("<LINE_TYPE_5>",		"	0	#magenta");
+				textbuf.subst_g("<LINE_TYPE_6>",		"	7	#yellow");
+				textbuf.subst_g("<LINE_TYPE_7>",		"	5	#cyan");
+				textbuf.subst_g("<LINE_TYPE_8>",		"	0	#pink");
+				textbuf.subst_g("<LINE_TYPE_9>",		"	0	#dark-green");
+				textbuf.subst_g("<LINE_TYPE_10>",	"	0	#light-blue");
+				textbuf.subst_g("<LINE_TYPE_11>",	"	4	#purple");
+				textbuf.subst_g("<LINE_TYPE_12>",	"	8	#orange");
+				textbuf.subst_g("<LINE_TYPE_13>",	"	6	#brown");
+
+				textbuf.subst_g("<POINT_SHAPE_1>",		"	1	#plus");
+				textbuf.subst_g("<POINT_SHAPE_2>",		"	2	#cross");
+				textbuf.subst_g("<POINT_SHAPE_3>",		"	3	#astrisk");
+				textbuf.subst_g("<POINT_SHAPE_4>",		"	4	#open_square");
+				textbuf.subst_g("<POINT_SHAPE_5>",		"	5	#filled_square");
+				textbuf.subst_g("<POINT_SHAPE_6>",		"	6	#open_circle");
+				textbuf.subst_g("<POINT_SHAPE_7>",		"	7	#filled_circle");
+				textbuf.subst_g("<POINT_SHAPE_8>",		"	8	#open_triangle");
+				textbuf.subst_g("<POINT_SHAPE_9>",		"	9	#filled_triangle");
+				textbuf.subst_g("<POINT_SHAPE_10>",	"10	#open_inverse-triangle");
+				textbuf.subst_g("<POINT_SHAPE_11>",	"11	#filled_inverse-triangle");
+				textbuf.subst_g("<POINT_SHAPE_12>",	"12	#open_diamond");
+				textbuf.subst_g("<POINT_SHAPE_13>",	"13	#filled_diamond");
+
+				textbuf.subst_g("<LINE_SPEC_1>",	"lw	1.0		pt	point_shape_1			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_2>",	"lw	1.0		pt	point_shape_2			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_3>",	"lw	1.0		pt	point_shape_3			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_4>",	"lw	1.0		pt	point_shape_4			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_5>",	"lw	1.0		pt	point_shape_5			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_6>",	"lw	1.0		pt	point_shape_6			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_7>",	"lw	1.0		pt	point_shape_7			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_8>",	"lw	1.0		pt	point_shape_8			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_9>",	"lw	1.0		pt	point_shape_9			ps	Small");
+				textbuf.subst_g("<LINE_SPEC_10>","lw	1.0		pt	point_shape_10		ps	Small");
+				textbuf.subst_g("<LINE_SPEC_11>","lw	1.0		pt	point_shape_11		ps	Small");
+				textbuf.subst_g("<LINE_SPEC_12>","lw	1.0		pt	point_shape_12		ps	Small");
+				textbuf.subst_g("<LINE_SPEC_13>","lw	1.0		pt	point_shape_13		ps	Small");
+
+				if	(	GnuplotVersion()	>=	4.2	)	{
+								for	(ii	=	0;		ii	<	n_CustomColors;			ii++)	{
+												//!	build	template	(e.g.	"<LINE_COLOR_1>")
+												tmp_stream.str("");
+												tmp_stream	<<	"<LINE_COLOR_"	<<	ii+1	<<	">"	;
+												tmp_string	=	tmp_stream.str();
+												//!	build	string	(e.g.	"linecolor	rgb	\"black\"")
+												tmp_stream.str("");
+												tmp_stream	<<	"linecolor	rgb	\""	<<	plotColors[ii]	<<	"\""	;
+												//!	Replace	template	with	string
+												textbuf.subst_g(	tmp_string.c_str(),	tmp_stream.str().c_str()	);
+								}
+				}	else	{
+								/*!
+									*	Change	gnuplot's	default	line	colors	(1=red	2=green	3=blue
+									*	4=magenta	5=cyan	6=sienna	7=orange	8=coral)	for	plot.
+									*	Note:	This	is	only	used	when	co-plotting	multiple	RUN_	dirs.
+									*/
+								for	(ii	=	0;		ii	<	n_CustomColors;			ii++)	{
+												tmp_stream.str("");
+												tmp_stream	<<	"<LINE_COLOR_"	<<	ii+1	<<	">"	;
+												//!	Clear	template;	use	new	line#Color	definitions	from	"-xrm"	options
+												textbuf.subst_g(	tmp_stream.str().c_str(),	""	);
+								}
+				}
+
+				tmp_stream.str("");
+				if	(	GnuplotVersion()	<	4.2		||		page_fg_color.empty()		||
+									!page_fg_color.empty()	)	{
+								tmp_stream	<<	"#"	;		/*	comment	out	the	textcolor	command	*/
+				}
+				tmp_stream	<<	"textcolor	rgb	\""	<<	page_fg_color	<<	"\""	;
+				textbuf.subst_g("<PAGE_TEXT_COLOR_SPEC>",	tmp_stream.str().c_str());
+
+				textbuf.subst_g("<LABEL_1_TAG>",	"1");
+				textbuf.subst_g("<LABEL_1_NAME>",	page_title.c_str());
+				textbuf.subst_g("<LABEL_1_XPOS>",	"0.51");
+				textbuf.subst_g("<LABEL_1_YPOS>",	"0.97");
+				textbuf.subst_g("<LABEL_1_JUST>",	"center");
+				textbuf.subst_g("<LABEL_1_FONT>",	"\"Helvetica,14\"");
+
+				textbuf.subst_g("<LABEL_2_TAG>",	"2");
+				textbuf.subst_g("<LABEL_2_NAME>",	"");
+				textbuf.subst_g("<LABEL_2_XPOS>",	"0.51");
+				textbuf.subst_g("<LABEL_2_YPOS>",	"0.95");
+				textbuf.subst_g("<LABEL_2_JUST>",	"center");
+				textbuf.subst_g("<LABEL_2_FONT>",	"\"Helvetica,10\"");
+
+				textbuf.subst_g("<LABEL_3_TAG>",	"3");
+				textbuf.subst_g("<LABEL_3_NAME>",	"`whoami`");
+				textbuf.subst_g("<LABEL_3_XPOS>",	"0.99");
+				textbuf.subst_g("<LABEL_3_YPOS>",	"0.99");
+				textbuf.subst_g("<LABEL_3_JUST>",	"right");
+				textbuf.subst_g("<LABEL_3_FONT>",	"\"Helvetica,8\"");
+
+				textbuf.subst_g("<LABEL_4_TAG>",	"4");
+				textbuf.subst_g("<LABEL_4_NAME>",	"`date	+%m/%d/%Y`");
+				textbuf.subst_g("<LABEL_4_XPOS>",	"0.99");
+				textbuf.subst_g("<LABEL_4_YPOS>",	"0.957");
+				textbuf.subst_g("<LABEL_4_JUST>",	"right");
+				textbuf.subst_g("<LABEL_4_FONT>",	"\"Helvetica,8\"");
+
+				textbuf.subst_g("<PLOT_TITLE_XPOS>",	"0.0");
+				textbuf.subst_g("<PLOT_TITLE_YPOS>",	"0.2");
+				textbuf.subst_g("<X_AXIS_LABEL_XPOS_DECL>",	"0.0");
+				textbuf.subst_g("<X_AXIS_LABEL_YPOS_DECL>",	"0.6");
+				if	(	GnuplotVersion()	<	4.2	)	{
+								textbuf.subst_g("<Y_AXIS_LABEL_XPOS_DECL>",	"0.6");
+				}	else	{
+								textbuf.subst_g("<Y_AXIS_LABEL_XPOS_DECL>",	"1.4");
+				}
+				textbuf.subst_g("<Y_AXIS_LABEL_YPOS_DECL>",	"0.0");
+
+				textbuf.subst_g("<DEFAULT_FONT>",		"\"Helvetica,12\"");
+
+				layout_page	(	this	);
+
+				//!	Figure	out	where	we	can	create	a	temporary	file.
+				if	(!access("/tmp",	W_OK))	{
+								strncpy(gp_template_file_name,
+																"/tmp/dpx_gp_page_XXXXXX",	sizeof(gp_template_file_name));
+
+				}	else	if	(!access("/var/tmp",	W_OK))	{
+								strncpy(gp_template_file_name,
+																"/var/tmp/dpx_gp_page_XXXXXX",	sizeof(gp_template_file_name));
+
+				}	else	{
+								std::cerr	<<	"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+												<<	"file	(that	represents	gnuplot	commands)	needs\n"
+												<<	"to	be	created.	Please	check	your	permissions."	<<	std::endl	;
+								return;
+				}
+
+				//!	Create	a	name	for	our	temporary	gnuplot	command	file.
+				if	(mkstemp(	gp_template_file_name)	<	0)	{
+								std::cerr	<<	"Unable	to	generate	a	temporary	file"
+												<<	"name	for	some	mind	boggling	reason."	<<	std::endl	;
+								return;
+				}
+
+
+				if	(	save_tmp_files	)	{
+
+								cout	<<	"Keeping	data	associated	with	this	gnuplot	file	:	"	<<	gp_template_file_name	<<	endl;
+
+								//!	Comment	out	all	commands	that	delete	temp	data	files
+								textbuf.subst_g("<SAVE_TMP_FILE_SPEC>",	"#");
+
+				}	else	{
+
+								//!	Allow	all	temp	data	files	to	be	deleted
+								textbuf.subst_g("<SAVE_TMP_FILE_SPEC>",	"");
+
+				}
+
+
+				//!	If	user	would	like	to	see	this	template,	print	it	to	stdout
+				//if	(args.generate_template)	{
+				//				cout	<<	textbuf.getText()	<<	endl;
+				//}
+
+				/*!
+					*	SAVE	buffer	TO	FILE	with	given	filename.
+					*	Note:	must	save	to	file	prior	to	sending	to	PRINTER	device.
+					*/
+				textbuf.writeFile(	(const	char*)gp_template_file_name	);
+
+
+				cmd	<<	"gnuplot";
+				if	(	!	page_fg_color.empty()		&&		color_is_valid(&page_fg_color)	)	{
+								cmd	<<	"	-xrm	'gnuplot*textColor:"	<<	page_fg_color	<<	"'"	;
+								cmd	<<	"	-xrm	'gnuplot*borderColor:"	<<	page_fg_color	<<	"'"	;
+								cmd	<<	"	-xrm	'gnuplot*axisColor:"	<<	page_fg_color	<<	"'"	;
+				}
+				if	(	!	page_bg_color.empty()		&&		color_is_valid(&page_bg_color)	)	{
+								cmd	<<	"	-xrm	'gnuplot*background:"	<<	page_bg_color	<<	"'"	;
+				}
+				/*!
+					*	Set	X11	line	colors.
+					*	Line	colors	are	global	per	page	in	gnuplot.
+					*	And	there	are	at	max	8	default	colors.	(%man	gnuplot)
+					*/
+				for	(ii	=	0;		ii	<	n_CustomColors;			ii++)	{
+								cmd	<<	"	-xrm	'gnuplot*line"	<<	ii+1	<<	"Color:"	<<	plotColors[ii]	<<	"'"	;
+				}
+
+				if	(	device	>	GPViewPageNode::NOT_SET	)	{
+												cerr				<<	"ERROR:	GPViewPageNode::finalize()	called	with	invalid	device.\n"
+																				<<	"Example	devices	are	TERMINAL,	DISK	and	PRINTER.\n"
+																				<<	"It	is	an	enumerated	type	in	the	GPViewPageNode	class.\n"	;
+												exit(-1);
+				}
+
+				switch	(	device	)	{
+
+								case	GPViewPageNode::DISK:
+
+												if	(	diskFileName.empty()	)	{
+																cerr	<<	"ERROR:	GPViewPageNode::finalize()	called	without	"
+																					<<	"setting	output	file.		When	you	are	sending	data	"
+																					<<	"to	disk,	you	must	set	output	file	name."
+																					<<	endl	;
+																exit(-1);
+												}
+
+												//!	Remove	any	quotes	from	string
+												while	(	1	)	{
+																idx	=	diskFileName.find('"');
+																if	(	idx	!=	string::npos	)	{
+																				diskFileName.erase(idx,1);
+																}	else	{
+																				break	;
+																}
+												}
+
+												/*!
+													*	The	weird	rfind(),	substr()	and	erase()	are	used
+													*	to	make	sure	that	if	the	outfile	name	already
+													*	has	an	extension	that	we	don't	duplicate	it
+													*/
+												idx	=	diskFileName.rfind('.');
+												if	(	idx	!=	string::npos	)	{
+																if	(diskFileName.substr(idx)	==	extension)	{
+																				diskFileName.erase(idx);
+																}
+												}
+
+												tmp_stream.str("");
+												tmp_stream	<<	instance_count	;
+												diskFileName.append(	tmp_stream.str()	);
+												diskFileName.append(	extension	);
+
+												//!	Complete	command	by	generating	an	output	file	from	the	gnuplot	file.
+												cmd	<<	"	"	<<	gp_template_file_name	<<	"	>&	"	<<	diskFileName;
+												cout	<<	"Generating	"	<<	diskFileName	<<	"..."	<<	endl;
+												cout.flush();
+												if	(	system(cmd.str().c_str())	>	-1	)	{
+																cout	<<	"Done."	<<	endl;
+												}
+
+												//!	Run	postscript	file	through	a	filter
+												if	(	terminalType	==	PS	)	{
+																filterPostScriptBW(	diskFileName.c_str()	);
+												}	else	if	(	terminalType	==	PS_COLOR	||	terminalType	==	EPS)	{
+																filterPostScriptColor(	diskFileName.c_str(),	this	);
+												}
+
+												break;
+
+								case	GPViewPageNode::PRINTER:
+
+												//!	Figure	out	where	we	can	create	a	temporary	file.
+												if	(!access("/tmp",	W_OK))	{
+																strncpy(outFileName,
+																								"/tmp/dpx_gxplot_XXXXXX",	sizeof(outFileName));
+
+												}	else	if	(!access("/var/tmp",	W_OK))	{
+																strncpy(outFileName,
+																								"/var/tmp/dpx_gxplot_XXXXXX",	sizeof(outFileName));
+
+												}	else	{
+																std::cerr	<<	"Unable	to	access	/tmp	or	/var/tmp,	where	a	temporary\n"
+																				<<	"file	for	printing	needs	to	be	created.\n"
+																				<<	"Please	check	your	permissions."	<<	std::endl	;
+																return;
+												}
+
+												//!	Create	a	name	for	our	temporary	gnuplot	command	file.
+												if	(mkstemp(outFileName)	<	0)	{
+																std::cerr	<<	"Unable	to	generate	a	temporary	file"
+																				<<	"name	for	some	mind	boggling	reason."	<<	std::endl	;
+																return;
+												}
+
+												//!	Complete	command	by	generating	an	output	file	from	the	gnuplot	file.
+												cmd	<<	"	"	<<	gp_template_file_name	<<	"	>&	"	<<	outFileName;
+												cout	<<	"Generating	output	file	:	"	<<	outFileName	<<	"..."	<<	endl;
+												if	(	system(cmd.str().c_str())	>	-1	)	{
+																cout	<<	"Done."	<<	endl;
+												}
+
+												//!	Run	postscript	file	through	a	filter
+												filterPostScriptBW(outFileName);
+
+												//!	Print	the	file
+												if	(	printPS((const	char*)outFileName)	>	-1	)	{
+																cout	<<	"Complete."	<<	endl;
+																cout.flush();
+												}
+
+												if	(	!save_tmp_files	)	{
+																//!	Clean	up	output	file.
+																tmp_stream.str("");
+																tmp_stream	<<	"rm	-f	"	<<	outFileName	;
+																tmp_stream	<<	";	rm	-f	"	<<	gp_template_file_name;
+																system(	tmp_stream.str().c_str()	);
+												}
+
+												break;
+
+								case	GPViewPageNode::NOT_SET:
+												break;
+
+								case	GPViewPageNode::TERMINAL:
+								default:
+
+												cmd	<<	"	-persist";
+												cmd	<<	"	-geometry	"	<<	xx_geom	<<	"x"	<<	yy_geom	;	//e.g.	850x657
+
+												//!	Complete	the	command	by	providing	the	gnuplot	file	name.
+												cmd	<<	"	"	<<	gp_template_file_name	;
+
+												if	(	!save_tmp_files	)	{
+																/*!
+																*	After	the	plot	is	drawn,	add	another	command	to	delete
+																*	the	temporary	gnuplot	file:	'/tmp/dpx_gp_page_******'.
+																*/
+																cmd	<<	";	rm	-f	"	<<	gp_template_file_name;
+												}
+
+												/*!
+													*	Run	the	system	command	to	create	the	plot.
+													*	Example:
+													*				%	"gnuplot	-persist	-geometry	850x657	\
+													*							-xrm	'gnuplot*textColor:black'	/tmp/dpx_gp_page_******"
+													*/
+												system(	cmd.str().c_str()	);
+
+												break;
+
+				}
 
 }
 
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_plot_node.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_plot_node.cpp
index 07c3f6616..9f4ada322 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_plot_node.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_plot_node.cpp
@@ -1,306 +1,306 @@
 
-#include <math.h>
-#include <stdio.h>    // for snprintf
-#include <string.h>   // for strncpy, strcmp, strlen
-#include <string>
-#include <iostream>
-#include <sstream>
+#include	<math.h>
+#include	<stdio.h>				//	for	snprintf
+#include	<string.h>			//	for	strncpy,	strcmp,	strlen
+#include	<string>
+#include	<iostream>
+#include	<sstream>
 
-#include "gp_view_plot_node.hh"
-#include "gp_version.hh"
-#include "gp_colors.hh"
+#include	"gp_view_plot_node.hh"
+#include	"gp_version.hh"
+#include	"gp_colors.hh"
 
-// CLASS VARIABLE INITIALIZATION
-int GPViewPlotNode::instance_count = 0;
+//	CLASS	VARIABLE	INITIALIZATION
+int	GPViewPlotNode::instance_count	=	0;
 
 
-// DESTRUCTOR
-GPViewPlotNode::~GPViewPlotNode() {
+//	DESTRUCTOR
+GPViewPlotNode::~GPViewPlotNode()	{
 
 }
 
 
-// CONSTRUCTOR
-GPViewPlotNode::GPViewPlotNode( Widget           Toplevel,
-                                DPV_TextBuffer * Textbuf,
-                                DPC_plot       * Plot,
-                                int              Plot_number ) {
-
-    const char *separator = "#------------------------------------------------\n";
-    const char *new_section = "\n\n";
-
-    //! Plot info is taken from file: '/tmp/DP_*.xml'
-    plot = Plot;
-    toplevel = Toplevel;
-    textbuf = Textbuf;
-
-    /*!
-     * Append to the gnuplot file with Plot setup and option commands
-     */
-    textbuf->print("\n");
-    textbuf->print("%s", new_section);
-    textbuf->print("%s", separator);
-    textbuf->print("# Plot %d\n", instance_count+1);
-    textbuf->print("%s", separator);
-
-    //! Plot origins. These will be populated by the Page's finalize method.
-    textbuf->print("plot_origin_x_%d = <PLOT_ORIGIN_X_%d> \n",
-                Plot_number, Plot_number);
-    textbuf->print("plot_origin_y_%d = <PLOT_ORIGIN_Y_%d> \n",
-                Plot_number, Plot_number);
-    textbuf->print("set origin plot_origin_x_%d, plot_origin_y_%d\n",
-                Plot_number, Plot_number);
-
-    textbuf->print("set size <PLOT_SIZE_SPEC> \n");
-
-    textbuf->print("<PLOT_KEY_SPEC>"); // key is the legend
-
-    if ( GnuplotVersion() >= 4.2 ) {
-        textbuf->print("set title \"<PLOT_TITLE>\" offset plot_title_xpos, plot_title_ypos <PLOT_FONT_SPEC> <PLOT_TEXT_COLOR_SPEC>\n");
-        textbuf->print("set xlabel \"<PLOT_X_AXIS_LABEL>\" offset x_axis_label_xpos, x_axis_label_ypos <PLOT_FONT_SPEC> <PLOT_TEXT_COLOR_SPEC>\n");
-        textbuf->print("set ylabel \"<PLOT_Y_AXIS_LABEL>\" offset y_axis_label_xpos, y_axis_label_ypos <PLOT_FONT_SPEC> <PLOT_TEXT_COLOR_SPEC>\n");
-    } else {
-        textbuf->print("set title \"<PLOT_TITLE>\" plot_title_xpos, plot_title_ypos <PLOT_FONT_SPEC> \n");
-        textbuf->print("set xlabel \"<PLOT_X_AXIS_LABEL>\" x_axis_label_xpos, x_axis_label_ypos <PLOT_FONT_SPEC> \n");
-        textbuf->print("set ylabel \"<PLOT_Y_AXIS_LABEL>\" y_axis_label_xpos, y_axis_label_ypos <PLOT_FONT_SPEC> \n");
-    }
-
-    /*!
-     * OPTIONAL PLOT SETTINGS
-     */
-    if ( GnuplotVersion() >= 4.0 ) {
-        textbuf->print("<PLOT_X_AXIS_SCALING_SPEC>");
-        textbuf->print("<PLOT_Y_AXIS_SCALING_SPEC>");
-    }
-    textbuf->print("<PLOT_Y_AXIS_FORMAT_SPEC>");
-    textbuf->print("<PLOT_FOREGROUND_SPEC>");
-    textbuf->print("<PLOT_BACKGROUND_SPEC>");
-    textbuf->print("<PLOT_GRID_SPEC> <PLOT_GRID_COLOR_SPEC>\n");
-
-    /*!
-     * PLOTTING:
-     * There are three `gnuplot` commands which actually create a plot: `plot`,
-     * `splot` and `replot`.  `plot` generates 2-d plots, `splot` generates 3-d
-     * plots (actually 2-d projections, of course), and `replot` appends its
-     * arguments to the previous `plot` or `splot` and executes the modified
-     * command.
-     */
-    textbuf->print("plot ");
-
-    instance_count ++;
+//	CONSTRUCTOR
+GPViewPlotNode::GPViewPlotNode(	Widget											Toplevel,
+																																DPV_TextBuffer	*	Textbuf,
+																																DPC_plot							*	Plot,
+																																int														Plot_number	)	{
+
+				const	char	*separator	=	"#------------------------------------------------\n";
+				const	char	*new_section	=	"\n\n";
+
+				//!	Plot	info	is	taken	from	file:	'/tmp/DP_*.xml'
+				plot	=	Plot;
+				toplevel	=	Toplevel;
+				textbuf	=	Textbuf;
+
+				/*!
+					*	Append	to	the	gnuplot	file	with	Plot	setup	and	option	commands
+					*/
+				textbuf->print("\n");
+				textbuf->print("%s",	new_section);
+				textbuf->print("%s",	separator);
+				textbuf->print("#	Plot	%d\n",	instance_count+1);
+				textbuf->print("%s",	separator);
+
+				//!	Plot	origins.	These	will	be	populated	by	the	Page's	finalize	method.
+				textbuf->print("plot_origin_x_%d	=	<PLOT_ORIGIN_X_%d>	\n",
+																Plot_number,	Plot_number);
+				textbuf->print("plot_origin_y_%d	=	<PLOT_ORIGIN_Y_%d>	\n",
+																Plot_number,	Plot_number);
+				textbuf->print("set	origin	plot_origin_x_%d,	plot_origin_y_%d\n",
+																Plot_number,	Plot_number);
+
+				textbuf->print("set	size	<PLOT_SIZE_SPEC>	\n");
+
+				textbuf->print("<PLOT_KEY_SPEC>");	//	key	is	the	legend
+
+				if	(	GnuplotVersion()	>=	4.2	)	{
+								textbuf->print("set	title	\"<PLOT_TITLE>\"	offset	plot_title_xpos,	plot_title_ypos	<PLOT_FONT_SPEC>	<PLOT_TEXT_COLOR_SPEC>\n");
+								textbuf->print("set	xlabel	\"<PLOT_X_AXIS_LABEL>\"	offset	x_axis_label_xpos,	x_axis_label_ypos	<PLOT_FONT_SPEC>	<PLOT_TEXT_COLOR_SPEC>\n");
+								textbuf->print("set	ylabel	\"<PLOT_Y_AXIS_LABEL>\"	offset	y_axis_label_xpos,	y_axis_label_ypos	<PLOT_FONT_SPEC>	<PLOT_TEXT_COLOR_SPEC>\n");
+				}	else	{
+								textbuf->print("set	title	\"<PLOT_TITLE>\"	plot_title_xpos,	plot_title_ypos	<PLOT_FONT_SPEC>	\n");
+								textbuf->print("set	xlabel	\"<PLOT_X_AXIS_LABEL>\"	x_axis_label_xpos,	x_axis_label_ypos	<PLOT_FONT_SPEC>	\n");
+								textbuf->print("set	ylabel	\"<PLOT_Y_AXIS_LABEL>\"	y_axis_label_xpos,	y_axis_label_ypos	<PLOT_FONT_SPEC>	\n");
+				}
+
+				/*!
+					*	OPTIONAL	PLOT	SETTINGS
+					*/
+				if	(	GnuplotVersion()	>=	4.0	)	{
+								textbuf->print("<PLOT_X_AXIS_SCALING_SPEC>");
+								textbuf->print("<PLOT_Y_AXIS_SCALING_SPEC>");
+				}
+				textbuf->print("<PLOT_Y_AXIS_FORMAT_SPEC>");
+				textbuf->print("<PLOT_FOREGROUND_SPEC>");
+				textbuf->print("<PLOT_BACKGROUND_SPEC>");
+				textbuf->print("<PLOT_GRID_SPEC>	<PLOT_GRID_COLOR_SPEC>\n");
+
+				/*!
+					*	PLOTTING:
+					*	There	are	three	`gnuplot`	commands	which	actually	create	a	plot:	`plot`,
+					*	`splot`	and	`replot`.		`plot`	generates	2-d	plots,	`splot`	generates	3-d
+					*	plots	(actually	2-d	projections,	of	course),	and	`replot`	appends	its
+					*	arguments	to	the	previous	`plot`	or	`splot`	and	executes	the	modified
+					*	command.
+					*/
+				textbuf->print("plot	");
+
+				instance_count	++;
 }
 
-void GPViewPlotNode::finalize() {
-
-    std::string       plot_data_src_label;
-    std::string       plot_title;
-    std::string       plot_x_label;
-    std::string       plot_x_scale;
-    std::string       plot_x_min_rng;
-    std::string       plot_x_max_rng;
-    std::string       plot_y_label;
-    std::string       plot_y_units;
-    std::string       plot_y_format;
-    std::string       plot_y_scale;
-    std::string       plot_y_min_rng;
-    std::string       plot_y_max_rng;
-    std::string       plot_fg_color;
-    std::string       plot_bg_color;
-    std::string       show_grid;
-    std::string       grid_color;
-    std::string       plot_font;
-    int          n_curves;
-    std::stringstream tmp_stream;
-
-    //! Plot info is taken from file: '/tmp/DP_*.xml'
-    tmp_stream.str("");
-    tmp_stream << "Plot " << instance_count+1 ;
-
-    n_curves = plot->getNumCurves();
-
-    /**!
-     * WARNING: getAttribute() returns a const char *, which may be null.
-     *          Assigning a null pointer to a string will crash the plot.
-     *          So, check the return value before making the assignment.
-     */
-    plot_title      = (plot->getTitle()) ?  plot->getTitle() : tmp_stream.str();
-    plot_x_label    = plot->getXLabel();
-    plot_x_scale    = (plot->getAttribute("x_scale")) ?  plot->getAttribute("x_scale") : "";
-    plot_x_min_rng  = (plot->getAttribute("xmin")) ?  plot->getAttribute("xmin") : "";
-    plot_x_max_rng  = (plot->getAttribute("xmax")) ?  plot->getAttribute("xmax") : "";
-    plot_y_label    = plot->getYLabel();
-    plot_y_format   = (plot->getAttribute("format")) ?  plot->getAttribute("format") : "";
-    plot_y_scale    = (plot->getAttribute("y_scale")) ?  plot->getAttribute("y_scale") : "";
-    plot_y_min_rng  = (plot->getAttribute("ymin")) ?  plot->getAttribute("ymin") : "";
-    plot_y_max_rng  = (plot->getAttribute("ymax")) ?  plot->getAttribute("ymax") : "";
-    plot_fg_color   = (plot->getAttribute("foreground_color")) ?  plot->getAttribute("foreground_color") : "";
-    plot_bg_color   = (plot->getAttribute("background_color")) ?  plot->getAttribute("background_color") : "";
-    show_grid       = (plot->getAttribute("grid")) ?  plot->getAttribute("grid") : "";
-    grid_color      = (plot->getAttribute("grid_color")) ?  plot->getAttribute("grid_color") : "";
-    plot_font       = (plot->getAttribute("font")) ?  plot->getAttribute("font") : "";
-
-    if (n_curves == 1) {
-        plot_data_src_label = curve_node_list[0]->data_src_label;
-        if (!plot_data_src_label.empty()) {
-            /* Append SIM/RUN_ name to plot title */
-            plot_title.append("\\n" );  /* add a newline after Plot title */
-            plot_title.append("(" + plot_data_src_label + ")");
-        }
-    }
-
-    //! plot_width and plot_height values are assigned in the Page constructor.
-    textbuf->subst_g( "<PLOT_SIZE_SPEC>", "plot_width, plot_height") ;
-
-    if (n_curves > 10) {
-        // too many curves to have a legend
-        textbuf->subst_g( "<PLOT_KEY_SPEC>", "set key off \n" );
-    } else {
-        // use default page setting
-        textbuf->subst_g( "<PLOT_KEY_SPEC>", "<PAGE_KEY_SPEC>" );
-    }
-
-    //! Set the plot's TITLE.
-    plot_title.insert( 0, "\\n" );  /* add a newline between Page title */
-    textbuf->subst_g( "<PLOT_TITLE>", plot_title.c_str() );
-
-    //! Set the plot's X AXIS LABEL.
-    if ( ! plot_x_label.empty() ) {
-        textbuf->subst_g( "<PLOT_X_AXIS_LABEL>", plot_x_label.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_X_AXIS_LABEL>", "" );
-    }
-
-    //! Set the plot's X AXIS SCALING.
-    if ( plot_x_scale.compare("Log") == 0 ) {
-        textbuf->subst_g( "<PLOT_X_AXIS_SCALING_SPEC>", "set logscale x\n" );
-    } else {
-        textbuf->subst_g( "<PLOT_X_AXIS_SCALING_SPEC>", "<PAGE_X_AXIS_SCALING_SPEC>" );
-    }
-
-    //! Set the plot's X MIN RANGE.
-    if ( ! plot_x_min_rng.empty() ) {
-        textbuf->subst_g( "<PLOT_X_MIN_RNG>", plot_x_min_rng.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_X_MIN_RNG>", "" );  /* keep current range */
-    }
-
-    //! Set the plot's X MAX RANGE.
-    if ( ! plot_x_max_rng.empty() ) {
-        textbuf->subst_g( "<PLOT_X_MAX_RNG>", plot_x_max_rng.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_X_MAX_RNG>", "" );  /* keep current range */
-    }
-
-    //! Set the plot's Y AXIS LABEL.
-    if ( ! plot_y_label.empty() ) {
-        textbuf->subst_g( "<PLOT_Y_AXIS_LABEL>", plot_y_label.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_AXIS_LABEL>", "" );
-    }
-
-    //! Set the plot's Y AXIS UNITS.
-    if ( ! plot_y_units.empty() ) {
-        textbuf->subst_g( "<PLOT_Y_AXIS_UNITS>", plot_y_units.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_AXIS_UNITS>", "" );
-    }
-
-    //! Set the plot's Y AXIS FORMAT.
-    if ( ! plot_y_format.empty() ) {
-        tmp_stream.str("");
-        tmp_stream << "set format y \'" << plot_y_format << "\'\n" ;
-        textbuf->subst_g( "<PLOT_Y_AXIS_FORMAT_SPEC>", tmp_stream.str().c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_AXIS_FORMAT_SPEC>", "<PAGE_Y_AXIS_FORMAT_SPEC>" );
-    }
-
-    //! Set the plot's Y AXIS SCALING.
-    if ( plot_y_scale.compare("Log") == 0 ) {
-        textbuf->subst_g( "<PLOT_Y_AXIS_SCALING_SPEC>", "set logscale y\n" );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_AXIS_SCALING_SPEC>", "<PAGE_Y_AXIS_SCALING_SPEC>" );
-    }
-
-    //! Set the plot's Y MIN RANGE.
-    if ( ! plot_y_min_rng.empty() ) {
-        textbuf->subst_g( "<PLOT_Y_MIN_RNG>", plot_y_min_rng.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_MIN_RNG>", "" );  /* keep current range */
-    }
-
-    //! Set the plot's Y MAX RANGE.
-    if ( ! plot_y_max_rng.empty() ) {
-        textbuf->subst_g( "<PLOT_Y_MAX_RNG>", plot_y_max_rng.c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_Y_MAX_RNG>", "" );  /* keep current range */
-    }
-
-    /*!
-     * Set the plot's FOREGROUND COLOR.
-     * (Feature only available in Gnuplot version 4.2, or later.)
-     */
-    tmp_stream.str("");
-    if ( GnuplotVersion() < 4.2  ||  plot_fg_color.empty()  ||
-         !color_is_valid(&plot_fg_color) ) {
-        tmp_stream << "#" ; /* comment out the textcolor command */
-    }
-    tmp_stream << "textcolor rgb \"" << plot_fg_color << "\"" ;
-    textbuf->subst_g( "<PLOT_TEXT_COLOR_SPEC>", tmp_stream.str().c_str() );
-    textbuf->subst_g( "<PLOT_FOREGROUND_SPEC>", "<PAGE_FOREGROUND_SPEC>" );
-
-    /*!
-     * Set the plot's BACKGROUND COLOR.
-     * (Feature only available in Gnuplot version 4.2, or later.)
-     */
-    if ( GnuplotVersion() >= 4.2 ) {
-        tmp_stream.str("");
-        tmp_stream << "set object 1 rect default; ";
-        tmp_stream << "unset object 1 #Clear previous plot background color" << std::endl;
-        if ( ! plot_bg_color.empty()  &&  color_is_valid(&plot_bg_color) ) {
-            tmp_stream << "set object 1 rectangle";
-            tmp_stream << " from graph 0, graph 0 to graph 1, graph 1 behind" << std::endl;
-            tmp_stream << "set object 1 rectangle";
-            tmp_stream << " fc rgb \"" << plot_bg_color << "\"" << std::endl;
-            textbuf->subst_g( "<PLOT_BACKGROUND_SPEC>", tmp_stream.str().c_str() );
-        } else {
-            textbuf->subst_g( "<PLOT_BACKGROUND_SPEC>", tmp_stream.str().c_str() );
-        }
-    } else {
-            textbuf->subst_g( "<PLOT_BACKGROUND_SPEC>", "<PAGE_BACKGROUND_SPEC>" );
-    }
-
-    //! Enable/Disable Grid.
-    if ( show_grid.compare("No") == 0 ) {
-        textbuf->subst_g( "<PLOT_GRID_SPEC>", "unset grid" );
-        textbuf->subst_g( "<PLOT_GRID_COLOR_SPEC>", "" );
-    } else {
-        textbuf->subst_g( "<PLOT_GRID_SPEC>", "<PAGE_GRID_SPEC>" );
-
-        /*!
-         * Set the plot's GRID COLOR.
-         * (Feature only available in Gnuplot version 4.2, or later.)
-         */
-        if ( GnuplotVersion() >= 4.2  &&
-             ! grid_color.empty()  &&  color_is_valid(&grid_color) ) {
-            tmp_stream.str("");
-            tmp_stream << "linecolor rgb \"" << grid_color << "\"" ;
-            //! Also change border color to match grid color
-            tmp_stream << "\nset border linecolor rgb \"" << grid_color << "\"" ;
-            textbuf->subst_g( "<PLOT_GRID_COLOR_SPEC>", tmp_stream.str().c_str() );
-        } else {
-            textbuf->subst_g( "<PLOT_GRID_COLOR_SPEC>", "<PAGE_GRID_COLOR_SPEC>" );
-        }
-    }
-
-    //! Set the plot's FONT.
-    if ( ! plot_font.empty() ) {
-        tmp_stream.str("");
-        //! insert a backslash(\), newline & indent 4 spaces
-        tmp_stream << "\\\n    font \"" << plot_font << "\"" ;
-        textbuf->subst_g( "<PLOT_FONT_SPEC>", tmp_stream.str().c_str() );
-    } else {
-        textbuf->subst_g( "<PLOT_FONT_SPEC>", "<PAGE_FONT_SPEC>" );
-    }
+void	GPViewPlotNode::finalize()	{
+
+				std::string							plot_data_src_label;
+				std::string							plot_title;
+				std::string							plot_x_label;
+				std::string							plot_x_scale;
+				std::string							plot_x_min_rng;
+				std::string							plot_x_max_rng;
+				std::string							plot_y_label;
+				std::string							plot_y_units;
+				std::string							plot_y_format;
+				std::string							plot_y_scale;
+				std::string							plot_y_min_rng;
+				std::string							plot_y_max_rng;
+				std::string							plot_fg_color;
+				std::string							plot_bg_color;
+				std::string							show_grid;
+				std::string							grid_color;
+				std::string							plot_font;
+				int										n_curves;
+				std::stringstream	tmp_stream;
+
+				//!	Plot	info	is	taken	from	file:	'/tmp/DP_*.xml'
+				tmp_stream.str("");
+				tmp_stream	<<	"Plot	"	<<	instance_count+1	;
+
+				n_curves	=	plot->getNumCurves();
+
+				/**!
+					*	WARNING:	getAttribute()	returns	a	const	char	*,	which	may	be	null.
+					*										Assigning	a	null	pointer	to	a	string	will	crash	the	plot.
+					*										So,	check	the	return	value	before	making	the	assignment.
+					*/
+				plot_title						=	(plot->getTitle())	?		plot->getTitle()	:	tmp_stream.str();
+				plot_x_label				=	plot->getXLabel();
+				plot_x_scale				=	(plot->getAttribute("x_scale"))	?		plot->getAttribute("x_scale")	:	"";
+				plot_x_min_rng		=	(plot->getAttribute("xmin"))	?		plot->getAttribute("xmin")	:	"";
+				plot_x_max_rng		=	(plot->getAttribute("xmax"))	?		plot->getAttribute("xmax")	:	"";
+				plot_y_label				=	plot->getYLabel();
+				plot_y_format			=	(plot->getAttribute("format"))	?		plot->getAttribute("format")	:	"";
+				plot_y_scale				=	(plot->getAttribute("y_scale"))	?		plot->getAttribute("y_scale")	:	"";
+				plot_y_min_rng		=	(plot->getAttribute("ymin"))	?		plot->getAttribute("ymin")	:	"";
+				plot_y_max_rng		=	(plot->getAttribute("ymax"))	?		plot->getAttribute("ymax")	:	"";
+				plot_fg_color			=	(plot->getAttribute("foreground_color"))	?		plot->getAttribute("foreground_color")	:	"";
+				plot_bg_color			=	(plot->getAttribute("background_color"))	?		plot->getAttribute("background_color")	:	"";
+				show_grid							=	(plot->getAttribute("grid"))	?		plot->getAttribute("grid")	:	"";
+				grid_color						=	(plot->getAttribute("grid_color"))	?		plot->getAttribute("grid_color")	:	"";
+				plot_font							=	(plot->getAttribute("font"))	?		plot->getAttribute("font")	:	"";
+
+				if	(n_curves	==	1)	{
+								plot_data_src_label	=	curve_node_list[0]->data_src_label;
+								if	(!plot_data_src_label.empty())	{
+												/*	Append	SIM/RUN_	name	to	plot	title	*/
+												plot_title.append("\\n"	);		/*	add	a	newline	after	Plot	title	*/
+												plot_title.append("("	+	plot_data_src_label	+	")");
+								}
+				}
+
+				//!	plot_width	and	plot_height	values	are	assigned	in	the	Page	constructor.
+				textbuf->subst_g(	"<PLOT_SIZE_SPEC>",	"plot_width,	plot_height")	;
+
+				if	(n_curves	>	10)	{
+								//	too	many	curves	to	have	a	legend
+								textbuf->subst_g(	"<PLOT_KEY_SPEC>",	"set	key	off	\n"	);
+				}	else	{
+								//	use	default	page	setting
+								textbuf->subst_g(	"<PLOT_KEY_SPEC>",	"<PAGE_KEY_SPEC>"	);
+				}
+
+				//!	Set	the	plot's	TITLE.
+				plot_title.insert(	0,	"\\n"	);		/*	add	a	newline	between	Page	title	*/
+				textbuf->subst_g(	"<PLOT_TITLE>",	plot_title.c_str()	);
+
+				//!	Set	the	plot's	X	AXIS	LABEL.
+				if	(	!	plot_x_label.empty()	)	{
+								textbuf->subst_g(	"<PLOT_X_AXIS_LABEL>",	plot_x_label.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_X_AXIS_LABEL>",	""	);
+				}
+
+				//!	Set	the	plot's	X	AXIS	SCALING.
+				if	(	plot_x_scale.compare("Log")	==	0	)	{
+								textbuf->subst_g(	"<PLOT_X_AXIS_SCALING_SPEC>",	"set	logscale	x\n"	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_X_AXIS_SCALING_SPEC>",	"<PAGE_X_AXIS_SCALING_SPEC>"	);
+				}
+
+				//!	Set	the	plot's	X	MIN	RANGE.
+				if	(	!	plot_x_min_rng.empty()	)	{
+								textbuf->subst_g(	"<PLOT_X_MIN_RNG>",	plot_x_min_rng.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_X_MIN_RNG>",	""	);		/*	keep	current	range	*/
+				}
+
+				//!	Set	the	plot's	X	MAX	RANGE.
+				if	(	!	plot_x_max_rng.empty()	)	{
+								textbuf->subst_g(	"<PLOT_X_MAX_RNG>",	plot_x_max_rng.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_X_MAX_RNG>",	""	);		/*	keep	current	range	*/
+				}
+
+				//!	Set	the	plot's	Y	AXIS	LABEL.
+				if	(	!	plot_y_label.empty()	)	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_LABEL>",	plot_y_label.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_LABEL>",	""	);
+				}
+
+				//!	Set	the	plot's	Y	AXIS	UNITS.
+				if	(	!	plot_y_units.empty()	)	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_UNITS>",	plot_y_units.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_UNITS>",	""	);
+				}
+
+				//!	Set	the	plot's	Y	AXIS	FORMAT.
+				if	(	!	plot_y_format.empty()	)	{
+								tmp_stream.str("");
+								tmp_stream	<<	"set	format	y	\'"	<<	plot_y_format	<<	"\'\n"	;
+								textbuf->subst_g(	"<PLOT_Y_AXIS_FORMAT_SPEC>",	tmp_stream.str().c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_FORMAT_SPEC>",	"<PAGE_Y_AXIS_FORMAT_SPEC>"	);
+				}
+
+				//!	Set	the	plot's	Y	AXIS	SCALING.
+				if	(	plot_y_scale.compare("Log")	==	0	)	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_SCALING_SPEC>",	"set	logscale	y\n"	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_AXIS_SCALING_SPEC>",	"<PAGE_Y_AXIS_SCALING_SPEC>"	);
+				}
+
+				//!	Set	the	plot's	Y	MIN	RANGE.
+				if	(	!	plot_y_min_rng.empty()	)	{
+								textbuf->subst_g(	"<PLOT_Y_MIN_RNG>",	plot_y_min_rng.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_MIN_RNG>",	""	);		/*	keep	current	range	*/
+				}
+
+				//!	Set	the	plot's	Y	MAX	RANGE.
+				if	(	!	plot_y_max_rng.empty()	)	{
+								textbuf->subst_g(	"<PLOT_Y_MAX_RNG>",	plot_y_max_rng.c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_Y_MAX_RNG>",	""	);		/*	keep	current	range	*/
+				}
+
+				/*!
+					*	Set	the	plot's	FOREGROUND	COLOR.
+					*	(Feature	only	available	in	Gnuplot	version	4.2,	or	later.)
+					*/
+				tmp_stream.str("");
+				if	(	GnuplotVersion()	<	4.2		||		plot_fg_color.empty()		||
+									!color_is_valid(&plot_fg_color)	)	{
+								tmp_stream	<<	"#"	;	/*	comment	out	the	textcolor	command	*/
+				}
+				tmp_stream	<<	"textcolor	rgb	\""	<<	plot_fg_color	<<	"\""	;
+				textbuf->subst_g(	"<PLOT_TEXT_COLOR_SPEC>",	tmp_stream.str().c_str()	);
+				textbuf->subst_g(	"<PLOT_FOREGROUND_SPEC>",	"<PAGE_FOREGROUND_SPEC>"	);
+
+				/*!
+					*	Set	the	plot's	BACKGROUND	COLOR.
+					*	(Feature	only	available	in	Gnuplot	version	4.2,	or	later.)
+					*/
+				if	(	GnuplotVersion()	>=	4.2	)	{
+								tmp_stream.str("");
+								tmp_stream	<<	"set	object	1	rect	default;	";
+								tmp_stream	<<	"unset	object	1	#Clear	previous	plot	background	color"	<<	std::endl;
+								if	(	!	plot_bg_color.empty()		&&		color_is_valid(&plot_bg_color)	)	{
+												tmp_stream	<<	"set	object	1	rectangle";
+												tmp_stream	<<	"	from	graph	0,	graph	0	to	graph	1,	graph	1	behind"	<<	std::endl;
+												tmp_stream	<<	"set	object	1	rectangle";
+												tmp_stream	<<	"	fc	rgb	\""	<<	plot_bg_color	<<	"\""	<<	std::endl;
+												textbuf->subst_g(	"<PLOT_BACKGROUND_SPEC>",	tmp_stream.str().c_str()	);
+								}	else	{
+												textbuf->subst_g(	"<PLOT_BACKGROUND_SPEC>",	tmp_stream.str().c_str()	);
+								}
+				}	else	{
+												textbuf->subst_g(	"<PLOT_BACKGROUND_SPEC>",	"<PAGE_BACKGROUND_SPEC>"	);
+				}
+
+				//!	Enable/Disable	Grid.
+				if	(	show_grid.compare("No")	==	0	)	{
+								textbuf->subst_g(	"<PLOT_GRID_SPEC>",	"unset	grid"	);
+								textbuf->subst_g(	"<PLOT_GRID_COLOR_SPEC>",	""	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_GRID_SPEC>",	"<PAGE_GRID_SPEC>"	);
+
+								/*!
+									*	Set	the	plot's	GRID	COLOR.
+									*	(Feature	only	available	in	Gnuplot	version	4.2,	or	later.)
+									*/
+								if	(	GnuplotVersion()	>=	4.2		&&
+													!	grid_color.empty()		&&		color_is_valid(&grid_color)	)	{
+												tmp_stream.str("");
+												tmp_stream	<<	"linecolor	rgb	\""	<<	grid_color	<<	"\""	;
+												//!	Also	change	border	color	to	match	grid	color
+												tmp_stream	<<	"\nset	border	linecolor	rgb	\""	<<	grid_color	<<	"\""	;
+												textbuf->subst_g(	"<PLOT_GRID_COLOR_SPEC>",	tmp_stream.str().c_str()	);
+								}	else	{
+												textbuf->subst_g(	"<PLOT_GRID_COLOR_SPEC>",	"<PAGE_GRID_COLOR_SPEC>"	);
+								}
+				}
+
+				//!	Set	the	plot's	FONT.
+				if	(	!	plot_font.empty()	)	{
+								tmp_stream.str("");
+								//!	insert	a	backslash(\),	newline	&	indent	4	spaces
+								tmp_stream	<<	"\\\n				font	\""	<<	plot_font	<<	"\""	;
+								textbuf->subst_g(	"<PLOT_FONT_SPEC>",	tmp_stream.str().c_str()	);
+				}	else	{
+								textbuf->subst_g(	"<PLOT_FONT_SPEC>",	"<PAGE_FONT_SPEC>"	);
+				}
 
 }
 
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_product_node.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_product_node.cpp
index cb060a8ac..de2adab56 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_product_node.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_view_product_node.cpp
@@ -1,28 +1,28 @@
 
-#include "gp_view_product_node.hh"
+#include	"gp_view_product_node.hh"
 
 
-GPViewProductNode::GPViewProductNode(Widget Toplevel, DPC_product* Product) {
+GPViewProductNode::GPViewProductNode(Widget	Toplevel,	DPC_product*	Product)	{
 
-    product = Product;
-    toplevel = Toplevel;
+				product	=	Product;
+				toplevel	=	Toplevel;
 }
 
 
 //DESTRUCTOR
-GPViewProductNode::~GPViewProductNode() {
+GPViewProductNode::~GPViewProductNode()	{
 
-    #ifdef DEBUG
-    cout << "GPViewProductNode DESTRUCTOR." << endl;
-    #endif
+				#ifdef	DEBUG
+				cout	<<	"GPViewProductNode	DESTRUCTOR."	<<	endl;
+				#endif
 
-    GPViewPageNode  *page_view_node;
-    int n,i;
+				GPViewPageNode		*page_view_node;
+				int	n,i;
 
-    n = (int)page_node_list.size();
-    for (i=0 ; i<n; i++ ) {
-        page_view_node = page_node_list[i];
-        delete page_view_node;
-    }
+				n	=	(int)page_node_list.size();
+				for	(i=0	;	i<n;	i++	)	{
+								page_view_node	=	page_node_list[i];
+								delete	page_view_node;
+				}
 
 }
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
index c65c48570..8ae71a0bf 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/gxplot.cpp
@@ -1,159 +1,159 @@
 
-#include <stdio.h>
-#include <string.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#include	<stdio.h>
+#include	<string.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
 
-#include "DPC/DPC_product.hh"
-#include "DPM/DPM_parse_tree.hh"
-#include "DPM/DPM_session.hh"
-#include "gp_view.hh"
+#include	"DPC/DPC_product.hh"
+#include	"DPM/DPM_parse_tree.hh"
+#include	"DPM/DPM_session.hh"
+#include	"gp_view.hh"
 
 
-int eqp_errno; // to satisfy libeqparse.a
+int	eqp_errno;	//	to	satisfy	libeqparse.a
 
-Widget toplevel;
-gnuplot_view *view;
-vector <DPC_product*> product_list;
+Widget	toplevel;
+gnuplot_view	*view;
+vector	<DPC_product*>	product_list;
 
 
-int file_exists(const char *fname) {
+int	file_exists(const	char	*fname)	{
 
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-        fclose(fp);
-        return(1);
-    } else {
-        return(0);
-    }
+				FILE	*fp	=	fopen(fname,"r");
+				if	(fp)	{
+								fclose(fp);
+								return(1);
+				}	else	{
+								return(0);
+				}
 }
 
-void copy_prefix(char *dest, const char* src) {
+void	copy_prefix(char	*dest,	const	char*	src)	{
 
-   size_t prefix_len;
-   char *base;
+			size_t	prefix_len;
+			char	*base;
 
-   if ((base = (char *)strrchr( src,'/')) != NULL ) {
-       prefix_len = strlen(src) - strlen(base);
-       strncpy(dest, src, prefix_len);
-       dest[prefix_len] = '\0';
-   } else {
-       dest[0] = '\0';
-   }
+			if	((base	=	(char	*)strrchr(	src,'/'))	!=	NULL	)	{
+							prefix_len	=	strlen(src)	-	strlen(base);
+							strncpy(dest,	src,	prefix_len);
+							dest[prefix_len]	=	'\0';
+			}	else	{
+							dest[0]	=	'\0';
+			}
 }
 
-int main(int argc, char * argv[] ) {
+int	main(int	argc,	char	*	argv[]	)	{
 
-    XtAppContext app;
+				XtAppContext	app;
 
-    DPM_parse_tree *session_parse_tree;
-    xmlNode *root_node;
-    DPM_session *session;
+				DPM_parse_tree	*session_parse_tree;
+				xmlNode	*root_node;
+				DPM_session	*session;
 
-    int n_product_files;
-    int n_products;
-    int product_ix;
-    char *session_file_name;
+				int	n_product_files;
+				int	n_products;
+				int	product_ix;
+				char	*session_file_name;
 
 
-    if (argc < 2) {
-        cerr << "ERROR: No session file specified." << endl;
-        exit(0);
-    }
+				if	(argc	<	2)	{
+								cerr	<<	"ERROR:	No	session	file	specified."	<<	endl;
+								exit(0);
+				}
 
-    session_file_name = argv[1];
+				session_file_name	=	argv[1];
 
-    toplevel = XtVaAppInitialize ( &app, "Gxplot", NULL, 0, &argc, argv, NULL, NULL );
+				toplevel	=	XtVaAppInitialize	(	&app,	"Gxplot",	NULL,	0,	&argc,	argv,	NULL,	NULL	);
 
-    view = new gnuplot_view(toplevel);
+				view	=	new	gnuplot_view(toplevel);
 
 
-    //Make a DPM_session parse tree
-    try {
-        session_parse_tree = new DPM_parse_tree(session_file_name);
-    }
-    catch (std::invalid_argument) {
-        cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
-        exit(1);
-    }
+				//Make	a	DPM_session	parse	tree
+				try	{
+								session_parse_tree	=	new	DPM_parse_tree(session_file_name);
+				}
+				catch	(std::invalid_argument)	{
+								cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	endl;
+								exit(1);
+				}
 
-    root_node = session_parse_tree->getRootNode();
+				root_node	=	session_parse_tree->getRootNode();
 
-    //Make a DPM_session object
-    try {
-        session = new DPM_session( NULL, root_node);
-    }
-    catch (std::invalid_argument) {
-        cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
-        exit(1);
-    }
+				//Make	a	DPM_session	object
+				try	{
+								session	=	new	DPM_session(	NULL,	root_node);
+				}
+				catch	(std::invalid_argument)	{
+								cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	endl;
+								exit(1);
+				}
 
-    delete session_parse_tree;
+				delete	session_parse_tree;
 
 
 
-    n_product_files = (int)session->product_file_list.size();
+				n_product_files	=	(int)session->product_file_list.size();
 
-    for (product_ix = 0; product_ix < n_product_files; product_ix++ ) {
+				for	(product_ix	=	0;	product_ix	<	n_product_files;	product_ix++	)	{
 
-        DPC_product *product;
+								DPC_product	*product;
 
-        char product_file_fullname[1024];
+								char	product_file_fullname[1024];
 
-        const char *product_file_name = session->product_file_list[product_ix];
+								const	char	*product_file_name	=	session->product_file_list[product_ix];
 
 
-        if (file_exists( product_file_name)) {
+								if	(file_exists(	product_file_name))	{
 
-             strcpy(product_file_fullname, product_file_name );
-        }
-        else {
+													strcpy(product_file_fullname,	product_file_name	);
+								}
+								else	{
 
-             copy_prefix(product_file_fullname, session_file_name);
-             strcat(product_file_fullname, "/");
-             strcat(product_file_fullname, product_file_name);
-        }
+													copy_prefix(product_file_fullname,	session_file_name);
+													strcat(product_file_fullname,	"/");
+													strcat(product_file_fullname,	product_file_name);
+								}
 
-        try {
+								try	{
 
-            product = new DPC_product( session, product_file_fullname);
-        }
-        catch  (std::invalid_argument) {
+												product	=	new	DPC_product(	session,	product_file_fullname);
+								}
+								catch		(std::invalid_argument)	{
 
-            cerr << "ERROR: Unable to create the product specified by file: \"" << product_file_name << "\"" << endl;
-            product = NULL;
-        }
+												cerr	<<	"ERROR:	Unable	to	create	the	product	specified	by	file:	\""	<<	product_file_name	<<	"\""	<<	endl;
+												product	=	NULL;
+								}
 
-        if ( product != NULL ) {
+								if	(	product	!=	NULL	)	{
 
-            product_list.push_back( product );
-            product->render( view );
-        }
-    }
+												product_list.push_back(	product	);
+												product->render(	view	);
+								}
+				}
 
 
-    n_products = (int)product_list.size();
+				n_products	=	(int)product_list.size();
 
-    for ( product_ix = 0; product_ix < n_products; product_ix++ ) {
+				for	(	product_ix	=	0;	product_ix	<	n_products;	product_ix++	)	{
 
-        DPC_product *product;
-        product = product_list[product_ix];
-        product->notify( view, gnuplot_view::DATA_UPDATE );
-    }
+								DPC_product	*product;
+								product	=	product_list[product_ix];
+								product->notify(	view,	gnuplot_view::DATA_UPDATE	);
+				}
 
 
-    // Delete the view and all of the viewable stuff that it created.
-    delete view;
+				//	Delete	the	view	and	all	of	the	viewable	stuff	that	it	created.
+				delete	view;
 
-    // Delete the list of DPC_product objects
-    n_products = (int)product_list.size();
+				//	Delete	the	list	of	DPC_product	objects
+				n_products	=	(int)product_list.size();
 
-    for (product_ix = 0; product_ix < n_products; product_ix++ ) {
+				for	(product_ix	=	0;	product_ix	<	n_products;	product_ix++	)	{
 
-        DPC_product *product;
-        product = product_list[product_ix];
-        delete product;
-    }
+								DPC_product	*product;
+								product	=	product_list[product_ix];
+								delete	product;
+				}
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp b/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
index a04a2432c..3bbbce9e5 100644
--- a/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_TimeCstrDataStream.cpp
@@ -1,103 +1,103 @@
 
-// NOTES:
-// Both the current and next time/value pair in a DataStream are kept
-// track of in this code. eos (end-of-stream) is an int array representing
-// whether or not the current/next pair exist.
-// 0 - exists
-// 1 - does not exist
+//	NOTES:
+//	Both	the	current	and	next	time/value	pair	in	a	DataStream	are	kept
+//	track	of	in	this	code.	eos	(end-of-stream)	is	an	int	array	representing
+//	whether	or	not	the	current/next	pair	exist.
+//	0	-	exists
+//	1	-	does	not	exist
 //
-// !bix: index of the current time/value pair
-// bix: index of the next time/value pair
+//	!bix:	index	of	the	current	time/value	pair
+//	bix:	index	of	the	next	time/value	pair
 //
-// This holds in every function until bix values are switched
-// 		bix = !bix
-
-#include "DPC/DPC_TimeCstrDataStream.hh"
-
-// CONSTRUCTOR
-DPC_TimeCstrDataStream::DPC_TimeCstrDataStream(DataStream* in_ds,
-                           DPM_time_constraints *time_constraints ) {
-  this->tstart = time_constraints->getStart();
-  this->tstop  = time_constraints->getStop();
-  this->period = time_constraints->getPeriod();
-
-  this->ds = in_ds;
-  this->bix = 0;
-  this->eos[0] = 0;
-  this->eos[1] = 0;
-  this->begin();
+//	This	holds	in	every	function	until	bix	values	are	switched
+//			bix	=	!bix
+
+#include	"DPC/DPC_TimeCstrDataStream.hh"
+
+//	CONSTRUCTOR
+DPC_TimeCstrDataStream::DPC_TimeCstrDataStream(DataStream*	in_ds,
+																											DPM_time_constraints	*time_constraints	)	{
+		this->tstart	=	time_constraints->getStart();
+		this->tstop		=	time_constraints->getStop();
+		this->period	=	time_constraints->getPeriod();
+
+		this->ds	=	in_ds;
+		this->bix	=	0;
+		this->eos[0]	=	0;
+		this->eos[1]	=	0;
+		this->begin();
 }
 
-// DESTRUCTOR
-DPC_TimeCstrDataStream::~DPC_TimeCstrDataStream() {
-  if (ds) delete ds;
+//	DESTRUCTOR
+DPC_TimeCstrDataStream::~DPC_TimeCstrDataStream()	{
+		if	(ds)	delete	ds;
 }
 
-// MEMBER FUNCTION
-int DPC_TimeCstrDataStream::get(double* timestamp, double* paramValue) {
+//	MEMBER	FUNCTION
+int	DPC_TimeCstrDataStream::get(double*	timestamp,	double*	paramValue)	{
 
-  step();
-  *timestamp = time[bix];
-  *paramValue = value[bix];
+		step();
+		*timestamp	=	time[bix];
+		*paramValue	=	value[bix];
 
-  if (eos[!bix]) return (0);
-  return (1);
+		if	(eos[!bix])	return	(0);
+		return	(1);
 }
 
-// MEMBER FUNCTION
-// Original: return -1 if no value, return 0 if value
-// New:		 return  0 if no value, return 1 if value
-int DPC_TimeCstrDataStream::peek(double* timestamp, double* paramValue) {
+//	MEMBER	FUNCTION
+//	Original:	return	-1	if	no	value,	return	0	if	value
+//	New:			return		0	if	no	value,	return	1	if	value
+int	DPC_TimeCstrDataStream::peek(double*	timestamp,	double*	paramValue)	{
 
-  if (eos[!bix]) return (0);
+		if	(eos[!bix])	return	(0);
 
-  *timestamp = time[!bix];
-  *paramValue = value[!bix];
+		*timestamp	=	time[!bix];
+		*paramValue	=	value[!bix];
 
-  return(1);
+		return(1);
 }
 
-// MEMBER FUNCTION
-std::string DPC_TimeCstrDataStream::getFileName() {
-  return ds->getFileName();
+//	MEMBER	FUNCTION
+std::string	DPC_TimeCstrDataStream::getFileName()	{
+		return	ds->getFileName();
 }
 
-// MEMBER FUNCTION
-std::string DPC_TimeCstrDataStream::getUnit() {
-  return ds->getUnit();
+//	MEMBER	FUNCTION
+std::string	DPC_TimeCstrDataStream::getUnit()	{
+		return	ds->getUnit();
 }
 
-// MEMBER FUNCTION
-std::string DPC_TimeCstrDataStream::getTimeUnit() {
-  return ds->getTimeUnit();
+//	MEMBER	FUNCTION
+std::string	DPC_TimeCstrDataStream::getTimeUnit()	{
+		return	ds->getTimeUnit();
 }
 
-// MEMBER FUNCTION
-void DPC_TimeCstrDataStream::begin() {
+//	MEMBER	FUNCTION
+void	DPC_TimeCstrDataStream::begin()	{
 
-  bix = 0;
-  eos[0] = 0;
-  eos[1] = 0;
-  ds->begin();
-  step();
+		bix	=	0;
+		eos[0]	=	0;
+		eos[1]	=	0;
+		ds->begin();
+		step();
 }
 
-// MEMBER FUNCTION
-int DPC_TimeCstrDataStream::end() {
-  if (eos[!bix]) return (1);
-  return(0);
+//	MEMBER	FUNCTION
+int	DPC_TimeCstrDataStream::end()	{
+		if	(eos[!bix])	return	(1);
+		return(0);
 }
 
-// MEMBER FUNCTION
-int DPC_TimeCstrDataStream::step() {
-
-  if (eos[!bix]) return (0);
-  do {
-    if (! ds->get(&time[bix], &value[bix])) {
-      eos[bix] = 1;
-    }
-    // times in log file may not be sequential
-  } while ((!eos[bix]) && ((time[bix] < tstart) || (time[bix] > tstop)) );
-  bix = !bix;
-  return (1);
+//	MEMBER	FUNCTION
+int	DPC_TimeCstrDataStream::step()	{
+
+		if	(eos[!bix])	return	(0);
+		do	{
+				if	(!	ds->get(&time[bix],	&value[bix]))	{
+						eos[bix]	=	1;
+				}
+				//	times	in	log	file	may	not	be	sequential
+		}	while	((!eos[bix])	&&	((time[bix]	<	tstart)	||	(time[bix]	>	tstop))	);
+		bix	=	!bix;
+		return	(1);
 }
diff --git a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
index a339632d6..b2d167f60 100644
--- a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp
@@ -1,154 +1,154 @@
 
-#include <string.h>
-#include <udunits2.h>
-#include "DPC/DPC_UnitConvDataStream.hh"
-
-extern ut_system * u_system ;
-
-// CONSTRUCTOR
-DPC_UnitConvDataStream::DPC_UnitConvDataStream(DataStream* ds, const char *ToUnits, const char *FromUnitsHint ) {
-
-
-    ut_unit * to = NULL ;
-    ut_unit * from = NULL ;
-    
-    std::string recorded_units = ds->getUnit();
-
-    source_ds = ds;
-
-    if (ToUnits != NULL) {
-        to = ut_parse(u_system, ToUnits, UT_ASCII) ;
-        to_units = ToUnits ;
-    }
-
-    // If the user has specified a units conversion and those units are valid ...
-    if ( to != NULL ) {
-        // If the recorded data file doesn't contain the units in which the data is recorded ...
-        if (recorded_units.empty()) {
-            // If the user didn't give us a hint as to what the units are (using var@from_units) ...
-            if ((FromUnitsHint == NULL) || (strcmp(FromUnitsHint,"") == 0)) {
-                // set the from units to the same as the to units.
-                cf = cv_get_trivial() ;
-                std::cerr << "ERROR: Unable to to perform units conversion"
-                          << " because the recorded data doesn't indicate it's"
-                          << " units and no @from_units hint is provided."
-                          << std::endl;
-                std::cerr.flush();
-            } else { // the user did give us a hint.
-                from = ut_parse(u_system, FromUnitsHint, UT_ASCII) ;
-                if ( ! from ) {
-                    std::cerr << "ERROR: Unable to to perform units conversion"
-                              << " because the recorded data doesn't indicate it's"
-                              << " units and although a @from_units hint is provided ("
-                              << "(\"" <<  FromUnitsHint << "\"), they are invalid."
-                              << std::endl;
-                    std::cerr.flush();
-                }
-            }
-        } else { // the recorded data file does "know" the units in which the data was recorded,
-            // so those will be the units that we convert from.
-            from = ut_parse(u_system, recorded_units.c_str(), UT_ASCII) ;
-            if ( !from ) {
-                std::cerr << "ERROR: Unable to to perform units conversion because the"
-                          << " units in the data recording file appear to be corrupt."
-                          << std::endl;
-                std::cerr.flush();
-            }
-        }
-
-        // If we know what units the data was recorded in ...
-        if ( from != NULL ) {
-            cf = ut_get_converter(from,to) ;
-            if ( cf == NULL ) {
-                std::cerr << "ERROR: Unable to convert from \"" << FromUnitsHint << "\" to \""
-                          << to_units << "\" because they are incompatible." << std::endl;
-                std::cerr.flush();
-                cf = cv_get_trivial() ;
-            }
-        } else {
-            std::cerr << "ERROR: Unable to perform units conversion becuase the units"
-                      << " that the data is recorded in is unknown." << std::endl;
-            cf = cv_get_trivial() ;
-        }
-    } else { // The user has not specified a units conversion or the units were not valid.
-        // If the recorded data file doesn't contain the units in which the data is recorded ...
-        if (recorded_units.empty()) {
-            // If the user didn't give us a hint as to what the units are (using var@from_units) ...
-            if ((FromUnitsHint == NULL) || (strcmp(FromUnitsHint,"") == 0)) {
-                cf = cv_get_trivial() ;
-            } else { // the user did give us a hint.
-                to_units = FromUnitsHint ;
-                cf = cv_get_trivial() ;
-            }
-        } else { // the recorded data file does "know" the units in which the data was recorded,
-            to_units = recorded_units ;
-            cf = cv_get_trivial() ;
-        }
-    }
-
-    if (to) ut_free(to) ;
-    if (from) ut_free(from) ;
-
-    this->begin();
+#include	<string.h>
+#include	<udunits2.h>
+#include	"DPC/DPC_UnitConvDataStream.hh"
+
+extern	ut_system	*	u_system	;
+
+//	CONSTRUCTOR
+DPC_UnitConvDataStream::DPC_UnitConvDataStream(DataStream*	ds,	const	char	*ToUnits,	const	char	*FromUnitsHint	)	{
+
+
+				ut_unit	*	to	=	NULL	;
+				ut_unit	*	from	=	NULL	;
+				
+				std::string	recorded_units	=	ds->getUnit();
+
+				source_ds	=	ds;
+
+				if	(ToUnits	!=	NULL)	{
+								to	=	ut_parse(u_system,	ToUnits,	UT_ASCII)	;
+								to_units	=	ToUnits	;
+				}
+
+				//	If	the	user	has	specified	a	units	conversion	and	those	units	are	valid	...
+				if	(	to	!=	NULL	)	{
+								//	If	the	recorded	data	file	doesn't	contain	the	units	in	which	the	data	is	recorded	...
+								if	(recorded_units.empty())	{
+												//	If	the	user	didn't	give	us	a	hint	as	to	what	the	units	are	(using	var@from_units)	...
+												if	((FromUnitsHint	==	NULL)	||	(strcmp(FromUnitsHint,"")	==	0))	{
+																//	set	the	from	units	to	the	same	as	the	to	units.
+																cf	=	cv_get_trivial()	;
+																std::cerr	<<	"ERROR:	Unable	to	to	perform	units	conversion"
+																										<<	"	because	the	recorded	data	doesn't	indicate	it's"
+																										<<	"	units	and	no	@from_units	hint	is	provided."
+																										<<	std::endl;
+																std::cerr.flush();
+												}	else	{	//	the	user	did	give	us	a	hint.
+																from	=	ut_parse(u_system,	FromUnitsHint,	UT_ASCII)	;
+																if	(	!	from	)	{
+																				std::cerr	<<	"ERROR:	Unable	to	to	perform	units	conversion"
+																														<<	"	because	the	recorded	data	doesn't	indicate	it's"
+																														<<	"	units	and	although	a	@from_units	hint	is	provided	("
+																														<<	"(\""	<<		FromUnitsHint	<<	"\"),	they	are	invalid."
+																														<<	std::endl;
+																				std::cerr.flush();
+																}
+												}
+								}	else	{	//	the	recorded	data	file	does	"know"	the	units	in	which	the	data	was	recorded,
+												//	so	those	will	be	the	units	that	we	convert	from.
+												from	=	ut_parse(u_system,	recorded_units.c_str(),	UT_ASCII)	;
+												if	(	!from	)	{
+																std::cerr	<<	"ERROR:	Unable	to	to	perform	units	conversion	because	the"
+																										<<	"	units	in	the	data	recording	file	appear	to	be	corrupt."
+																										<<	std::endl;
+																std::cerr.flush();
+												}
+								}
+
+								//	If	we	know	what	units	the	data	was	recorded	in	...
+								if	(	from	!=	NULL	)	{
+												cf	=	ut_get_converter(from,to)	;
+												if	(	cf	==	NULL	)	{
+																std::cerr	<<	"ERROR:	Unable	to	convert	from	\""	<<	FromUnitsHint	<<	"\"	to	\""
+																										<<	to_units	<<	"\"	because	they	are	incompatible."	<<	std::endl;
+																std::cerr.flush();
+																cf	=	cv_get_trivial()	;
+												}
+								}	else	{
+												std::cerr	<<	"ERROR:	Unable	to	perform	units	conversion	becuase	the	units"
+																						<<	"	that	the	data	is	recorded	in	is	unknown."	<<	std::endl;
+												cf	=	cv_get_trivial()	;
+								}
+				}	else	{	//	The	user	has	not	specified	a	units	conversion	or	the	units	were	not	valid.
+								//	If	the	recorded	data	file	doesn't	contain	the	units	in	which	the	data	is	recorded	...
+								if	(recorded_units.empty())	{
+												//	If	the	user	didn't	give	us	a	hint	as	to	what	the	units	are	(using	var@from_units)	...
+												if	((FromUnitsHint	==	NULL)	||	(strcmp(FromUnitsHint,"")	==	0))	{
+																cf	=	cv_get_trivial()	;
+												}	else	{	//	the	user	did	give	us	a	hint.
+																to_units	=	FromUnitsHint	;
+																cf	=	cv_get_trivial()	;
+												}
+								}	else	{	//	the	recorded	data	file	does	"know"	the	units	in	which	the	data	was	recorded,
+												to_units	=	recorded_units	;
+												cf	=	cv_get_trivial()	;
+								}
+				}
+
+				if	(to)	ut_free(to)	;
+				if	(from)	ut_free(from)	;
+
+				this->begin();
 }
 
-// DESTRUCTOR
-DPC_UnitConvDataStream::~DPC_UnitConvDataStream() {
+//	DESTRUCTOR
+DPC_UnitConvDataStream::~DPC_UnitConvDataStream()	{
 
-    cv_free(cf);
-    delete source_ds;
+				cv_free(cf);
+				delete	source_ds;
 }
 
-// MEMBER FUNCTION
-int DPC_UnitConvDataStream::get(double* timestamp, double* paramValue) {
-    double time, value;
-    int ret ;
+//	MEMBER	FUNCTION
+int	DPC_UnitConvDataStream::get(double*	timestamp,	double*	paramValue)	{
+				double	time,	value;
+				int	ret	;
 
-    ret = source_ds->get(&time, &value) ;
-    *timestamp  = time;
-    *paramValue = cv_convert_double(cf, value) ;;
-    return ret ;
+				ret	=	source_ds->get(&time,	&value)	;
+				*timestamp		=	time;
+				*paramValue	=	cv_convert_double(cf,	value)	;;
+				return	ret	;
 }
 
-// MEMBER FUNCTION
-int DPC_UnitConvDataStream::peek(double* timestamp, double* paramValue) {
-    double time, value;
-
-    if (! source_ds->peek(&time, &value) ) {
-        *timestamp  = time;
-        *paramValue = cv_convert_double(cf, value) ;;
-        return (0);
-    } else {
-        return (-1);
-    }
+//	MEMBER	FUNCTION
+int	DPC_UnitConvDataStream::peek(double*	timestamp,	double*	paramValue)	{
+				double	time,	value;
+
+				if	(!	source_ds->peek(&time,	&value)	)	{
+								*timestamp		=	time;
+								*paramValue	=	cv_convert_double(cf,	value)	;;
+								return	(0);
+				}	else	{
+								return	(-1);
+				}
 }
 
-// MEMBER FUNCTION
-std::string DPC_UnitConvDataStream::getFileName() {
-    return( source_ds->getFileName());
+//	MEMBER	FUNCTION
+std::string	DPC_UnitConvDataStream::getFileName()	{
+				return(	source_ds->getFileName());
 }
 
-// MEMBER FUNCTION
-std::string DPC_UnitConvDataStream::getUnit() {
-    return to_units ;
+//	MEMBER	FUNCTION
+std::string	DPC_UnitConvDataStream::getUnit()	{
+				return	to_units	;
 }
 
-// MEMBER FUNCTION
-std::string DPC_UnitConvDataStream::getTimeUnit() {
-    return( source_ds->getTimeUnit());
+//	MEMBER	FUNCTION
+std::string	DPC_UnitConvDataStream::getTimeUnit()	{
+				return(	source_ds->getTimeUnit());
 }
 
-// MEMBER FUNCTION
-void DPC_UnitConvDataStream::begin() {
-    source_ds->begin();
+//	MEMBER	FUNCTION
+void	DPC_UnitConvDataStream::begin()	{
+				source_ds->begin();
 }
 
-// MEMBER FUNCTION
-int DPC_UnitConvDataStream::end() {
-    return( source_ds->end());
+//	MEMBER	FUNCTION
+int	DPC_UnitConvDataStream::end()	{
+				return(	source_ds->end());
 }
 
-// MEMBER FUNCTION
-int DPC_UnitConvDataStream::step() {
-    return( source_ds->step());
+//	MEMBER	FUNCTION
+int	DPC_UnitConvDataStream::step()	{
+				return(	source_ds->step());
 }
diff --git a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
index 970aa82d9..3568c501f 100644
--- a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.cpp
@@ -1,111 +1,111 @@
-#include "DPC/DPC_datastream_supplier.hh"
-#include "DPC/DPC_TimeCstrDataStream.hh"
-#include "DPC/DPC_UnitConvDataStream.hh"
-#include <iostream>
+#include	"DPC/DPC_datastream_supplier.hh"
+#include	"DPC/DPC_TimeCstrDataStream.hh"
+#include	"DPC/DPC_UnitConvDataStream.hh"
+#include	<iostream>
 
-// CONSTRUCTOR
-DPC_datastream_supplier::DPC_datastream_supplier( DPM_product *Product ) {
+//	CONSTRUCTOR
+DPC_datastream_supplier::DPC_datastream_supplier(	DPM_product	*Product	)	{
 
-    product = Product;
-    data_stream_factory = new DataStreamFactory();
+				product	=	Product;
+				data_stream_factory	=	new	DataStreamFactory();
 }
 
-// DESTRUCTOR
-DPC_datastream_supplier::~DPC_datastream_supplier() {
+//	DESTRUCTOR
+DPC_datastream_supplier::~DPC_datastream_supplier()	{
 
-    delete data_stream_factory;
+				delete	data_stream_factory;
 }
 
-// MEMBER FUNCTION
-DataStream *DPC_datastream_supplier::getDataStream( const char *VarName,
-						    const char *ToUnits,
-						    const char *FromUnitsHint,
-						    DPM_run    *Run,
-						    DPM_time_constraints* in_time_constraints ) {
+//	MEMBER	FUNCTION
+DataStream	*DPC_datastream_supplier::getDataStream(	const	char	*VarName,
+										const	char	*ToUnits,
+										const	char	*FromUnitsHint,
+										DPM_run				*Run,
+										DPM_time_constraints*	in_time_constraints	)	{
 
-    DataStream** instreams;
-    int n_extfns, extfn_index;
+				DataStream**	instreams;
+				int	n_extfns,	extfn_index;
 
-    DataStream *ds = NULL;
-    DataStream *tds = NULL;
-    DataStream *utds = NULL;
+				DataStream	*ds	=	NULL;
+				DataStream	*tds	=	NULL;
+				DataStream	*utds	=	NULL;
 
-    const char *run_dir  = Run->getDir() ;
-    const char *timename = Run->getTimeName() ;
+				const	char	*run_dir		=	Run->getDir()	;
+				const	char	*timename	=	Run->getTimeName()	;
 
-    n_extfns = this->product->NumberOfExtFns();
+				n_extfns	=	this->product->NumberOfExtFns();
 
-    for (extfn_index = 0 ; extfn_index < n_extfns ; extfn_index++ ) {
-        DPM_extfn *extfn;
-        int output_index;
+				for	(extfn_index	=	0	;	extfn_index	<	n_extfns	;	extfn_index++	)	{
+								DPM_extfn	*extfn;
+								int	output_index;
 
-        extfn = this->product->getExtFn( extfn_index);
+								extfn	=	this->product->getExtFn(	extfn_index);
 
-        output_index = extfn->index_of( VarName );
+								output_index	=	extfn->index_of(	VarName	);
 
-        if (output_index >= 0 )  {
-            int n_inputs, n_outputs;
-            int input_ix;
+								if	(output_index	>=	0	)		{
+												int	n_inputs,	n_outputs;
+												int	input_ix;
 
-            n_inputs  = extfn->NumberOfInputs();
-            n_outputs = extfn->NumberOfOutputs();
+												n_inputs		=	extfn->NumberOfInputs();
+												n_outputs	=	extfn->NumberOfOutputs();
 
-            instreams = (DataStream**)calloc( sizeof( DataStream*), (size_t)n_inputs );
+												instreams	=	(DataStream**)calloc(	sizeof(	DataStream*),	(size_t)n_inputs	);
 
-            for (input_ix =0 ; input_ix < n_inputs ; input_ix++) {
-                instreams[input_ix] =
-                    data_stream_factory->create( run_dir,
-                                                 extfn->getInputVar( input_ix),
-                                                 timename );
-            }
+												for	(input_ix	=0	;	input_ix	<	n_inputs	;	input_ix++)	{
+																instreams[input_ix]	=
+																				data_stream_factory->create(	run_dir,
+																																																	extfn->getInputVar(	input_ix),
+																																																	timename	);
+												}
 
-            ds = data_stream_factory->create( extfn->getFName(), n_inputs, instreams, n_outputs, output_index);
-        }
-    }
+												ds	=	data_stream_factory->create(	extfn->getFName(),	n_inputs,	instreams,	n_outputs,	output_index);
+								}
+				}
 
-    if (ds == NULL) {
-        ds = data_stream_factory->create( run_dir, VarName, timename);
-    }
+				if	(ds	==	NULL)	{
+								ds	=	data_stream_factory->create(	run_dir,	VarName,	timename);
+				}
 
-    if (ds == NULL) {
-        return NULL;
-    }
+				if	(ds	==	NULL)	{
+								return	NULL;
+				}
 
-    if ( in_time_constraints == NULL )  {
-        tds = ds;
-    } else {
-        tds = new DPC_TimeCstrDataStream( ds, in_time_constraints );
-    }
+				if	(	in_time_constraints	==	NULL	)		{
+								tds	=	ds;
+				}	else	{
+								tds	=	new	DPC_TimeCstrDataStream(	ds,	in_time_constraints	);
+				}
 
-    utds = new DPC_UnitConvDataStream( tds, ToUnits, FromUnitsHint );
+				utds	=	new	DPC_UnitConvDataStream(	tds,	ToUnits,	FromUnitsHint	);
 
-    return utds;
+				return	utds;
 }
 
-DataStream *DPC_datastream_supplier::getDataStream( const char *VarName,
-						    const char *ToUnits,
-						    const char *FromUnitsHint,
-						    const char *Machine,
-						    const unsigned short Port,
-						    DPM_time_constraints* in_time_constraints ) {
+DataStream	*DPC_datastream_supplier::getDataStream(	const	char	*VarName,
+										const	char	*ToUnits,
+										const	char	*FromUnitsHint,
+										const	char	*Machine,
+										const	unsigned	short	Port,
+										DPM_time_constraints*	in_time_constraints	)	{
 
-    DataStream *ds = NULL;
-    DataStream *tds = NULL;
-    DataStream *utds = NULL;
+				DataStream	*ds	=	NULL;
+				DataStream	*tds	=	NULL;
+				DataStream	*utds	=	NULL;
 
-    ds = data_stream_factory->create( Machine, Port , VarName);
+				ds	=	data_stream_factory->create(	Machine,	Port	,	VarName);
 
-    if (ds == NULL) {
-        return NULL;
-    }
+				if	(ds	==	NULL)	{
+								return	NULL;
+				}
 
-    if ( in_time_constraints == NULL )  {
-        tds = ds;
-    } else {
-        tds = new DPC_TimeCstrDataStream( ds, in_time_constraints );
-    }
+				if	(	in_time_constraints	==	NULL	)		{
+								tds	=	ds;
+				}	else	{
+								tds	=	new	DPC_TimeCstrDataStream(	ds,	in_time_constraints	);
+				}
 
-    utds = new DPC_UnitConvDataStream( tds, ToUnits, FromUnitsHint);
+				utds	=	new	DPC_UnitConvDataStream(	tds,	ToUnits,	FromUnitsHint);
 
-    return utds;
+				return	utds;
 }
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
index a77cc5dba..a25ec0054 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
@@ -1,232 +1,232 @@
 
-#include "DPC/DPC_delta_curve.hh"
-#include "math.h"
-#include "string.h"
-#include <sstream>
-
-// CONSTRUCTOR
-DPC_delta_curve::DPC_delta_curve( DPM_curve*               Curve_spec,
-                                  DPM_run*                 RUN1,
-                                  DPM_run*                 RUN2,
-                                  DPC_datastream_supplier *ds_supplier,
-                                  DPM_time_constraints    *Time_constraints )
-    : DPC_curve()
+#include	"DPC/DPC_delta_curve.hh"
+#include	"math.h"
+#include	"string.h"
+#include	<sstream>
+
+//	CONSTRUCTOR
+DPC_delta_curve::DPC_delta_curve(	DPM_curve*															Curve_spec,
+																																		DPM_run*																	RUN1,
+																																		DPM_run*																	RUN2,
+																																		DPC_datastream_supplier	*ds_supplier,
+																																		DPM_time_constraints				*Time_constraints	)
+				:	DPC_curve()
 {
 
-    char work[255];
-    char *temp_s;
-
-    std::string run1_ds_units;
-    std::string run2_ds_units;
-
-    int RUN1_case_index;
-    int RUN2_case_index;
-    unsigned int case_index;
-    unsigned int number_of_cases = Curve_spec->NumberOfVarCases();
-
-    DPM_var * run1_x_var;
-    DPM_var * run1_y_var;
-    DPM_var * run2_x_var;
-    DPM_var * run2_y_var;
-
-    time_conversion = NULL;
-
-    run_dir1 = strdup( RUN1->getDir());
-    run_dir2 = strdup( RUN2->getDir());
-
-    // ------------------------------------------------------------
-    // The X-axis represents time, so this curve is of type:
-    //
-    //                      <X,Y> = <t, |A(t) - A(t)| >
-    //                                   Run1   Run2
-    // ------------------------------------------------------------
-
-    // For Delta Curves, the X-variable must be time.
-    // For RUN1, determine which of the X-varcase variable names matches RUN1's "time name"
-    // with its related Y-variable also being found in RUN1.
-    case_index = 0;
-    RUN1_case_index = -1;
-    while ((RUN1_case_index < 0) && (case_index < number_of_cases)) {
-        run1_x_var = Curve_spec->getXVar(case_index);
-        if ( strcmp( run1_x_var->getName(), RUN1->getTimeName()) == 0) {
-            run1_y_var = Curve_spec->getYVar(case_index);
-
-            // Create DataStream #1 if Y-variable is also found
-            ds[0] = ds_supplier->getDataStream( run1_y_var->getName(),
-                                                run1_y_var->AttributeValue("units"),
-                                                run1_y_var->AttributeValue("from_units"),
-                                                RUN1,
-                                                Time_constraints );
-            if (ds[0] != NULL) {
-                RUN1_case_index = case_index;
-            }
-        }
-        case_index++;
-    }
-
-    // If we did not find an X-variable in the varcase list that matches the
-    // time_name the RUN1 or the related Y-variable then we have an error condition.
-    if ( RUN1_case_index < 0 ) {
-        std::cerr << "ERROR: For RUN1, the X variable either does not represent time, a requirement for delta plots\n"
-                  << "       or the Y variable could not be found in RUN1."
-                  << std::endl;
-        std::cerr.flush();
-        throw(std::logic_error("Unable to create DPC_delta_curve."));
-    }
-
-    // For RUN2, determine which of the X-varcase variable names matches RUN2's "time name"
-    // with its related Y-variable also being found in RUN2.
-    case_index = 0;
-    RUN2_case_index = -1;
-    while ( (RUN2_case_index < 0) && (case_index < number_of_cases)) {
-        run2_x_var = Curve_spec->getXVar(case_index);
-        if ( strcmp( run2_x_var->getName(), RUN2->getTimeName()) == 0) {
-            run2_y_var = Curve_spec->getYVar(case_index);
-
-            // Create DataStream #1 if Y-variable is also found
-            ds[1] = ds_supplier->getDataStream( run2_y_var->getName(),
-                                                run2_y_var->AttributeValue("units"),
-                                                run2_y_var->AttributeValue("from_units"),
-                                                RUN2,
-                                                Time_constraints );
-            if (ds[1] != NULL) {
-                RUN2_case_index = case_index;
-            }
-        }
-        case_index++;
-    }
-
-    // If we did not find an X-variable in the varcase list that matches the
-    // time_name the RUN2 or the related Y-variable then we have an error condition.
-    if ( RUN2_case_index < 0 ) {
-        std::cerr << "ERROR: For RUN2, the X variable does not represent time, a requirement for delta plots\n"
-                  << "       or the Y variable could not be found in RUN2."
-                  << std::endl;
-        std::cerr.flush();
-        throw(std::logic_error("Unable to create DPC_delta_curve."));
-    }
-
-    // Create the X DPM_Var
-    if (strcmp( run1_x_var->getName(), run2_x_var->getName()) == 0) {
-        delta_x_var =  new DPM_var( run1_x_var->getName());
-    } else {
-        delta_x_var =  new DPM_var("time");
-    }
-    delta_x_var->add_attribute("units", "s");
-    x_var = delta_x_var;
-
-    // Create the Y DPM_Var
-    std::string s = "DELTA(";
-    s += run1_y_var->getName() ;
-    s += ")";
-    delta_y_var =  new DPM_var( s.c_str());
-    y_var = delta_y_var;
-
-    time_conversion = cv_get_trivial() ;
-    x_actual_units = strdup("s");
-
-    // Make sure we know what units we're actually getting from DataStream #1.
-    run1_ds_units = ds[0]->getUnit().c_str();
-
-    // Make sure we know what units we're actually getting from DataStream #2.
-    run2_ds_units = ds[1]->getUnit().c_str();
-
-    // ds1 and ds2 had better be supplying the same units.
-    if ( run1_ds_units != run2_ds_units ) {
-        std::cerr << "ERROR: The two data streams of a delta plot have different units." << std::endl;
-        std::cerr.flush();
-        throw(std::logic_error("Failed to create DataStream"));
-    }
-
-    y_actual_units = strdup( run1_ds_units.c_str());
-
-    // -------------------------------------------------------------
-    // Tell our DataStreams to start at the beginning just because
-    // it makes me feel all warm and fuzzy.
-    // -------------------------------------------------------------
-    ds[0]->begin();
-    ds[1]->begin();
-
-    // ------------------------
-    // Save the RUN directorys.
-    // ------------------------
-    work[0] ='\0';
-    if ((temp_s = strrchr(run_dir1,'/')) != NULL) {
-        strcpy(work, temp_s+1);
-    } else {
-        strcpy(work, run_dir1);
-    }
-    strcat(work, " - ");
-    if ((temp_s = strrchr(run_dir2,'/')) != NULL) {
-        strcat(work, temp_s+1);
-    } else {
-        strcat(work, run_dir2);
-    }
-    data_src_label = strdup(work);
+				char	work[255];
+				char	*temp_s;
+
+				std::string	run1_ds_units;
+				std::string	run2_ds_units;
+
+				int	RUN1_case_index;
+				int	RUN2_case_index;
+				unsigned	int	case_index;
+				unsigned	int	number_of_cases	=	Curve_spec->NumberOfVarCases();
+
+				DPM_var	*	run1_x_var;
+				DPM_var	*	run1_y_var;
+				DPM_var	*	run2_x_var;
+				DPM_var	*	run2_y_var;
+
+				time_conversion	=	NULL;
+
+				run_dir1	=	strdup(	RUN1->getDir());
+				run_dir2	=	strdup(	RUN2->getDir());
+
+				//	------------------------------------------------------------
+				//	The	X-axis	represents	time,	so	this	curve	is	of	type:
+				//
+				//																						<X,Y>	=	<t,	|A(t)	-	A(t)|	>
+				//																																			Run1			Run2
+				//	------------------------------------------------------------
+
+				//	For	Delta	Curves,	the	X-variable	must	be	time.
+				//	For	RUN1,	determine	which	of	the	X-varcase	variable	names	matches	RUN1's	"time	name"
+				//	with	its	related	Y-variable	also	being	found	in	RUN1.
+				case_index	=	0;
+				RUN1_case_index	=	-1;
+				while	((RUN1_case_index	<	0)	&&	(case_index	<	number_of_cases))	{
+								run1_x_var	=	Curve_spec->getXVar(case_index);
+								if	(	strcmp(	run1_x_var->getName(),	RUN1->getTimeName())	==	0)	{
+												run1_y_var	=	Curve_spec->getYVar(case_index);
+
+												//	Create	DataStream	#1	if	Y-variable	is	also	found
+												ds[0]	=	ds_supplier->getDataStream(	run1_y_var->getName(),
+																																																run1_y_var->AttributeValue("units"),
+																																																run1_y_var->AttributeValue("from_units"),
+																																																RUN1,
+																																																Time_constraints	);
+												if	(ds[0]	!=	NULL)	{
+																RUN1_case_index	=	case_index;
+												}
+								}
+								case_index++;
+				}
+
+				//	If	we	did	not	find	an	X-variable	in	the	varcase	list	that	matches	the
+				//	time_name	the	RUN1	or	the	related	Y-variable	then	we	have	an	error	condition.
+				if	(	RUN1_case_index	<	0	)	{
+								std::cerr	<<	"ERROR:	For	RUN1,	the	X	variable	either	does	not	represent	time,	a	requirement	for	delta	plots\n"
+																		<<	"							or	the	Y	variable	could	not	be	found	in	RUN1."
+																		<<	std::endl;
+								std::cerr.flush();
+								throw(std::logic_error("Unable	to	create	DPC_delta_curve."));
+				}
+
+				//	For	RUN2,	determine	which	of	the	X-varcase	variable	names	matches	RUN2's	"time	name"
+				//	with	its	related	Y-variable	also	being	found	in	RUN2.
+				case_index	=	0;
+				RUN2_case_index	=	-1;
+				while	(	(RUN2_case_index	<	0)	&&	(case_index	<	number_of_cases))	{
+								run2_x_var	=	Curve_spec->getXVar(case_index);
+								if	(	strcmp(	run2_x_var->getName(),	RUN2->getTimeName())	==	0)	{
+												run2_y_var	=	Curve_spec->getYVar(case_index);
+
+												//	Create	DataStream	#1	if	Y-variable	is	also	found
+												ds[1]	=	ds_supplier->getDataStream(	run2_y_var->getName(),
+																																																run2_y_var->AttributeValue("units"),
+																																																run2_y_var->AttributeValue("from_units"),
+																																																RUN2,
+																																																Time_constraints	);
+												if	(ds[1]	!=	NULL)	{
+																RUN2_case_index	=	case_index;
+												}
+								}
+								case_index++;
+				}
+
+				//	If	we	did	not	find	an	X-variable	in	the	varcase	list	that	matches	the
+				//	time_name	the	RUN2	or	the	related	Y-variable	then	we	have	an	error	condition.
+				if	(	RUN2_case_index	<	0	)	{
+								std::cerr	<<	"ERROR:	For	RUN2,	the	X	variable	does	not	represent	time,	a	requirement	for	delta	plots\n"
+																		<<	"							or	the	Y	variable	could	not	be	found	in	RUN2."
+																		<<	std::endl;
+								std::cerr.flush();
+								throw(std::logic_error("Unable	to	create	DPC_delta_curve."));
+				}
+
+				//	Create	the	X	DPM_Var
+				if	(strcmp(	run1_x_var->getName(),	run2_x_var->getName())	==	0)	{
+								delta_x_var	=		new	DPM_var(	run1_x_var->getName());
+				}	else	{
+								delta_x_var	=		new	DPM_var("time");
+				}
+				delta_x_var->add_attribute("units",	"s");
+				x_var	=	delta_x_var;
+
+				//	Create	the	Y	DPM_Var
+				std::string	s	=	"DELTA(";
+				s	+=	run1_y_var->getName()	;
+				s	+=	")";
+				delta_y_var	=		new	DPM_var(	s.c_str());
+				y_var	=	delta_y_var;
+
+				time_conversion	=	cv_get_trivial()	;
+				x_actual_units	=	strdup("s");
+
+				//	Make	sure	we	know	what	units	we're	actually	getting	from	DataStream	#1.
+				run1_ds_units	=	ds[0]->getUnit().c_str();
+
+				//	Make	sure	we	know	what	units	we're	actually	getting	from	DataStream	#2.
+				run2_ds_units	=	ds[1]->getUnit().c_str();
+
+				//	ds1	and	ds2	had	better	be	supplying	the	same	units.
+				if	(	run1_ds_units	!=	run2_ds_units	)	{
+								std::cerr	<<	"ERROR:	The	two	data	streams	of	a	delta	plot	have	different	units."	<<	std::endl;
+								std::cerr.flush();
+								throw(std::logic_error("Failed	to	create	DataStream"));
+				}
+
+				y_actual_units	=	strdup(	run1_ds_units.c_str());
+
+				//	-------------------------------------------------------------
+				//	Tell	our	DataStreams	to	start	at	the	beginning	just	because
+				//	it	makes	me	feel	all	warm	and	fuzzy.
+				//	-------------------------------------------------------------
+				ds[0]->begin();
+				ds[1]->begin();
+
+				//	------------------------
+				//	Save	the	RUN	directorys.
+				//	------------------------
+				work[0]	='\0';
+				if	((temp_s	=	strrchr(run_dir1,'/'))	!=	NULL)	{
+								strcpy(work,	temp_s+1);
+				}	else	{
+								strcpy(work,	run_dir1);
+				}
+				strcat(work,	"	-	");
+				if	((temp_s	=	strrchr(run_dir2,'/'))	!=	NULL)	{
+								strcat(work,	temp_s+1);
+				}	else	{
+								strcat(work,	run_dir2);
+				}
+				data_src_label	=	strdup(work);
 }
 
-// DESTRUCTOR
-DPC_delta_curve::~DPC_delta_curve() {
-
-    // We ONLY delete what we create.
-    delete delta_x_var;
-    delete delta_y_var;
-    delete ds[0];
-    delete ds[1];
-    if ( x_actual_units ) { free( x_actual_units); }
-    if ( y_actual_units ) { free( y_actual_units); }
-    if ( run_dir1 ) { free( run_dir1); }
-    if ( run_dir2 ) { free( run_dir2); }
-    if ( data_src_label ) { free( data_src_label); }
-    if ( time_conversion ) { cv_free(time_conversion); }
+//	DESTRUCTOR
+DPC_delta_curve::~DPC_delta_curve()	{
+
+				//	We	ONLY	delete	what	we	create.
+				delete	delta_x_var;
+				delete	delta_y_var;
+				delete	ds[0];
+				delete	ds[1];
+				if	(	x_actual_units	)	{	free(	x_actual_units);	}
+				if	(	y_actual_units	)	{	free(	y_actual_units);	}
+				if	(	run_dir1	)	{	free(	run_dir1);	}
+				if	(	run_dir2	)	{	free(	run_dir2);	}
+				if	(	data_src_label	)	{	free(	data_src_label);	}
+				if	(	time_conversion	)	{	cv_free(time_conversion);	}
 }
 
-// MEMBER FUNCTION
-const char* DPC_delta_curve::getXUnits() {
-    return ( x_actual_units);
+//	MEMBER	FUNCTION
+const	char*	DPC_delta_curve::getXUnits()	{
+				return	(	x_actual_units);
 }
 
-// MEMBER FUNCTION
-const char* DPC_delta_curve::getYUnits() {
-    return ( y_actual_units);
+//	MEMBER	FUNCTION
+const	char*	DPC_delta_curve::getYUnits()	{
+				return	(	y_actual_units);
 }
 
-// MEMBER FUNCTION
-const char *DPC_delta_curve::getDataSrcLbl() {
-    return( data_src_label);
+//	MEMBER	FUNCTION
+const	char	*DPC_delta_curve::getDataSrcLbl()	{
+				return(	data_src_label);
 }
 
-// MEMBER FUNCTION
-int DPC_delta_curve::getXY(double *X_value, double *Y_value) {
+//	MEMBER	FUNCTION
+int	DPC_delta_curve::getXY(double	*X_value,	double	*Y_value)	{
 
-    double t1,t2,v1,v2;
-    int eos;
-    int e0, e1;
+				double	t1,t2,v1,v2;
+				int	eos;
+				int	e0,	e1;
 
 
-    e0 = ds[0]->get( &t1, &v1);
-    e1 = ds[1]->get( &t2, &v2);
-    eos = !(e0 && e1);
+				e0	=	ds[0]->get(	&t1,	&v1);
+				e1	=	ds[1]->get(	&t2,	&v2);
+				eos	=	!(e0	&&	e1);
 
-    while (!eos && ( fabs( t1 - t2) > T_TOLERANCE )) {
-        if (t1 < t2) {
-            eos = ! ds[0]->get( &t1, &v1);
-        } else {
-            eos = ! ds[1]->get( &t2, &v2);
-        }
-    }
-    if (!eos) {
-        *X_value = cv_convert_double(time_conversion,t1);
-        *Y_value = v1 - v2;
-        return(1);
-    }
+				while	(!eos	&&	(	fabs(	t1	-	t2)	>	T_TOLERANCE	))	{
+								if	(t1	<	t2)	{
+												eos	=	!	ds[0]->get(	&t1,	&v1);
+								}	else	{
+												eos	=	!	ds[1]->get(	&t2,	&v2);
+								}
+				}
+				if	(!eos)	{
+								*X_value	=	cv_convert_double(time_conversion,t1);
+								*Y_value	=	v1	-	v2;
+								return(1);
+				}
 
-    return(0);
+				return(0);
 }
 
-// MEMBER FUNCTION
-void DPC_delta_curve::begin() {
-    if (ds[0]) ds[0]->begin();
-    if (ds[1]) ds[1]->begin();
+//	MEMBER	FUNCTION
+void	DPC_delta_curve::begin()	{
+				if	(ds[0])	ds[0]->begin();
+				if	(ds[1])	ds[1]->begin();
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
index 1d5821039..811103526 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
@@ -1,148 +1,148 @@
 
-#include "DPC/DPC_delta_plot.hh"
-#include "DPC/DPC_delta_curve.hh"
-#include "DPM/DPM_var.hh"
-#include "DPM/DPM_axis.hh"
-#include "DPM/DPM_run.hh"
-
-// CONSTRUCTOR for Delta session
-// One delta curve per plot
-DPC_delta_plot::DPC_delta_plot( DPC_datastream_supplier *DS_Supplier,
-                                DPM_run *Run1,
-                                DPM_run *Run2,
-                                DPM_relation            *Relation,
-                                DPM_time_constraints    *ParentTimeConstraints )
-    : DPC_plot( Relation)
+#include	"DPC/DPC_delta_plot.hh"
+#include	"DPC/DPC_delta_curve.hh"
+#include	"DPM/DPM_var.hh"
+#include	"DPM/DPM_axis.hh"
+#include	"DPM/DPM_run.hh"
+
+//	CONSTRUCTOR	for	Delta	session
+//	One	delta	curve	per	plot
+DPC_delta_plot::DPC_delta_plot(	DPC_datastream_supplier	*DS_Supplier,
+																																DPM_run	*Run1,
+																																DPM_run	*Run2,
+																																DPM_relation												*Relation,
+																																DPM_time_constraints				*ParentTimeConstraints	)
+				:	DPC_plot(	Relation)
 {
 
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints total_time_constraints;
-    int n_curves;
-    int cix;
-
-    // ###############################################################
-    // Initialize this plot object.
-    // ###############################################################
-    if ( !DS_Supplier )           { throw std::invalid_argument("DS_Supplier is NULL."); }
-    if ( !Run1 )                  { throw std::invalid_argument("Run1 is NULL."); }
-    if ( !Run2 )                  { throw std::invalid_argument("Run2 is NULL."); }
-    if ( !Relation )              { throw std::invalid_argument("Relation is NULL."); }
-    if ( !ParentTimeConstraints ) { throw std::invalid_argument("ParentTimeConstraints is NULL."); }
-
-    // ###############################################################
-    // Determine our time constraints.
-    // ###############################################################
-
-    // Combine the time constraints levied by the plot specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate curves.
-
-    my_time_constraints = Relation->getTimeConstraints();
-    total_time_constraints = *my_time_constraints + *ParentTimeConstraints;
-
-    // ###############################################################
-    // Create subordinate curves.
-    // ###############################################################
-
-    n_curves = Relation->NumberOfCurves();
-
-    // foreach of the Y variables
-    for (cix = 0 ; cix < n_curves ; cix ++ ) {
-        DPC_curve *curve;
-        DPM_curve *curve_spec = Relation->getCurve(cix);
-        try {
-            // Make a curve.
-            curve = new DPC_delta_curve( curve_spec,
-                                         Run1,
-                                         Run2,
-                                         DS_Supplier,
-                                         &total_time_constraints );
-        } catch (const std::logic_error& error) {
-            curve = NULL;
-            std::cerr << error.what() << std::endl;
-            std::cerr << "DPC_delta_plot: Alas! The DPC_delta_curve has poofed!." << std::endl;
-        }
-        // Put that new curve object into the curve list.
-        if ( curve) {
-            if ( add_curve( curve) < 0 ) {
-                std::cerr << "ERROR: Rejecting curve." << std::endl;
-                delete curve;
-            }
-        }
-    }
-
-    if ( getNumCurves() == 0 ) {
-        throw std::invalid_argument("DPC_delta_plot: Ack!! I dont have any curves to plot! I have no reason to exist! *POOF!*");
-    }
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	total_time_constraints;
+				int	n_curves;
+				int	cix;
+
+				//	###############################################################
+				//	Initialize	this	plot	object.
+				//	###############################################################
+				if	(	!DS_Supplier	)											{	throw	std::invalid_argument("DS_Supplier	is	NULL.");	}
+				if	(	!Run1	)																		{	throw	std::invalid_argument("Run1	is	NULL.");	}
+				if	(	!Run2	)																		{	throw	std::invalid_argument("Run2	is	NULL.");	}
+				if	(	!Relation	)														{	throw	std::invalid_argument("Relation	is	NULL.");	}
+				if	(	!ParentTimeConstraints	)	{	throw	std::invalid_argument("ParentTimeConstraints	is	NULL.");	}
+
+				//	###############################################################
+				//	Determine	our	time	constraints.
+				//	###############################################################
+
+				//	Combine	the	time	constraints	levied	by	the	plot	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	curves.
+
+				my_time_constraints	=	Relation->getTimeConstraints();
+				total_time_constraints	=	*my_time_constraints	+	*ParentTimeConstraints;
+
+				//	###############################################################
+				//	Create	subordinate	curves.
+				//	###############################################################
+
+				n_curves	=	Relation->NumberOfCurves();
+
+				//	foreach	of	the	Y	variables
+				for	(cix	=	0	;	cix	<	n_curves	;	cix	++	)	{
+								DPC_curve	*curve;
+								DPM_curve	*curve_spec	=	Relation->getCurve(cix);
+								try	{
+												//	Make	a	curve.
+												curve	=	new	DPC_delta_curve(	curve_spec,
+																																									Run1,
+																																									Run2,
+																																									DS_Supplier,
+																																									&total_time_constraints	);
+								}	catch	(const	std::logic_error&	error)	{
+												curve	=	NULL;
+												std::cerr	<<	error.what()	<<	std::endl;
+												std::cerr	<<	"DPC_delta_plot:	Alas!	The	DPC_delta_curve	has	poofed!."	<<	std::endl;
+								}
+								//	Put	that	new	curve	object	into	the	curve	list.
+								if	(	curve)	{
+												if	(	add_curve(	curve)	<	0	)	{
+																std::cerr	<<	"ERROR:	Rejecting	curve."	<<	std::endl;
+																delete	curve;
+												}
+								}
+				}
+
+				if	(	getNumCurves()	==	0	)	{
+								throw	std::invalid_argument("DPC_delta_plot:	Ack!!	I	dont	have	any	curves	to	plot!	I	have	no	reason	to	exist!	*POOF!*");
+				}
 }
 
-// CONSTRUCTOR
-DPC_delta_plot::DPC_delta_plot( DPC_datastream_supplier *DS_Supplier,
-                                std::vector <DPM_run *> *RunListp,
-                                DPM_relation            *Relation,
-                                DPM_time_constraints    *ParentTimeConstraints )
-    : DPC_plot( Relation)
+//	CONSTRUCTOR
+DPC_delta_plot::DPC_delta_plot(	DPC_datastream_supplier	*DS_Supplier,
+																																std::vector	<DPM_run	*>	*RunListp,
+																																DPM_relation												*Relation,
+																																DPM_time_constraints				*ParentTimeConstraints	)
+				:	DPC_plot(	Relation)
 {
 
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints total_time_constraints;
-    int n_curves, n_runs;
-    int cix, i, j;
-
-    // Validate Arguments
-    if ( !DS_Supplier )           { throw std::invalid_argument("DS_Supplier is NULL."); }
-    n_runs = (int)RunListp->size();
-    if ( n_runs==0)               { throw std::invalid_argument("Run List is NULL."); }
-    if ( !Relation )              { throw std::invalid_argument("Relation is NULL."); }
-    if ( !ParentTimeConstraints ) { throw std::invalid_argument("ParentTimeConstraints is NULL."); }
-
-    // Determine our time constraints.
-    // Combine the time constraints levied by the plot specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate curves.
-
-    my_time_constraints = Relation->getTimeConstraints();
-    total_time_constraints = *my_time_constraints + *ParentTimeConstraints;
-
-    // Create subordinate curves.
-
-    n_curves = Relation->NumberOfCurves();
-
-    // foreach of the Y variables
-    for (cix = 0 ; cix < n_curves ; cix ++ ) {
-        DPC_curve *curve;
-        DPM_curve *curve_spec = Relation->getCurve(cix);
-        // Create a DELTA curve for each pairing of runs.
-        for (i=0; i<n_runs-1; i++) {
-            for (j=i+1; j<n_runs; j++) {
-
-                DPM_run *Run1 = (*RunListp)[i];
-                DPM_run *Run2 = (*RunListp)[j];
-                try {
-                    // Make a curve.
-                    curve = new DPC_delta_curve( curve_spec,
-                                                 Run1,
-                                                 Run2,
-                                                 DS_Supplier,
-                                                 &total_time_constraints );
-                } catch (const std::logic_error& error) {
-                    curve = NULL;
-                    std::cerr << error.what() << std::endl;
-                    std::cerr << "DPC_delta_plot: Alas! The DPC_delta_curve has poofed!." << std::endl;
-                }
-                // Put that new curve object into the curve list.
-                if ( curve) {
-                    if ( add_curve( curve) < 0 ) {
-                        std::cerr << "ERROR: Rejecting curve." << std::endl;
-                        delete curve;
-                    }
-                }
-            } // end j
-        } // end i
-    } // end cix
-
-    if ( getNumCurves() == 0 ) {
-        throw std::invalid_argument("DPC_delta_plot: Ack!! I dont have any curves to plot! I have no reason to exist! *POOF!*");
-    }
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	total_time_constraints;
+				int	n_curves,	n_runs;
+				int	cix,	i,	j;
+
+				//	Validate	Arguments
+				if	(	!DS_Supplier	)											{	throw	std::invalid_argument("DS_Supplier	is	NULL.");	}
+				n_runs	=	(int)RunListp->size();
+				if	(	n_runs==0)															{	throw	std::invalid_argument("Run	List	is	NULL.");	}
+				if	(	!Relation	)														{	throw	std::invalid_argument("Relation	is	NULL.");	}
+				if	(	!ParentTimeConstraints	)	{	throw	std::invalid_argument("ParentTimeConstraints	is	NULL.");	}
+
+				//	Determine	our	time	constraints.
+				//	Combine	the	time	constraints	levied	by	the	plot	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	curves.
+
+				my_time_constraints	=	Relation->getTimeConstraints();
+				total_time_constraints	=	*my_time_constraints	+	*ParentTimeConstraints;
+
+				//	Create	subordinate	curves.
+
+				n_curves	=	Relation->NumberOfCurves();
+
+				//	foreach	of	the	Y	variables
+				for	(cix	=	0	;	cix	<	n_curves	;	cix	++	)	{
+								DPC_curve	*curve;
+								DPM_curve	*curve_spec	=	Relation->getCurve(cix);
+								//	Create	a	DELTA	curve	for	each	pairing	of	runs.
+								for	(i=0;	i<n_runs-1;	i++)	{
+												for	(j=i+1;	j<n_runs;	j++)	{
+
+																DPM_run	*Run1	=	(*RunListp)[i];
+																DPM_run	*Run2	=	(*RunListp)[j];
+																try	{
+																				//	Make	a	curve.
+																				curve	=	new	DPC_delta_curve(	curve_spec,
+																																																	Run1,
+																																																	Run2,
+																																																	DS_Supplier,
+																																																	&total_time_constraints	);
+																}	catch	(const	std::logic_error&	error)	{
+																				curve	=	NULL;
+																				std::cerr	<<	error.what()	<<	std::endl;
+																				std::cerr	<<	"DPC_delta_plot:	Alas!	The	DPC_delta_curve	has	poofed!."	<<	std::endl;
+																}
+																//	Put	that	new	curve	object	into	the	curve	list.
+																if	(	curve)	{
+																				if	(	add_curve(	curve)	<	0	)	{
+																								std::cerr	<<	"ERROR:	Rejecting	curve."	<<	std::endl;
+																								delete	curve;
+																				}
+																}
+												}	//	end	j
+								}	//	end	i
+				}	//	end	cix
+
+				if	(	getNumCurves()	==	0	)	{
+								throw	std::invalid_argument("DPC_delta_plot:	Ack!!	I	dont	have	any	curves	to	plot!	I	have	no	reason	to	exist!	*POOF!*");
+				}
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_page.cpp b/trick_source/data_products/DPX/DPC/DPC_page.cpp
index 5c48b0f98..1919b16da 100644
--- a/trick_source/data_products/DPX/DPC/DPC_page.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_page.cpp
@@ -1,199 +1,199 @@
 
-#include "DPC/DPC_page.hh"
-#include <stdio.h>
+#include	"DPC/DPC_page.hh"
+#include	<stdio.h>
 
-DPC_page::DPC_page( DPC_datastream_supplier *DS_Supplier,
-                    std::vector <DPM_run *> *RunListp,
-                    DPM_page                *PageSpec,
-                    DPM_time_constraints    *ParentTimeConstraints )
+DPC_page::DPC_page(	DPC_datastream_supplier	*DS_Supplier,
+																				std::vector	<DPM_run	*>	*RunListp,
+																				DPM_page																*PageSpec,
+																				DPM_time_constraints				*ParentTimeConstraints	)
 {
 
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints total_time_constraints;
-    DPM_relation *relation;
-    const char *presentation;
-    int n_relations, n_runs;
-    int relix, runix;
-    bool contrast_session = false;
-
-    page_spec = PageSpec;
-    view_data = NULL;
-
-    // Combine the time constraints levied by the page specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate plots.
-
-    my_time_constraints = page_spec->getTimeConstraints();
-    total_time_constraints = *my_time_constraints + *ParentTimeConstraints;
-
-    // ------------------------
-    // Create subordinate plots.
-    // ------------------------
-    n_runs = (int)RunListp->size();
-
-    n_relations = PageSpec->NumberOfRelations();
-
-    presentation = PageSpec->AttributeValue("presentation");
-    if ((presentation != NULL) && (strcasecmp( presentation, "CONTRAST") == 0)) {
-        // for a Contrast session, do a comparison plot and delta plot on same page
-        contrast_session = true;
-    }
-
-    if ( ((presentation != NULL) && (strcasecmp( presentation, "COMPARISON") == 0)) ||
-         (contrast_session) ) {
-        // Foreach of the Variable Relations.
-        for (relix = 0 ; relix < n_relations ; relix++ ) {
-            relation = PageSpec->getRelation( relix );
-            DPC_plot *plot;
-            try {
-                // Make a plot.
-                plot = new DPC_standard_plot( DS_Supplier,
-                                              RunListp,
-                                              relation,
-                                              &total_time_constraints );
-                if (contrast_session) {
-                    plot->setTitle("Contrast");
-                }
-                // Put the new plot in the plot list.
-                plot_list.push_back( plot );
-            } catch (const std::invalid_argument& error) {
-                std::cerr << error.what() << std::endl;
-            }
-        }
-    }
-    if ( ((presentation != NULL) && (strcasecmp( presentation, "DELTA") == 0)) ||
-         (contrast_session) ) {
-        // Foreach of the Variable Relations.
-        for (relix = 0 ; relix < n_relations ; relix++ ) {
-            relation = PageSpec->getRelation( relix );
-            DPC_plot *plot;
-            int i,j;
-
-            // For Contrast session, put all DELTA curves for all runs on one plot
-            if (contrast_session) {
-                try {
-                    // Make a plot.
-                    plot = new DPC_delta_plot( DS_Supplier,
-                                               RunListp,
-                                               relation,
-                                               &total_time_constraints );
-                    // Put the new plot in the plot list.
-                    plot->setTitle("Contrast");
-                    plot_list.push_back( plot );
-                } catch (const std::invalid_argument& error) {
-                    std::cerr << error.what() << std::endl;
-                }
-            } else {
-            // For Delta session, create a DELTA plot for each pairing of runs.
-                for (i=0; i<n_runs-1; i++) {
-                    for (j=i+1; j<n_runs; j++) {
-
-                        DPM_run *Run1 = (*RunListp)[i];
-                        DPM_run *Run2 = (*RunListp)[j];
-                        try {
-                            // Make a plot.
-                            plot = new DPC_delta_plot( DS_Supplier,
-                                                       Run1,
-                                                       Run2,
-                                                       relation,
-                                                       &total_time_constraints );
-                            // Put the new plot in the plot list.
-                            plot_list.push_back( plot );
-                        } catch (const std::invalid_argument& error) {
-                            std::cerr << error.what() << std::endl;
-                        }
-
-                    } // end j
-                } // end i
-            }
-        } // end relix
-    }
-
-    if ( plot_list.size() == 0 ) {
-        if ((presentation == NULL) ||  (strcasecmp( presentation, "SIMPLE") != 0)) {
-            std::cerr << "WARNING: Presentation not correctly specified.";
-            std::cerr << " Defaulting Presentation to SIMPLE." << std::endl;
-        }
-        for (relix = 0 ; relix < n_relations ; relix++ ) {
-            relation = PageSpec->getRelation( relix );
-            for (runix = 0 ; runix < n_runs ; runix++ ) {
-                DPC_plot *plot;
-                // Create a list of ONE run_directory.
-                std::vector <DPM_run *> *run_list_of_one = new std::vector <DPM_run *> ;
-                run_list_of_one->push_back( (*RunListp)[runix] ); // FIXME Does this ever get deleted?
-                try {
-                    // Make a plot.
-                    plot = new DPC_standard_plot( DS_Supplier,
-                                                  run_list_of_one,
-                                                  relation,
-                                                  &total_time_constraints );
-                    // Put the new plot in the plot list.
-                    plot_list.push_back( plot );
-                } catch (const std::invalid_argument& error) {
-                    std::cerr << error.what() << std::endl;
-                }
-            }
-        }
-    }
-
-    if ( plot_list.size() == 0 ) {
-        throw std::invalid_argument("ERROR: Page does not contain any plots.") ;
-    }
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	total_time_constraints;
+				DPM_relation	*relation;
+				const	char	*presentation;
+				int	n_relations,	n_runs;
+				int	relix,	runix;
+				bool	contrast_session	=	false;
+
+				page_spec	=	PageSpec;
+				view_data	=	NULL;
+
+				//	Combine	the	time	constraints	levied	by	the	page	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	plots.
+
+				my_time_constraints	=	page_spec->getTimeConstraints();
+				total_time_constraints	=	*my_time_constraints	+	*ParentTimeConstraints;
+
+				//	------------------------
+				//	Create	subordinate	plots.
+				//	------------------------
+				n_runs	=	(int)RunListp->size();
+
+				n_relations	=	PageSpec->NumberOfRelations();
+
+				presentation	=	PageSpec->AttributeValue("presentation");
+				if	((presentation	!=	NULL)	&&	(strcasecmp(	presentation,	"CONTRAST")	==	0))	{
+								//	for	a	Contrast	session,	do	a	comparison	plot	and	delta	plot	on	same	page
+								contrast_session	=	true;
+				}
+
+				if	(	((presentation	!=	NULL)	&&	(strcasecmp(	presentation,	"COMPARISON")	==	0))	||
+									(contrast_session)	)	{
+								//	Foreach	of	the	Variable	Relations.
+								for	(relix	=	0	;	relix	<	n_relations	;	relix++	)	{
+												relation	=	PageSpec->getRelation(	relix	);
+												DPC_plot	*plot;
+												try	{
+																//	Make	a	plot.
+																plot	=	new	DPC_standard_plot(	DS_Supplier,
+																																														RunListp,
+																																														relation,
+																																														&total_time_constraints	);
+																if	(contrast_session)	{
+																				plot->setTitle("Contrast");
+																}
+																//	Put	the	new	plot	in	the	plot	list.
+																plot_list.push_back(	plot	);
+												}	catch	(const	std::invalid_argument&	error)	{
+																std::cerr	<<	error.what()	<<	std::endl;
+												}
+								}
+				}
+				if	(	((presentation	!=	NULL)	&&	(strcasecmp(	presentation,	"DELTA")	==	0))	||
+									(contrast_session)	)	{
+								//	Foreach	of	the	Variable	Relations.
+								for	(relix	=	0	;	relix	<	n_relations	;	relix++	)	{
+												relation	=	PageSpec->getRelation(	relix	);
+												DPC_plot	*plot;
+												int	i,j;
+
+												//	For	Contrast	session,	put	all	DELTA	curves	for	all	runs	on	one	plot
+												if	(contrast_session)	{
+																try	{
+																				//	Make	a	plot.
+																				plot	=	new	DPC_delta_plot(	DS_Supplier,
+																																															RunListp,
+																																															relation,
+																																															&total_time_constraints	);
+																				//	Put	the	new	plot	in	the	plot	list.
+																				plot->setTitle("Contrast");
+																				plot_list.push_back(	plot	);
+																}	catch	(const	std::invalid_argument&	error)	{
+																				std::cerr	<<	error.what()	<<	std::endl;
+																}
+												}	else	{
+												//	For	Delta	session,	create	a	DELTA	plot	for	each	pairing	of	runs.
+																for	(i=0;	i<n_runs-1;	i++)	{
+																				for	(j=i+1;	j<n_runs;	j++)	{
+
+																								DPM_run	*Run1	=	(*RunListp)[i];
+																								DPM_run	*Run2	=	(*RunListp)[j];
+																								try	{
+																												//	Make	a	plot.
+																												plot	=	new	DPC_delta_plot(	DS_Supplier,
+																																																							Run1,
+																																																							Run2,
+																																																							relation,
+																																																							&total_time_constraints	);
+																												//	Put	the	new	plot	in	the	plot	list.
+																												plot_list.push_back(	plot	);
+																								}	catch	(const	std::invalid_argument&	error)	{
+																												std::cerr	<<	error.what()	<<	std::endl;
+																								}
+
+																				}	//	end	j
+																}	//	end	i
+												}
+								}	//	end	relix
+				}
+
+				if	(	plot_list.size()	==	0	)	{
+								if	((presentation	==	NULL)	||		(strcasecmp(	presentation,	"SIMPLE")	!=	0))	{
+												std::cerr	<<	"WARNING:	Presentation	not	correctly	specified.";
+												std::cerr	<<	"	Defaulting	Presentation	to	SIMPLE."	<<	std::endl;
+								}
+								for	(relix	=	0	;	relix	<	n_relations	;	relix++	)	{
+												relation	=	PageSpec->getRelation(	relix	);
+												for	(runix	=	0	;	runix	<	n_runs	;	runix++	)	{
+																DPC_plot	*plot;
+																//	Create	a	list	of	ONE	run_directory.
+																std::vector	<DPM_run	*>	*run_list_of_one	=	new	std::vector	<DPM_run	*>	;
+																run_list_of_one->push_back(	(*RunListp)[runix]	);	//	FIXME	Does	this	ever	get	deleted?
+																try	{
+																				//	Make	a	plot.
+																				plot	=	new	DPC_standard_plot(	DS_Supplier,
+																																																		run_list_of_one,
+																																																		relation,
+																																																		&total_time_constraints	);
+																				//	Put	the	new	plot	in	the	plot	list.
+																				plot_list.push_back(	plot	);
+																}	catch	(const	std::invalid_argument&	error)	{
+																				std::cerr	<<	error.what()	<<	std::endl;
+																}
+												}
+								}
+				}
+
+				if	(	plot_list.size()	==	0	)	{
+								throw	std::invalid_argument("ERROR:	Page	does	not	contain	any	plots.")	;
+				}
 }
 
-// DESTRUCTOR
-DPC_page::~DPC_page() {
-    DPC_plot *plot;
-    int n_plots, i;
+//	DESTRUCTOR
+DPC_page::~DPC_page()	{
+				DPC_plot	*plot;
+				int	n_plots,	i;
 
-    n_plots = (int)plot_list.size();
-    for (i=0 ; i<n_plots ; i++ ) {
-        plot = plot_list[i];
-        if (plot) { delete plot; }
-    }
+				n_plots	=	(int)plot_list.size();
+				for	(i=0	;	i<n_plots	;	i++	)	{
+								plot	=	plot_list[i];
+								if	(plot)	{	delete	plot;	}
+				}
 }
 
-// MEMBER FUNCTION
-DPV_pointer DPC_page::render( DPV_view *view,
-                              DPV_pointer parent_view_data ) {
+//	MEMBER	FUNCTION
+DPV_pointer	DPC_page::render(	DPV_view	*view,
+																														DPV_pointer	parent_view_data	)	{
 
-    if (view != NULL) {
-        DPC_plot  *plot;
-        int i, n_plots;
+				if	(view	!=	NULL)	{
+								DPC_plot		*plot;
+								int	i,	n_plots;
 
-        view_data = view->render_page( parent_view_data, this);
+								view_data	=	view->render_page(	parent_view_data,	this);
 
-        // Call the render member function of each of the plot children.
-        n_plots = (int)plot_list.size();
+								//	Call	the	render	member	function	of	each	of	the	plot	children.
+								n_plots	=	(int)plot_list.size();
 
-        for (i=0 ; i<n_plots ; i++ ) {
-            plot = plot_list[i];
-            plot->render( view, view_data);
-        }
+								for	(i=0	;	i<n_plots	;	i++	)	{
+												plot	=	plot_list[i];
+												plot->render(	view,	view_data);
+								}
 
-        view->finalize_page_view(view_data);
+								view->finalize_page_view(view_data);
 
-    } else {
-        view_data = NULL;
-    }
-    return (view_data);
+				}	else	{
+								view_data	=	NULL;
+				}
+				return	(view_data);
 }
 
-// MEMBER FUNCTION
-const char *DPC_page::getAttribute(const char *key) {
-    return( page_spec->AttributeValue(key) );
+//	MEMBER	FUNCTION
+const	char	*DPC_page::getAttribute(const	char	*key)	{
+				return(	page_spec->AttributeValue(key)	);
 }
 
-// MEMBER FUNCTION
-void DPC_page::notify( DPV_view *view, DPV_message msg) {
+//	MEMBER	FUNCTION
+void	DPC_page::notify(	DPV_view	*view,	DPV_message	msg)	{
 
-    if (view_data != NULL) {
-        view->notify_page( view_data, msg);
-    }
+				if	(view_data	!=	NULL)	{
+								view->notify_page(	view_data,	msg);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_page::getTitle() {
-    return( page_spec->getTitle() );
+//	MEMBER	FUNCTION
+const	char	*DPC_page::getTitle()	{
+				return(	page_spec->getTitle()	);
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_plot.cpp b/trick_source/data_products/DPX/DPC/DPC_plot.cpp
index eeb4eb06d..4ca6ba7e2 100644
--- a/trick_source/data_products/DPX/DPC/DPC_plot.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_plot.cpp
@@ -1,101 +1,101 @@
 
-#include <string.h>
-#include <float.h>
-#include "DPC_plot.hh"
-
-// CONSTRUCTOR
-    DPC_plot::DPC_plot( DPM_relation *Relation ) {
-        relation = Relation;
-        view_data = NULL;
-        xMin = -DBL_MAX;
-        xMax = DBL_MAX;
-        yMin = -DBL_MAX;
-        yMax = DBL_MAX;
-    }
-
-// DESTRUCTOR
-    DPC_plot::~DPC_plot(){
-        int n_curves;
-        int i;
-
-        n_curves = (int)curve_list.size();
-        for (i=0 ; i<n_curves ; i++ ) {
-            DPC_curve *curve;
-            curve = curve_list[i];
-            if ( curve ) { delete curve; };
-        }
-    }
-
-// MEMBER FUNCTION
-    DPV_pointer DPC_plot::render( DPV_view *view,
-                                  DPV_pointer parent_view_data ) {
-
-        if (view != NULL) {
-            DPC_curve *curve;
-            int i, n_curves;
-
-            view_data = view->render_plot( parent_view_data, this);
-
-            // Call the render member function of each of the children.
-            n_curves = (int)curve_list.size();
-            for (i=0 ; i<n_curves ; i++ ) {
-                curve = curve_list[i];
-                curve->render( view, view_data);
-            }
-            view->finalize_plot_view( view_data);
-        } else {
-            view_data = NULL;
-        }
-        return (view_data);
-    }
-
-// MEMBER FUNCTION
-    int DPC_plot::add_curve( DPC_curve *curve) {
-
-        curve_list.push_back( curve );
-        return 0;
-    }
-
-    /** Get minimum range for x for this plot */
-    double DPC_plot::getXMin() {
-            return xMin;
-    }
-
-    /** Set minimum range for x for this plot */
-    double DPC_plot::setXMin(double value) {
-            xMin = value;
-            return xMin;
-    }
-
-    /** Get maximum range for x for this plot */
-    double DPC_plot::getXMax() {
-            return xMax;
-    }
-
-    /** Set maximum range for x for this plot */
-    double DPC_plot::setXMax(double value){
-            xMax = value;
-            return xMax;
-    }
-
-    /** Get minimum range for y for this plot */
-    double DPC_plot::getYMin() {
-            return yMin;
-    }
-
-    /** Set minimum range for y for this plot */
-    double DPC_plot::setYMin(double value) {
-            yMin = value;
-            return yMin;
-    }
-
-    /** Get maximum range for y for this plot */
-    double DPC_plot::getYMax() {
-            return yMax;
-    }
-
-    /** Set maximum range for y for this plot */
-    double DPC_plot::setYMax(double value) {
-            yMax = value;
-            return yMax;
-    }
+#include	<string.h>
+#include	<float.h>
+#include	"DPC_plot.hh"
+
+//	CONSTRUCTOR
+				DPC_plot::DPC_plot(	DPM_relation	*Relation	)	{
+								relation	=	Relation;
+								view_data	=	NULL;
+								xMin	=	-DBL_MAX;
+								xMax	=	DBL_MAX;
+								yMin	=	-DBL_MAX;
+								yMax	=	DBL_MAX;
+				}
+
+//	DESTRUCTOR
+				DPC_plot::~DPC_plot(){
+								int	n_curves;
+								int	i;
+
+								n_curves	=	(int)curve_list.size();
+								for	(i=0	;	i<n_curves	;	i++	)	{
+												DPC_curve	*curve;
+												curve	=	curve_list[i];
+												if	(	curve	)	{	delete	curve;	};
+								}
+				}
+
+//	MEMBER	FUNCTION
+				DPV_pointer	DPC_plot::render(	DPV_view	*view,
+																																		DPV_pointer	parent_view_data	)	{
+
+								if	(view	!=	NULL)	{
+												DPC_curve	*curve;
+												int	i,	n_curves;
+
+												view_data	=	view->render_plot(	parent_view_data,	this);
+
+												//	Call	the	render	member	function	of	each	of	the	children.
+												n_curves	=	(int)curve_list.size();
+												for	(i=0	;	i<n_curves	;	i++	)	{
+																curve	=	curve_list[i];
+																curve->render(	view,	view_data);
+												}
+												view->finalize_plot_view(	view_data);
+								}	else	{
+												view_data	=	NULL;
+								}
+								return	(view_data);
+				}
+
+//	MEMBER	FUNCTION
+				int	DPC_plot::add_curve(	DPC_curve	*curve)	{
+
+								curve_list.push_back(	curve	);
+								return	0;
+				}
+
+				/**	Get	minimum	range	for	x	for	this	plot	*/
+				double	DPC_plot::getXMin()	{
+												return	xMin;
+				}
+
+				/**	Set	minimum	range	for	x	for	this	plot	*/
+				double	DPC_plot::setXMin(double	value)	{
+												xMin	=	value;
+												return	xMin;
+				}
+
+				/**	Get	maximum	range	for	x	for	this	plot	*/
+				double	DPC_plot::getXMax()	{
+												return	xMax;
+				}
+
+				/**	Set	maximum	range	for	x	for	this	plot	*/
+				double	DPC_plot::setXMax(double	value){
+												xMax	=	value;
+												return	xMax;
+				}
+
+				/**	Get	minimum	range	for	y	for	this	plot	*/
+				double	DPC_plot::getYMin()	{
+												return	yMin;
+				}
+
+				/**	Set	minimum	range	for	y	for	this	plot	*/
+				double	DPC_plot::setYMin(double	value)	{
+												yMin	=	value;
+												return	yMin;
+				}
+
+				/**	Get	maximum	range	for	y	for	this	plot	*/
+				double	DPC_plot::getYMax()	{
+												return	yMax;
+				}
+
+				/**	Set	maximum	range	for	y	for	this	plot	*/
+				double	DPC_plot::setYMax(double	value)	{
+												yMax	=	value;
+												return	yMax;
+				}
diff --git a/trick_source/data_products/DPX/DPC/DPC_product.cpp b/trick_source/data_products/DPX/DPC/DPC_product.cpp
index fc23b25ec..a60748d96 100644
--- a/trick_source/data_products/DPX/DPC/DPC_product.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_product.cpp
@@ -1,220 +1,220 @@
 
-#include "DPC/DPC_product.hh"
-#include "DPM/DPM_parse_tree.hh"
+#include	"DPC/DPC_product.hh"
+#include	"DPM/DPM_parse_tree.hh"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
 
-#include <fcntl.h>  // for open()
-#include <unistd.h> // for link()
-#include <stdlib.h> // for getenv()
-#include <string.h> // for strlen()
-
-DPC_product::DPC_product( DPM_session          *Session,
-                          const char           *ProductFileName
-                          )  {
-
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints *parentTimeConstraints;
-    DPM_time_constraints  total_time_constraints;
-    DPM_parse_tree *product_parse_tree;
-    DPM_page       *page_spec;
-    DPM_table      *table_spec;
-
-    xmlNode *root_node;
-
-    int n_pages, n_tables, pagix, tabix, runix, n_runs;
-
-    // ###############################################################
-    // Validate arguements.
-    // ###############################################################
-    if (Session->run_list.size() == 0 ) {
-        std::cerr << "No RUN Directories specified." << std::endl;
-        std::cerr.flush();
-        throw std::invalid_argument("No RUN directories specified.");
-    }
-
-    if (! ProductFileName) {
-        std::cerr << "No ProductFileName specified." << std::endl;
-        std::cerr.flush();
-        throw std::invalid_argument("No product file name specified.");
-    }
-
-    product_parse_tree = new DPM_parse_tree( ProductFileName);
-    root_node = product_parse_tree->getRootNode();
-    product_spec = new DPM_product( Session, root_node);
-    delete product_parse_tree;
-
-    datastream_supplier = new DPC_datastream_supplier( product_spec );
-    view_data = NULL;
-
-    // ###############################################################
-    // Determine our time constraints.
-    // ###############################################################
-
-    // Combine the time constraints levied by the product specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate pages.
-
-    parentTimeConstraints = Session->time_constraints;
-    my_time_constraints = product_spec->getTimeConstraints();
-    total_time_constraints = *my_time_constraints + *parentTimeConstraints;
-
-    const char* session_mode = Session->AttributeValue("mode");
-
-    if ((session_mode == NULL) || (strcasecmp( session_mode, "plot") == 0)) {
-
-        // ###############################################################
-        // Create subordinate pages.
-        // ###############################################################
-        n_pages = product_spec->NumberOfPages();
-
-        for (pagix = 0 ; pagix < n_pages ; pagix ++) {
-            DPC_page *page;
-
-            page_spec = product_spec->getPage(pagix);
-
-            try {
-            page = new DPC_page( datastream_supplier,
-                                 &(Session->run_list),
-                                 page_spec,
-                                 parentTimeConstraints );
-            // Put the new page in the page list.
-            page_list.push_back( page );
-            } catch (std::invalid_argument& error) {
-                std::cerr << error.what() << std::endl;
-            }
-
-        }
-    }
-
-    if ((session_mode == NULL) || (strcasecmp( session_mode, "table") == 0)) {
-
-        // ###############################################################
-        // Create subordinate tables.
-        // ###############################################################
-        n_tables = product_spec->NumberOfTables();
-        n_runs = (int)Session->run_list.size();
-
-        // Foreach of the Tables.
-        for (tabix = 0 ; tabix < n_tables ; tabix++ ) {
-
-            table_spec = product_spec->getTable( tabix );
-
-            // Foreach of the RUNS
-            for (runix = 0 ; runix < n_runs ; runix++ ) {
-                DPC_table *table;
-
-                // Make a plot.
-                table = new DPC_table( datastream_supplier,
-                                       Session->run_list[runix],
-                                       table_spec,
-                                       &total_time_constraints );
-
-                // Put the new plot in the plot list.
-                table_list.push_back( table );
-            }
-        }
-    }
+#include	<fcntl.h>		//	for	open()
+#include	<unistd.h>	//	for	link()
+#include	<stdlib.h>	//	for	getenv()
+#include	<string.h>	//	for	strlen()
+
+DPC_product::DPC_product(	DPM_session										*Session,
+																										const	char											*ProductFileName
+																										)		{
+
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	*parentTimeConstraints;
+				DPM_time_constraints		total_time_constraints;
+				DPM_parse_tree	*product_parse_tree;
+				DPM_page							*page_spec;
+				DPM_table						*table_spec;
+
+				xmlNode	*root_node;
+
+				int	n_pages,	n_tables,	pagix,	tabix,	runix,	n_runs;
+
+				//	###############################################################
+				//	Validate	arguements.
+				//	###############################################################
+				if	(Session->run_list.size()	==	0	)	{
+								std::cerr	<<	"No	RUN	Directories	specified."	<<	std::endl;
+								std::cerr.flush();
+								throw	std::invalid_argument("No	RUN	directories	specified.");
+				}
+
+				if	(!	ProductFileName)	{
+								std::cerr	<<	"No	ProductFileName	specified."	<<	std::endl;
+								std::cerr.flush();
+								throw	std::invalid_argument("No	product	file	name	specified.");
+				}
+
+				product_parse_tree	=	new	DPM_parse_tree(	ProductFileName);
+				root_node	=	product_parse_tree->getRootNode();
+				product_spec	=	new	DPM_product(	Session,	root_node);
+				delete	product_parse_tree;
+
+				datastream_supplier	=	new	DPC_datastream_supplier(	product_spec	);
+				view_data	=	NULL;
+
+				//	###############################################################
+				//	Determine	our	time	constraints.
+				//	###############################################################
+
+				//	Combine	the	time	constraints	levied	by	the	product	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	pages.
+
+				parentTimeConstraints	=	Session->time_constraints;
+				my_time_constraints	=	product_spec->getTimeConstraints();
+				total_time_constraints	=	*my_time_constraints	+	*parentTimeConstraints;
+
+				const	char*	session_mode	=	Session->AttributeValue("mode");
+
+				if	((session_mode	==	NULL)	||	(strcasecmp(	session_mode,	"plot")	==	0))	{
+
+								//	###############################################################
+								//	Create	subordinate	pages.
+								//	###############################################################
+								n_pages	=	product_spec->NumberOfPages();
+
+								for	(pagix	=	0	;	pagix	<	n_pages	;	pagix	++)	{
+												DPC_page	*page;
+
+												page_spec	=	product_spec->getPage(pagix);
+
+												try	{
+												page	=	new	DPC_page(	datastream_supplier,
+																																	&(Session->run_list),
+																																	page_spec,
+																																	parentTimeConstraints	);
+												//	Put	the	new	page	in	the	page	list.
+												page_list.push_back(	page	);
+												}	catch	(std::invalid_argument&	error)	{
+																std::cerr	<<	error.what()	<<	std::endl;
+												}
+
+								}
+				}
+
+				if	((session_mode	==	NULL)	||	(strcasecmp(	session_mode,	"table")	==	0))	{
+
+								//	###############################################################
+								//	Create	subordinate	tables.
+								//	###############################################################
+								n_tables	=	product_spec->NumberOfTables();
+								n_runs	=	(int)Session->run_list.size();
+
+								//	Foreach	of	the	Tables.
+								for	(tabix	=	0	;	tabix	<	n_tables	;	tabix++	)	{
+
+												table_spec	=	product_spec->getTable(	tabix	);
+
+												//	Foreach	of	the	RUNS
+												for	(runix	=	0	;	runix	<	n_runs	;	runix++	)	{
+																DPC_table	*table;
+
+																//	Make	a	plot.
+																table	=	new	DPC_table(	datastream_supplier,
+																																							Session->run_list[runix],
+																																							table_spec,
+																																							&total_time_constraints	);
+
+																//	Put	the	new	plot	in	the	plot	list.
+																table_list.push_back(	table	);
+												}
+								}
+				}
 
 }
-// DESTRUCTOR
-DPC_product::~DPC_product() {
-    DPC_page *page;
-    DPC_table *table;
-    int n_pages, pagix;
-    int n_tables, tabix;
-
-    delete product_spec;
-    delete datastream_supplier;
-    n_pages = (int)page_list.size();
-    for (pagix = 0 ; pagix < n_pages ; pagix ++) {
-        page = page_list[pagix];
-        delete page;
-    }
-    n_tables = (int)table_list.size();
-    for (tabix = 0 ; tabix < n_tables ; tabix ++) {
-        table = table_list[tabix];
-        delete table;
-    }
+//	DESTRUCTOR
+DPC_product::~DPC_product()	{
+				DPC_page	*page;
+				DPC_table	*table;
+				int	n_pages,	pagix;
+				int	n_tables,	tabix;
+
+				delete	product_spec;
+				delete	datastream_supplier;
+				n_pages	=	(int)page_list.size();
+				for	(pagix	=	0	;	pagix	<	n_pages	;	pagix	++)	{
+								page	=	page_list[pagix];
+								delete	page;
+				}
+				n_tables	=	(int)table_list.size();
+				for	(tabix	=	0	;	tabix	<	n_tables	;	tabix	++)	{
+								table	=	table_list[tabix];
+								delete	table;
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_product::getTitle() {
-    return ( product_spec->getTitle());
+//	MEMBER	FUNCTION
+const	char	*DPC_product::getTitle()	{
+				return	(	product_spec->getTitle());
 }
 
-// MEMBER FUNCTION
-int DPC_product::NumberOfTables() {
-    return ((int)table_list.size());
+//	MEMBER	FUNCTION
+int	DPC_product::NumberOfTables()	{
+				return	((int)table_list.size());
 }
 
-// MEMBER FUNCTION
-DPC_table *DPC_product::getTable( unsigned int index) {
-    if (index < table_list.size( ))  {
-        return ( table_list[index]);
-    } else {
-        return NULL;
-    }
+//	MEMBER	FUNCTION
+DPC_table	*DPC_product::getTable(	unsigned	int	index)	{
+				if	(index	<	table_list.size(	))		{
+								return	(	table_list[index]);
+				}	else	{
+								return	NULL;
+				}
 }
 
-// MEMBER FUNCTION
-int DPC_product::NumberOfPages() {
-    return ( (int)page_list.size());
+//	MEMBER	FUNCTION
+int	DPC_product::NumberOfPages()	{
+				return	(	(int)page_list.size());
 }
 
-// MEMBER FUNCTION
-DPC_page *DPC_product::getPage(unsigned int index) {
+//	MEMBER	FUNCTION
+DPC_page	*DPC_product::getPage(unsigned	int	index)	{
 
-    if (index < page_list.size()) {
-        return( page_list[index]);
-    } else {
-        return NULL;
-    }
+				if	(index	<	page_list.size())	{
+								return(	page_list[index]);
+				}	else	{
+								return	NULL;
+				}
 }
 
-// MEMBER FUNCTION
-DPV_pointer DPC_product::render( DPV_view *view ) {
-
-    if (view != NULL) {
-        DPC_page  *page;
-        DPC_table *table;
-        int i, n_pages, n_tables;
-
-        view_data = view->render_product( this);
-
-        // Call the render member function of each of the children.
-        n_pages = (int)page_list.size();
-        for (i=0 ; i<n_pages ; i++ ) {
-            page = page_list[i];
-            page->render( view, view_data);
-        }
-
-        // Call the render member function of each of the children.
-        n_tables = (int)table_list.size();
-        for (i=0 ; i<n_tables ; i++ ) {
-            table = table_list[i];
-            table->render( view, view_data);
-        }
-
-        view->finalize_product_view( view_data);
-
-    } else {
-        std::cout << "DPC_product::render: view is NULL." << std::endl;
-        view_data = NULL;
-    }
-    return (view_data);
+//	MEMBER	FUNCTION
+DPV_pointer	DPC_product::render(	DPV_view	*view	)	{
+
+				if	(view	!=	NULL)	{
+								DPC_page		*page;
+								DPC_table	*table;
+								int	i,	n_pages,	n_tables;
+
+								view_data	=	view->render_product(	this);
+
+								//	Call	the	render	member	function	of	each	of	the	children.
+								n_pages	=	(int)page_list.size();
+								for	(i=0	;	i<n_pages	;	i++	)	{
+												page	=	page_list[i];
+												page->render(	view,	view_data);
+								}
+
+								//	Call	the	render	member	function	of	each	of	the	children.
+								n_tables	=	(int)table_list.size();
+								for	(i=0	;	i<n_tables	;	i++	)	{
+												table	=	table_list[i];
+												table->render(	view,	view_data);
+								}
+
+								view->finalize_product_view(	view_data);
+
+				}	else	{
+								std::cout	<<	"DPC_product::render:	view	is	NULL."	<<	std::endl;
+								view_data	=	NULL;
+				}
+				return	(view_data);
 }
 
-void DPC_product::notify( DPV_view *view, DPV_message msg ) {
+void	DPC_product::notify(	DPV_view	*view,	DPV_message	msg	)	{
 
-    if (view_data != NULL) {
-        view->notify_product( view_data, msg);
-    }
+				if	(view_data	!=	NULL)	{
+								view->notify_product(	view_data,	msg);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_product::getAttribute(const char *key) {
-    return( product_spec->AttributeValue(key) );
+//	MEMBER	FUNCTION
+const	char	*DPC_product::getAttribute(const	char	*key)	{
+				return(	product_spec->AttributeValue(key)	);
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp b/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
index f7c75f32e..dc4bac9e4 100644
--- a/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
@@ -1,71 +1,71 @@
 
-#include "DPC/DPC_standard_plot.hh"
-#include "DPC/DPC_std_curve.hh"
-#include "DPM/DPM_var.hh"
-#include "DPM/DPM_axis.hh"
+#include	"DPC/DPC_standard_plot.hh"
+#include	"DPC/DPC_std_curve.hh"
+#include	"DPM/DPM_var.hh"
+#include	"DPM/DPM_axis.hh"
 
-// CONSTRUCTOR
+//	CONSTRUCTOR
 DPC_standard_plot::DPC_standard_plot(
-                                     DPC_datastream_supplier *DS_Supplier,
-                                     std::vector <DPM_run *> *RunListp,
-                                     DPM_relation            *Relation,
-                                     DPM_time_constraints    *ParentTimeConstraints )
-    : DPC_plot (Relation) {
+																																					DPC_datastream_supplier	*DS_Supplier,
+																																					std::vector	<DPM_run	*>	*RunListp,
+																																					DPM_relation												*Relation,
+																																					DPM_time_constraints				*ParentTimeConstraints	)
+				:	DPC_plot	(Relation)	{
 
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints total_time_constraints;
-    int n_runs, n_curves;
-    int cix, runix;
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	total_time_constraints;
+				int	n_runs,	n_curves;
+				int	cix,	runix;
 
-    if ( !DS_Supplier )           { throw std::invalid_argument("DS_Supplier is NULL."); }
-    if ( !RunListp )              { throw std::invalid_argument("RunListp is NULL."); }
-    if ( !Relation )              { throw std::invalid_argument("Relation is NULL."); }
-    if ( !ParentTimeConstraints ) { throw std::invalid_argument("ParentTimeConstraints is NULL."); }
+				if	(	!DS_Supplier	)											{	throw	std::invalid_argument("DS_Supplier	is	NULL.");	}
+				if	(	!RunListp	)														{	throw	std::invalid_argument("RunListp	is	NULL.");	}
+				if	(	!Relation	)														{	throw	std::invalid_argument("Relation	is	NULL.");	}
+				if	(	!ParentTimeConstraints	)	{	throw	std::invalid_argument("ParentTimeConstraints	is	NULL.");	}
 
-    // Combine the time constraints levied by the plot specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate curves.
+				//	Combine	the	time	constraints	levied	by	the	plot	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	curves.
 
-    my_time_constraints = Relation->getTimeConstraints();
-    total_time_constraints = *my_time_constraints + *ParentTimeConstraints;
+				my_time_constraints	=	Relation->getTimeConstraints();
+				total_time_constraints	=	*my_time_constraints	+	*ParentTimeConstraints;
 
-    n_runs = (int)RunListp->size();
+				n_runs	=	(int)RunListp->size();
 
-    n_curves = Relation->NumberOfCurves();
+				n_curves	=	Relation->NumberOfCurves();
 
-    // for each of the RUNs
-    for (runix = 0 ; runix < n_runs ; runix++) {
-        // for each of the curves
-        for (cix = 0 ; cix < n_curves ; cix ++ ) {
-            DPC_curve *curve;
-            DPM_curve *curve_spec = Relation->getCurve(cix);
-            try {
-                // Make a curve.
-                curve = new DPC_std_curve( curve_spec,
-                                           (*RunListp)[runix],
-                                           DS_Supplier,
-                                           &total_time_constraints );
-            } catch (const std::logic_error& error) {
-                curve = NULL;
-                std::cerr << error.what() << std::endl;
-            }
+				//	for	each	of	the	RUNs
+				for	(runix	=	0	;	runix	<	n_runs	;	runix++)	{
+								//	for	each	of	the	curves
+								for	(cix	=	0	;	cix	<	n_curves	;	cix	++	)	{
+												DPC_curve	*curve;
+												DPM_curve	*curve_spec	=	Relation->getCurve(cix);
+												try	{
+																//	Make	a	curve.
+																curve	=	new	DPC_std_curve(	curve_spec,
+																																											(*RunListp)[runix],
+																																											DS_Supplier,
+																																											&total_time_constraints	);
+												}	catch	(const	std::logic_error&	error)	{
+																curve	=	NULL;
+																std::cerr	<<	error.what()	<<	std::endl;
+												}
 
-            // Put that new curve object into the curve list.
-            if ( curve) {
-                if ( add_curve( curve) < 0 ) {
-                    std::cerr << "ERROR: Rejecting curve." << std::endl;
-                    delete curve;
-                }
-            }
-        }
-    }
+												//	Put	that	new	curve	object	into	the	curve	list.
+												if	(	curve)	{
+																if	(	add_curve(	curve)	<	0	)	{
+																				std::cerr	<<	"ERROR:	Rejecting	curve."	<<	std::endl;
+																				delete	curve;
+																}
+												}
+								}
+				}
 
-    // VALIDATION
-    // 1. We must have added at least 1 valid curve to the list.
-    // 2. If we have more than one curve, all of the ACTUAL units must match.
-    if ( getNumCurves() <= 0) {
-        throw std::invalid_argument("ERROR: DPC_plot does not contain any valid curves.");
-    }
+				//	VALIDATION
+				//	1.	We	must	have	added	at	least	1	valid	curve	to	the	list.
+				//	2.	If	we	have	more	than	one	curve,	all	of	the	ACTUAL	units	must	match.
+				if	(	getNumCurves()	<=	0)	{
+								throw	std::invalid_argument("ERROR:	DPC_plot	does	not	contain	any	valid	curves.");
+				}
 
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
index 55d37bf4a..c73a3230e 100644
--- a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
@@ -1,271 +1,271 @@
 
-#include <udunits2.h>
+#include	<udunits2.h>
 
-#include "DPC/DPC_std_curve.hh"
-#include "math.h"
+#include	"DPC/DPC_std_curve.hh"
+#include	"math.h"
 
-extern ut_system * u_system ;
+extern	ut_system	*	u_system	;
 
-// CONSTRUCTOR
+//	CONSTRUCTOR
 DPC_std_curve::DPC_std_curve(
-                             DPM_curve*               Curve_spec,
-                             DPM_run*                 Run,
-                             DPC_datastream_supplier *ds_supplier,
-                             DPM_time_constraints    *Time_constraints )
-    : DPC_curve() {
-
-    char work[255];
-    char *temp_s;
-
-    unsigned int case_index = 0;
-    unsigned int success = 0;
-    const char*  run_dir = Run->getDir();
-    unsigned int number_of_cases = Curve_spec->NumberOfVarCases();
-
-    x_actual_units = NULL;
-    y_actual_units = NULL;
-
-    data_src_label = NULL;
-    time_conversion = NULL;
-
-    // While we haven't found found a variable-pair that works for
-    // this RUN and we haven't exhausted all of the variable-pairs.
-
-    while ( !success && (case_index < number_of_cases)) {
-
-        x_var = Curve_spec->getXVar(case_index);
-        const char* x_var_name = x_var->getName();
-        const char* x_var_units = x_var->AttributeValue("units");
-        const char* x_var_from_units = x_var->AttributeValue("from_units");
-
-        y_var = Curve_spec->getYVar(case_index);
-        const char* y_var_name = y_var->getName();
-        const char* y_var_units = y_var->AttributeValue("units");
-        const char* y_var_from_units = y_var->AttributeValue("from_units");
-
-        // If the X-axis represents time then this curve is of type:
-        //
-        //                      <X,Y> = <t,A(t)>
-
-        if ( strcmp( (const char *)x_var_name, Run->getTimeName()) == 0) {
-
-            // Because the X-axis is time, we handle it's unit conversion
-            // here. Note that for the Y-axis or where the X-axis is not time,
-            // unit conversion handled by the corresponding
-            // DPC_UnitConvDataStream.
-
-            // If the user has specified a conversion to units other than seconds,
-            // then generate a units conversion from seconds to those units.
-            if ((x_var_units != NULL) && (strcmp( x_var_units,"s" ) != 0)) {
-
-                ut_unit *to;
-                ut_unit *from;
-
-                to = ut_parse(u_system, x_var_units, UT_ASCII) ;
-                if ( ! to ) {
-                    std::cerr << "ERROR: For the curve <X,Y> = <" << x_var_name << ", "
-                              << y_var_name << ">, " << "the units (\""<< x_var_units
-                              << "\") specified for " << x_var_name << " are invalid."
-                              << std::endl;
-                }
-
-                // Create the "from" object.
-                // Note that in the case of time, from_units must be seconds.
-                from = ut_parse(u_system, "s", UT_ASCII) ;
-
-                // If both the to and from objects are created
-                // successfully then attempt to create the conversion.
-                if (to && from) {
-                    x_actual_units = strdup( x_var_units);
-                    time_conversion = ut_get_converter(from,to) ;
-                    if ( time_conversion == NULL ) {
-                        std::cerr << "ERROR: For the curve <X,Y> = <" << x_var_name << ", "
-                                  << y_var_name << ">, " << "seconds (\"s\") cannot be converted to (\""<< x_var_units
-                                  << "\"), which have been specified for " << x_var_name << "."
-                                  << std::endl;
-                        time_conversion = cv_get_trivial() ;
-                        x_actual_units = strdup("s");
-                    }
-                    ut_free(to) ;
-                    ut_free(from) ;
-                } else {
-                    time_conversion = cv_get_trivial() ;
-                    x_actual_units = strdup("s");
-                }
-            } else {
-                time_conversion = cv_get_trivial() ;
-                x_actual_units = strdup("s");
-            }
-
-            // Create the one DataStream [A(t)] that we need for this curve.
-
-            ds[0] = ds_supplier->getDataStream( y_var_name,
-                                                y_var_units,
-                                                y_var_from_units,
-                                                Run,
-                                                Time_constraints );
-            if (ds[0] != NULL) {
-
-                std::string ds_units = ds[0]->getUnit();
-
-                y_actual_units = strdup(ds_units.c_str());
-
-                // Tell our DataStream to start at the beginning.
-                ds[0]->begin();
-
-                // Since we are not going to use two DataStreams in this case set
-                // the second one to NULL.
-                ds[1] = NULL;
-
-                // We've successfully initialized our curve from the variable-pair.
-                success = 1;
-
-            } else {
-                std::cerr << "ERROR: Variable \"" << y_var_name << "\" wasn't found in " << std::endl
-                          << "Run Directory \"" << run_dir << "\"" << std::endl;
-                std::cerr.flush();
-            }
-
-        } else {
-
-            // The X-axis does not represent time so this curve is of type:
-            //
-            //                        <X,Y> = <A(t),B(t)>
-
-            // Create the X-axis DataStream that we need for this curve.
-            ds[0] = ds_supplier->getDataStream( x_var_name, x_var_units, x_var_from_units, Run, Time_constraints );
-
-            // If we're successful then ...
-            if (ds[0] != NULL) {
-
-                x_actual_units = strdup( ds[0]->getUnit().c_str() );
-                ds[0]->begin();
-
-                // Create the Y-axis DataStream.
-                ds[1] = ds_supplier->getDataStream( y_var_name, y_var_units, y_var_from_units, Run, Time_constraints );
-
-                // If we're successful then ...
-                if (ds[1] != NULL) {
-                    y_actual_units = strdup( ds[1]->getUnit().c_str() );
-                    ds[1]->begin();
-
-                    // We're succesfully initialized our curve from the variable-pair.
-                    success = 1;
-
-                } else {
-                    delete ds[0]; ds[0] = NULL;
-                    std::cerr << "Variable \"" << y_var_name << "\" wasn't found in " << std::endl
-                              << "Run Directory \"" << run_dir << "\"" << std::endl;
-                    std::cerr.flush();
-                }
-            } else {
-                std::cerr << "Variable \"" << x_var_name << "\" wasn't found in " << std::endl
-                          << "Run Directory \"" << run_dir << "\"" << std::endl;
-                std::cerr.flush();
-            }
-        }
-        case_index++;
-    }
-
-    if (!success) {
-        throw (std::logic_error("Failed to create curve."));
-    }
-
-    // ----------------------
-    // Save the RUN directory.
-    // ----------------------
-    work[0] ='\0';
-    if ((temp_s = strrchr((char*)run_dir,'/')) != NULL) {
-        strcpy(work, temp_s+1);
-    } else {
-        strcpy(work, run_dir);
-    }
-    data_src_label = strdup(work);
+																													DPM_curve*															Curve_spec,
+																													DPM_run*																	Run,
+																													DPC_datastream_supplier	*ds_supplier,
+																													DPM_time_constraints				*Time_constraints	)
+				:	DPC_curve()	{
+
+				char	work[255];
+				char	*temp_s;
+
+				unsigned	int	case_index	=	0;
+				unsigned	int	success	=	0;
+				const	char*		run_dir	=	Run->getDir();
+				unsigned	int	number_of_cases	=	Curve_spec->NumberOfVarCases();
+
+				x_actual_units	=	NULL;
+				y_actual_units	=	NULL;
+
+				data_src_label	=	NULL;
+				time_conversion	=	NULL;
+
+				//	While	we	haven't	found	found	a	variable-pair	that	works	for
+				//	this	RUN	and	we	haven't	exhausted	all	of	the	variable-pairs.
+
+				while	(	!success	&&	(case_index	<	number_of_cases))	{
+
+								x_var	=	Curve_spec->getXVar(case_index);
+								const	char*	x_var_name	=	x_var->getName();
+								const	char*	x_var_units	=	x_var->AttributeValue("units");
+								const	char*	x_var_from_units	=	x_var->AttributeValue("from_units");
+
+								y_var	=	Curve_spec->getYVar(case_index);
+								const	char*	y_var_name	=	y_var->getName();
+								const	char*	y_var_units	=	y_var->AttributeValue("units");
+								const	char*	y_var_from_units	=	y_var->AttributeValue("from_units");
+
+								//	If	the	X-axis	represents	time	then	this	curve	is	of	type:
+								//
+								//																						<X,Y>	=	<t,A(t)>
+
+								if	(	strcmp(	(const	char	*)x_var_name,	Run->getTimeName())	==	0)	{
+
+												//	Because	the	X-axis	is	time,	we	handle	it's	unit	conversion
+												//	here.	Note	that	for	the	Y-axis	or	where	the	X-axis	is	not	time,
+												//	unit	conversion	handled	by	the	corresponding
+												//	DPC_UnitConvDataStream.
+
+												//	If	the	user	has	specified	a	conversion	to	units	other	than	seconds,
+												//	then	generate	a	units	conversion	from	seconds	to	those	units.
+												if	((x_var_units	!=	NULL)	&&	(strcmp(	x_var_units,"s"	)	!=	0))	{
+
+																ut_unit	*to;
+																ut_unit	*from;
+
+																to	=	ut_parse(u_system,	x_var_units,	UT_ASCII)	;
+																if	(	!	to	)	{
+																				std::cerr	<<	"ERROR:	For	the	curve	<X,Y>	=	<"	<<	x_var_name	<<	",	"
+																														<<	y_var_name	<<	">,	"	<<	"the	units	(\""<<	x_var_units
+																														<<	"\")	specified	for	"	<<	x_var_name	<<	"	are	invalid."
+																														<<	std::endl;
+																}
+
+																//	Create	the	"from"	object.
+																//	Note	that	in	the	case	of	time,	from_units	must	be	seconds.
+																from	=	ut_parse(u_system,	"s",	UT_ASCII)	;
+
+																//	If	both	the	to	and	from	objects	are	created
+																//	successfully	then	attempt	to	create	the	conversion.
+																if	(to	&&	from)	{
+																				x_actual_units	=	strdup(	x_var_units);
+																				time_conversion	=	ut_get_converter(from,to)	;
+																				if	(	time_conversion	==	NULL	)	{
+																								std::cerr	<<	"ERROR:	For	the	curve	<X,Y>	=	<"	<<	x_var_name	<<	",	"
+																																		<<	y_var_name	<<	">,	"	<<	"seconds	(\"s\")	cannot	be	converted	to	(\""<<	x_var_units
+																																		<<	"\"),	which	have	been	specified	for	"	<<	x_var_name	<<	"."
+																																		<<	std::endl;
+																								time_conversion	=	cv_get_trivial()	;
+																								x_actual_units	=	strdup("s");
+																				}
+																				ut_free(to)	;
+																				ut_free(from)	;
+																}	else	{
+																				time_conversion	=	cv_get_trivial()	;
+																				x_actual_units	=	strdup("s");
+																}
+												}	else	{
+																time_conversion	=	cv_get_trivial()	;
+																x_actual_units	=	strdup("s");
+												}
+
+												//	Create	the	one	DataStream	[A(t)]	that	we	need	for	this	curve.
+
+												ds[0]	=	ds_supplier->getDataStream(	y_var_name,
+																																																y_var_units,
+																																																y_var_from_units,
+																																																Run,
+																																																Time_constraints	);
+												if	(ds[0]	!=	NULL)	{
+
+																std::string	ds_units	=	ds[0]->getUnit();
+
+																y_actual_units	=	strdup(ds_units.c_str());
+
+																//	Tell	our	DataStream	to	start	at	the	beginning.
+																ds[0]->begin();
+
+																//	Since	we	are	not	going	to	use	two	DataStreams	in	this	case	set
+																//	the	second	one	to	NULL.
+																ds[1]	=	NULL;
+
+																//	We've	successfully	initialized	our	curve	from	the	variable-pair.
+																success	=	1;
+
+												}	else	{
+																std::cerr	<<	"ERROR:	Variable	\""	<<	y_var_name	<<	"\"	wasn't	found	in	"	<<	std::endl
+																										<<	"Run	Directory	\""	<<	run_dir	<<	"\""	<<	std::endl;
+																std::cerr.flush();
+												}
+
+								}	else	{
+
+												//	The	X-axis	does	not	represent	time	so	this	curve	is	of	type:
+												//
+												//																								<X,Y>	=	<A(t),B(t)>
+
+												//	Create	the	X-axis	DataStream	that	we	need	for	this	curve.
+												ds[0]	=	ds_supplier->getDataStream(	x_var_name,	x_var_units,	x_var_from_units,	Run,	Time_constraints	);
+
+												//	If	we're	successful	then	...
+												if	(ds[0]	!=	NULL)	{
+
+																x_actual_units	=	strdup(	ds[0]->getUnit().c_str()	);
+																ds[0]->begin();
+
+																//	Create	the	Y-axis	DataStream.
+																ds[1]	=	ds_supplier->getDataStream(	y_var_name,	y_var_units,	y_var_from_units,	Run,	Time_constraints	);
+
+																//	If	we're	successful	then	...
+																if	(ds[1]	!=	NULL)	{
+																				y_actual_units	=	strdup(	ds[1]->getUnit().c_str()	);
+																				ds[1]->begin();
+
+																				//	We're	succesfully	initialized	our	curve	from	the	variable-pair.
+																				success	=	1;
+
+																}	else	{
+																				delete	ds[0];	ds[0]	=	NULL;
+																				std::cerr	<<	"Variable	\""	<<	y_var_name	<<	"\"	wasn't	found	in	"	<<	std::endl
+																														<<	"Run	Directory	\""	<<	run_dir	<<	"\""	<<	std::endl;
+																				std::cerr.flush();
+																}
+												}	else	{
+																std::cerr	<<	"Variable	\""	<<	x_var_name	<<	"\"	wasn't	found	in	"	<<	std::endl
+																										<<	"Run	Directory	\""	<<	run_dir	<<	"\""	<<	std::endl;
+																std::cerr.flush();
+												}
+								}
+								case_index++;
+				}
+
+				if	(!success)	{
+								throw	(std::logic_error("Failed	to	create	curve."));
+				}
+
+				//	----------------------
+				//	Save	the	RUN	directory.
+				//	----------------------
+				work[0]	='\0';
+				if	((temp_s	=	strrchr((char*)run_dir,'/'))	!=	NULL)	{
+								strcpy(work,	temp_s+1);
+				}	else	{
+								strcpy(work,	run_dir);
+				}
+				data_src_label	=	strdup(work);
 
 }
 
-// DESTRUCTOR
-DPC_std_curve::~DPC_std_curve() {
-
-    // We ONLY delete what we create.
-    if ( ds[0] ) {
-        delete ds[0];
-        ds[0] = NULL;
-    };
-    if ( ds[1] ) {
-        delete ds[1];
-        ds[1] = NULL; };
-
-    if ( x_actual_units ) {
-        free( x_actual_units);
-        x_actual_units = NULL;
-    }
-    if ( y_actual_units ) {
-        free( y_actual_units);
-        y_actual_units = NULL;
-    }
-
-    if ( data_src_label ) {
-        free( data_src_label);
-        data_src_label = NULL;
-    }
-    if ( time_conversion ) {
-        cv_free(time_conversion);
-        time_conversion = NULL;
-    }
+//	DESTRUCTOR
+DPC_std_curve::~DPC_std_curve()	{
+
+				//	We	ONLY	delete	what	we	create.
+				if	(	ds[0]	)	{
+								delete	ds[0];
+								ds[0]	=	NULL;
+				};
+				if	(	ds[1]	)	{
+								delete	ds[1];
+								ds[1]	=	NULL;	};
+
+				if	(	x_actual_units	)	{
+								free(	x_actual_units);
+								x_actual_units	=	NULL;
+				}
+				if	(	y_actual_units	)	{
+								free(	y_actual_units);
+								y_actual_units	=	NULL;
+				}
+
+				if	(	data_src_label	)	{
+								free(	data_src_label);
+								data_src_label	=	NULL;
+				}
+				if	(	time_conversion	)	{
+								cv_free(time_conversion);
+								time_conversion	=	NULL;
+				}
 }
 
-// MEMBER FUNCTION
-const char* DPC_std_curve::getXUnits() {
-    return ( x_actual_units);
+//	MEMBER	FUNCTION
+const	char*	DPC_std_curve::getXUnits()	{
+				return	(	x_actual_units);
 }
 
-// MEMBER FUNCTION
-const char* DPC_std_curve::getYUnits() {
-    return ( y_actual_units);
+//	MEMBER	FUNCTION
+const	char*	DPC_std_curve::getYUnits()	{
+				return	(	y_actual_units);
 }
 
-// MEMBER FUNCTION
-const char *DPC_std_curve::getDataSrcLbl() {
-    return( data_src_label);
+//	MEMBER	FUNCTION
+const	char	*DPC_std_curve::getDataSrcLbl()	{
+				return(	data_src_label);
 }
 
-// MEMBER FUNCTION
-int DPC_std_curve::getXY(double *X_value, double *Y_value) {
-
-    double t1,t2,v1,v2;
-    int eos;
-
-    if (ds[0]) {
-        if (ds[1]) {
-            eos = !(ds[0]->get( &t1, &v1) && ds[1]->get( &t2, &v2));
-            while (!eos && ( fabs( t1 - t2) > T_TOLERANCE )) {
-                if (t1 < t2) {
-                    eos = ! ds[0]->get( &t1, &v1);
-                } else {
-                    eos = ! ds[1]->get( &t2, &v2);
-                }
-            }
-            *X_value = v1;
-            *Y_value = v2;
-            if (!eos) {
-                return(1);
-            }
-        } else {
-            eos = !ds[0]->get( &t1, &v1);
-            *X_value = cv_convert_double(time_conversion,t1);
-            *Y_value = v1;
-            if (!eos) {
-                return(1);
-	    }
+//	MEMBER	FUNCTION
+int	DPC_std_curve::getXY(double	*X_value,	double	*Y_value)	{
+
+				double	t1,t2,v1,v2;
+				int	eos;
+
+				if	(ds[0])	{
+								if	(ds[1])	{
+												eos	=	!(ds[0]->get(	&t1,	&v1)	&&	ds[1]->get(	&t2,	&v2));
+												while	(!eos	&&	(	fabs(	t1	-	t2)	>	T_TOLERANCE	))	{
+																if	(t1	<	t2)	{
+																				eos	=	!	ds[0]->get(	&t1,	&v1);
+																}	else	{
+																				eos	=	!	ds[1]->get(	&t2,	&v2);
+																}
+												}
+												*X_value	=	v1;
+												*Y_value	=	v2;
+												if	(!eos)	{
+																return(1);
+												}
+								}	else	{
+												eos	=	!ds[0]->get(	&t1,	&v1);
+												*X_value	=	cv_convert_double(time_conversion,t1);
+												*Y_value	=	v1;
+												if	(!eos)	{
+																return(1);
+					}
 	}
-    }
-    return(0);
+				}
+				return(0);
 }
 
-// MEMBER FUNCTION
-void DPC_std_curve::begin() {
-    if (ds[0]) ds[0]->begin();
-    if (ds[1]) ds[1]->begin();
+//	MEMBER	FUNCTION
+void	DPC_std_curve::begin()	{
+				if	(ds[0])	ds[0]->begin();
+				if	(ds[1])	ds[1]->begin();
 }
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_table.cpp b/trick_source/data_products/DPX/DPC/DPC_table.cpp
index 9615d4888..0e0b71dd1 100644
--- a/trick_source/data_products/DPX/DPC/DPC_table.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_table.cpp
@@ -1,319 +1,319 @@
 
-#include <udunits2.h>
-#include "DPC/DPC_table.hh"
-#include "DPM/DPM_var.hh"
-#include "DPM/DPM_column.hh"
-
-extern ut_system * u_system ;
-
-static const char *default_time_units = "s";
-
-// CONSTRUCTOR
-DPC_table::DPC_table( DPC_datastream_supplier *DS_Supplier,
-                      DPM_run                 *Run,
-                      DPM_table               *Table_spec,
-                      DPM_time_constraints    *ParentTimeConstraints )
-     {
-
-    DPM_time_constraints *my_time_constraints;
-    DPM_time_constraints total_time_constraints;
-    DPM_var *column_var;
-
-    //const char  *actual_units;
-    int n_columns, n_datastreams;
-    int colix;
-
-    // ###############################################################
-    // Initialize this table object.
-    // ###############################################################
-    if ( !DS_Supplier ) { throw std::invalid_argument("DS_Supplier is NULL"); }
-    if ( !Run         ) { throw std::invalid_argument("DPM_run is NULL"); }
-    if ( !Table_spec  ) { throw std::invalid_argument("DPM_table is NULL"); }
-
-    table_spec = Table_spec;
-    view_data = NULL;
-    run = Run;
-
-    // ###############################################################
-    // Determine our time constraints.
-    // ###############################################################
-
-    // Combine the time constraints levied by the table specification
-    // and those levied by the parent-page. The combined time constraints
-    // will be levied on each of the subordinate columns.
-
-    my_time_constraints = table_spec->getTimeConstraints();
-    if (ParentTimeConstraints != NULL) {
-        total_time_constraints = *my_time_constraints + *ParentTimeConstraints;
-    } else {
-        total_time_constraints = *my_time_constraints;
-    }
-
-    // #######################################################
-    // Create the necessary DataStreams, one for each column .
-    // #######################################################
-
-    // Get information about the variable(s) for this table.
-
-    n_columns = Table_spec->NumberOfColumns();
-
-    for ( colix = 0 ; colix < n_columns ; colix ++ ) {
-        DataStream * ds;
-        DPC_column_info * column_info;
-        DPM_column * column = Table_spec->getColumn( colix );
-		const char * actual_units;
-
-        column_var = column->getVar();
-        const char * column_var_name = column_var->getName();
-        const char * column_var_units = column_var->AttributeValue("units");
-        const char * column_var_from_units = column_var->AttributeValue("from_units");
-
-        cv_converter *time_conversion = NULL;
-        int dsix = -1;
-
-        if ( strcmp( column_var_name, run->getTimeName() ) == 0 ) {
-            if ((column_var_units != NULL) && (strcmp( column_var_units, default_time_units) != 0)) {
-                // Convert seconds to whatever the user requested.
-                ut_unit *to;
-                ut_unit *from;
-
-                to = ut_parse(u_system, column_var_units, UT_ASCII) ;
-                if ( ! to ) {
-                    std::cerr << "ERROR: Unable to convert values to invalid units: \""
-                         << column_var_units << "\"." << std::endl;
-                }
-                from = ut_parse(u_system, default_time_units, UT_ASCII) ;
-
-                if (to && from) {
-                    actual_units = column_var_units;
-                    time_conversion = ut_get_converter(from,to) ;
-                    if ( time_conversion == NULL ) {
-                        std::cerr << "ERROR: Unable to convert from \"" << default_time_units << "\" to \""
-                            << column_var_units << "\" because they are incompatible." << std::endl;
-                        time_conversion = cv_get_trivial() ;
-                        actual_units = default_time_units;
-                    }
-                    ut_free(to) ;
-                    ut_free(from) ;
-                } else {
-                    time_conversion = cv_get_trivial() ;
-                    actual_units = default_time_units;
-                }
-            } else {
-                time_conversion = cv_get_trivial() ;
-                actual_units = default_time_units;
-            }
-
-        } else {
-
-            ds = DS_Supplier->getDataStream( column_var_name,
-                                             column_var_units,
-                                             column_var_from_units,
-                                             Run,
-                                             &total_time_constraints );
-            if (ds == NULL) {
-	            std::cerr << "ERROR: Unable to create a DataStream for :" << std::endl <<
-                    "   Var name = \""      << column_var_name << "\"" << std::endl <<
-                    "   Run Directory = \"" << run->getDir() << "\"" << std::endl;
-                std::cerr.flush();
-                throw std::invalid_argument("ERROR: Bogus Table.");
-            }
-            datastream_list.push_back( ds );
-            actual_units = ds->getUnit().c_str();
-			dsix = datastream_list.size() - 1;
-        }
-        column_info = new DPC_column_info( column_var, actual_units, dsix, time_conversion);
-		column_info_list.push_back( column_info );
-    }
-
-    n_datastreams = (int)datastream_list.size();
-
-    if ( n_datastreams == 0 ) {
-        throw (std::logic_error("DataStreamList is empty."));
-    }
-
-    dsData = new DPC_datum[n_datastreams];
-    end_of_stream = new bool[n_datastreams];
-    synchronized_values = new double[n_datastreams];
-
-    begin();
+#include	<udunits2.h>
+#include	"DPC/DPC_table.hh"
+#include	"DPM/DPM_var.hh"
+#include	"DPM/DPM_column.hh"
+
+extern	ut_system	*	u_system	;
+
+static	const	char	*default_time_units	=	"s";
+
+//	CONSTRUCTOR
+DPC_table::DPC_table(	DPC_datastream_supplier	*DS_Supplier,
+																						DPM_run																	*Run,
+																						DPM_table															*Table_spec,
+																						DPM_time_constraints				*ParentTimeConstraints	)
+					{
+
+				DPM_time_constraints	*my_time_constraints;
+				DPM_time_constraints	total_time_constraints;
+				DPM_var	*column_var;
+
+				//const	char		*actual_units;
+				int	n_columns,	n_datastreams;
+				int	colix;
+
+				//	###############################################################
+				//	Initialize	this	table	object.
+				//	###############################################################
+				if	(	!DS_Supplier	)	{	throw	std::invalid_argument("DS_Supplier	is	NULL");	}
+				if	(	!Run									)	{	throw	std::invalid_argument("DPM_run	is	NULL");	}
+				if	(	!Table_spec		)	{	throw	std::invalid_argument("DPM_table	is	NULL");	}
+
+				table_spec	=	Table_spec;
+				view_data	=	NULL;
+				run	=	Run;
+
+				//	###############################################################
+				//	Determine	our	time	constraints.
+				//	###############################################################
+
+				//	Combine	the	time	constraints	levied	by	the	table	specification
+				//	and	those	levied	by	the	parent-page.	The	combined	time	constraints
+				//	will	be	levied	on	each	of	the	subordinate	columns.
+
+				my_time_constraints	=	table_spec->getTimeConstraints();
+				if	(ParentTimeConstraints	!=	NULL)	{
+								total_time_constraints	=	*my_time_constraints	+	*ParentTimeConstraints;
+				}	else	{
+								total_time_constraints	=	*my_time_constraints;
+				}
+
+				//	#######################################################
+				//	Create	the	necessary	DataStreams,	one	for	each	column	.
+				//	#######################################################
+
+				//	Get	information	about	the	variable(s)	for	this	table.
+
+				n_columns	=	Table_spec->NumberOfColumns();
+
+				for	(	colix	=	0	;	colix	<	n_columns	;	colix	++	)	{
+								DataStream	*	ds;
+								DPC_column_info	*	column_info;
+								DPM_column	*	column	=	Table_spec->getColumn(	colix	);
+		const	char	*	actual_units;
+
+								column_var	=	column->getVar();
+								const	char	*	column_var_name	=	column_var->getName();
+								const	char	*	column_var_units	=	column_var->AttributeValue("units");
+								const	char	*	column_var_from_units	=	column_var->AttributeValue("from_units");
+
+								cv_converter	*time_conversion	=	NULL;
+								int	dsix	=	-1;
+
+								if	(	strcmp(	column_var_name,	run->getTimeName()	)	==	0	)	{
+												if	((column_var_units	!=	NULL)	&&	(strcmp(	column_var_units,	default_time_units)	!=	0))	{
+																//	Convert	seconds	to	whatever	the	user	requested.
+																ut_unit	*to;
+																ut_unit	*from;
+
+																to	=	ut_parse(u_system,	column_var_units,	UT_ASCII)	;
+																if	(	!	to	)	{
+																				std::cerr	<<	"ERROR:	Unable	to	convert	values	to	invalid	units:	\""
+																									<<	column_var_units	<<	"\"."	<<	std::endl;
+																}
+																from	=	ut_parse(u_system,	default_time_units,	UT_ASCII)	;
+
+																if	(to	&&	from)	{
+																				actual_units	=	column_var_units;
+																				time_conversion	=	ut_get_converter(from,to)	;
+																				if	(	time_conversion	==	NULL	)	{
+																								std::cerr	<<	"ERROR:	Unable	to	convert	from	\""	<<	default_time_units	<<	"\"	to	\""
+																												<<	column_var_units	<<	"\"	because	they	are	incompatible."	<<	std::endl;
+																								time_conversion	=	cv_get_trivial()	;
+																								actual_units	=	default_time_units;
+																				}
+																				ut_free(to)	;
+																				ut_free(from)	;
+																}	else	{
+																				time_conversion	=	cv_get_trivial()	;
+																				actual_units	=	default_time_units;
+																}
+												}	else	{
+																time_conversion	=	cv_get_trivial()	;
+																actual_units	=	default_time_units;
+												}
+
+								}	else	{
+
+												ds	=	DS_Supplier->getDataStream(	column_var_name,
+																																													column_var_units,
+																																													column_var_from_units,
+																																													Run,
+																																													&total_time_constraints	);
+												if	(ds	==	NULL)	{
+													std::cerr	<<	"ERROR:	Unable	to	create	a	DataStream	for	:"	<<	std::endl	<<
+																				"			Var	name	=	\""						<<	column_var_name	<<	"\""	<<	std::endl	<<
+																				"			Run	Directory	=	\""	<<	run->getDir()	<<	"\""	<<	std::endl;
+																std::cerr.flush();
+																throw	std::invalid_argument("ERROR:	Bogus	Table.");
+												}
+												datastream_list.push_back(	ds	);
+												actual_units	=	ds->getUnit().c_str();
+			dsix	=	datastream_list.size()	-	1;
+								}
+								column_info	=	new	DPC_column_info(	column_var,	actual_units,	dsix,	time_conversion);
+		column_info_list.push_back(	column_info	);
+				}
+
+				n_datastreams	=	(int)datastream_list.size();
+
+				if	(	n_datastreams	==	0	)	{
+								throw	(std::logic_error("DataStreamList	is	empty."));
+				}
+
+				dsData	=	new	DPC_datum[n_datastreams];
+				end_of_stream	=	new	bool[n_datastreams];
+				synchronized_values	=	new	double[n_datastreams];
+
+				begin();
 }
 
-// DESTRUCTOR
-DPC_table::~DPC_table() {
+//	DESTRUCTOR
+DPC_table::~DPC_table()	{
 
-    DataStream *ds;
-    int n_ds, ds_ix;
+				DataStream	*ds;
+				int	n_ds,	ds_ix;
 
-    // This class didn't create the objects referenced by:
-    // ( table_spec, view_data and run)
-    // so it's not allowed to delete them:
+				//	This	class	didn't	create	the	objects	referenced	by:
+				//	(	table_spec,	view_data	and	run)
+				//	so	it's	not	allowed	to	delete	them:
 
-    n_ds = (int)datastream_list.size();
+				n_ds	=	(int)datastream_list.size();
 
-    for ( ds_ix = 0; ds_ix <n_ds ; ds_ix++ ) {
-        ds = datastream_list[ds_ix];
-        if (ds) { delete ds; }
-    }
+				for	(	ds_ix	=	0;	ds_ix	<n_ds	;	ds_ix++	)	{
+								ds	=	datastream_list[ds_ix];
+								if	(ds)	{	delete	ds;	}
+				}
 
-    if (dsData) { delete dsData; }
+				if	(dsData)	{	delete	dsData;	}
 }
 
-// MEMBER FUNCTION
-DPV_pointer DPC_table::render( DPV_view *view,
-                               DPV_pointer parent_view_data ) {
-
-    if (view != NULL) {
-        view_data = view->render_table( parent_view_data, this);
-        view->finalize_table_view(view_data);
-    } else {
-        view_data = NULL;
-    }
-    return (view_data);
+//	MEMBER	FUNCTION
+DPV_pointer	DPC_table::render(	DPV_view	*view,
+																															DPV_pointer	parent_view_data	)	{
+
+				if	(view	!=	NULL)	{
+								view_data	=	view->render_table(	parent_view_data,	this);
+								view->finalize_table_view(view_data);
+				}	else	{
+								view_data	=	NULL;
+				}
+				return	(view_data);
 }
 
-void DPC_table::notify( DPV_view *view, DPV_message msg ) {
-    if (view_data != NULL) {
-        view->notify_table( view_data, msg);
-    }
+void	DPC_table::notify(	DPV_view	*view,	DPV_message	msg	)	{
+				if	(view_data	!=	NULL)	{
+								view->notify_table(	view_data,	msg);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getRunDir() {
-    return( run->getDir());
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getRunDir()	{
+				return(	run->getDir());
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getTitle() {
-    return( table_spec->getTitle());
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getTitle()	{
+				return(	table_spec->getTitle());
 }
 
-// MEMBER FUNCTION
-int DPC_table::getNumColumns() {
-    return( table_spec->NumberOfColumns());
+//	MEMBER	FUNCTION
+int	DPC_table::getNumColumns()	{
+				return(	table_spec->NumberOfColumns());
 }
 
-// MEMBER FUNCTION
-std::string DPC_table::getColumnLabel(unsigned int index) {
-    DPM_column *column = table_spec->getColumn( index );
-    if ( column->getLabel() != NULL) {
-        return( column->getLabel());
-    } else {
-        return( column->getVar()->getShortName() );
-    }
+//	MEMBER	FUNCTION
+std::string	DPC_table::getColumnLabel(unsigned	int	index)	{
+				DPM_column	*column	=	table_spec->getColumn(	index	);
+				if	(	column->getLabel()	!=	NULL)	{
+								return(	column->getLabel());
+				}	else	{
+								return(	column->getVar()->getShortName()	);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getColumnVarName(unsigned int index) {
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getColumnVarName(unsigned	int	index)	{
 
-    return( table_spec->getColumn( index)->getVar()->getName());
+				return(	table_spec->getColumn(	index)->getVar()->getName());
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getColumnUnits(unsigned int index) {
-    if ( index < column_info_list.size()) {
-		//std::cout << column_info_list[index]->units << std::endl;
-        return ( column_info_list[index]->units);
-    }
-    return (NULL);
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getColumnUnits(unsigned	int	index)	{
+				if	(	index	<	column_info_list.size())	{
+		//std::cout	<<	column_info_list[index]->units	<<	std::endl;
+								return	(	column_info_list[index]->units);
+				}
+				return	(NULL);
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getColumnAttribute(unsigned int index,
-                                          const char *key) {
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getColumnAttribute(unsigned	int	index,
+																																										const	char	*key)	{
 
-    return( table_spec->getColumn( index)->AttributeValue( key));
+				return(	table_spec->getColumn(	index)->AttributeValue(	key));
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getVarAttribute(unsigned int index, const char *key) {
-    return( table_spec->getColumn(index)->getVar()->AttributeValue(key) );
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getVarAttribute(unsigned	int	index,	const	char	*key)	{
+				return(	table_spec->getColumn(index)->getVar()->AttributeValue(key)	);
 }
 
-// MEMBER FUNCTION
-int DPC_table::getRow(double *time, double *row_values) {
-
-    int ds_ix, col_ix;
-    int n_columns = table_spec->NumberOfColumns();
-    int n_datastreams = (int)datastream_list.size();
-    int min_time_ds_ix, max_time_ds_ix;
-
-    bool end_of_table = true;
-    for (ds_ix = 0; ds_ix < n_datastreams ; ds_ix ++) {
-        if ( end_of_stream[ds_ix] == false ) {
-            if ( end_of_table ) {
-                min_time_ds_ix = max_time_ds_ix = ds_ix;
-                end_of_table = false;
-            } else {
-                if (dsData[ds_ix].time  < dsData[min_time_ds_ix].time ){
-                    min_time_ds_ix = ds_ix;
-                } else if (dsData[ds_ix].time  > dsData[max_time_ds_ix].time ){
-                    max_time_ds_ix = ds_ix;
-                }
-            }
-        }
-    }
-
-    if ( end_of_table == false ) {
-
-        *time = dsData[min_time_ds_ix].time;
-
-        if ( (dsData[max_time_ds_ix].time - dsData[min_time_ds_ix].time) <= T_TOLERANCE ) {
-            // The times for each datastream are the same (within a tolerance)
-            // so output all of the current values, and get new ones.
-
-            for (ds_ix = 0 ;ds_ix < n_datastreams ; ds_ix++ ) {
-                synchronized_values[ds_ix] = dsData[ds_ix].value;
-                end_of_stream[ds_ix] = !datastream_list[ds_ix]->get( &dsData[ds_ix].time, &dsData[ds_ix].value);
-            }
-
-        } else {
-            // The times for each column are not the same so output/update
-            // only the values with the min time and those values within
-            // TOLERANCE of the min time. For those values output, get new
-            // values from the datastream.
-
-            synchronized_values[min_time_ds_ix] = dsData[min_time_ds_ix].value;
-
-            for (ds_ix = 0 ;ds_ix < n_datastreams ; ds_ix++ ) {
-                if ( ds_ix != min_time_ds_ix) {
-                    if ((dsData[ds_ix].time - dsData[min_time_ds_ix].time) <= T_TOLERANCE ) {
-                        synchronized_values[ds_ix] = dsData[ds_ix].value;
-                        end_of_stream[ds_ix] = !datastream_list[ds_ix]->get( &dsData[ds_ix].time, &dsData[ds_ix].value);
-                    }
-                }
-            }
-        }
-
-        for (col_ix = 0 ; col_ix < n_columns ; col_ix++ ) {
-            const char  *column_var_name;
-            column_var_name = column_info_list[col_ix]->var->getName();
-            if ( strcmp( column_var_name, run->getTimeName()) == 0) {
-               row_values[col_ix] = cv_convert_double(column_info_list[col_ix]->time_conversion, *time);
-            } else {
-               row_values[col_ix] = synchronized_values[ column_info_list[col_ix]->ds_ix ];
-            }
-        }
-    }
-
-    return (!end_of_table);
+//	MEMBER	FUNCTION
+int	DPC_table::getRow(double	*time,	double	*row_values)	{
+
+				int	ds_ix,	col_ix;
+				int	n_columns	=	table_spec->NumberOfColumns();
+				int	n_datastreams	=	(int)datastream_list.size();
+				int	min_time_ds_ix,	max_time_ds_ix;
+
+				bool	end_of_table	=	true;
+				for	(ds_ix	=	0;	ds_ix	<	n_datastreams	;	ds_ix	++)	{
+								if	(	end_of_stream[ds_ix]	==	false	)	{
+												if	(	end_of_table	)	{
+																min_time_ds_ix	=	max_time_ds_ix	=	ds_ix;
+																end_of_table	=	false;
+												}	else	{
+																if	(dsData[ds_ix].time		<	dsData[min_time_ds_ix].time	){
+																				min_time_ds_ix	=	ds_ix;
+																}	else	if	(dsData[ds_ix].time		>	dsData[max_time_ds_ix].time	){
+																				max_time_ds_ix	=	ds_ix;
+																}
+												}
+								}
+				}
+
+				if	(	end_of_table	==	false	)	{
+
+								*time	=	dsData[min_time_ds_ix].time;
+
+								if	(	(dsData[max_time_ds_ix].time	-	dsData[min_time_ds_ix].time)	<=	T_TOLERANCE	)	{
+												//	The	times	for	each	datastream	are	the	same	(within	a	tolerance)
+												//	so	output	all	of	the	current	values,	and	get	new	ones.
+
+												for	(ds_ix	=	0	;ds_ix	<	n_datastreams	;	ds_ix++	)	{
+																synchronized_values[ds_ix]	=	dsData[ds_ix].value;
+																end_of_stream[ds_ix]	=	!datastream_list[ds_ix]->get(	&dsData[ds_ix].time,	&dsData[ds_ix].value);
+												}
+
+								}	else	{
+												//	The	times	for	each	column	are	not	the	same	so	output/update
+												//	only	the	values	with	the	min	time	and	those	values	within
+												//	TOLERANCE	of	the	min	time.	For	those	values	output,	get	new
+												//	values	from	the	datastream.
+
+												synchronized_values[min_time_ds_ix]	=	dsData[min_time_ds_ix].value;
+
+												for	(ds_ix	=	0	;ds_ix	<	n_datastreams	;	ds_ix++	)	{
+																if	(	ds_ix	!=	min_time_ds_ix)	{
+																				if	((dsData[ds_ix].time	-	dsData[min_time_ds_ix].time)	<=	T_TOLERANCE	)	{
+																								synchronized_values[ds_ix]	=	dsData[ds_ix].value;
+																								end_of_stream[ds_ix]	=	!datastream_list[ds_ix]->get(	&dsData[ds_ix].time,	&dsData[ds_ix].value);
+																				}
+																}
+												}
+								}
+
+								for	(col_ix	=	0	;	col_ix	<	n_columns	;	col_ix++	)	{
+												const	char		*column_var_name;
+												column_var_name	=	column_info_list[col_ix]->var->getName();
+												if	(	strcmp(	column_var_name,	run->getTimeName())	==	0)	{
+															row_values[col_ix]	=	cv_convert_double(column_info_list[col_ix]->time_conversion,	*time);
+												}	else	{
+															row_values[col_ix]	=	synchronized_values[	column_info_list[col_ix]->ds_ix	];
+												}
+								}
+				}
+
+				return	(!end_of_table);
 }
 
-// MEMBER FUNCTION
-void DPC_table::begin() {
-    int ds_ix;
-    int n_ds = (int)datastream_list.size();
+//	MEMBER	FUNCTION
+void	DPC_table::begin()	{
+				int	ds_ix;
+				int	n_ds	=	(int)datastream_list.size();
 
-    for ( ds_ix = 0; ds_ix <n_ds ; ds_ix++ ) {
-        datastream_list[ds_ix]->begin();
-    }
+				for	(	ds_ix	=	0;	ds_ix	<n_ds	;	ds_ix++	)	{
+								datastream_list[ds_ix]->begin();
+				}
 
-    for (ds_ix = 0 ;ds_ix < n_ds ; ds_ix++ ) {
-        end_of_stream[ds_ix] = !datastream_list[ds_ix]->get( &dsData[ds_ix].time, &dsData[ds_ix].value);
-    }
+				for	(ds_ix	=	0	;ds_ix	<	n_ds	;	ds_ix++	)	{
+								end_of_stream[ds_ix]	=	!datastream_list[ds_ix]->get(	&dsData[ds_ix].time,	&dsData[ds_ix].value);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPC_table::getAttribute(const char *key) {
-    return( table_spec->AttributeValue(key) );
+//	MEMBER	FUNCTION
+const	char	*DPC_table::getAttribute(const	char	*key)	{
+				return(	table_spec->AttributeValue(key)	);
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_attribute.cpp b/trick_source/data_products/DPX/DPM/DPM_attribute.cpp
index 56a4d46f4..29b27f0b3 100644
--- a/trick_source/data_products/DPX/DPM/DPM_attribute.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_attribute.cpp
@@ -1,26 +1,26 @@
 
-#include "DPM_attribute.hh"
-#include <strings.h>
-#include <string.h>
+#include	"DPM_attribute.hh"
+#include	<strings.h>
+#include	<string.h>
 
-// COPY CONSTRUCTOR
-DPM_attribute::DPM_attribute(const DPM_attribute *attr) {
-  key   = attr->key;
-  value = attr->value;
+//	COPY	CONSTRUCTOR
+DPM_attribute::DPM_attribute(const	DPM_attribute	*attr)	{
+		key			=	attr->key;
+		value	=	attr->value;
 }
 
-// MEMBER FUNCTION
-int DPM_attribute::key_is (const char *name) {
-  return (strcmp(name, this->key.c_str()) == 0);
+//	MEMBER	FUNCTION
+int	DPM_attribute::key_is	(const	char	*name)	{
+		return	(strcmp(name,	this->key.c_str())	==	0);
 }
 
-// MEMBER FUNCTION
-std::string *DPM_attribute::value_of() {
-  return (new std::string(this->value));
+//	MEMBER	FUNCTION
+std::string	*DPM_attribute::value_of()	{
+		return	(new	std::string(this->value));
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_attribute *attr) {
-  s << attr->key << "=\"" << attr->value << "\"";
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_attribute	*attr)	{
+		s	<<	attr->key	<<	"=\""	<<	attr->value	<<	"\"";
+		return	s;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_axis.cpp b/trick_source/data_products/DPX/DPM/DPM_axis.cpp
index 6c7c3cdd1..19b2b161c 100644
--- a/trick_source/data_products/DPX/DPM/DPM_axis.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_axis.cpp
@@ -1,108 +1,108 @@
 
-#include <udunits2.h>
-#include <string.h>
-#include "DPM_axis.hh"
-
-extern ut_system * u_system ;
-
-int DPM_axis::Initialize(xmlNode *base_node) {
-
-    xmlNode *current_node;
-
-    label     = NULL;
-    unitspec  = NULL;
-    axis_type = DPM_AXIS_NONE;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_axis::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-
-    current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "label") == 0) {
-                // label is optional.
-                xmlNode *text_node = current_node->children;
-                label = strdup( (const char *)text_node->content);
-            } else if ( strcmp( (const char *)current_node->name, "units") == 0) {
-                // units is optional.
-                xmlNode *text_node = current_node->children;
-                unitspec = strdup( (const char *)text_node->content);
-            } else {
-                std::cerr << "WARNING: <axis> specification contains an unknown element \"<"
-                     << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    // Validation Criteria:
-    // 1. If units are supplied, they must be valid.
-
-    if (unitspec != NULL) {
-        ut_unit * validation_unit = ut_parse(u_system, unitspec, UT_ASCII) ;
-        if( validation_unit == NULL ) {
-            std::cerr << "ERROR: <axis> specifies invalid units: \"" << unitspec << "\"." << std::endl;
-            return -1;
-        }
-        ut_free(validation_unit) ;
-    }
-
-    return 0;
+#include	<udunits2.h>
+#include	<string.h>
+#include	"DPM_axis.hh"
+
+extern	ut_system	*	u_system	;
+
+int	DPM_axis::Initialize(xmlNode	*base_node)	{
+
+				xmlNode	*current_node;
+
+				label					=	NULL;
+				unitspec		=	NULL;
+				axis_type	=	DPM_AXIS_NONE;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_axis::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+
+				current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"label")	==	0)	{
+																//	label	is	optional.
+																xmlNode	*text_node	=	current_node->children;
+																label	=	strdup(	(const	char	*)text_node->content);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"units")	==	0)	{
+																//	units	is	optional.
+																xmlNode	*text_node	=	current_node->children;
+																unitspec	=	strdup(	(const	char	*)text_node->content);
+												}	else	{
+																std::cerr	<<	"WARNING:	<axis>	specification	contains	an	unknown	element	\"<"
+																					<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				//	Validation	Criteria:
+				//	1.	If	units	are	supplied,	they	must	be	valid.
+
+				if	(unitspec	!=	NULL)	{
+								ut_unit	*	validation_unit	=	ut_parse(u_system,	unitspec,	UT_ASCII)	;
+								if(	validation_unit	==	NULL	)	{
+												std::cerr	<<	"ERROR:	<axis>	specifies	invalid	units:	\""	<<	unitspec	<<	"\"."	<<	std::endl;
+												return	-1;
+								}
+								ut_free(validation_unit)	;
+				}
+
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_axis::DPM_axis(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_axis::DPM_axis(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize(Base_node) < 0) {
-      throw std::invalid_argument("DPM_axis specification is un-usable.");
-  }
+		if	(	Initialize(Base_node)	<	0)	{
+						throw	std::invalid_argument("DPM_axis	specification	is	un-usable.");
+		}
 }
 
-// DESTRUCTOR
-DPM_axis::~DPM_axis() {
-  if (unitspec) { free (unitspec); }
-  if (label) { free (label); }
+//	DESTRUCTOR
+DPM_axis::~DPM_axis()	{
+		if	(unitspec)	{	free	(unitspec);	}
+		if	(label)	{	free	(label);	}
 }
 
-// MEMBER FUNCTION
-const char *DPM_axis::getLabel() {
-  if (label != NULL) {
-      return ((const char*)label);
-  }
+//	MEMBER	FUNCTION
+const	char	*DPM_axis::getLabel()	{
+		if	(label	!=	NULL)	{
+						return	((const	char*)label);
+		}
 
-return NULL;
+return	NULL;
 }
 
-// MEMBER FUNCTION
-const char *DPM_axis::getUnits() {
-  return ( (const char*)unitspec );
+//	MEMBER	FUNCTION
+const	char	*DPM_axis::getUnits()	{
+		return	(	(const	char*)unitspec	);
 }
 
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_axis *axis) {
-  int i;
-  int n_attrs = (int)axis->attribute_list.size();
-
-  s << "<axis";
-  // Output the axis element attributes.
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << axis->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  // Output the optional label (if it exists).
-  if (strcmp(axis->label,"")) {
-    s << "<label>" << axis->label << "</label>" << std::endl;
-  }
-  // Output the unitspec.
-  s << "<units>" << axis->unitspec << "</units>" << std::endl;
-
-  s << "</axis>";
-  s << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_axis	*axis)	{
+		int	i;
+		int	n_attrs	=	(int)axis->attribute_list.size();
+
+		s	<<	"<axis";
+		//	Output	the	axis	element	attributes.
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	axis->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		//	Output	the	optional	label	(if	it	exists).
+		if	(strcmp(axis->label,""))	{
+				s	<<	"<label>"	<<	axis->label	<<	"</label>"	<<	std::endl;
+		}
+		//	Output	the	unitspec.
+		s	<<	"<units>"	<<	axis->unitspec	<<	"</units>"	<<	std::endl;
+
+		s	<<	"</axis>";
+		s	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_column.cpp b/trick_source/data_products/DPX/DPM/DPM_column.cpp
index f87297fa5..375482a70 100644
--- a/trick_source/data_products/DPX/DPM/DPM_column.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_column.cpp
@@ -1,122 +1,122 @@
 
-#include <udunits2.h>
-#include <string.h>
-#include "DPM_column.hh"
-
-extern ut_system * u_system ;
-
-int DPM_column::Initialize(xmlNode *base_node) {
-
-    xmlNode *current_node;
-
-    label     = NULL;
-    unitspec  = NULL;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_column::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-
-    current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "label") == 0) {
-                // label is optional.
-                xmlNode *text_node = current_node->children;
-                label = strdup( (const char *)text_node->content);
-            } else if ( strcmp( (const char *)current_node->name, "units") == 0) {
-                // units is optional.
-                xmlNode *text_node = current_node->children;
-                unitspec = strdup( (const char *)text_node->content);
-            } else if ( strcmp( (const char *)current_node->name, "var") == 0) {
-                DPM_var *var = new DPM_var(this, current_node);
-                if (var != NULL) {
-                   column_var = var;
-                }
-            } else {
-                std::cerr << "WARNING: <column> specification contains an unknown element \"<"
-                     << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    // Validation Criteria:
-    // 1. If units are supplied, they must be valid.
-
-    if (unitspec != NULL) {
-        ut_unit * validation_unit = ut_parse(u_system, unitspec, UT_ASCII) ;
-        if( validation_unit == NULL ) {
-            std::cerr << "ERROR: <column> specifies invalid units: \"" << unitspec << "\"." << std::endl;
-            return -1;
-        }
-        ut_free(validation_unit) ;
-    }
-
-    return 0;
+#include	<udunits2.h>
+#include	<string.h>
+#include	"DPM_column.hh"
+
+extern	ut_system	*	u_system	;
+
+int	DPM_column::Initialize(xmlNode	*base_node)	{
+
+				xmlNode	*current_node;
+
+				label					=	NULL;
+				unitspec		=	NULL;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_column::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+
+				current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"label")	==	0)	{
+																//	label	is	optional.
+																xmlNode	*text_node	=	current_node->children;
+																label	=	strdup(	(const	char	*)text_node->content);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"units")	==	0)	{
+																//	units	is	optional.
+																xmlNode	*text_node	=	current_node->children;
+																unitspec	=	strdup(	(const	char	*)text_node->content);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"var")	==	0)	{
+																DPM_var	*var	=	new	DPM_var(this,	current_node);
+																if	(var	!=	NULL)	{
+																			column_var	=	var;
+																}
+												}	else	{
+																std::cerr	<<	"WARNING:	<column>	specification	contains	an	unknown	element	\"<"
+																					<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				//	Validation	Criteria:
+				//	1.	If	units	are	supplied,	they	must	be	valid.
+
+				if	(unitspec	!=	NULL)	{
+								ut_unit	*	validation_unit	=	ut_parse(u_system,	unitspec,	UT_ASCII)	;
+								if(	validation_unit	==	NULL	)	{
+												std::cerr	<<	"ERROR:	<column>	specifies	invalid	units:	\""	<<	unitspec	<<	"\"."	<<	std::endl;
+												return	-1;
+								}
+								ut_free(validation_unit)	;
+				}
+
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_column::DPM_column(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_column::DPM_column(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize(Base_node) < 0) {
-      throw std::invalid_argument("DPM_column specification is un-usable.");
-  }
+		if	(	Initialize(Base_node)	<	0)	{
+						throw	std::invalid_argument("DPM_column	specification	is	un-usable.");
+		}
 }
 
-// DESTRUCTOR
-DPM_column::~DPM_column() {
-  if (unitspec) { free (unitspec); }
-  if (label) { free (label); }
-  delete column_var ;
+//	DESTRUCTOR
+DPM_column::~DPM_column()	{
+		if	(unitspec)	{	free	(unitspec);	}
+		if	(label)	{	free	(label);	}
+		delete	column_var	;
 }
 
-// MEMBER FUNCTION
-const char *DPM_column::getLabel() {
-  if (label != NULL) {
-      return ((const char*)label);
-  }
+//	MEMBER	FUNCTION
+const	char	*DPM_column::getLabel()	{
+		if	(label	!=	NULL)	{
+						return	((const	char*)label);
+		}
 
-return NULL;
+return	NULL;
 }
 
-// MEMBER FUNCTION
-const char *DPM_column::getUnits() {
-  return ( (const char*)unitspec );
+//	MEMBER	FUNCTION
+const	char	*DPM_column::getUnits()	{
+		return	(	(const	char*)unitspec	);
 }
 
-DPM_var *DPM_column::getVar() {
-  return ( column_var );
+DPM_var	*DPM_column::getVar()	{
+		return	(	column_var	);
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_column *column) {
-  int i;
-  int n_attrs = (int)column->attribute_list.size();
-
-  s << "<column";
-  // Output the column element attributes.
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << column->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  // Output the optional label (if it exists).
-  //if (strcmp(column->label,"")) {
-  if (column->label) {
-    s << "<label>" << column->label << "</label>" << std::endl;
-  }
-  // Output the unitspec.
-  if (column->unitspec) {
-    s << "<units>" << column->unitspec << "</units>" << std::endl;
-  }
-
-  s << column->column_var;
-
-
-  s << "</column>";
-  s << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_column	*column)	{
+		int	i;
+		int	n_attrs	=	(int)column->attribute_list.size();
+
+		s	<<	"<column";
+		//	Output	the	column	element	attributes.
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	column->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		//	Output	the	optional	label	(if	it	exists).
+		//if	(strcmp(column->label,""))	{
+		if	(column->label)	{
+				s	<<	"<label>"	<<	column->label	<<	"</label>"	<<	std::endl;
+		}
+		//	Output	the	unitspec.
+		if	(column->unitspec)	{
+				s	<<	"<units>"	<<	column->unitspec	<<	"</units>"	<<	std::endl;
+		}
+
+		s	<<	column->column_var;
+
+
+		s	<<	"</column>";
+		s	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_component.cpp b/trick_source/data_products/DPX/DPM/DPM_component.cpp
index e114c3608..0f298faa0 100644
--- a/trick_source/data_products/DPX/DPM/DPM_component.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_component.cpp
@@ -1,72 +1,72 @@
 
-#include "DPM_component.hh"
+#include	"DPM_component.hh"
 
-// DEFAULT CONSTRUCTOR
-DPM_component::DPM_component() {
-    parent = NULL;
+//	DEFAULT	CONSTRUCTOR
+DPM_component::DPM_component()	{
+				parent	=	NULL;
 }
 
-void DPM_component::add_attribute(const char *key, const char* value) {
-    std::string key_string( key);
-    std::string value_string( value);
-    attribute_list.push_back( new DPM_attribute(key_string, value_string) );
+void	DPM_component::add_attribute(const	char	*key,	const	char*	value)	{
+				std::string	key_string(	key);
+				std::string	value_string(	value);
+				attribute_list.push_back(	new	DPM_attribute(key_string,	value_string)	);
 }
 
-void DPM_component::Initialize( xmlNode *Base_node) {
+void	DPM_component::Initialize(	xmlNode	*Base_node)	{
 
-    if (Base_node != NULL) {
-        if (Base_node->type != XML_ELEMENT_NODE ) {
-            std::cerr << "DPM_component::Initialize: Bad parameters." << std::endl;
-        } else {
-            xmlAttr *current_attr = NULL;
+				if	(Base_node	!=	NULL)	{
+								if	(Base_node->type	!=	XML_ELEMENT_NODE	)	{
+												std::cerr	<<	"DPM_component::Initialize:	Bad	parameters."	<<	std::endl;
+								}	else	{
+												xmlAttr	*current_attr	=	NULL;
 
-            /* Get Attributes from the XML parse tree. */
-            for (current_attr = Base_node->properties; current_attr ; current_attr = current_attr->next ) {
-                if (current_attr->type == XML_ATTRIBUTE_NODE ) {
-                    add_attribute( (const char *)current_attr->name,
-                                   (const char *)current_attr->children->content);
-                }
-            }
-        }
-    }
+												/*	Get	Attributes	from	the	XML	parse	tree.	*/
+												for	(current_attr	=	Base_node->properties;	current_attr	;	current_attr	=	current_attr->next	)	{
+																if	(current_attr->type	==	XML_ATTRIBUTE_NODE	)	{
+																				add_attribute(	(const	char	*)current_attr->name,
+																																			(const	char	*)current_attr->children->content);
+																}
+												}
+								}
+				}
 }
 
-// XML CONSTRUCTOR
-DPM_component::DPM_component(DPM_component *Parent, xmlNode *Base_node) {
+//	XML	CONSTRUCTOR
+DPM_component::DPM_component(DPM_component	*Parent,	xmlNode	*Base_node)	{
 
-    Initialize( Base_node);
-    parent = Parent;
+				Initialize(	Base_node);
+				parent	=	Parent;
 }
 
-// DESTRUCTOR
-DPM_component::~DPM_component() {
-    // destroy each of the attributes in the attribute list
-    int i;
-    int n = (int)this->attribute_list.size();
-    for (i = 0; i < n ; i ++) {
-        delete this->attribute_list[i];
-    }
+//	DESTRUCTOR
+DPM_component::~DPM_component()	{
+				//	destroy	each	of	the	attributes	in	the	attribute	list
+				int	i;
+				int	n	=	(int)this->attribute_list.size();
+				for	(i	=	0;	i	<	n	;	i	++)	{
+								delete	this->attribute_list[i];
+				}
 }
 
-// MEMBER FUNCTION
-int DPM_component::NumberOfAttributes() {
-    return (int)attribute_list.size();
+//	MEMBER	FUNCTION
+int	DPM_component::NumberOfAttributes()	{
+				return	(int)attribute_list.size();
 }
 
-// MEMBER FUNCTION
-const char *DPM_component::AttributeValue( const char *name ) {
-    int i, ret;
-    int n_attrs = (int)attribute_list.size();
-    for (i=0 ; i<n_attrs ; i++) {
-        if ( (ret = attribute_list[i]->key_is(name)) ) {
-            return ( attribute_list[i]->value_of()->c_str() );
-        }
-    }
-    // We didnt find the attribute in the current component
-    // so check the parent component for the attribute.
-    if ( parent ) {
-        return ( parent->AttributeValue(name) );
-    }
+//	MEMBER	FUNCTION
+const	char	*DPM_component::AttributeValue(	const	char	*name	)	{
+				int	i,	ret;
+				int	n_attrs	=	(int)attribute_list.size();
+				for	(i=0	;	i<n_attrs	;	i++)	{
+								if	(	(ret	=	attribute_list[i]->key_is(name))	)	{
+												return	(	attribute_list[i]->value_of()->c_str()	);
+								}
+				}
+				//	We	didnt	find	the	attribute	in	the	current	component
+				//	so	check	the	parent	component	for	the	attribute.
+				if	(	parent	)	{
+								return	(	parent->AttributeValue(name)	);
+				}
 
-    return NULL;
+				return	NULL;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_curve.cpp b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
index d524fc108..abe364d0d 100644
--- a/trick_source/data_products/DPX/DPM/DPM_curve.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
@@ -1,316 +1,316 @@
 
-#include <string.h>
-
-#include "DPM_curve.hh"
-#include "float.h"
-
-int DPM_curve::Initialize(xmlNode *base_node) {
-
-    int axis_index = 0;
-    int number_of_axes;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_curve::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "curve") != 0) {
-        std::cerr << "ERROR: Expected <curve> specification but alas didnt find it." << std::endl;
-        return -1;
-    }
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-
-    /* Get the line number of this curve. */
-    line_number = current_node->line;
-
-
-   while( (current_node != NULL) &&
-          (current_node->type != XML_ELEMENT_NODE) ) {
-        current_node = current_node->next;
-   }
-
-   if (current_node == NULL) {
-        std::cerr << "ERROR: Expected <var> or <varcase> specification but alas didnt find it." << std::endl;
-        return -1;
-   }
-
-   if (strcmp( (const char *)current_node->name, "var") == 0) {
-       while (current_node != NULL) {
-           if (current_node->type == XML_ELEMENT_NODE) {
-               if ( strcmp( (const char *)current_node->name, "var") == 0) {
-                   DPM_var *var = new DPM_var(this, current_node);
-                   if (var != NULL) {
-                       switch (axis_index) {
-                       case 0 :
-                          x_varcase_list.push_back(var);
-                       break;
-                       case 1 :
-                          y_varcase_list.push_back(var);
-                       break;
-                       case 2 :
-                          z_varcase_list.push_back(var);
-                       break;
-                       default:
-                           std::cerr << "ERROR: Too many <var> elements in <curve>."   << std::endl;
-                           std::cerr << "       at line " << line_number << "."        << std::endl;
-                           std::cerr << "       There can be no more than three <var>" << std::endl;
-                           std::cerr << "       elements in a <curve>."                << std::endl;
-                           return -1;
-                       break;
-                       }
-                   }
-                   axis_index++;
-               } else {
-                   std::cerr << "WARNING: <curve> specification contains an unknown element \"<"
-                        << current_node->name << ">\". Skipping." << std::endl;
-               }
-           }
-           current_node = current_node->next;
-       }
-    }  else if (strcmp( (const char *)current_node->name, "varcase") == 0) {
-          while (current_node != NULL) {
-              if (current_node->type == XML_ELEMENT_NODE) {
-                  if ( strcmp( (const char *)current_node->name, "varcase") == 0) {
-                      xmlNode *child_current_node = current_node->children;
-                      axis_index = 0;
-                      while (child_current_node != NULL) {
-                          if (child_current_node->type == XML_ELEMENT_NODE) {
-                              if ( strcmp( (const char *)child_current_node->name, "var") == 0) {
-                                  DPM_var *var = new DPM_var(this, child_current_node);
-                                  if (var != NULL) {
-                                      switch (axis_index) {
-                                          case 0 :
-                                             x_varcase_list.push_back(var);
-                                          break;
-                                          case 1 :
-                                             y_varcase_list.push_back(var);
-                                          break;
-                                          case 2 :
-                                             z_varcase_list.push_back(var);
-                                          break;
-                                          default:
-                                              std::cerr << "ERROR: Too many <var> elements in <varcase>." << std::endl;
-                                              std::cerr << "       at line " << line_number << "."        << std::endl;
-                                              std::cerr << "       There can be no more than three <var>" << std::endl;
-                                              std::cerr << "       elements in a <varcase>."              << std::endl;
-                                              return -1;
-                                          break;
-                                      }
-                                  }
-                                  axis_index++;
-                              } else {
-                                  std::cerr << "WARNING: <varcase> specification contains an unknown element \"<"
-                                  << current_node->name << ">\". Skipping." << std::endl;
-                              }
-                          }
-                          child_current_node = child_current_node->next;
-                      }
-                  } else {
-                      std::cerr << "WARNING: <curve> specification contains an unknown element \"<"
-                           << current_node->name << ">\". Skipping." << std::endl;
-                  }
-              }
-              current_node = current_node->next;
-          }
-   } else {
-        std::cerr << "ERROR: Expected <var> or <varcase> specification but alas didnt find it." << std::endl;
-        return -1;
-   }
-
-    // Validation criteria:
-    number_of_axes = this->NumberOfAxes();
-
-    if ( !(number_of_axes == 2) && !(number_of_axes == 3)) {
-        return -1;
-    }
-
-    return 0;
+#include	<string.h>
+
+#include	"DPM_curve.hh"
+#include	"float.h"
+
+int	DPM_curve::Initialize(xmlNode	*base_node)	{
+
+				int	axis_index	=	0;
+				int	number_of_axes;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_curve::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"curve")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<curve>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+
+				/*	Get	the	line	number	of	this	curve.	*/
+				line_number	=	current_node->line;
+
+
+			while(	(current_node	!=	NULL)	&&
+										(current_node->type	!=	XML_ELEMENT_NODE)	)	{
+								current_node	=	current_node->next;
+			}
+
+			if	(current_node	==	NULL)	{
+								std::cerr	<<	"ERROR:	Expected	<var>	or	<varcase>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+			}
+
+			if	(strcmp(	(const	char	*)current_node->name,	"var")	==	0)	{
+							while	(current_node	!=	NULL)	{
+											if	(current_node->type	==	XML_ELEMENT_NODE)	{
+															if	(	strcmp(	(const	char	*)current_node->name,	"var")	==	0)	{
+																			DPM_var	*var	=	new	DPM_var(this,	current_node);
+																			if	(var	!=	NULL)	{
+																							switch	(axis_index)	{
+																							case	0	:
+																										x_varcase_list.push_back(var);
+																							break;
+																							case	1	:
+																										y_varcase_list.push_back(var);
+																							break;
+																							case	2	:
+																										z_varcase_list.push_back(var);
+																							break;
+																							default:
+																											std::cerr	<<	"ERROR:	Too	many	<var>	elements	in	<curve>."			<<	std::endl;
+																											std::cerr	<<	"							at	line	"	<<	line_number	<<	"."								<<	std::endl;
+																											std::cerr	<<	"							There	can	be	no	more	than	three	<var>"	<<	std::endl;
+																											std::cerr	<<	"							elements	in	a	<curve>."																<<	std::endl;
+																											return	-1;
+																							break;
+																							}
+																			}
+																			axis_index++;
+															}	else	{
+																			std::cerr	<<	"WARNING:	<curve>	specification	contains	an	unknown	element	\"<"
+																								<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+															}
+											}
+											current_node	=	current_node->next;
+							}
+				}		else	if	(strcmp(	(const	char	*)current_node->name,	"varcase")	==	0)	{
+										while	(current_node	!=	NULL)	{
+														if	(current_node->type	==	XML_ELEMENT_NODE)	{
+																		if	(	strcmp(	(const	char	*)current_node->name,	"varcase")	==	0)	{
+																						xmlNode	*child_current_node	=	current_node->children;
+																						axis_index	=	0;
+																						while	(child_current_node	!=	NULL)	{
+																										if	(child_current_node->type	==	XML_ELEMENT_NODE)	{
+																														if	(	strcmp(	(const	char	*)child_current_node->name,	"var")	==	0)	{
+																																		DPM_var	*var	=	new	DPM_var(this,	child_current_node);
+																																		if	(var	!=	NULL)	{
+																																						switch	(axis_index)	{
+																																										case	0	:
+																																													x_varcase_list.push_back(var);
+																																										break;
+																																										case	1	:
+																																													y_varcase_list.push_back(var);
+																																										break;
+																																										case	2	:
+																																													z_varcase_list.push_back(var);
+																																										break;
+																																										default:
+																																														std::cerr	<<	"ERROR:	Too	many	<var>	elements	in	<varcase>."	<<	std::endl;
+																																														std::cerr	<<	"							at	line	"	<<	line_number	<<	"."								<<	std::endl;
+																																														std::cerr	<<	"							There	can	be	no	more	than	three	<var>"	<<	std::endl;
+																																														std::cerr	<<	"							elements	in	a	<varcase>."														<<	std::endl;
+																																														return	-1;
+																																										break;
+																																						}
+																																		}
+																																		axis_index++;
+																														}	else	{
+																																		std::cerr	<<	"WARNING:	<varcase>	specification	contains	an	unknown	element	\"<"
+																																		<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+																														}
+																										}
+																										child_current_node	=	child_current_node->next;
+																						}
+																		}	else	{
+																						std::cerr	<<	"WARNING:	<curve>	specification	contains	an	unknown	element	\"<"
+																											<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+																		}
+														}
+														current_node	=	current_node->next;
+										}
+			}	else	{
+								std::cerr	<<	"ERROR:	Expected	<var>	or	<varcase>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+			}
+
+				//	Validation	criteria:
+				number_of_axes	=	this->NumberOfAxes();
+
+				if	(	!(number_of_axes	==	2)	&&	!(number_of_axes	==	3))	{
+								return	-1;
+				}
+
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_curve::DPM_curve(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_curve::DPM_curve(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0) {
-      throw std::invalid_argument("DPM_table specification is un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0)	{
+						throw	std::invalid_argument("DPM_table	specification	is	un-usable.");
+		}
 }
 
-// MEMBER FUNCTION
-DPM_curve::~DPM_curve() {
+//	MEMBER	FUNCTION
+DPM_curve::~DPM_curve()	{
 
-// FIXME delete all of the elements of the varcase lists.
-  if (x_varcase_list.size()) { x_varcase_list.clear(); }
-  if (y_varcase_list.size()) { y_varcase_list.clear(); }
-  if (z_varcase_list.size()) { z_varcase_list.clear(); }
+//	FIXME	delete	all	of	the	elements	of	the	varcase	lists.
+		if	(x_varcase_list.size())	{	x_varcase_list.clear();	}
+		if	(y_varcase_list.size())	{	y_varcase_list.clear();	}
+		if	(z_varcase_list.size())	{	z_varcase_list.clear();	}
 }
 
-// MEMBER FUNCTION
-  int DPM_curve::NumberOfAxes() {
-    int number_of_axes;
-    int x_case_count = (int)x_varcase_list.size();
-    int y_case_count = (int)y_varcase_list.size();
-    int z_case_count = (int)z_varcase_list.size();
-
-    if (x_case_count == y_case_count) {
-        if (z_case_count == 0) {
-            number_of_axes = 2;
-        } else if (z_case_count == x_case_count) {
-            number_of_axes = 3;
-        } else {
-            std::cerr << "INTERNAL ERROR: Variables lists are messed up.(1)" << std::endl;
-            return 0;
-        }
-    } else {
-        std::cerr << "INTERNAL ERROR: Variables lists are messed up.(2)" << std::endl;
-        std::cerr << "x_case_count =" << x_case_count << std::endl;
-        std::cerr << "y_case_count =" << y_case_count << std::endl;
-        std::cerr << "z_case_count =" << z_case_count << std::endl;
-        return 0;
-    }
-    return ( number_of_axes);
+//	MEMBER	FUNCTION
+		int	DPM_curve::NumberOfAxes()	{
+				int	number_of_axes;
+				int	x_case_count	=	(int)x_varcase_list.size();
+				int	y_case_count	=	(int)y_varcase_list.size();
+				int	z_case_count	=	(int)z_varcase_list.size();
+
+				if	(x_case_count	==	y_case_count)	{
+								if	(z_case_count	==	0)	{
+												number_of_axes	=	2;
+								}	else	if	(z_case_count	==	x_case_count)	{
+												number_of_axes	=	3;
+								}	else	{
+												std::cerr	<<	"INTERNAL	ERROR:	Variables	lists	are	messed	up.(1)"	<<	std::endl;
+												return	0;
+								}
+				}	else	{
+								std::cerr	<<	"INTERNAL	ERROR:	Variables	lists	are	messed	up.(2)"	<<	std::endl;
+								std::cerr	<<	"x_case_count	="	<<	x_case_count	<<	std::endl;
+								std::cerr	<<	"y_case_count	="	<<	y_case_count	<<	std::endl;
+								std::cerr	<<	"z_case_count	="	<<	z_case_count	<<	std::endl;
+								return	0;
+				}
+				return	(	number_of_axes);
 }
 
-// MEMBER FUNCTION
-  int DPM_curve::NumberOfVarCases() {
-  return ( (int)x_varcase_list.size());
+//	MEMBER	FUNCTION
+		int	DPM_curve::NumberOfVarCases()	{
+		return	(	(int)x_varcase_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_var *DPM_curve::getXVar(unsigned int index) {
-  if (index < x_varcase_list.size( ))  {
-    return ( x_varcase_list[index] );
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_var	*DPM_curve::getXVar(unsigned	int	index)	{
+		if	(index	<	x_varcase_list.size(	))		{
+				return	(	x_varcase_list[index]	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-DPM_var *DPM_curve::getYVar(unsigned int index) {
-  if (index < y_varcase_list.size( ))  {
-    return ( y_varcase_list[index] );
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_var	*DPM_curve::getYVar(unsigned	int	index)	{
+		if	(index	<	y_varcase_list.size(	))		{
+				return	(	y_varcase_list[index]	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-DPM_var *DPM_curve::getZVar(unsigned int index) {
-  if (index < z_varcase_list.size( ))  {
-    return ( z_varcase_list[index] );
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_var	*DPM_curve::getZVar(unsigned	int	index)	{
+		if	(index	<	z_varcase_list.size(	))		{
+				return	(	z_varcase_list[index]	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-const char * DPM_curve::getXVarName(unsigned int case_index) {
-  if (case_index < x_varcase_list.size())  {
-    return ( x_varcase_list[case_index]->getName());
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+const	char	*	DPM_curve::getXVarName(unsigned	int	case_index)	{
+		if	(case_index	<	x_varcase_list.size())		{
+				return	(	x_varcase_list[case_index]->getName());
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-const char * DPM_curve::getYVarName(unsigned int case_index) {
-  if (case_index < y_varcase_list.size())  {
-    return ( y_varcase_list[case_index]->getName());
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+const	char	*	DPM_curve::getYVarName(unsigned	int	case_index)	{
+		if	(case_index	<	y_varcase_list.size())		{
+				return	(	y_varcase_list[case_index]->getName());
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-const char * DPM_curve::getZVarName(unsigned int case_index) {
-  if (case_index < z_varcase_list.size())  {
-    return ( z_varcase_list[case_index]->getName());
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+const	char	*	DPM_curve::getZVarName(unsigned	int	case_index)	{
+		if	(case_index	<	z_varcase_list.size())		{
+				return	(	z_varcase_list[case_index]->getName());
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::string DPM_curve::getXCommonName() {
-
-  std::string candidate_label;
-  
-  int n_vars, i;
-
-  candidate_label = x_varcase_list[0]->getShortName();
-  n_vars = (int)x_varcase_list.size();
-  for (i=1; i<n_vars; i++) {
-     if (candidate_label != x_varcase_list[i]->getShortName()) {
-        return ("");
-     }
-  }
-  return (candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_curve::getXCommonName()	{
+
+		std::string	candidate_label;
+		
+		int	n_vars,	i;
+
+		candidate_label	=	x_varcase_list[0]->getShortName();
+		n_vars	=	(int)x_varcase_list.size();
+		for	(i=1;	i<n_vars;	i++)	{
+					if	(candidate_label	!=	x_varcase_list[i]->getShortName())	{
+								return	("");
+					}
+		}
+		return	(candidate_label);
 }
 
-// MEMBER FUNCTION
-std::string DPM_curve::getYCommonName() {
-
-  std::string candidate_label;
-  
-  int n_vars, i;
-
-  candidate_label = y_varcase_list[0]->getShortName();
-  n_vars = (int)y_varcase_list.size();
-  for (i=1; i<n_vars; i++) {
-     if (candidate_label != y_varcase_list[i]->getShortName()) {
-        return ("");
-     }
-  }
-  return ( candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_curve::getYCommonName()	{
+
+		std::string	candidate_label;
+		
+		int	n_vars,	i;
+
+		candidate_label	=	y_varcase_list[0]->getShortName();
+		n_vars	=	(int)y_varcase_list.size();
+		for	(i=1;	i<n_vars;	i++)	{
+					if	(candidate_label	!=	y_varcase_list[i]->getShortName())	{
+								return	("");
+					}
+		}
+		return	(	candidate_label);
 }
 
-// MEMBER FUNCTION
-std::string DPM_curve::getZCommonName() {
-
-  std::string candidate_label;
-  
-  int n_vars, i;
-
-  candidate_label = z_varcase_list[0]->getShortName();
-  n_vars = (int)z_varcase_list.size();
-  for (i=1; i<n_vars; i++) {
-     if (candidate_label != z_varcase_list[i]->getShortName()) {
-        return ("");
-     }
-  }
-  return (candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_curve::getZCommonName()	{
+
+		std::string	candidate_label;
+		
+		int	n_vars,	i;
+
+		candidate_label	=	z_varcase_list[0]->getShortName();
+		n_vars	=	(int)z_varcase_list.size();
+		for	(i=1;	i<n_vars;	i++)	{
+					if	(candidate_label	!=	z_varcase_list[i]->getShortName())	{
+								return	("");
+					}
+		}
+		return	(candidate_label);
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_curve *curve) {
-  int i;
-  //int n = (int)curve->attribute_list.size();
-  int n_x  = curve->x_varcase_list.size();
-  int n_y  = curve->y_varcase_list.size();
-  int n_z  = curve->z_varcase_list.size();
-
-  s << "<curve>" << std::endl;
-  //s << "<curve";
-  //for (i=0 ; i<n ; i++) {
-  //  s << " " << curve->attribute_list[i];
-  //}
-  //s << ">" << s << std::endl;
-
-  // Print out the variables.
-  for (i=0; i<n_x; i++) {
-    s << curve->x_varcase_list[i];
-  }
-
-  for (i=0; i<n_y; i++) {
-    s << curve->y_varcase_list[i];
-  }
-
-  for (i=0; i<n_z; i++) {
-    s << curve->z_varcase_list[i];
-  }
-
-  s << "</curve>";
-  s << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_curve	*curve)	{
+		int	i;
+		//int	n	=	(int)curve->attribute_list.size();
+		int	n_x		=	curve->x_varcase_list.size();
+		int	n_y		=	curve->y_varcase_list.size();
+		int	n_z		=	curve->z_varcase_list.size();
+
+		s	<<	"<curve>"	<<	std::endl;
+		//s	<<	"<curve";
+		//for	(i=0	;	i<n	;	i++)	{
+		//		s	<<	"	"	<<	curve->attribute_list[i];
+		//}
+		//s	<<	">"	<<	s	<<	std::endl;
+
+		//	Print	out	the	variables.
+		for	(i=0;	i<n_x;	i++)	{
+				s	<<	curve->x_varcase_list[i];
+		}
+
+		for	(i=0;	i<n_y;	i++)	{
+				s	<<	curve->y_varcase_list[i];
+		}
+
+		for	(i=0;	i<n_z;	i++)	{
+				s	<<	curve->z_varcase_list[i];
+		}
+
+		s	<<	"</curve>";
+		s	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
index 488ff500a..0f8960172 100644
--- a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
@@ -1,140 +1,140 @@
 
-#include <string.h>
+#include	<string.h>
 
-#include "DPM_extfn.hh"
+#include	"DPM_extfn.hh"
 
-int DPM_extfn::Initialize( xmlNode *base_node) {
+int	DPM_extfn::Initialize(	xmlNode	*base_node)	{
 
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_extfn::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_extfn::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
 
-    if ( strcmp( (char *)base_node->name, "extfn") != 0) {
-        std::cerr << "ERROR: Expected <extfn> specification but didnt find it." << std::endl;
-        return -1;
-    }
+				if	(	strcmp(	(char	*)base_node->name,	"extfn")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<extfn>	specification	but	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
 
-    xmlNode *current_node = base_node->children;
+				xmlNode	*current_node	=	base_node->children;
 
-    while (current_node != NULL) {
+				while	(current_node	!=	NULL)	{
 
-      if (current_node->type == XML_ELEMENT_NODE) {
-	if ( strcmp( (const char *)current_node->name, "fname") == 0) {
+						if	(current_node->type	==	XML_ELEMENT_NODE)	{
+	if	(	strcmp(	(const	char	*)current_node->name,	"fname")	==	0)	{
 
-	  xmlNode *text_node = current_node->children;
-	  fname = strdup( (const char *)text_node->content);
+			xmlNode	*text_node	=	current_node->children;
+			fname	=	strdup(	(const	char	*)text_node->content);
 
-	} else if ( strcmp( (const char *)current_node->name, "inputs") == 0) {
+	}	else	if	(	strcmp(	(const	char	*)current_node->name,	"inputs")	==	0)	{
 
-         try {
-             inputs = new DPM_inputs(this, current_node);
-         } catch (std::invalid_argument) {
-             inputs = NULL;
-             std::cerr << "ERROR: <inputs> specification is invalid." << std::endl;
-         }
+									try	{
+													inputs	=	new	DPM_inputs(this,	current_node);
+									}	catch	(std::invalid_argument)	{
+													inputs	=	NULL;
+													std::cerr	<<	"ERROR:	<inputs>	specification	is	invalid."	<<	std::endl;
+									}
 
-	} else if ( strcmp( (const char *)current_node->name, "outputs") == 0) {
+	}	else	if	(	strcmp(	(const	char	*)current_node->name,	"outputs")	==	0)	{
 
-         try {
-	      outputs = new DPM_outputs(this, current_node);
-         } catch (std::invalid_argument) {
-             inputs = NULL;
-             std::cerr << "ERROR: <outputs> specification is invalid." << std::endl;
-         }
+									try	{
+							outputs	=	new	DPM_outputs(this,	current_node);
+									}	catch	(std::invalid_argument)	{
+													inputs	=	NULL;
+													std::cerr	<<	"ERROR:	<outputs>	specification	is	invalid."	<<	std::endl;
+									}
 
-	} else {
-         std::cerr << "WARNING: Unknown element \"" << current_node->name << "\". Skipping." << std::endl;
+	}	else	{
+									std::cerr	<<	"WARNING:	Unknown	element	\""	<<	current_node->name	<<	"\".	Skipping."	<<	std::endl;
 	}
-      }
-      current_node = current_node->next;
-    }
-
-    // Validation
-    // 1. function name is required. Its needed to identify the external dynamically loaded function.
-    // 2. inputs are required.
-    // 3. outputs are required.
-
-    if (fname == NULL) {
-        std::cerr << "ERROR: <extfn> specification is missing an <fname> (function name) specification." << std::endl;
-        return -1;
-    }
-    if (inputs == NULL) {
-        std::cerr << "ERROR: <extfn> specification is missing an <inputs> specification." << std::endl;
-        return -1;
-    }
-    if (outputs == NULL) {
-        std::cerr << "ERROR: <extfn> specification is missing an <outputs> specification." << std::endl;
-        return -1;
-    }
-    return 0;
+						}
+						current_node	=	current_node->next;
+				}
+
+				//	Validation
+				//	1.	function	name	is	required.	Its	needed	to	identify	the	external	dynamically	loaded	function.
+				//	2.	inputs	are	required.
+				//	3.	outputs	are	required.
+
+				if	(fname	==	NULL)	{
+								std::cerr	<<	"ERROR:	<extfn>	specification	is	missing	an	<fname>	(function	name)	specification."	<<	std::endl;
+								return	-1;
+				}
+				if	(inputs	==	NULL)	{
+								std::cerr	<<	"ERROR:	<extfn>	specification	is	missing	an	<inputs>	specification."	<<	std::endl;
+								return	-1;
+				}
+				if	(outputs	==	NULL)	{
+								std::cerr	<<	"ERROR:	<extfn>	specification	is	missing	an	<outputs>	specification."	<<	std::endl;
+								return	-1;
+				}
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_extfn::DPM_extfn(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_extfn::DPM_extfn(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0) {
-      throw std::invalid_argument("<extfn> specification is un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0)	{
+						throw	std::invalid_argument("<extfn>	specification	is	un-usable.");
+		}
 }
 
-// DESTRUCTOR
-DPM_extfn::~DPM_extfn() {
-  if (inputs) { delete inputs; }
-  if (outputs) { delete outputs; }
+//	DESTRUCTOR
+DPM_extfn::~DPM_extfn()	{
+		if	(inputs)	{	delete	inputs;	}
+		if	(outputs)	{	delete	outputs;	}
 }
 
-// MEMBER FUNCTION
-const char *DPM_extfn::getFName() {
-  return ( (const char *)fname);
+//	MEMBER	FUNCTION
+const	char	*DPM_extfn::getFName()	{
+		return	(	(const	char	*)fname);
 }
 
-// MEMBER FUNCTION
-int DPM_extfn::NumberOfInputs() {
-  return( inputs->NumberOfInputs() );
+//	MEMBER	FUNCTION
+int	DPM_extfn::NumberOfInputs()	{
+		return(	inputs->NumberOfInputs()	);
 }
 
-// MEMBER FUNCTION
-const char* DPM_extfn::getInputVar( unsigned int index) {
-  return( inputs->getVarName(index) );
+//	MEMBER	FUNCTION
+const	char*	DPM_extfn::getInputVar(	unsigned	int	index)	{
+		return(	inputs->getVarName(index)	);
 }
 
-// MEMBER FUNCTION
-int DPM_extfn::NumberOfOutputs() {
-  return ( outputs->NumberOfOutputs() );
+//	MEMBER	FUNCTION
+int	DPM_extfn::NumberOfOutputs()	{
+		return	(	outputs->NumberOfOutputs()	);
 }
 
-// MEMBER FUNCTION
-const char* DPM_extfn::getOutputVar( unsigned int index) {
-  return( outputs->getVarName(index) );
+//	MEMBER	FUNCTION
+const	char*	DPM_extfn::getOutputVar(	unsigned	int	index)	{
+		return(	outputs->getVarName(index)	);
 }
 
-// MEMBER FUNCTION
-const char* DPM_extfn::getOutputUnits( unsigned int index) {
-  return( outputs->getUnits(index) );
+//	MEMBER	FUNCTION
+const	char*	DPM_extfn::getOutputUnits(	unsigned	int	index)	{
+		return(	outputs->getUnits(index)	);
 }
 
-// MEMBER FUNCTION
-int DPM_extfn::index_of( const char* var_name) {
-  // NOT YET IMPLEMENTED.
-  return (0);
+//	MEMBER	FUNCTION
+int	DPM_extfn::index_of(	const	char*	var_name)	{
+		//	NOT	YET	IMPLEMENTED.
+		return	(0);
 }
 
-// FRIEND FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_extfn *extfn) {
-  int i;
-  int n = (int)extfn->attribute_list.size();
-
-  s << "<extfn";
-  for (i=0 ; i<n ; i++) {
-    s << " " << extfn->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  s << extfn->inputs;
-  s << extfn->outputs;
-  s << "</relation>";
-  s << std::endl;
-  return s;
+//	FRIEND	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_extfn	*extfn)	{
+		int	i;
+		int	n	=	(int)extfn->attribute_list.size();
+
+		s	<<	"<extfn";
+		for	(i=0	;	i<n	;	i++)	{
+				s	<<	"	"	<<	extfn->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		s	<<	extfn->inputs;
+		s	<<	extfn->outputs;
+		s	<<	"</relation>";
+		s	<<	std::endl;
+		return	s;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_inputs.cpp b/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
index 66ef071b8..115553d9d 100644
--- a/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
@@ -1,105 +1,105 @@
 
-#include <string.h>
-
-#include "DPM_inputs.hh"
-
-// MEMBER FUNCTION
-int DPM_inputs::Initialize( xmlNode *base_node) {
-    int n_vars;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_inputs::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "inputs") != 0) {
-       std::cerr <<"ERROR: Expected an <inputs> specification, but alas it wasn\'t found." << std::endl;
-       return -1;
-    }
-
-    xmlNode *current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-        DPM_var *var;
-            if ( strcmp( (const char *)current_node->name, "var") == 0) {
-                try {
-                    var = new DPM_var(this, current_node);
-                } catch (std::invalid_argument) {
-                    var = NULL;
-                    std::cerr <<"ERROR: <input> specification contains an invalid <var> specification." << std::endl;
-                    std::cerr <<":::::: Therefore the entire <inputs> specification is invalid." << std::endl;
-                    return -1;
-                }
-                if (var != NULL) {
-                    var_list.push_back( var );
-                }
-            } else {
-                std::cerr << "WARNING: <input> specification contains the unknown element \"<" <<
-                        current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    // Validation
-    // 1. Inputs must have at least one var.
-    n_vars = (int)var_list.size();
-    if ( n_vars < 1) {
-        std::cerr <<"ERROR: <inputs> specification must have at least one <var> specification." << std::endl;
-        return -1;
-    }
-    return 0;
+#include	<string.h>
+
+#include	"DPM_inputs.hh"
+
+//	MEMBER	FUNCTION
+int	DPM_inputs::Initialize(	xmlNode	*base_node)	{
+				int	n_vars;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_inputs::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"inputs")	!=	0)	{
+							std::cerr	<<"ERROR:	Expected	an	<inputs>	specification,	but	alas	it	wasn\'t	found."	<<	std::endl;
+							return	-1;
+				}
+
+				xmlNode	*current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+								DPM_var	*var;
+												if	(	strcmp(	(const	char	*)current_node->name,	"var")	==	0)	{
+																try	{
+																				var	=	new	DPM_var(this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				var	=	NULL;
+																				std::cerr	<<"ERROR:	<input>	specification	contains	an	invalid	<var>	specification."	<<	std::endl;
+																				std::cerr	<<"::::::	Therefore	the	entire	<inputs>	specification	is	invalid."	<<	std::endl;
+																				return	-1;
+																}
+																if	(var	!=	NULL)	{
+																				var_list.push_back(	var	);
+																}
+												}	else	{
+																std::cerr	<<	"WARNING:	<input>	specification	contains	the	unknown	element	\"<"	<<
+																								current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				//	Validation
+				//	1.	Inputs	must	have	at	least	one	var.
+				n_vars	=	(int)var_list.size();
+				if	(	n_vars	<	1)	{
+								std::cerr	<<"ERROR:	<inputs>	specification	must	have	at	least	one	<var>	specification."	<<	std::endl;
+								return	-1;
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_inputs::DPM_inputs(DPM_component *Parent, xmlNode *Base_node)
-     : DPM_component(Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_inputs::DPM_inputs(DPM_component	*Parent,	xmlNode	*Base_node)
+					:	DPM_component(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0) {
-      throw std::invalid_argument("<inputs> specification is invalid and un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0)	{
+						throw	std::invalid_argument("<inputs>	specification	is	invalid	and	un-usable.");
+		}
 }
 
-// DESTRUCTOR
-DPM_inputs::~DPM_inputs() {
-    // Destroy all of the strings in the var_list.
-    int i;
-    int n = (int)var_list.size();
-    for (i = 0; i < n ; i ++) {
-         delete var_list[i];
-    }
+//	DESTRUCTOR
+DPM_inputs::~DPM_inputs()	{
+				//	Destroy	all	of	the	strings	in	the	var_list.
+				int	i;
+				int	n	=	(int)var_list.size();
+				for	(i	=	0;	i	<	n	;	i	++)	{
+									delete	var_list[i];
+				}
 }
 
-// MEMBER FUNCTION
-int DPM_inputs::NumberOfInputs() {
-  return ((int)var_list.size());
+//	MEMBER	FUNCTION
+int	DPM_inputs::NumberOfInputs()	{
+		return	((int)var_list.size());
 }
 
-// MEMBER FUNCTION
-const char *DPM_inputs::getVarName(unsigned int index) {
+//	MEMBER	FUNCTION
+const	char	*DPM_inputs::getVarName(unsigned	int	index)	{
 
-  if (index < var_list.size( ))  {
-    return ( var_list[index]->getName() );
-  } else {
-    return NULL;
-  }
+		if	(index	<	var_list.size(	))		{
+				return	(	var_list[index]->getName()	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_inputs *inputs) {
-     int i;
-     int n_attrs = (int)inputs->attribute_list.size();
-     int n_vars  = (int)inputs->var_list.size();
-
-     s << "<inputs";
-     for (i=0 ; i<n_attrs ; i++) {
-          s << " " << inputs->attribute_list[i];
-     }
-     s << ">" << std::endl;
-
-     for (i=0 ; i<n_vars ; i++) {
-          s << inputs->var_list[i];
-     }
-     s << "</inputs>" << std::endl;
-     return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_inputs	*inputs)	{
+					int	i;
+					int	n_attrs	=	(int)inputs->attribute_list.size();
+					int	n_vars		=	(int)inputs->var_list.size();
+
+					s	<<	"<inputs";
+					for	(i=0	;	i<n_attrs	;	i++)	{
+										s	<<	"	"	<<	inputs->attribute_list[i];
+					}
+					s	<<	">"	<<	std::endl;
+
+					for	(i=0	;	i<n_vars	;	i++)	{
+										s	<<	inputs->var_list[i];
+					}
+					s	<<	"</inputs>"	<<	std::endl;
+					return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
index 71fba007d..c5ac37f10 100644
--- a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
@@ -1,110 +1,110 @@
 
-#include <udunits2.h>
-#include <string.h>
-#include "DPM_measurement.hh"
-
-extern ut_system * u_system ;
-
-// MEMEBR FUNCTION
-int DPM_measurement::Initialize( xmlNode *base_node) {
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_measurement::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "measurement") != 0) {
-       std::cerr << "ERROR: Expected a <measurement> specification but alas it wasn\'t found." << std::endl;
-       return -1;
-    }
-
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-
-    while (current_node != NULL) {
-
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "var") == 0) {
-
-            // Note that for this "var" element we are ignoring any attributes.
-            // So we don't create an DPM_var. We just grab the content part.
-
-            xmlNode *text_node = current_node->children;
-            var = strdup( (const char *)text_node->content);
-
-            } else if ( strcmp( (const char *)current_node->name, "units") == 0) {
-
-                xmlNode *text_node = current_node->children;
-                unitspec = strdup( (const char *)text_node->content);
-
-            } else {
-                std::cerr << "WARNING: <measurement> specification contains an unknown element \"<" <<
-                        current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    // Validate measurement
-    // 1. Measurement requires one var.
-    // 2. Measurement requires one units.
-    if (var == NULL) {
-        std::cerr << "ERROR: <measurement> specification is missing a <var> specification." << std::endl;
-        return -1;
-    }
-    if (unitspec == NULL) {
-        std::cerr << "ERROR: <measurement> specification is missing a <units> specification." << std::endl;
-        return -1;
-    } else {
-        ut_unit * validation_unit = ut_parse(u_system, unitspec, UT_ASCII) ;
-        if( validation_unit == NULL ) {
-            std::cerr << "ERROR: <measurement> specification contains an invalid <units> specification: \"" << unitspec << "\"." << std::endl;
-            return -1;
-        }
-        ut_free(validation_unit) ;
-    }
-    return 0;
+#include	<udunits2.h>
+#include	<string.h>
+#include	"DPM_measurement.hh"
+
+extern	ut_system	*	u_system	;
+
+//	MEMEBR	FUNCTION
+int	DPM_measurement::Initialize(	xmlNode	*base_node)	{
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_measurement::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"measurement")	!=	0)	{
+							std::cerr	<<	"ERROR:	Expected	a	<measurement>	specification	but	alas	it	wasn\'t	found."	<<	std::endl;
+							return	-1;
+				}
+
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+
+				while	(current_node	!=	NULL)	{
+
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"var")	==	0)	{
+
+												//	Note	that	for	this	"var"	element	we	are	ignoring	any	attributes.
+												//	So	we	don't	create	an	DPM_var.	We	just	grab	the	content	part.
+
+												xmlNode	*text_node	=	current_node->children;
+												var	=	strdup(	(const	char	*)text_node->content);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"units")	==	0)	{
+
+																xmlNode	*text_node	=	current_node->children;
+																unitspec	=	strdup(	(const	char	*)text_node->content);
+
+												}	else	{
+																std::cerr	<<	"WARNING:	<measurement>	specification	contains	an	unknown	element	\"<"	<<
+																								current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				//	Validate	measurement
+				//	1.	Measurement	requires	one	var.
+				//	2.	Measurement	requires	one	units.
+				if	(var	==	NULL)	{
+								std::cerr	<<	"ERROR:	<measurement>	specification	is	missing	a	<var>	specification."	<<	std::endl;
+								return	-1;
+				}
+				if	(unitspec	==	NULL)	{
+								std::cerr	<<	"ERROR:	<measurement>	specification	is	missing	a	<units>	specification."	<<	std::endl;
+								return	-1;
+				}	else	{
+								ut_unit	*	validation_unit	=	ut_parse(u_system,	unitspec,	UT_ASCII)	;
+								if(	validation_unit	==	NULL	)	{
+												std::cerr	<<	"ERROR:	<measurement>	specification	contains	an	invalid	<units>	specification:	\""	<<	unitspec	<<	"\"."	<<	std::endl;
+												return	-1;
+								}
+								ut_free(validation_unit)	;
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_measurement::DPM_measurement(DPM_component *Parent, xmlNode *Base_node)
-     : DPM_component (Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_measurement::DPM_measurement(DPM_component	*Parent,	xmlNode	*Base_node)
+					:	DPM_component	(Parent,	Base_node)	{
 
-     if ( Initialize( Base_node) < 0) {
-         throw std::invalid_argument("<measurement> specification is invalid and un-usable.");
-     }
+					if	(	Initialize(	Base_node)	<	0)	{
+									throw	std::invalid_argument("<measurement>	specification	is	invalid	and	un-usable.");
+					}
 }
 
-// DESTRUCTOR
-DPM_measurement::~DPM_measurement() {
+//	DESTRUCTOR
+DPM_measurement::~DPM_measurement()	{
 
-  if (var) { free(var); }
-  if (unitspec) { free(unitspec); }
+		if	(var)	{	free(var);	}
+		if	(unitspec)	{	free(unitspec);	}
 }
 
-// MEMEBR FUNCTION
-const char *DPM_measurement::getVarName() {
-    return var;
+//	MEMEBR	FUNCTION
+const	char	*DPM_measurement::getVarName()	{
+				return	var;
 }
 
-// MEMEBR FUNCTION
-const char *DPM_measurement::getUnits() {
-    return unitspec;
+//	MEMEBR	FUNCTION
+const	char	*DPM_measurement::getUnits()	{
+				return	unitspec;
 }
 
-// MEMEBR FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_measurement *measurement) {
-     int i;
-     int n = (int)measurement->attribute_list.size();
-
-     s << "<measurement";
-     for (i=0 ; i<n ; i++) {
-          s << " " << measurement->attribute_list[i];
-     }
-     s << ">";
-     s << std::endl;
-     s << measurement->var;
-     s << "<units>" << measurement->unitspec << "</units>" << std::endl;
-     s << "</measurement>";
-     s << std::endl;
-     return s;
+//	MEMEBR	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_measurement	*measurement)	{
+					int	i;
+					int	n	=	(int)measurement->attribute_list.size();
+
+					s	<<	"<measurement";
+					for	(i=0	;	i<n	;	i++)	{
+										s	<<	"	"	<<	measurement->attribute_list[i];
+					}
+					s	<<	">";
+					s	<<	std::endl;
+					s	<<	measurement->var;
+					s	<<	"<units>"	<<	measurement->unitspec	<<	"</units>"	<<	std::endl;
+					s	<<	"</measurement>";
+					s	<<	std::endl;
+					return	s;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_outputs.cpp b/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
index 527a28a9f..adc165210 100644
--- a/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
@@ -1,108 +1,108 @@
 
-#include <string.h>
+#include	<string.h>
 
-#include "DPM_outputs.hh"
+#include	"DPM_outputs.hh"
 
-// MEMBER FUNCTION
-int DPM_outputs::Initialize( xmlNode *base_node) {
-    int n_measurements;
+//	MEMBER	FUNCTION
+int	DPM_outputs::Initialize(	xmlNode	*base_node)	{
+				int	n_measurements;
 
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_outputs::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "outputs") != 0) {
-        std::cerr << "ERROR: Expected <outputs> specification but alas, is wasn\'t found." << std::endl;
-        return -1;
-    }
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            DPM_measurement *measurement;
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_outputs::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"outputs")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<outputs>	specification	but	alas,	is	wasn\'t	found."	<<	std::endl;
+								return	-1;
+				}
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												DPM_measurement	*measurement;
 
-            if ( strcmp( (const char *)current_node->name, "measurement") == 0) {
-                try {
-                    measurement = new DPM_measurement(this, current_node);
-                } catch (std::invalid_argument) {
-                    measurement = NULL;
-                    std::cerr << "ERROR: <measurement> is invalid." << std::endl;
-                }
-                if (measurement != NULL) {
-                    measurement_list.push_back(measurement);
-                }
-            } else {
-                std::cerr << "WARNING: <outputs> specification contains an unknown element \"<" << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-    // Validation
-    // 1.  Outputs must have at least one valid measurement.
-    n_measurements = (int)measurement_list.size();
-    if ( n_measurements < 1) {
-        std::cerr << "ERROR: <outputs> specification requires at least one valid <measurement> specification." << std::endl;
-        return -1;
-    }
-    return 0;
+												if	(	strcmp(	(const	char	*)current_node->name,	"measurement")	==	0)	{
+																try	{
+																				measurement	=	new	DPM_measurement(this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				measurement	=	NULL;
+																				std::cerr	<<	"ERROR:	<measurement>	is	invalid."	<<	std::endl;
+																}
+																if	(measurement	!=	NULL)	{
+																				measurement_list.push_back(measurement);
+																}
+												}	else	{
+																std::cerr	<<	"WARNING:	<outputs>	specification	contains	an	unknown	element	\"<"	<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+				//	Validation
+				//	1.		Outputs	must	have	at	least	one	valid	measurement.
+				n_measurements	=	(int)measurement_list.size();
+				if	(	n_measurements	<	1)	{
+								std::cerr	<<	"ERROR:	<outputs>	specification	requires	at	least	one	valid	<measurement>	specification."	<<	std::endl;
+								return	-1;
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_outputs::DPM_outputs(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_outputs::DPM_outputs(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  Initialize( Base_node);
+		Initialize(	Base_node);
 }
 
-// DESTRUCTOR
-DPM_outputs::~DPM_outputs() {
-  int i,n;
-  n = (int)measurement_list.size();
-  for (i = 0; i < n ; i ++) {
-    DPM_measurement *measurement;
-    measurement = measurement_list[i];
-    if (measurement) { delete measurement; }
-  }
+//	DESTRUCTOR
+DPM_outputs::~DPM_outputs()	{
+		int	i,n;
+		n	=	(int)measurement_list.size();
+		for	(i	=	0;	i	<	n	;	i	++)	{
+				DPM_measurement	*measurement;
+				measurement	=	measurement_list[i];
+				if	(measurement)	{	delete	measurement;	}
+		}
 }
 
-// MEMBER FUNCTION
-int DPM_outputs::NumberOfOutputs() {
-  return(  (int)measurement_list.size());
+//	MEMBER	FUNCTION
+int	DPM_outputs::NumberOfOutputs()	{
+		return(		(int)measurement_list.size());
 }
 
-// MEMBER FUNCTION
-const char *DPM_outputs::getVarName( unsigned int index) {
-  if (index < measurement_list.size( ))  {
-    return ( measurement_list[index]->getVarName() );
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+const	char	*DPM_outputs::getVarName(	unsigned	int	index)	{
+		if	(index	<	measurement_list.size(	))		{
+				return	(	measurement_list[index]->getVarName()	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-const char *DPM_outputs::getUnits( unsigned int index) {
-  if (index < measurement_list.size( ))  {
-    return ( measurement_list[index]->getUnits() );
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+const	char	*DPM_outputs::getUnits(	unsigned	int	index)	{
+		if	(index	<	measurement_list.size(	))		{
+				return	(	measurement_list[index]->getUnits()	);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_outputs *outputs) {
-  int i;
-  int n_attrs = (int)outputs->attribute_list.size();
-  int n_measurements  = (int)outputs->measurement_list.size();
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_outputs	*outputs)	{
+		int	i;
+		int	n_attrs	=	(int)outputs->attribute_list.size();
+		int	n_measurements		=	(int)outputs->measurement_list.size();
 
-  s << "<outputs";
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << outputs->attribute_list[i];
-  }
-  s << ">" << std::endl;
+		s	<<	"<outputs";
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	outputs->attribute_list[i];
+		}
+		s	<<	">"	<<	std::endl;
 
-  for (i=0 ; i<n_measurements ; i++) {
-    s << outputs->measurement_list[i];
-  }
-  s << "</inputs>" << std::endl;
-  return s;
+		for	(i=0	;	i<n_measurements	;	i++)	{
+				s	<<	outputs->measurement_list[i];
+		}
+		s	<<	"</inputs>"	<<	std::endl;
+		return	s;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_page.cpp b/trick_source/data_products/DPX/DPM/DPM_page.cpp
index 25aa24a95..71c2da2a0 100644
--- a/trick_source/data_products/DPX/DPM/DPM_page.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_page.cpp
@@ -1,141 +1,141 @@
 
-#include <string.h>
-
-#include "DPM_page.hh"
-#include "float.h"
-
-int DPM_page::Initialize( xmlNode *base_node) {
-
-    double tstart    = 0.0;
-    double tstop     = DBL_MAX;
-    double frequency = DBL_MAX;
-    title = NULL;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_page::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "page") != 0) {
-        std::cerr << "ERROR: Expected <page> specification but alas it wasn\'t found." << std::endl;
-        return -1;
-    }
-
-    int n_relations;
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "title") == 0) {
-                xmlNode *text_node = current_node->children;
-                title = strdup( (const char *)text_node->content);
-            } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstart = strtod((const char *)text_node->content,(char **)NULL);
-            } else if ( strcmp( (const char *)current_node->name, "tstop") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstop = strtod((const char *)text_node->content,(char **)NULL);
-            } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
-                xmlNode *text_node = current_node->children;
-                frequency = strtod((const char *)text_node->content,(char**)NULL);
-            } else if ( strcmp( (const char *)current_node->name, "plot") == 0) {
-                DPM_relation *relation;
-                try {
-                    relation = new DPM_relation(this, current_node);
-                } catch (std::invalid_argument) {
-                    relation = NULL;
-                    std::cerr << "ERROR: <page> specification contains an invalid <plot> specification." << std::endl;
-                }
-                if (relation != NULL) {
-                    relation_list.push_back(relation);
-                }
-            } else {
-                std::cerr << "WARNING: <page> specification contains an unknown element \"<" << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
-
-    // Validation criteria:
-    // 1. Page requires at least one relation (plot).
-    n_relations = (int)relation_list.size();
-    if (n_relations < 1) {
-        std::cerr << "ERROR: <page> specification requires at least one valid <plot> specification. " << std::endl;
-        return -1;
-    }
-    return 0;
+#include	<string.h>
+
+#include	"DPM_page.hh"
+#include	"float.h"
+
+int	DPM_page::Initialize(	xmlNode	*base_node)	{
+
+				double	tstart				=	0.0;
+				double	tstop					=	DBL_MAX;
+				double	frequency	=	DBL_MAX;
+				title	=	NULL;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_page::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"page")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<page>	specification	but	alas	it	wasn\'t	found."	<<	std::endl;
+								return	-1;
+				}
+
+				int	n_relations;
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"title")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																title	=	strdup(	(const	char	*)text_node->content);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstart")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstart	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstop")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstop	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"frequency")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																frequency	=	strtod((const	char	*)text_node->content,(char**)NULL);
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"plot")	==	0)	{
+																DPM_relation	*relation;
+																try	{
+																				relation	=	new	DPM_relation(this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				relation	=	NULL;
+																				std::cerr	<<	"ERROR:	<page>	specification	contains	an	invalid	<plot>	specification."	<<	std::endl;
+																}
+																if	(relation	!=	NULL)	{
+																				relation_list.push_back(relation);
+																}
+												}	else	{
+																std::cerr	<<	"WARNING:	<page>	specification	contains	an	unknown	element	\"<"	<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				time_constraints	=	new	DPM_time_constraints(tstart,	tstop,	frequency);
+
+				//	Validation	criteria:
+				//	1.	Page	requires	at	least	one	relation	(plot).
+				n_relations	=	(int)relation_list.size();
+				if	(n_relations	<	1)	{
+								std::cerr	<<	"ERROR:	<page>	specification	requires	at	least	one	valid	<plot>	specification.	"	<<	std::endl;
+								return	-1;
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_page::DPM_page(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_page::DPM_page(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if (Initialize(Base_node) < 0 ) {
-      throw std::invalid_argument("<page> specification is invalid and un-usable.");
-  }
+		if	(Initialize(Base_node)	<	0	)	{
+						throw	std::invalid_argument("<page>	specification	is	invalid	and	un-usable.");
+		}
 }
 
-// MEMBER FUNCTION
-DPM_page::~DPM_page() {
-    // Destroy all of the DPM_relation objects in the relation_list.
-    int i,n;
-    n = (int)relation_list.size();
-    for (i = 0; i < n ; i ++) {
-        DPM_relation *relation;
-        relation = relation_list[i];
-        if (relation) { delete relation; }
-    }
+//	MEMBER	FUNCTION
+DPM_page::~DPM_page()	{
+				//	Destroy	all	of	the	DPM_relation	objects	in	the	relation_list.
+				int	i,n;
+				n	=	(int)relation_list.size();
+				for	(i	=	0;	i	<	n	;	i	++)	{
+								DPM_relation	*relation;
+								relation	=	relation_list[i];
+								if	(relation)	{	delete	relation;	}
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPM_page::getTitle() {
- return(title);
+//	MEMBER	FUNCTION
+const	char	*DPM_page::getTitle()	{
+	return(title);
 }
 
-// MEMBER FUNCTION
-DPM_time_constraints *DPM_page::getTimeConstraints() {
-  return (time_constraints);
+//	MEMBER	FUNCTION
+DPM_time_constraints	*DPM_page::getTimeConstraints()	{
+		return	(time_constraints);
 }
 
-// MEMBER FUNCTION
-int DPM_page::NumberOfRelations() {
-  return ((int)relation_list.size());
+//	MEMBER	FUNCTION
+int	DPM_page::NumberOfRelations()	{
+		return	((int)relation_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_relation *DPM_page::getRelation( unsigned int index) {
-  if (index < relation_list.size( ))  {
-    return ( relation_list[index]);
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_relation	*DPM_page::getRelation(	unsigned	int	index)	{
+		if	(index	<	relation_list.size(	))		{
+				return	(	relation_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_page *page) {
-  int i;
-  int n_attrs = (int)page->attribute_list.size();
-  int n_relations = (int)page->relation_list.size();
-
-  s << "<page";
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << page->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  if (page->title) {
-  	s << "<title>"  << page->title  << "</title>"  << std::endl;
-  }
-  s << "<tstart>" << page->time_constraints->getStart() << "</tstart>" << std::endl;
-  s << "<tstop>"  << page->time_constraints->getStop()  << "</tstop>"  << std::endl;
-  s << "<frequency>"  << page->time_constraints->getFrequency()  << "</frequency>"  << std::endl;
-
-  for (i=0 ; i<n_relations ; i++) {
-    s << page->relation_list[i];
-  }
-
-  s << "</page>" << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_page	*page)	{
+		int	i;
+		int	n_attrs	=	(int)page->attribute_list.size();
+		int	n_relations	=	(int)page->relation_list.size();
+
+		s	<<	"<page";
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	page->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		if	(page->title)	{
+			s	<<	"<title>"		<<	page->title		<<	"</title>"		<<	std::endl;
+		}
+		s	<<	"<tstart>"	<<	page->time_constraints->getStart()	<<	"</tstart>"	<<	std::endl;
+		s	<<	"<tstop>"		<<	page->time_constraints->getStop()		<<	"</tstop>"		<<	std::endl;
+		s	<<	"<frequency>"		<<	page->time_constraints->getFrequency()		<<	"</frequency>"		<<	std::endl;
+
+		for	(i=0	;	i<n_relations	;	i++)	{
+				s	<<	page->relation_list[i];
+		}
+
+		s	<<	"</page>"	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
index c98d2692c..777795e82 100644
--- a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
@@ -1,85 +1,85 @@
 
-#include <DPM/DPM_parse_tree.hh>
-#include <stdlib.h>
-
-int DPM_parse_tree::Initialize(const char *XMLFileName) {
-
-   int rc;
-   xmlParserCtxtPtr parser_context;
-
-   valid = 0;
-
-   if (! XMLFileName) {
-       std::cerr << "ERROR: XML file name is NULL." << std::endl;
-       std::cerr.flush();
-       rc = -1;
-   } else {
-
-       LIBXML_TEST_VERSION
-
-       // Create a parser context.
-       if ((parser_context = xmlNewParserCtxt()) == NULL) {
-           std::cerr << "ERROR: Out of Memory" << std::endl;
-           std::cerr.flush();
-           exit(0);
-       }
-
-       const char* xml_catalog_files = getenv("XML_CATALOG_FILES");
-       if (xml_catalog_files != NULL) {
-           doc = xmlCtxtReadFile( parser_context, XMLFileName, NULL, XML_PARSE_DTDVALID );
-       } else {
-           std::cerr << std::endl
-                     << "The XML_CATALOG_FILES environment variable is not set." << std::endl
-                     << "So, \"" << XMLFileName << "\" cannot be validated against it's DTD." << std::endl
-                     << "It will therefore be parsed without validation." << std::endl << std::endl;
-           doc = xmlCtxtReadFile( parser_context, XMLFileName, NULL, 0 );
-       } 
-
-       if (doc == NULL) {
-           std::cerr << "ERROR: Parse of XML file \"" << XMLFileName << "\"" << " failed." << std::endl;
-           std::cerr.flush();
-           rc = -1;
-       } else if (parser_context->valid == 0) {
-           std::cerr << "WARNING: Validation of XML file \"" << XMLFileName << "\"" << " failed." << std::endl;
-           std::cerr.flush();
-           rc = 0;
-       } else {
-           valid = 1;
-           rc = 0;
-       }
-       xmlFreeParserCtxt(parser_context);
-   }
-
-   return rc;
+#include	<DPM/DPM_parse_tree.hh>
+#include	<stdlib.h>
+
+int	DPM_parse_tree::Initialize(const	char	*XMLFileName)	{
+
+			int	rc;
+			xmlParserCtxtPtr	parser_context;
+
+			valid	=	0;
+
+			if	(!	XMLFileName)	{
+							std::cerr	<<	"ERROR:	XML	file	name	is	NULL."	<<	std::endl;
+							std::cerr.flush();
+							rc	=	-1;
+			}	else	{
+
+							LIBXML_TEST_VERSION
+
+							//	Create	a	parser	context.
+							if	((parser_context	=	xmlNewParserCtxt())	==	NULL)	{
+											std::cerr	<<	"ERROR:	Out	of	Memory"	<<	std::endl;
+											std::cerr.flush();
+											exit(0);
+							}
+
+							const	char*	xml_catalog_files	=	getenv("XML_CATALOG_FILES");
+							if	(xml_catalog_files	!=	NULL)	{
+											doc	=	xmlCtxtReadFile(	parser_context,	XMLFileName,	NULL,	XML_PARSE_DTDVALID	);
+							}	else	{
+											std::cerr	<<	std::endl
+																					<<	"The	XML_CATALOG_FILES	environment	variable	is	not	set."	<<	std::endl
+																					<<	"So,	\""	<<	XMLFileName	<<	"\"	cannot	be	validated	against	it's	DTD."	<<	std::endl
+																					<<	"It	will	therefore	be	parsed	without	validation."	<<	std::endl	<<	std::endl;
+											doc	=	xmlCtxtReadFile(	parser_context,	XMLFileName,	NULL,	0	);
+							}	
+
+							if	(doc	==	NULL)	{
+											std::cerr	<<	"ERROR:	Parse	of	XML	file	\""	<<	XMLFileName	<<	"\""	<<	"	failed."	<<	std::endl;
+											std::cerr.flush();
+											rc	=	-1;
+							}	else	if	(parser_context->valid	==	0)	{
+											std::cerr	<<	"WARNING:	Validation	of	XML	file	\""	<<	XMLFileName	<<	"\""	<<	"	failed."	<<	std::endl;
+											std::cerr.flush();
+											rc	=	0;
+							}	else	{
+											valid	=	1;
+											rc	=	0;
+							}
+							xmlFreeParserCtxt(parser_context);
+			}
+
+			return	rc;
 }
 
 
-// CONSTRUCTOR
-DPM_parse_tree::DPM_parse_tree(const char *XMLFileName)  {
+//	CONSTRUCTOR
+DPM_parse_tree::DPM_parse_tree(const	char	*XMLFileName)		{
 
-    if ( Initialize( XMLFileName) < 0) {
-        throw std::invalid_argument("DPM_parse_tree is un-usable.");
-    }
+				if	(	Initialize(	XMLFileName)	<	0)	{
+								throw	std::invalid_argument("DPM_parse_tree	is	un-usable.");
+				}
 }
 
-// DESTRUCTOR
-DPM_parse_tree::~DPM_parse_tree() {
+//	DESTRUCTOR
+DPM_parse_tree::~DPM_parse_tree()	{
 
-   if (doc) {
-       xmlFreeDoc(doc);
-   }
+			if	(doc)	{
+							xmlFreeDoc(doc);
+			}
 }
 
-// MEMBER FUNCTION
-xmlNode *DPM_parse_tree::getRootNode() {
+//	MEMBER	FUNCTION
+xmlNode	*DPM_parse_tree::getRootNode()	{
 
-   return ( xmlDocGetRootElement(doc));
+			return	(	xmlDocGetRootElement(doc));
 }
 
-// MEMBER FUNCTION
-int DPM_parse_tree::is_valid() {
+//	MEMBER	FUNCTION
+int	DPM_parse_tree::is_valid()	{
 
-   return ( valid);
+			return	(	valid);
 }
 
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_product.cpp b/trick_source/data_products/DPX/DPM/DPM_product.cpp
index 8087ae414..07f113040 100644
--- a/trick_source/data_products/DPX/DPM/DPM_product.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_product.cpp
@@ -1,201 +1,201 @@
 
-#include <string.h>
-
-#include "DPM_product.hh"
-#include "float.h"
-#include <stdio.h>
-
-int DPM_product::Initialize( xmlNode *base_node) {
-
-    double tstart    = 0.0;
-    double tstop     = DBL_MAX;
-    double frequency = DBL_MAX;
-    title   = (char *)NULL;
-
-    int n_pages, n_tables;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_product::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if (strcmp((char*) base_node->name, "product") != 0) {
-        std::cerr << "ERROR: Expected <product> specification but alas didnt find it." << std::endl;
-        return -1;
-    }
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            DPM_page  *page;
-            DPM_extfn *ext_prog;
-            DPM_table *table;
-            if ( strcmp( (char *)current_node->name, "page") == 0) {
-                try {
-                    page = new DPM_page( this, current_node);
-                } catch (std::invalid_argument) {
-                    page = NULL;
-                    std::cerr << "ERROR: <product> specification contains an invalid <page> specification." << std::endl;
-                }
-                if (page != NULL) {
-                    page_list.push_back( page);
-                }
-            } else if ( strcmp( (char*)current_node->name, "table") == 0) {
-                try {
-                    table = new DPM_table( this, current_node);
-                } catch (std::invalid_argument) {
-                    table = NULL;
-                    std::cerr << "ERROR: <product> specification contains an invalid <table> specification." << std::endl;
-                }
-                if (table != NULL) {
-                    table_list.push_back( table );
-                }
-            } else if ( strcmp( (char*)current_node->name, "extfn") == 0) {
-                try {
-                    ext_prog = new DPM_extfn( this, current_node);
-                } catch (std::invalid_argument) {
-                    ext_prog = NULL;
-                    std::cerr << "ERROR: <product> specification contains an invalid <extfn> specification." << std::endl;
-                }
-                if (ext_prog != NULL) {
-                    extfn_list.push_back( ext_prog );
-                }
-            } else if ( strcmp( (const char *)current_node->name, "title") == 0) {
-                xmlNode *text_node = current_node->children;
-                title = strdup( (const char *)text_node->content);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstart = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstop") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstop = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
-                xmlNode *text_node = current_node->children;
-                frequency = strtod((const char *)text_node->content,(char**)NULL);
-
-            } else {
-                std::cerr << "WARNING: <product> specification contains an unknown element \"<" << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-    time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
-
-    // Validation criteria:
-    // 1. Product requires at least on page or table.
-    n_pages = (int)page_list.size();
-    n_tables = (int)table_list.size();
-    if ((n_pages + n_tables) < 1 ) {
-       std::cerr << "ERROR: <product> specification requires at least one <page> or <table> specification." << std::endl;
-       return -1;
-    }
-
-    xmlCleanupParser();
-    return 0;
+#include	<string.h>
+
+#include	"DPM_product.hh"
+#include	"float.h"
+#include	<stdio.h>
+
+int	DPM_product::Initialize(	xmlNode	*base_node)	{
+
+				double	tstart				=	0.0;
+				double	tstop					=	DBL_MAX;
+				double	frequency	=	DBL_MAX;
+				title			=	(char	*)NULL;
+
+				int	n_pages,	n_tables;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_product::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(strcmp((char*)	base_node->name,	"product")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<product>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												DPM_page		*page;
+												DPM_extfn	*ext_prog;
+												DPM_table	*table;
+												if	(	strcmp(	(char	*)current_node->name,	"page")	==	0)	{
+																try	{
+																				page	=	new	DPM_page(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				page	=	NULL;
+																				std::cerr	<<	"ERROR:	<product>	specification	contains	an	invalid	<page>	specification."	<<	std::endl;
+																}
+																if	(page	!=	NULL)	{
+																				page_list.push_back(	page);
+																}
+												}	else	if	(	strcmp(	(char*)current_node->name,	"table")	==	0)	{
+																try	{
+																				table	=	new	DPM_table(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				table	=	NULL;
+																				std::cerr	<<	"ERROR:	<product>	specification	contains	an	invalid	<table>	specification."	<<	std::endl;
+																}
+																if	(table	!=	NULL)	{
+																				table_list.push_back(	table	);
+																}
+												}	else	if	(	strcmp(	(char*)current_node->name,	"extfn")	==	0)	{
+																try	{
+																				ext_prog	=	new	DPM_extfn(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				ext_prog	=	NULL;
+																				std::cerr	<<	"ERROR:	<product>	specification	contains	an	invalid	<extfn>	specification."	<<	std::endl;
+																}
+																if	(ext_prog	!=	NULL)	{
+																				extfn_list.push_back(	ext_prog	);
+																}
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"title")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																title	=	strdup(	(const	char	*)text_node->content);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstart")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstart	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstop")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstop	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"frequency")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																frequency	=	strtod((const	char	*)text_node->content,(char**)NULL);
+
+												}	else	{
+																std::cerr	<<	"WARNING:	<product>	specification	contains	an	unknown	element	\"<"	<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+				time_constraints	=	new	DPM_time_constraints(tstart,	tstop,	frequency);
+
+				//	Validation	criteria:
+				//	1.	Product	requires	at	least	on	page	or	table.
+				n_pages	=	(int)page_list.size();
+				n_tables	=	(int)table_list.size();
+				if	((n_pages	+	n_tables)	<	1	)	{
+							std::cerr	<<	"ERROR:	<product>	specification	requires	at	least	one	<page>	or	<table>	specification."	<<	std::endl;
+							return	-1;
+				}
+
+				xmlCleanupParser();
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_product::DPM_product(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_product::DPM_product(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0) {
-      throw std::invalid_argument("<product> specification is invalid and un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0)	{
+						throw	std::invalid_argument("<product>	specification	is	invalid	and	un-usable.");
+		}
 }
 
-// DESTRUCTOR
-DPM_product::~DPM_product() {
-  // destroy each of the allocated object elements.
+//	DESTRUCTOR
+DPM_product::~DPM_product()	{
+		//	destroy	each	of	the	allocated	object	elements.
 }
 
-// MEMBER FUNCTION
-const char *DPM_product::getTitle() {
-  return( title);
+//	MEMBER	FUNCTION
+const	char	*DPM_product::getTitle()	{
+		return(	title);
 }
 
-// MEMBER FUNCTION
-DPM_time_constraints *DPM_product::getTimeConstraints() {
-  return ( time_constraints);
+//	MEMBER	FUNCTION
+DPM_time_constraints	*DPM_product::getTimeConstraints()	{
+		return	(	time_constraints);
 }
 
-// MEMBER FUNCTION
-int DPM_product::NumberOfTables() {
-  return ((int)table_list.size());
+//	MEMBER	FUNCTION
+int	DPM_product::NumberOfTables()	{
+		return	((int)table_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_table *DPM_product::getTable( unsigned int index) {
-  if (index < table_list.size( ))  {
-    return ( table_list[index]);
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_table	*DPM_product::getTable(	unsigned	int	index)	{
+		if	(index	<	table_list.size(	))		{
+				return	(	table_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-int DPM_product::NumberOfPages() {
-  return ( (int)page_list.size());
+//	MEMBER	FUNCTION
+int	DPM_product::NumberOfPages()	{
+		return	(	(int)page_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_page *DPM_product::getPage(unsigned int index) {
+//	MEMBER	FUNCTION
+DPM_page	*DPM_product::getPage(unsigned	int	index)	{
 
-  if (index < page_list.size()) {
-    return( page_list[index]);
-  } else {
-    return NULL;
-  }
+		if	(index	<	page_list.size())	{
+				return(	page_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-int DPM_product::NumberOfExtFns() {
-  return ( (int)extfn_list.size());
+//	MEMBER	FUNCTION
+int	DPM_product::NumberOfExtFns()	{
+		return	(	(int)extfn_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_extfn *DPM_product::getExtFn(unsigned int index) {
+//	MEMBER	FUNCTION
+DPM_extfn	*DPM_product::getExtFn(unsigned	int	index)	{
 
-  if (index < extfn_list.size()) {
-    return( extfn_list[index]);
-  } else {
-    return NULL;
-  }
+		if	(index	<	extfn_list.size())	{
+				return(	extfn_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_product *product) {
-  int i;
-  int n_attrs = (int)product->attribute_list.size();
-  int n_pages = (int)product->page_list.size();
-  int n_tables = (int)product->table_list.size();
-  int n_extfns = (int)product->extfn_list.size();
-
-  s << "<product";
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << product->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-
-  if (product->title) {
-    s << "<title>" << product->title << "</title>" << std::endl;
-  }
-
-  for (i=0 ; i<n_pages ; i++) {
-    s << product->page_list[i];
-  }
-
-  for (i=0 ; i<n_tables ; i++) {
-    s << product->table_list[i];
-  }
-
-  for (i=0 ; i<n_extfns ; i++) {
-    s << product->extfn_list[i];
-  }
-  s << "</product>" << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_product	*product)	{
+		int	i;
+		int	n_attrs	=	(int)product->attribute_list.size();
+		int	n_pages	=	(int)product->page_list.size();
+		int	n_tables	=	(int)product->table_list.size();
+		int	n_extfns	=	(int)product->extfn_list.size();
+
+		s	<<	"<product";
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	product->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+
+		if	(product->title)	{
+				s	<<	"<title>"	<<	product->title	<<	"</title>"	<<	std::endl;
+		}
+
+		for	(i=0	;	i<n_pages	;	i++)	{
+				s	<<	product->page_list[i];
+		}
+
+		for	(i=0	;	i<n_tables	;	i++)	{
+				s	<<	product->table_list[i];
+		}
+
+		for	(i=0	;	i<n_extfns	;	i++)	{
+				s	<<	product->extfn_list[i];
+		}
+		s	<<	"</product>"	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_relation.cpp b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
index 3ea7788fd..8a1673c4f 100644
--- a/trick_source/data_products/DPX/DPM/DPM_relation.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
@@ -1,308 +1,308 @@
 
-#include <string.h>
-
-#include "DPM_relation.hh"
-#include "float.h"
-
-int DPM_relation::Initialize(xmlNode *base_node) {
-
-    double tstart    = 0.0;
-    double tstop     = DBL_MAX;
-    double frequency = DBL_MAX;
-    title = NULL;
-    xaxis = NULL;
-    yaxis = NULL;
-    zaxis = NULL;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_relation::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "plot") != 0) {
-        std::cerr << "ERROR: Expected <plot> specification but alas didnt find it." << std::endl;
-        return -1;
-    }
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-
-    while (current_node != NULL) {
-
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "title") == 0) {
-                xmlNode *text_node = current_node->children;
-                title = strdup( (const char *)text_node->content);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstart = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstop") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstop = strtod((const char *) text_node->content,(char**)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
-                xmlNode *text_node = current_node->children;
-                frequency = strtod((const char *)text_node->content,(char**)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "xaxis") == 0) {
-                try {
-                    xaxis = new DPM_axis( this, current_node);
-                } catch (std::invalid_argument) {
-                    xaxis = NULL;
-                    std::cerr << "ERROR: <plot> specification contains an invalid <xaxis> specification." << std::endl;
-                }
-            } else if ( strcmp( (const char *)current_node->name, "yaxis") == 0) {
-                try {
-                    yaxis = new DPM_axis( this, current_node);
-                } catch (std::invalid_argument) {
-                    yaxis = NULL;
-                    std::cerr << "ERROR: <plot> specification contains an invalid <yaxis> specification." << std::endl;
-                }
-            } else if ( strcmp( (const char *)current_node->name, "zaxis") == 0) {
-                try {
-                    zaxis = new DPM_axis( this, current_node);
-                } catch (std::invalid_argument) {
-                    zaxis = NULL;
-                    std::cerr << "ERROR: <plot> specification contains an invalid <zaxis> specification." << std::endl;
-                }
-            } else if ( strcmp( (const char *)current_node->name, "curve") == 0) {
-                DPM_curve *curve;
-                try {
-                    curve = new DPM_curve( this, current_node);
-                } catch (std::invalid_argument) {
-                    curve = NULL;
-                    std::cerr << "ERROR: " << std::endl;
-                }
-                if (curve != NULL) {
-                    curve_list.push_back( curve);
-                }
-             } else {
-                std::cerr << "WARNING: <plot> specification contains an unknown element \"<" << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
-
-    // Validation criteria:
-    // 1. Relation requires at least one curve.
-
-    return 0;
+#include	<string.h>
+
+#include	"DPM_relation.hh"
+#include	"float.h"
+
+int	DPM_relation::Initialize(xmlNode	*base_node)	{
+
+				double	tstart				=	0.0;
+				double	tstop					=	DBL_MAX;
+				double	frequency	=	DBL_MAX;
+				title	=	NULL;
+				xaxis	=	NULL;
+				yaxis	=	NULL;
+				zaxis	=	NULL;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_relation::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"plot")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<plot>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+
+				while	(current_node	!=	NULL)	{
+
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"title")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																title	=	strdup(	(const	char	*)text_node->content);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstart")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstart	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstop")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstop	=	strtod((const	char	*)	text_node->content,(char**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"frequency")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																frequency	=	strtod((const	char	*)text_node->content,(char**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"xaxis")	==	0)	{
+																try	{
+																				xaxis	=	new	DPM_axis(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				xaxis	=	NULL;
+																				std::cerr	<<	"ERROR:	<plot>	specification	contains	an	invalid	<xaxis>	specification."	<<	std::endl;
+																}
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"yaxis")	==	0)	{
+																try	{
+																				yaxis	=	new	DPM_axis(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				yaxis	=	NULL;
+																				std::cerr	<<	"ERROR:	<plot>	specification	contains	an	invalid	<yaxis>	specification."	<<	std::endl;
+																}
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"zaxis")	==	0)	{
+																try	{
+																				zaxis	=	new	DPM_axis(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				zaxis	=	NULL;
+																				std::cerr	<<	"ERROR:	<plot>	specification	contains	an	invalid	<zaxis>	specification."	<<	std::endl;
+																}
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"curve")	==	0)	{
+																DPM_curve	*curve;
+																try	{
+																				curve	=	new	DPM_curve(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				curve	=	NULL;
+																				std::cerr	<<	"ERROR:	"	<<	std::endl;
+																}
+																if	(curve	!=	NULL)	{
+																				curve_list.push_back(	curve);
+																}
+													}	else	{
+																std::cerr	<<	"WARNING:	<plot>	specification	contains	an	unknown	element	\"<"	<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				time_constraints	=	new	DPM_time_constraints(tstart,	tstop,	frequency);
+
+				//	Validation	criteria:
+				//	1.	Relation	requires	at	least	one	curve.
+
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_relation::DPM_relation(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_relation::DPM_relation(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0) {
-      throw std::invalid_argument("DPM_relation specification is un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0)	{
+						throw	std::invalid_argument("DPM_relation	specification	is	un-usable.");
+		}
 }
 
-// MEMBER FUNCTION
-DPM_relation::~DPM_relation() {
-
-  delete xaxis;
-  delete yaxis;
-  delete zaxis;
-  if (title) { free( title); }
-  // destroy each of the curves in the curves list
-  int i;
-  int n = (int)this->curve_list.size();
-  for (i = 0; i < n ; i ++) {
-      delete this->curve_list[i];
-  }
+//	MEMBER	FUNCTION
+DPM_relation::~DPM_relation()	{
+
+		delete	xaxis;
+		delete	yaxis;
+		delete	zaxis;
+		if	(title)	{	free(	title);	}
+		//	destroy	each	of	the	curves	in	the	curves	list
+		int	i;
+		int	n	=	(int)this->curve_list.size();
+		for	(i	=	0;	i	<	n	;	i	++)	{
+						delete	this->curve_list[i];
+		}
 }
 
-// MEMBER FUNCTION
-int DPM_relation::setTitle(const char *in_title) {
-  title = strdup(in_title);
-  return (0);
+//	MEMBER	FUNCTION
+int	DPM_relation::setTitle(const	char	*in_title)	{
+		title	=	strdup(in_title);
+		return	(0);
 }
 
-// MEMBER FUNCTION
-const char *DPM_relation::getTitle() {
-  return ( (const char *)title );
+//	MEMBER	FUNCTION
+const	char	*DPM_relation::getTitle()	{
+		return	(	(const	char	*)title	);
 }
 
-// MEMBER FUNCTION
-DPM_time_constraints *DPM_relation::getTimeConstraints() {
-  return (time_constraints);
+//	MEMBER	FUNCTION
+DPM_time_constraints	*DPM_relation::getTimeConstraints()	{
+		return	(time_constraints);
 }
 
-// MEMBER FUNCTION
-int DPM_relation::NumberOfAxes() {
-    int n_curves,n_axes,n,i;
-    n_curves = (int)curve_list.size();
-    if (n_curves <= 0 ) return (0);
-
-    n_axes = curve_list[0]->NumberOfAxes();
-    if (n_curves > 1) {
-        for (i=1; i<n_curves; i++) {
-            n = curve_list[i]->NumberOfAxes();
-            if (n < n_axes) n_axes = n;
-        }
-    }
-    return (n_axes);
+//	MEMBER	FUNCTION
+int	DPM_relation::NumberOfAxes()	{
+				int	n_curves,n_axes,n,i;
+				n_curves	=	(int)curve_list.size();
+				if	(n_curves	<=	0	)	return	(0);
+
+				n_axes	=	curve_list[0]->NumberOfAxes();
+				if	(n_curves	>	1)	{
+								for	(i=1;	i<n_curves;	i++)	{
+												n	=	curve_list[i]->NumberOfAxes();
+												if	(n	<	n_axes)	n_axes	=	n;
+								}
+				}
+				return	(n_axes);
 }
 
-// MEMBER FUNCTION
-std::string DPM_relation::getXAxisLabel() {
-  std::string candidate_label;
-  
-  int n_curves, i;
-
-  if (xaxis) {
-      candidate_label = xaxis->getLabel();
-  } else {
-      candidate_label = "";
-  }
-  // If an Y-Axis label wasn't supplied, see if there is a common
-  // variable name that will serve as a label.
-  if (candidate_label == "") {
-      if (( candidate_label = curve_list[0]->getXCommonName() ) == "") {
-          return ("");
-      }
-      n_curves = (int)curve_list.size();
-      for (i=1; i<n_curves; i++) {
-          if ( curve_list[i]->getXCommonName().empty() || candidate_label != curve_list[i]->getXCommonName()) {
-               return ("");
-          } 
-      }
-  }
-  return (candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_relation::getXAxisLabel()	{
+		std::string	candidate_label;
+		
+		int	n_curves,	i;
+
+		if	(xaxis)	{
+						candidate_label	=	xaxis->getLabel();
+		}	else	{
+						candidate_label	=	"";
+		}
+		//	If	an	Y-Axis	label	wasn't	supplied,	see	if	there	is	a	common
+		//	variable	name	that	will	serve	as	a	label.
+		if	(candidate_label	==	"")	{
+						if	((	candidate_label	=	curve_list[0]->getXCommonName()	)	==	"")	{
+										return	("");
+						}
+						n_curves	=	(int)curve_list.size();
+						for	(i=1;	i<n_curves;	i++)	{
+										if	(	curve_list[i]->getXCommonName().empty()	||	candidate_label	!=	curve_list[i]->getXCommonName())	{
+															return	("");
+										}	
+						}
+		}
+		return	(candidate_label);
 }
 
-// MEMBER FUNCTION
-std::string DPM_relation::getYAxisLabel() {
-  std::string candidate_label;
-  
-  int n_curves, i;
-
-  if (yaxis) {
-      candidate_label = yaxis->getLabel();
-  } else {
-      candidate_label = "";
-  }
-  // If an Y-Axis label wasn't supplied, see if there is a common
-  // variable name that will serve as a label.
-  if (candidate_label == "") {
-      if (( candidate_label = curve_list[0]->getYCommonName() ) == "") {
-          return ("");
-      }
-      n_curves = (int)curve_list.size();
-      for (i=1; i<n_curves; i++) {
-          if (curve_list[i]->getYCommonName().empty() || candidate_label != curve_list[i]->getYCommonName()) {
-               return ("");
-          } 
-      }
-  }
-  return (candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_relation::getYAxisLabel()	{
+		std::string	candidate_label;
+		
+		int	n_curves,	i;
+
+		if	(yaxis)	{
+						candidate_label	=	yaxis->getLabel();
+		}	else	{
+						candidate_label	=	"";
+		}
+		//	If	an	Y-Axis	label	wasn't	supplied,	see	if	there	is	a	common
+		//	variable	name	that	will	serve	as	a	label.
+		if	(candidate_label	==	"")	{
+						if	((	candidate_label	=	curve_list[0]->getYCommonName()	)	==	"")	{
+										return	("");
+						}
+						n_curves	=	(int)curve_list.size();
+						for	(i=1;	i<n_curves;	i++)	{
+										if	(curve_list[i]->getYCommonName().empty()	||	candidate_label	!=	curve_list[i]->getYCommonName())	{
+															return	("");
+										}	
+						}
+		}
+		return	(candidate_label);
 }
 
-// MEMBER FUNCTION
-std::string DPM_relation::getZAxisLabel() {
-  std::string candidate_label;
-  
-  int n_curves, i;
-
-  if (zaxis) {
-      candidate_label = zaxis->getLabel();
-  } else {
-      candidate_label = "";
-  }
-  // If an Z-Axis label wasn't supplied, see if there is a common
-  // variable name that will serve as a label.
-  if (candidate_label == "") {
-      if (( candidate_label = curve_list[0]->getZCommonName() ) == "") {
-          return ("");
-      }
-      n_curves = (int)curve_list.size();
-      for (i=1; i<n_curves; i++) {
-          if (curve_list[i]->getZCommonName().empty() || candidate_label != curve_list[i]->getZCommonName()) {
-               return ("");
-          } 
-      }
-  }
-  return (candidate_label);
+//	MEMBER	FUNCTION
+std::string	DPM_relation::getZAxisLabel()	{
+		std::string	candidate_label;
+		
+		int	n_curves,	i;
+
+		if	(zaxis)	{
+						candidate_label	=	zaxis->getLabel();
+		}	else	{
+						candidate_label	=	"";
+		}
+		//	If	an	Z-Axis	label	wasn't	supplied,	see	if	there	is	a	common
+		//	variable	name	that	will	serve	as	a	label.
+		if	(candidate_label	==	"")	{
+						if	((	candidate_label	=	curve_list[0]->getZCommonName()	)	==	"")	{
+										return	("");
+						}
+						n_curves	=	(int)curve_list.size();
+						for	(i=1;	i<n_curves;	i++)	{
+										if	(curve_list[i]->getZCommonName().empty()	||	candidate_label	!=	curve_list[i]->getZCommonName())	{
+															return	("");
+										}	
+						}
+		}
+		return	(candidate_label);
 }
 
-// MEMBER FUNCTION
-  const char * DPM_relation::getXAxisUnits() {
-  if (xaxis) {
-      return( xaxis->getUnits());
-  }
-  return NULL;
+//	MEMBER	FUNCTION
+		const	char	*	DPM_relation::getXAxisUnits()	{
+		if	(xaxis)	{
+						return(	xaxis->getUnits());
+		}
+		return	NULL;
 }
 
-// MEMBER FUNCTION
-  const char * DPM_relation::getYAxisUnits() {
-  if (yaxis) {
-      return( yaxis->getUnits());
-  }
-  return NULL;
+//	MEMBER	FUNCTION
+		const	char	*	DPM_relation::getYAxisUnits()	{
+		if	(yaxis)	{
+						return(	yaxis->getUnits());
+		}
+		return	NULL;
 }
 
-// MEMBER FUNCTION
-  const char * DPM_relation::getZAxisUnits() {
-  if (zaxis) {
-      return( zaxis->getUnits());
-  }
-  return NULL;
+//	MEMBER	FUNCTION
+		const	char	*	DPM_relation::getZAxisUnits()	{
+		if	(zaxis)	{
+						return(	zaxis->getUnits());
+		}
+		return	NULL;
 }
 
-  const char * DPM_relation::getYAxisFormat() {
-      if (yaxis) {
-          return yaxis->AttributeValue("format");
-      } else {
-          return NULL;
-      }
-  }
-
-// MEMBER FUNCTION
-int DPM_relation::NumberOfCurves() {
-    return ((int)curve_list.size());
+		const	char	*	DPM_relation::getYAxisFormat()	{
+						if	(yaxis)	{
+										return	yaxis->AttributeValue("format");
+						}	else	{
+										return	NULL;
+						}
+		}
+
+//	MEMBER	FUNCTION
+int	DPM_relation::NumberOfCurves()	{
+				return	((int)curve_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_curve *DPM_relation::getCurve(unsigned int index) {
-  if (index < curve_list.size( ))  {
-    return ( curve_list[index]);
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_curve	*DPM_relation::getCurve(unsigned	int	index)	{
+		if	(index	<	curve_list.size(	))		{
+				return	(	curve_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_relation *relation) {
-  int i;
-  int n_attr = (int)relation->attribute_list.size();
-  int n_curve = (int)relation->curve_list.size();
-
-  s << "<plot";
-  for (i=0 ; i<n_attr ; i++) {
-    s << " " << relation->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  if (relation->title) {
-    s << "<title>"  << relation->title  << "</title>"  << std::endl;
-  }
-  s << "<tstart>" << relation->time_constraints->getStart() << "</tstart>" << std::endl;
-  s << "<tstop>"  << relation->time_constraints->getStop()  << "</tstop>"  << std::endl;
-  s << "<frequency>"  << relation->time_constraints->getFrequency()  << "</frequency>"  << std::endl;
-
-  if (relation->xaxis) { s << relation->xaxis; }
-  if (relation->yaxis) { s << relation->yaxis; }
-  if (relation->zaxis) { s << relation->zaxis; }
-
-  for (i=0 ; i<n_curve ; i++) {
-    s << relation->curve_list[i];
-  }
-
-  s << "</plot>";
-  s << std::endl;
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_relation	*relation)	{
+		int	i;
+		int	n_attr	=	(int)relation->attribute_list.size();
+		int	n_curve	=	(int)relation->curve_list.size();
+
+		s	<<	"<plot";
+		for	(i=0	;	i<n_attr	;	i++)	{
+				s	<<	"	"	<<	relation->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		if	(relation->title)	{
+				s	<<	"<title>"		<<	relation->title		<<	"</title>"		<<	std::endl;
+		}
+		s	<<	"<tstart>"	<<	relation->time_constraints->getStart()	<<	"</tstart>"	<<	std::endl;
+		s	<<	"<tstop>"		<<	relation->time_constraints->getStop()		<<	"</tstop>"		<<	std::endl;
+		s	<<	"<frequency>"		<<	relation->time_constraints->getFrequency()		<<	"</frequency>"		<<	std::endl;
+
+		if	(relation->xaxis)	{	s	<<	relation->xaxis;	}
+		if	(relation->yaxis)	{	s	<<	relation->yaxis;	}
+		if	(relation->zaxis)	{	s	<<	relation->zaxis;	}
+
+		for	(i=0	;	i<n_curve	;	i++)	{
+				s	<<	relation->curve_list[i];
+		}
+
+		s	<<	"</plot>";
+		s	<<	std::endl;
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_run.cpp b/trick_source/data_products/DPX/DPM/DPM_run.cpp
index 362838f77..3946b81b0 100644
--- a/trick_source/data_products/DPX/DPM/DPM_run.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_run.cpp
@@ -1,80 +1,80 @@
 
-#include <string.h>
+#include	<string.h>
 
-#include "DPM_run.hh"
+#include	"DPM_run.hh"
 
-int DPM_run::Initialize( xmlNode *base_node) {
+int	DPM_run::Initialize(	xmlNode	*base_node)	{
 
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_run::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "run") != 0) {
-        std::cerr << "ERROR: Expected <run> specification but alas it wasn\'t found." << std::endl;
-        return -1;
-    }
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_run::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"run")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<run>	specification	but	alas	it	wasn\'t	found."	<<	std::endl;
+								return	-1;
+				}
 
-    time_name = AttributeValue("timename");
+				time_name	=	AttributeValue("timename");
 
-    // If timename is not defined in the xml file, use default one.
-    if (time_name == NULL) {
-    	// Set the default time name.
-    	time_name = "sys.exec.out.time";
-    }
+				//	If	timename	is	not	defined	in	the	xml	file,	use	default	one.
+				if	(time_name	==	NULL)	{
+					//	Set	the	default	time	name.
+					time_name	=	"sys.exec.out.time";
+				}
 
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (const char *)current_node->name, "dir") == 0) {
-                xmlNode *text_node = current_node->children;
-                dir = strdup( (const char *)text_node->content);
-            } else {
-                std::cerr << "WARNING: <run> specification contains an unknown element \"<"
-                     << current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-    return 0;
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(const	char	*)current_node->name,	"dir")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																dir	=	strdup(	(const	char	*)text_node->content);
+												}	else	{
+																std::cerr	<<	"WARNING:	<run>	specification	contains	an	unknown	element	\"<"
+																					<<	current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_run::DPM_run(DPM_component *Parent, xmlNode *Base_node)
-     : DPM_component (Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_run::DPM_run(DPM_component	*Parent,	xmlNode	*Base_node)
+					:	DPM_component	(Parent,	Base_node)	{
 
-     if ( Initialize( Base_node) < 0) {
-         throw std::invalid_argument("DPM_run specification is un-usable.");
-     }
+					if	(	Initialize(	Base_node)	<	0)	{
+									throw	std::invalid_argument("DPM_run	specification	is	un-usable.");
+					}
 }
 
-// DESTRUCTOR
-DPM_run::~DPM_run() {
+//	DESTRUCTOR
+DPM_run::~DPM_run()	{
 
-  free( dir);
+		free(	dir);
 }
 
-const char* DPM_run::getDir() {
-  return ( (const char*)dir );
+const	char*	DPM_run::getDir()	{
+		return	(	(const	char*)dir	);
 }
 
-const char* DPM_run::getTimeName() {
-  return time_name;
+const	char*	DPM_run::getTimeName()	{
+		return	time_name;
 }
 
-std::ostream& operator<< (std::ostream& s, const DPM_run *run) {
-     int i;
-     int n = (int)run->attribute_list.size();
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_run	*run)	{
+					int	i;
+					int	n	=	(int)run->attribute_list.size();
 
-     s << "<run";
-     for (i=0 ; i<n ; i++) {
-          s << " " << run->attribute_list[i];
-     }
-     s << ">";
-     s << "<dir>";
-     s << run->dir;
-     s << "</dir>";
-     s << "</run>";
-     s << std::endl;
-     return s;
+					s	<<	"<run";
+					for	(i=0	;	i<n	;	i++)	{
+										s	<<	"	"	<<	run->attribute_list[i];
+					}
+					s	<<	">";
+					s	<<	"<dir>";
+					s	<<	run->dir;
+					s	<<	"</dir>";
+					s	<<	"</run>";
+					s	<<	std::endl;
+					return	s;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_session.cpp b/trick_source/data_products/DPX/DPM/DPM_session.cpp
index 0e227074f..47b6699a4 100644
--- a/trick_source/data_products/DPX/DPM/DPM_session.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_session.cpp
@@ -1,222 +1,222 @@
 
-#include <string.h>
-
-#include "DPM/DPM_session.hh"
-#include "float.h"
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-int DPM_session::Initialize( xmlNode *SessionNode ) {
-
-    double tstart    = 0.0;
-    double tstop     = DBL_MAX;
-    double frequency = DBL_MAX;
-
-    int n_product_files, n_runs;
-
-    if (SessionNode == NULL) {
-         std::cerr << "ERROR: DPM_session::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-
-    if (strcmp((char*) SessionNode->name, "session") != 0) {
-        std::cerr << "ERROR: Expected <session> specification but alas didnt find it." << std::endl;
-        return -1;
-    }
-
-    if ( !strcasecmp(AttributeValue("presentation") , "stream" ) ) {
-        if ( AttributeValue("machine") == NULL ) {
-            std::cerr << "ERROR: Expected attribute \"machine\" when using stream presentation" << std::endl;
-            return -1;
-        }
-        if ( AttributeValue("port") == NULL ) {
-            std::cerr << "ERROR: Expected attribute \"port\" when using stream presentation" << std::endl;
-            return -1;
-        }
-    }
-
-    if (AttributeValue("device") != NULL) {
-        if (setDevice((char*)AttributeValue("device")) < 0) {
-            return -1;
-        }
-    } else {
-        sessionDevice = DPM_session::TERMINAL;
-    }
-
-
-
-    /* Process children */
-    xmlNode *current_node = SessionNode->children;
-
-    while (current_node != NULL) {
-        if (current_node->type == XML_ELEMENT_NODE) {
-            if ( strcmp( (char *)current_node->name, "run") == 0) {
-                DPM_run *run;
-                try {
-                    run = new DPM_run( this, current_node);
-                } catch (std::invalid_argument) {
-                    run = NULL;
-                    std::cerr << "ERROR: one of this <session>s <run>s is invalid." << std::endl;
-                }
-                if (run != NULL) {
-                    run_list.push_back( run);
-                }
-            } else if ( strcmp( (char*)current_node->name, "product_files") == 0) {
-                xmlNode *current_child_node;
-                current_child_node = current_node->children;
-                while (current_child_node != NULL) {
-                    if (current_child_node->type == XML_ELEMENT_NODE) {
-                        if ( strcmp( (const char *)current_child_node->name, "file") == 0) {
-                            char *product_file;
-                            xmlNode *text_node = current_child_node->children;
-                            product_file = strdup( (const char *)text_node->content);
-                            if (product_file != NULL) {
-                                product_file_list.push_back( product_file);
-                            }
-                        } else {
-                            std::cerr << "WARNING: <product_files> specification contains an unknown element \"<" <<
-                                    current_child_node->name << ">\". Skipping." << std::endl;
-                        }
-                    }
-                    current_child_node = current_child_node->next;
-                }
-            } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstart = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstop") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstop = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
-                xmlNode *text_node = current_node->children;
-                frequency = strtod((const char *)text_node->content,(char**)NULL);
-
-            } else {
-                std::cerr << "WARNING: <session> specification contains an unknown element \"<" <<
-                        current_node->name << ">\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-    time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
-
-    // Validation criteria:
-    // 1. Session requires at least one RUN directory.
-    // 2. Session requires at least one Product file.
-
-    n_product_files = (int)product_file_list.size();
-    if (n_product_files < 1) {
-        std::cerr << "ERROR: <session> requires at least one product file." << std::endl;
-        return -1;
-    }
-
-    n_runs = (int)run_list.size();
-    if (n_runs < 1) {
-        std::cerr << "ERROR: <session> requires at least one RUN." << std::endl;
-        return -1;
-    }
-
-    return 0;
+#include	<string.h>
+
+#include	"DPM/DPM_session.hh"
+#include	"float.h"
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
+
+int	DPM_session::Initialize(	xmlNode	*SessionNode	)	{
+
+				double	tstart				=	0.0;
+				double	tstop					=	DBL_MAX;
+				double	frequency	=	DBL_MAX;
+
+				int	n_product_files,	n_runs;
+
+				if	(SessionNode	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_session::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+
+				if	(strcmp((char*)	SessionNode->name,	"session")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<session>	specification	but	alas	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
+
+				if	(	!strcasecmp(AttributeValue("presentation")	,	"stream"	)	)	{
+								if	(	AttributeValue("machine")	==	NULL	)	{
+												std::cerr	<<	"ERROR:	Expected	attribute	\"machine\"	when	using	stream	presentation"	<<	std::endl;
+												return	-1;
+								}
+								if	(	AttributeValue("port")	==	NULL	)	{
+												std::cerr	<<	"ERROR:	Expected	attribute	\"port\"	when	using	stream	presentation"	<<	std::endl;
+												return	-1;
+								}
+				}
+
+				if	(AttributeValue("device")	!=	NULL)	{
+								if	(setDevice((char*)AttributeValue("device"))	<	0)	{
+												return	-1;
+								}
+				}	else	{
+								sessionDevice	=	DPM_session::TERMINAL;
+				}
+
+
+
+				/*	Process	children	*/
+				xmlNode	*current_node	=	SessionNode->children;
+
+				while	(current_node	!=	NULL)	{
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												if	(	strcmp(	(char	*)current_node->name,	"run")	==	0)	{
+																DPM_run	*run;
+																try	{
+																				run	=	new	DPM_run(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				run	=	NULL;
+																				std::cerr	<<	"ERROR:	one	of	this	<session>s	<run>s	is	invalid."	<<	std::endl;
+																}
+																if	(run	!=	NULL)	{
+																				run_list.push_back(	run);
+																}
+												}	else	if	(	strcmp(	(char*)current_node->name,	"product_files")	==	0)	{
+																xmlNode	*current_child_node;
+																current_child_node	=	current_node->children;
+																while	(current_child_node	!=	NULL)	{
+																				if	(current_child_node->type	==	XML_ELEMENT_NODE)	{
+																								if	(	strcmp(	(const	char	*)current_child_node->name,	"file")	==	0)	{
+																												char	*product_file;
+																												xmlNode	*text_node	=	current_child_node->children;
+																												product_file	=	strdup(	(const	char	*)text_node->content);
+																												if	(product_file	!=	NULL)	{
+																																product_file_list.push_back(	product_file);
+																												}
+																								}	else	{
+																												std::cerr	<<	"WARNING:	<product_files>	specification	contains	an	unknown	element	\"<"	<<
+																																				current_child_node->name	<<	">\".	Skipping."	<<	std::endl;
+																								}
+																				}
+																				current_child_node	=	current_child_node->next;
+																}
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstart")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstart	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstop")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstop	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"frequency")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																frequency	=	strtod((const	char	*)text_node->content,(char**)NULL);
+
+												}	else	{
+																std::cerr	<<	"WARNING:	<session>	specification	contains	an	unknown	element	\"<"	<<
+																								current_node->name	<<	">\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+				time_constraints	=	new	DPM_time_constraints(tstart,	tstop,	frequency);
+
+				//	Validation	criteria:
+				//	1.	Session	requires	at	least	one	RUN	directory.
+				//	2.	Session	requires	at	least	one	Product	file.
+
+				n_product_files	=	(int)product_file_list.size();
+				if	(n_product_files	<	1)	{
+								std::cerr	<<	"ERROR:	<session>	requires	at	least	one	product	file."	<<	std::endl;
+								return	-1;
+				}
+
+				n_runs	=	(int)run_list.size();
+				if	(n_runs	<	1)	{
+								std::cerr	<<	"ERROR:	<session>	requires	at	least	one	RUN."	<<	std::endl;
+								return	-1;
+				}
+
+				return	0;
 }
 
-DPM_session::DPM_session(DPM_component *Parent, xmlNode *SessionNode)
- : DPM_component(Parent, SessionNode) {
+DPM_session::DPM_session(DPM_component	*Parent,	xmlNode	*SessionNode)
+	:	DPM_component(Parent,	SessionNode)	{
 
-  if ( Initialize( SessionNode) < 0) {
-      throw std::invalid_argument("<session> specification is invalid and un-usable.");
-  }
+		if	(	Initialize(	SessionNode)	<	0)	{
+						throw	std::invalid_argument("<session>	specification	is	invalid	and	un-usable.");
+		}
 }
 
-DPM_session::~DPM_session() {
-    int i, n_product_files, n_runs ;
-
-    n_product_files = (int)product_file_list.size();
-    for (i = 0; i < n_product_files ; i++) {
-        char * product_file;
-        product_file =  product_file_list[i];
-        if (product_file) { free( product_file); }
-    }
-
-    n_runs = (int)run_list.size();
-    for (i = 0; i < n_runs ; i++) {
-        delete run_list[i];
-    }
-    delete time_constraints;
-
-    if (deviceFileName) {
-        free(deviceFileName);
-    }
+DPM_session::~DPM_session()	{
+				int	i,	n_product_files,	n_runs	;
+
+				n_product_files	=	(int)product_file_list.size();
+				for	(i	=	0;	i	<	n_product_files	;	i++)	{
+								char	*	product_file;
+								product_file	=		product_file_list[i];
+								if	(product_file)	{	free(	product_file);	}
+				}
+
+				n_runs	=	(int)run_list.size();
+				for	(i	=	0;	i	<	n_runs	;	i++)	{
+								delete	run_list[i];
+				}
+				delete	time_constraints;
+
+				if	(deviceFileName)	{
+								free(deviceFileName);
+				}
 }
 
 
-std::ostream& operator<< (std::ostream& s, const DPM_session *session) {
-  int i;
-  int n_attrs = (int)session->attribute_list.size();
-  int n_runs  = (int)session->run_list.size();
-  int n_product_files = (int)session->product_file_list.size();
-
-  s << "<session";
-  // Output the axis element attributes.
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << session->attribute_list[i];
-  }
-  s << ">" << std::endl;
-  s << "<tstart>" << session->time_constraints->getStart() << "</tstart>" << std::endl;
-  s << "<tstop>"  << session->time_constraints->getStop()  << "</tstop>"  << std::endl;
-  s << "<frequency>"  << session->time_constraints->getFrequency()  << "</frequency>"  << std::endl;
-
-  for (i=0 ; i<n_runs ; i++) {
-      s << "<run>" << std::endl;
-      s << session->run_list[i];
-      s << "</run>" << std::endl;
-  }
-
-  s << "<product_files>" << std::endl;
-  for (i=0 ; i<n_product_files ; i++) {
-      s << "<file>" << std::endl;
-      s << session->product_file_list[i];
-      s << "</file>" << std::endl;
-  }
-  s << "</product_files>" << std::endl;
-  s << std::endl;
-  s.flush();
-
-  return s;
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_session	*session)	{
+		int	i;
+		int	n_attrs	=	(int)session->attribute_list.size();
+		int	n_runs		=	(int)session->run_list.size();
+		int	n_product_files	=	(int)session->product_file_list.size();
+
+		s	<<	"<session";
+		//	Output	the	axis	element	attributes.
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	session->attribute_list[i];
+		}
+		s	<<	">"	<<	std::endl;
+		s	<<	"<tstart>"	<<	session->time_constraints->getStart()	<<	"</tstart>"	<<	std::endl;
+		s	<<	"<tstop>"		<<	session->time_constraints->getStop()		<<	"</tstop>"		<<	std::endl;
+		s	<<	"<frequency>"		<<	session->time_constraints->getFrequency()		<<	"</frequency>"		<<	std::endl;
+
+		for	(i=0	;	i<n_runs	;	i++)	{
+						s	<<	"<run>"	<<	std::endl;
+						s	<<	session->run_list[i];
+						s	<<	"</run>"	<<	std::endl;
+		}
+
+		s	<<	"<product_files>"	<<	std::endl;
+		for	(i=0	;	i<n_product_files	;	i++)	{
+						s	<<	"<file>"	<<	std::endl;
+						s	<<	session->product_file_list[i];
+						s	<<	"</file>"	<<	std::endl;
+		}
+		s	<<	"</product_files>"	<<	std::endl;
+		s	<<	std::endl;
+		s.flush();
+
+		return	s;
 }
 
-int DPM_session::setDevice(char* device) {
-
-    if ( device == NULL ) {
-        std::cerr << "ERROR: NULL device spec given to Session::setDevice()" << std::endl;
-        return(-1);
-    }
-
-    if ( !strcasecmp(device, "terminal") ) {
-        sessionDevice= DPM_session::TERMINAL ;
-    } else if ( !strcasecmp(device, "printer") ) {
-        sessionDevice = DPM_session::PRINTER ;
-    } else {
-        char tmp[5];
-        strncpy(tmp, device, 5);
-        if ( !strcasecmp(tmp, "file:")) {
-            sessionDevice = DPM_session::FILE ;
-            device += 5;
-            deviceFileName = strdup(device);
-        } else {
-            std::cerr << "ERROR: Bad device spec: \"" << device << "\"" << std::endl;
-            std::cerr << "Correct device spec format (case-insensitive): Printer|Terminal|File:<file_name>\n";
-            return(-1);
-        }
-    }
-
-    return(0) ;
+int	DPM_session::setDevice(char*	device)	{
+
+				if	(	device	==	NULL	)	{
+								std::cerr	<<	"ERROR:	NULL	device	spec	given	to	Session::setDevice()"	<<	std::endl;
+								return(-1);
+				}
+
+				if	(	!strcasecmp(device,	"terminal")	)	{
+								sessionDevice=	DPM_session::TERMINAL	;
+				}	else	if	(	!strcasecmp(device,	"printer")	)	{
+								sessionDevice	=	DPM_session::PRINTER	;
+				}	else	{
+								char	tmp[5];
+								strncpy(tmp,	device,	5);
+								if	(	!strcasecmp(tmp,	"file:"))	{
+												sessionDevice	=	DPM_session::FILE	;
+												device	+=	5;
+												deviceFileName	=	strdup(device);
+								}	else	{
+												std::cerr	<<	"ERROR:	Bad	device	spec:	\""	<<	device	<<	"\""	<<	std::endl;
+												std::cerr	<<	"Correct	device	spec	format	(case-insensitive):	Printer|Terminal|File:<file_name>\n";
+												return(-1);
+								}
+				}
+
+				return(0)	;
 }
 
-DPM_session::Device DPM_session::getDevice() {
-    return sessionDevice;
+DPM_session::Device	DPM_session::getDevice()	{
+				return	sessionDevice;
 }
 
-char* DPM_session::getDeviceFileName() {
-    return deviceFileName;
+char*	DPM_session::getDeviceFileName()	{
+				return	deviceFileName;
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_table.cpp b/trick_source/data_products/DPX/DPM/DPM_table.cpp
index 4282b7a1d..c6b284c10 100644
--- a/trick_source/data_products/DPX/DPM/DPM_table.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_table.cpp
@@ -1,156 +1,156 @@
 
-#include <string.h>
-
-#include "DPM_table.hh"
-#include "float.h"
-
-int DPM_table::Initialize( xmlNode *base_node) {
-
-    double tstart    = 0.0;
-    double tstop     = DBL_MAX;
-    double frequency = DBL_MAX;
-    title = NULL;
-
-    int n_columns;
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_table::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "table") != 0) {
-        std::cerr << "ERROR: Expected <table> but didnt find it." << std::endl;
-        return -1;
-    }
-    /* Process children */
-    xmlNode *current_node = base_node->children;
-
-    while (current_node != NULL) {
-
-        if (current_node->type == XML_ELEMENT_NODE) {
-            DPM_column *column;
-
-            if ( strcmp( (const char *)current_node->name, "title") == 0) {
-                xmlNode *text_node = current_node->children;
-                title = strdup( (const char *)text_node->content);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstart") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstart = strtod((const char *)text_node->content,(char **)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "tstop") == 0) {
-                xmlNode *text_node = current_node->children;
-                tstop = strtod((const char *) text_node->content,(char**)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "frequency") == 0) {
-                xmlNode *text_node = current_node->children;
-                frequency = strtod((const char *)text_node->content,(char**)NULL);
-
-            } else if ( strcmp( (const char *)current_node->name, "column") == 0) {
-                try {
-                    column = new DPM_column( this, current_node);
-                } catch (std::invalid_argument) {
-                    column = NULL;
-                    std::cerr << "ERROR: <table> will be incomplete because one of it\'s <column>s is invalid." << std::endl;
-                }
-                if (column != NULL) {
-                    column_list.push_back( column);
-                }
-
-            } else {
-                std::cerr << "WARNING: Unknown element \"" << current_node->name << "\". Skipping." << std::endl;
-            }
-        }
-        current_node = current_node->next;
-    }
-
-    time_constraints = new DPM_time_constraints(tstart, tstop, frequency);
-
-    // Validation criteria:
-    // 1. Table requires at least one column (DPM_column) in the column_list.
-
-    n_columns = (int)column_list.size();
-    if (n_columns < 1) {
-        std::cerr << "ERROR: <table> requires at least one valid <column>." << std::endl;
-        return -1;
-    }
-    return 0;
+#include	<string.h>
+
+#include	"DPM_table.hh"
+#include	"float.h"
+
+int	DPM_table::Initialize(	xmlNode	*base_node)	{
+
+				double	tstart				=	0.0;
+				double	tstop					=	DBL_MAX;
+				double	frequency	=	DBL_MAX;
+				title	=	NULL;
+
+				int	n_columns;
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_table::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"table")	!=	0)	{
+								std::cerr	<<	"ERROR:	Expected	<table>	but	didnt	find	it."	<<	std::endl;
+								return	-1;
+				}
+				/*	Process	children	*/
+				xmlNode	*current_node	=	base_node->children;
+
+				while	(current_node	!=	NULL)	{
+
+								if	(current_node->type	==	XML_ELEMENT_NODE)	{
+												DPM_column	*column;
+
+												if	(	strcmp(	(const	char	*)current_node->name,	"title")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																title	=	strdup(	(const	char	*)text_node->content);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstart")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstart	=	strtod((const	char	*)text_node->content,(char	**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"tstop")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																tstop	=	strtod((const	char	*)	text_node->content,(char**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"frequency")	==	0)	{
+																xmlNode	*text_node	=	current_node->children;
+																frequency	=	strtod((const	char	*)text_node->content,(char**)NULL);
+
+												}	else	if	(	strcmp(	(const	char	*)current_node->name,	"column")	==	0)	{
+																try	{
+																				column	=	new	DPM_column(	this,	current_node);
+																}	catch	(std::invalid_argument)	{
+																				column	=	NULL;
+																				std::cerr	<<	"ERROR:	<table>	will	be	incomplete	because	one	of	it\'s	<column>s	is	invalid."	<<	std::endl;
+																}
+																if	(column	!=	NULL)	{
+																				column_list.push_back(	column);
+																}
+
+												}	else	{
+																std::cerr	<<	"WARNING:	Unknown	element	\""	<<	current_node->name	<<	"\".	Skipping."	<<	std::endl;
+												}
+								}
+								current_node	=	current_node->next;
+				}
+
+				time_constraints	=	new	DPM_time_constraints(tstart,	tstop,	frequency);
+
+				//	Validation	criteria:
+				//	1.	Table	requires	at	least	one	column	(DPM_column)	in	the	column_list.
+
+				n_columns	=	(int)column_list.size();
+				if	(n_columns	<	1)	{
+								std::cerr	<<	"ERROR:	<table>	requires	at	least	one	valid	<column>."	<<	std::endl;
+								return	-1;
+				}
+				return	0;
 }
 
-// XML CONSTRUCTOR
-DPM_table::DPM_table(DPM_component *Parent, xmlNode *Base_node)
-  : DPM_component (Parent, Base_node) {
+//	XML	CONSTRUCTOR
+DPM_table::DPM_table(DPM_component	*Parent,	xmlNode	*Base_node)
+		:	DPM_component	(Parent,	Base_node)	{
 
-  if ( Initialize( Base_node) < 0 ) {
-      throw std::invalid_argument("DPM_table specification is un-usable.");
-  }
+		if	(	Initialize(	Base_node)	<	0	)	{
+						throw	std::invalid_argument("DPM_table	specification	is	un-usable.");
+		}
 }
 
-// MEMBER FUNCTION
-DPM_table::~DPM_table() {
-    int i, n_columns ;
-
-    n_columns = (int)column_list.size();
-    for (i = 0; i < n_columns ; i ++) {
-        DPM_column *column;
-        column =  column_list[i];
-        if (column) { delete column; }
-    }
-    if (title ) {
-        free( title);
-    }
+//	MEMBER	FUNCTION
+DPM_table::~DPM_table()	{
+				int	i,	n_columns	;
+
+				n_columns	=	(int)column_list.size();
+				for	(i	=	0;	i	<	n_columns	;	i	++)	{
+								DPM_column	*column;
+								column	=		column_list[i];
+								if	(column)	{	delete	column;	}
+				}
+				if	(title	)	{
+								free(	title);
+				}
 }
 
-// MEMBER FUNCTION
-const char *DPM_table::getTitle() {
-  return ( title);
+//	MEMBER	FUNCTION
+const	char	*DPM_table::getTitle()	{
+		return	(	title);
 }
 
-// MEMBER FUNCTION
-DPM_time_constraints *DPM_table::getTimeConstraints() {
-  return (time_constraints);
+//	MEMBER	FUNCTION
+DPM_time_constraints	*DPM_table::getTimeConstraints()	{
+		return	(time_constraints);
 }
 
-// MEMBER FUNCTION
-int DPM_table::NumberOfColumns() {
-  return ((int)column_list.size());
+//	MEMBER	FUNCTION
+int	DPM_table::NumberOfColumns()	{
+		return	((int)column_list.size());
 }
 
-// MEMBER FUNCTION
-DPM_column *DPM_table::getColumn( unsigned int index) {
-  if (index < column_list.size( ))  {
-    return ( column_list[index]);
-  } else {
-    return NULL;
-  }
+//	MEMBER	FUNCTION
+DPM_column	*DPM_table::getColumn(	unsigned	int	index)	{
+		if	(index	<	column_list.size(	))		{
+				return	(	column_list[index]);
+		}	else	{
+				return	NULL;
+		}
 }
 
-// MEMBER FUNCTION
-std::ostream& operator<< (std::ostream& s, const DPM_table *table) {
-  int i;
-  int n_attrs = (int)table->attribute_list.size();
-  int n_columns = (int)table->column_list.size();
-
-  s << "<table";
-  for (i=0 ; i<n_attrs ; i++) {
-    s << " " << table->attribute_list[i];
-  }
-  s << ">";
-  s << std::endl;
-  if (table->title != NULL) {
-    s << "<title>"  << table->title  << "</title>"  << std::endl;
-  }
-  s << "<tstart>" << table->time_constraints->getStart() << "</tstart>" << std::endl;
-  s << "<tstop>"  << table->time_constraints->getStop()  << "</tstop>"  << std::endl;
-  s << "<frequency>"  << table->time_constraints->getFrequency()  << "</frequency>"  << std::endl;
-
-  for (i=0 ; i<n_columns ; i++) {
-    s << table->column_list[i];
-  }
-
-  s << "</table>";
-  s << std::endl;
-  s.flush();
-
-  return s;
+//	MEMBER	FUNCTION
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_table	*table)	{
+		int	i;
+		int	n_attrs	=	(int)table->attribute_list.size();
+		int	n_columns	=	(int)table->column_list.size();
+
+		s	<<	"<table";
+		for	(i=0	;	i<n_attrs	;	i++)	{
+				s	<<	"	"	<<	table->attribute_list[i];
+		}
+		s	<<	">";
+		s	<<	std::endl;
+		if	(table->title	!=	NULL)	{
+				s	<<	"<title>"		<<	table->title		<<	"</title>"		<<	std::endl;
+		}
+		s	<<	"<tstart>"	<<	table->time_constraints->getStart()	<<	"</tstart>"	<<	std::endl;
+		s	<<	"<tstop>"		<<	table->time_constraints->getStop()		<<	"</tstop>"		<<	std::endl;
+		s	<<	"<frequency>"		<<	table->time_constraints->getFrequency()		<<	"</frequency>"		<<	std::endl;
+
+		for	(i=0	;	i<n_columns	;	i++)	{
+				s	<<	table->column_list[i];
+		}
+
+		s	<<	"</table>";
+		s	<<	std::endl;
+		s.flush();
+
+		return	s;
 }
 
diff --git a/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp b/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
index 44676e195..78a704217 100644
--- a/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_time_constraints.cpp
@@ -1,83 +1,83 @@
 
-#include "DPM_time_constraints.hh"
-#include "float.h"
+#include	"DPM_time_constraints.hh"
+#include	"float.h"
 
-void DPM_time_constraints::Initialize() {
+void	DPM_time_constraints::Initialize()	{
 
-  start_time = 0.0;
-  stop_time = DBL_MAX;
-  frequency = DBL_MAX;
+		start_time	=	0.0;
+		stop_time	=	DBL_MAX;
+		frequency	=	DBL_MAX;
 }
 
-// CONSTRUCTOR.
-DPM_time_constraints::DPM_time_constraints() {
-  Initialize();
+//	CONSTRUCTOR.
+DPM_time_constraints::DPM_time_constraints()	{
+		Initialize();
 }
 
-// CONSTRUCTOR.
-DPM_time_constraints::DPM_time_constraints(double start,
-					     double stop,
-					     double freq) {
-  Initialize();
-  if (start >= 0.0) {
-    start_time = start;
-  }
-  if (stop > start_time) {
-    stop_time = stop;
-  }
-  if (freq >= 0.0) frequency = freq;
+//	CONSTRUCTOR.
+DPM_time_constraints::DPM_time_constraints(double	start,
+										double	stop,
+										double	freq)	{
+		Initialize();
+		if	(start	>=	0.0)	{
+				start_time	=	start;
+		}
+		if	(stop	>	start_time)	{
+				stop_time	=	stop;
+		}
+		if	(freq	>=	0.0)	frequency	=	freq;
 }
 
-// MEMBER FUNCTION
-double DPM_time_constraints::getStart() {
-  return( start_time);
+//	MEMBER	FUNCTION
+double	DPM_time_constraints::getStart()	{
+		return(	start_time);
 }
 
-// MEMBER FUNCTION
-double DPM_time_constraints::getStop() {
-  return( stop_time);
+//	MEMBER	FUNCTION
+double	DPM_time_constraints::getStop()	{
+		return(	stop_time);
 }
 
-// MEMBER FUNCTION
-double DPM_time_constraints::getPeriod() {
-  if (frequency != 0.0) {
-    return ( 1.0/frequency);
-  }
-  return (0.0);
+//	MEMBER	FUNCTION
+double	DPM_time_constraints::getPeriod()	{
+		if	(frequency	!=	0.0)	{
+				return	(	1.0/frequency);
+		}
+		return	(0.0);
 }
 
-// MEMBER FUNCTION
-double DPM_time_constraints::getFrequency() {
-  return (frequency);
+//	MEMBER	FUNCTION
+double	DPM_time_constraints::getFrequency()	{
+		return	(frequency);
 }
 
-// MEMBER FUNCTION
-DPM_time_constraints operator+ ( DPM_time_constraints &tc1,
-				  DPM_time_constraints &tc2) {
+//	MEMBER	FUNCTION
+DPM_time_constraints	operator+	(	DPM_time_constraints	&tc1,
+						DPM_time_constraints	&tc2)	{
 
-  DPM_time_constraints tc_out;
+		DPM_time_constraints	tc_out;
 
-  if ( tc1.start_time > tc2.start_time ) {
-    tc_out.start_time = tc1.start_time;
-  } else {
-    tc_out.start_time = tc2.start_time;
-  }
+		if	(	tc1.start_time	>	tc2.start_time	)	{
+				tc_out.start_time	=	tc1.start_time;
+		}	else	{
+				tc_out.start_time	=	tc2.start_time;
+		}
 
-  if ( tc1.stop_time < tc2.stop_time ) {
-    tc_out.stop_time = tc1.stop_time;
-  } else {
-    tc_out.stop_time = tc2.stop_time;
-  }
+		if	(	tc1.stop_time	<	tc2.stop_time	)	{
+				tc_out.stop_time	=	tc1.stop_time;
+		}	else	{
+				tc_out.stop_time	=	tc2.stop_time;
+		}
 
-  if ( tc1.frequency < tc2.frequency ) {
-    tc_out.frequency = tc1.frequency;
-  } else {
-    tc_out.frequency = tc2.frequency;
-  }
+		if	(	tc1.frequency	<	tc2.frequency	)	{
+				tc_out.frequency	=	tc1.frequency;
+		}	else	{
+				tc_out.frequency	=	tc2.frequency;
+		}
 
-  if (tc_out.start_time > tc_out.stop_time) {
-    tc_out.start_time = tc_out.stop_time;
-  }
+		if	(tc_out.start_time	>	tc_out.stop_time)	{
+				tc_out.start_time	=	tc_out.stop_time;
+		}
 
-  return (tc_out);
+		return	(tc_out);
 }
diff --git a/trick_source/data_products/DPX/DPM/DPM_var.cpp b/trick_source/data_products/DPX/DPM/DPM_var.cpp
index a7e8440f7..f3f086d94 100644
--- a/trick_source/data_products/DPX/DPM/DPM_var.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_var.cpp
@@ -1,123 +1,123 @@
 
-#include <string.h>
+#include	<string.h>
 
-#include "DPM_var.hh"
+#include	"DPM_var.hh"
 
-DPM_var::DPM_var(const char* Name)
-        :DPM_component() {
-   name = strdup( Name);
+DPM_var::DPM_var(const	char*	Name)
+								:DPM_component()	{
+			name	=	strdup(	Name);
 }
 
-int DPM_var::Initialize( xmlNode *base_node) {
-
-    if (base_node == NULL) {
-         std::cerr << "ERROR: DPM_var::Initialize: Bad parameters." << std::endl;
-         return -1;
-    }
-    if ( strcmp( (char *)base_node->name, "var") != 0) {
-       return -1;
-    } else {
-       xmlNode *text_node = base_node->children;
-	name = strdup( (const char *)text_node->content);
-    }
-    return 0;
+int	DPM_var::Initialize(	xmlNode	*base_node)	{
+
+				if	(base_node	==	NULL)	{
+									std::cerr	<<	"ERROR:	DPM_var::Initialize:	Bad	parameters."	<<	std::endl;
+									return	-1;
+				}
+				if	(	strcmp(	(char	*)base_node->name,	"var")	!=	0)	{
+							return	-1;
+				}	else	{
+							xmlNode	*text_node	=	base_node->children;
+	name	=	strdup(	(const	char	*)text_node->content);
+				}
+				return	0;
 }
 
-// CONSTRUCTOR
-DPM_var::DPM_var(DPM_component *Parent, xmlNode *Base_node)
-     : DPM_component (Parent, Base_node) {
+//	CONSTRUCTOR
+DPM_var::DPM_var(DPM_component	*Parent,	xmlNode	*Base_node)
+					:	DPM_component	(Parent,	Base_node)	{
 
-     if ( Initialize( Base_node) < 0) {
-         throw std::invalid_argument("DPM_var specification is un-usable.");
-     }
+					if	(	Initialize(	Base_node)	<	0)	{
+									throw	std::invalid_argument("DPM_var	specification	is	un-usable.");
+					}
 }
 
-// DESTRUCTOR
-DPM_var::~DPM_var() {
+//	DESTRUCTOR
+DPM_var::~DPM_var()	{
 }
 
-const char* DPM_var::getName() {
-  return ( (const char*)name );
+const	char*	DPM_var::getName()	{
+		return	(	(const	char*)name	);
 }
 
-std::string DPM_var::getShortName() {
-    char *p;
-
-    std::string::size_type idx ;
-
-    // Make a string out of the parameter name
-    std::string pName = name ;
-
-    // Is this a delta(<var:run>,<var:run>) parameter?
-    idx = pName.find("delta(");
-    // if not, the short name is that last part of whole name path
-    if (idx != 0 ) {
-        if ((p=strrchr( name,'.')) != NULL) {
-            p++;
-            return ( (const char*)p);
-        } else {
-            return ( (const char*)name );
-        }
-    } else {
-        // if is a delta(...), the short name is <last part of var1> - <last part of var2>
-        int ret;
-        char vr1[1024];
-        char vr2[1024];
-        std::string paramName1;
-        std::string paramName2;
-        std::string combinedName;
-
-        // The delta statement is formatted like:
-        // delta(<var1:run1>, <var2:run2>)
-
-        // Extract <var1:run1> <var2:run2>
-        ret = sscanf(name, "delta(%[^,],%[^)]", vr1, vr2);
-        if ( ret != 2 ) {
-            fprintf(stderr, "ERROR: Delta::Delta() received bad spec \"%s\"\nAborting.\n", name);
-            exit(-1);
-        }
-
-        // now vr1 is var1:run1 and vr2 is var2:run2
-        // only var1 and var2 are needed
-        paramName1 = vr1;
-        idx = paramName1.find(':');
-        if ( idx != std::string::npos ) {
-            // Extract var1 name from vr1
-            paramName1 = paramName1.substr(0,idx) ;
-        }
-        if ((p=strrchr( (char*)paramName1.c_str(),'.')) != NULL) {
-            p++;
-            combinedName = std::string(p);
-        } else {
-            combinedName = paramName1;
-        }
-        paramName2 = vr2;
-        idx = paramName2.find(':');
-        if ( idx != std::string::npos ) {
-            // Extract var2 name from vr2
-            paramName2 = paramName2.substr(0,idx) ;
-        }
-        if ((p=strrchr( (char*)paramName2.c_str(),'.')) != NULL) {
-            p++;
-            combinedName += " - " + std::string(p);
-        } else {
-            combinedName += " - " + paramName2;
-        }
-        return combinedName;
-    }
+std::string	DPM_var::getShortName()	{
+				char	*p;
+
+				std::string::size_type	idx	;
+
+				//	Make	a	string	out	of	the	parameter	name
+				std::string	pName	=	name	;
+
+				//	Is	this	a	delta(<var:run>,<var:run>)	parameter?
+				idx	=	pName.find("delta(");
+				//	if	not,	the	short	name	is	that	last	part	of	whole	name	path
+				if	(idx	!=	0	)	{
+								if	((p=strrchr(	name,'.'))	!=	NULL)	{
+												p++;
+												return	(	(const	char*)p);
+								}	else	{
+												return	(	(const	char*)name	);
+								}
+				}	else	{
+								//	if	is	a	delta(...),	the	short	name	is	<last	part	of	var1>	-	<last	part	of	var2>
+								int	ret;
+								char	vr1[1024];
+								char	vr2[1024];
+								std::string	paramName1;
+								std::string	paramName2;
+								std::string	combinedName;
+
+								//	The	delta	statement	is	formatted	like:
+								//	delta(<var1:run1>,	<var2:run2>)
+
+								//	Extract	<var1:run1>	<var2:run2>
+								ret	=	sscanf(name,	"delta(%[^,],%[^)]",	vr1,	vr2);
+								if	(	ret	!=	2	)	{
+												fprintf(stderr,	"ERROR:	Delta::Delta()	received	bad	spec	\"%s\"\nAborting.\n",	name);
+												exit(-1);
+								}
+
+								//	now	vr1	is	var1:run1	and	vr2	is	var2:run2
+								//	only	var1	and	var2	are	needed
+								paramName1	=	vr1;
+								idx	=	paramName1.find(':');
+								if	(	idx	!=	std::string::npos	)	{
+												//	Extract	var1	name	from	vr1
+												paramName1	=	paramName1.substr(0,idx)	;
+								}
+								if	((p=strrchr(	(char*)paramName1.c_str(),'.'))	!=	NULL)	{
+												p++;
+												combinedName	=	std::string(p);
+								}	else	{
+												combinedName	=	paramName1;
+								}
+								paramName2	=	vr2;
+								idx	=	paramName2.find(':');
+								if	(	idx	!=	std::string::npos	)	{
+												//	Extract	var2	name	from	vr2
+												paramName2	=	paramName2.substr(0,idx)	;
+								}
+								if	((p=strrchr(	(char*)paramName2.c_str(),'.'))	!=	NULL)	{
+												p++;
+												combinedName	+=	"	-	"	+	std::string(p);
+								}	else	{
+												combinedName	+=	"	-	"	+	paramName2;
+								}
+								return	combinedName;
+				}
 }
 
-std::ostream& operator<< (std::ostream& s, const DPM_var *var) {
-     int i;
-     int n = (int)var->attribute_list.size();
-
-     s << "<var";
-     for (i=0 ; i<n ; i++) {
-          s << " " << var->attribute_list[i];
-     }
-     s << ">";
-     s << var->name;
-     s << "</var>";
-     s << std::endl;
-     return s;
+std::ostream&	operator<<	(std::ostream&	s,	const	DPM_var	*var)	{
+					int	i;
+					int	n	=	(int)var->attribute_list.size();
+
+					s	<<	"<var";
+					for	(i=0	;	i<n	;	i++)	{
+										s	<<	"	"	<<	var->attribute_list[i];
+					}
+					s	<<	">";
+					s	<<	var->name;
+					s	<<	"</var>";
+					s	<<	std::endl;
+					return	s;
 }
diff --git a/trick_source/data_products/DPX/DPV/UTILS/DPV_textbuffer.cpp b/trick_source/data_products/DPX/DPV/UTILS/DPV_textbuffer.cpp
index 2c0ccc8a5..164865988 100644
--- a/trick_source/data_products/DPX/DPV/UTILS/DPV_textbuffer.cpp
+++ b/trick_source/data_products/DPX/DPV/UTILS/DPV_textbuffer.cpp
@@ -1,154 +1,154 @@
 
-#include "DPV_textbuffer.hh"
+#include	"DPV_textbuffer.hh"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <iostream>
+#include	<stdio.h>
+#include	<stdarg.h>
+#include	<stdlib.h>
+#include	<unistd.h>
+#include	<iostream>
 
-#define MAX_MSG_SIZE 0xFFFF
+#define	MAX_MSG_SIZE	0xFFFF
 
-DPV_TextBuffer::DPV_TextBuffer() {
+DPV_TextBuffer::DPV_TextBuffer()	{
 
-    text_buf = NULL;
-    insertion_pos = 0;
-    buf_size = 0;
+				text_buf	=	NULL;
+				insertion_pos	=	0;
+				buf_size	=	0;
 }
 
-DPV_TextBuffer::~DPV_TextBuffer() {
+DPV_TextBuffer::~DPV_TextBuffer()	{
 }
 
-void DPV_TextBuffer::print(const char* format, ...) {
+void	DPV_TextBuffer::print(const	char*	format,	...)	{
 
-    char message[MAX_MSG_SIZE];
-    va_list vargs;
-    size_t new_insertion_pos;
-    size_t message_len;
+				char	message[MAX_MSG_SIZE];
+				va_list	vargs;
+				size_t	new_insertion_pos;
+				size_t	message_len;
 
-    va_start(vargs, format);
-    vsnprintf(message, (size_t)MAX_MSG_SIZE, format, vargs);
-    va_end(vargs);
+				va_start(vargs,	format);
+				vsnprintf(message,	(size_t)MAX_MSG_SIZE,	format,	vargs);
+				va_end(vargs);
 
-    message_len = strlen(message);
-    new_insertion_pos = insertion_pos + message_len;
+				message_len	=	strlen(message);
+				new_insertion_pos	=	insertion_pos	+	message_len;
 
-    if (text_buf == NULL) {
-        text_buf = (char*)calloc(1, size_t(MAX_MSG_SIZE));
-    }
+				if	(text_buf	==	NULL)	{
+								text_buf	=	(char*)calloc(1,	size_t(MAX_MSG_SIZE));
+				}
 
-    while ( insertion_pos > buf_size) {
-        buf_size += (size_t)MAX_MSG_SIZE;
-        if ((text_buf = (char *)realloc( text_buf, buf_size )) == NULL) {
-            fprintf(stderr,"OUT_OF_MEMORY in DPV_TextBuffer.\n");
-            fflush(stderr);
-            exit(1);
-        }
-    }
+				while	(	insertion_pos	>	buf_size)	{
+								buf_size	+=	(size_t)MAX_MSG_SIZE;
+								if	((text_buf	=	(char	*)realloc(	text_buf,	buf_size	))	==	NULL)	{
+												fprintf(stderr,"OUT_OF_MEMORY	in	DPV_TextBuffer.\n");
+												fflush(stderr);
+												exit(1);
+								}
+				}
 
-    strcpy(&text_buf[insertion_pos], message);
-    insertion_pos = new_insertion_pos;
+				strcpy(&text_buf[insertion_pos],	message);
+				insertion_pos	=	new_insertion_pos;
 
 }
 
 
-int DPV_TextBuffer::subst( const char* search_s, const char* replace_s ) {
+int	DPV_TextBuffer::subst(	const	char*	search_s,	const	char*	replace_s	)	{
 
-    std::string haystack = text_buf;
-    std::string needle = search_s;
+				std::string	haystack	=	text_buf;
+				std::string	needle	=	search_s;
 
-    // If we did'nt find the search string.
-    if ( haystack.find(needle) == std::string::npos ) {
-        // There is no substitution.
-        return (0);
-    }
+				//	If	we	did'nt	find	the	search	string.
+				if	(	haystack.find(needle)	==	std::string::npos	)	{
+								//	There	is	no	substitution.
+								return	(0);
+				}
 
-    // Perform a single substitution.
-    haystack.replace( haystack.find(needle), needle.length(), replace_s );
+				//	Perform	a	single	substitution.
+				haystack.replace(	haystack.find(needle),	needle.length(),	replace_s	);
 
-    if ( sizeof(haystack) > buf_size) {
-        buf_size += (size_t)MAX_MSG_SIZE;
-        if ((text_buf = (char *)realloc( text_buf, buf_size )) == NULL) {
-            fprintf(stderr,"OUT_OF_MEMORY in DPV_TextBuffer.\n");
-            fflush(stderr);
-            exit(1);
-        }
-    }
+				if	(	sizeof(haystack)	>	buf_size)	{
+								buf_size	+=	(size_t)MAX_MSG_SIZE;
+								if	((text_buf	=	(char	*)realloc(	text_buf,	buf_size	))	==	NULL)	{
+												fprintf(stderr,"OUT_OF_MEMORY	in	DPV_TextBuffer.\n");
+												fflush(stderr);
+												exit(1);
+								}
+				}
 
-    strcpy(text_buf, haystack.c_str());
+				strcpy(text_buf,	haystack.c_str());
 
-    //! Important! Needed by future print() calls.
-    insertion_pos = haystack.length();
+				//!	Important!	Needed	by	future	print()	calls.
+				insertion_pos	=	haystack.length();
 
-    // There was a substitution.
-    return (1);
+				//	There	was	a	substitution.
+				return	(1);
 }
 
-void DPV_TextBuffer::subst_g( const char* search_s, const char* replace_s ) {
+void	DPV_TextBuffer::subst_g(	const	char*	search_s,	const	char*	replace_s	)	{
 
-    while ( subst( search_s, replace_s)) ;
+				while	(	subst(	search_s,	replace_s))	;
 
 }
 
-const char* DPV_TextBuffer::getText() {
-    return ((const char*)text_buf);
+const	char*	DPV_TextBuffer::getText()	{
+				return	((const	char*)text_buf);
 }
 
-int DPV_TextBuffer::readFile( const char* fileName ) {
-
-    FILE *fp;
-
-    char *buf;
-    int success = 0;
-    int failure = -1;
-    size_t numRead;
-    long fileSize;
-
-    //! See if file name exists, and if writable
-    if (access(fileName, F_OK) == success) {
-        if (access(fileName, R_OK) == failure) {
-            std::cerr << "Unable to access file \"" << fileName << "\" for reading.\n";
-            return (-1);
-        }
-    }
-    //! Open it
-    fp = fopen(fileName, "r");
-    if (fp == NULL) {
-        return (-1);
-    }
-    //! Get size of file
-    fseek(fp, 0, SEEK_END);
-    fileSize = ftell(fp);
-    rewind(fp);
-
-    //! Read file into buffer
-    buf = new char[fileSize + 1];
-    numRead = fread((char *) buf, fileSize, 1, fp);
-    if (numRead != 1) {
-        delete[]buf;
-        fclose(fp);
-        return (-1);
-    }
-    buf[fileSize] = '\0';
-
-    //! Close file
-    fclose(fp);
-
-    this->print(buf);
-    return (0);
+int	DPV_TextBuffer::readFile(	const	char*	fileName	)	{
+
+				FILE	*fp;
+
+				char	*buf;
+				int	success	=	0;
+				int	failure	=	-1;
+				size_t	numRead;
+				long	fileSize;
+
+				//!	See	if	file	name	exists,	and	if	writable
+				if	(access(fileName,	F_OK)	==	success)	{
+								if	(access(fileName,	R_OK)	==	failure)	{
+												std::cerr	<<	"Unable	to	access	file	\""	<<	fileName	<<	"\"	for	reading.\n";
+												return	(-1);
+								}
+				}
+				//!	Open	it
+				fp	=	fopen(fileName,	"r");
+				if	(fp	==	NULL)	{
+								return	(-1);
+				}
+				//!	Get	size	of	file
+				fseek(fp,	0,	SEEK_END);
+				fileSize	=	ftell(fp);
+				rewind(fp);
+
+				//!	Read	file	into	buffer
+				buf	=	new	char[fileSize	+	1];
+				numRead	=	fread((char	*)	buf,	fileSize,	1,	fp);
+				if	(numRead	!=	1)	{
+								delete[]buf;
+								fclose(fp);
+								return	(-1);
+				}
+				buf[fileSize]	=	'\0';
+
+				//!	Close	file
+				fclose(fp);
+
+				this->print(buf);
+				return	(0);
 }
 
-int DPV_TextBuffer::writeFile( const char* filename ) {
+int	DPV_TextBuffer::writeFile(	const	char*	filename	)	{
 
-    FILE *fp;
+				FILE	*fp;
 
-    if ((fp = fopen( filename, "w")) == NULL) {
-        std::cerr << "Unable to open file \"" << filename << "\" for writing.\n";
-        return (-1);
-    }
+				if	((fp	=	fopen(	filename,	"w"))	==	NULL)	{
+								std::cerr	<<	"Unable	to	open	file	\""	<<	filename	<<	"\"	for	writing.\n";
+								return	(-1);
+				}
 
-    fprintf(fp,"%s", this->getText());
-    fclose(fp);
-    return (0);
+				fprintf(fp,"%s",	this->getText());
+				fclose(fp);
+				return	(0);
 }
 
diff --git a/trick_source/data_products/DPX/DPV/UTILS/tbtest.cpp b/trick_source/data_products/DPX/DPV/UTILS/tbtest.cpp
index 469ba6d38..5b37c15ae 100644
--- a/trick_source/data_products/DPX/DPV/UTILS/tbtest.cpp
+++ b/trick_source/data_products/DPX/DPV/UTILS/tbtest.cpp
@@ -1,25 +1,25 @@
 
-#include "DPV_textbuffer.hh"
+#include	"DPV_textbuffer.hh"
 
-#include <iostream>
+#include	<iostream>
 
-int main( int argc, char * argv[]) {
+int	main(	int	argc,	char	*	argv[])	{
 
-    DPV_TextBuffer my_text;
+				DPV_TextBuffer	my_text;
 
-    my_text.print("Old McDonald had a farm. EIEIO.\n");
-    my_text.print("On his farm he had a ANIMAL1. EIEIO.\n");
-    my_text.print("On his farm he had a ANIMAL2. EIEIO.\n");
-    my_text.print("On his farm he had a ANIMAL3. EIEIO.\n");
-    my_text.print("On his farm he had a ANIMAL1. EIEIO.\n");
-    my_text.print("On his farm he had a ANIMAL1. EIEIO.\n");
-    my_text.subst_g("ANIMAL1","cow");
-    my_text.subst_g("ANIMAL2","ostrich");
-    my_text.subst_g("ANIMAL3","hippopotamus");
-    my_text.subst_g("ANIMAL4","gnu");
-    my_text.subst_g("ANIMAL5","pig");
+				my_text.print("Old	McDonald	had	a	farm.	EIEIO.\n");
+				my_text.print("On	his	farm	he	had	a	ANIMAL1.	EIEIO.\n");
+				my_text.print("On	his	farm	he	had	a	ANIMAL2.	EIEIO.\n");
+				my_text.print("On	his	farm	he	had	a	ANIMAL3.	EIEIO.\n");
+				my_text.print("On	his	farm	he	had	a	ANIMAL1.	EIEIO.\n");
+				my_text.print("On	his	farm	he	had	a	ANIMAL1.	EIEIO.\n");
+				my_text.subst_g("ANIMAL1","cow");
+				my_text.subst_g("ANIMAL2","ostrich");
+				my_text.subst_g("ANIMAL3","hippopotamus");
+				my_text.subst_g("ANIMAL4","gnu");
+				my_text.subst_g("ANIMAL5","pig");
 
-    cout << my_text.getText();
+				cout	<<	my_text.getText();
 }
 
 
diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/ctrl_test.cpp b/trick_source/data_products/DPX/TESTING/DPC_TEST/ctrl_test.cpp
index ff9dc32f3..4bb3678a4 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/ctrl_test.cpp
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/ctrl_test.cpp
@@ -1,81 +1,81 @@
 
-#include <stdio.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include "DPC/DPC_product.hh"
-#include "DPM/DPM_parse_tree.hh"
-#include "DPM/DPM_session.hh"
-#include "test_view.hh"
-
-int main(int argc, char * argv[] ) {
-     DPM_parse_tree *session_parse_tree;
-     xmlNode *root_node;
-     DPM_session *session;
-     char *session_file_name;
-
-     vector <DPC_product*> product_list;
-
-     test_view *view;
-
-     int n_product_files;
-     int product_ix;
-
-    if (argc != 2) {
-         fprintf(stderr,"I need a session filename.\n");
-         fflush(stderr);
-         return (1);
-    }
-    session_file_name = argv[1];
-
-    cout << "START CTRL TEST" << endl;
-    cout.flush();
-
-    cout << "NEW TEST VIEW" << endl;
-    cout.flush();
-    view = new test_view();
-
-    try {
-        session_parse_tree = new DPM_parse_tree(session_file_name);
-    } catch (std::invalid_argument) {
-        cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
-        exit(1);
-    }
-
-    root_node = session_parse_tree->getRootNode();
-
-    try {
-        session = new DPM_session( NULL, root_node);
-    } catch (std::invalid_argument) {
-        cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << endl;
-        exit(1);
-    }
-
-    delete session_parse_tree;
-
-    n_product_files = session->product_file_list.size();
-
-    for (product_ix = 0; product_ix < n_product_files; product_ix++ ) {
-        DPC_product *product;
-        const char *product_file_name = session->product_file_list[product_ix];
-
-        try {
-            cout << "NEW DPC_PRODUCT" << endl;
-            cout.flush();
-            product = new DPC_product( session, product_file_name);
-        } catch  (std::invalid_argument) {
-            cerr << "ERROR: Unable to create the product specified by file: \"" <<
-                product_file_name << "\"" << endl;
-            product = NULL;
-        }
-
-        if (product != NULL) {
-            product_list.push_back( product);
-
-            cout << "RENDER VIEW" << endl;
-            cout.flush();
-            product->render( view);
-        }
-    }
-
-     return 0;
+#include	<stdio.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
+#include	"DPC/DPC_product.hh"
+#include	"DPM/DPM_parse_tree.hh"
+#include	"DPM/DPM_session.hh"
+#include	"test_view.hh"
+
+int	main(int	argc,	char	*	argv[]	)	{
+					DPM_parse_tree	*session_parse_tree;
+					xmlNode	*root_node;
+					DPM_session	*session;
+					char	*session_file_name;
+
+					vector	<DPC_product*>	product_list;
+
+					test_view	*view;
+
+					int	n_product_files;
+					int	product_ix;
+
+				if	(argc	!=	2)	{
+									fprintf(stderr,"I	need	a	session	filename.\n");
+									fflush(stderr);
+									return	(1);
+				}
+				session_file_name	=	argv[1];
+
+				cout	<<	"START	CTRL	TEST"	<<	endl;
+				cout.flush();
+
+				cout	<<	"NEW	TEST	VIEW"	<<	endl;
+				cout.flush();
+				view	=	new	test_view();
+
+				try	{
+								session_parse_tree	=	new	DPM_parse_tree(session_file_name);
+				}	catch	(std::invalid_argument)	{
+								cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	endl;
+								exit(1);
+				}
+
+				root_node	=	session_parse_tree->getRootNode();
+
+				try	{
+								session	=	new	DPM_session(	NULL,	root_node);
+				}	catch	(std::invalid_argument)	{
+								cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	endl;
+								exit(1);
+				}
+
+				delete	session_parse_tree;
+
+				n_product_files	=	session->product_file_list.size();
+
+				for	(product_ix	=	0;	product_ix	<	n_product_files;	product_ix++	)	{
+								DPC_product	*product;
+								const	char	*product_file_name	=	session->product_file_list[product_ix];
+
+								try	{
+												cout	<<	"NEW	DPC_PRODUCT"	<<	endl;
+												cout.flush();
+												product	=	new	DPC_product(	session,	product_file_name);
+								}	catch		(std::invalid_argument)	{
+												cerr	<<	"ERROR:	Unable	to	create	the	product	specified	by	file:	\""	<<
+																product_file_name	<<	"\""	<<	endl;
+												product	=	NULL;
+								}
+
+								if	(product	!=	NULL)	{
+												product_list.push_back(	product);
+
+												cout	<<	"RENDER	VIEW"	<<	endl;
+												cout.flush();
+												product->render(	view);
+								}
+				}
+
+					return	0;
 }
diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
index 7fc3f1f24..69abf771f 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/test_view.cpp
@@ -1,235 +1,235 @@
-#include "test_view.hh"
+#include	"test_view.hh"
 
 
 
-DPV_pointer test_view::create_product_view( DPC_product* product){
-  cout << "=======================" << endl;
-  cout << "PRODUCT VIEW." << endl;
-  cout << "=======================" << endl;
-  cout.flush();
-  cout << "Product title: " << product->getTitle() << endl;
-  cout.flush();
+DPV_pointer	test_view::create_product_view(	DPC_product*	product){
+		cout	<<	"======================="	<<	endl;
+		cout	<<	"PRODUCT	VIEW."	<<	endl;
+		cout	<<	"======================="	<<	endl;
+		cout.flush();
+		cout	<<	"Product	title:	"	<<	product->getTitle()	<<	endl;
+		cout.flush();
 
-  return ( (DPV_pointer)0x01111111 );
+		return	(	(DPV_pointer)0x01111111	);
 }
 
-DPV_pointer test_view::create_page_view( DPV_pointer parent_data,
-					  DPC_page* page) {
-  long pdata = (long)parent_data;
-  cout << "=======================" << endl;
-  cout << "PAGE VIEW." << endl;
-  cout << "=======================" << endl;
-  cout << "parent data: " << pdata << endl;
-  cout.flush();
-  cout << "Page title: " << page->getTitle() << endl;
-  cout.flush();
-
-  return ( (DPV_pointer)0x02222222 );
+DPV_pointer	test_view::create_page_view(	DPV_pointer	parent_data,
+							DPC_page*	page)	{
+		long	pdata	=	(long)parent_data;
+		cout	<<	"======================="	<<	endl;
+		cout	<<	"PAGE	VIEW."	<<	endl;
+		cout	<<	"======================="	<<	endl;
+		cout	<<	"parent	data:	"	<<	pdata	<<	endl;
+		cout.flush();
+		cout	<<	"Page	title:	"	<<	page->getTitle()	<<	endl;
+		cout.flush();
+
+		return	(	(DPV_pointer)0x02222222	);
 }
 
-DPV_pointer test_view::create_plot_view( DPV_pointer parent_data,
-					  DPC_plot* plot) {
-  long pdata = (long)parent_data;
-  const char *temp_cstr;
-
-  cout << "=====================" << endl;
-  cout << "PLOT VIEW." << endl;
-  cout << "=====================" << endl;
-  cout << "parent data: " << pdata << endl;
-  cout << "Plot title: " << plot->getTitle() << endl;
-  cout.flush();
-  cout << "Number of Curves: " << plot->getNumCurves() << endl;
-  cout.flush();
-  cout << "X-axis label: " << plot->getXLabel() << endl;
-  cout.flush();
-  cout << "Y-axis label: " << plot->getYLabel() << endl;
-  cout.flush();
-
-  if ((temp_cstr = plot->getAttribute("xmin")) != NULL) {
-    cout << "Attribute xmin: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("xmax")) != NULL) {
-    cout << "Attribute xmax: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("ymin")) != NULL) {
-    cout << "Attribute ymin: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("ymax")) != NULL) {
-    cout << "Attribute ymax: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("grid")) != NULL) {
-    cout << "Attribute grid: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("grid_color")) != NULL) {
-    cout << "Attribute grid_color: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("foreground_color")) != NULL) {
-    cout << "Attribute foreground_color: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("background_color")) != NULL) {
-    cout << "Attribute background_color: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = plot->getAttribute("font")) != NULL) {
-    cout << "Attribute font: " << temp_cstr << endl;
-  }
-  return ( (DPV_pointer)0x03333333 );
+DPV_pointer	test_view::create_plot_view(	DPV_pointer	parent_data,
+							DPC_plot*	plot)	{
+		long	pdata	=	(long)parent_data;
+		const	char	*temp_cstr;
+
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"PLOT	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"parent	data:	"	<<	pdata	<<	endl;
+		cout	<<	"Plot	title:	"	<<	plot->getTitle()	<<	endl;
+		cout.flush();
+		cout	<<	"Number	of	Curves:	"	<<	plot->getNumCurves()	<<	endl;
+		cout.flush();
+		cout	<<	"X-axis	label:	"	<<	plot->getXLabel()	<<	endl;
+		cout.flush();
+		cout	<<	"Y-axis	label:	"	<<	plot->getYLabel()	<<	endl;
+		cout.flush();
+
+		if	((temp_cstr	=	plot->getAttribute("xmin"))	!=	NULL)	{
+				cout	<<	"Attribute	xmin:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("xmax"))	!=	NULL)	{
+				cout	<<	"Attribute	xmax:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("ymin"))	!=	NULL)	{
+				cout	<<	"Attribute	ymin:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("ymax"))	!=	NULL)	{
+				cout	<<	"Attribute	ymax:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("grid"))	!=	NULL)	{
+				cout	<<	"Attribute	grid:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("grid_color"))	!=	NULL)	{
+				cout	<<	"Attribute	grid_color:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("foreground_color"))	!=	NULL)	{
+				cout	<<	"Attribute	foreground_color:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("background_color"))	!=	NULL)	{
+				cout	<<	"Attribute	background_color:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	plot->getAttribute("font"))	!=	NULL)	{
+				cout	<<	"Attribute	font:	"	<<	temp_cstr	<<	endl;
+		}
+		return	(	(DPV_pointer)0x03333333	);
 }
 
-DPV_pointer test_view::create_table_view( DPV_pointer parent_data,
-                                          DPC_table  *table) {
-  int n_columns, colix;
-  int i,j;
-  double * values;
-  double time;
-
-  cout << "=====================" << endl;
-  cout << "TABLE VIEW." << endl;
-  cout << "=====================" << endl;
-
-  cout << "RUN Directory : " << table->getRunDir() << endl;
-  cout << "Title : " << table->getTitle() << endl;
-
-  n_columns = table->getNumColumns();
-  cout << "Number of Columns : " << n_columns << endl;
-
-  for (colix=0; colix < n_columns ; colix++) {
-    const char *col_label = table->getColumnLabel( colix).c_str();
-    const char *var_name = table->getColumnVarName( colix);
-    const char *col_units = table->getColumnUnits( colix);
-    const char *format = table->getColumnAttribute( colix,"format");
-
-    if (col_label != NULL) {
-      cout << "Column Label[" << colix << "]: " << col_label << endl;
-    }
-    if (var_name != NULL) {
-      cout << "Variable Name[" << colix << "]: " << var_name << endl;
-    }
-    if (col_units != NULL) {
-      cout << "Column Units[" << colix << "]: " << col_units << endl;
-    }
-    if (format != NULL) {
-      cout << "format [" << colix << "]: " << format << endl;
-    }
-  }
-
-  values = new double[n_columns];
-
-  for (i=0; i<5 ; i++) {
-       if ( table->getRow(&time, values)) {
-            cout << "time: " << time ;
-            for (j=0; j<n_columns ; j++) {
-                 cout << " " << values[j];
-            }
-            cout << endl;
-       }
-  }
-
-// To test begin() Re-initialize the values, begin() and doing it again.
-  cout << "The following 5 lines should be the same as the previous 5 lines." << endl;
-  for (i=0; i<5 ; i++) { values[i] = 0.0; }
-  table->begin();
-  for (i=0; i<5 ; i++) {
-       if ( table->getRow(&time, values)) {
-            cout << "time: " << time ;
-            for (j=0; j<n_columns ; j++) {
-                 cout << " " << values[j];
-            }
-            cout << endl;
-       }
-  }
-
-  return ( (DPV_pointer)0x03333333 );
+DPV_pointer	test_view::create_table_view(	DPV_pointer	parent_data,
+																																										DPC_table		*table)	{
+		int	n_columns,	colix;
+		int	i,j;
+		double	*	values;
+		double	time;
+
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"TABLE	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+
+		cout	<<	"RUN	Directory	:	"	<<	table->getRunDir()	<<	endl;
+		cout	<<	"Title	:	"	<<	table->getTitle()	<<	endl;
+
+		n_columns	=	table->getNumColumns();
+		cout	<<	"Number	of	Columns	:	"	<<	n_columns	<<	endl;
+
+		for	(colix=0;	colix	<	n_columns	;	colix++)	{
+				const	char	*col_label	=	table->getColumnLabel(	colix).c_str();
+				const	char	*var_name	=	table->getColumnVarName(	colix);
+				const	char	*col_units	=	table->getColumnUnits(	colix);
+				const	char	*format	=	table->getColumnAttribute(	colix,"format");
+
+				if	(col_label	!=	NULL)	{
+						cout	<<	"Column	Label["	<<	colix	<<	"]:	"	<<	col_label	<<	endl;
+				}
+				if	(var_name	!=	NULL)	{
+						cout	<<	"Variable	Name["	<<	colix	<<	"]:	"	<<	var_name	<<	endl;
+				}
+				if	(col_units	!=	NULL)	{
+						cout	<<	"Column	Units["	<<	colix	<<	"]:	"	<<	col_units	<<	endl;
+				}
+				if	(format	!=	NULL)	{
+						cout	<<	"format	["	<<	colix	<<	"]:	"	<<	format	<<	endl;
+				}
+		}
+
+		values	=	new	double[n_columns];
+
+		for	(i=0;	i<5	;	i++)	{
+							if	(	table->getRow(&time,	values))	{
+												cout	<<	"time:	"	<<	time	;
+												for	(j=0;	j<n_columns	;	j++)	{
+																	cout	<<	"	"	<<	values[j];
+												}
+												cout	<<	endl;
+							}
+		}
+
+//	To	test	begin()	Re-initialize	the	values,	begin()	and	doing	it	again.
+		cout	<<	"The	following	5	lines	should	be	the	same	as	the	previous	5	lines."	<<	endl;
+		for	(i=0;	i<5	;	i++)	{	values[i]	=	0.0;	}
+		table->begin();
+		for	(i=0;	i<5	;	i++)	{
+							if	(	table->getRow(&time,	values))	{
+												cout	<<	"time:	"	<<	time	;
+												for	(j=0;	j<n_columns	;	j++)	{
+																	cout	<<	"	"	<<	values[j];
+												}
+												cout	<<	endl;
+							}
+		}
+
+		return	(	(DPV_pointer)0x03333333	);
 }
 
-DPV_pointer test_view::create_curve_view( DPV_pointer parent_data,
-					   DPC_curve* curve) {
-  int i;
-  long pdata = (long)parent_data;
-  const char *temp_cstr;
-
-  cout << "=====================" << endl;
-  cout << "CURVE VIEW." << endl;
-  cout << "=====================" << endl;
-  cout << "parent data: " << pdata << endl;
-  cout << "X Var Name: " << curve->getXVarName() << endl;
-  cout.flush();
-  cout << "Y Var Name: " << curve->getYVarName() << endl;
-  cout.flush();
-  cout << "X Units: " << curve->getXUnits() << endl;
-  cout.flush();
-  cout << "Y Units: " << curve->getYUnits() << endl;
-  cout.flush();
-  cout << "RUN Directory: " << curve->getDataSrcLbl() << endl;
-  cout.flush();
-
-  if ((temp_cstr = curve->getXAttribute("min")) != NULL) {
-    cout << "Attribute min: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getXAttribute("max")) != NULL) {
-    cout << "Attribute max: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getXAttribute("symbol_style")) != NULL) {
-    cout << "Attribute symbol_style: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getXAttribute("symbol_size")) != NULL) {
-    cout << "Attribute symbol_size: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getXAttribute("line_style")) != NULL) {
-    cout << "Attribute line_style: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getXAttribute("line_color")) != NULL) {
-    cout << "Attribute line_color: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("min")) != NULL) {
-    cout << "Attribute min: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("max")) != NULL) {
-    cout << "Attribute max: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("symbol_style")) != NULL) {
-    cout << "Attribute symbol_style: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("symbol_size")) != NULL) {
-    cout << "Attribute symbol_size: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("line_style")) != NULL) {
-    cout << "Attribute line_style: " << temp_cstr << endl;
-  }
-  if ((temp_cstr = curve->getYAttribute("line_color")) != NULL) {
-    cout << "Attribute line_color: " << temp_cstr << endl;
-  }
-
-  cout << "First 10 points:" << endl;
-  cout.flush();
-  for (i=0 ; i < 10 ; i++) {
-    double x, y;
-    if (curve->getXY(&x, &y) ) {
-      cout << "<" << x << "," << y << ">[" << i << "]" << endl;
-      cout.flush();
-    }
-  }
-
-  return ( (DPV_pointer)0x04444444 );
+DPV_pointer	test_view::create_curve_view(	DPV_pointer	parent_data,
+								DPC_curve*	curve)	{
+		int	i;
+		long	pdata	=	(long)parent_data;
+		const	char	*temp_cstr;
+
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"CURVE	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"parent	data:	"	<<	pdata	<<	endl;
+		cout	<<	"X	Var	Name:	"	<<	curve->getXVarName()	<<	endl;
+		cout.flush();
+		cout	<<	"Y	Var	Name:	"	<<	curve->getYVarName()	<<	endl;
+		cout.flush();
+		cout	<<	"X	Units:	"	<<	curve->getXUnits()	<<	endl;
+		cout.flush();
+		cout	<<	"Y	Units:	"	<<	curve->getYUnits()	<<	endl;
+		cout.flush();
+		cout	<<	"RUN	Directory:	"	<<	curve->getDataSrcLbl()	<<	endl;
+		cout.flush();
+
+		if	((temp_cstr	=	curve->getXAttribute("min"))	!=	NULL)	{
+				cout	<<	"Attribute	min:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getXAttribute("max"))	!=	NULL)	{
+				cout	<<	"Attribute	max:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getXAttribute("symbol_style"))	!=	NULL)	{
+				cout	<<	"Attribute	symbol_style:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getXAttribute("symbol_size"))	!=	NULL)	{
+				cout	<<	"Attribute	symbol_size:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getXAttribute("line_style"))	!=	NULL)	{
+				cout	<<	"Attribute	line_style:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getXAttribute("line_color"))	!=	NULL)	{
+				cout	<<	"Attribute	line_color:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("min"))	!=	NULL)	{
+				cout	<<	"Attribute	min:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("max"))	!=	NULL)	{
+				cout	<<	"Attribute	max:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("symbol_style"))	!=	NULL)	{
+				cout	<<	"Attribute	symbol_style:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("symbol_size"))	!=	NULL)	{
+				cout	<<	"Attribute	symbol_size:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("line_style"))	!=	NULL)	{
+				cout	<<	"Attribute	line_style:	"	<<	temp_cstr	<<	endl;
+		}
+		if	((temp_cstr	=	curve->getYAttribute("line_color"))	!=	NULL)	{
+				cout	<<	"Attribute	line_color:	"	<<	temp_cstr	<<	endl;
+		}
+
+		cout	<<	"First	10	points:"	<<	endl;
+		cout.flush();
+		for	(i=0	;	i	<	10	;	i++)	{
+				double	x,	y;
+				if	(curve->getXY(&x,	&y)	)	{
+						cout	<<	"<"	<<	x	<<	","	<<	y	<<	">["	<<	i	<<	"]"	<<	endl;
+						cout.flush();
+				}
+		}
+
+		return	(	(DPV_pointer)0x04444444	);
 }
 
-void test_view::finalize_product_view( DPV_pointer product_view ) {
-  cout << "=====================" << endl;
-  cout << "FINALIZE PRODUCT VIEW." << endl;
-  cout << "=====================" << endl;
-  cout.flush();
+void	test_view::finalize_product_view(	DPV_pointer	product_view	)	{
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"FINALIZE	PRODUCT	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+		cout.flush();
 
 }
 
-void test_view::finalize_page_view( DPV_pointer page_view ) {
-  cout << "=====================" << endl;
-  cout << "FINALIZE PAGE VIEW." << endl;
-  cout << "=====================" << endl;
-  cout.flush();
+void	test_view::finalize_page_view(	DPV_pointer	page_view	)	{
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"FINALIZE	PAGE	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+		cout.flush();
 }
 
-void test_view::finalize_plot_view( DPV_pointer plot_view ) {
-  cout << "=====================" << endl;
-  cout << "FINALIZE PLOT VIEW." << endl;
-  cout << "=====================" << endl;
-  cout.flush();
+void	test_view::finalize_plot_view(	DPV_pointer	plot_view	)	{
+		cout	<<	"====================="	<<	endl;
+		cout	<<	"FINALIZE	PLOT	VIEW."	<<	endl;
+		cout	<<	"====================="	<<	endl;
+		cout.flush();
 }
diff --git a/trick_source/data_products/DPX/TESTING/DPM_TEST/model_test.cpp b/trick_source/data_products/DPX/TESTING/DPM_TEST/model_test.cpp
index a6ceaa138..582ade3f7 100644
--- a/trick_source/data_products/DPX/TESTING/DPM_TEST/model_test.cpp
+++ b/trick_source/data_products/DPX/TESTING/DPM_TEST/model_test.cpp
@@ -1,41 +1,41 @@
-#include <stdio.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include "DPM/DPM_product.hh"
-
-
-int main(int argc, char * argv[] ) {
-     xmlParserCtxtPtr parser_context;
-     xmlDocPtr doc;
-     xmlNode *root_node;
-     DPM_product *product;
-
-     if (argc != 2) {
-          fprintf(stderr,"I need a filename.\n");
-          fflush(stderr);
-          return (1);
-     }
-
-     LIBXML_TEST_VERSION
-     if ((parser_context = xmlNewParserCtxt()) == NULL) {
-          fprintf(stderr,"Out of Memory\n");
-     }
-     doc = xmlCtxtReadFile( parser_context, argv[1], NULL, XML_PARSE_DTDVALID );
-     if (doc == NULL) {
-          fprintf(stderr,"Failed to parse \"%s\"\n",argv[1]);
-     } else if (parser_context->valid == 0) {
-          fprintf(stderr,"Failed to validate \"%s\"\n",argv[1]);
-          xmlFreeDoc(doc);
-     }
-     xmlFreeParserCtxt(parser_context);
-
-     root_node = xmlDocGetRootElement(doc);
-
-     if ((product = new DPM_product( NULL, root_node)) == NULL ) {
-          fprintf(stderr,"Failed to create a DPM_product.\n");
-     }
-
-     std::cout << product;
-
-     return 0;
+#include	<stdio.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
+#include	"DPM/DPM_product.hh"
+
+
+int	main(int	argc,	char	*	argv[]	)	{
+					xmlParserCtxtPtr	parser_context;
+					xmlDocPtr	doc;
+					xmlNode	*root_node;
+					DPM_product	*product;
+
+					if	(argc	!=	2)	{
+										fprintf(stderr,"I	need	a	filename.\n");
+										fflush(stderr);
+										return	(1);
+					}
+
+					LIBXML_TEST_VERSION
+					if	((parser_context	=	xmlNewParserCtxt())	==	NULL)	{
+										fprintf(stderr,"Out	of	Memory\n");
+					}
+					doc	=	xmlCtxtReadFile(	parser_context,	argv[1],	NULL,	XML_PARSE_DTDVALID	);
+					if	(doc	==	NULL)	{
+										fprintf(stderr,"Failed	to	parse	\"%s\"\n",argv[1]);
+					}	else	if	(parser_context->valid	==	0)	{
+										fprintf(stderr,"Failed	to	validate	\"%s\"\n",argv[1]);
+										xmlFreeDoc(doc);
+					}
+					xmlFreeParserCtxt(parser_context);
+
+					root_node	=	xmlDocGetRootElement(doc);
+
+					if	((product	=	new	DPM_product(	NULL,	root_node))	==	NULL	)	{
+										fprintf(stderr,"Failed	to	create	a	DPM_product.\n");
+					}
+
+					std::cout	<<	product;
+
+					return	0;
 }
diff --git a/trick_source/data_products/DPX/TESTING/DS/dstest.cpp b/trick_source/data_products/DPX/TESTING/DS/dstest.cpp
index ff4d78724..21a071a13 100644
--- a/trick_source/data_products/DPX/TESTING/DS/dstest.cpp
+++ b/trick_source/data_products/DPX/TESTING/DS/dstest.cpp
@@ -1,29 +1,29 @@
 
-#include "trick_utils/units/include/Unit.hh"
-#include "Log/DataStream.hh"
-#include "Log/DataStreamFactory.hh"
+#include	"trick_utils/units/include/Unit.hh"
+#include	"Log/DataStream.hh"
+#include	"Log/DataStreamFactory.hh"
 
-#include "DS_exercisor/DS_exercisor.hh"
+#include	"DS_exercisor/DS_exercisor.hh"
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-using namespace std;
+using	namespace	std;
 
-int main( int argc, char* argv[]) {
+int	main(	int	argc,	char*	argv[])	{
 
-  DataStreamFactory* data_stream_factory;
-  DataStream* testds;
-  DS_exercisor *exercisor;
+		DataStreamFactory*	data_stream_factory;
+		DataStream*	testds;
+		DS_exercisor	*exercisor;
 
-  char* RUN_dir = "../TEST_DATA";
-  char* VarName = "sun_predictor.sun.solar_azimuth";
+		char*	RUN_dir	=	"../TEST_DATA";
+		char*	VarName	=	"sun_predictor.sun.solar_azimuth";
 
-  data_stream_factory = new DataStreamFactory();
-  testds = data_stream_factory->create(RUN_dir, VarName, NULL);
+		data_stream_factory	=	new	DataStreamFactory();
+		testds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
 
-  exercisor = new DS_exercisor (testds);
-  exercisor->run();
+		exercisor	=	new	DS_exercisor	(testds);
+		exercisor->run();
 
-  return (0);
+		return	(0);
 }
diff --git a/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp b/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
index 056ebb01e..05cd76b97 100644
--- a/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
+++ b/trick_source/data_products/DPX/TESTING/DS_exercisor/DS_exercisor.cpp
@@ -1,82 +1,82 @@
-#include "DS_exercisor.hh"
+#include	"DS_exercisor.hh"
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-using namespace std;
+using	namespace	std;
 
-int DS_exercisor::run() {
+int	DS_exercisor::run()	{
 
-  int ch, done;
-  int ret;
-  double time, value;
-  string dsfilename, unitspec, timeunitspec;
+		int	ch,	done;
+		int	ret;
+		double	time,	value;
+		string	dsfilename,	unitspec,	timeunitspec;
 
-  cout << "DataStream Exercisor" << endl;
-  cout << "Type \"?\" for help." << endl;
+		cout	<<	"DataStream	Exercisor"	<<	endl;
+		cout	<<	"Type	\"?\"	for	help."	<<	endl;
 
-  done = 0;
-  while (!done) {
-    ch = getc(stdin);
-    switch (ch) {
-    case '?' : {
-      cout << "=== COMMANDS ===" << endl;
-      cout << "? -> help"        << endl;
-      cout << "! -> quit"        << endl;
-      cout << "g -> get"         << endl;
-      cout << "p -> peek"        << endl;
-      cout << "f -> getFileName" << endl;
-      cout << "u -> getUnit"     << endl;
-      cout << "t -> getTimeUnit" << endl;
-      cout << "b -> begin"       << endl;
-      cout << "e -> end"         << endl;
-      cout << "s -> step"        << endl;
-      cout << "================" << endl;
-    } break;
-    case '!' : {
-      cout << "================" << endl;
-      cout << "==  Quitting  ==" << endl;
-      cout << "================" << endl;
-      done = 1;
-    } break;
-    case 'g' : {
-      ret = testds->get(&time, &value);
-      cout << "get :" << "time = " << time  << "     " << "value= " << value << endl;
-      cout << "     " << "ret= " << ret << endl;
-    } break;
-    case 'p' : {
-      ret = testds->peek(&time, &value);
-      cout << "peek:" << "time = " << time  << "     " << "value= " << value << endl;
-      cout << "     " << "ret= " << ret << endl;
-    } break;
-    case 'f' : {
-      dsfilename = testds->getFileName();
-      cout << "getFileName:" << "filename= " << "\"" << dsfilename << "\"" << endl;
-    } break;
-    case 'u' : {
-      unitspec = testds->getUnit();
-      cout << "getUnit:" << "unitspec= " << "\"" << unitspec << "\"" << endl;
-    } break;
-    case 't' : {
-      timeunitspec = testds->getTimeUnit();
-      cout << "getTimeUnit:" << "timeunitspec= " << "\"" << timeunitspec << "\"" << endl;
-    } break;
-    case 'b' : {
-      testds->begin();
-      cout << "begin" << endl;
-    } break;
-    case 'e' : {
-      testds->end();
-      cout << "end" << endl;
-    } break;
-    case 's' : {
-      testds->step();
-      cout << "step" << endl;
-    } break;
-    default : {
-    }
-    }
-  }
-  return (0);
+		done	=	0;
+		while	(!done)	{
+				ch	=	getc(stdin);
+				switch	(ch)	{
+				case	'?'	:	{
+						cout	<<	"===	COMMANDS	==="	<<	endl;
+						cout	<<	"?	->	help"								<<	endl;
+						cout	<<	"!	->	quit"								<<	endl;
+						cout	<<	"g	->	get"									<<	endl;
+						cout	<<	"p	->	peek"								<<	endl;
+						cout	<<	"f	->	getFileName"	<<	endl;
+						cout	<<	"u	->	getUnit"					<<	endl;
+						cout	<<	"t	->	getTimeUnit"	<<	endl;
+						cout	<<	"b	->	begin"							<<	endl;
+						cout	<<	"e	->	end"									<<	endl;
+						cout	<<	"s	->	step"								<<	endl;
+						cout	<<	"================"	<<	endl;
+				}	break;
+				case	'!'	:	{
+						cout	<<	"================"	<<	endl;
+						cout	<<	"==		Quitting		=="	<<	endl;
+						cout	<<	"================"	<<	endl;
+						done	=	1;
+				}	break;
+				case	'g'	:	{
+						ret	=	testds->get(&time,	&value);
+						cout	<<	"get	:"	<<	"time	=	"	<<	time		<<	"					"	<<	"value=	"	<<	value	<<	endl;
+						cout	<<	"					"	<<	"ret=	"	<<	ret	<<	endl;
+				}	break;
+				case	'p'	:	{
+						ret	=	testds->peek(&time,	&value);
+						cout	<<	"peek:"	<<	"time	=	"	<<	time		<<	"					"	<<	"value=	"	<<	value	<<	endl;
+						cout	<<	"					"	<<	"ret=	"	<<	ret	<<	endl;
+				}	break;
+				case	'f'	:	{
+						dsfilename	=	testds->getFileName();
+						cout	<<	"getFileName:"	<<	"filename=	"	<<	"\""	<<	dsfilename	<<	"\""	<<	endl;
+				}	break;
+				case	'u'	:	{
+						unitspec	=	testds->getUnit();
+						cout	<<	"getUnit:"	<<	"unitspec=	"	<<	"\""	<<	unitspec	<<	"\""	<<	endl;
+				}	break;
+				case	't'	:	{
+						timeunitspec	=	testds->getTimeUnit();
+						cout	<<	"getTimeUnit:"	<<	"timeunitspec=	"	<<	"\""	<<	timeunitspec	<<	"\""	<<	endl;
+				}	break;
+				case	'b'	:	{
+						testds->begin();
+						cout	<<	"begin"	<<	endl;
+				}	break;
+				case	'e'	:	{
+						testds->end();
+						cout	<<	"end"	<<	endl;
+				}	break;
+				case	's'	:	{
+						testds->step();
+						cout	<<	"step"	<<	endl;
+				}	break;
+				default	:	{
+				}
+				}
+		}
+		return	(0);
 }
 
diff --git a/trick_source/data_products/DPX/TESTING/TCDS/tcdstest.cpp b/trick_source/data_products/DPX/TESTING/TCDS/tcdstest.cpp
index 35685c3bb..b57b5dd5c 100644
--- a/trick_source/data_products/DPX/TESTING/TCDS/tcdstest.cpp
+++ b/trick_source/data_products/DPX/TESTING/TCDS/tcdstest.cpp
@@ -1,39 +1,39 @@
 
-#include "trick_utils/units/include/Unit.hh"
-#include "data_products/Log/DataStream.hh"
-#include "data_products/Log/DataStreamFactory.hh"
+#include	"trick_utils/units/include/Unit.hh"
+#include	"data_products/Log/DataStream.hh"
+#include	"data_products/Log/DataStreamFactory.hh"
 
-#include "DPC/DPC_TimeCstrDataStream.hh"
-#include "DPM/DPM_time_constraints.hh"
-#include "DS_exercisor/DS_exercisor.hh"
+#include	"DPC/DPC_TimeCstrDataStream.hh"
+#include	"DPM/DPM_time_constraints.hh"
+#include	"DS_exercisor/DS_exercisor.hh"
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-using namespace std;
+using	namespace	std;
 
-int main( int argc, char* argv[]) {
+int	main(	int	argc,	char*	argv[])	{
 
-  DPM_time_constraints *time_constraints;
-  DataStreamFactory* data_stream_factory;
-  DataStream* testds;
-  DataStream* srcds;
-  DS_exercisor *exercisor;
+		DPM_time_constraints	*time_constraints;
+		DataStreamFactory*	data_stream_factory;
+		DataStream*	testds;
+		DataStream*	srcds;
+		DS_exercisor	*exercisor;
 
-  char* RUN_dir = "../TEST_DATA";
-  char* VarName = "sun_predictor.sun.solar_azimuth";
+		char*	RUN_dir	=	"../TEST_DATA";
+		char*	VarName	=	"sun_predictor.sun.solar_azimuth";
 
-  data_stream_factory = new DataStreamFactory();
-  srcds = data_stream_factory->create(RUN_dir, VarName, NULL);
+		data_stream_factory	=	new	DataStreamFactory();
+		srcds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
 
-  time_constraints = new DPM_time_constraints(0.0,     // Start time in seconds.
-                                              5.0,     // Stop time in seconds
-                                              50.0);   // Max Frequency in Hertz
+		time_constraints	=	new	DPM_time_constraints(0.0,					//	Start	time	in	seconds.
+																																														5.0,					//	Stop	time	in	seconds
+																																														50.0);			//	Max	Frequency	in	Hertz
 
-  testds = new DPC_TimeCstrDataStream(srcds, time_constraints);
+		testds	=	new	DPC_TimeCstrDataStream(srcds,	time_constraints);
 
-  exercisor = new DS_exercisor (testds);
-  exercisor->run();
+		exercisor	=	new	DS_exercisor	(testds);
+		exercisor->run();
 
-  return (0);
+		return	(0);
 }
diff --git a/trick_source/data_products/DPX/TESTING/UDS/udstest.cpp b/trick_source/data_products/DPX/TESTING/UDS/udstest.cpp
index 2f9bc37bc..baa85e42c 100644
--- a/trick_source/data_products/DPX/TESTING/UDS/udstest.cpp
+++ b/trick_source/data_products/DPX/TESTING/UDS/udstest.cpp
@@ -1,32 +1,32 @@
 
-#include "trick_utils/units/include/Unit.hh"
-#include "data_products/Log/DataStream.hh"
-#include "data_products/Log/DataStreamFactory.hh"
+#include	"trick_utils/units/include/Unit.hh"
+#include	"data_products/Log/DataStream.hh"
+#include	"data_products/Log/DataStreamFactory.hh"
 
-#include "DPC/DPC_UnitConvDataStream.hh"
-#include "DS_exercisor/DS_exercisor.hh"
+#include	"DPC/DPC_UnitConvDataStream.hh"
+#include	"DS_exercisor/DS_exercisor.hh"
 
-#include <iostream>
-#include <string>
+#include	<iostream>
+#include	<string>
 
-using namespace std;
+using	namespace	std;
 
-int main( int argc, char* argv[]) {
+int	main(	int	argc,	char*	argv[])	{
 
-  DataStreamFactory* data_stream_factory;
-  DataStream* testds;
-  DataStream* srcds;
-  DS_exercisor *exercisor;
+		DataStreamFactory*	data_stream_factory;
+		DataStream*	testds;
+		DataStream*	srcds;
+		DS_exercisor	*exercisor;
 
-  char* RUN_dir = "../TEST_DATA";
-  char* VarName = "sun_predictor.sun.solar_azimuth";
+		char*	RUN_dir	=	"../TEST_DATA";
+		char*	VarName	=	"sun_predictor.sun.solar_azimuth";
 
-  data_stream_factory = new DataStreamFactory();
-  srcds = data_stream_factory->create(RUN_dir, VarName, NULL);
+		data_stream_factory	=	new	DataStreamFactory();
+		srcds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
 
-  testds = new DPC_UnitConvDataStream(srcds, "d", "r");
+		testds	=	new	DPC_UnitConvDataStream(srcds,	"d",	"r");
 
-  exercisor = new DS_exercisor (testds);
-  exercisor->run();
+		exercisor	=	new	DS_exercisor	(testds);
+		exercisor->run();
 
 }
diff --git a/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp b/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
index 71bea4e03..fa9a4d313 100644
--- a/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DPC_test.cpp
@@ -1,934 +1,934 @@
-#define protected public
+#define	protected	public
 
-#include <stdio.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <string.h>
-#include "DPC/DPC_product.hh"
-#include "DPM/DPM_parse_tree.hh"
-#include "DPM/DPM_session.hh"
-#include "test_view.hh"
+#include	<stdio.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
+#include	<string.h>
+#include	"DPC/DPC_product.hh"
+#include	"DPM/DPM_parse_tree.hh"
+#include	"DPM/DPM_session.hh"
+#include	"test_view.hh"
 
-#include "gtest/gtest.h"
-//#include "trick_utils/reqs/include/RequirementScribe.hh"
+#include	"gtest/gtest.h"
+//#include	"trick_utils/reqs/include/RequirementScribe.hh"
 
-namespace Trick {
+namespace	Trick	{
 
-class DPCTest : public ::testing::Test {
-    protected:
-        //Trick::RequirementScribe req;
-        std::string testxml[15];
+class	DPCTest	:	public	::testing::Test	{
+				protected:
+								//Trick::RequirementScribe	req;
+								std::string	testxml[15];
 
-        DPCTest() {}
-        ~DPCTest() {}
-        virtual void SetUp();
-        virtual void TearDown();
+								DPCTest()	{}
+								~DPCTest()	{}
+								virtual	void	SetUp();
+								virtual	void	TearDown();
 
-		std::string parseDPCData(const char* name);
+		std::string	parseDPCData(const	char*	name);
 };
 
-void DPCTest::SetUp() {
-	testxml[0]  = "../TEST_DATA/session_1_1.xml";
-	testxml[1]  = "../TEST_DATA/session_1_2.xml";
-    testxml[2]  = "../TEST_DATA/session_2_1.xml";
-    testxml[3]  = "../TEST_DATA/session_3_1.xml";
-    testxml[4]  = "../TEST_DATA/session_4_1.xml";
-    testxml[5]  = "../TEST_DATA/session_5_1.xml";
-    testxml[6]  = "../TEST_DATA/session_6_1.xml";
-    testxml[7]  = "../TEST_DATA/session_7_1.xml";
-    testxml[8]  = "../TEST_DATA/session_8_1.xml";
-	testxml[9]  = "../TEST_DATA/session_8_2.xml";
-    testxml[10] = "../TEST_DATA/session_9_1.xml";
-    testxml[11] = "../TEST_DATA/session_9_2.xml";
-    testxml[12] = "../TEST_DATA/session_9_3.xml";
-    testxml[13] = "../TEST_DATA/session_testview.xml";
-	testxml[14] = "../TEST_DATA/session_invDTD.xml";
+void	DPCTest::SetUp()	{
+	testxml[0]		=	"../TEST_DATA/session_1_1.xml";
+	testxml[1]		=	"../TEST_DATA/session_1_2.xml";
+				testxml[2]		=	"../TEST_DATA/session_2_1.xml";
+				testxml[3]		=	"../TEST_DATA/session_3_1.xml";
+				testxml[4]		=	"../TEST_DATA/session_4_1.xml";
+				testxml[5]		=	"../TEST_DATA/session_5_1.xml";
+				testxml[6]		=	"../TEST_DATA/session_6_1.xml";
+				testxml[7]		=	"../TEST_DATA/session_7_1.xml";
+				testxml[8]		=	"../TEST_DATA/session_8_1.xml";
+	testxml[9]		=	"../TEST_DATA/session_8_2.xml";
+				testxml[10]	=	"../TEST_DATA/session_9_1.xml";
+				testxml[11]	=	"../TEST_DATA/session_9_2.xml";
+				testxml[12]	=	"../TEST_DATA/session_9_3.xml";
+				testxml[13]	=	"../TEST_DATA/session_testview.xml";
+	testxml[14]	=	"../TEST_DATA/session_invDTD.xml";
 }
 
-void DPCTest::TearDown() {}
-
-int strcmp_IgnoringWhiteSpace(const char* s1, const char* s2) {
-    int i1 = 0;
-    int i2 = 0;
-
-    while (1) {
-	    while ( !isgraph( s1[i1] ) && s1[i1] != '\0') { i1++; }
-        while ( !isgraph( s2[i2] ) && s2[i2] != '\0') { i2++; }
-        if ( s1[i1] == '\0' && s2[i2] == '\0') { return 0; }
-        if ( s1[i1] != s2[i2]) {
-            if (s1[i1] < s2[i2]) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        i1++; i2++;
-    }
+void	DPCTest::TearDown()	{}
+
+int	strcmp_IgnoringWhiteSpace(const	char*	s1,	const	char*	s2)	{
+				int	i1	=	0;
+				int	i2	=	0;
+
+				while	(1)	{
+					while	(	!isgraph(	s1[i1]	)	&&	s1[i1]	!=	'\0')	{	i1++;	}
+								while	(	!isgraph(	s2[i2]	)	&&	s2[i2]	!=	'\0')	{	i2++;	}
+								if	(	s1[i1]	==	'\0'	&&	s2[i2]	==	'\0')	{	return	0;	}
+								if	(	s1[i1]	!=	s2[i2])	{
+												if	(s1[i1]	<	s2[i2])	{
+																return	-1;
+												}	else	{
+																return	1;
+												}
+								}
+								i1++;	i2++;
+				}
 }
 
-std::string DPCTest::parseDPCData(const char* name) {
-    DPM_parse_tree *session_parse_tree;
-    xmlNode *root_node;
-    DPM_session *session;
-    const char *session_file_name;
-
-    vector <DPC_product*> product_list;
-
-    Test_view *view;
-
-    int n_product_files;
-    int product_ix;
-	std::stringstream output;
-
-	session_file_name = name;
-
-    //std::cout << "START CTRL TEST" << std::endl;
-    //std::cout << "NEW TEST VIEW" << std::endl;
-    view = new Test_view();
-
-    try {
-        session_parse_tree = new DPM_parse_tree(session_file_name);
-    } catch (std::invalid_argument) {
-        std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
-        exit(1);
-    }
-
-    root_node = session_parse_tree->getRootNode();
-
-    try {
-        session = new DPM_session( NULL, root_node );
-    } catch (std::invalid_argument) {
-        std::cerr << "ERROR: <session> specification is invalid and un-usable. Quitting." << std::endl;
-        exit(1);
-    }
-
-    delete session_parse_tree;
-
-    n_product_files = session->product_file_list.size();
-
-    for ( product_ix = 0; product_ix < n_product_files; product_ix++ ) {
-        DPC_product *product;
-        char tmp [50];
-        snprintf(tmp, sizeof(tmp), "../TEST_DATA/%s", session->product_file_list[product_ix]);
-        const char *product_file_name = tmp;
-
-        try {
-            //std::cout << "NEW DPC_PRODUCT" << std::endl;
-            product = new DPC_product( session, product_file_name );
-        } catch  ( std::invalid_argument ) {
-            std::cerr << "ERROR: Unable to create the product specified by file: \"" <<
-                product_file_name << "\"" << std::endl;
-            product = NULL;
-        }
-
-        if (product != NULL) {
-            product_list.push_back( product );
-
-            //std::cout << "RENDER VIEW" << std::endl;
-            product->render( view );
-			output << view->getOutput();
-        }
-    }
-    return output.str();
+std::string	DPCTest::parseDPCData(const	char*	name)	{
+				DPM_parse_tree	*session_parse_tree;
+				xmlNode	*root_node;
+				DPM_session	*session;
+				const	char	*session_file_name;
+
+				vector	<DPC_product*>	product_list;
+
+				Test_view	*view;
+
+				int	n_product_files;
+				int	product_ix;
+	std::stringstream	output;
+
+	session_file_name	=	name;
+
+				//std::cout	<<	"START	CTRL	TEST"	<<	std::endl;
+				//std::cout	<<	"NEW	TEST	VIEW"	<<	std::endl;
+				view	=	new	Test_view();
+
+				try	{
+								session_parse_tree	=	new	DPM_parse_tree(session_file_name);
+				}	catch	(std::invalid_argument)	{
+								std::cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	std::endl;
+								exit(1);
+				}
+
+				root_node	=	session_parse_tree->getRootNode();
+
+				try	{
+								session	=	new	DPM_session(	NULL,	root_node	);
+				}	catch	(std::invalid_argument)	{
+								std::cerr	<<	"ERROR:	<session>	specification	is	invalid	and	un-usable.	Quitting."	<<	std::endl;
+								exit(1);
+				}
+
+				delete	session_parse_tree;
+
+				n_product_files	=	session->product_file_list.size();
+
+				for	(	product_ix	=	0;	product_ix	<	n_product_files;	product_ix++	)	{
+								DPC_product	*product;
+								char	tmp	[50];
+								snprintf(tmp,	sizeof(tmp),	"../TEST_DATA/%s",	session->product_file_list[product_ix]);
+								const	char	*product_file_name	=	tmp;
+
+								try	{
+												//std::cout	<<	"NEW	DPC_PRODUCT"	<<	std::endl;
+												product	=	new	DPC_product(	session,	product_file_name	);
+								}	catch		(	std::invalid_argument	)	{
+												std::cerr	<<	"ERROR:	Unable	to	create	the	product	specified	by	file:	\""	<<
+																product_file_name	<<	"\""	<<	std::endl;
+												product	=	NULL;
+								}
+
+								if	(product	!=	NULL)	{
+												product_list.push_back(	product	);
+
+												//std::cout	<<	"RENDER	VIEW"	<<	std::endl;
+												product->render(	view	);
+			output	<<	view->getOutput();
+								}
+				}
+				return	output.str();
 }
 
-TEST_F(DPCTest, ValidateDTD) {
-    unsigned int i;
-    xmlParserCtxtPtr parser_context;
-    xmlDocPtr doc;
-
-    LIBXML_TEST_VERSION
-    if ((parser_context = xmlNewParserCtxt()) == NULL) {
-        fprintf(stderr,"Out of Memory\n");
-        exit(1);
-    }
-
-    for (i=0 ; i<(sizeof(testxml)/sizeof(testxml[0])) ; i++) {
-        doc = xmlCtxtReadFile(parser_context, testxml[i].c_str(), NULL, XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
-
-        if (i < 14) {
-            ASSERT_TRUE(parser_context->valid);
-        } else {
-            ASSERT_FALSE(parser_context->valid);
-        }
-        xmlFreeDoc(doc);
-    }
-    xmlFreeParserCtxt(parser_context);
+TEST_F(DPCTest,	ValidateDTD)	{
+				unsigned	int	i;
+				xmlParserCtxtPtr	parser_context;
+				xmlDocPtr	doc;
+
+				LIBXML_TEST_VERSION
+				if	((parser_context	=	xmlNewParserCtxt())	==	NULL)	{
+								fprintf(stderr,"Out	of	Memory\n");
+								exit(1);
+				}
+
+				for	(i=0	;	i<(sizeof(testxml)/sizeof(testxml[0]))	;	i++)	{
+								doc	=	xmlCtxtReadFile(parser_context,	testxml[i].c_str(),	NULL,	XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
+
+								if	(i	<	14)	{
+												ASSERT_TRUE(parser_context->valid);
+								}	else	{
+												ASSERT_FALSE(parser_context->valid);
+								}
+								xmlFreeDoc(doc);
+				}
+				xmlFreeParserCtxt(parser_context);
 }
 
-// Session 1_1
-TEST_F(DPCTest, VarvsTime_Binary) {
-	//req.add_requirement("2416241399 3201880761");
-
-	std::string tmp = parseDPCData(testxml[0].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"PAGE VIEW:		Attribute presentation: simple"
-
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"First 5 points:"
-		"<0,23.4391>[0] <1,23.4391>[1] <2,23.4391>[2]"
-		"<3,23.4391>[3] <4,23.4391>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"First 5 points:"
-		"<0,23.4391>[0] <1,23.4391>[1] <2,23.4391>[2]"
-		"<3,23.4391>[3] <4,23.4391>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	1_1
+TEST_F(DPCTest,	VarvsTime_Binary)	{
+	//req.add_requirement("2416241399	3201880761");
+
+	std::string	tmp	=	parseDPCData(testxml[0].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"PAGE	VIEW:		Attribute	presentation:	simple"
+
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"First	5	points:"
+		"<0,23.4391>[0]	<1,23.4391>[1]	<2,23.4391>[2]"
+		"<3,23.4391>[3]	<4,23.4391>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"First	5	points:"
+		"<0,23.4391>[0]	<1,23.4391>[1]	<2,23.4391>[2]"
+		"<3,23.4391>[3]	<4,23.4391>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 1_2
-TEST_F(DPCTest, VarvsTime_CSV) {
-	//req.add_requirement("2416241399 32631267");
-
-    std::string tmp = parseDPCData(testxml[1].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:		Attribute version: 1.0"
-		"PAGE VIEW:"
-		"Attribute presentation: stream"
-
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN_ASCII"
-		"First 5 points:"
-		"<0,14.0809>[0] <1,14.0809>[1] <2,14.0809>[2]"
-		"<3,14.0809>[3] <4,14.0809>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN_ASCII"
-		"First 5 points:"
-		"<0,14.0809>[0] <1,14.0809>[1] <2,14.0809>[2]"
-		"<3,14.0809>[3] <4,14.0809>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	1_2
+TEST_F(DPCTest,	VarvsTime_CSV)	{
+	//req.add_requirement("2416241399	32631267");
+
+				std::string	tmp	=	parseDPCData(testxml[1].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"PAGE	VIEW:"
+		"Attribute	presentation:	stream"
+
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN_ASCII"
+		"First	5	points:"
+		"<0,14.0809>[0]	<1,14.0809>[1]	<2,14.0809>[2]"
+		"<3,14.0809>[3]	<4,14.0809>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN_ASCII"
+		"First	5	points:"
+		"<0,14.0809>[0]	<1,14.0809>[1]	<2,14.0809>[2]"
+		"<3,14.0809>[3]	<4,14.0809>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 2_1
-TEST_F(DPCTest, SinglePlot) {
-    std::string tmp = parseDPCData(testxml[2].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"PAGE VIEW:		Attribute presentation: SIMPLE"
-
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: solar_azimuth	Y-axis label: solar_elevation"
-		"CURVE VIEW:"
-		"X Var Name: sun_predictor.sun.solar_azimuth	X Units: degree"
-		"Y Var Name: sun_predictor.sun.solar_elevation	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"First 5 points:"
-		"<353.673,-36.7426>[0] <353.678,-36.743>[1] <353.683,-36.7434>[2]"
-		"<353.688,-36.7438>[3] <353.692,-36.7442>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	2_1
+TEST_F(DPCTest,	SinglePlot)	{
+				std::string	tmp	=	parseDPCData(testxml[2].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"PAGE	VIEW:		Attribute	presentation:	SIMPLE"
+
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	solar_azimuth	Y-axis	label:	solar_elevation"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sun_predictor.sun.solar_azimuth	X	Units:	degree"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation	Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"First	5	points:"
+		"<353.673,-36.7426>[0]	<353.678,-36.743>[1]	<353.683,-36.7434>[2]"
+		"<353.688,-36.7438>[3]	<353.692,-36.7442>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
 
-// Session 3_1
-TEST_F(DPCTest, SingleTable) {
+//	Session	3_1
+TEST_F(DPCTest,	SingleTable)	{
 	//req.add_requirement("3667219994");
 
-    std::string tmp = parseDPCData(testxml[3].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-
-		"TABLE VIEW:"
-		"RUN Directory: ../TEST_DATA/RUN_BINARY"
-		"Number of Columns: 3"
-		"Column Label [0]: time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s"
-		"Column Label [1]: solar_azimuth"
-		"Variable Name[1]: sun_predictor.sun.solar_azimuth"
-		"Column Units [1]: degree"
-		"Column Label [2]: solar_elevation"
-		"Variable Name[2]: sun_predictor.sun.solar_elevation"
-		"Column Units [2]: degree"
-		"time: 0 values:  0 353.673 -36.7426"
-		"time: 1 values:  1 353.678 -36.743"
-		"time: 2 values:  2 353.683 -36.7434"
-		"time: 3 values:  3 353.688 -36.7438"
-		"time: 4 values:  4 353.692 -36.7442"
-		"FINALIZE TABLE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[3].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+
+		"TABLE	VIEW:"
+		"RUN	Directory:	../TEST_DATA/RUN_BINARY"
+		"Number	of	Columns:	3"
+		"Column	Label	[0]:	time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s"
+		"Column	Label	[1]:	solar_azimuth"
+		"Variable	Name[1]:	sun_predictor.sun.solar_azimuth"
+		"Column	Units	[1]:	degree"
+		"Column	Label	[2]:	solar_elevation"
+		"Variable	Name[2]:	sun_predictor.sun.solar_elevation"
+		"Column	Units	[2]:	degree"
+		"time:	0	values:		0	353.673	-36.7426"
+		"time:	1	values:		1	353.678	-36.743"
+		"time:	2	values:		2	353.683	-36.7434"
+		"time:	3	values:		3	353.688	-36.7438"
+		"time:	4	values:		4	353.692	-36.7442"
+		"FINALIZE	TABLE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 4_1
-TEST_F(DPCTest, PlotAttr_Binary) {
-    std::string tmp = parseDPCData(testxml[4].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"Product title: Solar Elevation"
-		"PAGE VIEW:		Page title: Solar Elevation for a Day"
-		"Attribute presentation: SIMPLE"
-
-		"PLOT VIEW:		Plot title: Sun Elevation vs. Time"
-		"Number of Curves: 1"
-		"X-axis label: Time		Y-axis label: Elevation"
-		"Attribute grid:			 yes"
-		"Attribute grid_color: 		 blue"
-		"Attribute background_color: #eef0ff"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time					X Units: s"
-		"Y Var Name: sun_predictor.sun.solar_elevation	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_style: dash"
-		"Attribute y line_color: red"
-		"First 5 points:"
-		"<0,-36.7426>[0] <1,-36.743> [1] <2,-36.7434>[2]"
-		"<3,-36.7438>[3] <4,-36.7442>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	4_1
+TEST_F(DPCTest,	PlotAttr_Binary)	{
+				std::string	tmp	=	parseDPCData(testxml[4].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"Product	title:	Solar	Elevation"
+		"PAGE	VIEW:		Page	title:	Solar	Elevation	for	a	Day"
+		"Attribute	presentation:	SIMPLE"
+
+		"PLOT	VIEW:		Plot	title:	Sun	Elevation	vs.	Time"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Time		Y-axis	label:	Elevation"
+		"Attribute	grid:				yes"
+		"Attribute	grid_color:				blue"
+		"Attribute	background_color:	#eef0ff"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation	Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_style:	dash"
+		"Attribute	y	line_color:	red"
+		"First	5	points:"
+		"<0,-36.7426>[0]	<1,-36.743>	[1]	<2,-36.7434>[2]"
+		"<3,-36.7438>[3]	<4,-36.7442>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 5_1
-/* This session is based on product_5.xml which has 3 dimensional plotting schematic.
- * DPV currently only supports 2D plots.
- */
-TEST_F(DPCTest, 3DProduct_2DPlot) {
+//	Session	5_1
+/*	This	session	is	based	on	product_5.xml	which	has	3	dimensional	plotting	schematic.
+	*	DPV	currently	only	supports	2D	plots.
+	*/
+TEST_F(DPCTest,	3DProduct_2DPlot)	{
 	//req.add_requirement("2469402355");
 
-    std::string tmp = parseDPCData(testxml[5].c_str());
-	//std::cout << tmp << std::endl;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"Product title: 			 title of the product"
-		"Attribute foreground_color: #000000"
-		"Attribute background_color: #ffffff"
-		"PAGE VIEW:		Page title:  Solar Elevation for a Day"
-		"Attribute foreground_color: #000000"
-		"Attribute background_color: #ffffff"
-		"Attribute vcells: 			 #000000"
-		"Attribute presentation: 	 SIMPLE"
-
-		"PLOT VIEW:		Plot title: Sun Time vs. Elevation vs. Azimuth"
-		"Number of Curves: 1"
-		"X-axis label: Azimuth		Y-axis label: Elevation"
-		"Attribute grid: 			 yes"
-		"Attribute foreground_color: #000000"
-		"Attribute background_color: #fffff0"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sun_predictor.sun.solar_azimuth	X Units: degree"
-		"Y Var Name: sun_predictor.sun.solar_elevation	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 	 #323200"
-		"First 5 points:"
-		"<353.673,-36.7426>[0] <353.678,-36.743>[1] <353.683,-36.7434>[2]"
-		"<353.688,-36.7438>[3] <353.692,-36.7442>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[5].c_str());
+	//std::cout	<<	tmp	<<	std::endl;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"Product	title:					title	of	the	product"
+		"Attribute	foreground_color:	#000000"
+		"Attribute	background_color:	#ffffff"
+		"PAGE	VIEW:		Page	title:		Solar	Elevation	for	a	Day"
+		"Attribute	foreground_color:	#000000"
+		"Attribute	background_color:	#ffffff"
+		"Attribute	vcells:					#000000"
+		"Attribute	presentation:			SIMPLE"
+
+		"PLOT	VIEW:		Plot	title:	Sun	Time	vs.	Elevation	vs.	Azimuth"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Azimuth		Y-axis	label:	Elevation"
+		"Attribute	grid:					yes"
+		"Attribute	foreground_color:	#000000"
+		"Attribute	background_color:	#fffff0"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sun_predictor.sun.solar_azimuth	X	Units:	degree"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation	Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<353.673,-36.7426>[0]	<353.678,-36.743>[1]	<353.683,-36.7434>[2]"
+		"<353.688,-36.7438>[3]	<353.692,-36.7442>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
 
-// Session 6_1
-TEST_F(DPCTest, Table_Attributes) {
-    std::string tmp = parseDPCData(testxml[6].c_str());
-	//std::cout << tmp << std::endl;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"Product title: Table of Sun Positions"
-
-		"TABLE VIEW:"
-		"RUN Directory: ../TEST_DATA/RUN_BINARY"
-		"Title: Sun Azimuth vs. Time"
-		"Number of Columns: 5"
-		"Column Label [0]: Time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s	format [0]: %24.10f"
-		"Column Label [1]: Azimuth"
-		"Variable Name[1]: sun_predictor.sun.solar_azimuth"
-		"Column Units [1]: degree	format [1]: %16.5q"
-		"Column Label [2]: Hours"
-		"Variable Name[2]: sys.exec.out.time"
-		"Column Units [2]: s	format [2]: %24.10f"
-        "Column Label [3]: Hours"
-        "Variable Name[3]: sys.exec.out.time"
-        "Column Units [3]: hr    format [3]: %24.10f"
-		"Column Label [4]: Elevation"
-		"Variable Name[4]: sun_predictor.sun.solar_elevation"
-		"Column Units [4]: degree	format [4]: %16.5f"
-		"time: 400 values:  400 355.576 400 0.111111 -36.8784"
-		"time: 401 values:  401 355.58 401 0.111389 -36.8787"
-		"time: 402 values:  402 355.585 402 0.111667 -36.879"
-		"time: 403 values:  403 355.59 403 0.111944 -36.8792"
-		"time: 404 values:  404 355.595 404 0.112222 -36.8795"
-		"FINALIZE TABLE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	6_1
+TEST_F(DPCTest,	Table_Attributes)	{
+				std::string	tmp	=	parseDPCData(testxml[6].c_str());
+	//std::cout	<<	tmp	<<	std::endl;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"Product	title:	Table	of	Sun	Positions"
+
+		"TABLE	VIEW:"
+		"RUN	Directory:	../TEST_DATA/RUN_BINARY"
+		"Title:	Sun	Azimuth	vs.	Time"
+		"Number	of	Columns:	5"
+		"Column	Label	[0]:	Time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s	format	[0]:	%24.10f"
+		"Column	Label	[1]:	Azimuth"
+		"Variable	Name[1]:	sun_predictor.sun.solar_azimuth"
+		"Column	Units	[1]:	degree	format	[1]:	%16.5q"
+		"Column	Label	[2]:	Hours"
+		"Variable	Name[2]:	sys.exec.out.time"
+		"Column	Units	[2]:	s	format	[2]:	%24.10f"
+								"Column	Label	[3]:	Hours"
+								"Variable	Name[3]:	sys.exec.out.time"
+								"Column	Units	[3]:	hr				format	[3]:	%24.10f"
+		"Column	Label	[4]:	Elevation"
+		"Variable	Name[4]:	sun_predictor.sun.solar_elevation"
+		"Column	Units	[4]:	degree	format	[4]:	%16.5f"
+		"time:	400	values:		400	355.576	400	0.111111	-36.8784"
+		"time:	401	values:		401	355.58	401	0.111389	-36.8787"
+		"time:	402	values:		402	355.585	402	0.111667	-36.879"
+		"time:	403	values:		403	355.59	403	0.111944	-36.8792"
+		"time:	404	values:		404	355.595	404	0.112222	-36.8795"
+		"FINALIZE	TABLE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
 
-// Session 7_1
-TEST_F(DPCTest, MultiplePlots) {
+//	Session	7_1
+TEST_F(DPCTest,	MultiplePlots)	{
 	//req.add_requirement("445237094");
 
-    std::string tmp = parseDPCData(testxml[7].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW: 	Attribute version: 1.0"
-		"Product title: title of the product"
-		"PAGE VIEW: 	Page title: Solar Elevation for a Day"
-		"Attribute presentation: SIMPLE"
-
-		"PLOT VIEW: 	Plot title: Sun Elevation vs. Time"
-		"Number of Curves: 1"
-		"X-axis label: Time 		Y-axis label: Elevation"
-		"Attribute grid: 			 yes"
-		"Attribute background_color: #fff0ff"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 					X Units: s"
-		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 	 #323200"
-		"First 5 points:"
-		"<0,-36.7426>[0] <1,-36.743> [1] <2,-36.7434>[2]"
-		"<3,-36.7438>[3] <4,-36.7442>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW: Plot title: Sun Azimuth vs. Time"
-		"Number of Curves: 1"
-		"X-axis label: Time			Y-axis label: Azimuth"
-		"Attribute grid:			 yes"
-		"Attribute background_color: #f0fff0"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 					X Units: s"
-		"Y Var Name: sun_predictor.sun.solar_azimuth 	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 	 #323200"
-		"First 5 points:"
-		"<0,353.673>[0] <1,353.678>[1] <2,353.683>[2]"
-		"<3,353.688>[3] <4,353.692>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW: Plot title: Sun Elevation vs. Azimuth"
-		"Number of Curves: 1"
-		"X-axis label: Azimuth		Y-axis label: Elevation"
-		"Attribute grid: 			 yes"
-		"Attribute background_color: #fffff0"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sun_predictor.sun.solar_azimuth 	X Units: degree"
-		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 	 #323200"
-		"First 5 points:"
-		"<353.673,-36.7426>[0] <353.678,-36.743> [1] <353.683,-36.7434>[2]"
-		"<353.688,-36.7438>[3] <353.692,-36.7442>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[7].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"Product	title:	title	of	the	product"
+		"PAGE	VIEW:		Page	title:	Solar	Elevation	for	a	Day"
+		"Attribute	presentation:	SIMPLE"
+
+		"PLOT	VIEW:		Plot	title:	Sun	Elevation	vs.	Time"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Time			Y-axis	label:	Elevation"
+		"Attribute	grid:					yes"
+		"Attribute	background_color:	#fff0ff"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time						X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation		Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<0,-36.7426>[0]	<1,-36.743>	[1]	<2,-36.7434>[2]"
+		"<3,-36.7438>[3]	<4,-36.7442>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:	Plot	title:	Sun	Azimuth	vs.	Time"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Time			Y-axis	label:	Azimuth"
+		"Attribute	grid:				yes"
+		"Attribute	background_color:	#f0fff0"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time						X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.solar_azimuth		Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<0,353.673>[0]	<1,353.678>[1]	<2,353.683>[2]"
+		"<3,353.688>[3]	<4,353.692>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:	Plot	title:	Sun	Elevation	vs.	Azimuth"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Azimuth		Y-axis	label:	Elevation"
+		"Attribute	grid:					yes"
+		"Attribute	background_color:	#fffff0"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sun_predictor.sun.solar_azimuth		X	Units:	degree"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation		Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<353.673,-36.7426>[0]	<353.678,-36.743>	[1]	<353.683,-36.7434>[2]"
+		"<353.688,-36.7438>[3]	<353.692,-36.7442>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 8_1
-TEST_F(DPCTest, MultPlots_MultTables) {
-	//req.add_requirement("150267139 32631267");
-
-    std::string tmp = parseDPCData(testxml[8].c_str());
-	//std::cout << tmp << std::endl;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW: 					Attribute version: 1.0"
-		"Attribute background_color: 	#885588"
-		"PAGE VIEW: Page title: 		Solar Elevation for a Day"
-		"Attribute background_color: 	#885588"
-		"Attribute presentation: 		SIMPLE"
-
-		"PLOT VIEW: 	Plot title: Sun Elevation vs. Time"
-		"Number of Curves: 1"
-		"X-axis label: Time 	Y-axis label: Elevation"
-		"Attribute grid: 			 yes"
-		"Attribute background_color: 	#885588"
-		"Attribute font: 			 -*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time		 			X Units: s"
-		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 		#323200"
-		"First 5 points:"
-		"<500,-36.9048>[0] <501,-36.9051>[1] <502,-36.9053>[2]"
-		"<503,-36.9056>[3] <504,-36.9058>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW."
-
-		"PAGE VIEW: 	Attribute background_color: #885588"
-		"Attribute presentation: 		SIMPLE"
-
-		"PLOT VIEW: 	Plot title: Sun Elevation vs. Azimuth"
-		"Number of Curves: 1"
-		"X-axis label: Azimuth 		Y-axis label: Elevation"
-		"Attribute grid: 				yes"
-		"Attribute background_color: 	#fffff0"
-		"Attribute font: 				-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
-		"CURVE VIEW:"
-		"X Var Name: sun_predictor.sun.solar_azimuth 	X Units: degree"
-		"Y Var Name: sun_predictor.sun.solar_elevation 	Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute y line_color: 		#323200"
-		"First 5 points:"
-		"<356.052,-36.9048>[0] <356.057,-36.9051>[1] <356.062,-36.9053>[2]"
-		"<356.067,-36.9056>[3] <356.071,-36.9058>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW."
-
-		"TABLE VIEW: 	RUN Directory: ../TEST_DATA/RUN_BINARY"
-		"Title: My Two Column Table"
-		"Number of Columns: 3"
-		"Column Label [0]: Time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s 	format[0]: %24.10f"
-		"Column Label [1]: Azimuth"
-		"Variable Name[1]: sun_predictor.sun.solar_azimuth"
-		"Column Units [1]: degree	format[1]: %16.5q"
-		"Column Label [2]: Elevation"
-		"Variable Name[2]: sun_predictor.sun.solar_elevation"
-		"Column Units [2]: degree	format[2]: %16.5f"
-		"time: 500 values:  500 356.052 -36.9048"
-		"time: 501 values:  501 356.057 -36.9051"
-		"time: 502 values:  502 356.062 -36.9053"
-		"time: 503 values:  503 356.067 -36.9056"
-		"time: 504 values:  504 356.071 -36.9058"
-		"FINALIZE TABLE VIEW."
-
-		"TABLE VIEW: 	RUN Directory: ../TEST_DATA/RUN_BINARY"
-		"Title: Four Column Table"
-		"Number of Columns: 5"
-		"Column Label [0]: time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s 	format[0]: %24.10f"
-		"Column Label [1]: Seconds"
-		"Variable Name[1]: sun_predictor.sun.local_time.sec"
-		"Column Units [1]: s	format[1]: %16.5f"
-		"Column Label [2]: Day"
-		"Variable Name[2]: sun_predictor.sun.local_time.day"
-		"Column Units [2]: day	format[2]: %16.5f"
-		"Column Label [3]: Month"
-		"Variable Name[3]: sun_predictor.sun.local_time.month"
-		"Column Units [3]: --	format[3]: %16.5f"
-		"Column Label [4]: Year"
-		"Variable Name[4]: sun_predictor.sun.local_time.year"
-		"Column Units [4]: --	format[4]: %16.5f"
-		"time: 500 values:  500 20 21 6 2006"
-		"time: 501 values:  501 21 21 6 2006"
-		"time: 502 values:  502 22 21 6 2006"
-		"time: 503 values:  503 23 21 6 2006"
-		"time: 504 values:  504 24 21 6 2006"
-		"FINALIZE TABLE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session	8_1
+TEST_F(DPCTest,	MultPlots_MultTables)	{
+	//req.add_requirement("150267139	32631267");
+
+				std::string	tmp	=	parseDPCData(testxml[8].c_str());
+	//std::cout	<<	tmp	<<	std::endl;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:						Attribute	version:	1.0"
+		"Attribute	background_color:		#885588"
+		"PAGE	VIEW:	Page	title:			Solar	Elevation	for	a	Day"
+		"Attribute	background_color:		#885588"
+		"Attribute	presentation:			SIMPLE"
+
+		"PLOT	VIEW:		Plot	title:	Sun	Elevation	vs.	Time"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Time		Y-axis	label:	Elevation"
+		"Attribute	grid:					yes"
+		"Attribute	background_color:		#885588"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time						X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation		Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<500,-36.9048>[0]	<501,-36.9051>[1]	<502,-36.9053>[2]"
+		"<503,-36.9056>[3]	<504,-36.9058>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW."
+
+		"PAGE	VIEW:		Attribute	background_color:	#885588"
+		"Attribute	presentation:			SIMPLE"
+
+		"PLOT	VIEW:		Plot	title:	Sun	Elevation	vs.	Azimuth"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Azimuth			Y-axis	label:	Elevation"
+		"Attribute	grid:					yes"
+		"Attribute	background_color:		#fffff0"
+		"Attribute	font:					-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sun_predictor.sun.solar_azimuth		X	Units:	degree"
+		"Y	Var	Name:	sun_predictor.sun.solar_elevation		Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	y	line_color:			#323200"
+		"First	5	points:"
+		"<356.052,-36.9048>[0]	<356.057,-36.9051>[1]	<356.062,-36.9053>[2]"
+		"<356.067,-36.9056>[3]	<356.071,-36.9058>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW."
+
+		"TABLE	VIEW:		RUN	Directory:	../TEST_DATA/RUN_BINARY"
+		"Title:	My	Two	Column	Table"
+		"Number	of	Columns:	3"
+		"Column	Label	[0]:	Time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s		format[0]:	%24.10f"
+		"Column	Label	[1]:	Azimuth"
+		"Variable	Name[1]:	sun_predictor.sun.solar_azimuth"
+		"Column	Units	[1]:	degree	format[1]:	%16.5q"
+		"Column	Label	[2]:	Elevation"
+		"Variable	Name[2]:	sun_predictor.sun.solar_elevation"
+		"Column	Units	[2]:	degree	format[2]:	%16.5f"
+		"time:	500	values:		500	356.052	-36.9048"
+		"time:	501	values:		501	356.057	-36.9051"
+		"time:	502	values:		502	356.062	-36.9053"
+		"time:	503	values:		503	356.067	-36.9056"
+		"time:	504	values:		504	356.071	-36.9058"
+		"FINALIZE	TABLE	VIEW."
+
+		"TABLE	VIEW:		RUN	Directory:	../TEST_DATA/RUN_BINARY"
+		"Title:	Four	Column	Table"
+		"Number	of	Columns:	5"
+		"Column	Label	[0]:	time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s		format[0]:	%24.10f"
+		"Column	Label	[1]:	Seconds"
+		"Variable	Name[1]:	sun_predictor.sun.local_time.sec"
+		"Column	Units	[1]:	s	format[1]:	%16.5f"
+		"Column	Label	[2]:	Day"
+		"Variable	Name[2]:	sun_predictor.sun.local_time.day"
+		"Column	Units	[2]:	day	format[2]:	%16.5f"
+		"Column	Label	[3]:	Month"
+		"Variable	Name[3]:	sun_predictor.sun.local_time.month"
+		"Column	Units	[3]:	--	format[3]:	%16.5f"
+		"Column	Label	[4]:	Year"
+		"Variable	Name[4]:	sun_predictor.sun.local_time.year"
+		"Column	Units	[4]:	--	format[4]:	%16.5f"
+		"time:	500	values:		500	20	21	6	2006"
+		"time:	501	values:		501	21	21	6	2006"
+		"time:	502	values:		502	22	21	6	2006"
+		"time:	503	values:		503	23	21	6	2006"
+		"time:	504	values:		504	24	21	6	2006"
+		"FINALIZE	TABLE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
 
-// Session_8_2
-
-TEST_F(DPCTest, MultTables) {
-	//req.add_requirement("2064022342 3201880761");
-
-	std::string tmp = parseDPCData(testxml[9].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:		Attribute version: 1.0"
-		"Attribute background_color: #885588"
-
-		"TABLE VIEW:"
-		"RUN Directory: ../TEST_DATA/RUN_ASCII"
-		"Title: My Two Column Table"
-		"Number of Columns: 3"
-		"Column Label [0]: Time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s 	format [0]: %24.10f"
-		"Column Label [1]: Azimuth"
-		"Variable Name[1]: sun_predictor.sun.solar_azimuth"
-		"Column Units [1]: degree	format [1]: %16.5q"
-		"Column Label [2]: Elevation"
-		"Variable Name[2]: sun_predictor.sun.solar_elevation"
-		"Column Units [2]: degree	format [2]: %16.5f"
-		"time: 500 values:  500 354.177 -46.1843"
-		"time: 501 values:  501 354.183 -46.1846"
-		"time: 502 values:  502 354.189 -46.185"
-		"time: 503 values:  503 354.195 -46.1854"
-		"time: 504 values:  504 354.201 -46.1857"
-		"FINALIZE TABLE VIEW."
-
-		"TABLE VIEW:"
-		"RUN Directory: ../TEST_DATA/RUN_ASCII"
-		"Title: Four Column Table"
-		"Number of Columns: 5"
-		"Column Label [0]: time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s	format [0]: %24.10f"
-		"Column Label [1]: Seconds"
-		"Variable Name[1]: sun_predictor.sun.local_time.sec"
-		"Column Units [1]: s	format [1]: %16.5f"
-		"Column Label [2]: Day"
-		"Variable Name[2]: sun_predictor.sun.local_time.day"
-		"Column Units [2]: day	format [2]: %16.5f"
-		"Column Label [3]: Month"
-		"Variable Name[3]: sun_predictor.sun.local_time.month"
-		"Column Units [3]: --	format [3]: %16.5f"
-		"Column Label [4]: Year"
-		"Variable Name[4]: sun_predictor.sun.local_time.year"
-		"Column Units [4]: --	format [4]: %16.5f"
-		"time: 500 values:  500 20 15 8 2006"
-		"time: 501 values:  501 21 15 8 2006"
-		"time: 502 values:  502 22 15 8 2006"
-		"time: 503 values:  503 23 15 8 2006"
-		"time: 504 values:  504 24 15 8 2006"
-		"FINALIZE TABLE VIEW. FINALIZE PRODUCT VIEW.",
+//	Session_8_2
+
+TEST_F(DPCTest,	MultTables)	{
+	//req.add_requirement("2064022342	3201880761");
+
+	std::string	tmp	=	parseDPCData(testxml[9].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"Attribute	background_color:	#885588"
+
+		"TABLE	VIEW:"
+		"RUN	Directory:	../TEST_DATA/RUN_ASCII"
+		"Title:	My	Two	Column	Table"
+		"Number	of	Columns:	3"
+		"Column	Label	[0]:	Time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s		format	[0]:	%24.10f"
+		"Column	Label	[1]:	Azimuth"
+		"Variable	Name[1]:	sun_predictor.sun.solar_azimuth"
+		"Column	Units	[1]:	degree	format	[1]:	%16.5q"
+		"Column	Label	[2]:	Elevation"
+		"Variable	Name[2]:	sun_predictor.sun.solar_elevation"
+		"Column	Units	[2]:	degree	format	[2]:	%16.5f"
+		"time:	500	values:		500	354.177	-46.1843"
+		"time:	501	values:		501	354.183	-46.1846"
+		"time:	502	values:		502	354.189	-46.185"
+		"time:	503	values:		503	354.195	-46.1854"
+		"time:	504	values:		504	354.201	-46.1857"
+		"FINALIZE	TABLE	VIEW."
+
+		"TABLE	VIEW:"
+		"RUN	Directory:	../TEST_DATA/RUN_ASCII"
+		"Title:	Four	Column	Table"
+		"Number	of	Columns:	5"
+		"Column	Label	[0]:	time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s	format	[0]:	%24.10f"
+		"Column	Label	[1]:	Seconds"
+		"Variable	Name[1]:	sun_predictor.sun.local_time.sec"
+		"Column	Units	[1]:	s	format	[1]:	%16.5f"
+		"Column	Label	[2]:	Day"
+		"Variable	Name[2]:	sun_predictor.sun.local_time.day"
+		"Column	Units	[2]:	day	format	[2]:	%16.5f"
+		"Column	Label	[3]:	Month"
+		"Variable	Name[3]:	sun_predictor.sun.local_time.month"
+		"Column	Units	[3]:	--	format	[3]:	%16.5f"
+		"Column	Label	[4]:	Year"
+		"Variable	Name[4]:	sun_predictor.sun.local_time.year"
+		"Column	Units	[4]:	--	format	[4]:	%16.5f"
+		"time:	500	values:		500	20	15	8	2006"
+		"time:	501	values:		501	21	15	8	2006"
+		"time:	502	values:		502	22	15	8	2006"
+		"time:	503	values:		503	23	15	8	2006"
+		"time:	504	values:		504	24	15	8	2006"
+		"FINALIZE	TABLE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 9_1
-TEST_F(DPCTest, ComparisonCurves) {
+//	Session	9_1
+TEST_F(DPCTest,	ComparisonCurves)	{
 	//req.add_requirement("665188150");
 
-    std::string tmp = parseDPCData(testxml[10].c_str());
-    //std::cout << tmp;
-    int result = strcmp_IgnoringWhiteSpace(
-    	"PRODUCT VIEW: 	Attribute version: 1.0"
-		"PAGE VIEW: Page title: Page of Squiggles"
-		"Attribute presentation: comparison"
-
-		"PLOT VIEW: 	Plot title: Squiggle 1"
-		"Number of Curves: 2"
-		"X-axis label: time		Y-axis label: JD"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 		X Units: s"
-		"Y Var Name: sun_predictor.sun.JD 	Y Units: day"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,2.45661e+06>[0] <1,2.45661e+06>[1] <2,2.45661e+06>[2]"
-		"<3,2.45661e+06>[3] <4,2.45661e+06>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 		X Units: s"
-		"Y Var Name: sun_predictor.sun.JD 	Y Units: day"
-		"RUN Directory: RUN6"
-		"First 5 points:"
-		"<0,2.45661e+06>[0] <1,2.45661e+06>[1] <2,2.45661e+06>[2]"
-		"<3,2.45661e+06>[3] <4,2.45661e+06>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Squiggle 2"
-		"Number of Curves: 2"
-		"X-axis label: time 	Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination 	Y Units: degree"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,-18.1012>[0] <1,-18.1012>[1] <2,-18.1012>[2]"
-		"<3,-18.1012>[3] <4,-18.1012>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination 	Y Units: degree"
-		"RUN Directory: RUN6"
-		"First 5 points:"
-		"<0,-18.1668>[0] <1,-18.1668>[1] <2,-18.1668>[2]"
-		"<3,-18.1668>[3] <4,-18.1668>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW: 	Plot title: Squiggle 3"
-		"Number of Curves: 2"
-		"X-axis label: time		Y-axis label: hour_angle"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 				X Units: s"
-		"Y Var Name: sun_predictor.sun.hour_angle 	Y Units: degree"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,-61.18>[0]   <1,-61.1758>[1] <2,-61.1717>[2]"
-		"<3,-61.1675>[3] <4,-61.1633>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 				X Units: s"
-		"Y Var Name: sun_predictor.sun.hour_angle 	Y Units: degree"
-		"RUN Directory: RUN6"
-		"First 5 points:"
-		"<0,28.8108>[0] <1,28.8149>[1] <2,28.8191>[2]"
-		"<3,28.8233>[3] <4,28.8274>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[10].c_str());
+				//std::cout	<<	tmp;
+				int	result	=	strcmp_IgnoringWhiteSpace(
+					"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"PAGE	VIEW:	Page	title:	Page	of	Squiggles"
+		"Attribute	presentation:	comparison"
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	1"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	JD"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time			X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.JD		Y	Units:	day"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,2.45661e+06>[0]	<1,2.45661e+06>[1]	<2,2.45661e+06>[2]"
+		"<3,2.45661e+06>[3]	<4,2.45661e+06>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time			X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.JD		Y	Units:	day"
+		"RUN	Directory:	RUN6"
+		"First	5	points:"
+		"<0,2.45661e+06>[0]	<1,2.45661e+06>[1]	<2,2.45661e+06>[2]"
+		"<3,2.45661e+06>[3]	<4,2.45661e+06>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	2"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination		Y	Units:	degree"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,-18.1012>[0]	<1,-18.1012>[1]	<2,-18.1012>[2]"
+		"<3,-18.1012>[3]	<4,-18.1012>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination		Y	Units:	degree"
+		"RUN	Directory:	RUN6"
+		"First	5	points:"
+		"<0,-18.1668>[0]	<1,-18.1668>[1]	<2,-18.1668>[2]"
+		"<3,-18.1668>[3]	<4,-18.1668>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	3"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	hour_angle"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.hour_angle		Y	Units:	degree"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,-61.18>[0]			<1,-61.1758>[1]	<2,-61.1717>[2]"
+		"<3,-61.1675>[3]	<4,-61.1633>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.hour_angle		Y	Units:	degree"
+		"RUN	Directory:	RUN6"
+		"First	5	points:"
+		"<0,28.8108>[0]	<1,28.8149>[1]	<2,28.8191>[2]"
+		"<3,28.8233>[3]	<4,28.8274>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-    EXPECT_EQ(result, 0);
+				EXPECT_EQ(result,	0);
 }
 
-// Session 9_2
-TEST_F(DPCTest, DeltaCurves) {
+//	Session	9_2
+TEST_F(DPCTest,	DeltaCurves)	{
 	//req.add_requirement("2904854297");
 
-    std::string tmp = parseDPCData(testxml[11].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW: 	Attribute version: 1.0"
-		"PAGE VIEW: 	Page title: Page of Squiggles"
-		"Attribute presentation: DELTA"
-
-		"PLOT VIEW: 	Plot title: Squiggle 1"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: JD"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 				X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.JD) 	Y Units: day"
-		"RUN Directory: RUN1 - RUN2"
-		"First 5 points:"
-		"<0,-0.0416667>[0] <1,-0.0416667>[1] <2,-0.0416667>[2]"
-		"<3,-0.0416667>[3] <4,-0.0416667>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW: 	Plot title: Squiggle 2"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 						X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.declination) 	Y Units: degree"
-		"RUN Directory: RUN1 - RUN2"
-		"First 5 points:"
-		"<0,0.0110458>[0] <1,0.0110457>[1] <2,0.0110457>[2]"
-		"<3,0.0110457>[3] <4,0.0110457>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW: 	Plot title: Squiggle 3"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: hour_angle"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 						X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.hour_angle) 	Y Units: degree"
-		"RUN Directory: RUN1 - RUN2"
-		"First 5 points:"
-		"<0,-14.9985>[0] <1,-14.9985>[1] <2,-14.9985>[2]"
-		"<3,-14.9985>[3] <4,-14.9985>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[11].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"PAGE	VIEW:		Page	title:	Page	of	Squiggles"
+		"Attribute	presentation:	DELTA"
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	1"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	JD"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time					X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.JD)		Y	Units:	day"
+		"RUN	Directory:	RUN1	-	RUN2"
+		"First	5	points:"
+		"<0,-0.0416667>[0]	<1,-0.0416667>[1]	<2,-0.0416667>[2]"
+		"<3,-0.0416667>[3]	<4,-0.0416667>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	2"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time							X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.declination)		Y	Units:	degree"
+		"RUN	Directory:	RUN1	-	RUN2"
+		"First	5	points:"
+		"<0,0.0110458>[0]	<1,0.0110457>[1]	<2,0.0110457>[2]"
+		"<3,0.0110457>[3]	<4,0.0110457>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Squiggle	3"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	hour_angle"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time							X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.hour_angle)		Y	Units:	degree"
+		"RUN	Directory:	RUN1	-	RUN2"
+		"First	5	points:"
+		"<0,-14.9985>[0]	<1,-14.9985>[1]	<2,-14.9985>[2]"
+		"<3,-14.9985>[3]	<4,-14.9985>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Session 9_3
-TEST_F(DPCTest, ContrastCurves) {
+//	Session	9_3
+TEST_F(DPCTest,	ContrastCurves)	{
 	//req.add_requirement("3042036071");
 
-    std::string tmp = parseDPCData(testxml[12].c_str());
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:"
-		"Attribute version: 	1.0"
-		"PAGE VIEW:		Page title: Page of Squiggles"
-		"Attribute presentation: contrast"
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 2"
-		"X-axis label: time		Y-axis label: JD"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time 		X Units: s"
-		"Y Var Name: sun_predictor.sun.JD	Y Units: day"
-		"RUN Directory: RUN4"
-		"First 5 points:"
-		"<0,2.45661e+06>[0] <1,2.45661e+06>[1] <2,2.45661e+06>[2]"
-		"<3,2.45661e+06>[3] <4,2.45661e+06>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time		X Units: s"
-		"Y Var Name: sun_predictor.sun.JD	Y Units: day"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,2.45661e+06>[0] <1,2.45661e+06>[1] <2,2.45661e+06>[2]"
-		"<3,2.45661e+06>[3] <4,2.45661e+06>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 2"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN4"
-		"First 5 points:"
-		"<0,-18.0353>[0] <1,-18.0353>[1]	<2,-18.0353>[2]"
-		"<3,-18.0353>[3] <4,-18.0353>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.declination	Y Units: degree"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,-18.1012>[0] <1,-18.1012>[1] <2,-18.1012>[2]"
-		"<3,-18.1012>[3] <4,-18.1012>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 2"
-		"X-axis label: time		Y-axis label: hour_angle"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.hour_angle	Y Units: degree"
-		"RUN Directory: RUN4"
-		"First 5 points:"
-		"<0,-151.171>[0] <1,-151.167>[1] <2,-151.163>[2]"
-		"<3,-151.158>[3] <4,-151.154>[4]"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: sun_predictor.sun.hour_angle	Y Units: degree"
-		"RUN Directory: RUN5"
-		"First 5 points:"
-		"<0,-61.18>[0] 	 <1,-61.1758>[1] <2,-61.1717>[2]"
-		"<3,-61.1675>[3] <4,-61.1633>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: JD"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time				X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.JD)	Y Units: day"
-		"RUN Directory: RUN4 - RUN5"
-		"First 5 points:"
-		"<0,-0.25>[0] <1,-0.25>[1] <2,-0.25>[2]"
-		"<3,-0.25>[3] <4,-0.25>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: declination"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time						X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.declination)	Y Units: degree"
-		"RUN Directory: RUN4 - RUN5"
-		"First 5 points:"
-		"<0,0.0659199>[0] <1,0.0659199>[1] <2,0.0659199>[2]"
-		"<3,0.0659198>[3] <4,0.0659198>[4]"
-		"FINALIZE PLOT VIEW."
-
-		"PLOT VIEW:		Plot title: Contrast"
-		"Number of Curves: 1"
-		"X-axis label: time		Y-axis label: hour_angle"
-		"CURVE VIEW:"
-		"X Var Name: sys.exec.out.time						X Units: s"
-		"Y Var Name: DELTA(sun_predictor.sun.hour_angle)	Y Units: degree"
-		"RUN Directory: RUN4 - RUN5"
-		"First 5 points:"
-		"<0,-89.991>[0]	<1,-89.991>[1] <2,-89.991>[2]"
-		"<3,-89.991>[3] <4,-89.991>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW.",
+				std::string	tmp	=	parseDPCData(testxml[12].c_str());
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:"
+		"Attribute	version:		1.0"
+		"PAGE	VIEW:		Page	title:	Page	of	Squiggles"
+		"Attribute	presentation:	contrast"
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	JD"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time			X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.JD	Y	Units:	day"
+		"RUN	Directory:	RUN4"
+		"First	5	points:"
+		"<0,2.45661e+06>[0]	<1,2.45661e+06>[1]	<2,2.45661e+06>[2]"
+		"<3,2.45661e+06>[3]	<4,2.45661e+06>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time		X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.JD	Y	Units:	day"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,2.45661e+06>[0]	<1,2.45661e+06>[1]	<2,2.45661e+06>[2]"
+		"<3,2.45661e+06>[3]	<4,2.45661e+06>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN4"
+		"First	5	points:"
+		"<0,-18.0353>[0]	<1,-18.0353>[1]	<2,-18.0353>[2]"
+		"<3,-18.0353>[3]	<4,-18.0353>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.declination	Y	Units:	degree"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,-18.1012>[0]	<1,-18.1012>[1]	<2,-18.1012>[2]"
+		"<3,-18.1012>[3]	<4,-18.1012>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	2"
+		"X-axis	label:	time		Y-axis	label:	hour_angle"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.hour_angle	Y	Units:	degree"
+		"RUN	Directory:	RUN4"
+		"First	5	points:"
+		"<0,-151.171>[0]	<1,-151.167>[1]	<2,-151.163>[2]"
+		"<3,-151.158>[3]	<4,-151.154>[4]"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	sun_predictor.sun.hour_angle	Y	Units:	degree"
+		"RUN	Directory:	RUN5"
+		"First	5	points:"
+		"<0,-61.18>[0]			<1,-61.1758>[1]	<2,-61.1717>[2]"
+		"<3,-61.1675>[3]	<4,-61.1633>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	JD"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time				X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.JD)	Y	Units:	day"
+		"RUN	Directory:	RUN4	-	RUN5"
+		"First	5	points:"
+		"<0,-0.25>[0]	<1,-0.25>[1]	<2,-0.25>[2]"
+		"<3,-0.25>[3]	<4,-0.25>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	declination"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time						X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.declination)	Y	Units:	degree"
+		"RUN	Directory:	RUN4	-	RUN5"
+		"First	5	points:"
+		"<0,0.0659199>[0]	<1,0.0659199>[1]	<2,0.0659199>[2]"
+		"<3,0.0659198>[3]	<4,0.0659198>[4]"
+		"FINALIZE	PLOT	VIEW."
+
+		"PLOT	VIEW:		Plot	title:	Contrast"
+		"Number	of	Curves:	1"
+		"X-axis	label:	time		Y-axis	label:	hour_angle"
+		"CURVE	VIEW:"
+		"X	Var	Name:	sys.exec.out.time						X	Units:	s"
+		"Y	Var	Name:	DELTA(sun_predictor.sun.hour_angle)	Y	Units:	degree"
+		"RUN	Directory:	RUN4	-	RUN5"
+		"First	5	points:"
+		"<0,-89.991>[0]	<1,-89.991>[1]	<2,-89.991>[2]"
+		"<3,-89.991>[3]	<4,-89.991>[4]"
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-TEST_F(DPCTest, DPV_Test) {
-	//req.add_requirement("2826924382 1366633954");
-
-	std::string tmp = parseDPCData(testxml[13].c_str());
-    //std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:	Attribute version: 1.0"
-		"Attribute foreground_color: #ffffff"
-		"Attribute background_color: #885588"
-
-		"PAGE VIEW:		Page title: This is a page"
-		"Attribute foreground_color: #ffffff"
-		"Attribute background_color: #885588"
-		"Attribute hcells: 1			   Attribute vcells: #ffffff"
-		"Attribute presentation: SIMPLE	   Attribute gnuplot_template: this one"
-		"Attribute gnuplot_object: ball	   Attribute gnuplot_geom: square"
-		"Attribute gnuplot_plot_ratio: 1.5 Attribute gnuplot_page_orientation: landscape"
-
-		"PLOT VIEW:		Plot title: This is a page"
-		"Number of Curves: 1"
-		"X-axis label: Mass					Y-axis label: Density"
-		"Attribute xmin: -100000			Attribute xmax: 100000"
-		"Attribute x_scale: 1.0				Attribute ymin: -200000"
-		"Attribute ymax: 200000				Attribute y_scale: 2.0"
-		"Attribute grid: yes				Attribute grid_color: pink"
-		"Attribute foreground_color: #ffffff"
-		"Attribute background_color: #000000"
-		"Attribute font: helvetica"
-
-		"CURVE VIEW:"
-		"X Var Name: sun_predictor.sun.observer_offset_from_UTC"
-		"X Units: min"
-		"Y Var Name: sun_predictor.sun.observer_latitude"
-		"Y Units: degree"
-		"RUN Directory: RUN_BINARY"
-		"Attribute x max: 100000000			Attribute x symbol_style: circles"
-		"Attribute x symbol_size: small		Attribute x line_style: dotted"
-		"Attribute x line_color: green		Attribute x gnuplot_line_style: box"
-		"First 5 points:"
+TEST_F(DPCTest,	DPV_Test)	{
+	//req.add_requirement("2826924382	1366633954");
+
+	std::string	tmp	=	parseDPCData(testxml[13].c_str());
+				//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:	Attribute	version:	1.0"
+		"Attribute	foreground_color:	#ffffff"
+		"Attribute	background_color:	#885588"
+
+		"PAGE	VIEW:		Page	title:	This	is	a	page"
+		"Attribute	foreground_color:	#ffffff"
+		"Attribute	background_color:	#885588"
+		"Attribute	hcells:	1						Attribute	vcells:	#ffffff"
+		"Attribute	presentation:	SIMPLE				Attribute	gnuplot_template:	this	one"
+		"Attribute	gnuplot_object:	ball				Attribute	gnuplot_geom:	square"
+		"Attribute	gnuplot_plot_ratio:	1.5	Attribute	gnuplot_page_orientation:	landscape"
+
+		"PLOT	VIEW:		Plot	title:	This	is	a	page"
+		"Number	of	Curves:	1"
+		"X-axis	label:	Mass					Y-axis	label:	Density"
+		"Attribute	xmin:	-100000			Attribute	xmax:	100000"
+		"Attribute	x_scale:	1.0				Attribute	ymin:	-200000"
+		"Attribute	ymax:	200000				Attribute	y_scale:	2.0"
+		"Attribute	grid:	yes				Attribute	grid_color:	pink"
+		"Attribute	foreground_color:	#ffffff"
+		"Attribute	background_color:	#000000"
+		"Attribute	font:	helvetica"
+
+		"CURVE	VIEW:"
+		"X	Var	Name:	sun_predictor.sun.observer_offset_from_UTC"
+		"X	Units:	min"
+		"Y	Var	Name:	sun_predictor.sun.observer_latitude"
+		"Y	Units:	degree"
+		"RUN	Directory:	RUN_BINARY"
+		"Attribute	x	max:	100000000			Attribute	x	symbol_style:	circles"
+		"Attribute	x	symbol_size:	small		Attribute	x	line_style:	dotted"
+		"Attribute	x	line_color:	green		Attribute	x	gnuplot_line_style:	box"
+		"First	5	points:"
 		"<-360,29.553>[0]	<-360,29.553>[1]	<-360,29.553>[2]"
 		"<-360,29.553>[3]	<-360,29.553>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW."
-
-		"TABLE VIEW:"
-		"RUN Directory: ../TEST_DATA/RUN_BINARY"
-		"Title: This is a table"
-		"Number of Columns: 2"
-		"Column Label [0]: Time"
-		"Variable Name[0]: sys.exec.out.time"
-		"Column Units [0]: s	format [0]: feng shui"
-		"Column Label [1]: Pressure"
-		"Variable Name[1]: sun_predictor.sun.hour_angle"
-		"Column Units [1]: arcsecond	format [1]: normal"
-		"time: 10 values:  10 628267"
-		"time: 11 values:  11 628282"
-		"time: 12 values:  12 628297"
-		"time: 13 values:  13 628312"
-		"time: 14 values:  14 628327"
-		"FINALIZE TABLE VIEW. FINALIZE PRODUCT VIEW.",
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW."
+
+		"TABLE	VIEW:"
+		"RUN	Directory:	../TEST_DATA/RUN_BINARY"
+		"Title:	This	is	a	table"
+		"Number	of	Columns:	2"
+		"Column	Label	[0]:	Time"
+		"Variable	Name[0]:	sys.exec.out.time"
+		"Column	Units	[0]:	s	format	[0]:	feng	shui"
+		"Column	Label	[1]:	Pressure"
+		"Variable	Name[1]:	sun_predictor.sun.hour_angle"
+		"Column	Units	[1]:	arcsecond	format	[1]:	normal"
+		"time:	10	values:		10	628267"
+		"time:	11	values:		11	628282"
+		"time:	12	values:		12	628297"
+		"time:	13	values:		13	628312"
+		"time:	14	values:		14	628327"
+		"FINALIZE	TABLE	VIEW.	FINALIZE	PRODUCT	VIEW.",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-TEST_F(DPCTest, Plot_Matlab) {
+TEST_F(DPCTest,	Plot_Matlab)	{
 	//req.add_requirement("2533684432");
 
-	std::string tmp = parseDPCData("../TEST_DATA/session_mat.xml");
-	//std::cout << tmp;
-	int result = strcmp_IgnoringWhiteSpace(
-		"PRODUCT VIEW:		Attribute version: 1.0"
-		"PAGE VIEW:			Attribute presentation: simple"
-		"PLOT VIEW:"
-		"Number of Curves: 1"
-		"X-axis label: s_simtime		Y-axis label: dvvl_01c_3"
-
-		"CURVE VIEW:"
-		"X Var Name: s_simtime			X Units: s"
-		"Y Var Name: dvvl_01c_3			Y Units: 1"
-		"RUN Directory: RUN_MATLAB"
-		"First 5 points:"
+	std::string	tmp	=	parseDPCData("../TEST_DATA/session_mat.xml");
+	//std::cout	<<	tmp;
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"PRODUCT	VIEW:		Attribute	version:	1.0"
+		"PAGE	VIEW:			Attribute	presentation:	simple"
+		"PLOT	VIEW:"
+		"Number	of	Curves:	1"
+		"X-axis	label:	s_simtime		Y-axis	label:	dvvl_01c_3"
+
+		"CURVE	VIEW:"
+		"X	Var	Name:	s_simtime			X	Units:	s"
+		"Y	Var	Name:	dvvl_01c_3			Y	Units:	1"
+		"RUN	Directory:	RUN_MATLAB"
+		"First	5	points:"
 		"<0,0>[0]				<0.05,-4.61208e-45>[1]"
 		"<0.1,-8.39122e-45>[2]	<0.15,1.51334e-44>[3]"
 		"<0.2,4.47631e-45>[4]"
-		"FINALIZE PLOT VIEW. FINALIZE PAGE VIEW. FINALIZE PRODUCT VIEW."
+		"FINALIZE	PLOT	VIEW.	FINALIZE	PAGE	VIEW.	FINALIZE	PRODUCT	VIEW."
 		,tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
 }
diff --git a/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp b/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
index 87392fca8..9823613ab 100644
--- a/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DPM_test.cpp
@@ -1,126 +1,126 @@
-#define protected public
+#define	protected	public
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#include	<ctype.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<libxml/parser.h>
+#include	<libxml/tree.h>
 
-#include "gtest/gtest.h"
-//#include "trick_utils/reqs/include/RequirementScribe.hh"
-#include "DPM/DPM_product.hh"
+#include	"gtest/gtest.h"
+//#include	"trick_utils/reqs/include/RequirementScribe.hh"
+#include	"DPM/DPM_product.hh"
 
-namespace Trick {
+namespace	Trick	{
 
-class DPMTest : public ::testing::Test {
-    protected:
-        //Trick::RequirementScribe req;
-		std::string testxml[10];
+class	DPMTest	:	public	::testing::Test	{
+				protected:
+								//Trick::RequirementScribe	req;
+		std::string	testxml[10];
 
-		DPMTest() {}
-		~DPMTest() {}
-		virtual void SetUp();
-        virtual void TearDown();
+		DPMTest()	{}
+		~DPMTest()	{}
+		virtual	void	SetUp();
+								virtual	void	TearDown();
 
-		std::string parseTestData(const char* name);
+		std::string	parseTestData(const	char*	name);
 };
 
-int strcmp_IgnoringWhiteSpace(const char* s1, const char* s2) {
-    int i1 = 0;
-    int i2 = 0;
-
-    while (1) {
-        while ( !isgraph( s1[i1] ) && s1[i1] != '\0') { i1++; }
-        while ( !isgraph( s2[i2] ) && s2[i2] != '\0') { i2++; }
-        if ( s1[i1] == '\0' && s2[i2] == '\0') { return 0; }
-        if ( s1[i1] != s2[i2]) {
-            if (s1[i1] < s2[i2]) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        i1++; i2++;
-    }
+int	strcmp_IgnoringWhiteSpace(const	char*	s1,	const	char*	s2)	{
+				int	i1	=	0;
+				int	i2	=	0;
+
+				while	(1)	{
+								while	(	!isgraph(	s1[i1]	)	&&	s1[i1]	!=	'\0')	{	i1++;	}
+								while	(	!isgraph(	s2[i2]	)	&&	s2[i2]	!=	'\0')	{	i2++;	}
+								if	(	s1[i1]	==	'\0'	&&	s2[i2]	==	'\0')	{	return	0;	}
+								if	(	s1[i1]	!=	s2[i2])	{
+												if	(s1[i1]	<	s2[i2])	{
+																return	-1;
+												}	else	{
+																return	1;
+												}
+								}
+								i1++;	i2++;
+				}
 }
 
 
-void DPMTest::SetUp() {
+void	DPMTest::SetUp()	{
 
-	testxml[0] = "../TEST_DATA/product_1.xml";
-    testxml[1] = "../TEST_DATA/product_2.xml";
-    testxml[2] = "../TEST_DATA/product_3.xml";
-    testxml[3] = "../TEST_DATA/product_4.xml";
-    testxml[4] = "../TEST_DATA/product_5.xml";
-    testxml[5] = "../TEST_DATA/product_6.xml";
-    testxml[6] = "../TEST_DATA/product_7.xml";
-    testxml[7] = "../TEST_DATA/product_8.xml";
-    testxml[8] = "../TEST_DATA/product_9.xml";
+	testxml[0]	=	"../TEST_DATA/product_1.xml";
+				testxml[1]	=	"../TEST_DATA/product_2.xml";
+				testxml[2]	=	"../TEST_DATA/product_3.xml";
+				testxml[3]	=	"../TEST_DATA/product_4.xml";
+				testxml[4]	=	"../TEST_DATA/product_5.xml";
+				testxml[5]	=	"../TEST_DATA/product_6.xml";
+				testxml[6]	=	"../TEST_DATA/product_7.xml";
+				testxml[7]	=	"../TEST_DATA/product_8.xml";
+				testxml[8]	=	"../TEST_DATA/product_9.xml";
 
-	// product_10.xml has an inconsistency with DTD
-	testxml[9] = "../TEST_DATA/product_10.xml";
+	//	product_10.xml	has	an	inconsistency	with	DTD
+	testxml[9]	=	"../TEST_DATA/product_10.xml";
 }
 
-void DPMTest::TearDown() {}
+void	DPMTest::TearDown()	{}
 
-std::string DPMTest::parseTestData(const char* name) {
-    xmlParserCtxtPtr parser_context;
-    xmlDocPtr doc;
-	xmlNode *root_node;
-	DPM_product *product;
+std::string	DPMTest::parseTestData(const	char*	name)	{
+				xmlParserCtxtPtr	parser_context;
+				xmlDocPtr	doc;
+	xmlNode	*root_node;
+	DPM_product	*product;
 
-	std::stringstream s;
-	std::string tmp;
+	std::stringstream	s;
+	std::string	tmp;
 
 	LIBXML_TEST_VERSION
-    if ((parser_context = xmlNewParserCtxt()) == NULL) {
-        fprintf(stderr,"Out of Memory\n");
-        exit(1);
-    }
+				if	((parser_context	=	xmlNewParserCtxt())	==	NULL)	{
+								fprintf(stderr,"Out	of	Memory\n");
+								exit(1);
+				}
 
-	doc = xmlCtxtReadFile(parser_context, name, NULL, XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
+	doc	=	xmlCtxtReadFile(parser_context,	name,	NULL,	XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
 
-	if (parser_context->valid) {
-        xmlFreeParserCtxt(parser_context);
-		root_node = xmlDocGetRootElement(doc);
+	if	(parser_context->valid)	{
+								xmlFreeParserCtxt(parser_context);
+		root_node	=	xmlDocGetRootElement(doc);
 
-        if ((product = new DPM_product( NULL, root_node)) == NULL ) {
-           fprintf(stderr,"Failed to create a DPM_product.\n");
-        }
+								if	((product	=	new	DPM_product(	NULL,	root_node))	==	NULL	)	{
+											fprintf(stderr,"Failed	to	create	a	DPM_product.\n");
+								}
 
-        s << product;
-		tmp = s.str();
+								s	<<	product;
+		tmp	=	s.str();
 
-		delete product;
+		delete	product;
 
-	} else {
+	}	else	{
 		xmlFreeParserCtxt(parser_context);
-		fprintf(stderr,"Failed to validate \"%s\"\n",name);
-		tmp = "Failed to validate";
+		fprintf(stderr,"Failed	to	validate	\"%s\"\n",name);
+		tmp	=	"Failed	to	validate";
 	}
-    xmlFreeDoc(doc);
+				xmlFreeDoc(doc);
 
-	return tmp;
+	return	tmp;
 }
 
-TEST_F(DPMTest, ValidateDTD) {
-	unsigned int i;
-	xmlParserCtxtPtr parser_context;
-	xmlDocPtr doc;
+TEST_F(DPMTest,	ValidateDTD)	{
+	unsigned	int	i;
+	xmlParserCtxtPtr	parser_context;
+	xmlDocPtr	doc;
 
 	LIBXML_TEST_VERSION
-    if ((parser_context = xmlNewParserCtxt()) == NULL) {
-        fprintf(stderr,"Out of Memory\n");
-        exit(1);
-    }
+				if	((parser_context	=	xmlNewParserCtxt())	==	NULL)	{
+								fprintf(stderr,"Out	of	Memory\n");
+								exit(1);
+				}
 
-	for (i=0 ; i<(sizeof(testxml)/sizeof(testxml[0])) ; i++) {
-    	doc = xmlCtxtReadFile(parser_context, testxml[i].c_str(), NULL, XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
+	for	(i=0	;	i<(sizeof(testxml)/sizeof(testxml[0]))	;	i++)	{
+					doc	=	xmlCtxtReadFile(parser_context,	testxml[i].c_str(),	NULL,	XML_PARSE_DTDVALID+XML_PARSE_NOERROR);
 
-		if (i < 9) {
+		if	(i	<	9)	{
 			ASSERT_TRUE(parser_context->valid);
-		} else {
+		}	else	{
 			ASSERT_FALSE(parser_context->valid);
 		}
 		xmlFreeDoc(doc);
@@ -128,13 +128,13 @@ TEST_F(DPMTest, ValidateDTD) {
 	xmlFreeParserCtxt(parser_context);
 }
 
-// Product 1
-TEST_F(DPMTest, VarvsTime_NoAttributes) {
+//	Product	1
+TEST_F(DPMTest,	VarvsTime_NoAttributes)	{
 	//req.add_requirement("2416241399");
 
-	std::string tmp = parseTestData(testxml[0].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
+	std::string	tmp	=	parseTestData(testxml[0].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
 		"<page>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
@@ -160,16 +160,16 @@ TEST_F(DPMTest, VarvsTime_NoAttributes) {
 		"</page>"
 		"</product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 2
-TEST_F(DPMTest, VarvsVar_NoAttributes) {
+//	Product	2
+TEST_F(DPMTest,	VarvsVar_NoAttributes)	{
 	//req.add_requirement("1589175037");
 
-    std::string tmp = parseTestData(testxml[1].c_str());
-    int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
+				std::string	tmp	=	parseTestData(testxml[1].c_str());
+				int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
 		"<page>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
@@ -186,14 +186,14 @@ TEST_F(DPMTest, VarvsVar_NoAttributes) {
 		"</page>"
 		"</product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 3
-TEST_F(DPMTest, Table_NoAttributes) {
-	std::string tmp = parseTestData(testxml[2].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
+//	Product	3
+TEST_F(DPMTest,	Table_NoAttributes)	{
+	std::string	tmp	=	parseTestData(testxml[2].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
 		"<table>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
@@ -211,24 +211,24 @@ TEST_F(DPMTest, Table_NoAttributes) {
 		"</table>"
 		"</product>",
 		tmp.c_str());
-	 EXPECT_EQ(result, 0);
+		EXPECT_EQ(result,	0);
 }
 
-// Product 4
-TEST_F(DPMTest, VarvsTime_Attributes) {
-    std::string tmp = parseTestData(testxml[3].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
-		"<title>Solar Elevation</title>"
+//	Product	4
+TEST_F(DPMTest,	VarvsTime_Attributes)	{
+				std::string	tmp	=	parseTestData(testxml[3].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
+		"<title>Solar	Elevation</title>"
 		"<page>"
-		"<title>Solar Elevation for a Day</title>"
+		"<title>Solar	Elevation	for	a	Day</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" grid_color=\"blue\""
-		"font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"<plot	grid=\"yes\"	grid_color=\"blue\""
+		"font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#eef0ff\">"
-		"<title>Sun Elevation vs. Time</title>"
+		"<title>Sun	Elevation	vs.	Time</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -242,32 +242,32 @@ TEST_F(DPMTest, VarvsTime_Attributes) {
 		"</axis>"
 		"<curve>"
 		"<var>sys.exec.out.time</var>"
-		"<var line_color=\"red\" line_style=\"dash\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"red\"	line_style=\"dash\">sun_predictor.sun.solar_elevation</var>"
 		"</curve>"
 		"</plot>"
 		"</page>"
 		"</product>",
 		tmp.c_str());
-    EXPECT_EQ(result, 0);
+				EXPECT_EQ(result,	0);
 }
 
-// Product 5
-TEST_F(DPMTest, VarvsVarvsTime_Attributes) {
+//	Product	5
+TEST_F(DPMTest,	VarvsVarvsTime_Attributes)	{
 	//req.add_requirement("2469402355");
 
-	std::string tmp = parseTestData(testxml[4].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\" foreground_color=\"#000000\" background_color=\"#ffffff\">"
-		"<title>title of the product</title>"
+	std::string	tmp	=	parseTestData(testxml[4].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\"	foreground_color=\"#000000\"	background_color=\"#ffffff\">"
+		"<title>title	of	the	product</title>"
 		"<page>"
-		"<title>Solar Elevation for a Day</title>"
+		"<title>Solar	Elevation	for	a	Day</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\""
-		"font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"<plot	grid=\"yes\""
+		"font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#fffff0\">"
-		"<title>Sun Time vs. Elevation vs. Azimuth</title>"
+		"<title>Sun	Time	vs.	Elevation	vs.	Azimuth</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -275,7 +275,7 @@ TEST_F(DPMTest, VarvsVarvsTime_Attributes) {
 		"<label>Azimuth</label>"
 		"<units>d</units>"
 		"</axis>"
-		"<axis format=\"%g\">"
+		"<axis	format=\"%g\">"
 		"<label>Elevation</label>"
 		"<units>d</units>"
 		"</axis>"
@@ -285,49 +285,49 @@ TEST_F(DPMTest, VarvsVarvsTime_Attributes) {
 		"</axis>"
 		"<curve>"
 		"<var>sun_predictor.sun.solar_azimuth</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"<var>sys.exec.out.time</var>"
 		"</curve>"
 		"</plot>"
 		"</page>"
 		"</product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 6
-TEST_F(DPMTest, Table_Attributes) {
-    std::string tmp = parseTestData(testxml[5].c_str());
-	//std::cout << tmp << std::endl;
-    int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
-		"<title>Table of Sun Positions</title>"
-		"<table foreground_color=\"#00ff00\" background_color=\"#556677\">"
-		"<title>Sun Azimuth vs. Time</title>"
+//	Product	6
+TEST_F(DPMTest,	Table_Attributes)	{
+				std::string	tmp	=	parseTestData(testxml[5].c_str());
+	//std::cout	<<	tmp	<<	std::endl;
+				int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
+		"<title>Table	of	Sun	Positions</title>"
+		"<table	foreground_color=\"#00ff00\"	background_color=\"#556677\">"
+		"<title>Sun	Azimuth	vs.	Time</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<column format=\"%24.10f\">"
+		"<column	format=\"%24.10f\">"
 		"<label>Time</label>"
 		"<units>s</units>"
 		"<var>sys.exec.out.time</var>"
 		"</column>"
-		"<column format=\"%16.5q\">"
+		"<column	format=\"%16.5q\">"
 		"<label>Azimuth</label>"
 		"<units>d</units>"
 		"<var>sun_predictor.sun.solar_azimuth</var>"
 		"</column>"
-		"<column format=\"%24.10f\">"
+		"<column	format=\"%24.10f\">"
 		"<label>Hours</label>"
 		"<units>hr</units>"
 		"<var>sys.exec.out.time</var>"
 		"</column>"
-        "<column format=\"%24.10f\">"
+								"<column	format=\"%24.10f\">"
 		"<label>Hours</label>"
 		"<units>hr</units>"
-		"<var units=\"hr\">sys.exec.out.time</var>"
+		"<var	units=\"hr\">sys.exec.out.time</var>"
 		"</column>"
-		"<column format=\"%16.5f\">"
+		"<column	format=\"%16.5f\">"
 		"<label>Elevation</label>"
 		"<units>d</units>"
 		"<var>sun_predictor.sun.solar_elevation</var>"
@@ -335,25 +335,25 @@ TEST_F(DPMTest, Table_Attributes) {
 		"</table>"
 		"</product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 7
-TEST_F(DPMTest, MultiplePlots) {
+//	Product	7
+TEST_F(DPMTest,	MultiplePlots)	{
 	//req.add_requirement("445237094");
 
-    std::string tmp = parseTestData(testxml[6].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
-		"<title>title of the product</title>"
-		"<page vcells=\"3\">"
-		"<title>Solar Elevation for a Day</title>"
+				std::string	tmp	=	parseTestData(testxml[6].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
+		"<title>title	of	the	product</title>"
+		"<page	vcells=\"3\">"
+		"<title>Solar	Elevation	for	a	Day</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"<plot	grid=\"yes\"	font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#fff0ff\">"
-		"<title>Sun Elevation vs. Time</title>"
+		"<title>Sun	Elevation	vs.	Time</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -364,124 +364,124 @@ TEST_F(DPMTest, MultiplePlots) {
 		"<units>d</units>"
 		"</axis><curve>"
 		"<var>sys.exec.out.time</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"</curve></plot>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"<plot	grid=\"yes\"	font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#f0fff0\">"
-		"<title>Sun Azimuth vs. Time</title>"
+		"<title>Sun	Azimuth	vs.	Time</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
 		"<axis><label>Time</label>"
 		"<units>hr</units>"
-		"</axis><axis format=\"%g\">"
+		"</axis><axis	format=\"%g\">"
 		"<label>Azimuth</label>"
 		"<units>d</units>"
 		"</axis><curve>"
 		"<var>sys.exec.out.time</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_azimuth</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_azimuth</var>"
 		"</curve></plot>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
-		" background_color=\"#fffff0\">"
-		"<title>Sun Elevation vs. Azimuth</title>"
+		"<plot	grid=\"yes\"	font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"	background_color=\"#fffff0\">"
+		"<title>Sun	Elevation	vs.	Azimuth</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
 		"<axis><label>Azimuth</label>"
 		"<units>d</units>"
-		"</axis><axis format=\"%g\">"
+		"</axis><axis	format=\"%g\">"
 		"<label>Elevation</label>"
 		"<units>d</units>"
 		"</axis><curve>"
 		"<var>sun_predictor.sun.solar_azimuth</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"</curve></plot></page></product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 8
-TEST_F(DPMTest, MultipleTables_Multipe_Plots) {
-	//req.add_requirement("1422666851 150267139 445237094");
+//	Product	8
+TEST_F(DPMTest,	MultipleTables_Multipe_Plots)	{
+	//req.add_requirement("1422666851	150267139	445237094");
 
-    std::string tmp = parseTestData(testxml[7].c_str());
-	int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\" background_color=\"#885588\">"
-		"<page><title>Solar Elevation for a Day</title>"
+				std::string	tmp	=	parseTestData(testxml[7].c_str());
+	int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\"	background_color=\"#885588\">"
+		"<page><title>Solar	Elevation	for	a	Day</title>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\">"
-		"<title>Sun Elevation vs. Time</title>"
+		"<plot	grid=\"yes\"	font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\">"
+		"<title>Sun	Elevation	vs.	Time</title>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
 		"<axis><label>Time</label><units>hr</units></axis><axis>"
 		"<label>Elevation</label><units>d</units></axis><curve>"
 		"<var>sys.exec.out.time</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"</curve></plot></page><page>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<plot grid=\"yes\" font=\"-*-new century schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
+		"<plot	grid=\"yes\"	font=\"-*-new	century	schoolbook-bold-r-*--12-*-*-*-*-*-*-*\""
 		"background_color=\"#fffff0\">"
-		"<title>Sun Elevation vs. Azimuth</title>"
+		"<title>Sun	Elevation	vs.	Azimuth</title>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
 		"<axis><label>Azimuth</label>"
 		"<units>d</units></axis><axis>"
 		"<label>Elevation</label><units>d</units></axis><curve>"
 		"<var>sun_predictor.sun.solar_azimuth</var>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"</curve></plot></page><table>"
-		"<title>My Two Column Table</title>"
+		"<title>My	Two	Column	Table</title>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<column format=\"%24.10f\">"
+		"<column	format=\"%24.10f\">"
 		"<label>Time</label>"
 		"<var>sys.exec.out.time</var>"
-		"</column><column format=\"%16.5q\">"
+		"</column><column	format=\"%16.5q\">"
 		"<label>Azimuth</label><units>d</units>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_azimuth</var>"
-		"</column><column format=\"%16.5f\">"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_azimuth</var>"
+		"</column><column	format=\"%16.5f\">"
 		"<label>Elevation</label><units>d</units>"
-		"<var line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.solar_elevation</var>"
 		"</column></table>"
-		"<table background_color=\"#ffeebb\">"
-		"<title>Four Column Table</title>"
+		"<table	background_color=\"#ffeebb\">"
+		"<title>Four	Column	Table</title>"
 		"<tstart>0</tstart><tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
-		"<column format=\"%24.10f\">"
+		"<column	format=\"%24.10f\">"
 		"<units>s</units><var>sys.exec.out.time</var>"
-		"</column><column format=\"%16.5f\">"
+		"</column><column	format=\"%16.5f\">"
 		"<label>Seconds</label>"
-		"<var line_color=\"#323200\">sun_predictor.sun.local_time.sec</var>"
-		"</column><column format=\"%16.5f\">"
+		"<var	line_color=\"#323200\">sun_predictor.sun.local_time.sec</var>"
+		"</column><column	format=\"%16.5f\">"
 		"<label>Day</label>"
-		"<var line_color=\"#323200\">sun_predictor.sun.local_time.day</var>"
-		"</column><column format=\"%16.5f\">"
+		"<var	line_color=\"#323200\">sun_predictor.sun.local_time.day</var>"
+		"</column><column	format=\"%16.5f\">"
 		"<label>Month</label>"
-		"<var line_color=\"#323200\">sun_predictor.sun.local_time.month</var>"
-		"</column><column format=\"%16.5f\">"
+		"<var	line_color=\"#323200\">sun_predictor.sun.local_time.month</var>"
+		"</column><column	format=\"%16.5f\">"
 		"<label>Year</label>"
-		"<var line_color=\"#323200\">sun_predictor.sun.local_time.year</var>"
+		"<var	line_color=\"#323200\">sun_predictor.sun.local_time.year</var>"
 		"</column></table></product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 
-// Product 9
-TEST_F(DPMTest, Multipe_Plots_NoAttributes) {
+//	Product	9
+TEST_F(DPMTest,	Multipe_Plots_NoAttributes)	{
 	//req.add_requirement("445237094");
 
-    std::string tmp = parseTestData(testxml[8].c_str());
-    int result = strcmp_IgnoringWhiteSpace(
-		"<product version=\"1.0\">"
-		"<page vcells=\"3\">"
-		"<title>Page of Squiggles</title>"
+				std::string	tmp	=	parseTestData(testxml[8].c_str());
+				int	result	=	strcmp_IgnoringWhiteSpace(
+		"<product	version=\"1.0\">"
+		"<page	vcells=\"3\">"
+		"<title>Page	of	Squiggles</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
 		"<plot>"
-		"<title>Squiggle 1</title>"
+		"<title>Squiggle	1</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -491,7 +491,7 @@ TEST_F(DPMTest, Multipe_Plots_NoAttributes) {
 		"</curve>"
 		"</plot>"
 		"<plot>"
-		"<title>Squiggle 2</title>"
+		"<title>Squiggle	2</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -501,7 +501,7 @@ TEST_F(DPMTest, Multipe_Plots_NoAttributes) {
 		"</curve>"
 		"</plot>"
 		"<plot>"
-		"<title>Squiggle 3</title>"
+		"<title>Squiggle	3</title>"
 		"<tstart>0</tstart>"
 		"<tstop>1.79769e+308</tstop>"
 		"<frequency>1.79769e+308</frequency>"
@@ -513,6 +513,6 @@ TEST_F(DPMTest, Multipe_Plots_NoAttributes) {
 		"</page>"
 		"</product>",
 		tmp.c_str());
-	EXPECT_EQ(result, 0);
+	EXPECT_EQ(result,	0);
 }
 }
diff --git a/trick_source/data_products/DPX/test/unit_test/DS_test.cpp b/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
index 56f6ac270..a3373b519 100644
--- a/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/DS_test.cpp
@@ -1,428 +1,428 @@
-#define protected public
-
-#include <iostream>
-#include <string.h>
-#include "Log/DataStream.hh"
-#include "Log/DataStreamFactory.hh"
-#include "DPC/DPC_UnitConvDataStream.hh"
-#include "DPC/DPC_TimeCstrDataStream.hh"
-#include "DPM/DPM_time_constraints.hh"
-
-#include "gtest/gtest.h"
-//#include "trick_utils/reqs/include/RequirementScribe.hh"
-
-namespace Trick {
-
-int strcmp_IgnoreWhiteSpace(const char* s1, const char* s2) {
-    int i1 = 0;
-    int i2 = 0;
-
-    while (1) {
-        while ( !isgraph( s1[i1] ) && s1[i1] != '\0') { i1++; }
-        while ( !isgraph( s2[i2] ) && s2[i2] != '\0') { i2++; }
-        if ( s1[i1] == '\0' && s2[i2] == '\0') { return 0; }
-        if ( s1[i1] != s2[i2]) {
-            if (s1[i1] < s2[i2]) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        i1++; i2++;
-    }
+#define	protected	public
+
+#include	<iostream>
+#include	<string.h>
+#include	"Log/DataStream.hh"
+#include	"Log/DataStreamFactory.hh"
+#include	"DPC/DPC_UnitConvDataStream.hh"
+#include	"DPC/DPC_TimeCstrDataStream.hh"
+#include	"DPM/DPM_time_constraints.hh"
+
+#include	"gtest/gtest.h"
+//#include	"trick_utils/reqs/include/RequirementScribe.hh"
+
+namespace	Trick	{
+
+int	strcmp_IgnoreWhiteSpace(const	char*	s1,	const	char*	s2)	{
+				int	i1	=	0;
+				int	i2	=	0;
+
+				while	(1)	{
+								while	(	!isgraph(	s1[i1]	)	&&	s1[i1]	!=	'\0')	{	i1++;	}
+								while	(	!isgraph(	s2[i2]	)	&&	s2[i2]	!=	'\0')	{	i2++;	}
+								if	(	s1[i1]	==	'\0'	&&	s2[i2]	==	'\0')	{	return	0;	}
+								if	(	s1[i1]	!=	s2[i2])	{
+												if	(s1[i1]	<	s2[i2])	{
+																return	-1;
+												}	else	{
+																return	1;
+												}
+								}
+								i1++;	i2++;
+				}
 }
 
-class DSTest : public :: testing::Test {
-    protected:
-        //Trick::RequirementScribe req;
-        std::string testxml[14];
+class	DSTest	:	public	::	testing::Test	{
+				protected:
+								//Trick::RequirementScribe	req;
+								std::string	testxml[14];
 
-        DSTest() {}
-        ~DSTest() {}
-        virtual void SetUp() {}
-        virtual void TearDown() {}
+								DSTest()	{}
+								~DSTest()	{}
+								virtual	void	SetUp()	{}
+								virtual	void	TearDown()	{}
 
-        std::string run(char ch);
+								std::string	run(char	ch);
 
-		const char* RUN_dir;
-	    const char* VarName;
-		std::string output;
-		int result;
+		const	char*	RUN_dir;
+					const	char*	VarName;
+		std::string	output;
+		int	result;
 
-		DataStreamFactory* data_stream_factory;
-		DataStream *testds, *srcds;
+		DataStreamFactory*	data_stream_factory;
+		DataStream	*testds,	*srcds;
 
 };
 
-std::string DSTest::run(char ch) {
-
-	int ret;
-	double time, value;
-	std::string spec;
-	std::stringstream s;
-
-	// === COMMANDS ===
-	// g -> get
-	// p -> peek
-	// f -> getFileName
-	// u -> getUnit
-	// t -> getTimeUnit
-	// b -> begin
-	// e -> end
-	// s -> step
-
-    switch (ch) {
-		case 'g' : {
-			ret = testds->get(&time, &value);
-			s << "get : " << "time = " << time << "     " << "value = " << value;
-			s << "return = " << ret;
-		} break;
-		case 'p' : {
-			ret = testds->peek(&time, &value);
-			//s << "peek: " << "time = " << time << "     " << "value = " << value;
-			if (ret) {
-				s << "peek: " << "time = " << time << "     " << "value = " << value;
-			} else {
-				s << "peek: Reached end of stream. No value to peek.";
+std::string	DSTest::run(char	ch)	{
+
+	int	ret;
+	double	time,	value;
+	std::string	spec;
+	std::stringstream	s;
+
+	//	===	COMMANDS	===
+	//	g	->	get
+	//	p	->	peek
+	//	f	->	getFileName
+	//	u	->	getUnit
+	//	t	->	getTimeUnit
+	//	b	->	begin
+	//	e	->	end
+	//	s	->	step
+
+				switch	(ch)	{
+		case	'g'	:	{
+			ret	=	testds->get(&time,	&value);
+			s	<<	"get	:	"	<<	"time	=	"	<<	time	<<	"					"	<<	"value	=	"	<<	value;
+			s	<<	"return	=	"	<<	ret;
+		}	break;
+		case	'p'	:	{
+			ret	=	testds->peek(&time,	&value);
+			//s	<<	"peek:	"	<<	"time	=	"	<<	time	<<	"					"	<<	"value	=	"	<<	value;
+			if	(ret)	{
+				s	<<	"peek:	"	<<	"time	=	"	<<	time	<<	"					"	<<	"value	=	"	<<	value;
+			}	else	{
+				s	<<	"peek:	Reached	end	of	stream.	No	value	to	peek.";
 			}
-			s << "return = " << ret;
-		} break;
-		case 'f' : {
-			spec = testds->getFileName();
-			s << "getFileName: " << "filename = " << "\"" << spec << "\"";
-		} break;
-		case 'u' : {
-			spec = testds->getUnit();
-			s << "getUnit: " << "unitspec = " << "\"" << spec << "\"";
-		} break;
-		case 't' : {
-			spec = testds->getTimeUnit();
-			s << "getTimeUnit: " << "timeunitspec = " << "\"" << spec << "\"";
-		} break;
-		case 'b' : {
+			s	<<	"return	=	"	<<	ret;
+		}	break;
+		case	'f'	:	{
+			spec	=	testds->getFileName();
+			s	<<	"getFileName:	"	<<	"filename	=	"	<<	"\""	<<	spec	<<	"\"";
+		}	break;
+		case	'u'	:	{
+			spec	=	testds->getUnit();
+			s	<<	"getUnit:	"	<<	"unitspec	=	"	<<	"\""	<<	spec	<<	"\"";
+		}	break;
+		case	't'	:	{
+			spec	=	testds->getTimeUnit();
+			s	<<	"getTimeUnit:	"	<<	"timeunitspec	=	"	<<	"\""	<<	spec	<<	"\"";
+		}	break;
+		case	'b'	:	{
 			testds->begin();
-			s << "begin";
-		} break;
-		case 'e' : {
-			ret = testds->end();
-			s << "end : return = " << ret;
-		} break;
-		case 's' : {
-	    	ret = testds->step();
-    		s << "step: return = " << ret;
-    	} break;
-    	default : {
-			s << "Invalid command";
-		} break;
+			s	<<	"begin";
+		}	break;
+		case	'e'	:	{
+			ret	=	testds->end();
+			s	<<	"end	:	return	=	"	<<	ret;
+		}	break;
+		case	's'	:	{
+						ret	=	testds->step();
+						s	<<	"step:	return	=	"	<<	ret;
+					}	break;
+					default	:	{
+			s	<<	"Invalid	command";
+		}	break;
 	}
-  	return s.str();
+			return	s.str();
 }
 
 
 
-// ASCII (CSV) DATASTREAM
-TEST_F(DSTest, DataStream_Ascii) {
-  	//req.add_requirement("32631267");
-
-	RUN_dir = "../TEST_DATA/RUN_ASCII";
-    VarName = "sun_predictor.sun.solar_azimuth";
-
-	data_stream_factory = new DataStreamFactory();
-    testds = data_stream_factory->create(RUN_dir, VarName, NULL);
-
-	// GET FILE NAME
-	output = run('f');
-    result = strcmp_IgnoreWhiteSpace(
-        "getFileName : filename = \"../TEST_DATA/RUN_ASCII/log_helios.csv\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET UNIT
-    output = run('u');
-    result = strcmp_IgnoreWhiteSpace("getUnit : unitspec = \"degree\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET TIME UNIT
-    output = run('t');
-    result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET
-    output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = 351.283     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 1     value = 351.289     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// PEEK
-	output = run('p');
-    result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 2     value= 351.295     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	output = run('p');
-    result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 2     value= 351.295     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// BEGIN
-	output = run('b');
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = 351.283    return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// STEP
-	output = run('s');
-	output = run('s');
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 3     value= 351.301    return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// END
-	output = run('e');
-	result = strcmp_IgnoreWhiteSpace("end : return = 0", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	delete data_stream_factory;
+//	ASCII	(CSV)	DATASTREAM
+TEST_F(DSTest,	DataStream_Ascii)	{
+			//req.add_requirement("32631267");
+
+	RUN_dir	=	"../TEST_DATA/RUN_ASCII";
+				VarName	=	"sun_predictor.sun.solar_azimuth";
+
+	data_stream_factory	=	new	DataStreamFactory();
+				testds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
+
+	//	GET	FILE	NAME
+	output	=	run('f');
+				result	=	strcmp_IgnoreWhiteSpace(
+								"getFileName	:	filename	=	\"../TEST_DATA/RUN_ASCII/log_helios.csv\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET	UNIT
+				output	=	run('u');
+				result	=	strcmp_IgnoreWhiteSpace("getUnit	:	unitspec	=	\"degree\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET	TIME	UNIT
+				output	=	run('t');
+				result	=	strcmp_IgnoreWhiteSpace("getTimeUnit	:	timeunitspec	=	\"s\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET
+				output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	351.283					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	1					value	=	351.289					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	PEEK
+	output	=	run('p');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	2					value=	351.295					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	output	=	run('p');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	2					value=	351.295					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	BEGIN
+	output	=	run('b');
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	351.283				return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	STEP
+	output	=	run('s');
+	output	=	run('s');
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	3					value=	351.301				return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	END
+	output	=	run('e');
+	result	=	strcmp_IgnoreWhiteSpace("end	:	return	=	0",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	delete	data_stream_factory;
 }
 
-// TRICK BINARY DATASTREAM
-TEST_F(DSTest, DataStream_Binary) {
+//	TRICK	BINARY	DATASTREAM
+TEST_F(DSTest,	DataStream_Binary)	{
 	//req.add_requirement("3201880761");
 
-	RUN_dir = "../TEST_DATA/RUN_BINARY";
-    VarName = "sun_predictor.sun.solar_elevation";
-
-    data_stream_factory = new DataStreamFactory();
-    testds = data_stream_factory->create(RUN_dir, VarName, NULL);
-
-    // GET FILE NAME
-    output = run('f');
-    result = strcmp_IgnoreWhiteSpace(
-    	"getFileName : filename = \"../TEST_DATA/RUN_BINARY/log_helios.trk\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET UNIT
-    output = run('u');
-    result = strcmp_IgnoreWhiteSpace("getUnit : unitspec = \"degree\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET TIME UNIT
-    output = run('t');
-    result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// GET
-    output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = -36.7426     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 1     value = -36.743     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// PEEK
-    output = run('p');
-    result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 2     value= -36.7434     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	output = run('p');
-    result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 2     value= -36.7434     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// BEGIN
-    output = run('b');
-    output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = -36.7426      return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// STEP
-    output = run('s');
-    output = run('s');
-    output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 3     value= -36.7438     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	// END
-	output = run('e');
-	result = strcmp_IgnoreWhiteSpace("end : return = 0", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	delete data_stream_factory;
+	RUN_dir	=	"../TEST_DATA/RUN_BINARY";
+				VarName	=	"sun_predictor.sun.solar_elevation";
+
+				data_stream_factory	=	new	DataStreamFactory();
+				testds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
+
+				//	GET	FILE	NAME
+				output	=	run('f');
+				result	=	strcmp_IgnoreWhiteSpace(
+					"getFileName	:	filename	=	\"../TEST_DATA/RUN_BINARY/log_helios.trk\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET	UNIT
+				output	=	run('u');
+				result	=	strcmp_IgnoreWhiteSpace("getUnit	:	unitspec	=	\"degree\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET	TIME	UNIT
+				output	=	run('t');
+				result	=	strcmp_IgnoreWhiteSpace("getTimeUnit	:	timeunitspec	=	\"s\"",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	GET
+				output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	-36.7426					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	1					value	=	-36.743					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	PEEK
+				output	=	run('p');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	2					value=	-36.7434					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	output	=	run('p');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	2					value=	-36.7434					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	BEGIN
+				output	=	run('b');
+				output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	-36.7426						return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	STEP
+				output	=	run('s');
+				output	=	run('s');
+				output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	3					value=	-36.7438					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	//	END
+	output	=	run('e');
+	result	=	strcmp_IgnoreWhiteSpace("end	:	return	=	0",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	delete	data_stream_factory;
 }
 
-// MATLAB DATASTREAM
-TEST_F(DSTest, DataStream_MatLab) {
-	//req.add_requirement("2533684432 1366633954");
-
-    RUN_dir = "../TEST_DATA/RUN_MATLAB";
-    VarName = "ch_joint_angle_5";
-
-    data_stream_factory = new DataStreamFactory();
-    testds = data_stream_factory->create(RUN_dir, VarName, "s_simtime");
-
-	// GET FILE NAME
-	output = run('f');
-	result = strcmp_IgnoreWhiteSpace(
-		"getFileName : filename= \"../TEST_DATA/RUN_MATLAB/nasa_p1.mat\"", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// GET UNIT
-	output = run('u');
-	result = strcmp_IgnoreWhiteSpace("getUnit : unitspec= \"1\"", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// GET TIME UNIT
-	output = run('t');
-	result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// GET
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0.05     value = -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// PEEK
-	output = run('p');
-	result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 0.1     value= -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	output = run('p');
-	result = strcmp_IgnoreWhiteSpace(
-		"peek : time = 0.1     value= -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// BEGIN
-	output = run('b');
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// STEP
-	output = run('s');
-	output = run('s');
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0.15     value= -210.146     return = 1", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	// END
-	output = run('e');
-	result = strcmp_IgnoreWhiteSpace("end : return = 0", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	delete data_stream_factory;
+//	MATLAB	DATASTREAM
+TEST_F(DSTest,	DataStream_MatLab)	{
+	//req.add_requirement("2533684432	1366633954");
+
+				RUN_dir	=	"../TEST_DATA/RUN_MATLAB";
+				VarName	=	"ch_joint_angle_5";
+
+				data_stream_factory	=	new	DataStreamFactory();
+				testds	=	data_stream_factory->create(RUN_dir,	VarName,	"s_simtime");
+
+	//	GET	FILE	NAME
+	output	=	run('f');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"getFileName	:	filename=	\"../TEST_DATA/RUN_MATLAB/nasa_p1.mat\"",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	GET	UNIT
+	output	=	run('u');
+	result	=	strcmp_IgnoreWhiteSpace("getUnit	:	unitspec=	\"1\"",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	GET	TIME	UNIT
+	output	=	run('t');
+	result	=	strcmp_IgnoreWhiteSpace("getTimeUnit	:	timeunitspec	=	\"s\"",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	GET
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0.05					value	=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	PEEK
+	output	=	run('p');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	0.1					value=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	output	=	run('p');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"peek	:	time	=	0.1					value=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	BEGIN
+	output	=	run('b');
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	STEP
+	output	=	run('s');
+	output	=	run('s');
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0.15					value=	-210.146					return	=	1",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	//	END
+	output	=	run('e');
+	result	=	strcmp_IgnoreWhiteSpace("end	:	return	=	0",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	delete	data_stream_factory;
 }
 
-// DELTA DATASTREAM
-// The delta statement is formatted as follows:
-//   delta(<var1:run1>, <var2:run2>)
-TEST_F(DSTest, DataStream_Delta) {
+//	DELTA	DATASTREAM
+//	The	delta	statement	is	formatted	as	follows:
+//			delta(<var1:run1>,	<var2:run2>)
+TEST_F(DSTest,	DataStream_Delta)	{
 	//req.add_requirement("2904854297");
 
-	RUN_dir = NULL;
-	char DeltaName[1000];
+	RUN_dir	=	NULL;
+	char	DeltaName[1000];
 
-	const char* a = "sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN1";
-	const char* b = "sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN2";
+	const	char*	a	=	"sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN1";
+	const	char*	b	=	"sun_predictor.sun.solar_azimuth:../TEST_DATA/BUNCHORUNS/RUN2";
 
-	snprintf(DeltaName, sizeof(DeltaName), "delta(%s, %s)", a, b);
+	snprintf(DeltaName,	sizeof(DeltaName),	"delta(%s,	%s)",	a,	b);
 
-    data_stream_factory = new DataStreamFactory();
-    testds = data_stream_factory->create(RUN_dir, DeltaName, "s_simtime");
+				data_stream_factory	=	new	DataStreamFactory();
+				testds	=	data_stream_factory->create(RUN_dir,	DeltaName,	"s_simtime");
 
-	delete data_stream_factory;
+	delete	data_stream_factory;
 }
 
-// DPC UNIT CONVERSION DATASTREAM
-TEST_F(DSTest, DataStream_DPCUnitConv) {
+//	DPC	UNIT	CONVERSION	DATASTREAM
+TEST_F(DSTest,	DataStream_DPCUnitConv)	{
 	//req.add_requirement("2269871888");
 
-	RUN_dir = "../TEST_DATA/RUN_BINARY";
-	VarName = "sun_predictor.sun.right_ascension";
+	RUN_dir	=	"../TEST_DATA/RUN_BINARY";
+	VarName	=	"sun_predictor.sun.right_ascension";
 
-	data_stream_factory = new DataStreamFactory();
-    srcds = data_stream_factory->create(RUN_dir, VarName, NULL);
-	testds = new DPC_UnitConvDataStream(srcds, "rad", "degree");
+	data_stream_factory	=	new	DataStreamFactory();
+				srcds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
+	testds	=	new	DPC_UnitConvDataStream(srcds,	"rad",	"degree");
 
-	output = run('g');
-    result = strcmp_IgnoreWhiteSpace(
-		"get : time = 0     value = 1.56605     return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
+	output	=	run('g');
+				result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	0					value	=	1.56605					return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
 
-	output = run('u');
-	result = strcmp_IgnoreWhiteSpace("getUnit : unitspec = \"rad\"", output.c_str());
-	EXPECT_EQ(result, 0);
+	output	=	run('u');
+	result	=	strcmp_IgnoreWhiteSpace("getUnit	:	unitspec	=	\"rad\"",	output.c_str());
+	EXPECT_EQ(result,	0);
 
-	output = run('t');
-    result = strcmp_IgnoreWhiteSpace("getTimeUnit : timeunitspec = \"s\"", output.c_str());
-    EXPECT_EQ(result, 0);
+	output	=	run('t');
+				result	=	strcmp_IgnoreWhiteSpace("getTimeUnit	:	timeunitspec	=	\"s\"",	output.c_str());
+				EXPECT_EQ(result,	0);
 
-	delete data_stream_factory;
-	delete testds;
+	delete	data_stream_factory;
+	delete	testds;
 }
 
-// TIME CONSTRAINT DATASTREAM
-TEST_F(DSTest, DataStream_DPCTimeCstr) {
+//	TIME	CONSTRAINT	DATASTREAM
+TEST_F(DSTest,	DataStream_DPCTimeCstr)	{
 	//req.add_requirement("3610816325");
 
-	int i;
-	DPM_time_constraints *time_constraints;
+	int	i;
+	DPM_time_constraints	*time_constraints;
 
-	RUN_dir = "../TEST_DATA/RUN_BINARY";
-	VarName = "sun_predictor.sun.utc.sec";
+	RUN_dir	=	"../TEST_DATA/RUN_BINARY";
+	VarName	=	"sun_predictor.sun.utc.sec";
 
-	data_stream_factory = new DataStreamFactory();
-    srcds = data_stream_factory->create(RUN_dir, VarName, NULL);
-    time_constraints = new DPM_time_constraints(0.0, 5.0, 50.0);
+	data_stream_factory	=	new	DataStreamFactory();
+				srcds	=	data_stream_factory->create(RUN_dir,	VarName,	NULL);
+				time_constraints	=	new	DPM_time_constraints(0.0,	5.0,	50.0);
 
-	testds = new DPC_TimeCstrDataStream(srcds, time_constraints);
+	testds	=	new	DPC_TimeCstrDataStream(srcds,	time_constraints);
 
-	for (i = 0; i < 6; i++) {
-		output = run('s');
-		result = strcmp_IgnoreWhiteSpace("step: return = 1", output.c_str());
-	    EXPECT_EQ(result, 0);
+	for	(i	=	0;	i	<	6;	i++)	{
+		output	=	run('s');
+		result	=	strcmp_IgnoreWhiteSpace("step:	return	=	1",	output.c_str());
+					EXPECT_EQ(result,	0);
 	}
-	// REACHED END OF STREAM
-	output = run('s');
-	result = strcmp_IgnoreWhiteSpace("step: return = 0", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	output = run('g');
-	result = strcmp_IgnoreWhiteSpace(
-		"get : time = 5	    value = 5     return = 0", output.c_str());
-	EXPECT_EQ(result, 0);
-
-	output = run('p');
-	result = strcmp_IgnoreWhiteSpace(
-		"peek: Reached end of stream. No value to peek.     return = 0", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	output = run('e');
-    result = strcmp_IgnoreWhiteSpace("end : return = 1", output.c_str());
-    EXPECT_EQ(result, 0);
-
-	delete data_stream_factory;
-	delete testds;
+	//	REACHED	END	OF	STREAM
+	output	=	run('s');
+	result	=	strcmp_IgnoreWhiteSpace("step:	return	=	0",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	output	=	run('g');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"get	:	time	=	5					value	=	5					return	=	0",	output.c_str());
+	EXPECT_EQ(result,	0);
+
+	output	=	run('p');
+	result	=	strcmp_IgnoreWhiteSpace(
+		"peek:	Reached	end	of	stream.	No	value	to	peek.					return	=	0",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	output	=	run('e');
+				result	=	strcmp_IgnoreWhiteSpace("end	:	return	=	1",	output.c_str());
+				EXPECT_EQ(result,	0);
+
+	delete	data_stream_factory;
+	delete	testds;
 }
 
 }
diff --git a/trick_source/data_products/DPX/test/unit_test/test_view.cpp b/trick_source/data_products/DPX/test/unit_test/test_view.cpp
index 31577ec78..f17d1b9e2 100644
--- a/trick_source/data_products/DPX/test/unit_test/test_view.cpp
+++ b/trick_source/data_products/DPX/test/unit_test/test_view.cpp
@@ -1,275 +1,275 @@
-#include <string.h>
+#include	<string.h>
 
-#include "test_view.hh"
-#include "gtest/gtest.h"
+#include	"test_view.hh"
+#include	"gtest/gtest.h"
 
-std::string Test_view::getOutput() {
-	std::string tmp = s.str();
-	return tmp;
+std::string	Test_view::getOutput()	{
+	std::string	tmp	=	s.str();
+	return	tmp;
 }
 
-DPV_pointer Test_view::render_product( DPC_product* product){
-	const char *temp_cstr;
-
-	s << "PRODUCT VIEW:" << std::endl;
-    s << "Attribute version: " <<  product->getAttribute("version") << std::endl;
-	if ((temp_cstr = product->getTitle()) != NULL) {
-  		s << "Product title: " << product->getTitle() << std::endl;
-  	}
-	if ((temp_cstr = product->getAttribute("foreground_color")) != NULL) {
-        s << "Attribute foreground_color: " << temp_cstr << std::endl;
-    }
-    if ((temp_cstr = product->getAttribute("background_color")) != NULL) {
-        s << "Attribute background_color: " << temp_cstr << std::endl;
-    }
-
-	return ( (DPV_pointer)0x01111111 );
+DPV_pointer	Test_view::render_product(	DPC_product*	product){
+	const	char	*temp_cstr;
+
+	s	<<	"PRODUCT	VIEW:"	<<	std::endl;
+				s	<<	"Attribute	version:	"	<<		product->getAttribute("version")	<<	std::endl;
+	if	((temp_cstr	=	product->getTitle())	!=	NULL)	{
+				s	<<	"Product	title:	"	<<	product->getTitle()	<<	std::endl;
+			}
+	if	((temp_cstr	=	product->getAttribute("foreground_color"))	!=	NULL)	{
+								s	<<	"Attribute	foreground_color:	"	<<	temp_cstr	<<	std::endl;
+				}
+				if	((temp_cstr	=	product->getAttribute("background_color"))	!=	NULL)	{
+								s	<<	"Attribute	background_color:	"	<<	temp_cstr	<<	std::endl;
+				}
+
+	return	(	(DPV_pointer)0x01111111	);
 }
 
-DPV_pointer Test_view::render_page( DPV_pointer parent_data, DPC_page* page) {
-  	const char *temp_cstr;
+DPV_pointer	Test_view::render_page(	DPV_pointer	parent_data,	DPC_page*	page)	{
+			const	char	*temp_cstr;
 	(void)parent_data;
-  	s << "PAGE VIEW:" << std::endl;
-  	if ((temp_cstr = page->getTitle()) != NULL) {
-    	s << "Page title: " << page->getTitle() << std::endl;
-  	}
-	if ((temp_cstr = page->getAttribute("foreground_color")) != NULL) {
-        s << "Attribute foreground_color: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("background_color")) != NULL) {
-        s << "Attribute background_color: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("hcells")) != NULL) {
-        s << "Attribute hcells: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("foreground_color")) != NULL) {
-        s << "Attribute vcells: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("presentation")) != NULL) {
-        s << "Attribute presentation: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("gnuplot_template")) != NULL) {
-        s << "Attribute gnuplot_template: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("gnuplot_object")) != NULL) {
-        s << "Attribute gnuplot_object: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("gnuplot_geom")) != NULL) {
-        s << "Attribute gnuplot_geom: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("gnuplot_plot_ratio")) != NULL) {
-        s << "Attribute gnuplot_plot_ratio: " << temp_cstr << std::endl;
-    }
-	if ((temp_cstr = page->getAttribute("gnuplot_page_orientation")) != NULL) {
-        s << "Attribute gnuplot_page_orientation: " << temp_cstr << std::endl;
-    }
-
-
-  	return ( (DPV_pointer)0x02222222 );
+			s	<<	"PAGE	VIEW:"	<<	std::endl;
+			if	((temp_cstr	=	page->getTitle())	!=	NULL)	{
+					s	<<	"Page	title:	"	<<	page->getTitle()	<<	std::endl;
+			}
+	if	((temp_cstr	=	page->getAttribute("foreground_color"))	!=	NULL)	{
+								s	<<	"Attribute	foreground_color:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("background_color"))	!=	NULL)	{
+								s	<<	"Attribute	background_color:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("hcells"))	!=	NULL)	{
+								s	<<	"Attribute	hcells:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("foreground_color"))	!=	NULL)	{
+								s	<<	"Attribute	vcells:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("presentation"))	!=	NULL)	{
+								s	<<	"Attribute	presentation:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("gnuplot_template"))	!=	NULL)	{
+								s	<<	"Attribute	gnuplot_template:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("gnuplot_object"))	!=	NULL)	{
+								s	<<	"Attribute	gnuplot_object:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("gnuplot_geom"))	!=	NULL)	{
+								s	<<	"Attribute	gnuplot_geom:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("gnuplot_plot_ratio"))	!=	NULL)	{
+								s	<<	"Attribute	gnuplot_plot_ratio:	"	<<	temp_cstr	<<	std::endl;
+				}
+	if	((temp_cstr	=	page->getAttribute("gnuplot_page_orientation"))	!=	NULL)	{
+								s	<<	"Attribute	gnuplot_page_orientation:	"	<<	temp_cstr	<<	std::endl;
+				}
+
+
+			return	(	(DPV_pointer)0x02222222	);
 }
 
-DPV_pointer Test_view::render_plot( DPV_pointer parent_data, DPC_plot* plot) {
-  	const char *temp_cstr;
+DPV_pointer	Test_view::render_plot(	DPV_pointer	parent_data,	DPC_plot*	plot)	{
+			const	char	*temp_cstr;
 	(void)parent_data;
-  	s << "PLOT VIEW:" << std::endl;
-  	if ((temp_cstr = plot->getTitle()) != NULL) {
-  		s << "Plot title: " << plot->getTitle() << std::endl;
-  	}
-
-  	s << "Number of Curves: " << plot->getNumCurves() << std::endl;
-  	s << "X-axis label: " << plot->getXLabel() << std::endl;
-  	s << "Y-axis label: " << plot->getYLabel() << std::endl;
-
-  	if ((temp_cstr = plot->getAttribute("xmin")) != NULL) {
-    	s << "Attribute xmin: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = plot->getAttribute("xmax")) != NULL) {
-    	s << "Attribute xmax: " << temp_cstr << std::endl;
-  	}
-	if ((temp_cstr = plot->getAttribute("x_scale")) != NULL) {
-	    s << "Attribute x_scale: " << temp_cstr << std::endl;
+			s	<<	"PLOT	VIEW:"	<<	std::endl;
+			if	((temp_cstr	=	plot->getTitle())	!=	NULL)	{
+				s	<<	"Plot	title:	"	<<	plot->getTitle()	<<	std::endl;
+			}
+
+			s	<<	"Number	of	Curves:	"	<<	plot->getNumCurves()	<<	std::endl;
+			s	<<	"X-axis	label:	"	<<	plot->getXLabel()	<<	std::endl;
+			s	<<	"Y-axis	label:	"	<<	plot->getYLabel()	<<	std::endl;
+
+			if	((temp_cstr	=	plot->getAttribute("xmin"))	!=	NULL)	{
+					s	<<	"Attribute	xmin:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	plot->getAttribute("xmax"))	!=	NULL)	{
+					s	<<	"Attribute	xmax:	"	<<	temp_cstr	<<	std::endl;
+			}
+	if	((temp_cstr	=	plot->getAttribute("x_scale"))	!=	NULL)	{
+					s	<<	"Attribute	x_scale:	"	<<	temp_cstr	<<	std::endl;
 	}
-  	if ((temp_cstr = plot->getAttribute("ymin")) != NULL) {
-    	s << "Attribute ymin: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = plot->getAttribute("ymax")) != NULL) {
-    	s << "Attribute ymax: " << temp_cstr << std::endl;
-  	}
-    if ((temp_cstr = plot->getAttribute("y_scale")) != NULL) {
-        s << "Attribute y_scale: " << temp_cstr << std::endl;
-    }
-  	if ((temp_cstr = plot->getAttribute("grid")) != NULL) {
-    	s << "Attribute grid: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = plot->getAttribute("grid_color")) != NULL) {
-    	s << "Attribute grid_color: " << temp_cstr << std::endl;
-  	}
- 	if ((temp_cstr = plot->getAttribute("foreground_color")) != NULL) {
-    	s << "Attribute foreground_color: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = plot->getAttribute("background_color")) != NULL) {
-    	s << "Attribute background_color: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = plot->getAttribute("font")) != NULL) {
-    	s << "Attribute font: " << temp_cstr << std::endl;
-  	}
-  	return ( (DPV_pointer)0x03333333 );
+			if	((temp_cstr	=	plot->getAttribute("ymin"))	!=	NULL)	{
+					s	<<	"Attribute	ymin:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	plot->getAttribute("ymax"))	!=	NULL)	{
+					s	<<	"Attribute	ymax:	"	<<	temp_cstr	<<	std::endl;
+			}
+				if	((temp_cstr	=	plot->getAttribute("y_scale"))	!=	NULL)	{
+								s	<<	"Attribute	y_scale:	"	<<	temp_cstr	<<	std::endl;
+				}
+			if	((temp_cstr	=	plot->getAttribute("grid"))	!=	NULL)	{
+					s	<<	"Attribute	grid:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	plot->getAttribute("grid_color"))	!=	NULL)	{
+					s	<<	"Attribute	grid_color:	"	<<	temp_cstr	<<	std::endl;
+			}
+		if	((temp_cstr	=	plot->getAttribute("foreground_color"))	!=	NULL)	{
+					s	<<	"Attribute	foreground_color:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	plot->getAttribute("background_color"))	!=	NULL)	{
+					s	<<	"Attribute	background_color:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	plot->getAttribute("font"))	!=	NULL)	{
+					s	<<	"Attribute	font:	"	<<	temp_cstr	<<	std::endl;
+			}
+			return	(	(DPV_pointer)0x03333333	);
 }
 
-DPV_pointer Test_view::render_table( DPV_pointer parent_data, DPC_table  *table) {
-	const char *temp_cstr;
+DPV_pointer	Test_view::render_table(	DPV_pointer	parent_data,	DPC_table		*table)	{
+	const	char	*temp_cstr;
 	(void)parent_data;
-  	int n_columns, colix;
-  	int i,j;
-  	double time;
-	double * values;
-
-  	std::stringstream begin1;
-  	std::stringstream begin2;
-
-  	s << "TABLE VIEW:" << std::endl;
-
-  	s << "RUN Directory: " << table->getRunDir() << std::endl;
-  	if ((temp_cstr = table->getTitle()) != NULL) {
-		s << "Title: " << temp_cstr << std::endl;
-  	}
-
-  	n_columns = table->getNumColumns();
-  	s << "Number of Columns: " << n_columns << std::endl;
-
-  	for (colix=0; colix < n_columns ; colix++) {
-    	if ((temp_cstr = table->getColumnLabel(colix).c_str())[0] != '\0') {
-      		s << "Column Label [" << colix << "]: " << temp_cstr << std::endl;
-    	}
-    	if ((temp_cstr = table->getColumnVarName(colix)) != NULL) {
-      		s << "Variable Name[" << colix << "]: " << temp_cstr << std::endl;
-    	}
-    	if ((temp_cstr = table->getColumnUnits(colix)) != NULL) {
-      		s << "Column Units [" << colix << "]: " << temp_cstr << std::endl;
-    	}
-    	if ((temp_cstr = table->getColumnAttribute(colix,"format")) != NULL) {
-      		s << "format [" << colix << "]: " << temp_cstr << std::endl;
-    	}
-  	}
-
-  	values = new double[n_columns];
-
-	for (i=0; i<5 ; i++) {
-    	if ( table->getRow(&time, values)) {
-        	begin1 << "time: " << time << " values: ";
-			s << "time: " << time << " values: ";
-            for (j=0; j<n_columns ; j++) {
-                 begin1 << " " << values[j];
-				 s << " " << values[j];
-            }
-			begin1 << std::endl;
-            s << std::endl;
-       }
-  	}
-
-  	// To test begin() Re-initialize the values, begin() and doing it again.
-  	// The following lines should be the same as the previous lines.
-  	for (i=0; i<n_columns ; i++) { values[i] = 0.0; }
-  	table->begin();
-  	for (i=0; i<5 ; i++) {
-       	if ( table->getRow(&time, values)) {
-			begin2 << "time: " << time << " values: ";
-            for (j=0; j<n_columns ; j++) {
-                 begin2 << " " << values[j];
-            }
-            begin2 << std::endl;
-       	}
-  	}
-  	EXPECT_EQ(strcmp(begin1.str().c_str(), begin2.str().c_str()), 0);
-
-  	delete [] values;
-
-  	return ( (DPV_pointer)0x03333333 );
+			int	n_columns,	colix;
+			int	i,j;
+			double	time;
+	double	*	values;
+
+			std::stringstream	begin1;
+			std::stringstream	begin2;
+
+			s	<<	"TABLE	VIEW:"	<<	std::endl;
+
+			s	<<	"RUN	Directory:	"	<<	table->getRunDir()	<<	std::endl;
+			if	((temp_cstr	=	table->getTitle())	!=	NULL)	{
+		s	<<	"Title:	"	<<	temp_cstr	<<	std::endl;
+			}
+
+			n_columns	=	table->getNumColumns();
+			s	<<	"Number	of	Columns:	"	<<	n_columns	<<	std::endl;
+
+			for	(colix=0;	colix	<	n_columns	;	colix++)	{
+					if	((temp_cstr	=	table->getColumnLabel(colix).c_str())[0]	!=	'\0')	{
+								s	<<	"Column	Label	["	<<	colix	<<	"]:	"	<<	temp_cstr	<<	std::endl;
+					}
+					if	((temp_cstr	=	table->getColumnVarName(colix))	!=	NULL)	{
+								s	<<	"Variable	Name["	<<	colix	<<	"]:	"	<<	temp_cstr	<<	std::endl;
+					}
+					if	((temp_cstr	=	table->getColumnUnits(colix))	!=	NULL)	{
+								s	<<	"Column	Units	["	<<	colix	<<	"]:	"	<<	temp_cstr	<<	std::endl;
+					}
+					if	((temp_cstr	=	table->getColumnAttribute(colix,"format"))	!=	NULL)	{
+								s	<<	"format	["	<<	colix	<<	"]:	"	<<	temp_cstr	<<	std::endl;
+					}
+			}
+
+			values	=	new	double[n_columns];
+
+	for	(i=0;	i<5	;	i++)	{
+					if	(	table->getRow(&time,	values))	{
+									begin1	<<	"time:	"	<<	time	<<	"	values:	";
+			s	<<	"time:	"	<<	time	<<	"	values:	";
+												for	(j=0;	j<n_columns	;	j++)	{
+																	begin1	<<	"	"	<<	values[j];
+					s	<<	"	"	<<	values[j];
+												}
+			begin1	<<	std::endl;
+												s	<<	std::endl;
+							}
+			}
+
+			//	To	test	begin()	Re-initialize	the	values,	begin()	and	doing	it	again.
+			//	The	following	lines	should	be	the	same	as	the	previous	lines.
+			for	(i=0;	i<n_columns	;	i++)	{	values[i]	=	0.0;	}
+			table->begin();
+			for	(i=0;	i<5	;	i++)	{
+								if	(	table->getRow(&time,	values))	{
+			begin2	<<	"time:	"	<<	time	<<	"	values:	";
+												for	(j=0;	j<n_columns	;	j++)	{
+																	begin2	<<	"	"	<<	values[j];
+												}
+												begin2	<<	std::endl;
+								}
+			}
+			EXPECT_EQ(strcmp(begin1.str().c_str(),	begin2.str().c_str()),	0);
+
+			delete	[]	values;
+
+			return	(	(DPV_pointer)0x03333333	);
 }
 
-DPV_pointer Test_view::render_curve( DPV_pointer parent_data, DPC_curve* curve) {
-  	int i;
-  	const char *temp_cstr;
+DPV_pointer	Test_view::render_curve(	DPV_pointer	parent_data,	DPC_curve*	curve)	{
+			int	i;
+			const	char	*temp_cstr;
 	(void)parent_data;
-  	s << "CURVE VIEW:" << std::endl;
-  	s << "X Var Name: " << curve->getXVarName() << std::endl;
-  	s << "X Units: " << curve->getXUnits() << std::endl;
-  	s << "Y Var Name: " << curve->getYVarName() << std::endl;
-  	s << "Y Units: " << curve->getYUnits() << std::endl;
-  	s << "RUN Directory: " << curve->getDataSrcLbl() << std::endl;
-
-  	if ((temp_cstr = curve->getXAttribute("min")) != NULL) {
-    	s << "Attribute x min: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getXAttribute("max")) != NULL) {
-    	s << "Attribute x max: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getXAttribute("symbol_style")) != NULL) {
-    	s << "Attribute x symbol_style: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getXAttribute("symbol_size")) != NULL) {
-    	s << "Attribute x symbol_size: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getXAttribute("line_style")) != NULL) {
-    	s << "Attribute x line_style: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getXAttribute("line_color")) != NULL) {
-    	s << "Attribute x line_color: " << temp_cstr << std::endl;
-  	}
-	if ((temp_cstr = curve->getXAttribute("gnuplot_line_style")) != NULL) {
-        s << "Attribute x gnuplot_line_style: " << temp_cstr << std::endl;
-    }
-
-  	if ((temp_cstr = curve->getYAttribute("min")) != NULL) {
-    	s << "Attribute y min: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getYAttribute("max")) != NULL) {
-    	s << "Attribute y max: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getYAttribute("symbol_style")) != NULL) {
-    	s << "Attribute y symbol_style: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getYAttribute("symbol_size")) != NULL) {
-    	s << "Attribute y symbol_size: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getYAttribute("line_style")) != NULL) {
-    	s << "Attribute y line_style: " << temp_cstr << std::endl;
-  	}
-  	if ((temp_cstr = curve->getYAttribute("line_color")) != NULL) {
-    	s << "Attribute y line_color: " << temp_cstr << std::endl;
-  	}
-	if ((temp_cstr = curve->getYAttribute("gnuplot_line_style")) != NULL) {
-        s << "Attribute y gnuplot_line_style: " << temp_cstr << std::endl;
-    }
-
-  	s << "First 5 points:" << std::endl;
-  	for (i=0 ; i < 5 ; i++) {
-    	double x, y;
-    	if (curve->getXY(&x, &y) ) {
-      		s << "<" << x << "," << y << ">[" << i << "]" << std::endl;
-    	}
-  	}
-
-  	return ( (DPV_pointer)0x04444444 );
+			s	<<	"CURVE	VIEW:"	<<	std::endl;
+			s	<<	"X	Var	Name:	"	<<	curve->getXVarName()	<<	std::endl;
+			s	<<	"X	Units:	"	<<	curve->getXUnits()	<<	std::endl;
+			s	<<	"Y	Var	Name:	"	<<	curve->getYVarName()	<<	std::endl;
+			s	<<	"Y	Units:	"	<<	curve->getYUnits()	<<	std::endl;
+			s	<<	"RUN	Directory:	"	<<	curve->getDataSrcLbl()	<<	std::endl;
+
+			if	((temp_cstr	=	curve->getXAttribute("min"))	!=	NULL)	{
+					s	<<	"Attribute	x	min:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getXAttribute("max"))	!=	NULL)	{
+					s	<<	"Attribute	x	max:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getXAttribute("symbol_style"))	!=	NULL)	{
+					s	<<	"Attribute	x	symbol_style:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getXAttribute("symbol_size"))	!=	NULL)	{
+					s	<<	"Attribute	x	symbol_size:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getXAttribute("line_style"))	!=	NULL)	{
+					s	<<	"Attribute	x	line_style:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getXAttribute("line_color"))	!=	NULL)	{
+					s	<<	"Attribute	x	line_color:	"	<<	temp_cstr	<<	std::endl;
+			}
+	if	((temp_cstr	=	curve->getXAttribute("gnuplot_line_style"))	!=	NULL)	{
+								s	<<	"Attribute	x	gnuplot_line_style:	"	<<	temp_cstr	<<	std::endl;
+				}
+
+			if	((temp_cstr	=	curve->getYAttribute("min"))	!=	NULL)	{
+					s	<<	"Attribute	y	min:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getYAttribute("max"))	!=	NULL)	{
+					s	<<	"Attribute	y	max:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getYAttribute("symbol_style"))	!=	NULL)	{
+					s	<<	"Attribute	y	symbol_style:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getYAttribute("symbol_size"))	!=	NULL)	{
+					s	<<	"Attribute	y	symbol_size:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getYAttribute("line_style"))	!=	NULL)	{
+					s	<<	"Attribute	y	line_style:	"	<<	temp_cstr	<<	std::endl;
+			}
+			if	((temp_cstr	=	curve->getYAttribute("line_color"))	!=	NULL)	{
+					s	<<	"Attribute	y	line_color:	"	<<	temp_cstr	<<	std::endl;
+			}
+	if	((temp_cstr	=	curve->getYAttribute("gnuplot_line_style"))	!=	NULL)	{
+								s	<<	"Attribute	y	gnuplot_line_style:	"	<<	temp_cstr	<<	std::endl;
+				}
+
+			s	<<	"First	5	points:"	<<	std::endl;
+			for	(i=0	;	i	<	5	;	i++)	{
+					double	x,	y;
+					if	(curve->getXY(&x,	&y)	)	{
+								s	<<	"<"	<<	x	<<	","	<<	y	<<	">["	<<	i	<<	"]"	<<	std::endl;
+					}
+			}
+
+			return	(	(DPV_pointer)0x04444444	);
 }
 
-void Test_view::finalize_product_view( DPV_pointer product_view ) {
-  	s << "FINALIZE PRODUCT VIEW." << std::endl;
+void	Test_view::finalize_product_view(	DPV_pointer	product_view	)	{
+			s	<<	"FINALIZE	PRODUCT	VIEW."	<<	std::endl;
 	(void)product_view;
 }
 
-void Test_view::finalize_page_view( DPV_pointer page_view ) {
-	s << "FINALIZE PAGE VIEW." << std::endl;
+void	Test_view::finalize_page_view(	DPV_pointer	page_view	)	{
+	s	<<	"FINALIZE	PAGE	VIEW."	<<	std::endl;
 	(void)page_view;
 }
 
-void Test_view::finalize_plot_view( DPV_pointer plot_view ) {
-	s << "FINALIZE PLOT VIEW." << std::endl;
+void	Test_view::finalize_plot_view(	DPV_pointer	plot_view	)	{
+	s	<<	"FINALIZE	PLOT	VIEW."	<<	std::endl;
 	(void)plot_view;
 }
 
-void Test_view::finalize_table_view( DPV_pointer table_view ) {
-	s << "FINALIZE TABLE VIEW." << std::endl;
+void	Test_view::finalize_table_view(	DPV_pointer	table_view	)	{
+	s	<<	"FINALIZE	TABLE	VIEW."	<<	std::endl;
 	(void)table_view;
 }
 
diff --git a/trick_source/data_products/Log/Csv.cpp b/trick_source/data_products/Log/Csv.cpp
index e90aa922b..d236689ad 100644
--- a/trick_source/data_products/Log/Csv.cpp
+++ b/trick_source/data_products/Log/Csv.cpp
@@ -1,184 +1,184 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <math.h>
-#include "Csv.hh"
-#include "trick/map_trick_units_to_udunits.hh"
-
-Csv::Csv(char * file_name , char * param_name ) {
-
-        char * header ;
-        char * next_field ;
-        int len ;
-
-        fileName_ = file_name ;
-        len = strlen(param_name) ;
-
-        if ((fp_ = fopen(file_name , "r")) == 0 ) {
-           std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-           exit(-1) ;
-        }
-
-        line_ = new char[20480] ;
-        header = new char[20480] ;
-        fgets( header , 20480 , fp_ );
-
-        // remove trailing newline
-        header[strlen(header)-1] = '\0' ;
-
-        field_num_ = 0 ;
-        next_field = strtok( header , "," ) ;
-
-        if ( strncmp(next_field , param_name, len) ) {
-                field_num_++ ;
-                while ((next_field = strtok( NULL , "," ))) {
-                        char *space_loc = strchr(next_field, ' ');
-                        int actual_name_len = space_loc - next_field;
-                        // need to make sure if the length of the parameter and the length
-                        // of the parameter found in the next_field are actually the same,
-                        // since strncmp(a.b.c_more, a.b.c, 5) results a.b.c_more equals a.b.c.
-                        if ( strncmp(next_field , param_name, len) || actual_name_len != len) {
-                                field_num_++ ;
-                        }
-                        else {
-                                /* found the parameter, get the units if there are any */
-                                char * start_unit ,  * end_unit ;
-                                if ((start_unit = index( next_field , '{' ))) {
-                                        end_unit = index( next_field , '}' ) ;
-                                        end_unit[0] = '\0' ;
-                                        if ( ! strcmp( param_name , "sys.exec.out.time" )) {
-                                                unitTimeStr_ = start_unit + 1 ;
-                                        }
-                                        else {
-                                                if ( !strcmp(start_unit + 1,"--") ) {
-                                                    unitStr_ = start_unit + 1;
-                                                } else {
-                                                    unitStr_ = map_trick_units_to_udunits(start_unit + 1) ;
-                                                }
-                                        }
-                                }
-                                break ;
-                        }
-                }
-        }
-
-        data_offset_ = ftell(fp_) ;
-
-        delete[]header ;
+#include	<cerrno>
+#include	<cstring>
+#include	<iostream>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<strings.h>
+#include	<math.h>
+#include	"Csv.hh"
+#include	"trick/map_trick_units_to_udunits.hh"
+
+Csv::Csv(char	*	file_name	,	char	*	param_name	)	{
+
+								char	*	header	;
+								char	*	next_field	;
+								int	len	;
+
+								fileName_	=	file_name	;
+								len	=	strlen(param_name)	;
+
+								if	((fp_	=	fopen(file_name	,	"r"))	==	0	)	{
+											std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+											exit(-1)	;
+								}
+
+								line_	=	new	char[20480]	;
+								header	=	new	char[20480]	;
+								fgets(	header	,	20480	,	fp_	);
+
+								//	remove	trailing	newline
+								header[strlen(header)-1]	=	'\0'	;
+
+								field_num_	=	0	;
+								next_field	=	strtok(	header	,	","	)	;
+
+								if	(	strncmp(next_field	,	param_name,	len)	)	{
+																field_num_++	;
+																while	((next_field	=	strtok(	NULL	,	","	)))	{
+																								char	*space_loc	=	strchr(next_field,	'	');
+																								int	actual_name_len	=	space_loc	-	next_field;
+																								//	need	to	make	sure	if	the	length	of	the	parameter	and	the	length
+																								//	of	the	parameter	found	in	the	next_field	are	actually	the	same,
+																								//	since	strncmp(a.b.c_more,	a.b.c,	5)	results	a.b.c_more	equals	a.b.c.
+																								if	(	strncmp(next_field	,	param_name,	len)	||	actual_name_len	!=	len)	{
+																																field_num_++	;
+																								}
+																								else	{
+																																/*	found	the	parameter,	get	the	units	if	there	are	any	*/
+																																char	*	start_unit	,		*	end_unit	;
+																																if	((start_unit	=	index(	next_field	,	'{'	)))	{
+																																								end_unit	=	index(	next_field	,	'}'	)	;
+																																								end_unit[0]	=	'\0'	;
+																																								if	(	!	strcmp(	param_name	,	"sys.exec.out.time"	))	{
+																																																unitTimeStr_	=	start_unit	+	1	;
+																																								}
+																																								else	{
+																																																if	(	!strcmp(start_unit	+	1,"--")	)	{
+																																																				unitStr_	=	start_unit	+	1;
+																																																}	else	{
+																																																				unitStr_	=	map_trick_units_to_udunits(start_unit	+	1)	;
+																																																}
+																																								}
+																																}
+																																break	;
+																								}
+																}
+								}
+
+								data_offset_	=	ftell(fp_)	;
+
+								delete[]header	;
 
 }
 
-int Csv::get( double * time , double * value ) {
-
-        int ii ;
-        char * field ;
-        int ret ;
-
-        /* loop until we get a good line or we finish the file */
-        while ( fgets( line_ , 20480 , fp_ ) ) {
-
-                field = strtok( line_ , "," ) ;
-                /* handle numbers in parenthesis as negative numbers */
-                if ( (ret = sscanf( field , "%*[ \t](%lf)" , time )) == 1 || (ret = sscanf( field , "(%lf)" , time )) == 1  ) {
-                        *time = -(*time) ;
-                }
-                else {
-                        ret = sscanf( field , "%lf" , time ) ;
-                }
-
-                if ( ret == 1 ) {
-
-                        for ( ii = 0 ; ii < field_num_ ; ii++ ) {
-                                field = strtok(NULL , ",") ;
-                        }
-
-                        if ( field != NULL ) {
-                                /* handle numbers in parenthesis as negative numbers */
-                                if ( sscanf( field , "%*[ \t](%lf)" , value ) == 1 || sscanf( field , "(%lf)" , value ) == 1 ) {
-                                        *value = -(*value) ;
-                                        /* successfully read both time and value */
-                                        return( 1 ) ;
-                                }
-                                else {
-                                        ret = sscanf( field , "%lf" ,  value ) ;
-                                        if ( ret == 1 ) {
-                                                /* successfully read both time and value */
-                                                return( 1 ) ;
-                                        }
-                                }
-                        }
-                }
-        }
-
-        return ( 0 ) ;
+int	Csv::get(	double	*	time	,	double	*	value	)	{
+
+								int	ii	;
+								char	*	field	;
+								int	ret	;
+
+								/*	loop	until	we	get	a	good	line	or	we	finish	the	file	*/
+								while	(	fgets(	line_	,	20480	,	fp_	)	)	{
+
+																field	=	strtok(	line_	,	","	)	;
+																/*	handle	numbers	in	parenthesis	as	negative	numbers	*/
+																if	(	(ret	=	sscanf(	field	,	"%*[	\t](%lf)"	,	time	))	==	1	||	(ret	=	sscanf(	field	,	"(%lf)"	,	time	))	==	1		)	{
+																								*time	=	-(*time)	;
+																}
+																else	{
+																								ret	=	sscanf(	field	,	"%lf"	,	time	)	;
+																}
+
+																if	(	ret	==	1	)	{
+
+																								for	(	ii	=	0	;	ii	<	field_num_	;	ii++	)	{
+																																field	=	strtok(NULL	,	",")	;
+																								}
+
+																								if	(	field	!=	NULL	)	{
+																																/*	handle	numbers	in	parenthesis	as	negative	numbers	*/
+																																if	(	sscanf(	field	,	"%*[	\t](%lf)"	,	value	)	==	1	||	sscanf(	field	,	"(%lf)"	,	value	)	==	1	)	{
+																																								*value	=	-(*value)	;
+																																								/*	successfully	read	both	time	and	value	*/
+																																								return(	1	)	;
+																																}
+																																else	{
+																																								ret	=	sscanf(	field	,	"%lf"	,		value	)	;
+																																								if	(	ret	==	1	)	{
+																																																/*	successfully	read	both	time	and	value	*/
+																																																return(	1	)	;
+																																								}
+																																}
+																								}
+																}
+								}
+
+								return	(	0	)	;
 
 }
 
-int Csv::peek( double * time , double * value ) {
+int	Csv::peek(	double	*	time	,	double	*	value	)	{
 
-        long offset ;
-        int ret ;
+								long	offset	;
+								int	ret	;
 
-        offset = ftell(fp_) ;
-        ret = get( time , value ) ;
-        fseek(fp_ , offset , SEEK_SET ) ;
+								offset	=	ftell(fp_)	;
+								ret	=	get(	time	,	value	)	;
+								fseek(fp_	,	offset	,	SEEK_SET	)	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-void Csv::begin() {
-        fseek(fp_ , data_offset_ , SEEK_SET ) ;
-        return ;
+void	Csv::begin()	{
+								fseek(fp_	,	data_offset_	,	SEEK_SET	)	;
+								return	;
 }
 
-int Csv::end() {
-        return(feof(fp_)) ;
+int	Csv::end()	{
+								return(feof(fp_))	;
 }
 
-int Csv::step() {
+int	Csv::step()	{
 
-        if ( fgets( line_ , 20480 , fp_ ) ) {
-                return(1) ;
-        }
+								if	(	fgets(	line_	,	20480	,	fp_	)	)	{
+																return(1)	;
+								}
 
-        return(0) ;
+								return(0)	;
 }
 
-int CsvLocateParam( char * file_name , char * param_name ) {
-        char * header ;
-        char * next_field ;
-        FILE * fp ;
-        int len ;
-
-        len = strlen(param_name) ;
-
-        if ((fp = fopen(file_name , "r")) != 0 ) {
-                header = new char[20480] ;
-                fgets( header , 20480 , fp );
-
-                // remove trailing newline
-                header[strlen(header)-1] = '\0' ;
-                next_field = strtok( header , "," ) ;
-                do {
-                        if ( ! strncmp(next_field , param_name, len) ) {
-                                fclose(fp) ;
-                                delete[]header ;
-                                return(1) ;
-                        }
-                } while ((next_field = strtok( NULL , "," ))) ;
-
-                delete[]header ;
-                fclose(fp) ;
-
-        }
-        else {
-           std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-        }
-
-        return(0) ;
+int	CsvLocateParam(	char	*	file_name	,	char	*	param_name	)	{
+								char	*	header	;
+								char	*	next_field	;
+								FILE	*	fp	;
+								int	len	;
+
+								len	=	strlen(param_name)	;
+
+								if	((fp	=	fopen(file_name	,	"r"))	!=	0	)	{
+																header	=	new	char[20480]	;
+																fgets(	header	,	20480	,	fp	);
+
+																//	remove	trailing	newline
+																header[strlen(header)-1]	=	'\0'	;
+																next_field	=	strtok(	header	,	","	)	;
+																do	{
+																								if	(	!	strncmp(next_field	,	param_name,	len)	)	{
+																																fclose(fp)	;
+																																delete[]header	;
+																																return(1)	;
+																								}
+																}	while	((next_field	=	strtok(	NULL	,	","	)))	;
+
+																delete[]header	;
+																fclose(fp)	;
+
+								}
+								else	{
+											std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+								}
+
+								return(0)	;
 }
 
 
diff --git a/trick_source/data_products/Log/DataStream.cpp b/trick_source/data_products/Log/DataStream.cpp
index 2564a2e1a..fc4f98cc8 100644
--- a/trick_source/data_products/Log/DataStream.cpp
+++ b/trick_source/data_products/Log/DataStream.cpp
@@ -1,39 +1,39 @@
-#include "DataStream.hh"
-#include <float.h>
-#include <math.h>
+#include	"DataStream.hh"
+#include	<float.h>
+#include	<math.h>
 
-DataStream::DataStream() {
-        unitStr_     = "1" ;
-        unitTimeStr_ = "s" ;
+DataStream::DataStream()	{
+								unitStr_					=	"1"	;
+								unitTimeStr_	=	"s"	;
 }
 
 DataStream::~DataStream()
 {
-        // Nada
+								//	Nada
 }
 
-int DataStream::getValueAtTime(double time , double * value ) {
+int	DataStream::getValueAtTime(double	time	,	double	*	value	)	{
 
-        double value_time ;
-        int ret = 0 ;
+								double	value_time	;
+								int	ret	=	0	;
 
-        begin() ;
-        while ( (ret = get( &value_time , value )) &&
-                (fabs( value_time - time ) > 1e-9 )) ;
+								begin()	;
+								while	(	(ret	=	get(	&value_time	,	value	))	&&
+																(fabs(	value_time	-	time	)	>	1e-9	))	;
 
-        return(ret) ;
+								return(ret)	;
 
 }
 
-string DataStream::getFileName() {
-        return(fileName_) ;
+string	DataStream::getFileName()	{
+								return(fileName_)	;
 }
 
-string DataStream::getUnit() {
-        return(unitStr_) ;
+string	DataStream::getUnit()	{
+								return(unitStr_)	;
 }
 
-string DataStream::getTimeUnit() {
-        return(unitTimeStr_) ;
+string	DataStream::getTimeUnit()	{
+								return(unitTimeStr_)	;
 }
 
diff --git a/trick_source/data_products/Log/DataStreamFactory.cpp b/trick_source/data_products/Log/DataStreamFactory.cpp
index 25965c0bc..dcd410f64 100644
--- a/trick_source/data_products/Log/DataStreamFactory.cpp
+++ b/trick_source/data_products/Log/DataStreamFactory.cpp
@@ -1,193 +1,193 @@
 
-#include "DataStreamFactory.hh"
+#include	"DataStreamFactory.hh"
 
 DataStreamFactory::~DataStreamFactory()
 {
-        // Nada
+								//	Nada
 }
 
-DataStream* DataStreamFactory::create( const char* iRunDir,
-                                       const char* iParamName ,
-                                       const char* timeName )
+DataStream*	DataStreamFactory::create(	const	char*	iRunDir,
+																																							const	char*	iParamName	,
+																																							const	char*	timeName	)
 {
-	DataStream* stream = 0 ;
-    DIR *dirp;
-    struct dirent *dp;
-    int len;
-    char* full_path ;
-    string runDir ;
-    string paramName ;
-    string::size_type idx ;
-
-    // Make a string out of the input parameter name
-    string pName = iParamName ;
-
-    // Is this a delta(<var:run>,<var:run>) parameter?
-    idx = pName.find("delta(");
-    if (idx == 0 ) {
-        stream = new Delta(iParamName, timeName);
-        return( stream ) ;
-
-    }
-
-    // Determine parameter name and run directory
-    //
-    // If parameter name contains a run directory, this will
-    // take precedence over the runDir given.
-    // The syntax for a parameter with run dir name is:
-    // <param_name>:<run>
-    // If no colon, it is just a plain param name
-    idx = pName.find(':');
-    if ( idx != string::npos ) {
-        // Extract param name from pName
-        paramName = pName.substr(0,idx) ;
-
-        // Extract run dir from pName
-        runDir = pName.substr(idx+1,pName.size()-1);
-    } else {
-        runDir = iRunDir ;
-        paramName = iParamName ;
-    }
-
-    // Open up RUN dir
-    if ((dirp = opendir(runDir.c_str())) == NULL) {
-        fprintf(stderr,
-        "Couldn't open \"%s\" for reading. \n", runDir.c_str());
-    	return(NULL) ;
-    }
-
-    // HDF5 (Hierarchical Data Format - h5, hdf5) log files
-#ifdef HDF5
-    while ((dp = readdir(dirp)) != NULL) {
-        len = strlen(dp->d_name);
-        if ( !strcmp( &(dp->d_name[len - 3]) , ".h5")) {
-            size_t full_path_len = runDir.length() + strlen(dp->d_name) + 2;
-    	    full_path = (char*) malloc (full_path_len) ;
-            snprintf(full_path, full_path_len, "%s/%s" , runDir.c_str() , dp->d_name);
-            if ( HDF5LocateParam((const char*)full_path , paramName.c_str()) ) {
-            	closedir(dirp) ;
-                stream = new TrickHDF5(full_path , (char *)paramName.c_str() , (char *)timeName ) ;
-                free( full_path ) ;
-                return(stream) ;
-            }
-            free( full_path ) ;
-        }
-    }
+	DataStream*	stream	=	0	;
+				DIR	*dirp;
+				struct	dirent	*dp;
+				int	len;
+				char*	full_path	;
+				string	runDir	;
+				string	paramName	;
+				string::size_type	idx	;
+
+				//	Make	a	string	out	of	the	input	parameter	name
+				string	pName	=	iParamName	;
+
+				//	Is	this	a	delta(<var:run>,<var:run>)	parameter?
+				idx	=	pName.find("delta(");
+				if	(idx	==	0	)	{
+								stream	=	new	Delta(iParamName,	timeName);
+								return(	stream	)	;
+
+				}
+
+				//	Determine	parameter	name	and	run	directory
+				//
+				//	If	parameter	name	contains	a	run	directory,	this	will
+				//	take	precedence	over	the	runDir	given.
+				//	The	syntax	for	a	parameter	with	run	dir	name	is:
+				//	<param_name>:<run>
+				//	If	no	colon,	it	is	just	a	plain	param	name
+				idx	=	pName.find(':');
+				if	(	idx	!=	string::npos	)	{
+								//	Extract	param	name	from	pName
+								paramName	=	pName.substr(0,idx)	;
+
+								//	Extract	run	dir	from	pName
+								runDir	=	pName.substr(idx+1,pName.size()-1);
+				}	else	{
+								runDir	=	iRunDir	;
+								paramName	=	iParamName	;
+				}
+
+				//	Open	up	RUN	dir
+				if	((dirp	=	opendir(runDir.c_str()))	==	NULL)	{
+								fprintf(stderr,
+								"Couldn't	open	\"%s\"	for	reading.	\n",	runDir.c_str());
+					return(NULL)	;
+				}
+
+				//	HDF5	(Hierarchical	Data	Format	-	h5,	hdf5)	log	files
+#ifdef	HDF5
+				while	((dp	=	readdir(dirp))	!=	NULL)	{
+								len	=	strlen(dp->d_name);
+								if	(	!strcmp(	&(dp->d_name[len	-	3])	,	".h5"))	{
+												size_t	full_path_len	=	runDir.length()	+	strlen(dp->d_name)	+	2;
+									full_path	=	(char*)	malloc	(full_path_len)	;
+												snprintf(full_path,	full_path_len,	"%s/%s"	,	runDir.c_str()	,	dp->d_name);
+												if	(	HDF5LocateParam((const	char*)full_path	,	paramName.c_str())	)	{
+													closedir(dirp)	;
+																stream	=	new	TrickHDF5(full_path	,	(char	*)paramName.c_str()	,	(char	*)timeName	)	;
+																free(	full_path	)	;
+																return(stream)	;
+												}
+												free(	full_path	)	;
+								}
+				}
 #endif
 
-    // Trick binary
-    rewinddir(dirp) ;
-    while ((dp = readdir(dirp)) != NULL) {
-        len = strlen(dp->d_name);
-        if ( !strcmp( &(dp->d_name[len - 4]) , ".trk")) {
-            size_t full_path_len = runDir.length() + strlen(dp->d_name) + 2;
-            full_path = (char*) malloc( full_path_len) ;
-            snprintf(full_path, full_path_len, "%s/%s", runDir.c_str(), dp->d_name);
-            if ( TrickBinaryLocateParam((const char*)full_path , paramName.c_str()) ) {
-            	closedir(dirp) ;
-                stream = new TrickBinary(full_path , (char *)paramName.c_str()) ;
-                free( full_path ) ;
-                return(stream) ;
-            }
-            free( full_path ) ;
-        }
-    }
-
-    // CSV Files
-    rewinddir(dirp) ;
-    while ((dp = readdir(dirp)) != NULL) {
-        len = strlen(dp->d_name);
-        if ( !strcmp( &(dp->d_name[len - 4]) , ".csv")) {
-            size_t full_path_len = runDir.length() + strlen(dp->d_name) + 2;
-    	    full_path = (char*) malloc( full_path_len) ;
-            snprintf(full_path, full_path_len, "%s/%s", runDir.c_str(), dp->d_name);
-            if ( CsvLocateParam(full_path , (char *)paramName.c_str()) ) {
-            	closedir(dirp) ;
-                stream = new Csv(full_path , (char *)paramName.c_str()) ;
-             	free( full_path ) ;
-                return(stream) ;
-            }
-        free( full_path ) ;
-    	}
-    }
-
-    // MatLab Binary Files
-    rewinddir(dirp) ;
-    while ((dp = readdir(dirp)) != NULL) {
-     	len = strlen(dp->d_name);
-        if ( !strcmp( &(dp->d_name[len - 4]) , ".mat")) {
-            size_t full_path_len = runDir.length() + strlen(dp->d_name) + 2;
-      	    full_path = (char*) malloc ( full_path_len) ;
-            snprintf(full_path, full_path_len, "%s/%s", runDir.c_str(), dp->d_name);
-            if ( MatLabLocateParam(full_path ,
-        	    				   (char *)paramName.c_str(),
-                				   (char *)timeName ) ) {
-                closedir(dirp) ;
-                stream = new MatLab(full_path ,
-                					(char *)paramName.c_str(),
-                					(char *)timeName ) ;
-                free( full_path ) ;
-                return(stream) ;
-            }
-        	if ( MatLab4LocateParam(full_path ,
-                                	(char *)paramName.c_str(),
-                                	(char *)timeName) ) {
-        		closedir(dirp) ;
-            	stream = new MatLab4(full_path ,
-									 (char *)paramName.c_str(),
-            						 (char *)timeName ) ;
-            	free( full_path ) ;
-            	return(stream) ;
-        	}
-        free( full_path ) ;
+				//	Trick	binary
+				rewinddir(dirp)	;
+				while	((dp	=	readdir(dirp))	!=	NULL)	{
+								len	=	strlen(dp->d_name);
+								if	(	!strcmp(	&(dp->d_name[len	-	4])	,	".trk"))	{
+												size_t	full_path_len	=	runDir.length()	+	strlen(dp->d_name)	+	2;
+												full_path	=	(char*)	malloc(	full_path_len)	;
+												snprintf(full_path,	full_path_len,	"%s/%s",	runDir.c_str(),	dp->d_name);
+												if	(	TrickBinaryLocateParam((const	char*)full_path	,	paramName.c_str())	)	{
+													closedir(dirp)	;
+																stream	=	new	TrickBinary(full_path	,	(char	*)paramName.c_str())	;
+																free(	full_path	)	;
+																return(stream)	;
+												}
+												free(	full_path	)	;
+								}
+				}
+
+				//	CSV	Files
+				rewinddir(dirp)	;
+				while	((dp	=	readdir(dirp))	!=	NULL)	{
+								len	=	strlen(dp->d_name);
+								if	(	!strcmp(	&(dp->d_name[len	-	4])	,	".csv"))	{
+												size_t	full_path_len	=	runDir.length()	+	strlen(dp->d_name)	+	2;
+									full_path	=	(char*)	malloc(	full_path_len)	;
+												snprintf(full_path,	full_path_len,	"%s/%s",	runDir.c_str(),	dp->d_name);
+												if	(	CsvLocateParam(full_path	,	(char	*)paramName.c_str())	)	{
+													closedir(dirp)	;
+																stream	=	new	Csv(full_path	,	(char	*)paramName.c_str())	;
+														free(	full_path	)	;
+																return(stream)	;
+												}
+								free(	full_path	)	;
+					}
+				}
+
+				//	MatLab	Binary	Files
+				rewinddir(dirp)	;
+				while	((dp	=	readdir(dirp))	!=	NULL)	{
+						len	=	strlen(dp->d_name);
+								if	(	!strcmp(	&(dp->d_name[len	-	4])	,	".mat"))	{
+												size_t	full_path_len	=	runDir.length()	+	strlen(dp->d_name)	+	2;
+											full_path	=	(char*)	malloc	(	full_path_len)	;
+												snprintf(full_path,	full_path_len,	"%s/%s",	runDir.c_str(),	dp->d_name);
+												if	(	MatLabLocateParam(full_path	,
+																				(char	*)paramName.c_str(),
+																							(char	*)timeName	)	)	{
+																closedir(dirp)	;
+																stream	=	new	MatLab(full_path	,
+																					(char	*)paramName.c_str(),
+																					(char	*)timeName	)	;
+																free(	full_path	)	;
+																return(stream)	;
+												}
+									if	(	MatLab4LocateParam(full_path	,
+																																	(char	*)paramName.c_str(),
+																																	(char	*)timeName)	)	{
+										closedir(dirp)	;
+													stream	=	new	MatLab4(full_path	,
+										(char	*)paramName.c_str(),
+																			(char	*)timeName	)	;
+													free(	full_path	)	;
+													return(stream)	;
+									}
+								free(	full_path	)	;
 		}
 	}
 
-    closedir(dirp) ;
+				closedir(dirp)	;
 
-    return stream ;
+				return	stream	;
 }
 
-DataStream* DataStreamFactory::create( const char* Machine,
-                                       const unsigned short Port ,
-                                       const char* VarName )
+DataStream*	DataStreamFactory::create(	const	char*	Machine,
+																																							const	unsigned	short	Port	,
+																																							const	char*	VarName	)
 {
-    DataStream* stream = 0 ;
+				DataStream*	stream	=	0	;
 
-    //stream = new VariableServerStream( Machine, Port, VarName ) ;
+				//stream	=	new	VariableServerStream(	Machine,	Port,	VarName	)	;
 
-    return stream ;
+				return	stream	;
 }
 
-// Create an external program data stream
-DataStream* DataStreamFactory::create(  const char* sharedLibName,
-                                   int nInputStreams, DataStream** istreams,
-                                   int nOutputStreams, int outputIdx )
+//	Create	an	external	program	data	stream
+DataStream*	DataStreamFactory::create(		const	char*	sharedLibName,
+																																			int	nInputStreams,	DataStream**	istreams,
+																																			int	nOutputStreams,	int	outputIdx	)
 {
-    DataStream* stream = 0  ;
+				DataStream*	stream	=	0		;
 
-    stream = new ExternalProgram( sharedLibName,
-                                  nInputStreams, istreams,
-                                  nOutputStreams, outputIdx ) ;
+				stream	=	new	ExternalProgram(	sharedLibName,
+																																		nInputStreams,	istreams,
+																																		nOutputStreams,	outputIdx	)	;
 
-    return(stream);
+				return(stream);
 }
 
-int getVariableNames( const char* pathToData,
-                      int* numVariables, char*** variableNames )
+int	getVariableNames(	const	char*	pathToData,
+																						int*	numVariables,	char***	variableNames	)
 {
-    int len ;
+				int	len	;
 
-    len = strlen( pathToData ) ;
+				len	=	strlen(	pathToData	)	;
 
-    if ( !strcmp( &pathToData[len - 4] , ".trk" )) {
-    	*numVariables  = TrickBinaryGetNumVariables(pathToData) ;
-        if ( *numVariables == 0 ) {
-        	return 0 ;
-        }
-        *variableNames = TrickBinaryGetVariableNames(pathToData) ;
-        return 1 ;
+				if	(	!strcmp(	&pathToData[len	-	4]	,	".trk"	))	{
+					*numVariables		=	TrickBinaryGetNumVariables(pathToData)	;
+								if	(	*numVariables	==	0	)	{
+									return	0	;
+								}
+								*variableNames	=	TrickBinaryGetVariableNames(pathToData)	;
+								return	1	;
 }
 
-    return(0);
+				return(0);
 }
diff --git a/trick_source/data_products/Log/DataStreamGroup.cpp b/trick_source/data_products/Log/DataStreamGroup.cpp
index 911a75b30..2095d38dc 100644
--- a/trick_source/data_products/Log/DataStreamGroup.cpp
+++ b/trick_source/data_products/Log/DataStreamGroup.cpp
@@ -1,367 +1,367 @@
-#include <float.h>
-#include <math.h>
-#include "DataStreamGroup.hh"
+#include	<float.h>
+#include	<math.h>
+#include	"DataStreamGroup.hh"
 
 DataStreamGroup::DataStreamGroup()
 {
-        startTime_ = 0.0 ;
-        stopTime_  = DBL_MAX  ;
-        frequency_ = 0.0 ;
-        preserveTime_ = 1 ;
-        nextFrequencyCheck_ = 0.0 ;
-        frequencyMultiple_ = 0.0 ;
-        isEOF_ = 0 ;
-        timeMatchTolerance_ = 1.0e-9 ;
+								startTime_	=	0.0	;
+								stopTime_		=	DBL_MAX		;
+								frequency_	=	0.0	;
+								preserveTime_	=	1	;
+								nextFrequencyCheck_	=	0.0	;
+								frequencyMultiple_	=	0.0	;
+								isEOF_	=	0	;
+								timeMatchTolerance_	=	1.0e-9	;
 }
 
-DataStreamGroup::~DataStreamGroup() {
+DataStreamGroup::~DataStreamGroup()	{
 }
 
-void DataStreamGroup::setTimeMatchTolerance( double tol )
+void	DataStreamGroup::setTimeMatchTolerance(	double	tol	)
 {
-        timeMatchTolerance_ = tol ;
+								timeMatchTolerance_	=	tol	;
 }
 
-void DataStreamGroup::setFrequency( double freq ) {
-        frequency_ = freq ;
+void	DataStreamGroup::setFrequency(	double	freq	)	{
+								frequency_	=	freq	;
 }
 
-void DataStreamGroup::setStartTime( double time ) {
-        startTime_ = time ;
+void	DataStreamGroup::setStartTime(	double	time	)	{
+								startTime_	=	time	;
 }
 
-void DataStreamGroup::setStopTime( double time ) {
-        stopTime_ = time ;
+void	DataStreamGroup::setStopTime(	double	time	)	{
+								stopTime_	=	time	;
 }
 
-void DataStreamGroup::add( DataStream* ds ) {
+void	DataStreamGroup::add(	DataStream*	ds	)	{
 
-        dataStreams_.push_back(ds) ;
-        currTime_.push_back(0.0);
+								dataStreams_.push_back(ds)	;
+								currTime_.push_back(0.0);
 }
 
-void DataStreamGroup::clear()
+void	DataStreamGroup::clear()
 {
-        dataStreams_.clear() ;
+								dataStreams_.clear()	;
 }
 
-void DataStreamGroup::setPreserveTimeOn() {
-        preserveTime_ = 1 ;
+void	DataStreamGroup::setPreserveTimeOn()	{
+								preserveTime_	=	1	;
 }
 
-void DataStreamGroup::setPreserveTimeOff() {
-        preserveTime_ = 0 ;
+void	DataStreamGroup::setPreserveTimeOff()	{
+								preserveTime_	=	0	;
 }
 
-void DataStreamGroup::begin()
+void	DataStreamGroup::begin()
 {
-        unsigned int ii ;
-        double timeStamp ;
-
-        isEOF_ = 0 ;
-
-        for ( ii = 0; ii < dataStreams_.size(); ii++ ) {
-                dataStreams_[ii]->begin();
-        }
-
-        // Reset frequency
-        if ( frequency_ == 0.0 ) {
-                nextFrequencyCheck_ = DBL_MAX;
-        } else {
-                if ( startTime_ == 0.0 ) {
-                        nextFrequencyCheck_ = startTime_ + frequency_ ;
-                } else {
-                        nextFrequencyCheck_ = startTime_ ;
-                }
-        }
-
-	// Changed from 1.0 to 0.0 since this variable is increased by 1 first
-	// for getting next frequency check in stepInTime_ method.
-        frequencyMultiple_ = 0.0 ;
-
-        // If time < start time requested by user,
-        // continue marching through time until start time reached
-        timeStamp = 0.0 ;
-        while ( timeStamp < startTime_ ) {
-                step() ;
-                timeStamp = getTime();
-        }
-
-        // Grab data from each stream without stepping
-        for ( ii = 0; ii < dataStreams_.size(); ii++ ) {
-                dataStreams_[ii]->peek(&lastRead_[dataStreams_[ii]].time,
-                                       &lastRead_[dataStreams_[ii]].value);
-
-        }
+								unsigned	int	ii	;
+								double	timeStamp	;
+
+								isEOF_	=	0	;
+
+								for	(	ii	=	0;	ii	<	dataStreams_.size();	ii++	)	{
+																dataStreams_[ii]->begin();
+								}
+
+								//	Reset	frequency
+								if	(	frequency_	==	0.0	)	{
+																nextFrequencyCheck_	=	DBL_MAX;
+								}	else	{
+																if	(	startTime_	==	0.0	)	{
+																								nextFrequencyCheck_	=	startTime_	+	frequency_	;
+																}	else	{
+																								nextFrequencyCheck_	=	startTime_	;
+																}
+								}
+
+	//	Changed	from	1.0	to	0.0	since	this	variable	is	increased	by	1	first
+	//	for	getting	next	frequency	check	in	stepInTime_	method.
+								frequencyMultiple_	=	0.0	;
+
+								//	If	time	<	start	time	requested	by	user,
+								//	continue	marching	through	time	until	start	time	reached
+								timeStamp	=	0.0	;
+								while	(	timeStamp	<	startTime_	)	{
+																step()	;
+																timeStamp	=	getTime();
+								}
+
+								//	Grab	data	from	each	stream	without	stepping
+								for	(	ii	=	0;	ii	<	dataStreams_.size();	ii++	)	{
+																dataStreams_[ii]->peek(&lastRead_[dataStreams_[ii]].time,
+																																							&lastRead_[dataStreams_[ii]].value);
+
+								}
 }
 
 
-bool DataStreamGroup::end()
+bool	DataStreamGroup::end()
 {
-        return isEOF_ ;
+								return	isEOF_	;
 }
 
-void DataStreamGroup::step() {
-
-        unsigned int ii ;
-        double pVal ;
-        bool stepAgain ;
-
-        while ( ! stepInTime_() ) {
-        }
-
-        // Preserve time
-        // Keep all time stamps from data streams on same time stamp
-        if ( preserveTime_ ) {
-                pVal = currTime_[0] ;
-                stepAgain = 0 ;
-                for ( ii = 1 ; ii < currTime_.size() ; ii++ ) {
-                        if ( pVal != currTime_[ii] ) {
-                                stepAgain = 1 ;
-                        }
-                }
-                if ( stepAgain ) {
-                        step();
-                }
-        }
-
-        return ;
+void	DataStreamGroup::step()	{
+
+								unsigned	int	ii	;
+								double	pVal	;
+								bool	stepAgain	;
+
+								while	(	!	stepInTime_()	)	{
+								}
+
+								//	Preserve	time
+								//	Keep	all	time	stamps	from	data	streams	on	same	time	stamp
+								if	(	preserveTime_	)	{
+																pVal	=	currTime_[0]	;
+																stepAgain	=	0	;
+																for	(	ii	=	1	;	ii	<	currTime_.size()	;	ii++	)	{
+																								if	(	pVal	!=	currTime_[ii]	)	{
+																																stepAgain	=	1	;
+																								}
+																}
+																if	(	stepAgain	)	{
+																								step();
+																}
+								}
+
+								return	;
 }
 
-// This returns minimum time stamp across all data streams
+//	This	returns	minimum	time	stamp	across	all	data	streams
 //
-// If one streams has logged more data in time,
-// (i.e. one log has 100 seconds of data, another 300 seconds)
-// by default getTime() will ignore the log that has expired
-// all of its data.  Therefore, the data from the short log
-// will not force the longer to be truncated.
+//	If	one	streams	has	logged	more	data	in	time,
+//	(i.e.	one	log	has	100	seconds	of	data,	another	300	seconds)
+//	by	default	getTime()	will	ignore	the	log	that	has	expired
+//	all	of	its	data.		Therefore,	the	data	from	the	short	log
+//	will	not	force	the	longer	to	be	truncated.
 //
-// In the case of error plotting, you do not want any extra
-// data points if the time stamps do not match
-double DataStreamGroup::getTime( ) {
+//	In	the	case	of	error	plotting,	you	do	not	want	any	extra
+//	data	points	if	the	time	stamps	do	not	match
+double	DataStreamGroup::getTime(	)	{
 
-        double minTime = DBL_MAX;
-        double time, val ;
-        unsigned int ii ;
+								double	minTime	=	DBL_MAX;
+								double	time,	val	;
+								unsigned	int	ii	;
 
-        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
+								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
 
-                if ( ! dataStreams_[ii]->end() ) {
-                        dataStreams_[ii]->peek(&time, &val) ;
-                        currTime_[ii] = time ;
-                } else {
-                        currTime_[ii] = DBL_MAX ;
-                }
+																if	(	!	dataStreams_[ii]->end()	)	{
+																								dataStreams_[ii]->peek(&time,	&val)	;
+																								currTime_[ii]	=	time	;
+																}	else	{
+																								currTime_[ii]	=	DBL_MAX	;
+																}
 
-                if (currTime_[ii] < minTime) {
-                        minTime = currTime_[ii];
-                }
+																if	(currTime_[ii]	<	minTime)	{
+																								minTime	=	currTime_[ii];
+																}
 
-        }
-        return( minTime ) ;
+								}
+								return(	minTime	)	;
 }
 
 
-// Advance through records in each data stream synchronously
+//	Advance	through	records	in	each	data	stream	synchronously
 //
-// Example: If data stream "A" is recorded at 1.0 second,
-// and "B" at 10 seconds.  Both will advance at time zero.
-// Then at time=1.0, log "A" will have a record read.  "B" will not be read.
-// At time=2.0 through time=9.0 the same will occur. A advances, B stays put.
-// At time=10.0, both A and B will be read from.  Both will advance.
-// This keeps the data on the same time stamp on like intervals.
+//	Example:	If	data	stream	"A"	is	recorded	at	1.0	second,
+//	and	"B"	at	10	seconds.		Both	will	advance	at	time	zero.
+//	Then	at	time=1.0,	log	"A"	will	have	a	record	read.		"B"	will	not	be	read.
+//	At	time=2.0	through	time=9.0	the	same	will	occur.	A	advances,	B	stays	put.
+//	At	time=10.0,	both	A	and	B	will	be	read	from.		Both	will	advance.
+//	This	keeps	the	data	on	the	same	time	stamp	on	like	intervals.
 //
-// Note: If flag preserveTime_ is set, step() will only return
-// when time stamps match.
+//	Note:	If	flag	preserveTime_	is	set,	step()	will	only	return
+//	when	time	stamps	match.
 //
-// If A has more records than B in time, by default, read all of A's
-// data.  E.g. 'A' logged for 300 seconds,  while 'B' 100 seconds, by default
-// walk through all of A's data
-int DataStreamGroup::stepInTime_() {
+//	If	A	has	more	records	than	B	in	time,	by	default,	read	all	of	A's
+//	data.		E.g.	'A'	logged	for	300	seconds,		while	'B'	100	seconds,	by	default
+//	walk	through	all	of	A's	data
+int	DataStreamGroup::stepInTime_()	{
 
 
-#define DPLOG_ABS(x) ((x) < 0.0 ? -(x) : (x))
+#define	DPLOG_ABS(x)	((x)	<	0.0	?	-(x)	:	(x))
 
-#define NEXTFREQ_EQUALS_MINTIME \
-        (DPLOG_ABS(nextFrequencyCheck_ - minTime) < timeMatchTolerance_)
+#define	NEXTFREQ_EQUALS_MINTIME	\
+								(DPLOG_ABS(nextFrequencyCheck_	-	minTime)	<	timeMatchTolerance_)
 
-#define NEXTFREQ_LESSTHAN_MINTIME \
-        ((nextFrequencyCheck_ - minTime < 0.0) && ! NEXTFREQ_EQUALS_MINTIME)
+#define	NEXTFREQ_LESSTHAN_MINTIME	\
+								((nextFrequencyCheck_	-	minTime	<	0.0)	&&	!	NEXTFREQ_EQUALS_MINTIME)
 
-#define NEXTFREQ_INCR \
-        frequencyMultiple_++ ; \
-        nextFrequencyCheck_ = frequencyMultiple_*frequency_ ;
+#define	NEXTFREQ_INCR	\
+								frequencyMultiple_++	;	\
+								nextFrequencyCheck_	=	frequencyMultiple_*frequency_	;
 
 
-        unsigned int ii ;
-        double minTime ;
-        int isEOF ;
+								unsigned	int	ii	;
+								double	minTime	;
+								int	isEOF	;
 
-        double t, x ;
+								double	t,	x	;
 
-        // Get all values in all data log groups
-        // Also get mininum time stamp from all log data files
-        minTime = getTime();
+								//	Get	all	values	in	all	data	log	groups
+								//	Also	get	mininum	time	stamp	from	all	log	data	files
+								minTime	=	getTime();
 
-        // Take a step through time (sounds like a song)
-        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                if ( currTime_[ii] == minTime && !dataStreams_[ii]->end() ) {
-                        dataStreams_[ii]->get(&t, &x);
-                }
-        }
+								//	Take	a	step	through	time	(sounds	like	a	song)
+								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
+																if	(	currTime_[ii]	==	minTime	&&	!dataStreams_[ii]->end()	)	{
+																								dataStreams_[ii]->get(&t,	&x);
+																}
+								}
 
-        // Check for end of file
-        isEOF = 1 ;
-        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                if ( ! dataStreams_[ii]->end() ) {
-                        isEOF = 0 ;
-                        break ;
-                }
-        }
-        if (isEOF) {
-                isEOF_ = 1 ;
-                return(1) ;
-        }
+								//	Check	for	end	of	file
+								isEOF	=	1	;
+								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
+																if	(	!	dataStreams_[ii]->end()	)	{
+																								isEOF	=	0	;
+																								break	;
+																}
+								}
+								if	(isEOF)	{
+																isEOF_	=	1	;
+																return(1)	;
+								}
 
-        // Now that a time step has occured
-        // Get the new mininum time stamp and associated
-        // values from all log data files
-        minTime = getTime();
+								//	Now	that	a	time	step	has	occured
+								//	Get	the	new	mininum	time	stamp	and	associated
+								//	values	from	all	log	data	files
+								minTime	=	getTime();
 
 
-        // Step depending on frequency
-        if (minTime <= stopTime_) {
+								//	Step	depending	on	frequency
+								if	(minTime	<=	stopTime_)	{
 
-                // Handle Frequency (if specified)
-                if ( nextFrequencyCheck_ != DBL_MAX ) {
+																//	Handle	Frequency	(if	specified)
+																if	(	nextFrequencyCheck_	!=	DBL_MAX	)	{
 
-                        if ( NEXTFREQ_EQUALS_MINTIME ) {
+																								if	(	NEXTFREQ_EQUALS_MINTIME	)	{
 
-                                // Frequency synced with a data point
-                                // Stops recursion
-                                NEXTFREQ_INCR ;
+																																//	Frequency	synced	with	a	data	point
+																																//	Stops	recursion
+																																NEXTFREQ_INCR	;
 
-                        } else if ( minTime - nextFrequencyCheck_ > 0.0 ) {
+																								}	else	if	(	minTime	-	nextFrequencyCheck_	>	0.0	)	{
 
-                                // Mintime exceeded nextFreqCheck
-                                // Frequency must be higher than
-                                // data frequency
+																																//	Mintime	exceeded	nextFreqCheck
+																																//	Frequency	must	be	higher	than
+																																//	data	frequency
 
-                                // Bump nextFrequencyCheck past minTime
-                                while ( NEXTFREQ_LESSTHAN_MINTIME ) {
+																																//	Bump	nextFrequencyCheck	past	minTime
+																																while	(	NEXTFREQ_LESSTHAN_MINTIME	)	{
 
-                                        NEXTFREQ_INCR ;
-                                }
+																																								NEXTFREQ_INCR	;
+																																}
 
-                                if ( NEXTFREQ_EQUALS_MINTIME ) {
+																																if	(	NEXTFREQ_EQUALS_MINTIME	)	{
 
-                                       // We synced
-                                       NEXTFREQ_INCR ;
+																																							//	We	synced
+																																							NEXTFREQ_INCR	;
 
-                                } else {
+																																}	else	{
 
-                                        // No sync, keep iterating through data
-                                        return(0);
-                                }
-                        } else {
+																																								//	No	sync,	keep	iterating	through	data
+																																								return(0);
+																																}
+																								}	else	{
 
-                                // Mintime is less than nextFreq check
-                                // Need to iterate again
-                                return(0) ;
-                        }
-                }
-        }
+																																//	Mintime	is	less	than	nextFreq	check
+																																//	Need	to	iterate	again
+																																return(0)	;
+																								}
+																}
+								}
 
-        if (minTime > stopTime_) {
-                isEOF_ = 1 ;
-                return(1) ;
-        }
+								if	(minTime	>	stopTime_)	{
+																isEOF_	=	1	;
+																return(1)	;
+								}
 
-        // Tells caller that time step did indeed occur
-        return(1) ;
+								//	Tells	caller	that	time	step	did	indeed	occur
+								return(1)	;
 }
 
 
 
-// Advance through records in each data stream synchronously
-// Reading will stop when one of the streams is out of data
-int DataStreamGroup::matchTimeStamps() {
-
-        unsigned int ii ;
-        int matched_time_stamps ;
-        int frequency_match ;
-        double maxTime ;
-
-        frequency_match = 0 ;
-        while ( !frequency_match ) {
-
-                matched_time_stamps = 0 ;
-                maxTime = startTime_ ;
-                while ( ! matched_time_stamps ) {
-
-                        // get the next record out of the file and find the maximum time stamp
-                        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                                if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
-                                        &lastRead_[dataStreams_[ii]].value) ) {
-                                        isEOF_ = 1 ;
-                                        return(0) ;
-                                }
-                                if (lastRead_[dataStreams_[ii]].time > maxTime ) {
-                                        maxTime = lastRead_[dataStreams_[ii]].time ;
-                                }
-                        }
-
-                        // if the maximum time is greater than the stopTime we are done ;
-                        if ( maxTime > stopTime_ ) {
-                                 isEOF_ = 1 ;
-                                 return(0) ;
-                        }
-
-                        // keep getting records from the all streams until we past the largest time step
-                        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                                while ( maxTime -
-                                        lastRead_[dataStreams_[ii]].time > timeMatchTolerance_ ) {
-                                        if ( ! dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
-                                                &lastRead_[dataStreams_[ii]].value)) {
-                                                isEOF_ = 1 ;
-                                                return(0) ;
-                                        }
-                                }
-                        }
-
-
-                        // check to see if all the time stamps match or not
-                        matched_time_stamps = 1 ;
-                        for ( ii = 0 ; ii < dataStreams_.size() ; ii++ ) {
-                                if ( DPLOG_ABS(lastRead_[dataStreams_[ii]].time - maxTime) > timeMatchTolerance_ ) {
-                                        matched_time_stamps = 0 ;
-                                        break ;
-                                }
-                        }
-
-                }
-
-                // check to see if we match the requested frequency
-                frequency_match = 1 ;
-                if ( frequency_ != 0.0 ) {
-                        while ( nextFrequencyCheck_ < maxTime ) {
-                                nextFrequencyCheck_ = frequencyMultiple_ * frequency_ ;
-                                frequencyMultiple_++ ;
-                        }
-                        if ( DPLOG_ABS(nextFrequencyCheck_ - maxTime) > timeMatchTolerance_ ) {
-                                frequency_match = 0 ;
-                        }
-                }
-        }
-
-        isEOF_ = 0 ;
-        return(1) ;
+//	Advance	through	records	in	each	data	stream	synchronously
+//	Reading	will	stop	when	one	of	the	streams	is	out	of	data
+int	DataStreamGroup::matchTimeStamps()	{
+
+								unsigned	int	ii	;
+								int	matched_time_stamps	;
+								int	frequency_match	;
+								double	maxTime	;
+
+								frequency_match	=	0	;
+								while	(	!frequency_match	)	{
+
+																matched_time_stamps	=	0	;
+																maxTime	=	startTime_	;
+																while	(	!	matched_time_stamps	)	{
+
+																								//	get	the	next	record	out	of	the	file	and	find	the	maximum	time	stamp
+																								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
+																																if	(	!	dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
+																																								&lastRead_[dataStreams_[ii]].value)	)	{
+																																								isEOF_	=	1	;
+																																								return(0)	;
+																																}
+																																if	(lastRead_[dataStreams_[ii]].time	>	maxTime	)	{
+																																								maxTime	=	lastRead_[dataStreams_[ii]].time	;
+																																}
+																								}
+
+																								//	if	the	maximum	time	is	greater	than	the	stopTime	we	are	done	;
+																								if	(	maxTime	>	stopTime_	)	{
+																																	isEOF_	=	1	;
+																																	return(0)	;
+																								}
+
+																								//	keep	getting	records	from	the	all	streams	until	we	past	the	largest	time	step
+																								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
+																																while	(	maxTime	-
+																																								lastRead_[dataStreams_[ii]].time	>	timeMatchTolerance_	)	{
+																																								if	(	!	dataStreams_[ii]->get(&lastRead_[dataStreams_[ii]].time,
+																																																&lastRead_[dataStreams_[ii]].value))	{
+																																																isEOF_	=	1	;
+																																																return(0)	;
+																																								}
+																																}
+																								}
+
+
+																								//	check	to	see	if	all	the	time	stamps	match	or	not
+																								matched_time_stamps	=	1	;
+																								for	(	ii	=	0	;	ii	<	dataStreams_.size()	;	ii++	)	{
+																																if	(	DPLOG_ABS(lastRead_[dataStreams_[ii]].time	-	maxTime)	>	timeMatchTolerance_	)	{
+																																								matched_time_stamps	=	0	;
+																																								break	;
+																																}
+																								}
+
+																}
+
+																//	check	to	see	if	we	match	the	requested	frequency
+																frequency_match	=	1	;
+																if	(	frequency_	!=	0.0	)	{
+																								while	(	nextFrequencyCheck_	<	maxTime	)	{
+																																nextFrequencyCheck_	=	frequencyMultiple_	*	frequency_	;
+																																frequencyMultiple_++	;
+																								}
+																								if	(	DPLOG_ABS(nextFrequencyCheck_	-	maxTime)	>	timeMatchTolerance_	)	{
+																																frequency_match	=	0	;
+																								}
+																}
+								}
+
+								isEOF_	=	0	;
+								return(1)	;
 }
 
-int DataStreamGroup::getLastRead( DataStream *ds , double *time , double *value) {
+int	DataStreamGroup::getLastRead(	DataStream	*ds	,	double	*time	,	double	*value)	{
 
-        *time = lastRead_[ds].time ;
-        *value = lastRead_[ds].value ;
-        return (1) ;
+								*time	=	lastRead_[ds].time	;
+								*value	=	lastRead_[ds].value	;
+								return	(1)	;
 }
 
diff --git a/trick_source/data_products/Log/Delta.cpp b/trick_source/data_products/Log/Delta.cpp
index 5e5f6641e..049d51982 100644
--- a/trick_source/data_products/Log/Delta.cpp
+++ b/trick_source/data_products/Log/Delta.cpp
@@ -1,92 +1,92 @@
-// The delta stream returns the difference between
-// two streams designated with the <var:run> syntax
+//	The	delta	stream	returns	the	difference	between
+//	two	streams	designated	with	the	<var:run>	syntax
 
-#include <stdio.h>
-#include <iostream>
-#include <string>
-using namespace std ;
+#include	<stdio.h>
+#include	<iostream>
+#include	<string>
+using	namespace	std	;
 
-#include "Delta.hh"
-#include "DataStreamFactory.hh"
+#include	"Delta.hh"
+#include	"DataStreamFactory.hh"
 
-Delta::Delta(const char * deltaStatement, const char* timeName)
+Delta::Delta(const	char	*	deltaStatement,	const	char*	timeName)
 {
-        int ret ;
-        char vr1[1024];
-        char vr2[1024];
+								int	ret	;
+								char	vr1[1024];
+								char	vr2[1024];
 
-        DataStreamFactory dsf ;
+								DataStreamFactory	dsf	;
 
-        // The delta statement is formatted like:
-        // delta(<var1:run1>, <var2:run2>)
+								//	The	delta	statement	is	formatted	like:
+								//	delta(<var1:run1>,	<var2:run2>)
 
-        // Extract <var1:run1> <var2:run2>
-        ret = sscanf(deltaStatement, "delta(%[^,],%[^)]", vr1, vr2);
-        if ( ret != 2 ) {
-                fprintf(stderr, "ERROR: Delta::Delta() received bad spec "
-                                "\"%s\"\nAborting.\n", deltaStatement);
-                exit(-1);
-        }
+								//	Extract	<var1:run1>	<var2:run2>
+								ret	=	sscanf(deltaStatement,	"delta(%[^,],%[^)]",	vr1,	vr2);
+								if	(	ret	!=	2	)	{
+																fprintf(stderr,	"ERROR:	Delta::Delta()	received	bad	spec	"
+																																"\"%s\"\nAborting.\n",	deltaStatement);
+																exit(-1);
+								}
 
-        dataStream1_ = dsf.create(NULL, vr1, timeName);
-        dataStream2_ = dsf.create(NULL, vr2, timeName);
+								dataStream1_	=	dsf.create(NULL,	vr1,	timeName);
+								dataStream2_	=	dsf.create(NULL,	vr2,	timeName);
 
-        dsg_.add(dataStream1_);
-        dsg_.add(dataStream2_);
+								dsg_.add(dataStream1_);
+								dsg_.add(dataStream2_);
 }
 
 Delta::~Delta()
 {
-        delete dataStream1_ ;
-        delete dataStream2_ ;
+								delete	dataStream1_	;
+								delete	dataStream2_	;
 }
 
 
-int Delta::get( double * time , double * value )
+int	Delta::get(	double	*	time	,	double	*	value	)
 {
-        int ret ;
-        double val1, val2 ;
+								int	ret	;
+								double	val1,	val2	;
 
-        ret = dsg_.matchTimeStamps();
-        if ( ! ret ) {
-                // At end of input streams
-                return ret ;
-        }
+								ret	=	dsg_.matchTimeStamps();
+								if	(	!	ret	)	{
+																//	At	end	of	input	streams
+																return	ret	;
+								}
 
-        dsg_.getLastRead(dataStream1_, time, &val1);
-        ret = dsg_.getLastRead(dataStream2_, time, &val2);
+								dsg_.getLastRead(dataStream1_,	time,	&val1);
+								ret	=	dsg_.getLastRead(dataStream2_,	time,	&val2);
 
-        *value = val1 - val2 ;
+								*value	=	val1	-	val2	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-int Delta::peek( double * time , double * value )
+int	Delta::peek(	double	*	time	,	double	*	value	)
 {
-        int ret ;
-        double val1, val2 ;
+								int	ret	;
+								double	val1,	val2	;
 
-        dsg_.getLastRead(dataStream1_, time, &val1);
-        ret = dsg_.getLastRead(dataStream2_, time, &val2);
+								dsg_.getLastRead(dataStream1_,	time,	&val1);
+								ret	=	dsg_.getLastRead(dataStream2_,	time,	&val2);
 
-        *value = val1 - val2 ;
+								*value	=	val1	-	val2	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-void Delta::begin()
+void	Delta::begin()
 {
-        dsg_.begin();
-        return ;
+								dsg_.begin();
+								return	;
 }
 
-int Delta::end()
+int	Delta::end()
 {
-        return (dsg_.end()) ;
+								return	(dsg_.end())	;
 }
 
-int Delta::step()
+int	Delta::step()
 {
-        dsg_.step();
-        return(0) ;
+								dsg_.step();
+								return(0)	;
 }
diff --git a/trick_source/data_products/Log/ExternalProgram.cpp b/trick_source/data_products/Log/ExternalProgram.cpp
index 959f4bb39..175749ad1 100644
--- a/trick_source/data_products/Log/ExternalProgram.cpp
+++ b/trick_source/data_products/Log/ExternalProgram.cpp
@@ -1,151 +1,151 @@
-#include <math.h>
-#include <stdlib.h>
+#include	<math.h>
+#include	<stdlib.h>
 
-#include "log.h"
-#include "ExternalProgram.hh"
+#include	"log.h"
+#include	"ExternalProgram.hh"
 
-ExternalProgram::ExternalProgram( const char* sharedLibName,
-                                   int nInputStreams, DataStream** istreams,
-                                   int nOutputs, int outputIdx )
+ExternalProgram::ExternalProgram(	const	char*	sharedLibName,
+																																			int	nInputStreams,	DataStream**	istreams,
+																																			int	nOutputs,	int	outputIdx	)
 {
-        char msg[80];
-        int ii ;
-
-        char next_record_str[] = "extGetNextRecord" ;
-        unitStr_ = "1" ;
-        unitTimeStr_ = "s" ;
-
-        // Open up external plugin program
-        progHandle_ = dlopen(sharedLibName, RTLD_LAZY);
-        if (!progHandle_) {
-                snprintf(msg, sizeof(msg), "ERROR: Couldn't load shared program \"%s\" \n",
-                        sharedLibName);
-                fputs(msg, stderr);
-                exit(1);
-        }
-        cout << "Loading shared library: " << sharedLibName << "\n" ;
-        external_program =
-            (int (*)(double *, int, double *, int)) dlsym(progHandle_,
-                                                          next_record_str);
-        if ((error = dlerror()) != NULL) {
-                fprintf(stderr, "%s\n", error);
-                exit(1);
-        }
-
-        // Load input streams
-        for ( ii = 0 ; ii < nInputStreams ; ii++ ) {
-                dsg_.add(istreams[ii]);
-                istreams_.push_back(istreams[ii]) ;
-        }
-        delete[] istreams ;
-
-        // Set up i/o to shared lib program
-        nInputs_ = nInputStreams;
-        input_ = new double[nInputStreams];
-        nOutputs_ = nOutputs;
-        output_ = new double[nOutputs];
-
-        // Since this is a "stream", only one output value
-        // will be returned (see get()).  The output index passed
-        // in indicates which output to pass back.
-        if ( nOutputs_ <= outputIdx ) {
-                cerr << "ERROR: External program output index exceeds total "
-                     << "number of external program outputs.\n" ;
-                exit(-1);
-        }
-        outputIdx_ = outputIdx ;
+								char	msg[80];
+								int	ii	;
+
+								char	next_record_str[]	=	"extGetNextRecord"	;
+								unitStr_	=	"1"	;
+								unitTimeStr_	=	"s"	;
+
+								//	Open	up	external	plugin	program
+								progHandle_	=	dlopen(sharedLibName,	RTLD_LAZY);
+								if	(!progHandle_)	{
+																snprintf(msg,	sizeof(msg),	"ERROR:	Couldn't	load	shared	program	\"%s\"	\n",
+																								sharedLibName);
+																fputs(msg,	stderr);
+																exit(1);
+								}
+								cout	<<	"Loading	shared	library:	"	<<	sharedLibName	<<	"\n"	;
+								external_program	=
+												(int	(*)(double	*,	int,	double	*,	int))	dlsym(progHandle_,
+																																																										next_record_str);
+								if	((error	=	dlerror())	!=	NULL)	{
+																fprintf(stderr,	"%s\n",	error);
+																exit(1);
+								}
+
+								//	Load	input	streams
+								for	(	ii	=	0	;	ii	<	nInputStreams	;	ii++	)	{
+																dsg_.add(istreams[ii]);
+																istreams_.push_back(istreams[ii])	;
+								}
+								delete[]	istreams	;
+
+								//	Set	up	i/o	to	shared	lib	program
+								nInputs_	=	nInputStreams;
+								input_	=	new	double[nInputStreams];
+								nOutputs_	=	nOutputs;
+								output_	=	new	double[nOutputs];
+
+								//	Since	this	is	a	"stream",	only	one	output	value
+								//	will	be	returned	(see	get()).		The	output	index	passed
+								//	in	indicates	which	output	to	pass	back.
+								if	(	nOutputs_	<=	outputIdx	)	{
+																cerr	<<	"ERROR:	External	program	output	index	exceeds	total	"
+																					<<	"number	of	external	program	outputs.\n"	;
+																exit(-1);
+								}
+								outputIdx_	=	outputIdx	;
 }
 
 ExternalProgram::~ExternalProgram()
 {
-        unsigned int ii ;
+								unsigned	int	ii	;
 
-        delete[] input_ ;
-        delete[] output_ ;
+								delete[]	input_	;
+								delete[]	output_	;
 
-        for ( ii = 0 ; ii < istreams_.size() ; ii++ ) {
-                delete istreams_[ii] ;
-        }
+								for	(	ii	=	0	;	ii	<	istreams_.size()	;	ii++	)	{
+																delete	istreams_[ii]	;
+								}
 }
 
-int ExternalProgram::step()
+int	ExternalProgram::step()
 {
-        dsg_.step();
-        return(0) ;
+								dsg_.step();
+								return(0)	;
 }
 
 /**
- * Get parameter and time stamp values, don't advance (step)
- */
-int ExternalProgram::peek(double* timeStamp, double* paramValue)
+	*	Get	parameter	and	time	stamp	values,	don't	advance	(step)
+	*/
+int	ExternalProgram::peek(double*	timeStamp,	double*	paramValue)
 {
-        int ret = getOutputValue( timeStamp, paramValue ) ;
+								int	ret	=	getOutputValue(	timeStamp,	paramValue	)	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
 /**
- * Advance (step) through stream
- * And get parameter and time stamp values,
- */
-int ExternalProgram::get(double* timeStamp, double* outputValue)
+	*	Advance	(step)	through	stream
+	*	And	get	parameter	and	time	stamp	values,
+	*/
+int	ExternalProgram::get(double*	timeStamp,	double*	outputValue)
 {
-        int ret ;
-        ret = dsg_.matchTimeStamps();
-        if ( ! ret ) {
-                // At end of input streams
-                return ret ;
-        }
+								int	ret	;
+								ret	=	dsg_.matchTimeStamps();
+								if	(	!	ret	)	{
+																//	At	end	of	input	streams
+																return	ret	;
+								}
 
-        ret = getOutputValue( timeStamp, outputValue ) ;
+								ret	=	getOutputValue(	timeStamp,	outputValue	)	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-int ExternalProgram::getOutputValue( double* timeStamp, double* outputValue )
+int	ExternalProgram::getOutputValue(	double*	timeStamp,	double*	outputValue	)
 {
-        int ii ;
-        int ret ;
+								int	ii	;
+								int	ret	;
 
-        for ( ii = 0 ; ii < nInputs_ ; ii++ ) {
-                dsg_.getLastRead(istreams_[ii], timeStamp, &input_[ii] ) ;
-        }
+								for	(	ii	=	0	;	ii	<	nInputs_	;	ii++	)	{
+																dsg_.getLastRead(istreams_[ii],	timeStamp,	&input_[ii]	)	;
+								}
 
-        ret = external_program(input_, nInputs_, output_, nOutputs_);
-        if (ret < 0) {
-                fprintf(stderr, "ERROR: External program \"%s\" "
-                        " aborted with an error status of %d \n",
-                        sharedLibName_, ret);
-                return(-1);
-        }
+								ret	=	external_program(input_,	nInputs_,	output_,	nOutputs_);
+								if	(ret	<	0)	{
+																fprintf(stderr,	"ERROR:	External	program	\"%s\"	"
+																								"	aborted	with	an	error	status	of	%d	\n",
+																								sharedLibName_,	ret);
+																return(-1);
+								}
 
-        *outputValue = output_[outputIdx_] ;
+								*outputValue	=	output_[outputIdx_]	;
 
-        return(ret);
+								return(ret);
 }
 
 /**
- * Advance through data
- * Get parameter and time stamp values
- */
-void ExternalProgram::begin()
+	*	Advance	through	data
+	*	Get	parameter	and	time	stamp	values
+	*/
+void	ExternalProgram::begin()
 {
-        dsg_.begin();
+								dsg_.begin();
 }
 
 /**
- * Seek in data until time stamp.
- */
-int ExternalProgram::getValueAtTime(double time, double* pVal )
+	*	Seek	in	data	until	time	stamp.
+	*/
+int	ExternalProgram::getValueAtTime(double	time,	double*	pVal	)
 {
-        // TODO
-        return(-1);
+								//	TODO
+								return(-1);
 }
 
 /**
- * Are we at end of data stream?
- */
-int ExternalProgram::end()
+	*	Are	we	at	end	of	data	stream?
+	*/
+int	ExternalProgram::end()
 {
-        return (dsg_.end()) ;
+								return	(dsg_.end())	;
 }
diff --git a/trick_source/data_products/Log/MatLab.cpp b/trick_source/data_products/Log/MatLab.cpp
index 7c495987b..1b95b9d73 100644
--- a/trick_source/data_products/Log/MatLab.cpp
+++ b/trick_source/data_products/Log/MatLab.cpp
@@ -1,934 +1,934 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-
-#include <stdlib.h>
-#include <string.h>
-#if __sgi | __sun
-#include <strings.h>
+#include	<cerrno>
+#include	<cstring>
+#include	<iostream>
+
+#include	<stdlib.h>
+#include	<string.h>
+#if	__sgi	|	__sun
+#include	<strings.h>
 #endif
 
-#include <math.h>
-#include "MatLab.hh"
-#include "trick_byteswap.h"
-
-#include "trick/parameter_types.h"
-
-// Add to the parameter types
-#define MATLAB_ARRAY 21
-#define MATLAB_UNSUPPORTED 22
-
-// These come from MatLab documentation
-#define MI_INT8   1
-#define MI_UINT8  2
-#define MI_INT16  3
-#define MI_UINT16 4
-#define MI_INT32  5
-#define MI_UINT32 6
-#define MI_SINGLE 7
-#define MI_DOUBLE 9
-#define MI_INT64  12
-#define MI_UINT64 13
-#define MI_MATRIX 14
-
-// Supported array types
-
-#define mxSTRUCT_CLASS 2
-#define mxDOUBLE_CLASS 6
+#include	<math.h>
+#include	"MatLab.hh"
+#include	"trick_byteswap.h"
+
+#include	"trick/parameter_types.h"
+
+//	Add	to	the	parameter	types
+#define	MATLAB_ARRAY	21
+#define	MATLAB_UNSUPPORTED	22
+
+//	These	come	from	MatLab	documentation
+#define	MI_INT8			1
+#define	MI_UINT8		2
+#define	MI_INT16		3
+#define	MI_UINT16	4
+#define	MI_INT32		5
+#define	MI_UINT32	6
+#define	MI_SINGLE	7
+#define	MI_DOUBLE	9
+#define	MI_INT64		12
+#define	MI_UINT64	13
+#define	MI_MATRIX	14
+
+//	Supported	array	types
+
+#define	mxSTRUCT_CLASS	2
+#define	mxDOUBLE_CLASS	6
 /*
- TODO: support more array types?
-    #define mxCELL_CLASS 1
-    #define mxOBJECT_CLASS 3
-    #define mxCHAR_CLASS 4
-    #define mxSPARSE_CLASS 5
-    #define mxSINGLE_CLASS 7
-    #define mxINT8_CLASS 8
-    #define mxUINT8_CLASS 9
-    #define mxINT16_CLASS 10
+	TODO:	support	more	array	types?
+				#define	mxCELL_CLASS	1
+				#define	mxOBJECT_CLASS	3
+				#define	mxCHAR_CLASS	4
+				#define	mxSPARSE_CLASS	5
+				#define	mxSINGLE_CLASS	7
+				#define	mxINT8_CLASS	8
+				#define	mxUINT8_CLASS	9
+				#define	mxINT16_CLASS	10
 */
 
-MatLab::MatLab(char * file_name, char * param_name, char * time_name) {
-
-    const int file_type_len = 124;
-    char file_type[file_type_len + 1];
-    int ii;
-    char * temp_ptr;
-    int temp;
-    short version;
-    short magic;
-    int data_type, bytes, field_data_type, field_bytes;
-    int size = 0, type = 0;
-    int array_type, array_bytes, array_flags[2];
-    int array_complex, array_class ;
-    int dim_type, dim_bytes, num_dims;
-    int * dims = NULL;
-    int name_bytes;
-    char * name, * field_name, * variable_name;
-    int real_type, real_bytes;
-    int img_type, img_bytes;
-    bool param_found, time_found, found, field_found;
-    int offset;
-
-    int field_index, field_num;
-
-    fileName_ = file_name;
-
-    if ((fp_ = fopen(file_name, "r")) == 0) {
-        std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-        return;
-    }
-
-    // we use fseek calls to move around so I need to know the max offset of the file
-    fseek(fp_, 0, SEEK_END) ;
-    rewind(fp_) ;
-
-    // TODO:  This only handles single dimensional arrays
-
-    // get field_num from param_name
-    temp_ptr = rindex(param_name, '[') ;
-    if (temp_ptr != NULL) {
-        sscanf(&temp_ptr[1], "%d", &y_value_.field_num_) ;
-    } else {
-        y_value_.field_num_ = 0;
-    }
-
-    // get field_num from time_name
-    temp_ptr = rindex(time_name, '[') ;
-    if (temp_ptr != NULL) {
-        sscanf(&temp_ptr[1], "%d", &time_value_.field_num_) ;
-    } else {
-        time_value_.field_num_ = 0;
-    }
-
-    fread(file_type, file_type_len, 1, fp_) ;
-    file_type[file_type_len] = '\0';
-
-    if ( !strncmp(file_type, "MATL", 4)) {
-
-        fread(&version, 2, 1, fp_) ;
-        fread(&magic, 2, 1, fp_) ;
-        if (magic == 0x4d49) {
-            swap_ = 0;
-        } else if (magic == 0x494d) {
-            swap_ = 1;
-        }
-
-        param_found = time_found = false;
-        while ( (!param_found || !time_found) && !feof(fp_)) {
-
-            // Start to access a new data element
-            found = false;
-
-            // this is either 0 or num_bytes if non_zero
-            fread(&temp, 4, 1, fp_) ;
-            if (swap_) {
-                temp = trick_byteswap_int(temp) ;
-            }
-            if ( (temp >> 16 ) == 0) {
-                // data_type
-                data_type = temp;
-
-                // bytes
-                fread(&bytes, 4, 1, fp_) ;
-                if (swap_) {
-                    bytes = trick_byteswap_int(bytes) ;
-                }
-            } else {
-                bytes = temp >> 16;
-                data_type = temp & 0x0000FFFF;
-            }
-
-            // Matricies are what we want to deal with
-            if (data_type == MI_MATRIX) {
-                // array type is always miUINT32
-                fread(&array_type, 4, 1, fp_) ;
-                // array bytes is always 8
-                fread(&array_bytes, 4, 1, fp_) ;
-
-                // array flags
-                fread(array_flags, 8, 1, fp_) ;
-                if (swap_) {
-                    array_flags[0] = trick_byteswap_int(array_flags[0]) ;
-                }
-                array_complex = (array_flags[0] & 0x00000800 ) ? 1 : 0;
-                array_class = array_flags[0] & 0x000000FF;
-
-                // dim type is always miINT32
-                fread(&dim_type, 4, 1, fp_) ;
-                if (swap_) {
-                    dim_type = trick_byteswap_int(dim_type) ;
-                }
-
-                // dim bytes = ( num_dim * 4 )
-                fread(&dim_bytes, 4, 1, fp_) ;
-                if (swap_) {
-                    dim_bytes = trick_byteswap_int(dim_bytes) ;
-                }
-
-                num_dims = dim_bytes / 4;
-                dims = new int[num_dims];
-                for (ii = 0; ii < num_dims; ii++) {
-                    fread(&dims[ii], 4, 1, fp_) ;
-                    if (swap_) {
-                        dims[ii] = trick_byteswap_int(dims[ii]) ;
-                    }
-                }
-
-                // name field, could be a short element type if we have a short name
-                // this is either 0 or num_bytes if non_zero
-                fread(&temp, 4, 1, fp_) ;
-                if (swap_) {
-                    temp = trick_byteswap_short(temp) ;
-                }
-                if ( (temp >> 16 ) == 0) {
-                    // bytes
-                    fread(&name_bytes, 4, 1, fp_) ;
-                    if (swap_) {
-                        name_bytes = trick_byteswap_int(name_bytes) ;
-                    }
-                } else {
-                    name_bytes = temp >> 16;
-                }
-
-                name = new char[name_bytes + 1];
-                fread(name, name_bytes, 1, fp_) ;
-                name[name_bytes] = '\0';
-
-                // name pad
-                offset = ftell(fp_) ;
-                if (offset % 8) {
-                    fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
-                }
-
-                // for mxSTRUCT_CLASS
-                if (array_class == mxSTRUCT_CLASS) {
-                    int field_name_len, each_field_name_len;
-                    fseek(fp_, 4, SEEK_CUR);
-                    fread(&each_field_name_len, 4, 1, fp_);
-                    if (swap_) {
-                        each_field_name_len = trick_byteswap_short(each_field_name_len);
-                    }
-
-                    fseek(fp_, 4, SEEK_CUR);
-                    fread(&field_name_len, 4, 1, fp_);
-                    if (swap_) {
-                        field_name_len = trick_byteswap_short(field_name_len);
-                    }
-
-                    field_found = false;
-                    field_num = field_name_len / each_field_name_len;
-                    for (field_index = 0; field_index < field_num; field_index++) {
-                        field_name = new char[each_field_name_len];
-                        fread(field_name, each_field_name_len, 1, fp_);
-
-                        variable_name = new char[name_bytes+each_field_name_len+1];
-                        strcpy(variable_name, name);
-
-                        strcat(variable_name, ".");
-                        strcat(variable_name, field_name);
-
-                        if (!strcmp( variable_name , param_name )) {
-                            name = new char[strlen(variable_name)];
-                            strcpy(name, variable_name);
-                            field_found = true;
-                            delete [] field_name;
-                            delete [] variable_name;
-                            break;
-                        }
-                        delete [] field_name;
-                        delete [] variable_name;
-                    }
-
-                    if (field_found) {
-                        fseek(fp_, (field_num-field_index-1)*each_field_name_len, SEEK_CUR);
-                    }
-
-                    ii = 0;
-                    while (ii < field_num) {
-                        // Numeric array for each field
-                        // this is either 0 or num_bytes if non_zero
-                        fread(&temp, 4, 1, fp_) ;
-                        if (swap_) {
-                            temp = trick_byteswap_int(temp) ;
-                        }
-                        if ( (temp >> 16 ) == 0) {
-                            // data_type
-                            field_data_type = temp;
-
-                            // bytes
-                            fread(&field_bytes, 4, 1, fp_) ;
-                            if (swap_) {
-                                field_bytes = trick_byteswap_int(field_bytes) ;
-                            }
-                        } else {
-                            field_bytes = temp >> 16;
-                            field_data_type = temp & 0x0000FFFF;
-                        }
-
-                        if (ii == field_index) {
-                            break;
-                        } else {
-                            fseek(fp_, field_bytes, SEEK_CUR);
-                            ii++;
-                        }
-                    }
-
-                    if (field_found ){
-                        if (field_data_type == MI_MATRIX) {
-                            // array type is always miUINT32
-                            fread(&array_type, 4, 1, fp_) ;
-
-                            // array bytes is always 8
-                            fread(&array_bytes, 4, 1, fp_) ;
-
-                            // array flags
-                            fread(array_flags, 8, 1, fp_) ;
-                            if (swap_) {
-                                array_flags[0] = trick_byteswap_int(array_flags[0]) ;
-                            }
-
-                            // dim type is always miINT32
-                            fread(&dim_type, 4, 1, fp_) ;
-                            if (swap_) {
-                                dim_type = trick_byteswap_int(dim_type) ;
-                            }
-
-                            fread(&dim_bytes, 4, 1, fp_) ;
-                            if (swap_) {
-                                dim_bytes = trick_byteswap_int(dim_bytes) ;
-                            }
-
-                            num_dims = dim_bytes / 4;
-                            dims = new int[num_dims];
-                            for (ii = 0; ii < num_dims; ii++) {
-                                fread(&dims[ii], 4, 1, fp_) ;
-                                if (swap_) {
-                                    dims[ii] = trick_byteswap_int(dims[ii]) ;
-                                }
-                            }
-
-                            // each array name
-                            fread(&temp, 4, 1, fp_) ;
-                            fread(&temp, 4, 1, fp_);
-
-                            // field data, could be a small data element format if we
-                            // have a data element takes up only 1 to 4 bytes.
-                            // if first 2 bytes of the tag are not 0, the tag uses the small
-                            // data element format.
-                            fread(&temp, 4, 1, fp_) ;
-                            if (swap_) {
-                                temp = trick_byteswap_short(temp) ;
-                            }
-
-                            if ( (temp >> 16 ) == 0) {
-                                // data_type
-                                real_type = temp;
-
-                                // bytes
-                                fread(&real_bytes, 4, 1, fp_) ;
-                                if (swap_) {
-                                    real_bytes = trick_byteswap_int(real_bytes) ;
-                                }
-                            } else {
-                                real_bytes = temp >> 16;
-                                real_type = temp & 0x0000FFFF;
-
-                            }
-
-                            // TODO: make sure else part
-                        } else {
-                            // Everythig else we skip
-                            temp_ptr = new char[field_bytes];
-                            fread(temp_ptr, field_bytes, 1, fp_) ;
-                            delete [] temp_ptr;
-                        }
-                    } else {
-                        real_bytes = 0;
-                        real_type = 0;
-                    }
-
-                } else {
-                    // real data type
-                    fread(&real_type, 4, 1, fp_) ;
-                    if (swap_) {
-                        real_type = trick_byteswap_int(real_type) ;
-                    }
-                    // bytes
-                    fread(&real_bytes, 4, 1, fp_) ;
-                    if (swap_) {
-                        real_bytes = trick_byteswap_int(real_bytes) ;
-                    }
-                }
-
-                switch (real_type) {
-                case MI_INT8:
-                    type = TRICK_CHARACTER;
-                    size = 1;
-                    break;
-                case MI_UINT8:
-                    type = TRICK_UNSIGNED_CHARACTER;
-                    size = 1;
-                    break;
-                case MI_INT16:
-                    type = TRICK_SHORT;
-                    size = 2;
-                    break;
-                case MI_UINT16:
-                    type = TRICK_UNSIGNED_SHORT;
-                    size = 2;
-                    break;
-                case MI_INT32:
-                    type = TRICK_INTEGER;
-                    size = 4;
-                    break;
-                case MI_UINT32:
-                    type = TRICK_UNSIGNED_INTEGER;
-                    size = 4;
-                    break;
-                case MI_SINGLE:
-                    type = TRICK_FLOAT;
-                    size = 4;
-                    break;
-                case MI_DOUBLE:
-                    type = TRICK_DOUBLE;
-                    size = 8;
-                    break;
-                case MI_INT64:
-                    type = TRICK_LONG_LONG;
-                    size = 8;
-                    break;
-                case MI_UINT64:
-                    type = TRICK_UNSIGNED_LONG_LONG;
-                    size = 8;
-                    break;
-                case 15: // miCOMPRESSED
-                case 16: // miUTF8
-                case 17: // miUTF16
-                case 18: // miUTF32
-                case 0:
-                    type = MATLAB_UNSUPPORTED;
-                    size = 0;
-                    break;
-                }
-
-                // TODO: Array bounds checking
-                if (array_class == mxSTRUCT_CLASS) {
-
-                    if (!strcmp(name, param_name)) {
-                        y_value_.size_ = size;
-                        y_value_.type_ = type;
-                        y_value_.bytes_ = real_bytes;
-                        y_value_.num_dims_ = num_dims;
-                        y_value_.dims_ = dims;
-                        y_value_.data_offset_ = ftell(fp_) ;
-                        found = param_found = true;
-                    }
-                    if (!strcmp(name, time_name)) {
-                        time_value_.size_ = size;
-                        time_value_.type_ = type;
-                        time_value_.bytes_ = real_bytes;
-                        time_value_.num_dims_ = num_dims;
-                        time_value_.dims_ = dims;
-                        time_value_.data_offset_ = ftell(fp_) ;
-                        found = time_found = true;
-                    }
-                } else {
-                    if (!strcmp(name, param_name)) {
-                        y_value_.size_ = size;
-                        y_value_.type_ = type;
-                        y_value_.bytes_ = real_bytes;
-                        y_value_.num_dims_ = num_dims;
-                        y_value_.dims_ = dims;
-                        y_value_.data_offset_ = ftell(fp_) ;
-                        found = param_found = true;
-                    }
-
-                    if ( !strcmp(name, time_name)) {
-                        time_value_.size_ = size;
-                        time_value_.type_ = type;
-                        time_value_.bytes_ = real_bytes;
-                        time_value_.num_dims_ = num_dims;
-                        time_value_.dims_ = dims;
-                        time_value_.data_offset_ = ftell(fp_) ;
-                        found = time_found = true;
-                    }
-                }
-
-                // skip past this array
-                fseek(fp_, real_bytes, SEEK_CUR) ;
-                if (array_class != mxSTRUCT_CLASS) {
-
-                    // make sure that we are on a 64 bit boundary
-                    offset = ftell(fp_) ;
-                    if (offset % 8) {
-                        fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
-                    }
-
-                    // skip over the imaginary part if any right now
-                    if (array_complex) {
-                        // real data type
-                        fread(&img_type, 4, 1, fp_) ;
-                        // bytes
-                        fread(&img_bytes, 4, 1, fp_) ;
-                        if (swap_) {
-                            img_bytes = trick_byteswap_int(img_bytes) ;
-                        }
-
-                        fseek(fp_, img_bytes, SEEK_CUR) ;
-
-                        // make sure that we are on a 64 bit boundary
-                        offset = ftell(fp_) ;
-                        if (offset % 8) {
-                            fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
-                        }
-
-                    }
-                } else {
-                    // for mxSTRUCT_CLASS, skip pass all the other fields
-                    while (field_index < field_num-1) {
-                        // Numeric array for each field
-                        // this is either 0 or num_bytes if non_zero
-                        fread(&temp, 4, 1, fp_) ;
-                        if (swap_) {
-                            temp = trick_byteswap_int(temp) ;
-                        }
-                        if ( (temp >> 16 ) == 0) {
-                            // bytes
-                            fread(&bytes, 4, 1, fp_) ;
-                            if (swap_) {
-                                bytes = trick_byteswap_int(bytes) ;
-                            }
-                        } else {
-                            bytes = temp >> 16;
-                        }
-                        fseek(fp_, bytes, SEEK_CUR);
-                        field_index++;
-                    }
-
-                    // make sure that we are on a 64 bit boundary
-                    offset = ftell(fp_) ;
-                    if (offset % 8) {
-                        fseek(fp_, 8 - (offset % 8), SEEK_CUR) ;
-                    }
-
-                }
-
-                if ( !found) {
-                    delete [] dims;
-                    dims = NULL;
-                }
-                delete [] name;
-
-            } else {
-                // Everythig else we skip
-                temp_ptr = new char[bytes];
-                fread(temp_ptr, bytes, 1, fp_) ;
-                delete [] temp_ptr;
-            }
-        }
-    }
-
-    curr_row_ = 0;
+MatLab::MatLab(char	*	file_name,	char	*	param_name,	char	*	time_name)	{
+
+				const	int	file_type_len	=	124;
+				char	file_type[file_type_len	+	1];
+				int	ii;
+				char	*	temp_ptr;
+				int	temp;
+				short	version;
+				short	magic;
+				int	data_type,	bytes,	field_data_type,	field_bytes;
+				int	size	=	0,	type	=	0;
+				int	array_type,	array_bytes,	array_flags[2];
+				int	array_complex,	array_class	;
+				int	dim_type,	dim_bytes,	num_dims;
+				int	*	dims	=	NULL;
+				int	name_bytes;
+				char	*	name,	*	field_name,	*	variable_name;
+				int	real_type,	real_bytes;
+				int	img_type,	img_bytes;
+				bool	param_found,	time_found,	found,	field_found;
+				int	offset;
+
+				int	field_index,	field_num;
+
+				fileName_	=	file_name;
+
+				if	((fp_	=	fopen(file_name,	"r"))	==	0)	{
+								std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+								return;
+				}
+
+				//	we	use	fseek	calls	to	move	around	so	I	need	to	know	the	max	offset	of	the	file
+				fseek(fp_,	0,	SEEK_END)	;
+				rewind(fp_)	;
+
+				//	TODO:		This	only	handles	single	dimensional	arrays
+
+				//	get	field_num	from	param_name
+				temp_ptr	=	rindex(param_name,	'[')	;
+				if	(temp_ptr	!=	NULL)	{
+								sscanf(&temp_ptr[1],	"%d",	&y_value_.field_num_)	;
+				}	else	{
+								y_value_.field_num_	=	0;
+				}
+
+				//	get	field_num	from	time_name
+				temp_ptr	=	rindex(time_name,	'[')	;
+				if	(temp_ptr	!=	NULL)	{
+								sscanf(&temp_ptr[1],	"%d",	&time_value_.field_num_)	;
+				}	else	{
+								time_value_.field_num_	=	0;
+				}
+
+				fread(file_type,	file_type_len,	1,	fp_)	;
+				file_type[file_type_len]	=	'\0';
+
+				if	(	!strncmp(file_type,	"MATL",	4))	{
+
+								fread(&version,	2,	1,	fp_)	;
+								fread(&magic,	2,	1,	fp_)	;
+								if	(magic	==	0x4d49)	{
+												swap_	=	0;
+								}	else	if	(magic	==	0x494d)	{
+												swap_	=	1;
+								}
+
+								param_found	=	time_found	=	false;
+								while	(	(!param_found	||	!time_found)	&&	!feof(fp_))	{
+
+												//	Start	to	access	a	new	data	element
+												found	=	false;
+
+												//	this	is	either	0	or	num_bytes	if	non_zero
+												fread(&temp,	4,	1,	fp_)	;
+												if	(swap_)	{
+																temp	=	trick_byteswap_int(temp)	;
+												}
+												if	(	(temp	>>	16	)	==	0)	{
+																//	data_type
+																data_type	=	temp;
+
+																//	bytes
+																fread(&bytes,	4,	1,	fp_)	;
+																if	(swap_)	{
+																				bytes	=	trick_byteswap_int(bytes)	;
+																}
+												}	else	{
+																bytes	=	temp	>>	16;
+																data_type	=	temp	&	0x0000FFFF;
+												}
+
+												//	Matricies	are	what	we	want	to	deal	with
+												if	(data_type	==	MI_MATRIX)	{
+																//	array	type	is	always	miUINT32
+																fread(&array_type,	4,	1,	fp_)	;
+																//	array	bytes	is	always	8
+																fread(&array_bytes,	4,	1,	fp_)	;
+
+																//	array	flags
+																fread(array_flags,	8,	1,	fp_)	;
+																if	(swap_)	{
+																				array_flags[0]	=	trick_byteswap_int(array_flags[0])	;
+																}
+																array_complex	=	(array_flags[0]	&	0x00000800	)	?	1	:	0;
+																array_class	=	array_flags[0]	&	0x000000FF;
+
+																//	dim	type	is	always	miINT32
+																fread(&dim_type,	4,	1,	fp_)	;
+																if	(swap_)	{
+																				dim_type	=	trick_byteswap_int(dim_type)	;
+																}
+
+																//	dim	bytes	=	(	num_dim	*	4	)
+																fread(&dim_bytes,	4,	1,	fp_)	;
+																if	(swap_)	{
+																				dim_bytes	=	trick_byteswap_int(dim_bytes)	;
+																}
+
+																num_dims	=	dim_bytes	/	4;
+																dims	=	new	int[num_dims];
+																for	(ii	=	0;	ii	<	num_dims;	ii++)	{
+																				fread(&dims[ii],	4,	1,	fp_)	;
+																				if	(swap_)	{
+																								dims[ii]	=	trick_byteswap_int(dims[ii])	;
+																				}
+																}
+
+																//	name	field,	could	be	a	short	element	type	if	we	have	a	short	name
+																//	this	is	either	0	or	num_bytes	if	non_zero
+																fread(&temp,	4,	1,	fp_)	;
+																if	(swap_)	{
+																				temp	=	trick_byteswap_short(temp)	;
+																}
+																if	(	(temp	>>	16	)	==	0)	{
+																				//	bytes
+																				fread(&name_bytes,	4,	1,	fp_)	;
+																				if	(swap_)	{
+																								name_bytes	=	trick_byteswap_int(name_bytes)	;
+																				}
+																}	else	{
+																				name_bytes	=	temp	>>	16;
+																}
+
+																name	=	new	char[name_bytes	+	1];
+																fread(name,	name_bytes,	1,	fp_)	;
+																name[name_bytes]	=	'\0';
+
+																//	name	pad
+																offset	=	ftell(fp_)	;
+																if	(offset	%	8)	{
+																				fseek(fp_,	8	-	(offset	%	8),	SEEK_CUR)	;
+																}
+
+																//	for	mxSTRUCT_CLASS
+																if	(array_class	==	mxSTRUCT_CLASS)	{
+																				int	field_name_len,	each_field_name_len;
+																				fseek(fp_,	4,	SEEK_CUR);
+																				fread(&each_field_name_len,	4,	1,	fp_);
+																				if	(swap_)	{
+																								each_field_name_len	=	trick_byteswap_short(each_field_name_len);
+																				}
+
+																				fseek(fp_,	4,	SEEK_CUR);
+																				fread(&field_name_len,	4,	1,	fp_);
+																				if	(swap_)	{
+																								field_name_len	=	trick_byteswap_short(field_name_len);
+																				}
+
+																				field_found	=	false;
+																				field_num	=	field_name_len	/	each_field_name_len;
+																				for	(field_index	=	0;	field_index	<	field_num;	field_index++)	{
+																								field_name	=	new	char[each_field_name_len];
+																								fread(field_name,	each_field_name_len,	1,	fp_);
+
+																								variable_name	=	new	char[name_bytes+each_field_name_len+1];
+																								strcpy(variable_name,	name);
+
+																								strcat(variable_name,	".");
+																								strcat(variable_name,	field_name);
+
+																								if	(!strcmp(	variable_name	,	param_name	))	{
+																												name	=	new	char[strlen(variable_name)];
+																												strcpy(name,	variable_name);
+																												field_found	=	true;
+																												delete	[]	field_name;
+																												delete	[]	variable_name;
+																												break;
+																								}
+																								delete	[]	field_name;
+																								delete	[]	variable_name;
+																				}
+
+																				if	(field_found)	{
+																								fseek(fp_,	(field_num-field_index-1)*each_field_name_len,	SEEK_CUR);
+																				}
+
+																				ii	=	0;
+																				while	(ii	<	field_num)	{
+																								//	Numeric	array	for	each	field
+																								//	this	is	either	0	or	num_bytes	if	non_zero
+																								fread(&temp,	4,	1,	fp_)	;
+																								if	(swap_)	{
+																												temp	=	trick_byteswap_int(temp)	;
+																								}
+																								if	(	(temp	>>	16	)	==	0)	{
+																												//	data_type
+																												field_data_type	=	temp;
+
+																												//	bytes
+																												fread(&field_bytes,	4,	1,	fp_)	;
+																												if	(swap_)	{
+																																field_bytes	=	trick_byteswap_int(field_bytes)	;
+																												}
+																								}	else	{
+																												field_bytes	=	temp	>>	16;
+																												field_data_type	=	temp	&	0x0000FFFF;
+																								}
+
+																								if	(ii	==	field_index)	{
+																												break;
+																								}	else	{
+																												fseek(fp_,	field_bytes,	SEEK_CUR);
+																												ii++;
+																								}
+																				}
+
+																				if	(field_found	){
+																								if	(field_data_type	==	MI_MATRIX)	{
+																												//	array	type	is	always	miUINT32
+																												fread(&array_type,	4,	1,	fp_)	;
+
+																												//	array	bytes	is	always	8
+																												fread(&array_bytes,	4,	1,	fp_)	;
+
+																												//	array	flags
+																												fread(array_flags,	8,	1,	fp_)	;
+																												if	(swap_)	{
+																																array_flags[0]	=	trick_byteswap_int(array_flags[0])	;
+																												}
+
+																												//	dim	type	is	always	miINT32
+																												fread(&dim_type,	4,	1,	fp_)	;
+																												if	(swap_)	{
+																																dim_type	=	trick_byteswap_int(dim_type)	;
+																												}
+
+																												fread(&dim_bytes,	4,	1,	fp_)	;
+																												if	(swap_)	{
+																																dim_bytes	=	trick_byteswap_int(dim_bytes)	;
+																												}
+
+																												num_dims	=	dim_bytes	/	4;
+																												dims	=	new	int[num_dims];
+																												for	(ii	=	0;	ii	<	num_dims;	ii++)	{
+																																fread(&dims[ii],	4,	1,	fp_)	;
+																																if	(swap_)	{
+																																				dims[ii]	=	trick_byteswap_int(dims[ii])	;
+																																}
+																												}
+
+																												//	each	array	name
+																												fread(&temp,	4,	1,	fp_)	;
+																												fread(&temp,	4,	1,	fp_);
+
+																												//	field	data,	could	be	a	small	data	element	format	if	we
+																												//	have	a	data	element	takes	up	only	1	to	4	bytes.
+																												//	if	first	2	bytes	of	the	tag	are	not	0,	the	tag	uses	the	small
+																												//	data	element	format.
+																												fread(&temp,	4,	1,	fp_)	;
+																												if	(swap_)	{
+																																temp	=	trick_byteswap_short(temp)	;
+																												}
+
+																												if	(	(temp	>>	16	)	==	0)	{
+																																//	data_type
+																																real_type	=	temp;
+
+																																//	bytes
+																																fread(&real_bytes,	4,	1,	fp_)	;
+																																if	(swap_)	{
+																																				real_bytes	=	trick_byteswap_int(real_bytes)	;
+																																}
+																												}	else	{
+																																real_bytes	=	temp	>>	16;
+																																real_type	=	temp	&	0x0000FFFF;
+
+																												}
+
+																												//	TODO:	make	sure	else	part
+																								}	else	{
+																												//	Everythig	else	we	skip
+																												temp_ptr	=	new	char[field_bytes];
+																												fread(temp_ptr,	field_bytes,	1,	fp_)	;
+																												delete	[]	temp_ptr;
+																								}
+																				}	else	{
+																								real_bytes	=	0;
+																								real_type	=	0;
+																				}
+
+																}	else	{
+																				//	real	data	type
+																				fread(&real_type,	4,	1,	fp_)	;
+																				if	(swap_)	{
+																								real_type	=	trick_byteswap_int(real_type)	;
+																				}
+																				//	bytes
+																				fread(&real_bytes,	4,	1,	fp_)	;
+																				if	(swap_)	{
+																								real_bytes	=	trick_byteswap_int(real_bytes)	;
+																				}
+																}
+
+																switch	(real_type)	{
+																case	MI_INT8:
+																				type	=	TRICK_CHARACTER;
+																				size	=	1;
+																				break;
+																case	MI_UINT8:
+																				type	=	TRICK_UNSIGNED_CHARACTER;
+																				size	=	1;
+																				break;
+																case	MI_INT16:
+																				type	=	TRICK_SHORT;
+																				size	=	2;
+																				break;
+																case	MI_UINT16:
+																				type	=	TRICK_UNSIGNED_SHORT;
+																				size	=	2;
+																				break;
+																case	MI_INT32:
+																				type	=	TRICK_INTEGER;
+																				size	=	4;
+																				break;
+																case	MI_UINT32:
+																				type	=	TRICK_UNSIGNED_INTEGER;
+																				size	=	4;
+																				break;
+																case	MI_SINGLE:
+																				type	=	TRICK_FLOAT;
+																				size	=	4;
+																				break;
+																case	MI_DOUBLE:
+																				type	=	TRICK_DOUBLE;
+																				size	=	8;
+																				break;
+																case	MI_INT64:
+																				type	=	TRICK_LONG_LONG;
+																				size	=	8;
+																				break;
+																case	MI_UINT64:
+																				type	=	TRICK_UNSIGNED_LONG_LONG;
+																				size	=	8;
+																				break;
+																case	15:	//	miCOMPRESSED
+																case	16:	//	miUTF8
+																case	17:	//	miUTF16
+																case	18:	//	miUTF32
+																case	0:
+																				type	=	MATLAB_UNSUPPORTED;
+																				size	=	0;
+																				break;
+																}
+
+																//	TODO:	Array	bounds	checking
+																if	(array_class	==	mxSTRUCT_CLASS)	{
+
+																				if	(!strcmp(name,	param_name))	{
+																								y_value_.size_	=	size;
+																								y_value_.type_	=	type;
+																								y_value_.bytes_	=	real_bytes;
+																								y_value_.num_dims_	=	num_dims;
+																								y_value_.dims_	=	dims;
+																								y_value_.data_offset_	=	ftell(fp_)	;
+																								found	=	param_found	=	true;
+																				}
+																				if	(!strcmp(name,	time_name))	{
+																								time_value_.size_	=	size;
+																								time_value_.type_	=	type;
+																								time_value_.bytes_	=	real_bytes;
+																								time_value_.num_dims_	=	num_dims;
+																								time_value_.dims_	=	dims;
+																								time_value_.data_offset_	=	ftell(fp_)	;
+																								found	=	time_found	=	true;
+																				}
+																}	else	{
+																				if	(!strcmp(name,	param_name))	{
+																								y_value_.size_	=	size;
+																								y_value_.type_	=	type;
+																								y_value_.bytes_	=	real_bytes;
+																								y_value_.num_dims_	=	num_dims;
+																								y_value_.dims_	=	dims;
+																								y_value_.data_offset_	=	ftell(fp_)	;
+																								found	=	param_found	=	true;
+																				}
+
+																				if	(	!strcmp(name,	time_name))	{
+																								time_value_.size_	=	size;
+																								time_value_.type_	=	type;
+																								time_value_.bytes_	=	real_bytes;
+																								time_value_.num_dims_	=	num_dims;
+																								time_value_.dims_	=	dims;
+																								time_value_.data_offset_	=	ftell(fp_)	;
+																								found	=	time_found	=	true;
+																				}
+																}
+
+																//	skip	past	this	array
+																fseek(fp_,	real_bytes,	SEEK_CUR)	;
+																if	(array_class	!=	mxSTRUCT_CLASS)	{
+
+																				//	make	sure	that	we	are	on	a	64	bit	boundary
+																				offset	=	ftell(fp_)	;
+																				if	(offset	%	8)	{
+																								fseek(fp_,	8	-	(offset	%	8),	SEEK_CUR)	;
+																				}
+
+																				//	skip	over	the	imaginary	part	if	any	right	now
+																				if	(array_complex)	{
+																								//	real	data	type
+																								fread(&img_type,	4,	1,	fp_)	;
+																								//	bytes
+																								fread(&img_bytes,	4,	1,	fp_)	;
+																								if	(swap_)	{
+																												img_bytes	=	trick_byteswap_int(img_bytes)	;
+																								}
+
+																								fseek(fp_,	img_bytes,	SEEK_CUR)	;
+
+																								//	make	sure	that	we	are	on	a	64	bit	boundary
+																								offset	=	ftell(fp_)	;
+																								if	(offset	%	8)	{
+																												fseek(fp_,	8	-	(offset	%	8),	SEEK_CUR)	;
+																								}
+
+																				}
+																}	else	{
+																				//	for	mxSTRUCT_CLASS,	skip	pass	all	the	other	fields
+																				while	(field_index	<	field_num-1)	{
+																								//	Numeric	array	for	each	field
+																								//	this	is	either	0	or	num_bytes	if	non_zero
+																								fread(&temp,	4,	1,	fp_)	;
+																								if	(swap_)	{
+																												temp	=	trick_byteswap_int(temp)	;
+																								}
+																								if	(	(temp	>>	16	)	==	0)	{
+																												//	bytes
+																												fread(&bytes,	4,	1,	fp_)	;
+																												if	(swap_)	{
+																																bytes	=	trick_byteswap_int(bytes)	;
+																												}
+																								}	else	{
+																												bytes	=	temp	>>	16;
+																								}
+																								fseek(fp_,	bytes,	SEEK_CUR);
+																								field_index++;
+																				}
+
+																				//	make	sure	that	we	are	on	a	64	bit	boundary
+																				offset	=	ftell(fp_)	;
+																				if	(offset	%	8)	{
+																								fseek(fp_,	8	-	(offset	%	8),	SEEK_CUR)	;
+																				}
+
+																}
+
+																if	(	!found)	{
+																				delete	[]	dims;
+																				dims	=	NULL;
+																}
+																delete	[]	name;
+
+												}	else	{
+																//	Everythig	else	we	skip
+																temp_ptr	=	new	char[bytes];
+																fread(temp_ptr,	bytes,	1,	fp_)	;
+																delete	[]	temp_ptr;
+												}
+								}
+				}
+
+				curr_row_	=	0;
 }
 
-double MatLab::getvalue(struct MatLabVar * mv) {
-    char c;
-    short s;
-    unsigned short us;
-    int i;
-    float f;
-    double d;
-
-    switch (mv->type_) {
-    case TRICK_CHARACTER:
-        fread( &c, mv->size_, 1, fp_) ;
-        return ((double)c);
-    case TRICK_SHORT:
-        fread( &s, mv->size_, 1, fp_) ;
-        if (swap_) {
-            s = trick_byteswap_short(s) ;
-        }
-        return ((double)s);
-    case TRICK_UNSIGNED_SHORT:
-        fread( &us, mv->size_, 1, fp_) ;
-        if (swap_) {
-            us = (unsigned short)trick_byteswap_short(us) ;
-        }
-        return ((double)us);
-    case TRICK_INTEGER:
-        fread( &i, mv->size_, 1, fp_) ;
-        if (swap_) {
-            i = trick_byteswap_int(i) ;
-        }
-        return ((double)i);
-    case TRICK_FLOAT:
-        fread( &f, mv->size_, 1, fp_) ;
-        if (swap_) {
-            f = trick_byteswap_float(f) ;
-        }
-        return ((double)f);
-    case TRICK_DOUBLE:
-        fread( &d, mv->size_, 1, fp_) ;
-        if (swap_) {
-            d = trick_byteswap_double(d) ;
-        }
-        return (d);
-    }
-
-    return (0);
+double	MatLab::getvalue(struct	MatLabVar	*	mv)	{
+				char	c;
+				short	s;
+				unsigned	short	us;
+				int	i;
+				float	f;
+				double	d;
+
+				switch	(mv->type_)	{
+				case	TRICK_CHARACTER:
+								fread(	&c,	mv->size_,	1,	fp_)	;
+								return	((double)c);
+				case	TRICK_SHORT:
+								fread(	&s,	mv->size_,	1,	fp_)	;
+								if	(swap_)	{
+												s	=	trick_byteswap_short(s)	;
+								}
+								return	((double)s);
+				case	TRICK_UNSIGNED_SHORT:
+								fread(	&us,	mv->size_,	1,	fp_)	;
+								if	(swap_)	{
+												us	=	(unsigned	short)trick_byteswap_short(us)	;
+								}
+								return	((double)us);
+				case	TRICK_INTEGER:
+								fread(	&i,	mv->size_,	1,	fp_)	;
+								if	(swap_)	{
+												i	=	trick_byteswap_int(i)	;
+								}
+								return	((double)i);
+				case	TRICK_FLOAT:
+								fread(	&f,	mv->size_,	1,	fp_)	;
+								if	(swap_)	{
+												f	=	trick_byteswap_float(f)	;
+								}
+								return	((double)f);
+				case	TRICK_DOUBLE:
+								fread(	&d,	mv->size_,	1,	fp_)	;
+								if	(swap_)	{
+												d	=	trick_byteswap_double(d)	;
+								}
+								return	(d);
+				}
+
+				return	(0);
 }
 
-int MatLab::get(double * time, double * value) {
+int	MatLab::get(double	*	time,	double	*	value)	{
 
-    long offset;
+				long	offset;
 
 
-    if (curr_row_ < y_value_.dims_[0] && curr_row_ < time_value_.dims_[0]) {
-        offset = time_value_.data_offset_ + time_value_.dims_[0]
-                * time_value_.field_num_ * time_value_.size_ + curr_row_
-                * time_value_.size_;
-        fseek(fp_, offset, SEEK_SET) ;
-        *time = getvalue(&time_value_) ;
+				if	(curr_row_	<	y_value_.dims_[0]	&&	curr_row_	<	time_value_.dims_[0])	{
+								offset	=	time_value_.data_offset_	+	time_value_.dims_[0]
+																*	time_value_.field_num_	*	time_value_.size_	+	curr_row_
+																*	time_value_.size_;
+								fseek(fp_,	offset,	SEEK_SET)	;
+								*time	=	getvalue(&time_value_)	;
 
-        offset = y_value_.data_offset_ + y_value_.dims_[0]
-                * y_value_.field_num_ * y_value_.size_ + curr_row_
-                * y_value_.size_;
-        fseek(fp_, offset, SEEK_SET) ;
-        *value = getvalue(&y_value_) ;
-        curr_row_++;
+								offset	=	y_value_.data_offset_	+	y_value_.dims_[0]
+																*	y_value_.field_num_	*	y_value_.size_	+	curr_row_
+																*	y_value_.size_;
+								fseek(fp_,	offset,	SEEK_SET)	;
+								*value	=	getvalue(&y_value_)	;
+								curr_row_++;
 
-        return ( 1 );
-    }
+								return	(	1	);
+				}
 
-    return ( 0 );
+				return	(	0	);
 }
 
-int MatLab::peek(double * time, double * value) {
+int	MatLab::peek(double	*	time,	double	*	value)	{
 
-    long save_row;
-	int ret;
+				long	save_row;
+	int	ret;
 
-    save_row = curr_row_;
-    ret = get(time, value) ;
-    curr_row_ = save_row;
+				save_row	=	curr_row_;
+				ret	=	get(time,	value)	;
+				curr_row_	=	save_row;
 
-    return (ret);
+				return	(ret);
 }
 
-void MatLab::begin() {
-    curr_row_ = 0;
-    return;
+void	MatLab::begin()	{
+				curr_row_	=	0;
+				return;
 }
 
-int MatLab::end() {
-    return (curr_row_ >= y_value_.dims_[0] || curr_row_ >= time_value_.dims_[0] );
+int	MatLab::end()	{
+				return	(curr_row_	>=	y_value_.dims_[0]	||	curr_row_	>=	time_value_.dims_[0]	);
 }
 
-int MatLab::step() {
+int	MatLab::step()	{
 
-    if (curr_row_ < y_value_.dims_[0] && curr_row_ < time_value_.dims_[0]) {
-        curr_row_++;
-        return ( 1 );
-    }
-    return (0);
+				if	(curr_row_	<	y_value_.dims_[0]	&&	curr_row_	<	time_value_.dims_[0])	{
+								curr_row_++;
+								return	(	1	);
+				}
+				return	(0);
 
 }
 
-int MatLabLocateParam(char * file_name, char * param_name, char * time_name) {
-    const int file_type_len = 124;
-    char file_type[file_type_len + 1];
-    int ii;
-    char * temp_ptr;
-    int temp;
-    short version;
-    short magic;
-    int data_type, bytes;
-    int array_type, array_bytes, array_flags[2];
-    int array_complex, array_class;
-    int dim_type, dim_bytes, num_dims;
-    int * dims = NULL;
-    int name_bytes;
-    char * name, * field_name, * variable_name;
-    int real_type, real_bytes;
-    int img_type, img_bytes;
-    bool param_found, time_found, field_found;
-    int offset = 0;
-    int swap;
-    int y_field_num, time_field_num;
-    FILE *fp;
-    int field_index, field_num;
-
-    if ((fp = fopen(file_name, "r")) == 0) {
-        std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-        return (0);
-    }
-
-    // we use fseek calls to move around so I need to know the max offset of the file
-    fseek(fp, 0, SEEK_END) ;
-    rewind(fp) ;
-
-    // TODO:  This only handles single dimensional arrays
-
-    // get field_num from param_name
-    temp_ptr = rindex(param_name, '[') ;
-    if (temp_ptr != NULL) {
-        sscanf(&temp_ptr[1], "%d", &y_field_num) ;
-    } else {
-        y_field_num = 0;
-    }
-
-    // get field_num from time_name
-    temp_ptr = rindex(time_name, '[') ;
-    if (temp_ptr != NULL) {
-        sscanf(&temp_ptr[1], "%d", &time_field_num) ;
-    } else {
-        time_field_num = 0;
-    }
-
-    fread(file_type, file_type_len, 1, fp) ;
-    file_type[file_type_len] = '\0';
-
-    if ( !strncmp(file_type, "MATL", 4)) {
-
-        fread(&version, 2, 1, fp) ;
-        fread(&magic, 2, 1, fp) ;
-        if (magic == 0x4d49) {
-            swap = 0;
-        } else if (magic == 0x494d) {
-            swap = 1;
-        } else {
-            std::cerr << "ERROR: MatLab.cpp swap magic is invalid, default to byte swap == false" << std::endl;
-            swap = 0;
-        }
-
-        param_found = time_found = false;
-        while ( (!param_found || !time_found) && !feof(fp)) {
-
-            // this is either 0 or num_bytes if non_zero
-            fread(&temp, 4, 1, fp) ;
-            if (swap) {
-                temp = trick_byteswap_int(temp) ;
-            }
-            if ( (temp >> 16 ) == 0) {
-                // data_type
-                data_type = temp;
-
-                // bytes
-                fread(&bytes, 4, 1, fp) ;
-                if (swap) {
-                    bytes = trick_byteswap_int(bytes) ;
-                }
-            } else {
-                bytes = temp >> 16;
-                data_type = temp & 0x0000FFFF;
-            }
-
-            // Matricies are what we want to deal with
-            if (data_type == MI_MATRIX) {
-                // array type is always miUINT32
-                fread(&array_type, 4, 1, fp) ;
-                // array bytes is always 8
-                fread(&array_bytes, 4, 1, fp) ;
-
-                // array flags
-                fread(array_flags, 8, 1, fp) ;
-                if (swap) {
-                    array_flags[0] = trick_byteswap_int(array_flags[0]) ;
-                }
-                array_complex = (array_flags[0] & 0x00000800 ) ? 1 : 0;
-                array_class = array_flags[0] & 0x000000FF;
-
-                // dim type is always miINT32
-                fread(&dim_type, 4, 1, fp) ;
-                if (swap) {
-                    dim_type = trick_byteswap_int(dim_type) ;
-                }
-
-                // dim bytes = ( num_dim * 4 )
-                fread(&dim_bytes, 4, 1, fp) ;
-                if (swap) {
-                    dim_bytes = trick_byteswap_int(dim_bytes) ;
-                }
-
-                num_dims = dim_bytes / 4;
-                dims = new int[num_dims];
-                for (ii = 0; ii < num_dims; ii++) {
-                    fread(&dims[ii], 4, 1, fp) ;
-                    if (swap) {
-                        dims[ii] = trick_byteswap_int(dims[ii]) ;
-                    }
-                }
-
-                // name field, could be a short element type if we have a short name
-                // this is either 0 or num_bytes if non_zero
-                fread(&temp, 4, 1, fp) ;
-                if (swap) {
-                    temp = trick_byteswap_short(temp) ;
-                }
-                if ( (temp >> 16 ) == 0) {
-                    // bytes
-                    fread(&name_bytes, 4, 1, fp) ;
-                    if (swap) {
-                        name_bytes = trick_byteswap_int(name_bytes) ;
-                    }
-                } else {
-                    name_bytes = temp >> 16;
-                }
-
-                name = new char[name_bytes + 1];
-                fread(name, name_bytes, 1, fp) ;
-                name[name_bytes] = '\0';
-
-                // name pad
-                offset = ftell(fp) ;
-                if (offset % 8) {
-                    fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
-                }
-
-                // for mxSTRUCT_CLASS
-                if (array_class == mxSTRUCT_CLASS) {
-                    int field_name_len, each_field_name_len;
-                    fseek(fp, 4, SEEK_CUR);
-                    fread(&each_field_name_len, 4, 1, fp);
-                    if (swap) {
-                        each_field_name_len = trick_byteswap_short(each_field_name_len);
-                    }
-
-                    fseek(fp, 4, SEEK_CUR);
-                    fread(&field_name_len, 4, 1, fp);
-                    if (swap) {
-                        field_name_len = trick_byteswap_short(field_name_len);
-                    }
-
-                    field_num = field_name_len / each_field_name_len;
-
-                    field_found = false;
-                    for (field_index = 0; field_index < field_num; field_index++) {
-                        field_name = new char[each_field_name_len];
-                        fread(field_name, each_field_name_len, 1, fp);
-                        variable_name = new char[name_bytes+each_field_name_len+1];
-                        strcpy(variable_name, name);
-                        strcat(variable_name, ".");
-                        strcat(variable_name, field_name);
-
-                        if (!strcmp( variable_name , param_name ) ) {
-                            name = new char[strlen(variable_name)];
-                            strcpy(name, variable_name);
-                            field_found = true;
-                            delete [] field_name;
-                            delete [] variable_name;
-                            break;
-                        }
-                        delete [] field_name;
-                        delete [] variable_name;
-                    }
-
-                    if (field_found) {
-                        fseek(fp, (field_num-field_index-1)*each_field_name_len, SEEK_CUR);
-                    }
-                    ii = 0;
-                    while (ii < field_num) {
-                        // Numeric array for each field
-                        // this is either 0 or num_bytes if non_zero
-                        fread(&temp, 4, 1, fp) ;
-                        if (swap) {
-                            temp = trick_byteswap_int(temp) ;
-                        }
-                        if ( (temp >> 16 ) == 0) {
-
-                            // bytes
-                            fread(&bytes, 4, 1, fp) ;
-                            if (swap) {
-                                bytes = trick_byteswap_int(bytes) ;
-                            }
-                        } else {
-                            bytes = temp >> 16;
-                        }
-                        fseek(fp, bytes, SEEK_CUR);
-                        ii++;
-                    }
-                } else {
-                    // real data type
-                    fread(&real_type, 4, 1, fp) ;
-                    if (swap) {
-                        real_type = trick_byteswap_int(real_type) ;
-                    }
-                    // bytes
-                    fread(&real_bytes, 4, 1, fp) ;
-                    if (swap) {
-                        real_bytes = trick_byteswap_int(real_bytes) ;
-                    }
-                }
-
-                // TODO: Array bounds checking
-                if (array_class == mxSTRUCT_CLASS) {
-
-                    if (!strcmp(name, param_name)) {
-                        param_found = true;
-                    }
-
-                    if (!strcmp(name, time_name)) {
-
-                       time_found = true;
-                    }
-                } else {
-
-                    if (!strncmp(name, param_name, name_bytes)) {
-                        param_found = true;
-                    }
-                    if (!strncmp(name, time_name, name_bytes)) {
-                        time_found = true;
-                    }
-
-                }
-                delete [] name;
-                // delete [] dims;
-                dims = NULL;
-
-                if (param_found && time_found) {
-                    fclose(fp);
-                    return(1);
-                }
-                if (array_class != mxSTRUCT_CLASS) {
-                    // skip past this array
-                    fseek(fp, real_bytes, SEEK_CUR) ;
-
-                    // make sure that we are on a 64 bit boundary
-                    offset = ftell(fp) ;
-                    if (offset % 8) {
-                        fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
-                    }
-
-                    // skip over the imaginary part if any right now
-                    if (array_complex) {
-                        // real data type
-                        fread(&img_type, 4, 1, fp) ;
-                        // bytes
-                        fread(&img_bytes, 4, 1, fp) ;
-                        if (swap) {
-                            img_bytes = trick_byteswap_int(img_bytes) ;
-                        }
-
-                        fseek(fp, img_bytes, SEEK_CUR) ;
-
-                        // make sure that we are on a 64 bit boundary
-                        offset = ftell(fp) ;
-                        if (offset % 8) {
-                            fseek(fp, 8 - (offset % 8), SEEK_CUR) ;
-                        }
-
-                    }
-                }
-            } else {
-                // Everythig else we skip
-                temp_ptr = new char[bytes];
-                fread(temp_ptr, bytes, 1, fp) ;
-                delete [] temp_ptr;
-            }
-        }
-    }
-    fclose(fp) ;
-    return (0);
+int	MatLabLocateParam(char	*	file_name,	char	*	param_name,	char	*	time_name)	{
+				const	int	file_type_len	=	124;
+				char	file_type[file_type_len	+	1];
+				int	ii;
+				char	*	temp_ptr;
+				int	temp;
+				short	version;
+				short	magic;
+				int	data_type,	bytes;
+				int	array_type,	array_bytes,	array_flags[2];
+				int	array_complex,	array_class;
+				int	dim_type,	dim_bytes,	num_dims;
+				int	*	dims	=	NULL;
+				int	name_bytes;
+				char	*	name,	*	field_name,	*	variable_name;
+				int	real_type,	real_bytes;
+				int	img_type,	img_bytes;
+				bool	param_found,	time_found,	field_found;
+				int	offset	=	0;
+				int	swap;
+				int	y_field_num,	time_field_num;
+				FILE	*fp;
+				int	field_index,	field_num;
+
+				if	((fp	=	fopen(file_name,	"r"))	==	0)	{
+								std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+								return	(0);
+				}
+
+				//	we	use	fseek	calls	to	move	around	so	I	need	to	know	the	max	offset	of	the	file
+				fseek(fp,	0,	SEEK_END)	;
+				rewind(fp)	;
+
+				//	TODO:		This	only	handles	single	dimensional	arrays
+
+				//	get	field_num	from	param_name
+				temp_ptr	=	rindex(param_name,	'[')	;
+				if	(temp_ptr	!=	NULL)	{
+								sscanf(&temp_ptr[1],	"%d",	&y_field_num)	;
+				}	else	{
+								y_field_num	=	0;
+				}
+
+				//	get	field_num	from	time_name
+				temp_ptr	=	rindex(time_name,	'[')	;
+				if	(temp_ptr	!=	NULL)	{
+								sscanf(&temp_ptr[1],	"%d",	&time_field_num)	;
+				}	else	{
+								time_field_num	=	0;
+				}
+
+				fread(file_type,	file_type_len,	1,	fp)	;
+				file_type[file_type_len]	=	'\0';
+
+				if	(	!strncmp(file_type,	"MATL",	4))	{
+
+								fread(&version,	2,	1,	fp)	;
+								fread(&magic,	2,	1,	fp)	;
+								if	(magic	==	0x4d49)	{
+												swap	=	0;
+								}	else	if	(magic	==	0x494d)	{
+												swap	=	1;
+								}	else	{
+												std::cerr	<<	"ERROR:	MatLab.cpp	swap	magic	is	invalid,	default	to	byte	swap	==	false"	<<	std::endl;
+												swap	=	0;
+								}
+
+								param_found	=	time_found	=	false;
+								while	(	(!param_found	||	!time_found)	&&	!feof(fp))	{
+
+												//	this	is	either	0	or	num_bytes	if	non_zero
+												fread(&temp,	4,	1,	fp)	;
+												if	(swap)	{
+																temp	=	trick_byteswap_int(temp)	;
+												}
+												if	(	(temp	>>	16	)	==	0)	{
+																//	data_type
+																data_type	=	temp;
+
+																//	bytes
+																fread(&bytes,	4,	1,	fp)	;
+																if	(swap)	{
+																				bytes	=	trick_byteswap_int(bytes)	;
+																}
+												}	else	{
+																bytes	=	temp	>>	16;
+																data_type	=	temp	&	0x0000FFFF;
+												}
+
+												//	Matricies	are	what	we	want	to	deal	with
+												if	(data_type	==	MI_MATRIX)	{
+																//	array	type	is	always	miUINT32
+																fread(&array_type,	4,	1,	fp)	;
+																//	array	bytes	is	always	8
+																fread(&array_bytes,	4,	1,	fp)	;
+
+																//	array	flags
+																fread(array_flags,	8,	1,	fp)	;
+																if	(swap)	{
+																				array_flags[0]	=	trick_byteswap_int(array_flags[0])	;
+																}
+																array_complex	=	(array_flags[0]	&	0x00000800	)	?	1	:	0;
+																array_class	=	array_flags[0]	&	0x000000FF;
+
+																//	dim	type	is	always	miINT32
+																fread(&dim_type,	4,	1,	fp)	;
+																if	(swap)	{
+																				dim_type	=	trick_byteswap_int(dim_type)	;
+																}
+
+																//	dim	bytes	=	(	num_dim	*	4	)
+																fread(&dim_bytes,	4,	1,	fp)	;
+																if	(swap)	{
+																				dim_bytes	=	trick_byteswap_int(dim_bytes)	;
+																}
+
+																num_dims	=	dim_bytes	/	4;
+																dims	=	new	int[num_dims];
+																for	(ii	=	0;	ii	<	num_dims;	ii++)	{
+																				fread(&dims[ii],	4,	1,	fp)	;
+																				if	(swap)	{
+																								dims[ii]	=	trick_byteswap_int(dims[ii])	;
+																				}
+																}
+
+																//	name	field,	could	be	a	short	element	type	if	we	have	a	short	name
+																//	this	is	either	0	or	num_bytes	if	non_zero
+																fread(&temp,	4,	1,	fp)	;
+																if	(swap)	{
+																				temp	=	trick_byteswap_short(temp)	;
+																}
+																if	(	(temp	>>	16	)	==	0)	{
+																				//	bytes
+																				fread(&name_bytes,	4,	1,	fp)	;
+																				if	(swap)	{
+																								name_bytes	=	trick_byteswap_int(name_bytes)	;
+																				}
+																}	else	{
+																				name_bytes	=	temp	>>	16;
+																}
+
+																name	=	new	char[name_bytes	+	1];
+																fread(name,	name_bytes,	1,	fp)	;
+																name[name_bytes]	=	'\0';
+
+																//	name	pad
+																offset	=	ftell(fp)	;
+																if	(offset	%	8)	{
+																				fseek(fp,	8	-	(offset	%	8),	SEEK_CUR)	;
+																}
+
+																//	for	mxSTRUCT_CLASS
+																if	(array_class	==	mxSTRUCT_CLASS)	{
+																				int	field_name_len,	each_field_name_len;
+																				fseek(fp,	4,	SEEK_CUR);
+																				fread(&each_field_name_len,	4,	1,	fp);
+																				if	(swap)	{
+																								each_field_name_len	=	trick_byteswap_short(each_field_name_len);
+																				}
+
+																				fseek(fp,	4,	SEEK_CUR);
+																				fread(&field_name_len,	4,	1,	fp);
+																				if	(swap)	{
+																								field_name_len	=	trick_byteswap_short(field_name_len);
+																				}
+
+																				field_num	=	field_name_len	/	each_field_name_len;
+
+																				field_found	=	false;
+																				for	(field_index	=	0;	field_index	<	field_num;	field_index++)	{
+																								field_name	=	new	char[each_field_name_len];
+																								fread(field_name,	each_field_name_len,	1,	fp);
+																								variable_name	=	new	char[name_bytes+each_field_name_len+1];
+																								strcpy(variable_name,	name);
+																								strcat(variable_name,	".");
+																								strcat(variable_name,	field_name);
+
+																								if	(!strcmp(	variable_name	,	param_name	)	)	{
+																												name	=	new	char[strlen(variable_name)];
+																												strcpy(name,	variable_name);
+																												field_found	=	true;
+																												delete	[]	field_name;
+																												delete	[]	variable_name;
+																												break;
+																								}
+																								delete	[]	field_name;
+																								delete	[]	variable_name;
+																				}
+
+																				if	(field_found)	{
+																								fseek(fp,	(field_num-field_index-1)*each_field_name_len,	SEEK_CUR);
+																				}
+																				ii	=	0;
+																				while	(ii	<	field_num)	{
+																								//	Numeric	array	for	each	field
+																								//	this	is	either	0	or	num_bytes	if	non_zero
+																								fread(&temp,	4,	1,	fp)	;
+																								if	(swap)	{
+																												temp	=	trick_byteswap_int(temp)	;
+																								}
+																								if	(	(temp	>>	16	)	==	0)	{
+
+																												//	bytes
+																												fread(&bytes,	4,	1,	fp)	;
+																												if	(swap)	{
+																																bytes	=	trick_byteswap_int(bytes)	;
+																												}
+																								}	else	{
+																												bytes	=	temp	>>	16;
+																								}
+																								fseek(fp,	bytes,	SEEK_CUR);
+																								ii++;
+																				}
+																}	else	{
+																				//	real	data	type
+																				fread(&real_type,	4,	1,	fp)	;
+																				if	(swap)	{
+																								real_type	=	trick_byteswap_int(real_type)	;
+																				}
+																				//	bytes
+																				fread(&real_bytes,	4,	1,	fp)	;
+																				if	(swap)	{
+																								real_bytes	=	trick_byteswap_int(real_bytes)	;
+																				}
+																}
+
+																//	TODO:	Array	bounds	checking
+																if	(array_class	==	mxSTRUCT_CLASS)	{
+
+																				if	(!strcmp(name,	param_name))	{
+																								param_found	=	true;
+																				}
+
+																				if	(!strcmp(name,	time_name))	{
+
+																							time_found	=	true;
+																				}
+																}	else	{
+
+																				if	(!strncmp(name,	param_name,	name_bytes))	{
+																								param_found	=	true;
+																				}
+																				if	(!strncmp(name,	time_name,	name_bytes))	{
+																								time_found	=	true;
+																				}
+
+																}
+																delete	[]	name;
+																//	delete	[]	dims;
+																dims	=	NULL;
+
+																if	(param_found	&&	time_found)	{
+																				fclose(fp);
+																				return(1);
+																}
+																if	(array_class	!=	mxSTRUCT_CLASS)	{
+																				//	skip	past	this	array
+																				fseek(fp,	real_bytes,	SEEK_CUR)	;
+
+																				//	make	sure	that	we	are	on	a	64	bit	boundary
+																				offset	=	ftell(fp)	;
+																				if	(offset	%	8)	{
+																								fseek(fp,	8	-	(offset	%	8),	SEEK_CUR)	;
+																				}
+
+																				//	skip	over	the	imaginary	part	if	any	right	now
+																				if	(array_complex)	{
+																								//	real	data	type
+																								fread(&img_type,	4,	1,	fp)	;
+																								//	bytes
+																								fread(&img_bytes,	4,	1,	fp)	;
+																								if	(swap)	{
+																												img_bytes	=	trick_byteswap_int(img_bytes)	;
+																								}
+
+																								fseek(fp,	img_bytes,	SEEK_CUR)	;
+
+																								//	make	sure	that	we	are	on	a	64	bit	boundary
+																								offset	=	ftell(fp)	;
+																								if	(offset	%	8)	{
+																												fseek(fp,	8	-	(offset	%	8),	SEEK_CUR)	;
+																								}
+
+																				}
+																}
+												}	else	{
+																//	Everythig	else	we	skip
+																temp_ptr	=	new	char[bytes];
+																fread(temp_ptr,	bytes,	1,	fp)	;
+																delete	[]	temp_ptr;
+												}
+								}
+				}
+				fclose(fp)	;
+				return	(0);
 
 }
 
diff --git a/trick_source/data_products/Log/MatLab4.cpp b/trick_source/data_products/Log/MatLab4.cpp
index e5f9bc5d4..67e38d23b 100644
--- a/trick_source/data_products/Log/MatLab4.cpp
+++ b/trick_source/data_products/Log/MatLab4.cpp
@@ -1,417 +1,417 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-
-#include <stdlib.h>
-#include <string.h>
-#if __sgi | __sun
-#include <strings.h>
+#include	<cerrno>
+#include	<cstring>
+#include	<iostream>
+
+#include	<stdlib.h>
+#include	<string.h>
+#if	__sgi	|	__sun
+#include	<strings.h>
 #endif
 
-#include <math.h>
-#include "MatLab4.hh"
-#include "trick/parameter_types.h"
-#include "trick_byteswap.h"
-#include "trick_byte_order.h"
-
-MatLab4::MatLab4(char * file_name , char * param_name , char * time_name ) {
-
-        int len ;
-        int temp ;
-        int endian ;
-        int mat_size ;
-        int type = 0, size = 0;
-        int mat_type ;
-        int my_byte_order ;
-        div_t div_result ;
-        int row , column , imaginary ;
-        char * temp_ptr ;
-        bool param_found , time_found ;
-        int max_offset , offset = 0 ;
-
-        fileName_ = file_name ;
-        TRICK_GET_BYTE_ORDER(my_byte_order) ;
-
-        if ((fp_ = fopen(file_name , "r")) == 0 ) {
-           std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-           exit(-1) ;
-        }
-
-        // we use fseek calls to move around so I need to know the max offset of the file
-        fseek( fp_ , 0 , SEEK_END ) ;
-        max_offset = ftell(fp_) ;
-        rewind( fp_ ) ;
-
-        // get field_num from param_name
-        temp_ptr = rindex(param_name, '[') ;
-        if ( temp_ptr != NULL ) {
-                sscanf(&temp_ptr[1] , "%d" , &y_value_.field_num_ ) ;
-        }
-        else {
-                y_value_.field_num_ = 0 ;
-        }
-
-        // get field_num from time_name
-        temp_ptr = rindex(param_name, '[') ;
-        if ( temp_ptr != NULL ) {
-                sscanf(&temp_ptr[1] , "%d" , &time_value_.field_num_ ) ;
-        }
-        else {
-                time_value_.field_num_ = 0 ;
-        }
-
-        param_found = time_found = false ;
-        while ( (!param_found || !time_found) && (offset < max_offset)) {
-
-                // read the type in
-                fread( &temp , 4 , 1 , fp_ ) ;
-                if ( ! strncmp( (char *)&temp , "MATL" , 4 )) {
-                        fclose(fp_) ;
-                        return ;
-                }
-                // byte swap it if it looks like we need to
-                if ( temp & 0xFFFF0000 ) {
-                        temp = trick_byteswap_int(temp) ;
-                }
-
-                div_result = div(temp , 1000) ;
-                endian = div_result.quot ;
-                temp = div_result.rem ;
-
-                switch ( endian ) {
-                        case 0:
-                                swap_ = ( my_byte_order == TRICK_LITTLE_ENDIAN ) ? 0 : 1 ;
-                                break ;
-                        case 1:
-                                swap_ = ( my_byte_order == TRICK_BIG_ENDIAN ) ? 0 : 1 ;
-                                break ;
-                        default:
-                                fprintf(stderr,"Unknown endianness!\n") ;
-                                fclose(fp_) ;
-                                return ;
-                                break ;
-                }
-
-                div_result = div( temp , 10 ) ;
-                mat_size = div_result.quot ;
-                mat_type = div_result.rem ;
-                switch ( mat_size ) {
-                        case 0:
-                                type = TRICK_DOUBLE ;
-                                size = 8 ;
-                                break ;
-                        case 1:
-                                type = TRICK_FLOAT ;
-                                size = 4 ;
-                                break ;
-                        case 2:
-                                type = TRICK_INTEGER ;
-                                size = 4 ;
-                                break ;
-                        case 3:
-                                type = TRICK_SHORT ;
-                                size = 2 ;
-                                break ;
-                        case 4:
-                                type = TRICK_UNSIGNED_SHORT ;
-                                size = 2 ;
-                                break ;
-                        case 5:
-                                type = TRICK_CHARACTER ;
-                                size = 1 ;
-                                break ;
-                }
-
-                if ( mat_type != 0 ) {
-                        fprintf(stderr,"Unknown matrix type!\n") ;
-                        fclose(fp_) ;
-                        return ;
-                }
-
-                fread( &row , 4 , 1 , fp_ ) ;
-                if ( swap_ ) { row = trick_byteswap_int(row) ; }
-
-                fread( &column , 4 , 1 , fp_ ) ;
-                if ( swap_ ) { column = trick_byteswap_int(column) ; }
-
-                fread( &imaginary , 4 , 1 , fp_ ) ;
-                if ( swap_ ) { imaginary = trick_byteswap_int(imaginary) ; }
-
-                fread( &len , 4 , 1 , fp_ ) ;
-                if ( swap_ ) { len = trick_byteswap_int(len) ; }
-
-                temp_ptr = new char[len +1] ;
-                fread( temp_ptr , len , 1 , fp_ ) ;
-
-                if ( ! strncmp( temp_ptr , param_name , len ) && y_value_.field_num_ < column ) {
-                        y_value_.size_ = size ;
-                        y_value_.type_ = type ;
-                        y_value_.rows_ = row ;
-                        y_value_.columns_ = column ;
-                        y_value_.imaginary_ = imaginary ;
-                        y_value_.data_offset_ = ftell(fp_) ;
-                        param_found = true ;
-                }
-                if ( ! strncmp( temp_ptr , time_name , len ) && time_value_.field_num_ < column ) {
-                        time_value_.size_ = size ;
-                        time_value_.type_ = type ;
-                        time_value_.rows_ = row ;
-                        time_value_.columns_ = column ;
-                        time_value_.imaginary_ = imaginary ;
-                        time_value_.data_offset_ = ftell(fp_) ;
-                        time_found = true ;
-                }
-
-                delete [] temp_ptr ;
-
-                // skip to next parameter
-                fseek( fp_ ,  row * column * size * ( 1 + imaginary ) , SEEK_CUR ) ;
-                offset = ftell(fp_) ;
-        }
-
-        curr_row_ = 0 ;
+#include	<math.h>
+#include	"MatLab4.hh"
+#include	"trick/parameter_types.h"
+#include	"trick_byteswap.h"
+#include	"trick_byte_order.h"
+
+MatLab4::MatLab4(char	*	file_name	,	char	*	param_name	,	char	*	time_name	)	{
+
+								int	len	;
+								int	temp	;
+								int	endian	;
+								int	mat_size	;
+								int	type	=	0,	size	=	0;
+								int	mat_type	;
+								int	my_byte_order	;
+								div_t	div_result	;
+								int	row	,	column	,	imaginary	;
+								char	*	temp_ptr	;
+								bool	param_found	,	time_found	;
+								int	max_offset	,	offset	=	0	;
+
+								fileName_	=	file_name	;
+								TRICK_GET_BYTE_ORDER(my_byte_order)	;
+
+								if	((fp_	=	fopen(file_name	,	"r"))	==	0	)	{
+											std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+											exit(-1)	;
+								}
+
+								//	we	use	fseek	calls	to	move	around	so	I	need	to	know	the	max	offset	of	the	file
+								fseek(	fp_	,	0	,	SEEK_END	)	;
+								max_offset	=	ftell(fp_)	;
+								rewind(	fp_	)	;
+
+								//	get	field_num	from	param_name
+								temp_ptr	=	rindex(param_name,	'[')	;
+								if	(	temp_ptr	!=	NULL	)	{
+																sscanf(&temp_ptr[1]	,	"%d"	,	&y_value_.field_num_	)	;
+								}
+								else	{
+																y_value_.field_num_	=	0	;
+								}
+
+								//	get	field_num	from	time_name
+								temp_ptr	=	rindex(param_name,	'[')	;
+								if	(	temp_ptr	!=	NULL	)	{
+																sscanf(&temp_ptr[1]	,	"%d"	,	&time_value_.field_num_	)	;
+								}
+								else	{
+																time_value_.field_num_	=	0	;
+								}
+
+								param_found	=	time_found	=	false	;
+								while	(	(!param_found	||	!time_found)	&&	(offset	<	max_offset))	{
+
+																//	read	the	type	in
+																fread(	&temp	,	4	,	1	,	fp_	)	;
+																if	(	!	strncmp(	(char	*)&temp	,	"MATL"	,	4	))	{
+																								fclose(fp_)	;
+																								return	;
+																}
+																//	byte	swap	it	if	it	looks	like	we	need	to
+																if	(	temp	&	0xFFFF0000	)	{
+																								temp	=	trick_byteswap_int(temp)	;
+																}
+
+																div_result	=	div(temp	,	1000)	;
+																endian	=	div_result.quot	;
+																temp	=	div_result.rem	;
+
+																switch	(	endian	)	{
+																								case	0:
+																																swap_	=	(	my_byte_order	==	TRICK_LITTLE_ENDIAN	)	?	0	:	1	;
+																																break	;
+																								case	1:
+																																swap_	=	(	my_byte_order	==	TRICK_BIG_ENDIAN	)	?	0	:	1	;
+																																break	;
+																								default:
+																																fprintf(stderr,"Unknown	endianness!\n")	;
+																																fclose(fp_)	;
+																																return	;
+																																break	;
+																}
+
+																div_result	=	div(	temp	,	10	)	;
+																mat_size	=	div_result.quot	;
+																mat_type	=	div_result.rem	;
+																switch	(	mat_size	)	{
+																								case	0:
+																																type	=	TRICK_DOUBLE	;
+																																size	=	8	;
+																																break	;
+																								case	1:
+																																type	=	TRICK_FLOAT	;
+																																size	=	4	;
+																																break	;
+																								case	2:
+																																type	=	TRICK_INTEGER	;
+																																size	=	4	;
+																																break	;
+																								case	3:
+																																type	=	TRICK_SHORT	;
+																																size	=	2	;
+																																break	;
+																								case	4:
+																																type	=	TRICK_UNSIGNED_SHORT	;
+																																size	=	2	;
+																																break	;
+																								case	5:
+																																type	=	TRICK_CHARACTER	;
+																																size	=	1	;
+																																break	;
+																}
+
+																if	(	mat_type	!=	0	)	{
+																								fprintf(stderr,"Unknown	matrix	type!\n")	;
+																								fclose(fp_)	;
+																								return	;
+																}
+
+																fread(	&row	,	4	,	1	,	fp_	)	;
+																if	(	swap_	)	{	row	=	trick_byteswap_int(row)	;	}
+
+																fread(	&column	,	4	,	1	,	fp_	)	;
+																if	(	swap_	)	{	column	=	trick_byteswap_int(column)	;	}
+
+																fread(	&imaginary	,	4	,	1	,	fp_	)	;
+																if	(	swap_	)	{	imaginary	=	trick_byteswap_int(imaginary)	;	}
+
+																fread(	&len	,	4	,	1	,	fp_	)	;
+																if	(	swap_	)	{	len	=	trick_byteswap_int(len)	;	}
+
+																temp_ptr	=	new	char[len	+1]	;
+																fread(	temp_ptr	,	len	,	1	,	fp_	)	;
+
+																if	(	!	strncmp(	temp_ptr	,	param_name	,	len	)	&&	y_value_.field_num_	<	column	)	{
+																								y_value_.size_	=	size	;
+																								y_value_.type_	=	type	;
+																								y_value_.rows_	=	row	;
+																								y_value_.columns_	=	column	;
+																								y_value_.imaginary_	=	imaginary	;
+																								y_value_.data_offset_	=	ftell(fp_)	;
+																								param_found	=	true	;
+																}
+																if	(	!	strncmp(	temp_ptr	,	time_name	,	len	)	&&	time_value_.field_num_	<	column	)	{
+																								time_value_.size_	=	size	;
+																								time_value_.type_	=	type	;
+																								time_value_.rows_	=	row	;
+																								time_value_.columns_	=	column	;
+																								time_value_.imaginary_	=	imaginary	;
+																								time_value_.data_offset_	=	ftell(fp_)	;
+																								time_found	=	true	;
+																}
+
+																delete	[]	temp_ptr	;
+
+																//	skip	to	next	parameter
+																fseek(	fp_	,		row	*	column	*	size	*	(	1	+	imaginary	)	,	SEEK_CUR	)	;
+																offset	=	ftell(fp_)	;
+								}
+
+								curr_row_	=	0	;
 }
 
-double MatLab4::getvalue(struct MatLab4Var * mv ) {
-        char c ;
-        short s ;
-        unsigned short us ;
-        int i ;
-        float f ;
-        double d ;
-
-        switch ( mv->type_ ) {
-                case TRICK_CHARACTER:
-                        fread( &c , mv->size_ , 1 , fp_ ) ;
-                        return((double)c) ;
-                case TRICK_SHORT:
-                        fread( &s , mv->size_ , 1 , fp_ ) ;
-                        if ( swap_ ) { s = trick_byteswap_short(s) ; }
-                        return((double)s) ;
-                case TRICK_UNSIGNED_SHORT:
-                        fread( &us , mv->size_ , 1 , fp_ ) ;
-                        if ( swap_ ) { us = (unsigned short)trick_byteswap_short(us) ; }
-                        return((double)us) ;
-                case TRICK_INTEGER:
-                        fread( &i , mv->size_ , 1 , fp_ ) ;
-                        if ( swap_ ) { i = trick_byteswap_int(i) ; }
-                        return((double)i) ;
-                case TRICK_FLOAT:
-                        fread( &f , mv->size_ , 1 , fp_ ) ;
-                        if ( swap_ ) { f = trick_byteswap_float(f) ; }
-                        return((double)f) ;
-                case TRICK_DOUBLE:
-                        fread( &d , mv->size_ , 1 , fp_ ) ;
-                        if ( swap_ ) { d = trick_byteswap_double(d) ; }
-                        return(d) ;
-        }
-        return(0.0) ;
+double	MatLab4::getvalue(struct	MatLab4Var	*	mv	)	{
+								char	c	;
+								short	s	;
+								unsigned	short	us	;
+								int	i	;
+								float	f	;
+								double	d	;
+
+								switch	(	mv->type_	)	{
+																case	TRICK_CHARACTER:
+																								fread(	&c	,	mv->size_	,	1	,	fp_	)	;
+																								return((double)c)	;
+																case	TRICK_SHORT:
+																								fread(	&s	,	mv->size_	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	s	=	trick_byteswap_short(s)	;	}
+																								return((double)s)	;
+																case	TRICK_UNSIGNED_SHORT:
+																								fread(	&us	,	mv->size_	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	us	=	(unsigned	short)trick_byteswap_short(us)	;	}
+																								return((double)us)	;
+																case	TRICK_INTEGER:
+																								fread(	&i	,	mv->size_	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	i	=	trick_byteswap_int(i)	;	}
+																								return((double)i)	;
+																case	TRICK_FLOAT:
+																								fread(	&f	,	mv->size_	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	f	=	trick_byteswap_float(f)	;	}
+																								return((double)f)	;
+																case	TRICK_DOUBLE:
+																								fread(	&d	,	mv->size_	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	d	=	trick_byteswap_double(d)	;	}
+																								return(d)	;
+								}
+								return(0.0)	;
 }
 
-int MatLab4::get( double * time , double * value ) {
+int	MatLab4::get(	double	*	time	,	double	*	value	)	{
 
-        long offset ;
+								long	offset	;
 
-        if ( curr_row_ < y_value_.rows_ && curr_row_ < time_value_.rows_ ) {
-                offset = time_value_.data_offset_ + time_value_.rows_ * time_value_.field_num_ * time_value_.size_ +
-                         curr_row_ * time_value_.size_ ;
-                fseek( fp_ , offset , SEEK_SET) ;
-                *time = getvalue(&time_value_) ;
+								if	(	curr_row_	<	y_value_.rows_	&&	curr_row_	<	time_value_.rows_	)	{
+																offset	=	time_value_.data_offset_	+	time_value_.rows_	*	time_value_.field_num_	*	time_value_.size_	+
+																									curr_row_	*	time_value_.size_	;
+																fseek(	fp_	,	offset	,	SEEK_SET)	;
+																*time	=	getvalue(&time_value_)	;
 
-                offset = y_value_.data_offset_ + y_value_.rows_ * y_value_.field_num_ * y_value_.size_ +
-                         curr_row_ * y_value_.size_ ;
-                fseek( fp_ , offset , SEEK_SET) ;
-                *value = getvalue(&y_value_) ;
+																offset	=	y_value_.data_offset_	+	y_value_.rows_	*	y_value_.field_num_	*	y_value_.size_	+
+																									curr_row_	*	y_value_.size_	;
+																fseek(	fp_	,	offset	,	SEEK_SET)	;
+																*value	=	getvalue(&y_value_)	;
 
-                curr_row_++ ;
-                return( 1 ) ;
-        }
+																curr_row_++	;
+																return(	1	)	;
+								}
 
-        return( 0 ) ;
+								return(	0	)	;
 }
 
-int MatLab4::peek( double * time , double * value ) {
+int	MatLab4::peek(	double	*	time	,	double	*	value	)	{
 
-        long save_row ;
-		int ret;
+								long	save_row	;
+		int	ret;
 
-        save_row = curr_row_ ;
-        ret = get( time , value ) ;
-        curr_row_ = save_row ;
+								save_row	=	curr_row_	;
+								ret	=	get(	time	,	value	)	;
+								curr_row_	=	save_row	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-void MatLab4::begin() {
+void	MatLab4::begin()	{
 
-        curr_row_ = 0 ;
-        return ;
+								curr_row_	=	0	;
+								return	;
 }
 
-int MatLab4::end() {
-        return(curr_row_ >= y_value_.rows_ || curr_row_ >= time_value_.rows_ ) ;
+int	MatLab4::end()	{
+								return(curr_row_	>=	y_value_.rows_	||	curr_row_	>=	time_value_.rows_	)	;
 }
 
-int MatLab4::step() {
+int	MatLab4::step()	{
 
-        if ( curr_row_ < y_value_.rows_ && curr_row_ < time_value_.rows_ ) {
-                curr_row_++ ;
-                return( 1 ) ;
-        }
-        return(0) ;
+								if	(	curr_row_	<	y_value_.rows_	&&	curr_row_	<	time_value_.rows_	)	{
+																curr_row_++	;
+																return(	1	)	;
+								}
+								return(0)	;
 
 }
 
-int MatLab4LocateParam( char *file_name , char *param_name , char *time_name ) {
-
-        int len ;
-        int temp ;
-        int endian ;
-        int mat_size ;
-        int mat_type ;
-        int my_byte_order ;
-        div_t div_result ;
-        int row , column , imaginary ;
-        char * temp_ptr ;
-        bool param_found , time_found ;
-        FILE *fp ;
-        bool swap = false ;
-        int size ;
-        int y_field_num , time_field_num ;
-        int max_offset , offset = 0 ;
-
-        TRICK_GET_BYTE_ORDER(my_byte_order) ;
-
-        if ((fp = fopen(file_name , "r")) == 0 ) {
-           std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-           exit(-1) ;
-        }
-
-        // we use fseek calls to move around so I need to know the max offset of the file
-        fseek( fp , 0 , SEEK_END ) ;
-        max_offset = ftell(fp) ;
-        rewind( fp ) ;
-
-        // get field_num from param_name
-        temp_ptr = rindex(param_name, '[') ;
-        if ( temp_ptr != NULL ) {
-                sscanf(&temp_ptr[1] , "%d" , &y_field_num ) ;
-        }
-        else {
-                y_field_num = 0 ;
-        }
-
-        // get field_num from time_name
-        temp_ptr = rindex(param_name, '[') ;
-        if ( temp_ptr != NULL ) {
-                sscanf(&temp_ptr[1] , "%d" , &time_field_num ) ;
-        }
-        else {
-                time_field_num = 0 ;
-        }
-
-        param_found = time_found = false ;
-        while ( offset < max_offset ) {
-
-                // read the type in
-                fread( &temp , 4 , 1 , fp ) ;
-                if ( !strncmp( (char *)&temp , "MATL" , 4 )) {
-                        return(0) ;
-                }
-
-                // byte swap it if it looks like we need to
-                if ( temp & 0xFFFF0000 ) {
-                        temp = trick_byteswap_int(temp) ;
-                }
-
-                div_result = div(temp , 1000) ;
-                endian = div_result.quot ;
-                temp = div_result.rem ;
-
-                switch ( endian ) {
-                        case 0:
-                                swap = ( my_byte_order == TRICK_LITTLE_ENDIAN ) ? 0 : 1 ;
-                                break ;
-                        case 1:
-                                swap = ( my_byte_order == TRICK_BIG_ENDIAN ) ? 0 : 1 ;
-                                break ;
-                        default:
-                                fprintf(stderr,"Unknown endianness!\n") ;
-                                fclose(fp) ;
-                                return(0) ;
-                                break ;
-                }
-
-                div_result = div( temp , 10 ) ;
-                mat_size = div_result.quot ;
-                mat_type = div_result.rem ;
-                switch ( mat_size ) {
-                        case 0:
-                                size = 8 ;
-                                break ;
-                        case 1:
-                                size = 4 ;
-                                break ;
-                        case 2:
-                                size = 4 ;
-                                break ;
-                        case 3:
-                                size = 2 ;
-                                break ;
-                        case 4:
-                                size = 2 ;
-                                break ;
-                        case 5:
-                                size = 1 ;
-                                break ;
-                        default :
-                                std::cerr << "Matlab4 " << __FUNCTION__ << "ERROR: invalid matrix size" << std::endl;
-                                size = -1 ; 
-                                break ;
-                }
-
-                fread( &row , 4 , 1 , fp ) ;
-                if ( swap ) { row = trick_byteswap_int(row) ; }
-
-                fread( &column , 4 , 1 , fp ) ;
-                if ( swap ) { column = trick_byteswap_int(column) ; }
-
-                fread( &imaginary , 4 , 1 , fp ) ;
-                if ( swap ) { imaginary = trick_byteswap_int(imaginary) ; }
-
-                fread( &len , 4 , 1 , fp ) ;
-                if ( swap ) { len = trick_byteswap_int(len) ; }
-
-                temp_ptr = new char[len +1] ;
-                fread( temp_ptr , len , 1 , fp ) ;
-
-                if ( ! strncmp( temp_ptr , param_name , len ) && y_field_num < column ) {
-                        param_found = true ;
-                }
-
-                if ( ! strncmp( temp_ptr , time_name , len ) && time_field_num < column ) {
-                        time_found = true ;
-                }
-
-                if ( mat_type != 0 ) {
-                        fprintf(stderr,"Unknown matrix type for %s\n", temp_ptr) ;
-                }
-
-                if ( param_found && time_found ) {
-                        fclose(fp) ;
-                        delete[] temp_ptr ;
-                        return(1) ;
-                }
-
-                delete[] temp_ptr ;
-
-                // skip to next parameter
-                fseek( fp ,  row * column * size * ( 1 + imaginary ) , SEEK_CUR ) ;
-                offset = ftell(fp) ;
-
-        }
-
-        fclose(fp) ;
-        return(0) ;
+int	MatLab4LocateParam(	char	*file_name	,	char	*param_name	,	char	*time_name	)	{
+
+								int	len	;
+								int	temp	;
+								int	endian	;
+								int	mat_size	;
+								int	mat_type	;
+								int	my_byte_order	;
+								div_t	div_result	;
+								int	row	,	column	,	imaginary	;
+								char	*	temp_ptr	;
+								bool	param_found	,	time_found	;
+								FILE	*fp	;
+								bool	swap	=	false	;
+								int	size	;
+								int	y_field_num	,	time_field_num	;
+								int	max_offset	,	offset	=	0	;
+
+								TRICK_GET_BYTE_ORDER(my_byte_order)	;
+
+								if	((fp	=	fopen(file_name	,	"r"))	==	0	)	{
+											std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+											exit(-1)	;
+								}
+
+								//	we	use	fseek	calls	to	move	around	so	I	need	to	know	the	max	offset	of	the	file
+								fseek(	fp	,	0	,	SEEK_END	)	;
+								max_offset	=	ftell(fp)	;
+								rewind(	fp	)	;
+
+								//	get	field_num	from	param_name
+								temp_ptr	=	rindex(param_name,	'[')	;
+								if	(	temp_ptr	!=	NULL	)	{
+																sscanf(&temp_ptr[1]	,	"%d"	,	&y_field_num	)	;
+								}
+								else	{
+																y_field_num	=	0	;
+								}
+
+								//	get	field_num	from	time_name
+								temp_ptr	=	rindex(param_name,	'[')	;
+								if	(	temp_ptr	!=	NULL	)	{
+																sscanf(&temp_ptr[1]	,	"%d"	,	&time_field_num	)	;
+								}
+								else	{
+																time_field_num	=	0	;
+								}
+
+								param_found	=	time_found	=	false	;
+								while	(	offset	<	max_offset	)	{
+
+																//	read	the	type	in
+																fread(	&temp	,	4	,	1	,	fp	)	;
+																if	(	!strncmp(	(char	*)&temp	,	"MATL"	,	4	))	{
+																								return(0)	;
+																}
+
+																//	byte	swap	it	if	it	looks	like	we	need	to
+																if	(	temp	&	0xFFFF0000	)	{
+																								temp	=	trick_byteswap_int(temp)	;
+																}
+
+																div_result	=	div(temp	,	1000)	;
+																endian	=	div_result.quot	;
+																temp	=	div_result.rem	;
+
+																switch	(	endian	)	{
+																								case	0:
+																																swap	=	(	my_byte_order	==	TRICK_LITTLE_ENDIAN	)	?	0	:	1	;
+																																break	;
+																								case	1:
+																																swap	=	(	my_byte_order	==	TRICK_BIG_ENDIAN	)	?	0	:	1	;
+																																break	;
+																								default:
+																																fprintf(stderr,"Unknown	endianness!\n")	;
+																																fclose(fp)	;
+																																return(0)	;
+																																break	;
+																}
+
+																div_result	=	div(	temp	,	10	)	;
+																mat_size	=	div_result.quot	;
+																mat_type	=	div_result.rem	;
+																switch	(	mat_size	)	{
+																								case	0:
+																																size	=	8	;
+																																break	;
+																								case	1:
+																																size	=	4	;
+																																break	;
+																								case	2:
+																																size	=	4	;
+																																break	;
+																								case	3:
+																																size	=	2	;
+																																break	;
+																								case	4:
+																																size	=	2	;
+																																break	;
+																								case	5:
+																																size	=	1	;
+																																break	;
+																								default	:
+																																std::cerr	<<	"Matlab4	"	<<	__FUNCTION__	<<	"ERROR:	invalid	matrix	size"	<<	std::endl;
+																																size	=	-1	;	
+																																break	;
+																}
+
+																fread(	&row	,	4	,	1	,	fp	)	;
+																if	(	swap	)	{	row	=	trick_byteswap_int(row)	;	}
+
+																fread(	&column	,	4	,	1	,	fp	)	;
+																if	(	swap	)	{	column	=	trick_byteswap_int(column)	;	}
+
+																fread(	&imaginary	,	4	,	1	,	fp	)	;
+																if	(	swap	)	{	imaginary	=	trick_byteswap_int(imaginary)	;	}
+
+																fread(	&len	,	4	,	1	,	fp	)	;
+																if	(	swap	)	{	len	=	trick_byteswap_int(len)	;	}
+
+																temp_ptr	=	new	char[len	+1]	;
+																fread(	temp_ptr	,	len	,	1	,	fp	)	;
+
+																if	(	!	strncmp(	temp_ptr	,	param_name	,	len	)	&&	y_field_num	<	column	)	{
+																								param_found	=	true	;
+																}
+
+																if	(	!	strncmp(	temp_ptr	,	time_name	,	len	)	&&	time_field_num	<	column	)	{
+																								time_found	=	true	;
+																}
+
+																if	(	mat_type	!=	0	)	{
+																								fprintf(stderr,"Unknown	matrix	type	for	%s\n",	temp_ptr)	;
+																}
+
+																if	(	param_found	&&	time_found	)	{
+																								fclose(fp)	;
+																								delete[]	temp_ptr	;
+																								return(1)	;
+																}
+
+																delete[]	temp_ptr	;
+
+																//	skip	to	next	parameter
+																fseek(	fp	,		row	*	column	*	size	*	(	1	+	imaginary	)	,	SEEK_CUR	)	;
+																offset	=	ftell(fp)	;
+
+								}
+
+								fclose(fp)	;
+								return(0)	;
 }
 
diff --git a/trick_source/data_products/Log/TrickBinary.cpp b/trick_source/data_products/Log/TrickBinary.cpp
index 1688f44ec..a04206ab1 100644
--- a/trick_source/data_products/Log/TrickBinary.cpp
+++ b/trick_source/data_products/Log/TrickBinary.cpp
@@ -1,586 +1,586 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <map>
-#include "TrickBinary.hh"
-#include "trick/parameter_types.h"
-#include "trick_byte_order.h"
-#include "trick_byteswap.h"
-#include "trick/units_conv.h"
-#include "trick/map_trick_units_to_udunits.hh"
-
-TrickBinary::TrickBinary(char * file_name , char * param_name ) {
-
-        const int file_type_len = 10 ;
-        char file_type[file_type_len + 1] ;
-        int my_byte_order ;
-        char *name_ptr ;
-        char *units_ptr ;
-        int len ;
-        int ii ;
-        int type ;
-        int size ;
-        std::map<int, TRICK_TYPE> seven_to_ten_params  ;
-
-        seven_to_ten_params[0] = TRICK_CHARACTER ;
-        seven_to_ten_params[1] = TRICK_UNSIGNED_CHARACTER ;
-        seven_to_ten_params[2] = TRICK_STRING ;
-        seven_to_ten_params[3] = TRICK_SHORT ;
-        seven_to_ten_params[4] = TRICK_UNSIGNED_SHORT ;
-        seven_to_ten_params[5] = TRICK_INTEGER ;
-        seven_to_ten_params[6] = TRICK_UNSIGNED_INTEGER ;
-        seven_to_ten_params[7] = TRICK_LONG ;
-        seven_to_ten_params[8] = TRICK_UNSIGNED_LONG ;
-        seven_to_ten_params[9] = TRICK_FLOAT ;
-        seven_to_ten_params[10] = TRICK_DOUBLE ;
-        seven_to_ten_params[11] = TRICK_BITFIELD ;
-        seven_to_ten_params[12] = TRICK_UNSIGNED_BITFIELD ;
-        seven_to_ten_params[13] = TRICK_LONG_LONG ;
-        seven_to_ten_params[14] = TRICK_UNSIGNED_LONG_LONG ;
-        seven_to_ten_params[15] = TRICK_FILE_PTR ;
-        seven_to_ten_params[16] = TRICK_VOID ;
-        seven_to_ten_params[17] = TRICK_BOOLEAN ;
-        // 18 = TRICK_COMPLX , 19 = TRICK_DBL_COMPLX , 20 = TRICK_REF. These don't exist in 10
-        seven_to_ten_params[21] =  TRICK_WCHAR ;
-        seven_to_ten_params[22] =  TRICK_WSTRING ;
-        seven_to_ten_params[99] = TRICK_VOID_PTR ;
-        seven_to_ten_params[102] = TRICK_ENUMERATED ;
-        seven_to_ten_params[103] = TRICK_STRUCTURED ;
-
-        fileName_ = file_name ;
-
-        if ((fp_ = fopen(file_name , "r")) != 0 ) {
-                memset(file_type, 0 , 10 ) ;
-                fread(file_type , file_type_len , 1 , fp_ ) ;
-                file_type[file_type_len] = '\0' ;
-
-                if ( !strncmp( file_type , "Trick-05" , 8 ) ||
-                     !strncmp( file_type , "Trick-07" , 8 ) ||
-                     !strncmp( file_type , "Trick-10" , 8 ) ) {
-
-                        TRICK_GET_BYTE_ORDER(my_byte_order) ;
-                        switch ( file_type[file_type_len - 1] ) {
-                            case 'L':
-                                    swap_ = ( my_byte_order == TRICK_LITTLE_ENDIAN ) ? 0 : 1 ;
-                                    break ;
-                            case 'B':
-                                    swap_ = ( my_byte_order == TRICK_BIG_ENDIAN ) ? 0 : 1 ;
-                                    break ;
-                        }
-
-                        // num_params
-                        fread(&num_params_ , 4 , 1 , fp_ ) ;
-                        if ( swap_ ) { num_params_ = trick_byteswap_int(num_params_) ; }
-
-                        record_size_ = 0 ;
-                        for ( ii = 0  ; ii < num_params_ ; ii++ ) {
-
-                                // name length
-                                fread(&len , 4 , 1 , fp_ ) ;
-                                if ( swap_ ) { len = trick_byteswap_int(len) ; }
-
-                                // name
-                                name_ptr = new char[len + 1] ;
-                                fread(name_ptr , len , 1 , fp_ ) ;
-                                name_ptr[len] = '\0' ;
-
-                                // units length
-                                fread(&len , 4 , 1 , fp_ ) ;
-                                if ( swap_ ) { len = trick_byteswap_int(len) ; }
-
-                                // units
-                                units_ptr = new char[len + 1] ;
-                                fread(units_ptr , len , 1 , fp_ ) ;
-                                units_ptr[len] = '\0' ;
-
-                                // If this is an 05 log file, we need to convert the units to 07 units
-                                // ( where explicit asterisk for multiplication is required. )
-                                if ( !strncmp( file_type , "Trick-05" , 8 ) )  {
-                                        char new_units_spec[100];
-                                        new_units_spec[0] = 0;
-                                        if ( convert_units_spec (units_ptr, new_units_spec) != 0 ) {
-                                                printf (" ERROR: Attempt to convert Trick-05 units spec \"%s\" failed.\n\n",units_ptr);
-                                        }
-                                        delete [] units_ptr;
-                                        len = strlen(new_units_spec);
-                                        units_ptr = new char[len + 1] ;
-                                        strcpy(units_ptr, new_units_spec);
-                                }
-
-                                // type of param
-                                fread(&type , 4 , 1 , fp_ ) ;
-                                if ( swap_ ) { type = trick_byteswap_int(type) ; }
-                                // adjust the recorded types for 05 & 07 because they are 1 less than Trick10 types (because of Penn!)
-                                if ( strncmp( file_type , "Trick-10" , 8 ) )  {
-                                    type = (int)seven_to_ten_params[type] ;
-                                }
-
-                                // size of param
-                                fread(&size , 4 , 1 , fp_ ) ;
-                                if ( swap_ ) { size = trick_byteswap_int(size) ; }
-
-                                // correct they "type" according to the size recorded
-                                switch ( type ) {
-                                    case TRICK_LONG:
-                                        switch  ( size ) {
-                                            case 4:
-                                                type = TRICK_INTEGER ;
-                                                break ;
-                                            case 8:
-                                                type = TRICK_LONG_LONG ;
-                                                break ;
-                                            default:
-                                                break ;
-                                        }
-                                    case TRICK_UNSIGNED_LONG:
-                                        switch  ( size ) {
-                                            case 4:
-                                                type = TRICK_UNSIGNED_INTEGER ;
-                                                break ;
-                                            case 8:
-                                                type = TRICK_UNSIGNED_LONG_LONG ;
-                                                break ;
-                                            default:
-                                                break ;
-                                        }
-                                    default:
-                                        break ;
-                                }
-
-                                if ( ! strcmp( name_ptr , "sys.exec.out.time" )) {
-                                        time_size_  = size ;
-                                        unitTimeStr_ = units_ptr ;
-                                }
-
-                                if ( ! strcmp( name_ptr , param_name )) {
-                                        if ( !strcmp(units_ptr,"--") ) {
-                                            unitStr_ = units_ptr ;
-                                        } else {
-                                            unitStr_ = map_trick_units_to_udunits(units_ptr) ;
-                                        }
-                                        record_offset_ =  record_size_ ;
-                                        type_ =  type ;
-                                        size_ =  size ;
-                                }
-
-                                record_size_ += size ;
-
-                                delete[]name_ptr ;
-                                delete[]units_ptr ;
-                        }
-
-                        data_offset_ = ftell(fp_) ;
-                }
-
-                record_ = new char[record_size_] ;
-        }
-        else {
-            std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-        }
+#include	<cerrno>
+#include	<cstring>
+#include	<iostream>
+
+#include	<stdlib.h>
+#include	<string.h>
+#include	<math.h>
+#include	<map>
+#include	"TrickBinary.hh"
+#include	"trick/parameter_types.h"
+#include	"trick_byte_order.h"
+#include	"trick_byteswap.h"
+#include	"trick/units_conv.h"
+#include	"trick/map_trick_units_to_udunits.hh"
+
+TrickBinary::TrickBinary(char	*	file_name	,	char	*	param_name	)	{
+
+								const	int	file_type_len	=	10	;
+								char	file_type[file_type_len	+	1]	;
+								int	my_byte_order	;
+								char	*name_ptr	;
+								char	*units_ptr	;
+								int	len	;
+								int	ii	;
+								int	type	;
+								int	size	;
+								std::map<int,	TRICK_TYPE>	seven_to_ten_params		;
+
+								seven_to_ten_params[0]	=	TRICK_CHARACTER	;
+								seven_to_ten_params[1]	=	TRICK_UNSIGNED_CHARACTER	;
+								seven_to_ten_params[2]	=	TRICK_STRING	;
+								seven_to_ten_params[3]	=	TRICK_SHORT	;
+								seven_to_ten_params[4]	=	TRICK_UNSIGNED_SHORT	;
+								seven_to_ten_params[5]	=	TRICK_INTEGER	;
+								seven_to_ten_params[6]	=	TRICK_UNSIGNED_INTEGER	;
+								seven_to_ten_params[7]	=	TRICK_LONG	;
+								seven_to_ten_params[8]	=	TRICK_UNSIGNED_LONG	;
+								seven_to_ten_params[9]	=	TRICK_FLOAT	;
+								seven_to_ten_params[10]	=	TRICK_DOUBLE	;
+								seven_to_ten_params[11]	=	TRICK_BITFIELD	;
+								seven_to_ten_params[12]	=	TRICK_UNSIGNED_BITFIELD	;
+								seven_to_ten_params[13]	=	TRICK_LONG_LONG	;
+								seven_to_ten_params[14]	=	TRICK_UNSIGNED_LONG_LONG	;
+								seven_to_ten_params[15]	=	TRICK_FILE_PTR	;
+								seven_to_ten_params[16]	=	TRICK_VOID	;
+								seven_to_ten_params[17]	=	TRICK_BOOLEAN	;
+								//	18	=	TRICK_COMPLX	,	19	=	TRICK_DBL_COMPLX	,	20	=	TRICK_REF.	These	don't	exist	in	10
+								seven_to_ten_params[21]	=		TRICK_WCHAR	;
+								seven_to_ten_params[22]	=		TRICK_WSTRING	;
+								seven_to_ten_params[99]	=	TRICK_VOID_PTR	;
+								seven_to_ten_params[102]	=	TRICK_ENUMERATED	;
+								seven_to_ten_params[103]	=	TRICK_STRUCTURED	;
+
+								fileName_	=	file_name	;
+
+								if	((fp_	=	fopen(file_name	,	"r"))	!=	0	)	{
+																memset(file_type,	0	,	10	)	;
+																fread(file_type	,	file_type_len	,	1	,	fp_	)	;
+																file_type[file_type_len]	=	'\0'	;
+
+																if	(	!strncmp(	file_type	,	"Trick-05"	,	8	)	||
+																					!strncmp(	file_type	,	"Trick-07"	,	8	)	||
+																					!strncmp(	file_type	,	"Trick-10"	,	8	)	)	{
+
+																								TRICK_GET_BYTE_ORDER(my_byte_order)	;
+																								switch	(	file_type[file_type_len	-	1]	)	{
+																												case	'L':
+																																				swap_	=	(	my_byte_order	==	TRICK_LITTLE_ENDIAN	)	?	0	:	1	;
+																																				break	;
+																												case	'B':
+																																				swap_	=	(	my_byte_order	==	TRICK_BIG_ENDIAN	)	?	0	:	1	;
+																																				break	;
+																								}
+
+																								//	num_params
+																								fread(&num_params_	,	4	,	1	,	fp_	)	;
+																								if	(	swap_	)	{	num_params_	=	trick_byteswap_int(num_params_)	;	}
+
+																								record_size_	=	0	;
+																								for	(	ii	=	0		;	ii	<	num_params_	;	ii++	)	{
+
+																																//	name	length
+																																fread(&len	,	4	,	1	,	fp_	)	;
+																																if	(	swap_	)	{	len	=	trick_byteswap_int(len)	;	}
+
+																																//	name
+																																name_ptr	=	new	char[len	+	1]	;
+																																fread(name_ptr	,	len	,	1	,	fp_	)	;
+																																name_ptr[len]	=	'\0'	;
+
+																																//	units	length
+																																fread(&len	,	4	,	1	,	fp_	)	;
+																																if	(	swap_	)	{	len	=	trick_byteswap_int(len)	;	}
+
+																																//	units
+																																units_ptr	=	new	char[len	+	1]	;
+																																fread(units_ptr	,	len	,	1	,	fp_	)	;
+																																units_ptr[len]	=	'\0'	;
+
+																																//	If	this	is	an	05	log	file,	we	need	to	convert	the	units	to	07	units
+																																//	(	where	explicit	asterisk	for	multiplication	is	required.	)
+																																if	(	!strncmp(	file_type	,	"Trick-05"	,	8	)	)		{
+																																								char	new_units_spec[100];
+																																								new_units_spec[0]	=	0;
+																																								if	(	convert_units_spec	(units_ptr,	new_units_spec)	!=	0	)	{
+																																																printf	("	ERROR:	Attempt	to	convert	Trick-05	units	spec	\"%s\"	failed.\n\n",units_ptr);
+																																								}
+																																								delete	[]	units_ptr;
+																																								len	=	strlen(new_units_spec);
+																																								units_ptr	=	new	char[len	+	1]	;
+																																								strcpy(units_ptr,	new_units_spec);
+																																}
+
+																																//	type	of	param
+																																fread(&type	,	4	,	1	,	fp_	)	;
+																																if	(	swap_	)	{	type	=	trick_byteswap_int(type)	;	}
+																																//	adjust	the	recorded	types	for	05	&	07	because	they	are	1	less	than	Trick10	types	(because	of	Penn!)
+																																if	(	strncmp(	file_type	,	"Trick-10"	,	8	)	)		{
+																																				type	=	(int)seven_to_ten_params[type]	;
+																																}
+
+																																//	size	of	param
+																																fread(&size	,	4	,	1	,	fp_	)	;
+																																if	(	swap_	)	{	size	=	trick_byteswap_int(size)	;	}
+
+																																//	correct	they	"type"	according	to	the	size	recorded
+																																switch	(	type	)	{
+																																				case	TRICK_LONG:
+																																								switch		(	size	)	{
+																																												case	4:
+																																																type	=	TRICK_INTEGER	;
+																																																break	;
+																																												case	8:
+																																																type	=	TRICK_LONG_LONG	;
+																																																break	;
+																																												default:
+																																																break	;
+																																								}
+																																				case	TRICK_UNSIGNED_LONG:
+																																								switch		(	size	)	{
+																																												case	4:
+																																																type	=	TRICK_UNSIGNED_INTEGER	;
+																																																break	;
+																																												case	8:
+																																																type	=	TRICK_UNSIGNED_LONG_LONG	;
+																																																break	;
+																																												default:
+																																																break	;
+																																								}
+																																				default:
+																																								break	;
+																																}
+
+																																if	(	!	strcmp(	name_ptr	,	"sys.exec.out.time"	))	{
+																																								time_size_		=	size	;
+																																								unitTimeStr_	=	units_ptr	;
+																																}
+
+																																if	(	!	strcmp(	name_ptr	,	param_name	))	{
+																																								if	(	!strcmp(units_ptr,"--")	)	{
+																																												unitStr_	=	units_ptr	;
+																																								}	else	{
+																																												unitStr_	=	map_trick_units_to_udunits(units_ptr)	;
+																																								}
+																																								record_offset_	=		record_size_	;
+																																								type_	=		type	;
+																																								size_	=		size	;
+																																}
+
+																																record_size_	+=	size	;
+
+																																delete[]name_ptr	;
+																																delete[]units_ptr	;
+																								}
+
+																								data_offset_	=	ftell(fp_)	;
+																}
+
+																record_	=	new	char[record_size_]	;
+								}
+								else	{
+												std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+								}
 }
 
 TrickBinary::~TrickBinary()
 {
-        if ( fp_ ) {
-                fclose(fp_);
-        }
+								if	(	fp_	)	{
+																fclose(fp_);
+								}
 }
 
-int TrickBinary::get( double * time , double * value ) {
-
-        char * cp ;
-        unsigned char * ucp ;
-        short * sp ;
-        unsigned short * usp ;
-        int * ip ;
-        unsigned int * uip ;
-        long * lp ;
-        unsigned long * ulp ;
-        float * fp ;
-        double * dp ;
-        long long * llp ;
-        unsigned long long * ullp ;
-
-        if ( fread(record_ , record_size_ , 1 , fp_ )) {
-
-                if ( time_size_ == 8 ) {
-                        double * my_time = (double *)record_ ;
-                        *time = *my_time ;
-                        *time = swap_ ? trick_byteswap_double(*my_time) : *time ;
-                }
-                else {
-                        float *my_time = (float *)record_ ;
-                        *time = (double)*my_time ;
-                        *time = swap_ ? trick_byteswap_double(*my_time) : *time ;
-                }
-
-                switch ( type_ ) {
-                        case TRICK_CHARACTER:
-                                cp = (char *)(record_ + record_offset_) ;
-                                *value = (double)*cp ;
-                                break ;
-                        case TRICK_UNSIGNED_CHARACTER:
-                                ucp = (unsigned char *)(record_ + record_offset_) ;
-                                *value = (double)*ucp ;
-                                break ;
-                        case TRICK_SHORT:
-                                sp = (short *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_short(*sp) : *sp) ;
-                                break ;
-                        case TRICK_UNSIGNED_SHORT:
-                                usp = (unsigned short *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_short(*usp) : *usp) ;
-                                break ;
-                        case TRICK_ENUMERATED:
-                        case TRICK_INTEGER:
-                                ip = (int *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_int(*ip) : *ip) ;
-                                break ;
-                        case TRICK_UNSIGNED_INTEGER:
-                                uip = (unsigned int *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? (unsigned int)trick_byteswap_int(*uip) : *uip) ;
-                                break ;
-                        case TRICK_LONG:
-                                lp = (long *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_long(*lp) : *lp) ;
-                                break ;
-                        case TRICK_UNSIGNED_LONG:
-                                ulp = (unsigned long *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? (unsigned long)trick_byteswap_long(*ulp) : *ulp) ;
-                                break ;
-                        case TRICK_FLOAT:
-                                fp = (float *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_float(*fp) : *fp) ;
-                                break ;
-                        case TRICK_DOUBLE:
-                                dp = (double *)(record_ + record_offset_) ;
-                                *value = swap_ ? trick_byteswap_double(*dp) : *dp ;
-                                break ;
-                        case TRICK_BITFIELD:
-                                switch ( size_ ) {
-                                        case 1 :
-                                                cp = (char *)(record_ + record_offset_) ;
-                                                *value = (double)*cp ;
-                                                break ;
-                                        case 2 :
-                                                sp = (short *)(record_ + record_offset_) ;
-                                                *value = (double)(swap_ ? trick_byteswap_short(*sp) : *sp) ;
-                                                break ;
-                                        case 4 :
-                                                ip = (int *)(record_ + record_offset_) ;
-                                                *value = (double)(swap_ ? trick_byteswap_int(*ip) : *ip) ;
-                                                break ;
-                                }
-                                break ;
-                        case TRICK_UNSIGNED_BITFIELD:
-                                switch ( size_ ) {
-                                        case 1 :
-                                                ucp = (unsigned char *)(record_ + record_offset_) ;
-                                                *value = (double)*ucp ;
-                                                break ;
-                                        case 2 :
-                                                usp = (unsigned short *)(record_ + record_offset_) ;
-                                                *value = (double)(swap_ ? (unsigned short)trick_byteswap_short(*usp) : *usp) ;
-                                                break ;
-                                        case 4 :
-                                                uip = (unsigned int *)(record_ + record_offset_) ;
-                                                *value = (double)(swap_ ? (unsigned int)trick_byteswap_int(*uip) : *uip) ;
-                                                break ;
-                                }
-                                break ;
-                        case TRICK_LONG_LONG:
-                                llp = (long long *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? trick_byteswap_long_long(*llp) : *llp) ;
-                                break ;
-                        case TRICK_UNSIGNED_LONG_LONG:
-                                ullp = (unsigned long long *)(record_ + record_offset_) ;
-                                *value = (double)(swap_ ? (unsigned long long)trick_byteswap_long_long(*ullp) : *ullp) ;
-                                break ;
-                        case TRICK_BOOLEAN:
-                                switch ( size_ ) {
-                                        case 1 :
-                                                ucp = (unsigned char *)(record_ + record_offset_) ;
-                                                *value = (double)*ucp ;
-                                                break ;
-                                        case 4 :
-                                                ip = (int *)(record_ + record_offset_) ;
-                                                *value = (double)(swap_ ? trick_byteswap_int(*ip) : *ip) ;
-                                                break ;
-                                }
-                                break ;
-                }
-                return(1) ;
-        }
-
-        return(0) ;
+int	TrickBinary::get(	double	*	time	,	double	*	value	)	{
+
+								char	*	cp	;
+								unsigned	char	*	ucp	;
+								short	*	sp	;
+								unsigned	short	*	usp	;
+								int	*	ip	;
+								unsigned	int	*	uip	;
+								long	*	lp	;
+								unsigned	long	*	ulp	;
+								float	*	fp	;
+								double	*	dp	;
+								long	long	*	llp	;
+								unsigned	long	long	*	ullp	;
+
+								if	(	fread(record_	,	record_size_	,	1	,	fp_	))	{
+
+																if	(	time_size_	==	8	)	{
+																								double	*	my_time	=	(double	*)record_	;
+																								*time	=	*my_time	;
+																								*time	=	swap_	?	trick_byteswap_double(*my_time)	:	*time	;
+																}
+																else	{
+																								float	*my_time	=	(float	*)record_	;
+																								*time	=	(double)*my_time	;
+																								*time	=	swap_	?	trick_byteswap_double(*my_time)	:	*time	;
+																}
+
+																switch	(	type_	)	{
+																								case	TRICK_CHARACTER:
+																																cp	=	(char	*)(record_	+	record_offset_)	;
+																																*value	=	(double)*cp	;
+																																break	;
+																								case	TRICK_UNSIGNED_CHARACTER:
+																																ucp	=	(unsigned	char	*)(record_	+	record_offset_)	;
+																																*value	=	(double)*ucp	;
+																																break	;
+																								case	TRICK_SHORT:
+																																sp	=	(short	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_short(*sp)	:	*sp)	;
+																																break	;
+																								case	TRICK_UNSIGNED_SHORT:
+																																usp	=	(unsigned	short	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_short(*usp)	:	*usp)	;
+																																break	;
+																								case	TRICK_ENUMERATED:
+																								case	TRICK_INTEGER:
+																																ip	=	(int	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_int(*ip)	:	*ip)	;
+																																break	;
+																								case	TRICK_UNSIGNED_INTEGER:
+																																uip	=	(unsigned	int	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	(unsigned	int)trick_byteswap_int(*uip)	:	*uip)	;
+																																break	;
+																								case	TRICK_LONG:
+																																lp	=	(long	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_long(*lp)	:	*lp)	;
+																																break	;
+																								case	TRICK_UNSIGNED_LONG:
+																																ulp	=	(unsigned	long	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	(unsigned	long)trick_byteswap_long(*ulp)	:	*ulp)	;
+																																break	;
+																								case	TRICK_FLOAT:
+																																fp	=	(float	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_float(*fp)	:	*fp)	;
+																																break	;
+																								case	TRICK_DOUBLE:
+																																dp	=	(double	*)(record_	+	record_offset_)	;
+																																*value	=	swap_	?	trick_byteswap_double(*dp)	:	*dp	;
+																																break	;
+																								case	TRICK_BITFIELD:
+																																switch	(	size_	)	{
+																																								case	1	:
+																																																cp	=	(char	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)*cp	;
+																																																break	;
+																																								case	2	:
+																																																sp	=	(short	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)(swap_	?	trick_byteswap_short(*sp)	:	*sp)	;
+																																																break	;
+																																								case	4	:
+																																																ip	=	(int	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)(swap_	?	trick_byteswap_int(*ip)	:	*ip)	;
+																																																break	;
+																																}
+																																break	;
+																								case	TRICK_UNSIGNED_BITFIELD:
+																																switch	(	size_	)	{
+																																								case	1	:
+																																																ucp	=	(unsigned	char	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)*ucp	;
+																																																break	;
+																																								case	2	:
+																																																usp	=	(unsigned	short	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)(swap_	?	(unsigned	short)trick_byteswap_short(*usp)	:	*usp)	;
+																																																break	;
+																																								case	4	:
+																																																uip	=	(unsigned	int	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)(swap_	?	(unsigned	int)trick_byteswap_int(*uip)	:	*uip)	;
+																																																break	;
+																																}
+																																break	;
+																								case	TRICK_LONG_LONG:
+																																llp	=	(long	long	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	trick_byteswap_long_long(*llp)	:	*llp)	;
+																																break	;
+																								case	TRICK_UNSIGNED_LONG_LONG:
+																																ullp	=	(unsigned	long	long	*)(record_	+	record_offset_)	;
+																																*value	=	(double)(swap_	?	(unsigned	long	long)trick_byteswap_long_long(*ullp)	:	*ullp)	;
+																																break	;
+																								case	TRICK_BOOLEAN:
+																																switch	(	size_	)	{
+																																								case	1	:
+																																																ucp	=	(unsigned	char	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)*ucp	;
+																																																break	;
+																																								case	4	:
+																																																ip	=	(int	*)(record_	+	record_offset_)	;
+																																																*value	=	(double)(swap_	?	trick_byteswap_int(*ip)	:	*ip)	;
+																																																break	;
+																																}
+																																break	;
+																}
+																return(1)	;
+								}
+
+								return(0)	;
 
 }
 
-int TrickBinary::peek( double * time , double * value ) {
+int	TrickBinary::peek(	double	*	time	,	double	*	value	)	{
 
-        long offset ;
-		int ret ;
+								long	offset	;
+		int	ret	;
 
-        offset = ftell(fp_) ;
-        ret = get( time , value ) ;
-        fseek(fp_ , offset , SEEK_SET ) ;
+								offset	=	ftell(fp_)	;
+								ret	=	get(	time	,	value	)	;
+								fseek(fp_	,	offset	,	SEEK_SET	)	;
 
-        return(ret) ;
+								return(ret)	;
 }
 
-void TrickBinary::begin() {
-        fseek(fp_, data_offset_ , SEEK_SET) ;
-        return ;
+void	TrickBinary::begin()	{
+								fseek(fp_,	data_offset_	,	SEEK_SET)	;
+								return	;
 }
 
-int TrickBinary::end() {
+int	TrickBinary::end()	{
 
-        long offset ;
-        long endOffset ;
+								long	offset	;
+								long	endOffset	;
 
-        offset = ftell(fp_) ;
-        fseek(fp_, 0, SEEK_END) ;
-        endOffset = ftell(fp_) ;
-        fseek(fp_ , offset , SEEK_SET ) ;
+								offset	=	ftell(fp_)	;
+								fseek(fp_,	0,	SEEK_END)	;
+								endOffset	=	ftell(fp_)	;
+								fseek(fp_	,	offset	,	SEEK_SET	)	;
 
-        if ( endOffset - offset == 0 ) {
-                // Sitting past the last data point
-                return(1);
-        }
+								if	(	endOffset	-	offset	==	0	)	{
+																//	Sitting	past	the	last	data	point
+																return(1);
+								}
 
-        return(feof(fp_)) ;
+								return(feof(fp_))	;
 }
 
-int TrickBinary::step() {
+int	TrickBinary::step()	{
 
-        char * record ;
-        record = new char[record_size_] ;
+								char	*	record	;
+								record	=	new	char[record_size_]	;
 
-        if ( fread(record , record_size_ , 1 , fp_ )) {
-                delete[]record ;
-                return(1) ;
-        }
+								if	(	fread(record	,	record_size_	,	1	,	fp_	))	{
+																delete[]record	;
+																return(1)	;
+								}
 
-        delete[]record ;
-        return(0) ;
+								delete[]record	;
+								return(0)	;
 }
 
-int TrickBinaryReadByteOrder( FILE* fp ) {
-
-        const int file_type_len = 10 ;
-        char file_type[file_type_len + 1] ;
-        int my_byte_order ;
-        int swap = 0;
-
-        memset(file_type, 0 , 10 ) ;
-        fread(file_type , file_type_len , 1 , fp ) ;
-        file_type[file_type_len] = '\0' ;
-
-        if ( !strncmp( file_type , "Trick-05" , 8 ) ||
-             !strncmp( file_type , "Trick-07" , 8 ) ||
-             !strncmp( file_type , "Trick-10" , 8) ) {
-
-                TRICK_GET_BYTE_ORDER(my_byte_order) ;
-                switch ( file_type[file_type_len - 1] ) {
-                    case 'L':
-                            swap = ( my_byte_order == TRICK_LITTLE_ENDIAN ) ? 0 : 1 ;
-                            break ;
-                    case 'B':
-                            swap = ( my_byte_order == TRICK_BIG_ENDIAN ) ? 0 : 1 ;
-                            break ;
-                }
-        } else {
-                return -1 ;
-        }
-
-        return swap ;
+int	TrickBinaryReadByteOrder(	FILE*	fp	)	{
+
+								const	int	file_type_len	=	10	;
+								char	file_type[file_type_len	+	1]	;
+								int	my_byte_order	;
+								int	swap	=	0;
+
+								memset(file_type,	0	,	10	)	;
+								fread(file_type	,	file_type_len	,	1	,	fp	)	;
+								file_type[file_type_len]	=	'\0'	;
+
+								if	(	!strncmp(	file_type	,	"Trick-05"	,	8	)	||
+													!strncmp(	file_type	,	"Trick-07"	,	8	)	||
+													!strncmp(	file_type	,	"Trick-10"	,	8)	)	{
+
+																TRICK_GET_BYTE_ORDER(my_byte_order)	;
+																switch	(	file_type[file_type_len	-	1]	)	{
+																				case	'L':
+																												swap	=	(	my_byte_order	==	TRICK_LITTLE_ENDIAN	)	?	0	:	1	;
+																												break	;
+																				case	'B':
+																												swap	=	(	my_byte_order	==	TRICK_BIG_ENDIAN	)	?	0	:	1	;
+																												break	;
+																}
+								}	else	{
+																return	-1	;
+								}
+
+								return	swap	;
 }
 
-int TrickBinaryGetNumVariables(const char* file_name) {
+int	TrickBinaryGetNumVariables(const	char*	file_name)	{
 
-        int num_params ;
-        FILE *fp ;
-        int swap ;
+								int	num_params	;
+								FILE	*fp	;
+								int	swap	;
 
-        if ((fp = fopen(file_name , "r")) != 0 ) {
-                swap = TrickBinaryReadByteOrder( fp ) ;
-                fread(&num_params , 4 , 1 , fp ) ;
-                if ( swap ) { num_params = trick_byteswap_int(num_params) ; }
-        } else {
-                std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-                return(0) ;
-        }
+								if	((fp	=	fopen(file_name	,	"r"))	!=	0	)	{
+																swap	=	TrickBinaryReadByteOrder(	fp	)	;
+																fread(&num_params	,	4	,	1	,	fp	)	;
+																if	(	swap	)	{	num_params	=	trick_byteswap_int(num_params)	;	}
+								}	else	{
+																std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+																return(0)	;
+								}
 
-        fclose(fp);
-        return num_params ;
+								fclose(fp);
+								return	num_params	;
 }
 
-char** TrickBinaryGetVariableNames(const char* file_name) {
+char**	TrickBinaryGetVariableNames(const	char*	file_name)	{
 
-        int swap ;
-        char *name_ptr ;
-        char *units_ptr ;
-        int len ;
-        int ii ;
-        int type ;
-        int size ;
-        int num_params ;
-        FILE *fp ;
+								int	swap	;
+								char	*name_ptr	;
+								char	*units_ptr	;
+								int	len	;
+								int	ii	;
+								int	type	;
+								int	size	;
+								int	num_params	;
+								FILE	*fp	;
 
-        char** variable_names = 0 ;
+								char**	variable_names	=	0	;
 
-        if ((fp = fopen(file_name , "r")) != 0 ) {
+								if	((fp	=	fopen(file_name	,	"r"))	!=	0	)	{
 
-                 swap = TrickBinaryReadByteOrder( fp ) ;
+																	swap	=	TrickBinaryReadByteOrder(	fp	)	;
 
-                 // num_params
-                 fread(&num_params , 4 , 1 , fp ) ;
-                 if ( swap ) { num_params = trick_byteswap_int(num_params) ; }
+																	//	num_params
+																	fread(&num_params	,	4	,	1	,	fp	)	;
+																	if	(	swap	)	{	num_params	=	trick_byteswap_int(num_params)	;	}
 
-                 // Alloc space for return list
-                 variable_names = new char*[num_params] ;
+																	//	Alloc	space	for	return	list
+																	variable_names	=	new	char*[num_params]	;
 
-                 for ( ii = 0  ; ii < num_params ; ii++ ) {
+																	for	(	ii	=	0		;	ii	<	num_params	;	ii++	)	{
 
-                         // name length
-                         fread(&len , 4 , 1 , fp ) ;
-                         if ( swap ) { len = trick_byteswap_int(len) ; }
+																									//	name	length
+																									fread(&len	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	len	=	trick_byteswap_int(len)	;	}
 
-                         // name
-                         variable_names[ii] = new char[len + 1] ;
-                         name_ptr = variable_names[ii] ;
-                         fread(name_ptr , len , 1 , fp ) ;
-                         name_ptr[len] = '\0' ;
+																									//	name
+																									variable_names[ii]	=	new	char[len	+	1]	;
+																									name_ptr	=	variable_names[ii]	;
+																									fread(name_ptr	,	len	,	1	,	fp	)	;
+																									name_ptr[len]	=	'\0'	;
 
-                         // units length
-                         fread(&len , 4 , 1 , fp ) ;
-                         if ( swap ) { len = trick_byteswap_int(len) ; }
+																									//	units	length
+																									fread(&len	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	len	=	trick_byteswap_int(len)	;	}
 
-                         // units
-                         units_ptr = new char[len + 1] ;
-                         fread(units_ptr , len , 1 , fp ) ;
-                         units_ptr[len] = '\0' ;
+																									//	units
+																									units_ptr	=	new	char[len	+	1]	;
+																									fread(units_ptr	,	len	,	1	,	fp	)	;
+																									units_ptr[len]	=	'\0'	;
 
-                         // type of param
-                         fread(&type , 4 , 1 , fp ) ;
-                         if ( swap ) { type = trick_byteswap_int(type) ; }
+																									//	type	of	param
+																									fread(&type	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	type	=	trick_byteswap_int(type)	;	}
 
-                         // size of param
-                         fread(&size , 4 , 1 , fp ) ;
-                         if ( swap ) { size = trick_byteswap_int(size) ; }
+																									//	size	of	param
+																									fread(&size	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	size	=	trick_byteswap_int(size)	;	}
 
-                         delete[]units_ptr ;
-                 }
-        }
-        else {
-                std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-                return(0) ;
-        }
+																									delete[]units_ptr	;
+																	}
+								}
+								else	{
+																std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+																return(0)	;
+								}
 
-        fclose(fp) ;
+								fclose(fp)	;
 
-        return( variable_names ) ;
+								return(	variable_names	)	;
 }
 
-char** TrickBinaryGetVariableUnits(const char* file_name) {
+char**	TrickBinaryGetVariableUnits(const	char*	file_name)	{
 
-        int swap ;
-        char *name_ptr ;
-        char *units_ptr ;
-        int len ;
-        int ii ;
-        int type ;
-        int size ;
-        int num_params ;
-        FILE *fp ;
+								int	swap	;
+								char	*name_ptr	;
+								char	*units_ptr	;
+								int	len	;
+								int	ii	;
+								int	type	;
+								int	size	;
+								int	num_params	;
+								FILE	*fp	;
 
-        char** variable_units = 0 ;
+								char**	variable_units	=	0	;
 
-        if ((fp = fopen(file_name , "r")) != 0 ) {
+								if	((fp	=	fopen(file_name	,	"r"))	!=	0	)	{
 
-                 swap = TrickBinaryReadByteOrder( fp ) ;
+																	swap	=	TrickBinaryReadByteOrder(	fp	)	;
 
-                 // num_params
-                 fread(&num_params , 4 , 1 , fp ) ;
-                 if ( swap ) { num_params = trick_byteswap_int(num_params) ; }
+																	//	num_params
+																	fread(&num_params	,	4	,	1	,	fp	)	;
+																	if	(	swap	)	{	num_params	=	trick_byteswap_int(num_params)	;	}
 
-                 // Alloc space for return list
-                 variable_units = new char*[num_params] ;
+																	//	Alloc	space	for	return	list
+																	variable_units	=	new	char*[num_params]	;
 
-                 for ( ii = 0  ; ii < num_params ; ii++ ) {
+																	for	(	ii	=	0		;	ii	<	num_params	;	ii++	)	{
 
-                         // name length
-                         fread(&len , 4 , 1 , fp ) ;
-                         if ( swap ) { len = trick_byteswap_int(len) ; }
+																									//	name	length
+																									fread(&len	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	len	=	trick_byteswap_int(len)	;	}
 
-                         // name
-                         name_ptr = new char[len + 1] ;
-                         fread(name_ptr , len , 1 , fp ) ;
-                         name_ptr[len] = '\0' ;
+																									//	name
+																									name_ptr	=	new	char[len	+	1]	;
+																									fread(name_ptr	,	len	,	1	,	fp	)	;
+																									name_ptr[len]	=	'\0'	;
 
-                         // units length
-                         fread(&len , 4 , 1 , fp ) ;
-                         if ( swap ) { len = trick_byteswap_int(len) ; }
+																									//	units	length
+																									fread(&len	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	len	=	trick_byteswap_int(len)	;	}
 
-                         // units
-                         variable_units[ii] = new char[len + 1] ;
-                         units_ptr = variable_units[ii] ;
-                         fread(units_ptr , len , 1 , fp ) ;
-                         units_ptr[len] = '\0' ;
+																									//	units
+																									variable_units[ii]	=	new	char[len	+	1]	;
+																									units_ptr	=	variable_units[ii]	;
+																									fread(units_ptr	,	len	,	1	,	fp	)	;
+																									units_ptr[len]	=	'\0'	;
 
-                         // type of param
-                         fread(&type , 4 , 1 , fp ) ;
-                         if ( swap ) { type = trick_byteswap_int(type) ; }
+																									//	type	of	param
+																									fread(&type	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	type	=	trick_byteswap_int(type)	;	}
 
-                         // size of param
-                         fread(&size , 4 , 1 , fp ) ;
-                         if ( swap ) { size = trick_byteswap_int(size) ; }
+																									//	size	of	param
+																									fread(&size	,	4	,	1	,	fp	)	;
+																									if	(	swap	)	{	size	=	trick_byteswap_int(size)	;	}
 
-                         delete[]name_ptr ;
-                 }
-        }
-        else {
-                std::cerr << "ERROR:  Couldn't open \"" << file_name << "\": " << std::strerror(errno) << std::endl;
-                return(0) ;
-        }
+																									delete[]name_ptr	;
+																	}
+								}
+								else	{
+																std::cerr	<<	"ERROR:		Couldn't	open	\""	<<	file_name	<<	"\":	"	<<	std::strerror(errno)	<<	std::endl;
+																return(0)	;
+								}
 
-        fclose(fp) ;
+								fclose(fp)	;
 
-        return( variable_units ) ;
+								return(	variable_units	)	;
 }
 
-int TrickBinaryLocateParam( const char * file_name , const char * param_name ) {
-
-        int found ;
-        int num_vars ;
-        int ii ;
-        char** var_names ;
-
-        num_vars = TrickBinaryGetNumVariables( file_name) ;
-        if ( num_vars == 0 ) {
-                return 0 ;
-        }
-
-        var_names = TrickBinaryGetVariableNames(file_name) ;
-        if ( var_names == 0 ) {
-                return 0 ;
-        }
-
-        found = 0 ;
-        for ( ii = 0 ; ii < num_vars ; ii++ ) {
-                if ( !strcmp( var_names[ii], param_name) ) {
-                        found = 1 ;
-                        break ;
-                }
-        }
-
-        for ( ii = 0 ; ii < num_vars ; ii++ ) {
-                delete[] var_names[ii] ;
-        }
-        delete[] var_names;
-        return(found) ;
+int	TrickBinaryLocateParam(	const	char	*	file_name	,	const	char	*	param_name	)	{
+
+								int	found	;
+								int	num_vars	;
+								int	ii	;
+								char**	var_names	;
+
+								num_vars	=	TrickBinaryGetNumVariables(	file_name)	;
+								if	(	num_vars	==	0	)	{
+																return	0	;
+								}
+
+								var_names	=	TrickBinaryGetVariableNames(file_name)	;
+								if	(	var_names	==	0	)	{
+																return	0	;
+								}
+
+								found	=	0	;
+								for	(	ii	=	0	;	ii	<	num_vars	;	ii++	)	{
+																if	(	!strcmp(	var_names[ii],	param_name)	)	{
+																								found	=	1	;
+																								break	;
+																}
+								}
+
+								for	(	ii	=	0	;	ii	<	num_vars	;	ii++	)	{
+																delete[]	var_names[ii]	;
+								}
+								delete[]	var_names;
+								return(found)	;
 }
diff --git a/trick_source/data_products/Log/TrickHDF5.cpp b/trick_source/data_products/Log/TrickHDF5.cpp
index 8fa585a5e..db45534e0 100644
--- a/trick_source/data_products/Log/TrickHDF5.cpp
+++ b/trick_source/data_products/Log/TrickHDF5.cpp
@@ -1,224 +1,224 @@
 
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <math.h>
-#include "TrickHDF5.hh"
-#include "trick/map_trick_units_to_udunits.hh"
-
-TrickHDF5::TrickHDF5(char *file_name , char *parameter_name , char *time_name) {
-
-    packet_index = 0;
-
-    hid_t header_group, parameter_names, parameter_units;
-    hsize_t header_packet_index;
-    hsize_t header_num_packets;
-
-    fileName_ = file_name ;
-    unitTimeStr_ = time_name ;
-
-    /*!
-     * Open the HDF5 file.
-     */
-    if ( (file = H5Fopen( file_name, H5F_ACC_RDONLY, H5P_DEFAULT )) < 0 ) {
-        cerr << "ERROR:  Couldn't open file \"" << file_name << "\"" << endl;
-        exit(-1);
-    }
-
-    /*!
-     * Open all dataset/packet-table groups.
-     * Every HDF5 file has at least a root "/" group.
-     */
-    root_group = H5Gopen( file, "/", H5P_DEFAULT );
-    if ( root_group < 0 ) {
-        cerr << "ERROR:  Couldn't open group \"" <<  "/" << "\"" << endl;
-        exit(-1);
-    }
-
-    // Open "/header" group for the purpose of getting the units of the parameter
-    header_group = H5Gopen( file, "/header", H5P_DEFAULT );
-
-    // Find the units for specified parameter_name in recorded data
-    if ( header_group >= 0 ) {
-        parameter_names = H5PTopen( header_group, "param_names" );
-        parameter_units = H5PTopen( header_group, "param_units" );
-
-        if (H5PTis_valid(parameter_names) >= 0 &&  H5PTis_valid(parameter_units) >= 0) {
-            H5PTget_num_packets(parameter_names, &header_num_packets);
-
-            char name_buf[1024];
-            char units_buf[1024];
-
-            for (header_packet_index = 0; header_packet_index < header_num_packets; header_packet_index++) {
-                H5PTget_next(parameter_names, 1, name_buf);
-                H5PTget_next(parameter_units, 1, units_buf);
-                // the specified parameter_name is found, set the units
-                if (strcmp(parameter_name, name_buf) == 0) {
-                    if ( !strcmp(units_buf,"--") ) {
-                        unitStr_ = strdup(units_buf) ;
-                    } else {
-                        unitStr_ = map_trick_units_to_udunits(units_buf) ;
-                    }
-                    break;
-                }
-            }
-
-            H5PTclose(parameter_names);
-            H5PTclose(parameter_units);
-        }
-
-        H5Gclose(header_group);
-    }
-
-    /*!
-     * Open datasets(D)/packet-tables(PT).
-     * "parameter_dataset" is the recorded data for the specified parameter.
-     * "time_dataset" is the actual recorded data for "sys.exec.out.time".
-     */
-    parameter_dataset = H5PTopen( root_group, parameter_name );
-    if ( H5PTis_valid(parameter_dataset) < 0 ) {
-        cerr << "ERROR:  Couldn't open packet table \""
-             << parameter_name << "\"" << endl;
-        exit(-1);
-    }
-    time_dataset = H5PTopen( root_group, time_name );
-    if ( H5PTis_valid(time_dataset) < 0 ) {
-        cerr << "ERROR:  Couldn't open packet table \""
-             << time_name << "\"" << endl;
-        exit(-1);
-    }
+#include	<stdlib.h>
+#include	<string.h>
+#include	<strings.h>
+#include	<math.h>
+#include	"TrickHDF5.hh"
+#include	"trick/map_trick_units_to_udunits.hh"
+
+TrickHDF5::TrickHDF5(char	*file_name	,	char	*parameter_name	,	char	*time_name)	{
+
+				packet_index	=	0;
+
+				hid_t	header_group,	parameter_names,	parameter_units;
+				hsize_t	header_packet_index;
+				hsize_t	header_num_packets;
+
+				fileName_	=	file_name	;
+				unitTimeStr_	=	time_name	;
+
+				/*!
+					*	Open	the	HDF5	file.
+					*/
+				if	(	(file	=	H5Fopen(	file_name,	H5F_ACC_RDONLY,	H5P_DEFAULT	))	<	0	)	{
+								cerr	<<	"ERROR:		Couldn't	open	file	\""	<<	file_name	<<	"\""	<<	endl;
+								exit(-1);
+				}
+
+				/*!
+					*	Open	all	dataset/packet-table	groups.
+					*	Every	HDF5	file	has	at	least	a	root	"/"	group.
+					*/
+				root_group	=	H5Gopen(	file,	"/",	H5P_DEFAULT	);
+				if	(	root_group	<	0	)	{
+								cerr	<<	"ERROR:		Couldn't	open	group	\""	<<		"/"	<<	"\""	<<	endl;
+								exit(-1);
+				}
+
+				//	Open	"/header"	group	for	the	purpose	of	getting	the	units	of	the	parameter
+				header_group	=	H5Gopen(	file,	"/header",	H5P_DEFAULT	);
+
+				//	Find	the	units	for	specified	parameter_name	in	recorded	data
+				if	(	header_group	>=	0	)	{
+								parameter_names	=	H5PTopen(	header_group,	"param_names"	);
+								parameter_units	=	H5PTopen(	header_group,	"param_units"	);
+
+								if	(H5PTis_valid(parameter_names)	>=	0	&&		H5PTis_valid(parameter_units)	>=	0)	{
+												H5PTget_num_packets(parameter_names,	&header_num_packets);
+
+												char	name_buf[1024];
+												char	units_buf[1024];
+
+												for	(header_packet_index	=	0;	header_packet_index	<	header_num_packets;	header_packet_index++)	{
+																H5PTget_next(parameter_names,	1,	name_buf);
+																H5PTget_next(parameter_units,	1,	units_buf);
+																//	the	specified	parameter_name	is	found,	set	the	units
+																if	(strcmp(parameter_name,	name_buf)	==	0)	{
+																				if	(	!strcmp(units_buf,"--")	)	{
+																								unitStr_	=	strdup(units_buf)	;
+																				}	else	{
+																								unitStr_	=	map_trick_units_to_udunits(units_buf)	;
+																				}
+																				break;
+																}
+												}
+
+												H5PTclose(parameter_names);
+												H5PTclose(parameter_units);
+								}
+
+								H5Gclose(header_group);
+				}
+
+				/*!
+					*	Open	datasets(D)/packet-tables(PT).
+					*	"parameter_dataset"	is	the	recorded	data	for	the	specified	parameter.
+					*	"time_dataset"	is	the	actual	recorded	data	for	"sys.exec.out.time".
+					*/
+				parameter_dataset	=	H5PTopen(	root_group,	parameter_name	);
+				if	(	H5PTis_valid(parameter_dataset)	<	0	)	{
+								cerr	<<	"ERROR:		Couldn't	open	packet	table	\""
+													<<	parameter_name	<<	"\""	<<	endl;
+								exit(-1);
+				}
+				time_dataset	=	H5PTopen(	root_group,	time_name	);
+				if	(	H5PTis_valid(time_dataset)	<	0	)	{
+								cerr	<<	"ERROR:		Couldn't	open	packet	table	\""
+													<<	time_name	<<	"\""	<<	endl;
+								exit(-1);
+				}
 
 }
 
-TrickHDF5::~TrickHDF5() {
-    //! End access to all open packet tables.
-    H5PTclose(time_dataset);
-    H5PTclose(parameter_dataset);
-    //! End access to all dataset/packet-table groups.
-    H5Gclose(root_group);
-    //! Terminate access to the HDF5 file.
-    H5Fclose(file);
+TrickHDF5::~TrickHDF5()	{
+				//!	End	access	to	all	open	packet	tables.
+				H5PTclose(time_dataset);
+				H5PTclose(parameter_dataset);
+				//!	End	access	to	all	dataset/packet-table	groups.
+				H5Gclose(root_group);
+				//!	Terminate	access	to	the	HDF5	file.
+				H5Fclose(file);
 }
 
-int TrickHDF5::get(double *time, double *value) {
+int	TrickHDF5::get(double	*time,	double	*value)	{
 
-    int ret;
+				int	ret;
 
-    if ( packet_index < num_packets ) {
-        /*! Retrieve a param value (plus corresponding time)
-         *  from the current packet index position. */
-        H5PTget_next(parameter_dataset, 1, value);
-        H5PTget_next(time_dataset,      1, time);
+				if	(	packet_index	<	num_packets	)	{
+								/*!	Retrieve	a	param	value	(plus	corresponding	time)
+									*		from	the	current	packet	index	position.	*/
+								H5PTget_next(parameter_dataset,	1,	value);
+								H5PTget_next(time_dataset,						1,	time);
 
-        //! Advance the packet index.
-        ret = this->step();
+								//!	Advance	the	packet	index.
+								ret	=	this->step();
 
-        //! Is there more data to read?
-        return (ret);
-    } else {
-        //! No more data to read
-        return (0);
-    }
+								//!	Is	there	more	data	to	read?
+								return	(ret);
+				}	else	{
+								//!	No	more	data	to	read
+								return	(0);
+				}
 
 }
 
-int TrickHDF5::peek( double * time , double * value ) {
+int	TrickHDF5::peek(	double	*	time	,	double	*	value	)	{
 
-    int ret ;
+				int	ret	;
 
-    ret = get( time , value ) ;
+				ret	=	get(	time	,	value	)	;
 
-    return(ret) ;
+				return(ret)	;
 }
 
-void TrickHDF5::begin() {
+void	TrickHDF5::begin()	{
 
-    //! Reset the dataset if another data pass is needed.
-    packet_index = 0;
+				//!	Reset	the	dataset	if	another	data	pass	is	needed.
+				packet_index	=	0;
 
-    /*! See how many packets were logged for this parameter.
-     *  Each recorded value is represented by one packet. */
-    H5PTget_num_packets( parameter_dataset, &num_packets );
+				/*!	See	how	many	packets	were	logged	for	this	parameter.
+					*		Each	recorded	value	is	represented	by	one	packet.	*/
+				H5PTget_num_packets(	parameter_dataset,	&num_packets	);
 
-    /*! Before beginning to read values (packets) from a packet table,
-     *  reset the packet table's index to point to the first packet.
-     *  (Note: the packets are zero-indexed.)
-     */
-    H5PTcreate_index( time_dataset );
-    H5PTcreate_index( parameter_dataset );
+				/*!	Before	beginning	to	read	values	(packets)	from	a	packet	table,
+					*		reset	the	packet	table's	index	to	point	to	the	first	packet.
+					*		(Note:	the	packets	are	zero-indexed.)
+					*/
+				H5PTcreate_index(	time_dataset	);
+				H5PTcreate_index(	parameter_dataset	);
 
-    return ;
+				return	;
 }
 
-int TrickHDF5::end() {
+int	TrickHDF5::end()	{
 
-    //! Move packet index to the end of the packet table.
-    H5PTset_index( time_dataset, num_packets );
-    H5PTset_index( parameter_dataset, num_packets );
-    packet_index = num_packets;
+				//!	Move	packet	index	to	the	end	of	the	packet	table.
+				H5PTset_index(	time_dataset,	num_packets	);
+				H5PTset_index(	parameter_dataset,	num_packets	);
+				packet_index	=	num_packets;
 
-    return (1);
+				return	(1);
 }
 
-int TrickHDF5::step() {
+int	TrickHDF5::step()	{
 
-    if ( packet_index < num_packets ) {
-        //! Increment the packet table's index.
-        packet_index++;
-        /*! Set the packet table's index.  Each packet table keeps an index
-         *  of its "current" packet so that get_next can iterate through
-         *  the packets in order. */
-        H5PTset_index( time_dataset, packet_index );
-        H5PTset_index( parameter_dataset, packet_index );
+				if	(	packet_index	<	num_packets	)	{
+								//!	Increment	the	packet	table's	index.
+								packet_index++;
+								/*!	Set	the	packet	table's	index.		Each	packet	table	keeps	an	index
+									*		of	its	"current"	packet	so	that	get_next	can	iterate	through
+									*		the	packets	in	order.	*/
+								H5PTset_index(	time_dataset,	packet_index	);
+								H5PTset_index(	parameter_dataset,	packet_index	);
 
-        return (1);
+								return	(1);
 
-    } else {
-        //! No more data to read
-        return (0);
-    }
+				}	else	{
+								//!	No	more	data	to	read
+								return	(0);
+				}
 }
 
 
-int HDF5LocateParam( const char * file_name, const char * parameter_name ) {
-
-    //! Open an existing HDF5 file and get a file identifier.
-    hid_t file = H5Fopen(file_name, H5F_ACC_RDONLY, H5P_DEFAULT);
-    if (file < 0) {
-        cerr << "ERROR:  Couldn't open file \"" << file_name << "\"" << endl;
-        return 0;
-    }
-
-    //! Open group containing data.
-    hid_t group = H5Gopen(file, "/", H5P_DEFAULT);
-    if (group < 0) {
-        cerr << "ERROR:  Couldn't open group \"" <<  "/" << "\"" << endl;
-        return 0;
-    }
-
-    /*! Open an existing HDF5 packet table.
-     * PARAMETERS:
-     *     IN: Identifier of the file/group which the packet table can be found.
-     *     IN: The name of the group/packet-table to open.
-     * RETURN:
-     *     Returns an identifier for the group/packet-table, or H5I_BADID on error.
-     */
-    hid_t packet_table = H5PTopen(group, parameter_name);
-    if ( H5PTis_valid(packet_table) < 0 ) {
-        cerr << "ERROR:  Couldn't open packet table \""
-             << parameter_name << "\"" << endl;
-        return 0;
-    }
-
-    //! Close and end access to packet table, group, and file
-    H5PTclose(packet_table);
-    H5Gclose(group);
-    H5Fclose(file);
-
-    return 1;
+int	HDF5LocateParam(	const	char	*	file_name,	const	char	*	parameter_name	)	{
+
+				//!	Open	an	existing	HDF5	file	and	get	a	file	identifier.
+				hid_t	file	=	H5Fopen(file_name,	H5F_ACC_RDONLY,	H5P_DEFAULT);
+				if	(file	<	0)	{
+								cerr	<<	"ERROR:		Couldn't	open	file	\""	<<	file_name	<<	"\""	<<	endl;
+								return	0;
+				}
+
+				//!	Open	group	containing	data.
+				hid_t	group	=	H5Gopen(file,	"/",	H5P_DEFAULT);
+				if	(group	<	0)	{
+								cerr	<<	"ERROR:		Couldn't	open	group	\""	<<		"/"	<<	"\""	<<	endl;
+								return	0;
+				}
+
+				/*!	Open	an	existing	HDF5	packet	table.
+					*	PARAMETERS:
+					*					IN:	Identifier	of	the	file/group	which	the	packet	table	can	be	found.
+					*					IN:	The	name	of	the	group/packet-table	to	open.
+					*	RETURN:
+					*					Returns	an	identifier	for	the	group/packet-table,	or	H5I_BADID	on	error.
+					*/
+				hid_t	packet_table	=	H5PTopen(group,	parameter_name);
+				if	(	H5PTis_valid(packet_table)	<	0	)	{
+								cerr	<<	"ERROR:		Couldn't	open	packet	table	\""
+													<<	parameter_name	<<	"\""	<<	endl;
+								return	0;
+				}
+
+				//!	Close	and	end	access	to	packet	table,	group,	and	file
+				H5PTclose(packet_table);
+				H5Gclose(group);
+				H5Fclose(file);
+
+				return	1;
 
 }
-/*! Overloaded function */
-int HDF5LocateParam( string file_name , string param_name ) {
-    return( HDF5LocateParam(file_name.c_str(), param_name.c_str()) ) ;
+/*!	Overloaded	function	*/
+int	HDF5LocateParam(	string	file_name	,	string	param_name	)	{
+				return(	HDF5LocateParam(file_name.c_str(),	param_name.c_str())	)	;
 }
diff --git a/trick_source/data_products/Log/log.cpp b/trick_source/data_products/Log/log.cpp
index b51b0f1a4..75be74071 100644
--- a/trick_source/data_products/Log/log.cpp
+++ b/trick_source/data_products/Log/log.cpp
@@ -1,1560 +1,1560 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <udunits2.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<sys/types.h>
+#include	<dirent.h>
+#include	<unistd.h>
+#include	<udunits2.h>
 
-#include "log.h"
-#include "trick_byteswap.h"
+#include	"log.h"
+#include	"trick_byteswap.h"
 
-// For DBL_MAX def
-#include <math.h>
-#include <float.h>
+//	For	DBL_MAX	def
+#include	<math.h>
+#include	<float.h>
 
-extern ut_system * u_system ;
+extern	ut_system	*	u_system	;
 
 /**
- * LogData constructor
- */
+	*	LogData	constructor
+	*/
 LogData::LogData()
 {
-        unsigned char localByteOrder;
+								unsigned	char	localByteOrder;
 
-        open_ = 0;
-        dataByteOrder = 0;
-        currBinExtension_ = 0;
-        fp_ = 0;
-        nBinFiles_ = 0;
+								open_	=	0;
+								dataByteOrder	=	0;
+								currBinExtension_	=	0;
+								fp_	=	0;
+								nBinFiles_	=	0;
 
-        binFileName_ = new char[1];
-        binFileName_[0] = '\0';
+								binFileName_	=	new	char[1];
+								binFileName_[0]	=	'\0';
 
-        binFilePath_ = new char[1];
-        binFilePath_[0] = '\0';
+								binFilePath_	=	new	char[1];
+								binFilePath_[0]	=	'\0';
 
-        currRecord_ = new char[0];
+								currRecord_	=	new	char[0];
 
-        isEOF_ = 0;
-        currValIdx_ = 0;
-        convertToDouble_ = 0;
-        nVars_ = 0;
+								isEOF_	=	0;
+								currValIdx_	=	0;
+								convertToDouble_	=	0;
+								nVars_	=	0;
 
-        isEnabledStats_ = 0;
+								isEnabledStats_	=	0;
 
-        statsMin_ = 0 ;
-        statsMax_ = 0 ;
+								statsMin_	=	0	;
+								statsMax_	=	0	;
 
-        // Get local machine's byte odor (smelly to be sure)
-        TRICK_GET_BYTE_ORDER(localByteOrder)
-            if (localByteOrder == (char) (0x00)) {
-                // Big Endian
-                machineByteOrder = 1;
-        } else {
-                // Little Endian
-                machineByteOrder = 0;
-        }
+								//	Get	local	machine's	byte	odor	(smelly	to	be	sure)
+								TRICK_GET_BYTE_ORDER(localByteOrder)
+												if	(localByteOrder	==	(char)	(0x00))	{
+																//	Big	Endian
+																machineByteOrder	=	1;
+								}	else	{
+																//	Little	Endian
+																machineByteOrder	=	0;
+								}
 }
 
-/** Destructor for LogData */
+/**	Destructor	for	LogData	*/
 LogData::~LogData()
 {
 
-        int ii;
-
-        if (fp_) {
-                fclose(fp_);
-        }
-
-        delete[]binFilePath_;
-        delete[]binFileName_;
-
-        for (ii = 0; ii < nVars_; ii++) {
-                delete vars[ii];
-        }
-
-        delete[]currRecord_;
-        delete[]varVal_;
-        delete[]sizeVal_;
-        delete[]scaleVal_;
-        delete[]biasVal_;
-        delete[]unitVal_;
-        delete[]maxVal_;
-        delete[]minVal_;
-        delete[]typeVal_;
-
-        if ( statsMin_ && statsMax_ ) {
-                delete[] statsMin_;
-                delete[] statsMax_;
-        }
-}
-
-/** Return the number of variable (not values) in binary log file header
- *
- *  If log header contains "a[0-1].b[0-1], x.y[4-5]" there are 2
- *  variables NOT 6.
- */
-int LogData::getNumVars()
+								int	ii;
+
+								if	(fp_)	{
+																fclose(fp_);
+								}
+
+								delete[]binFilePath_;
+								delete[]binFileName_;
+
+								for	(ii	=	0;	ii	<	nVars_;	ii++)	{
+																delete	vars[ii];
+								}
+
+								delete[]currRecord_;
+								delete[]varVal_;
+								delete[]sizeVal_;
+								delete[]scaleVal_;
+								delete[]biasVal_;
+								delete[]unitVal_;
+								delete[]maxVal_;
+								delete[]minVal_;
+								delete[]typeVal_;
+
+								if	(	statsMin_	&&	statsMax_	)	{
+																delete[]	statsMin_;
+																delete[]	statsMax_;
+								}
+}
+
+/**	Return	the	number	of	variable	(not	values)	in	binary	log	file	header
+	*
+	*		If	log	header	contains	"a[0-1].b[0-1],	x.y[4-5]"	there	are	2
+	*		variables	NOT	6.
+	*/
+int	LogData::getNumVars()
 {
-        return (nVars_);
-}
-
-/** Set the number of variables (not values) in binary log file header
- *
- *  If log header contains "a[0-1].b[0-1], x.y[4-5]" there are 2
- *  variables NOT 6.
- *
- *  This should be used with care!  Currently -only- a parse routine
- *  in LogGroup uses it.  I could have made LogGroup a friend... but
- *  wanted to keep the interface stiff.
- */
-void LogData::setNumVars(int nVars)
+								return	(nVars_);
+}
+
+/**	Set	the	number	of	variables	(not	values)	in	binary	log	file	header
+	*
+	*		If	log	header	contains	"a[0-1].b[0-1],	x.y[4-5]"	there	are	2
+	*		variables	NOT	6.
+	*
+	*		This	should	be	used	with	care!		Currently	-only-	a	parse	routine
+	*		in	LogGroup	uses	it.		I	could	have	made	LogGroup	a	friend...	but
+	*		wanted	to	keep	the	interface	stiff.
+	*/
+void	LogData::setNumVars(int	nVars)
 {
-        nVars_ = nVars;
+								nVars_	=	nVars;
 }
 
-/** Close a Trick data log
- * @see rewind() close()
- */
-int LogData::close()
+/**	Close	a	Trick	data	log
+	*	@see	rewind()	close()
+	*/
+int	LogData::close()
 {
 
-        // Delete currRecord
-        delete[]currRecord_;
+								//	Delete	currRecord
+								delete[]currRecord_;
 
-        open_ = 0;
-        fclose(fp_);
+								open_	=	0;
+								fclose(fp_);
 
-        // Return
-        return (1);
+								//	Return
+								return	(1);
 }
 
-/** Puts next read at beginning of data log
- *  @see open() close()
- */
-int LogData::rewind()
+/**	Puts	next	read	at	beginning	of	data	log
+	*		@see	open()	close()
+	*/
+int	LogData::rewind()
 {
 
-        if (!open_) {
-                return (-1);
-        }
+								if	(!open_)	{
+																return	(-1);
+								}
 
-        isEOF_ = 0;
+								isEOF_	=	0;
 
-        if (currBinExtension_ > 0) {
-                // If we have multiple bin files, we must go back to first one
-                fclose(fp_);
-                currBinExtension_ = 0;
-                openCurrBinaryFile();
-        } else {
-                ::rewind(fp_);
-        }
+								if	(currBinExtension_	>	0)	{
+																//	If	we	have	multiple	bin	files,	we	must	go	back	to	first	one
+																fclose(fp_);
+																currBinExtension_	=	0;
+																openCurrBinaryFile();
+								}	else	{
+																::rewind(fp_);
+								}
 
-        return (0);
+								return	(0);
 }
 
-/** Open a data log at location specified by path
- *  Path will normally point to a RUN_ directory
- *  @see rewind() close()
- */
-int LogData::open(char *pathToBinaryData)
+/**	Open	a	data	log	at	location	specified	by	path
+	*		Path	will	normally	point	to	a	RUN_	directory
+	*		@see	rewind()	close()
+	*/
+int	LogData::open(char	*pathToBinaryData)
 {
 
-        int i, j;
-        int idx;
-        int nDims;
-        int ret ;
-
-        if (open_) {
-                printf("WARNING: Data file already opened.\n");
-                return (1);
-        }
-        // Make sure that number of variables have been set
-        if (nVars_ == 0) {
-                printf("ERROR: The number of variables "
-                       "in log file is not set.\n");
-                return (-1);
-        }
-        // Count number of binary files for this log data dude (log*000-?)
-        nBinFiles_ = countNumBinaryFiles(pathToBinaryData);
-
-        // Save off binary file path
-        delete[]binFilePath_;
-        binFilePath_ = new char[strlen(pathToBinaryData) + 1];
-        strcpy(binFilePath_, pathToBinaryData);
-
-        // Open first binary file (log*.000)
-        ret = openCurrBinaryFile();
-        if ( ret == -1 ) {
-                return(-1);
-        }
-
-        // Initialize size of record
-        sizeRecord_ = getSizeRecord();
-        if (sizeRecord_ < 1) {
-                printf("ERROR: Size of record is %d.\n", sizeRecord_);
-        }
-        // Initialize currRecord
-        delete[]currRecord_;
-        currRecord_ = new char[sizeRecord_];
-
-        // Initialize the value array's size and types
-        // Values are elements in record, each one has a size and type
-
-        // Allocate value attributes
-        nVals_ = calcNumValRecord();
-        varVal_ = new int[nVals_];
-        sizeVal_ = new int[nVals_];
-        scaleVal_ = new double[nVals_];
-        biasVal_ = new double[nVals_];
-        unitVal_ = new double[nVals_];
-        maxVal_ = new double[nVals_];
-        minVal_ = new double[nVals_];
-        typeVal_ = new Var::enumType[nVals_];
-
-        // Allocate variables that hold stats
-        statsMin_ = new Stats[nVals_];
-        statsMax_ = new Stats[nVals_];
-        for (i = 0; i < nVals_; i++) {
-                statsMin_[i].val = DBL_MAX;
-                statsMax_[i].val = -DBL_MAX;
-        }
-
-        // Initialize value attributes
-        idx = 0;
-        for (i = 0; i < nVars_; i++) {
-                nDims = vars[i]->getNumDims();
-                for (j = 0; j < nDims; j++) {
-                        varVal_[idx] = i;
-                        sizeVal_[idx] = vars[i]->getTypeSize();
-                        scaleVal_[idx] = vars[i]->getScaleFactor();
-                        biasVal_[idx] = vars[i]->getBias();
-                        unitVal_[idx] = 1.0;
-                        maxVal_[idx] = vars[i]->getMaxRange();
-                        minVal_[idx] = vars[i]->getMinRange();
-                        typeVal_[idx] = vars[i]->getType();
-                        idx++;
-                }
-        }
-
-        // Finally set open flag
-        open_ = 1;
-
-        // Return
-        return (1);
-}
-
-/** Go through all data and calculate statistics
- */
-void LogData::enableStats()
+								int	i,	j;
+								int	idx;
+								int	nDims;
+								int	ret	;
+
+								if	(open_)	{
+																printf("WARNING:	Data	file	already	opened.\n");
+																return	(1);
+								}
+								//	Make	sure	that	number	of	variables	have	been	set
+								if	(nVars_	==	0)	{
+																printf("ERROR:	The	number	of	variables	"
+																							"in	log	file	is	not	set.\n");
+																return	(-1);
+								}
+								//	Count	number	of	binary	files	for	this	log	data	dude	(log*000-?)
+								nBinFiles_	=	countNumBinaryFiles(pathToBinaryData);
+
+								//	Save	off	binary	file	path
+								delete[]binFilePath_;
+								binFilePath_	=	new	char[strlen(pathToBinaryData)	+	1];
+								strcpy(binFilePath_,	pathToBinaryData);
+
+								//	Open	first	binary	file	(log*.000)
+								ret	=	openCurrBinaryFile();
+								if	(	ret	==	-1	)	{
+																return(-1);
+								}
+
+								//	Initialize	size	of	record
+								sizeRecord_	=	getSizeRecord();
+								if	(sizeRecord_	<	1)	{
+																printf("ERROR:	Size	of	record	is	%d.\n",	sizeRecord_);
+								}
+								//	Initialize	currRecord
+								delete[]currRecord_;
+								currRecord_	=	new	char[sizeRecord_];
+
+								//	Initialize	the	value	array's	size	and	types
+								//	Values	are	elements	in	record,	each	one	has	a	size	and	type
+
+								//	Allocate	value	attributes
+								nVals_	=	calcNumValRecord();
+								varVal_	=	new	int[nVals_];
+								sizeVal_	=	new	int[nVals_];
+								scaleVal_	=	new	double[nVals_];
+								biasVal_	=	new	double[nVals_];
+								unitVal_	=	new	double[nVals_];
+								maxVal_	=	new	double[nVals_];
+								minVal_	=	new	double[nVals_];
+								typeVal_	=	new	Var::enumType[nVals_];
+
+								//	Allocate	variables	that	hold	stats
+								statsMin_	=	new	Stats[nVals_];
+								statsMax_	=	new	Stats[nVals_];
+								for	(i	=	0;	i	<	nVals_;	i++)	{
+																statsMin_[i].val	=	DBL_MAX;
+																statsMax_[i].val	=	-DBL_MAX;
+								}
+
+								//	Initialize	value	attributes
+								idx	=	0;
+								for	(i	=	0;	i	<	nVars_;	i++)	{
+																nDims	=	vars[i]->getNumDims();
+																for	(j	=	0;	j	<	nDims;	j++)	{
+																								varVal_[idx]	=	i;
+																								sizeVal_[idx]	=	vars[i]->getTypeSize();
+																								scaleVal_[idx]	=	vars[i]->getScaleFactor();
+																								biasVal_[idx]	=	vars[i]->getBias();
+																								unitVal_[idx]	=	1.0;
+																								maxVal_[idx]	=	vars[i]->getMaxRange();
+																								minVal_[idx]	=	vars[i]->getMinRange();
+																								typeVal_[idx]	=	vars[i]->getType();
+																								idx++;
+																}
+								}
+
+								//	Finally	set	open	flag
+								open_	=	1;
+
+								//	Return
+								return	(1);
+}
+
+/**	Go	through	all	data	and	calculate	statistics
+	*/
+void	LogData::enableStats()
 {
 
-        int ii;
-        double val, tval;
-
-        // Stats on, just return
-        if (isEnabledStats_) {
-                return;
-        } else {
-                isEnabledStats_ = 1;
-        }
-
-        int tIdx = getParamIdx("sys.exec.out.time");
-        if (tIdx == -1) {
-                fprintf(stderr, "ERROR: enableStats() because time is "
-                                "something other than sys.exec.out.time\n");
-                exit(-1);
-        }
-        // Mins and maxs
-        rewind();               // Start at top of records
-        while (getNextRecord() != NULL) {
-
-                // Get time stamp and BE SURE to reset pointers
-                tval = *((double *) getVal(tIdx));
-                currValPtr_ = (unsigned char *) currRecord_;
-                currValIdx_ = 0;
-                bytesRead_ = 0;
-
-                for (ii = 0; ii < nVals_; ii++) {
-                        val = *((double *) getNextVal());       // For speed :)
-                        if (statsMin_[ii].val > val) {
-                                statsMin_[ii].val = val;
-                                statsMin_[ii].tval = tval;
-                        }
-                        if (statsMax_[ii].val < val) {
-                                statsMax_[ii].val = val;
-                                statsMax_[ii].tval = tval;
-                        }
-                }
-        }
-}
-
-/** Returns min/max time stamps and values calculated by calculateStats() */
-void LogData::getMinMaxStats(int paramIdx,
-                             double *tmin, double *min,
-                             double *tmax, double *max)
+								int	ii;
+								double	val,	tval;
+
+								//	Stats	on,	just	return
+								if	(isEnabledStats_)	{
+																return;
+								}	else	{
+																isEnabledStats_	=	1;
+								}
+
+								int	tIdx	=	getParamIdx("sys.exec.out.time");
+								if	(tIdx	==	-1)	{
+																fprintf(stderr,	"ERROR:	enableStats()	because	time	is	"
+																																"something	other	than	sys.exec.out.time\n");
+																exit(-1);
+								}
+								//	Mins	and	maxs
+								rewind();															//	Start	at	top	of	records
+								while	(getNextRecord()	!=	NULL)	{
+
+																//	Get	time	stamp	and	BE	SURE	to	reset	pointers
+																tval	=	*((double	*)	getVal(tIdx));
+																currValPtr_	=	(unsigned	char	*)	currRecord_;
+																currValIdx_	=	0;
+																bytesRead_	=	0;
+
+																for	(ii	=	0;	ii	<	nVals_;	ii++)	{
+																								val	=	*((double	*)	getNextVal());							//	For	speed	:)
+																								if	(statsMin_[ii].val	>	val)	{
+																																statsMin_[ii].val	=	val;
+																																statsMin_[ii].tval	=	tval;
+																								}
+																								if	(statsMax_[ii].val	<	val)	{
+																																statsMax_[ii].val	=	val;
+																																statsMax_[ii].tval	=	tval;
+																								}
+																}
+								}
+}
+
+/**	Returns	min/max	time	stamps	and	values	calculated	by	calculateStats()	*/
+void	LogData::getMinMaxStats(int	paramIdx,
+																													double	*tmin,	double	*min,
+																													double	*tmax,	double	*max)
 {
 
-        if (!isEnabledStats_) {
-                enableStats();
-        }
+								if	(!isEnabledStats_)	{
+																enableStats();
+								}
 
-        *tmin = statsMin_[paramIdx].tval;
-        *min = statsMin_[paramIdx].val;
-        *tmax = statsMax_[paramIdx].tval;
-        *max = statsMax_[paramIdx].val;
+								*tmin	=	statsMin_[paramIdx].tval;
+								*min	=	statsMin_[paramIdx].val;
+								*tmax	=	statsMax_[paramIdx].tval;
+								*max	=	statsMax_[paramIdx].val;
 }
 
 
-/** Count the number of binary files located at path given e.g.
- *  In /user3/vetter/trick_sims/SIM_dog/RUN_test
- *  there may be log_Cat.000 log_Cat.001 .... log_Cat.034
- *  In this case countNumBinaryFiles returns 35
- */
-int LogData::countNumBinaryFiles(char *pathToBinaryData)
+/**	Count	the	number	of	binary	files	located	at	path	given	e.g.
+	*		In	/user3/vetter/trick_sims/SIM_dog/RUN_test
+	*		there	may	be	log_Cat.000	log_Cat.001	....	log_Cat.034
+	*		In	this	case	countNumBinaryFiles	returns	35
+	*/
+int	LogData::countNumBinaryFiles(char	*pathToBinaryData)
 {
 
-        DIR *dirp;
-        struct dirent *dp;
-        int count;
-        int ii;                 // Long live Rob!
-        int binary;
-        int len_binFileName;
-        int len_dname;
-        int len_extension = 4;  // length .### binary extension
-
-        // Open up RUN dir
-        if ((dirp = opendir(pathToBinaryData)) == NULL) {
-                fprintf(stderr, "Couldn't open \"%s\" for reading. \n",
-                        pathToBinaryData);
-                fprintf(stderr, "Maybe LogGroup Constructor not called.\n");
-                exit(-1);
-        }
-
-        count = 0;
-        while ((dp = readdir(dirp)) != NULL) {
-                len_dname = strlen(dp->d_name);
-                len_binFileName = strlen(binFileName_);
-                if (len_dname == len_binFileName + len_extension &&
-                    !strncmp(dp->d_name, binFileName_, len_binFileName)) {
-
-                        // We have found bin file name,
-                        // make sure it has a binary extension
-                        binary = 1;
-                        for (ii = len_dname - 1; ii >= len_dname - 3; ii--) {
-                                if (!(dp->d_name[ii] >= '0' &&
-                                      dp->d_name[ii] <= '9')) {
-                                        binary = 0;
-                                }
-                        }
-
-                        // If this is a binary file,
-                        // 000-999 extension, increment count
-                        if (binary) {
-                                count++;
-                        }
-                }
-        }
-
-        closedir(dirp);
-
-        return (count);
+								DIR	*dirp;
+								struct	dirent	*dp;
+								int	count;
+								int	ii;																	//	Long	live	Rob!
+								int	binary;
+								int	len_binFileName;
+								int	len_dname;
+								int	len_extension	=	4;		//	length	.###	binary	extension
+
+								//	Open	up	RUN	dir
+								if	((dirp	=	opendir(pathToBinaryData))	==	NULL)	{
+																fprintf(stderr,	"Couldn't	open	\"%s\"	for	reading.	\n",
+																								pathToBinaryData);
+																fprintf(stderr,	"Maybe	LogGroup	Constructor	not	called.\n");
+																exit(-1);
+								}
+
+								count	=	0;
+								while	((dp	=	readdir(dirp))	!=	NULL)	{
+																len_dname	=	strlen(dp->d_name);
+																len_binFileName	=	strlen(binFileName_);
+																if	(len_dname	==	len_binFileName	+	len_extension	&&
+																				!strncmp(dp->d_name,	binFileName_,	len_binFileName))	{
+
+																								//	We	have	found	bin	file	name,
+																								//	make	sure	it	has	a	binary	extension
+																								binary	=	1;
+																								for	(ii	=	len_dname	-	1;	ii	>=	len_dname	-	3;	ii--)	{
+																																if	(!(dp->d_name[ii]	>=	'0'	&&
+																																						dp->d_name[ii]	<=	'9'))	{
+																																								binary	=	0;
+																																}
+																								}
+
+																								//	If	this	is	a	binary	file,
+																								//	000-999	extension,	increment	count
+																								if	(binary)	{
+																																count++;
+																								}
+																}
+								}
+
+								closedir(dirp);
+
+								return	(count);
 }
 
 
 /*
- * Used privately to open each subsequent binary file on a the lowest level
- */
-int LogData::openCurrBinaryFile()
+	*	Used	privately	to	open	each	subsequent	binary	file	on	a	the	lowest	level
+	*/
+int	LogData::openCurrBinaryFile()
 {
 
-        char extension[4];
-        char *file;
-        int len;
-
-        // Construct extension
-        if (currBinExtension_ < 10) {
-                snprintf(extension, sizeof(extension), "00%d", currBinExtension_);
-        } else if (currBinExtension_ < 100) {
-                snprintf(extension, sizeof(extension), "0%d", currBinExtension_);
-        } else {
-                snprintf(extension, sizeof(extension), "%d", currBinExtension_);
-        }
-
-        // Construct binary filename
-        len = strlen(binFilePath_) + strlen(binFileName_) +
-            strlen(extension) + 3;
-        file = new char[len];
-        snprintf(file, len, "%s/%s.%s", binFilePath_, binFileName_, extension);
-
-        // Do sanity check on file
-        if (access(file, F_OK | R_OK) == -1) {
-                fprintf(stderr, "ERROR: Search for parameter exhausted."
-                       "       Or \"%s\" is not readable or doesn't exist. \n",
-                       file);
-                delete [] file;
-                return(-1);
-        }
-        // Close previous binary file if not first file to open
-        if (currBinExtension_ > 0) {
-                fclose(fp_);
-        }
-        // Open binary file
-        fp_ = fopen(file, "r");
-        if (fp_ == NULL) {
-                printf("ERROR: Couldn't open \"%s\" \n", file);
-                exit(-1);
-        }
-
-        delete[]file;
-
-        return (1);
-}
-
-/** Request to convert all data from log file into doubles
- *  @see convertToDoubleNo()
+								char	extension[4];
+								char	*file;
+								int	len;
+
+								//	Construct	extension
+								if	(currBinExtension_	<	10)	{
+																snprintf(extension,	sizeof(extension),	"00%d",	currBinExtension_);
+								}	else	if	(currBinExtension_	<	100)	{
+																snprintf(extension,	sizeof(extension),	"0%d",	currBinExtension_);
+								}	else	{
+																snprintf(extension,	sizeof(extension),	"%d",	currBinExtension_);
+								}
+
+								//	Construct	binary	filename
+								len	=	strlen(binFilePath_)	+	strlen(binFileName_)	+
+												strlen(extension)	+	3;
+								file	=	new	char[len];
+								snprintf(file,	len,	"%s/%s.%s",	binFilePath_,	binFileName_,	extension);
+
+								//	Do	sanity	check	on	file
+								if	(access(file,	F_OK	|	R_OK)	==	-1)	{
+																fprintf(stderr,	"ERROR:	Search	for	parameter	exhausted."
+																							"							Or	\"%s\"	is	not	readable	or	doesn't	exist.	\n",
+																							file);
+																delete	[]	file;
+																return(-1);
+								}
+								//	Close	previous	binary	file	if	not	first	file	to	open
+								if	(currBinExtension_	>	0)	{
+																fclose(fp_);
+								}
+								//	Open	binary	file
+								fp_	=	fopen(file,	"r");
+								if	(fp_	==	NULL)	{
+																printf("ERROR:	Couldn't	open	\"%s\"	\n",	file);
+																exit(-1);
+								}
+
+								delete[]file;
+
+								return	(1);
+}
+
+/**	Request	to	convert	all	data	from	log	file	into	doubles
+	*		@see	convertToDoubleNo()
 */
-int LogData::convertToDoubleYes()
+int	LogData::convertToDoubleYes()
 {
-        convertToDouble_ = 1;
-        return (1);
+								convertToDouble_	=	1;
+								return	(1);
 }
 
-/** Do NOT convert log data to doubles
- *  @see convertToDoubleYes()
- */
-int LogData::convertToDoubleNo()
+/**	Do	NOT	convert	log	data	to	doubles
+	*		@see	convertToDoubleYes()
+	*/
+int	LogData::convertToDoubleNo()
 {
-        convertToDouble_ = 0;
-        return (1);
+								convertToDouble_	=	0;
+								return	(1);
 }
 
-/** Get number of records within a Trick binary log e.g.
- *
- *  If time, x and y are logged, where time, x & y are doubles
- *  And the Trick binary files contains 29616 bytes, we'd have
- *  29616/24 = 1,234 records.
- */
-int LogData::getNumRecords()
+/**	Get	number	of	records	within	a	Trick	binary	log	e.g.
+	*
+	*		If	time,	x	and	y	are	logged,	where	time,	x	&	y	are	doubles
+	*		And	the	Trick	binary	files	contains	29616	bytes,	we'd	have
+	*		29616/24	=	1,234	records.
+	*/
+int	LogData::getNumRecords()
 {
 
-        FILE *fpTmp;
-        char *file;
-        char extension[4];
-
-        int fileOffset;
-        int numRecs;
-        int totalNumRecs;
-        int ii;
-        int len;
-
-        totalNumRecs = 0;
-        for (ii = 0; ii < nBinFiles_; ii++) {
-
-                // Construct extension
-                if (ii < 10) {
-                        snprintf(extension, sizeof(extension), "00%d", ii);
-                } else if (ii < 100) {
-                        snprintf(extension, sizeof(extension), "0%d", ii);
-                } else {
-                        snprintf(extension, sizeof(extension), "%d", ii);
-                }
-
-                // Allocate & construct file name
-                // (+3 for '/' ,  '.' & null terminator)
-                len = strlen(binFilePath_) + strlen(binFileName_) +
-                    strlen(extension) + 3;
-                file = new char[len];
-                snprintf(file, len, "%s/%s.%s", binFilePath_,
-                        binFileName_, extension);
-
-                fpTmp = fopen(file, "r");
-                if (fpTmp == NULL) {
-                        printf("ERROR: Couldn't open \"%s\" \n", file);
-                        exit(-1);
-                }
-
-                fseek(fpTmp, 0, SEEK_END);
-                fileOffset = ftell(fpTmp);
-                numRecs = fileOffset / getSizeRecord();
-                totalNumRecs += numRecs;
-
-                fclose(fpTmp);
-                delete[]file;
-        }
-
-        return (totalNumRecs);
-}
-
-/** Are all params read from current record ? */
-int LogData::isEOF()
+								FILE	*fpTmp;
+								char	*file;
+								char	extension[4];
+
+								int	fileOffset;
+								int	numRecs;
+								int	totalNumRecs;
+								int	ii;
+								int	len;
+
+								totalNumRecs	=	0;
+								for	(ii	=	0;	ii	<	nBinFiles_;	ii++)	{
+
+																//	Construct	extension
+																if	(ii	<	10)	{
+																								snprintf(extension,	sizeof(extension),	"00%d",	ii);
+																}	else	if	(ii	<	100)	{
+																								snprintf(extension,	sizeof(extension),	"0%d",	ii);
+																}	else	{
+																								snprintf(extension,	sizeof(extension),	"%d",	ii);
+																}
+
+																//	Allocate	&	construct	file	name
+																//	(+3	for	'/'	,		'.'	&	null	terminator)
+																len	=	strlen(binFilePath_)	+	strlen(binFileName_)	+
+																				strlen(extension)	+	3;
+																file	=	new	char[len];
+																snprintf(file,	len,	"%s/%s.%s",	binFilePath_,
+																								binFileName_,	extension);
+
+																fpTmp	=	fopen(file,	"r");
+																if	(fpTmp	==	NULL)	{
+																								printf("ERROR:	Couldn't	open	\"%s\"	\n",	file);
+																								exit(-1);
+																}
+
+																fseek(fpTmp,	0,	SEEK_END);
+																fileOffset	=	ftell(fpTmp);
+																numRecs	=	fileOffset	/	getSizeRecord();
+																totalNumRecs	+=	numRecs;
+
+																fclose(fpTmp);
+																delete[]file;
+								}
+
+								return	(totalNumRecs);
+}
+
+/**	Are	all	params	read	from	current	record	?	*/
+int	LogData::isEOF()
 {
-        return (isEOF_);
+								return	(isEOF_);
 }
 
-/** Return size of record in bytes e.g.
- *
- *  If a record contains time, x, y, i, j where
- *  time, x, & y are doubles and i,j are ints
- *  You'd have 3*8 + 2*4 = 32 bytes (on most machines)
- */
-int LogData::getSizeRecord()
+/**	Return	size	of	record	in	bytes	e.g.
+	*
+	*		If	a	record	contains	time,	x,	y,	i,	j	where
+	*		time,	x,	&	y	are	doubles	and	i,j	are	ints
+	*		You'd	have	3*8	+	2*4	=	32	bytes	(on	most	machines)
+	*/
+int	LogData::getSizeRecord()
 {
 
-        int i;
-        int sizeRec;
-
-        sizeRec = 0;
-        for (i = 0; i < nVars_; i++) {
-                sizeRec = sizeRec + vars[i]->getSize();
-        }
-        if(sizeRec <= 0) {
-            std::cerr << "ERROR: LogData::getSizeRecord() is zero or negative, may cause divide-by-zero. Exiting." << std::endl;
-            exit(-1);
-        }
-        return (sizeRec);
-}
-
-/** Calculate the number of values in a record e.g.
- *
- *  A record with "x.y.z[0-2] & a[0-1].b[7]" is
- *  x.y.z[0], x.y.z[1], x.y.z[2], a[0].b[7], a[1].b[7]
- *  This is 5 vals for the record.  Use getSizeRecord
- *  for byte size.
- */
-int LogData::calcNumValRecord()
+								int	i;
+								int	sizeRec;
+
+								sizeRec	=	0;
+								for	(i	=	0;	i	<	nVars_;	i++)	{
+																sizeRec	=	sizeRec	+	vars[i]->getSize();
+								}
+								if(sizeRec	<=	0)	{
+												std::cerr	<<	"ERROR:	LogData::getSizeRecord()	is	zero	or	negative,	may	cause	divide-by-zero.	Exiting."	<<	std::endl;
+												exit(-1);
+								}
+								return	(sizeRec);
+}
+
+/**	Calculate	the	number	of	values	in	a	record	e.g.
+	*
+	*		A	record	with	"x.y.z[0-2]	&	a[0-1].b[7]"	is
+	*		x.y.z[0],	x.y.z[1],	x.y.z[2],	a[0].b[7],	a[1].b[7]
+	*		This	is	5	vals	for	the	record.		Use	getSizeRecord
+	*		for	byte	size.
+	*/
+int	LogData::calcNumValRecord()
 {
 
 
-        int i;
-        int nVals;
+								int	i;
+								int	nVals;
 
-        nVals = 0;
-        for (i = 0; i < nVars_; i++) {
-                nVals = nVals + vars[i]->getNumDims();
-        }
+								nVals	=	0;
+								for	(i	=	0;	i	<	nVars_;	i++)	{
+																nVals	=	nVals	+	vars[i]->getNumDims();
+								}
 
-        return (nVals);
+								return	(nVals);
 }
 
-/** Retrieve number of values in a record
- *  (calculated by calcNumValRecord())
- *  nVals_ set once in the open routine
- */
-int LogData::getNumValRecord()
+/**	Retrieve	number	of	values	in	a	record
+	*		(calculated	by	calcNumValRecord())
+	*		nVals_	set	once	in	the	open	routine
+	*/
+int	LogData::getNumValRecord()
 {
-        return (nVals_);
+								return	(nVals_);
 }
 
-/** Read the next binary record in current binary file
- * For external data logs we just return a 1
- **/
-char *LogData::getNextRecord()
+/**	Read	the	next	binary	record	in	current	binary	file
+	*	For	external	data	logs	we	just	return	a	1
+	**/
+char	*LogData::getNextRecord()
 {
 
-        int ret;
-        int sr;
-
-        // Reset variable index to first variable
-        currVarIndex_ = 0;
-
-        // Reset variable pointer to top of record
-        currValPtr_ = (unsigned char *) currRecord_;
-        currValIdx_ = 0;
-        bytesRead_ = 0;
-        isEOF_ = 0;
-
-        // Read in next record
-        sr = sizeRecord_;
-        ret = fread(currRecord_, sr, 1, fp_);
-        if (ret <= 0) {
-                // Hit EOF on current bin file
-                currBinExtension_++;
-                if (currBinExtension_ < nBinFiles_) {
-                        // Open up next bin file, and get first rec
-                        openCurrBinaryFile();
-                        fread(currRecord_, sr, 1, fp_);
-                        return (currRecord_);
-                } else {
-                        // We are at end of log data (no more recs)
-                        currValIdx_ = 0;
-                        isEOF_ = 1;
-                        return ((char *) NULL);
-                }
-        } else {
-                // Read went OK
-                return (currRecord_);
-        }
-}
-
-/* Very low level routine for advancing value pointer across record */
-void *LogData::advanceCurrValPtr()
+								int	ret;
+								int	sr;
+
+								//	Reset	variable	index	to	first	variable
+								currVarIndex_	=	0;
+
+								//	Reset	variable	pointer	to	top	of	record
+								currValPtr_	=	(unsigned	char	*)	currRecord_;
+								currValIdx_	=	0;
+								bytesRead_	=	0;
+								isEOF_	=	0;
+
+								//	Read	in	next	record
+								sr	=	sizeRecord_;
+								ret	=	fread(currRecord_,	sr,	1,	fp_);
+								if	(ret	<=	0)	{
+																//	Hit	EOF	on	current	bin	file
+																currBinExtension_++;
+																if	(currBinExtension_	<	nBinFiles_)	{
+																								//	Open	up	next	bin	file,	and	get	first	rec
+																								openCurrBinaryFile();
+																								fread(currRecord_,	sr,	1,	fp_);
+																								return	(currRecord_);
+																}	else	{
+																								//	We	are	at	end	of	log	data	(no	more	recs)
+																								currValIdx_	=	0;
+																								isEOF_	=	1;
+																								return	((char	*)	NULL);
+																}
+								}	else	{
+																//	Read	went	OK
+																return	(currRecord_);
+								}
+}
+
+/*	Very	low	level	routine	for	advancing	value	pointer	across	record	*/
+void	*LogData::advanceCurrValPtr()
 {
 
-        currValPtr_ = currValPtr_ + sizeVal_[currValIdx_];
-        bytesRead_ = bytesRead_ + sizeVal_[currValIdx_];
-        currValIdx_++;
-
-        return ((void *) &currVal_);
-}
-
-#define DP_ASSIGN_VAL(V, TYPE) \
-       if ( convertToDouble_ ) { \
-               currVal_.d = (double) V ;  \
-       } else { \
-               currVal_.V =  (TYPE) V ;  \
-               currVal_.V *= (TYPE)scaleVal_[currValIdx_] ; \
-               currVal_.V *= (TYPE)unitVal_[currValIdx_] ; \
-               currVal_.V += (TYPE)scaleVal_[currValIdx_] ; \
-               if ( currVal_.V > (TYPE) maxVal_[currValIdx_] ) { \
-                       currVal_.V = (TYPE) maxVal_[currValIdx_] ; \
-               } \
-               if ( currVal_.V < (TYPE) minVal_[currValIdx_] ) { \
-                       currVal_.V = (TYPE) minVal_[currValIdx_] ; \
-               } \
-       }
+								currValPtr_	=	currValPtr_	+	sizeVal_[currValIdx_];
+								bytesRead_	=	bytesRead_	+	sizeVal_[currValIdx_];
+								currValIdx_++;
+
+								return	((void	*)	&currVal_);
+}
+
+#define	DP_ASSIGN_VAL(V,	TYPE)	\
+							if	(	convertToDouble_	)	{	\
+															currVal_.d	=	(double)	V	;		\
+							}	else	{	\
+															currVal_.V	=		(TYPE)	V	;		\
+															currVal_.V	*=	(TYPE)scaleVal_[currValIdx_]	;	\
+															currVal_.V	*=	(TYPE)unitVal_[currValIdx_]	;	\
+															currVal_.V	+=	(TYPE)scaleVal_[currValIdx_]	;	\
+															if	(	currVal_.V	>	(TYPE)	maxVal_[currValIdx_]	)	{	\
+																							currVal_.V	=	(TYPE)	maxVal_[currValIdx_]	;	\
+															}	\
+															if	(	currVal_.V	<	(TYPE)	minVal_[currValIdx_]	)	{	\
+																							currVal_.V	=	(TYPE)	minVal_[currValIdx_]	;	\
+															}	\
+							}
 
 /**
- * Main function for byte-by-byte grabbing values out of a binary record
- * TODO: Can I use a Template<> ???
- */
-void *LogData::getNextVal()
+	*	Main	function	for	byte-by-byte	grabbing	values	out	of	a	binary	record
+	*	TODO:	Can	I	use	a	Template<>	???
+	*/
+void	*LogData::getNextVal()
 {
 
-        int idx;
-        unsigned char *cp1;
-
-        char c;
-        short s;
-        int i;
-        long l;
-        unsigned char uc;
-        unsigned short us;
-        unsigned int ui;
-        unsigned long ul;
-        float f;
-        double d;
-        long long ll;
-        unsigned long long ull;
-
-        if (currRecord_ == 0) {
-                return (0);
-        }
-
-        if (bytesRead_ >= sizeRecord_) {
-                return (0);
-        }
-
-        switch (typeVal_[currValIdx_]) {
-
-        case Var::CHAR:
-                cp1 = (unsigned char *) &c;
-                cp1[0] = currValPtr_[0];
-                if (convertToDouble_) {
-                        currVal_.d = (double) c;
-                } else {
-                        currVal_.c = (char) c;
-                }
-                break;
-        case Var::SHORT:
-                cp1 = (unsigned char *) &s;
-                for (idx = 0; idx < 2; idx++)
-                        cp1[idx] = currValPtr_[idx];
-                if (machineByteOrder != dataByteOrder) {
-                        s = trick_byteswap_short(s);
-                }
-                DP_ASSIGN_VAL(s, short int);
-                break;
-        case Var::INT:
-                cp1 = (unsigned char *) &i;
-                for (idx = 0; idx < 4; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        i = trick_byteswap_int(i);
-                }
-                DP_ASSIGN_VAL(i, int);
-                break;
-        case Var::LONG:
-                cp1 = (unsigned char *) &l;
-                for (idx = 0; idx < 8; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        l = trick_byteswap_long(l);
-                }
-                DP_ASSIGN_VAL(l, long);
-                break;
-        case Var::UNSIGNED_CHAR:
-                cp1 = (unsigned char *) &uc;
-                cp1[0] = currValPtr_[0];
-                if (convertToDouble_) {
-                        currVal_.d = (double) uc;
-                } else {
-                        currVal_.uc = (unsigned char) uc;
-                }
-                break;
-        case Var::UNSIGNED_SHORT:
-                cp1 = (unsigned char *) &us;
-                for (idx = 0; idx < 2; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        us = trick_byteswap_short(us);
-                }
-                DP_ASSIGN_VAL(us, unsigned short);
-                break;
-        case Var::UNSIGNED_INTEGER:
-                cp1 = (unsigned char *) &ui;
-                for (idx = 0; idx < 4; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        ui = trick_byteswap_int(ui);
-                }
-                DP_ASSIGN_VAL(ui, unsigned int);
-                break;
-        case Var::UNSIGNED_LONG:
-                cp1 = (unsigned char *) &ul;
-                for (idx = 0; idx < 8; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        ul = trick_byteswap_long(ul);
-                }
-                DP_ASSIGN_VAL(ul, unsigned long);
-                break;
-        case Var::FLOAT:
-                cp1 = (unsigned char *) &f;
-                for (idx = 0; idx < 4; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        f = trick_byteswap_float(f);
-                }
-                DP_ASSIGN_VAL(f, float);
-                break;
-        case Var::DOUBLE:
-                cp1 = (unsigned char *) &d;
-                for (idx = 0; idx < 8; idx++) {
-                        cp1[idx] = currValPtr_[idx];
-                }
-                if (machineByteOrder != dataByteOrder) {
-                        d = trick_byteswap_double(d);
-                }
-                currVal_.d = (double) d;
-                if (!convertToDouble_) {
-                        // If converting, scaling done later
-                        currVal_.d *= scaleVal_[currValIdx_];
-                        currVal_.d *= unitVal_[currValIdx_];
-                        currVal_.d += biasVal_[currValIdx_];
-                        if (currVal_.d > maxVal_[currValIdx_]) {
-                                currVal_.d = maxVal_[currValIdx_];
-                        }
-                        if (currVal_.d < minVal_[currValIdx_]) {
-                                currVal_.d = minVal_[currValIdx_];
-                        }
-                }
-                break;
-        case Var::LONG_LONG:
-                cp1 = (unsigned char *) &ll;
-                if (machineByteOrder != dataByteOrder) {
-                        for (idx = 0; idx < 8; idx++) {
-                                cp1[7 - idx] = currValPtr_[idx];
-                        }
-                } else {
-                        for (idx = 0; idx < 8; idx++) {
-                                cp1[idx] = currValPtr_[idx];
-                        }
-                }
-                DP_ASSIGN_VAL(ll, long long);
-                break;
-        case Var::UNSIGNED_LONG_LONG:
-                cp1 = (unsigned char *) &ull;
-                if (machineByteOrder != dataByteOrder) {
-                        for (idx = 0; idx < 8; idx++) {
-                                cp1[7 - idx] = currValPtr_[idx];
-                        }
-                } else {
-                        for (idx = 0; idx < 8; idx++) {
-                                cp1[idx] = currValPtr_[idx];
-                        }
-                }
-
-                DP_ASSIGN_VAL(ull, unsigned long long);
-                break;
-        case Var::VOID:
-                break;
-        default:
-                printf("ERROR: GetNextVal getting weird type.\n");
-                exit(-1);
-        }
-
-        // Do scaling etc... if converting to doubles
-        if (convertToDouble_) {
-                currVal_.d *= scaleVal_[currValIdx_];
-                currVal_.d *= unitVal_[currValIdx_];
-                currVal_.d += biasVal_[currValIdx_];
-                if (currVal_.d > maxVal_[currValIdx_]) {
-                        currVal_.d = maxVal_[currValIdx_];
-                }
-                if (currVal_.d < minVal_[currValIdx_]) {
-                        currVal_.d = minVal_[currValIdx_];
-                }
-        }
-        // Now that we have current val, advance pointer
-        advanceCurrValPtr();
-
-        return ((void *) &currVal_);
-}
-
-/** Get value in record at given index e.g.
- *
- *  So if the current record contains a[0-1], b[0-1]
- *  getVal(2) will return b[0]'s value
- */
-void *LogData::getVal(int index)
+								int	idx;
+								unsigned	char	*cp1;
+
+								char	c;
+								short	s;
+								int	i;
+								long	l;
+								unsigned	char	uc;
+								unsigned	short	us;
+								unsigned	int	ui;
+								unsigned	long	ul;
+								float	f;
+								double	d;
+								long	long	ll;
+								unsigned	long	long	ull;
+
+								if	(currRecord_	==	0)	{
+																return	(0);
+								}
+
+								if	(bytesRead_	>=	sizeRecord_)	{
+																return	(0);
+								}
+
+								switch	(typeVal_[currValIdx_])	{
+
+								case	Var::CHAR:
+																cp1	=	(unsigned	char	*)	&c;
+																cp1[0]	=	currValPtr_[0];
+																if	(convertToDouble_)	{
+																								currVal_.d	=	(double)	c;
+																}	else	{
+																								currVal_.c	=	(char)	c;
+																}
+																break;
+								case	Var::SHORT:
+																cp1	=	(unsigned	char	*)	&s;
+																for	(idx	=	0;	idx	<	2;	idx++)
+																								cp1[idx]	=	currValPtr_[idx];
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								s	=	trick_byteswap_short(s);
+																}
+																DP_ASSIGN_VAL(s,	short	int);
+																break;
+								case	Var::INT:
+																cp1	=	(unsigned	char	*)	&i;
+																for	(idx	=	0;	idx	<	4;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								i	=	trick_byteswap_int(i);
+																}
+																DP_ASSIGN_VAL(i,	int);
+																break;
+								case	Var::LONG:
+																cp1	=	(unsigned	char	*)	&l;
+																for	(idx	=	0;	idx	<	8;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								l	=	trick_byteswap_long(l);
+																}
+																DP_ASSIGN_VAL(l,	long);
+																break;
+								case	Var::UNSIGNED_CHAR:
+																cp1	=	(unsigned	char	*)	&uc;
+																cp1[0]	=	currValPtr_[0];
+																if	(convertToDouble_)	{
+																								currVal_.d	=	(double)	uc;
+																}	else	{
+																								currVal_.uc	=	(unsigned	char)	uc;
+																}
+																break;
+								case	Var::UNSIGNED_SHORT:
+																cp1	=	(unsigned	char	*)	&us;
+																for	(idx	=	0;	idx	<	2;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								us	=	trick_byteswap_short(us);
+																}
+																DP_ASSIGN_VAL(us,	unsigned	short);
+																break;
+								case	Var::UNSIGNED_INTEGER:
+																cp1	=	(unsigned	char	*)	&ui;
+																for	(idx	=	0;	idx	<	4;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								ui	=	trick_byteswap_int(ui);
+																}
+																DP_ASSIGN_VAL(ui,	unsigned	int);
+																break;
+								case	Var::UNSIGNED_LONG:
+																cp1	=	(unsigned	char	*)	&ul;
+																for	(idx	=	0;	idx	<	8;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								ul	=	trick_byteswap_long(ul);
+																}
+																DP_ASSIGN_VAL(ul,	unsigned	long);
+																break;
+								case	Var::FLOAT:
+																cp1	=	(unsigned	char	*)	&f;
+																for	(idx	=	0;	idx	<	4;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								f	=	trick_byteswap_float(f);
+																}
+																DP_ASSIGN_VAL(f,	float);
+																break;
+								case	Var::DOUBLE:
+																cp1	=	(unsigned	char	*)	&d;
+																for	(idx	=	0;	idx	<	8;	idx++)	{
+																								cp1[idx]	=	currValPtr_[idx];
+																}
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								d	=	trick_byteswap_double(d);
+																}
+																currVal_.d	=	(double)	d;
+																if	(!convertToDouble_)	{
+																								//	If	converting,	scaling	done	later
+																								currVal_.d	*=	scaleVal_[currValIdx_];
+																								currVal_.d	*=	unitVal_[currValIdx_];
+																								currVal_.d	+=	biasVal_[currValIdx_];
+																								if	(currVal_.d	>	maxVal_[currValIdx_])	{
+																																currVal_.d	=	maxVal_[currValIdx_];
+																								}
+																								if	(currVal_.d	<	minVal_[currValIdx_])	{
+																																currVal_.d	=	minVal_[currValIdx_];
+																								}
+																}
+																break;
+								case	Var::LONG_LONG:
+																cp1	=	(unsigned	char	*)	&ll;
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								for	(idx	=	0;	idx	<	8;	idx++)	{
+																																cp1[7	-	idx]	=	currValPtr_[idx];
+																								}
+																}	else	{
+																								for	(idx	=	0;	idx	<	8;	idx++)	{
+																																cp1[idx]	=	currValPtr_[idx];
+																								}
+																}
+																DP_ASSIGN_VAL(ll,	long	long);
+																break;
+								case	Var::UNSIGNED_LONG_LONG:
+																cp1	=	(unsigned	char	*)	&ull;
+																if	(machineByteOrder	!=	dataByteOrder)	{
+																								for	(idx	=	0;	idx	<	8;	idx++)	{
+																																cp1[7	-	idx]	=	currValPtr_[idx];
+																								}
+																}	else	{
+																								for	(idx	=	0;	idx	<	8;	idx++)	{
+																																cp1[idx]	=	currValPtr_[idx];
+																								}
+																}
+
+																DP_ASSIGN_VAL(ull,	unsigned	long	long);
+																break;
+								case	Var::VOID:
+																break;
+								default:
+																printf("ERROR:	GetNextVal	getting	weird	type.\n");
+																exit(-1);
+								}
+
+								//	Do	scaling	etc...	if	converting	to	doubles
+								if	(convertToDouble_)	{
+																currVal_.d	*=	scaleVal_[currValIdx_];
+																currVal_.d	*=	unitVal_[currValIdx_];
+																currVal_.d	+=	biasVal_[currValIdx_];
+																if	(currVal_.d	>	maxVal_[currValIdx_])	{
+																								currVal_.d	=	maxVal_[currValIdx_];
+																}
+																if	(currVal_.d	<	minVal_[currValIdx_])	{
+																								currVal_.d	=	minVal_[currValIdx_];
+																}
+								}
+								//	Now	that	we	have	current	val,	advance	pointer
+								advanceCurrValPtr();
+
+								return	((void	*)	&currVal_);
+}
+
+/**	Get	value	in	record	at	given	index	e.g.
+	*
+	*		So	if	the	current	record	contains	a[0-1],	b[0-1]
+	*		getVal(2)	will	return	b[0]'s	value
+	*/
+void	*LogData::getVal(int	index)
 {
 
-        int i;
-
-        // Make sure record exists
-        if (currRecord_ == 0) {
-                return (0);
-        }
-
-        // Make sure index is valid
-        if (index >= nVals_ || index < 0) {
-                fprintf(stderr, "ERROR: getVal attempting to grab val "
-                        "out of bounds.\n"
-                        "       getVal received faulty index \"%d\".\n", index);
-                fprintf(stderr, "       %s has only \"%d\" vals per record.\n",
-                        binFileName_, getNumValRecord());
-                exit(-1);
-        }
-        // Reset variable pointer to top of current record
-        currValPtr_ = (unsigned char *) currRecord_;
-        currValIdx_ = 0;
-        bytesRead_ = 0;
-
-        // Now advance to index given
-        for (i = 0; i < index; i++) {
-                advanceCurrValPtr();
-        }
-
-        // Now return value at index
-        return (getNextVal());
-}
-
-/** Get C-type for value of current record at given index */
-Var::enumType LogData::getType(int idx)
+								int	i;
+
+								//	Make	sure	record	exists
+								if	(currRecord_	==	0)	{
+																return	(0);
+								}
+
+								//	Make	sure	index	is	valid
+								if	(index	>=	nVals_	||	index	<	0)	{
+																fprintf(stderr,	"ERROR:	getVal	attempting	to	grab	val	"
+																								"out	of	bounds.\n"
+																								"							getVal	received	faulty	index	\"%d\".\n",	index);
+																fprintf(stderr,	"							%s	has	only	\"%d\"	vals	per	record.\n",
+																								binFileName_,	getNumValRecord());
+																exit(-1);
+								}
+								//	Reset	variable	pointer	to	top	of	current	record
+								currValPtr_	=	(unsigned	char	*)	currRecord_;
+								currValIdx_	=	0;
+								bytesRead_	=	0;
+
+								//	Now	advance	to	index	given
+								for	(i	=	0;	i	<	index;	i++)	{
+																advanceCurrValPtr();
+								}
+
+								//	Now	return	value	at	index
+								return	(getNextVal());
+}
+
+/**	Get	C-type	for	value	of	current	record	at	given	index	*/
+Var::enumType	LogData::getType(int	idx)
 {
-        return (typeVal_[idx]);
+								return	(typeVal_[idx]);
 }
 
-/** Get size in bytes for value of current record at given index */
-int LogData::getSize(int idx)
+/**	Get	size	in	bytes	for	value	of	current	record	at	given	index	*/
+int	LogData::getSize(int	idx)
 {
-        return (sizeVal_[idx]);
+								return	(sizeVal_[idx]);
 }
 
 /**
- * Get index of a parameter in log header e.g.
- *
- * If header has a[0-1].b[3], x[0-1].y[0-1]
- * getParamIdx( "x[1].y[0]" ) returns 4 since
- * x[1].y[0] is 4rth idx into
- * a[0].b[3], a[1].b[3], x[0].y[0], x[0].y[1], x[1].y[0], x[1].y[1]
- *
- * If this log data is external data just pass back index
- * to external parameter.  No worries about multi-dimensions :)
- */
-int LogData::getParamIdx(const char *param)
+	*	Get	index	of	a	parameter	in	log	header	e.g.
+	*
+	*	If	header	has	a[0-1].b[3],	x[0-1].y[0-1]
+	*	getParamIdx(	"x[1].y[0]"	)	returns	4	since
+	*	x[1].y[0]	is	4rth	idx	into
+	*	a[0].b[3],	a[1].b[3],	x[0].y[0],	x[0].y[1],	x[1].y[0],	x[1].y[1]
+	*
+	*	If	this	log	data	is	external	data	just	pass	back	index
+	*	to	external	parameter.		No	worries	about	multi-dimensions	:)
+	*/
+int	LogData::getParamIdx(const	char	*param)
 {
 
-        int i;
-        int valIndex;
-        int offset;
-
-        valIndex = 0;
-        for (i = 0; i < nVars_; i++) {
-                if (!vars[i]->compareNames(param)) {
-                        /*
-                         * We have a match
-                         *
-                         * So the given parameter was found in the variable
-                         * list given in the header file
-                         *
-                         * We -almost- know which variable index this is,
-                         * but we must now get the offset
-                         *
-                         * Must also make sure that param is in vars[i] space
-                         * E.g. a.b[0][1] is in a.b[0-5][1-3] space
-                         * but  a.b[0][1] is NOT in a.b[5][6-10] space
-                         */
-
-                        offset = vars[i]->getDimOffset(param);
-                        if (offset != -1) {
-                                valIndex = valIndex + offset;
-                                return (valIndex);
-                        }
-                }
-                valIndex = valIndex + vars[i]->getNumDims();
-        }
-
-        // Not found
-        return (-1);
-}
-
-/** Get the unit associated with the parameter as specified in Log header */
-std::string LogData::getUnit(char *param)
+								int	i;
+								int	valIndex;
+								int	offset;
+
+								valIndex	=	0;
+								for	(i	=	0;	i	<	nVars_;	i++)	{
+																if	(!vars[i]->compareNames(param))	{
+																								/*
+																									*	We	have	a	match
+																									*
+																									*	So	the	given	parameter	was	found	in	the	variable
+																									*	list	given	in	the	header	file
+																									*
+																									*	We	-almost-	know	which	variable	index	this	is,
+																									*	but	we	must	now	get	the	offset
+																									*
+																									*	Must	also	make	sure	that	param	is	in	vars[i]	space
+																									*	E.g.	a.b[0][1]	is	in	a.b[0-5][1-3]	space
+																									*	but		a.b[0][1]	is	NOT	in	a.b[5][6-10]	space
+																									*/
+
+																								offset	=	vars[i]->getDimOffset(param);
+																								if	(offset	!=	-1)	{
+																																valIndex	=	valIndex	+	offset;
+																																return	(valIndex);
+																								}
+																}
+																valIndex	=	valIndex	+	vars[i]->getNumDims();
+								}
+
+								//	Not	found
+								return	(-1);
+}
+
+/**	Get	the	unit	associated	with	the	parameter	as	specified	in	Log	header	*/
+std::string	LogData::getUnit(char	*param)
 {
 
-        int ii;
+								int	ii;
 
-        for (ii = 0; ii < nVars_; ii++) {
-                if (!vars[ii]->compareNames(param)) {
-                        return (vars[ii]->getUnit());
-                }
-        }
+								for	(ii	=	0;	ii	<	nVars_;	ii++)	{
+																if	(!vars[ii]->compareNames(param))	{
+																								return	(vars[ii]->getUnit());
+																}
+								}
 
-        // Not found, return NULL
-        return (0);
+								//	Not	found,	return	NULL
+								return	(0);
 }
 
-/** Set scale factor for parameter with given factor */
-int LogData::setScaleFactor(int paramIdx, double factor)
+/**	Set	scale	factor	for	parameter	with	given	factor	*/
+int	LogData::setScaleFactor(int	paramIdx,	double	factor)
 {
 
-        if (paramIdx > nVals_ || paramIdx < 0) {
-                fprintf(stderr, "ERROR: setScaleFactor received paramIdx "
-                        "%d out of bounds.\n", paramIdx);
-                exit(-1);
-        }
+								if	(paramIdx	>	nVals_	||	paramIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	setScaleFactor	received	paramIdx	"
+																								"%d	out	of	bounds.\n",	paramIdx);
+																exit(-1);
+								}
 
-        vars[varVal_[paramIdx]]->setScaleFactor(factor);
-        scaleVal_[paramIdx] = factor;
-        return (1);
+								vars[varVal_[paramIdx]]->setScaleFactor(factor);
+								scaleVal_[paramIdx]	=	factor;
+								return	(1);
 }
 
-/** Set bias (offset/shift) for parameter with given value */
-int LogData::setBias(int paramIdx, double bias)
+/**	Set	bias	(offset/shift)	for	parameter	with	given	value	*/
+int	LogData::setBias(int	paramIdx,	double	bias)
 {
 
-        if (paramIdx > nVals_ || paramIdx < 0) {
-                fprintf(stderr, "ERROR: setBias received paramIdx %d "
-                        "out of bounds.\n", paramIdx);
-                exit(-1);
-        }
+								if	(paramIdx	>	nVals_	||	paramIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	setBias	received	paramIdx	%d	"
+																								"out	of	bounds.\n",	paramIdx);
+																exit(-1);
+								}
 
-        vars[varVal_[paramIdx]]->setBias(bias);
-        biasVal_[paramIdx] = bias;
-        return (1);
+								vars[varVal_[paramIdx]]->setBias(bias);
+								biasVal_[paramIdx]	=	bias;
+								return	(1);
 }
 
-/** Set maximal value for parameter */
-int LogData::setMax(int paramIdx, double max)
+/**	Set	maximal	value	for	parameter	*/
+int	LogData::setMax(int	paramIdx,	double	max)
 {
 
-        if (paramIdx > nVals_ || paramIdx < 0) {
-                fprintf(stderr, "ERROR: setMax received paramIdx %d"
-                        " out of bounds.\n", paramIdx);
-                exit(-1);
-        }
+								if	(paramIdx	>	nVals_	||	paramIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	setMax	received	paramIdx	%d"
+																								"	out	of	bounds.\n",	paramIdx);
+																exit(-1);
+								}
 
-        vars[varVal_[paramIdx]]->setMaxRange(max);
-        maxVal_[paramIdx] = max;
-        return (1);
+								vars[varVal_[paramIdx]]->setMaxRange(max);
+								maxVal_[paramIdx]	=	max;
+								return	(1);
 }
 
-/** Set maximal value for parameter */
-int LogData::setMin(int paramIdx, double min)
+/**	Set	maximal	value	for	parameter	*/
+int	LogData::setMin(int	paramIdx,	double	min)
 {
 
-        if (paramIdx > nVals_ || paramIdx < 0) {
-                fprintf(stderr, "ERROR: setMin received paramIdx %d "
-                        "out of bounds.\n", paramIdx);
-                exit(-1);
-        }
+								if	(paramIdx	>	nVals_	||	paramIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	setMin	received	paramIdx	%d	"
+																								"out	of	bounds.\n",	paramIdx);
+																exit(-1);
+								}
 
-        vars[varVal_[paramIdx]]->setMinRange(min);
-        minVal_[paramIdx] = min;
-        return (1);
+								vars[varVal_[paramIdx]]->setMinRange(min);
+								minVal_[paramIdx]	=	min;
+								return	(1);
 }
 
-/** Set unit for parameter
- *  Internally this will set a scale factor from unit in log
- *  file to unit given as argument.  If the unit passed is
- *  NULL, the scale factor will be set to 1.0.
- */
-int LogData::setUnit(int paramIdx, std::string to_units)
+/**	Set	unit	for	parameter
+	*		Internally	this	will	set	a	scale	factor	from	unit	in	log
+	*		file	to	unit	given	as	argument.		If	the	unit	passed	is
+	*		NULL,	the	scale	factor	will	be	set	to	1.0.
+	*/
+int	LogData::setUnit(int	paramIdx,	std::string	to_units)
 {
 
-        if (paramIdx > nVals_ || paramIdx < 0) {
-                fprintf(stderr, "ERROR: setUnit received paramIdx %d "
-                        "out of bounds.\n", paramIdx);
-                exit(-1);
-        }
-
-        // If no unit passed, set scale factor to 1.0 (default)
-        if (to_units.empty()) {
-                unitVal_[paramIdx] = 1.0;
-                return (-1);
-        }
-
-        std::string from_units = vars[varVal_[paramIdx]]->getUnit() ;
-        ut_unit * from = ut_parse(u_system, from_units.c_str(), UT_ASCII) ;
-        if ( !from ) {
-            unitVal_[paramIdx] = 1.0;
-            std::cout << "could not covert from units " << from_units << std::endl ;
-            return -1 ;
-        }
-
-        ut_unit * to = ut_parse(u_system, to_units.c_str(), UT_ASCII) ;
-        if ( !to ) {
-            unitVal_[paramIdx] = 1.0;
-            std::cout << "could not covert to units " << to_units << std::endl ;
-            return -1 ;
-        }
-
-        cv_converter * converter = ut_get_converter(from,to) ;
-        if ( converter ) {
-            biasVal_[paramIdx] = cv_convert_double(converter, 0.0 ) ;
-            unitVal_[paramIdx] = cv_convert_double(converter, 1.0 ) - biasVal_[paramIdx] ;
-            cv_free(converter) ;
-        } else {
-            std::cerr << "Units conversion error from " << from_units << " to " << to_units << std::endl ;
-            return -1 ;
-        }
-
-        ut_free(from) ;
-        ut_free(to) ;
-
-        return (1);
-}
-
-/** Get the value of a paramter at a given time stamp
- *  Find value around an epsilon of time stamp
- *  return -1 if can't find value with time stamp
- */
-int LogData::getValueAtTime( int tIdx, double time,
-                             int vIdx, double* value) {
-
-        double tVal ;
-
-        if (vIdx > nVals_ || vIdx < 0) {
-                fprintf(stderr, "ERROR: getValueAtTime received paramIdx %d "
-                        "out of bounds.\n", vIdx);
-                exit(-1);
-        }
-        if ( time < 0 ) {
-                fprintf(stderr, "ERROR: getValueAtTime() received "
-                        "a time stamp of %lf.\n", time);
-                exit(-1);
-        }
-
-        // Sequentially look for data associated with time stamp
-        // I'll optimize this if it gets more use, or I get more time
-        rewind();
-        while (getNextRecord() != NULL) {
-
-                // Get time stamp and BE SURE to reset pointers
-                tVal = *((double *) getVal(tIdx));
-                currValPtr_ = (unsigned char *) currRecord_;
-                currValIdx_ = 0;
-                bytesRead_ = 0;
-
-                if ( fabs( tVal - time ) < 0.0000001 ) {
-                        *value =  *((double*)getVal(vIdx)) ;
-                        return( 1 ) ;
-                }
-        }
-
-        // Never found value associated with time stamp
-        return(-1);
-}
-
-/** Set the binary file name e.g.
-  * log_Ball1, without the 000, 001 extensions...
-  */
-int LogData::setBinaryFileName(char *fileName)
+								if	(paramIdx	>	nVals_	||	paramIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	setUnit	received	paramIdx	%d	"
+																								"out	of	bounds.\n",	paramIdx);
+																exit(-1);
+								}
+
+								//	If	no	unit	passed,	set	scale	factor	to	1.0	(default)
+								if	(to_units.empty())	{
+																unitVal_[paramIdx]	=	1.0;
+																return	(-1);
+								}
+
+								std::string	from_units	=	vars[varVal_[paramIdx]]->getUnit()	;
+								ut_unit	*	from	=	ut_parse(u_system,	from_units.c_str(),	UT_ASCII)	;
+								if	(	!from	)	{
+												unitVal_[paramIdx]	=	1.0;
+												std::cout	<<	"could	not	covert	from	units	"	<<	from_units	<<	std::endl	;
+												return	-1	;
+								}
+
+								ut_unit	*	to	=	ut_parse(u_system,	to_units.c_str(),	UT_ASCII)	;
+								if	(	!to	)	{
+												unitVal_[paramIdx]	=	1.0;
+												std::cout	<<	"could	not	covert	to	units	"	<<	to_units	<<	std::endl	;
+												return	-1	;
+								}
+
+								cv_converter	*	converter	=	ut_get_converter(from,to)	;
+								if	(	converter	)	{
+												biasVal_[paramIdx]	=	cv_convert_double(converter,	0.0	)	;
+												unitVal_[paramIdx]	=	cv_convert_double(converter,	1.0	)	-	biasVal_[paramIdx]	;
+												cv_free(converter)	;
+								}	else	{
+												std::cerr	<<	"Units	conversion	error	from	"	<<	from_units	<<	"	to	"	<<	to_units	<<	std::endl	;
+												return	-1	;
+								}
+
+								ut_free(from)	;
+								ut_free(to)	;
+
+								return	(1);
+}
+
+/**	Get	the	value	of	a	paramter	at	a	given	time	stamp
+	*		Find	value	around	an	epsilon	of	time	stamp
+	*		return	-1	if	can't	find	value	with	time	stamp
+	*/
+int	LogData::getValueAtTime(	int	tIdx,	double	time,
+																													int	vIdx,	double*	value)	{
+
+								double	tVal	;
+
+								if	(vIdx	>	nVals_	||	vIdx	<	0)	{
+																fprintf(stderr,	"ERROR:	getValueAtTime	received	paramIdx	%d	"
+																								"out	of	bounds.\n",	vIdx);
+																exit(-1);
+								}
+								if	(	time	<	0	)	{
+																fprintf(stderr,	"ERROR:	getValueAtTime()	received	"
+																								"a	time	stamp	of	%lf.\n",	time);
+																exit(-1);
+								}
+
+								//	Sequentially	look	for	data	associated	with	time	stamp
+								//	I'll	optimize	this	if	it	gets	more	use,	or	I	get	more	time
+								rewind();
+								while	(getNextRecord()	!=	NULL)	{
+
+																//	Get	time	stamp	and	BE	SURE	to	reset	pointers
+																tVal	=	*((double	*)	getVal(tIdx));
+																currValPtr_	=	(unsigned	char	*)	currRecord_;
+																currValIdx_	=	0;
+																bytesRead_	=	0;
+
+																if	(	fabs(	tVal	-	time	)	<	0.0000001	)	{
+																								*value	=		*((double*)getVal(vIdx))	;
+																								return(	1	)	;
+																}
+								}
+
+								//	Never	found	value	associated	with	time	stamp
+								return(-1);
+}
+
+/**	Set	the	binary	file	name	e.g.
+		*	log_Ball1,	without	the	000,	001	extensions...
+		*/
+int	LogData::setBinaryFileName(char	*fileName)
 {
 
-        delete[]binFileName_;
-        binFileName_ = new char[strlen(fileName) + 1];
-        strcpy(binFileName_, fileName);
+								delete[]binFileName_;
+								binFileName_	=	new	char[strlen(fileName)	+	1];
+								strcpy(binFileName_,	fileName);
 
-        return (0);
+								return	(0);
 }
 
-/** Get the binary file name e.g.
-  * log_Ball1, without the 000, 001 extensions...
-  */
-char *LogData::getBinaryFileName()
+/**	Get	the	binary	file	name	e.g.
+		*	log_Ball1,	without	the	000,	001	extensions...
+		*/
+char	*LogData::getBinaryFileName()
 {
-        return (binFileName_);
+								return	(binFileName_);
 }
 
-/** Default LogGroup constructor */
+/**	Default	LogGroup	constructor	*/
 LogGroup::LogGroup()
 {
-        fprintf(stderr, "ERROR: Please use LogGroup::LogGroup(char* headerFile)"
-                " constructor.\n");
+								fprintf(stderr,	"ERROR:	Please	use	LogGroup::LogGroup(char*	headerFile)"
+																"	constructor.\n");
 
-        exit(0);
+								exit(0);
 }
 
-/** This LogGroup constructor takes a path to the Trick binary data files */
-LogGroup::LogGroup(char *path)
+/**	This	LogGroup	constructor	takes	a	path	to	the	Trick	binary	data	files	*/
+LogGroup::LogGroup(char	*path)
 {
 
-        int ret;
-        int i;
-
-        nGroups_ = 0;
-        isEOF_ = 0;
-
-        pathToBinaryData_ = new char[strlen(path) + 1];
-        strcpy(pathToBinaryData_, path);
-
-        getHeaders();
-
-        if (parseLogHeaders() == -1) {
-                fprintf(stderr, "ERROR: Failed parsing log headers "
-                                "for \"%s\".\n", path);
-        }
-        // Make sure there is at least one log file
-        if (nGroups_ == 0) {
-                fprintf(stderr, "ERROR: No log header files found in \"%s\"\n",
-                        pathToBinaryData_);
-        }
-        // Open up data files
-        for (i = 0; i < nGroups_; i++) {
-                ret = log[i]->open(pathToBinaryData_);
-                if ( ret == -1 ) {
-                        fprintf(stderr, "ERROR: Failed open() for \"%s\"\n",
-                        pathToBinaryData_);
-                }
-        }
-}
-
-/** Default destructor --- broken :( */
+								int	ret;
+								int	i;
+
+								nGroups_	=	0;
+								isEOF_	=	0;
+
+								pathToBinaryData_	=	new	char[strlen(path)	+	1];
+								strcpy(pathToBinaryData_,	path);
+
+								getHeaders();
+
+								if	(parseLogHeaders()	==	-1)	{
+																fprintf(stderr,	"ERROR:	Failed	parsing	log	headers	"
+																																"for	\"%s\".\n",	path);
+								}
+								//	Make	sure	there	is	at	least	one	log	file
+								if	(nGroups_	==	0)	{
+																fprintf(stderr,	"ERROR:	No	log	header	files	found	in	\"%s\"\n",
+																								pathToBinaryData_);
+								}
+								//	Open	up	data	files
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																ret	=	log[i]->open(pathToBinaryData_);
+																if	(	ret	==	-1	)	{
+																								fprintf(stderr,	"ERROR:	Failed	open()	for	\"%s\"\n",
+																								pathToBinaryData_);
+																}
+								}
+}
+
+/**	Default	destructor	---	broken	:(	*/
 LogGroup::~LogGroup()
 {
 
-        int ii;
+								int	ii;
 
-        delete[]pathToBinaryData_;
+								delete[]pathToBinaryData_;
 
-        for (ii = 0; ii < nGroups_; ii++) {
-                delete log[ii];
-        }
+								for	(ii	=	0;	ii	<	nGroups_;	ii++)	{
+																delete	log[ii];
+								}
 
-        if (headers_) {
-                for (ii = 0; ii < nHeaders_; ii++) {
-                        free(headers_[ii]);
-                }
-                free(headers_);
-        }
+								if	(headers_)	{
+																for	(ii	=	0;	ii	<	nHeaders_;	ii++)	{
+																								free(headers_[ii]);
+																}
+																free(headers_);
+								}
 }
 
 
-/** All data will be converted to doubles */
-int LogGroup::convertToDoubleYes()
+/**	All	data	will	be	converted	to	doubles	*/
+int	LogGroup::convertToDoubleYes()
 {
-        int i;
+								int	i;
 
-        for (i = 0; i < nGroups_; i++) {
-                log[i]->convertToDoubleYes();
-        }
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																log[i]->convertToDoubleYes();
+								}
 
-        return (0);
+								return	(0);
 }
 
-/** Get number of records in this log group
- *  Return the max number of records among all the Trick logs
- */
-int LogGroup::getNumRecords()
+/**	Get	number	of	records	in	this	log	group
+	*		Return	the	max	number	of	records	among	all	the	Trick	logs
+	*/
+int	LogGroup::getNumRecords()
 {
-        int i;
-        int ret;
-        int max;
-
-        max = 0;
-        for (i = 0; i < nGroups_; i++) {
-                ret = log[i]->getNumRecords();
-                if (ret > max) {
-                        max = ret;
-                }
-        }
-
-        return (max);
-}
-
-/** Enable statistics (min/max...)
- *  This will actually calculate stats on the first pass
- *  Find absolute min/max value for a param
- *  This will move the file offsets in the binary files
- *  Maybe we'll add the "ftell()" later!
- */
-void LogGroup::getMinMaxStats(const char *param,
-                              double *tmin, double *min,
-                              double *tmax, double *max)
+								int	i;
+								int	ret;
+								int	max;
+
+								max	=	0;
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																ret	=	log[i]->getNumRecords();
+																if	(ret	>	max)	{
+																								max	=	ret;
+																}
+								}
+
+								return	(max);
+}
+
+/**	Enable	statistics	(min/max...)
+	*		This	will	actually	calculate	stats	on	the	first	pass
+	*		Find	absolute	min/max	value	for	a	param
+	*		This	will	move	the	file	offsets	in	the	binary	files
+	*		Maybe	we'll	add	the	"ftell()"	later!
+	*/
+void	LogGroup::getMinMaxStats(const	char	*param,
+																														double	*tmin,	double	*min,
+																														double	*tmax,	double	*max)
 {
 
-        int xIdx, xLogIdx;
-        int yIdx, yLogIdx;
-        int ret ;
+								int	xIdx,	xLogIdx;
+								int	yIdx,	yLogIdx;
+								int	ret	;
 
-        // We need to insure all are doubles for these calculations
-        convertToDoubleYes();
+								//	We	need	to	insure	all	are	doubles	for	these	calculations
+								convertToDoubleYes();
 
-        ret = getParamIdx("sys.exec.out.time", &xIdx, &xLogIdx,
-                    param, &yIdx, &yLogIdx);
-        if ( ret == -1 ) {
-                fprintf(stderr, "ERROR: Couldn't get min/max statistics "
-                                " due to bad log indices.\n");
-                exit(-1);
-        }
+								ret	=	getParamIdx("sys.exec.out.time",	&xIdx,	&xLogIdx,
+																				param,	&yIdx,	&yLogIdx);
+								if	(	ret	==	-1	)	{
+																fprintf(stderr,	"ERROR:	Couldn't	get	min/max	statistics	"
+																																"	due	to	bad	log	indices.\n");
+																exit(-1);
+								}
 
-        log[yLogIdx]->getMinMaxStats(yIdx, tmin, min, tmax, max);
+								log[yLogIdx]->getMinMaxStats(yIdx,	tmin,	min,	tmax,	max);
 }
 
-/** Set scale factor for given paramter and given factor */
-int LogGroup::setScaleFactor(int logIdx, int paramIdx, double factor)
+/**	Set	scale	factor	for	given	paramter	and	given	factor	*/
+int	LogGroup::setScaleFactor(int	logIdx,	int	paramIdx,	double	factor)
 {
 
-        log[logIdx]->setScaleFactor(paramIdx, factor);
+								log[logIdx]->setScaleFactor(paramIdx,	factor);
 
-        return (1);
+								return	(1);
 }
 
 
-/** Set bias (offset/shift) parameter */
-int LogGroup::setBias(int logIdx, int paramIdx, double bias)
+/**	Set	bias	(offset/shift)	parameter	*/
+int	LogGroup::setBias(int	logIdx,	int	paramIdx,	double	bias)
 {
 
-        log[logIdx]->setBias(paramIdx, bias);
+								log[logIdx]->setBias(paramIdx,	bias);
 
-        return (1);
+								return	(1);
 }
 
-/** Set maximum value for parameter */
-int LogGroup::setMax(int logIdx, int paramIdx, double max)
+/**	Set	maximum	value	for	parameter	*/
+int	LogGroup::setMax(int	logIdx,	int	paramIdx,	double	max)
 {
 
-        log[logIdx]->setMax(paramIdx, max);
+								log[logIdx]->setMax(paramIdx,	max);
 
-        return (1);
+								return	(1);
 }
 
-/** Set minimum value for parameter */
-int LogGroup::setMin(int logIdx, int paramIdx, double min)
+/**	Set	minimum	value	for	parameter	*/
+int	LogGroup::setMin(int	logIdx,	int	paramIdx,	double	min)
 {
 
-        log[logIdx]->setMin(paramIdx, min);
+								log[logIdx]->setMin(paramIdx,	min);
 
-        return (1);
+								return	(1);
 }
 
-/** Set unit for parameter
- *  @see LogData::setUnit()
- */
-int LogGroup::setUnit(int logIdx, int paramIdx, std::string u)
+/**	Set	unit	for	parameter
+	*		@see	LogData::setUnit()
+	*/
+int	LogGroup::setUnit(int	logIdx,	int	paramIdx,	std::string	u)
 {
 
-        log[logIdx]->setUnit(paramIdx, u);
+								log[logIdx]->setUnit(paramIdx,	u);
 
-        return (1);
+								return	(1);
 }
 
-/** Set unit for parameter
- *  @see LogData::setUnit()
- */
-int LogGroup::setUnit(const char *paramName, std::string u)
+/**	Set	unit	for	parameter
+	*		@see	LogData::setUnit()
+	*/
+int	LogGroup::setUnit(const	char	*paramName,	std::string	u)
 {
 
-        int xIdx, xLogIdx;
-        int yIdx, yLogIdx;
-        int ret ;
-
-        ret = getParamIdx("sys.exec.out.time", &xIdx, &xLogIdx,
-                    paramName, &yIdx, &yLogIdx);
-        if ( ret == -1 ) {
-                fprintf(stderr, "ERROR: In setUnit() died with faulty "
-                                "parameter name.\n");
-                exit(-1);
-        }
-
-        log[yLogIdx]->setUnit(yIdx, u);
-
-        return (1);
-}
-
-/** Get the value of a paramter at a given time stamp
- *  Return value around an epsilon of time stamp
- */
-int LogGroup::getValueAtTime( const char *paramName,
-                              double time, double* value ) {
-
-        int tIdx, tLogIdx;
-        int yIdx, yLogIdx;
-        double vv ;
-        int rr ;
-        int ret ;
-
-        // Get indices based on paramName
-        ret = getParamIdx("sys.exec.out.time", &tIdx, &tLogIdx,
-                    paramName, &yIdx, &yLogIdx);
-        if ( ret == -1 ) {
-                fprintf(stderr, "ERROR: In getValueAtTime() died with faulty "
-                                "parameter name.\n");
-                exit(-1);
-        }
-
-        // Get the value at time
-        rr = log[yLogIdx]->getValueAtTime(tIdx, time,
-                                          yIdx, &vv) ;
-        //  If value with timestamp found
-        if(rr > 0){
-            *value = vv ;
-        }
-        
-        return(rr);
-
-}
-
-/** Move all file pointers of all data log files back to start */
-int LogGroup::rewind()
+								int	xIdx,	xLogIdx;
+								int	yIdx,	yLogIdx;
+								int	ret	;
+
+								ret	=	getParamIdx("sys.exec.out.time",	&xIdx,	&xLogIdx,
+																				paramName,	&yIdx,	&yLogIdx);
+								if	(	ret	==	-1	)	{
+																fprintf(stderr,	"ERROR:	In	setUnit()	died	with	faulty	"
+																																"parameter	name.\n");
+																exit(-1);
+								}
+
+								log[yLogIdx]->setUnit(yIdx,	u);
+
+								return	(1);
+}
+
+/**	Get	the	value	of	a	paramter	at	a	given	time	stamp
+	*		Return	value	around	an	epsilon	of	time	stamp
+	*/
+int	LogGroup::getValueAtTime(	const	char	*paramName,
+																														double	time,	double*	value	)	{
+
+								int	tIdx,	tLogIdx;
+								int	yIdx,	yLogIdx;
+								double	vv	;
+								int	rr	;
+								int	ret	;
+
+								//	Get	indices	based	on	paramName
+								ret	=	getParamIdx("sys.exec.out.time",	&tIdx,	&tLogIdx,
+																				paramName,	&yIdx,	&yLogIdx);
+								if	(	ret	==	-1	)	{
+																fprintf(stderr,	"ERROR:	In	getValueAtTime()	died	with	faulty	"
+																																"parameter	name.\n");
+																exit(-1);
+								}
+
+								//	Get	the	value	at	time
+								rr	=	log[yLogIdx]->getValueAtTime(tIdx,	time,
+																																										yIdx,	&vv)	;
+								//		If	value	with	timestamp	found
+								if(rr	>	0){
+												*value	=	vv	;
+								}
+								
+								return(rr);
+
+}
+
+/**	Move	all	file	pointers	of	all	data	log	files	back	to	start	*/
+int	LogGroup::rewind()
 {
 
-        int i;
+								int	i;
 
-        // Make sure there is at least one log file
-        if (nGroups_ == 0) {
-                fprintf(stderr, "ERROR: No log files specified.\n");
-                fprintf(stderr, "       GetNextRecord aborting.\n");
-                exit(-1);
-        }
+								//	Make	sure	there	is	at	least	one	log	file
+								if	(nGroups_	==	0)	{
+																fprintf(stderr,	"ERROR:	No	log	files	specified.\n");
+																fprintf(stderr,	"							GetNextRecord	aborting.\n");
+																exit(-1);
+								}
 
-        isEOF_ = 0;
+								isEOF_	=	0;
 
-        // Rewind each log data group
-        for (i = 0; i < nGroups_; i++) {
-                log[i]->rewind();
-        }
+								//	Rewind	each	log	data	group
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																log[i]->rewind();
+								}
 
-        return (0);
+								return	(0);
 }
 
-/** Get next record across data log files by
- *  advancing ALL files in log group to next record
- */
-char *LogGroup::getNextRecord()
+/**	Get	next	record	across	data	log	files	by
+	*		advancing	ALL	files	in	log	group	to	next	record
+	*/
+char	*LogGroup::getNextRecord()
 {
 
-        int i;
-        int eof;
-        char *record;
-
-        // Make sure there is at least one log file
-        if (nGroups_ == 0) {
-                fprintf(stderr, "ERROR: No log files specified.\n");
-                fprintf(stderr, "       GetNextRecord aborting.\n");
-                exit(-1);
-        }
-
-        // Get next record in each group
-        eof = 0;
-        for (i = 0; i < nGroups_; i++) {
-                if ((record = log[i]->getNextRecord()) == (char*)NULL) {
-                        eof++;
-                }
-        }
-
-        // Return NULL if all groups data is read
-        if ( eof >= nGroups_ ) {
-                isEOF_ = 1;
-                return ((char *) NULL);
-        } else {
-                return ((char *) 1);
-        }
+								int	i;
+								int	eof;
+								char	*record;
+
+								//	Make	sure	there	is	at	least	one	log	file
+								if	(nGroups_	==	0)	{
+																fprintf(stderr,	"ERROR:	No	log	files	specified.\n");
+																fprintf(stderr,	"							GetNextRecord	aborting.\n");
+																exit(-1);
+								}
+
+								//	Get	next	record	in	each	group
+								eof	=	0;
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																if	((record	=	log[i]->getNextRecord())	==	(char*)NULL)	{
+																								eof++;
+																}
+								}
+
+								//	Return	NULL	if	all	groups	data	is	read
+								if	(	eof	>=	nGroups_	)	{
+																isEOF_	=	1;
+																return	((char	*)	NULL);
+								}	else	{
+																return	((char	*)	1);
+								}
 }
 
 /**
- * Given xVarName & yVarName; return xIdx, yIdx, xLogDataIdx, yLogDataIdx
- *
- * x&y Idx are parameter indices into the x&y LogData files
- *
- * xVarName & yVarName may be in different log data groups,
- * so it get's a little complicated.  Also there may
- * more than one param with same xVarName (time) or same yVarName!
- *
- * The algorithm here will find first group with yVarName, and then
- * see if xVarName is in same group.  If all possibilities of
- * getting x & y out same log data group are exhausted, it will
- * then choose y to be last group it found it in, then find
- * first x with xVarName.  Thus x & y will be pulled out of
- * different log data groups.  If x & y not found, it will issue an
- * error and exit.
- */
-int LogGroup::getParamIdx(const char *xVarName, int *xIdx, int *xLogDataIdx,
-                          const char *yVarName, int *yIdx, int *yLogDataIdx)
+	*	Given	xVarName	&	yVarName;	return	xIdx,	yIdx,	xLogDataIdx,	yLogDataIdx
+	*
+	*	x&y	Idx	are	parameter	indices	into	the	x&y	LogData	files
+	*
+	*	xVarName	&	yVarName	may	be	in	different	log	data	groups,
+	*	so	it	get's	a	little	complicated.		Also	there	may
+	*	more	than	one	param	with	same	xVarName	(time)	or	same	yVarName!
+	*
+	*	The	algorithm	here	will	find	first	group	with	yVarName,	and	then
+	*	see	if	xVarName	is	in	same	group.		If	all	possibilities	of
+	*	getting	x	&	y	out	same	log	data	group	are	exhausted,	it	will
+	*	then	choose	y	to	be	last	group	it	found	it	in,	then	find
+	*	first	x	with	xVarName.		Thus	x	&	y	will	be	pulled	out	of
+	*	different	log	data	groups.		If	x	&	y	not	found,	it	will	issue	an
+	*	error	and	exit.
+	*/
+int	LogGroup::getParamIdx(const	char	*xVarName,	int	*xIdx,	int	*xLogDataIdx,
+																										const	char	*yVarName,	int	*yIdx,	int	*yLogDataIdx)
 {
-        int i;
-        int yFoundIdx;
-
-        // Search by log data groups for x & y parameters
-        *xLogDataIdx = -1;
-        *yLogDataIdx = -1;
-        yFoundIdx = -1;
-        for (i = 0; i < nGroups_; i++) {
-
-                if ((*yIdx = log[i]->getParamIdx(yVarName)) != -1) {
-                        *yLogDataIdx = i;
-                        yFoundIdx = *yIdx;
-                        if ((*xIdx = log[i]->getParamIdx(xVarName)) != -1) {
-                                // Yippee.  x & y in same group
-                                *xLogDataIdx = *yLogDataIdx;
-                                break;
-                        }
-                }
-        }
-
-        if (*xLogDataIdx == -1) {
-                // So x & y not in same group
-
-                if (yFoundIdx != -1) {
-                        // Let's see if xVarName is in a different
-                        // log data group than y
-                        // Choose first one you find
-                        *yIdx = yFoundIdx;
-                        for (i = 0; i < nGroups_; i++) {
-                                *xIdx = log[i]->getParamIdx(xVarName);
-                                if (*xIdx != -1) {
-                                        *xLogDataIdx = i;
-                                        break;
-                                }
-                        }
-                        if (*xLogDataIdx == -1) {
-                                // Never found x parameter
-                                fprintf(stderr, "ERROR: Couldn't find x "
-                                        "param \"%s\".\n", xVarName);
-                                fprintf(stderr, "       Param is not in log "
-                                        "header.\n");
-                                return(-1);
-                        }
-                } else {
-                        // Never found y parameter
-                        fprintf(stderr,
-                                "ERROR: Couldn't find y param \"%s\".\n"
-                                " Param is not in log header for "
-                                "run: \"%s\".\n",
-                                yVarName, getDataDir());
-                        return(-1);
-                }
-        }
-
-        return (0);
-}
-
-// Private function for caching a list of headers in a RUN_ dir
-int LogGroup::getHeaders()
+								int	i;
+								int	yFoundIdx;
+
+								//	Search	by	log	data	groups	for	x	&	y	parameters
+								*xLogDataIdx	=	-1;
+								*yLogDataIdx	=	-1;
+								yFoundIdx	=	-1;
+								for	(i	=	0;	i	<	nGroups_;	i++)	{
+
+																if	((*yIdx	=	log[i]->getParamIdx(yVarName))	!=	-1)	{
+																								*yLogDataIdx	=	i;
+																								yFoundIdx	=	*yIdx;
+																								if	((*xIdx	=	log[i]->getParamIdx(xVarName))	!=	-1)	{
+																																//	Yippee.		x	&	y	in	same	group
+																																*xLogDataIdx	=	*yLogDataIdx;
+																																break;
+																								}
+																}
+								}
+
+								if	(*xLogDataIdx	==	-1)	{
+																//	So	x	&	y	not	in	same	group
+
+																if	(yFoundIdx	!=	-1)	{
+																								//	Let's	see	if	xVarName	is	in	a	different
+																								//	log	data	group	than	y
+																								//	Choose	first	one	you	find
+																								*yIdx	=	yFoundIdx;
+																								for	(i	=	0;	i	<	nGroups_;	i++)	{
+																																*xIdx	=	log[i]->getParamIdx(xVarName);
+																																if	(*xIdx	!=	-1)	{
+																																								*xLogDataIdx	=	i;
+																																								break;
+																																}
+																								}
+																								if	(*xLogDataIdx	==	-1)	{
+																																//	Never	found	x	parameter
+																																fprintf(stderr,	"ERROR:	Couldn't	find	x	"
+																																								"param	\"%s\".\n",	xVarName);
+																																fprintf(stderr,	"							Param	is	not	in	log	"
+																																								"header.\n");
+																																return(-1);
+																								}
+																}	else	{
+																								//	Never	found	y	parameter
+																								fprintf(stderr,
+																																"ERROR:	Couldn't	find	y	param	\"%s\".\n"
+																																"	Param	is	not	in	log	header	for	"
+																																"run:	\"%s\".\n",
+																																yVarName,	getDataDir());
+																								return(-1);
+																}
+								}
+
+								return	(0);
+}
+
+//	Private	function	for	caching	a	list	of	headers	in	a	RUN_	dir
+int	LogGroup::getHeaders()
 {
-        DIR *dirp;
-        struct dirent *dp;
-
-        char* full_header_name ;
-
-        unsigned int maxLengthHeaderName;
-
-        int i;
-        int len ;
-
-        // Open up RUN dir
-        if ((dirp = opendir(pathToBinaryData_)) == NULL) {
-                fprintf(stderr, "ERROR: Couldn't open \"%s\" for reading. \n",
-                        pathToBinaryData_);
-                fprintf(stderr, "Maybe LogGroup constructer wasn't done. \n");
-                exit(-1);
-        }
-        // Count num headers, and max file name length in RUN dir
-        maxLengthHeaderName = 0;
-        nHeaders_ = 0;
-        while ((dp = readdir(dirp)) != NULL) {
-                if (strstr(dp->d_name, ".header") != NULL) {
-                        len  = strlen(dp->d_name) +
-                               strlen(pathToBinaryData_) + 2 ;
-                        full_header_name = (char*) malloc ( len ) ;
-                        snprintf(full_header_name, len, "%s/%s",
-                                pathToBinaryData_, dp->d_name);
-                        if (!strncmp(dp->d_name, "log_", 4) &&
-                             is04BinaryHeader_(full_header_name)) {
-                                if (strlen(dp->d_name) > maxLengthHeaderName) {
-                                        maxLengthHeaderName =
-                                            strlen(dp->d_name);
-                                }
-                                nHeaders_++;
-                        }
-                        free(full_header_name) ;
-                }
-        }
-        maxLengthHeaderName++;  // Add null character onto length
-
-        // Malloc room for header names
-        rewinddir(dirp);
-        headers_ = (char **) malloc((nHeaders_) * sizeof(char *));
-        i = 0;
-        while ((dp = readdir(dirp)) != NULL) {
-                if (strstr(dp->d_name, ".header") != NULL) {
-                        if (!strncmp(dp->d_name, "log_", 4)) {
-                                headers_[i] = (char *) malloc
-                                    (maxLengthHeaderName);
-                                strcpy(headers_[i], dp->d_name);
-                                i++;
-                        }
-                }
-        }
-
-        closedir(dirp);
-
-        return (0);
-}
-
-bool LogGroup::is04BinaryHeader_( const char* file_name )
+								DIR	*dirp;
+								struct	dirent	*dp;
+
+								char*	full_header_name	;
+
+								unsigned	int	maxLengthHeaderName;
+
+								int	i;
+								int	len	;
+
+								//	Open	up	RUN	dir
+								if	((dirp	=	opendir(pathToBinaryData_))	==	NULL)	{
+																fprintf(stderr,	"ERROR:	Couldn't	open	\"%s\"	for	reading.	\n",
+																								pathToBinaryData_);
+																fprintf(stderr,	"Maybe	LogGroup	constructer	wasn't	done.	\n");
+																exit(-1);
+								}
+								//	Count	num	headers,	and	max	file	name	length	in	RUN	dir
+								maxLengthHeaderName	=	0;
+								nHeaders_	=	0;
+								while	((dp	=	readdir(dirp))	!=	NULL)	{
+																if	(strstr(dp->d_name,	".header")	!=	NULL)	{
+																								len		=	strlen(dp->d_name)	+
+																															strlen(pathToBinaryData_)	+	2	;
+																								full_header_name	=	(char*)	malloc	(	len	)	;
+																								snprintf(full_header_name,	len,	"%s/%s",
+																																pathToBinaryData_,	dp->d_name);
+																								if	(!strncmp(dp->d_name,	"log_",	4)	&&
+																													is04BinaryHeader_(full_header_name))	{
+																																if	(strlen(dp->d_name)	>	maxLengthHeaderName)	{
+																																								maxLengthHeaderName	=
+																																												strlen(dp->d_name);
+																																}
+																																nHeaders_++;
+																								}
+																								free(full_header_name)	;
+																}
+								}
+								maxLengthHeaderName++;		//	Add	null	character	onto	length
+
+								//	Malloc	room	for	header	names
+								rewinddir(dirp);
+								headers_	=	(char	**)	malloc((nHeaders_)	*	sizeof(char	*));
+								i	=	0;
+								while	((dp	=	readdir(dirp))	!=	NULL)	{
+																if	(strstr(dp->d_name,	".header")	!=	NULL)	{
+																								if	(!strncmp(dp->d_name,	"log_",	4))	{
+																																headers_[i]	=	(char	*)	malloc
+																																				(maxLengthHeaderName);
+																																strcpy(headers_[i],	dp->d_name);
+																																i++;
+																								}
+																}
+								}
+
+								closedir(dirp);
+
+								return	(0);
+}
+
+bool	LogGroup::is04BinaryHeader_(	const	char*	file_name	)
 {
-        FILE* fp ;
-        char* rc ;
-        char str[4][256] ;
-        char line[1024] ;
+								FILE*	fp	;
+								char*	rc	;
+								char	str[4][256]	;
+								char	line[1024]	;
 
 
-        fp = fopen( file_name, "r" ) ;
-        if ( fp == NULL ) {
-                fprintf(stderr, "Died while attempting to open \"%s\".\n",
-                        file_name);
-                exit(-1) ;
-        }
+								fp	=	fopen(	file_name,	"r"	)	;
+								if	(	fp	==	NULL	)	{
+																fprintf(stderr,	"Died	while	attempting	to	open	\"%s\".\n",
+																								file_name);
+																exit(-1)	;
+								}
 
-        // Either the first or second line must have
-        // * byte_order is (little|big)_endian
-        // where * is some text
-        rc = fgets(line, 1024, fp);
-        if ( rc == NULL ) {
-                return 0 ;
-        }
+								//	Either	the	first	or	second	line	must	have
+								//	*	byte_order	is	(little|big)_endian
+								//	where	*	is	some	text
+								rc	=	fgets(line,	1024,	fp);
+								if	(	rc	==	NULL	)	{
+																return	0	;
+								}
 
-        if ( sscanf(line, "%s %s %s %s",
-                          str[0], str[1], str[2], str[3]) == 4 ) {
+								if	(	sscanf(line,	"%s	%s	%s	%s",
+																										str[0],	str[1],	str[2],	str[3])	==	4	)	{
 
-                if (!strcmp(str[1], "byte_order")) {
-                        return 1 ;
-                }
-        }
+																if	(!strcmp(str[1],	"byte_order"))	{
+																								return	1	;
+																}
+								}
 
-        // If we get here, the header is not an 04 header
-        return 0 ;
+								//	If	we	get	here,	the	header	is	not	an	04	header
+								return	0	;
 
 }
 
@@ -1565,170 +1565,170 @@ bool LogGroup::is04BinaryHeader_( const char* file_name )
 
 
 
-/** Returns number of Trick Log Data groups in RUN_ dir */
-int LogGroup::getNumGroups()
+/**	Returns	number	of	Trick	Log	Data	groups	in	RUN_	dir	*/
+int	LogGroup::getNumGroups()
 {
-        return (nGroups_);
+								return	(nGroups_);
 }
 
-/** Returns path to Binary data (RUN_ dir) */
-char *LogGroup::getDataDir()
+/**	Returns	path	to	Binary	data	(RUN_	dir)	*/
+char	*LogGroup::getDataDir()
 {
-        return (pathToBinaryData_);
+								return	(pathToBinaryData_);
 }
 
-void LogGroup::setEOF_()
+void	LogGroup::setEOF_()
 {
-        isEOF_ = 1 ;
+								isEOF_	=	1	;
 }
 
-int LogGroup::isEOF()
+int	LogGroup::isEOF()
 {
-        int ii ;
-        int nGroupsToCheck ;
-        int eof ;
+								int	ii	;
+								int	nGroupsToCheck	;
+								int	eof	;
 
-        if ( isEOF_ ) {
-                return( 1 ) ;
-        }
+								if	(	isEOF_	)	{
+																return(	1	)	;
+								}
 
-        nGroupsToCheck = nGroups_ ;
+								nGroupsToCheck	=	nGroups_	;
 
-        eof = 1 ;
-        for (ii = 0; ii < nGroupsToCheck ; ii++) {
-                if ( ! log[ii]->isEOF() ) {
-                        eof = 0 ;
-                        break ;
-                }
-        }
-        isEOF_ = eof ;
+								eof	=	1	;
+								for	(ii	=	0;	ii	<	nGroupsToCheck	;	ii++)	{
+																if	(	!	log[ii]->isEOF()	)	{
+																								eof	=	0	;
+																								break	;
+																}
+								}
+								isEOF_	=	eof	;
 
-        return( eof ) ;
+								return(	eof	)	;
 }
 
-IterMultiRun::IterMultiRun( LogGroup* lg1, set<int>& logIndices1,
-                            LogGroup* lg2, set<int>& logIndices2,
-                            double frequency,
-                            double startTime, double stopTime ) {
+IterMultiRun::IterMultiRun(	LogGroup*	lg1,	set<int>&	logIndices1,
+																												LogGroup*	lg2,	set<int>&	logIndices2,
+																												double	frequency,
+																												double	startTime,	double	stopTime	)	{
 
-        // Two iterators for iterating over both runs
-        iter1_ = new IterPreserveTime(lg1, logIndices1,
-                               frequency, startTime, stopTime);
-        iter2_ = new IterPreserveTime(lg2, logIndices2,
-                               frequency, startTime, stopTime);
+								//	Two	iterators	for	iterating	over	both	runs
+								iter1_	=	new	IterPreserveTime(lg1,	logIndices1,
+																															frequency,	startTime,	stopTime);
+								iter2_	=	new	IterPreserveTime(lg2,	logIndices2,
+																															frequency,	startTime,	stopTime);
 
-        startTime_ = startTime;
-        stopTime_ = stopTime;
+								startTime_	=	startTime;
+								stopTime_	=	stopTime;
 
-        logIndices1_ = logIndices1;
-        logIndices2_ = logIndices2;
+								logIndices1_	=	logIndices1;
+								logIndices2_	=	logIndices2;
 }
 
 IterMultiRun::~IterMultiRun()
 {
-        delete iter1_ ;
-        delete iter2_ ;
+								delete	iter1_	;
+								delete	iter2_	;
 }
 
-void IterMultiRun::begin()
+void	IterMultiRun::begin()
 {
-        iter1_->begin();
-        iter2_->begin();
-        return ;
+								iter1_->begin();
+								iter2_->begin();
+								return	;
 }
 
-bool IterMultiRun::end()
+bool	IterMultiRun::end()
 {
-        if ( iter1_->end() || iter2_->end() ) {
-                return( 1 ) ;
-        } else {
-                return( 0 ) ;
-        }
-}
-
-void IterMultiRun::operator++(int) {
-
-        double minTime, t1, t2;
-
-        // No more iteration to be done if at end
-        if ( end() ) {
-                return ;
-        }
-
-        // Get all values in all data log groups
-        // Also get mininum time stamp from all log data files
-        t1 = iter1_->getTime();
-        t2 = iter2_->getTime();
-        if ( t1 <= t2 ) {
-                minTime = t1 ;
-        } else {
-                minTime = t2 ;
-        }
-
-        // Take a step through time (sounds like a song)
-        if ( fabs(t1 - minTime) < 0.0000001 ) {
-                (*iter1_)++ ;
-        }
-        if ( fabs(t2 - minTime) < 0.0000001 ) {
-                (*iter2_)++ ;
-        }
-
-        // Now that a time step has occured
-        // Get the new mininum time stamp
-        t1 = iter1_->getTime();
-        t2 = iter2_->getTime();
-        if ( t1 <= t2 ) {
-                minTime = t1 ;
-        } else {
-                minTime = t2 ;
-        }
-
-        // Insure that time stamp remains same across runs
-        if ( fabs(t1-t2) > 0.0000001 ) {
-                (*this)++ ;
-        }
-
-        // If time < start time requested by user,
-        // continue marching through time until start time reached
-        if (minTime < startTime_) {
-                (*this)++ ;
-        }
-}
-
-IterPreserveTime::IterPreserveTime( LogGroup* lg, set<int>& logIndices,
-                                    double frequency,
-                                    double startTime, double stopTime )
+								if	(	iter1_->end()	||	iter2_->end()	)	{
+																return(	1	)	;
+								}	else	{
+																return(	0	)	;
+								}
+}
+
+void	IterMultiRun::operator++(int)	{
+
+								double	minTime,	t1,	t2;
+
+								//	No	more	iteration	to	be	done	if	at	end
+								if	(	end()	)	{
+																return	;
+								}
+
+								//	Get	all	values	in	all	data	log	groups
+								//	Also	get	mininum	time	stamp	from	all	log	data	files
+								t1	=	iter1_->getTime();
+								t2	=	iter2_->getTime();
+								if	(	t1	<=	t2	)	{
+																minTime	=	t1	;
+								}	else	{
+																minTime	=	t2	;
+								}
+
+								//	Take	a	step	through	time	(sounds	like	a	song)
+								if	(	fabs(t1	-	minTime)	<	0.0000001	)	{
+																(*iter1_)++	;
+								}
+								if	(	fabs(t2	-	minTime)	<	0.0000001	)	{
+																(*iter2_)++	;
+								}
+
+								//	Now	that	a	time	step	has	occured
+								//	Get	the	new	mininum	time	stamp
+								t1	=	iter1_->getTime();
+								t2	=	iter2_->getTime();
+								if	(	t1	<=	t2	)	{
+																minTime	=	t1	;
+								}	else	{
+																minTime	=	t2	;
+								}
+
+								//	Insure	that	time	stamp	remains	same	across	runs
+								if	(	fabs(t1-t2)	>	0.0000001	)	{
+																(*this)++	;
+								}
+
+								//	If	time	<	start	time	requested	by	user,
+								//	continue	marching	through	time	until	start	time	reached
+								if	(minTime	<	startTime_)	{
+																(*this)++	;
+								}
+}
+
+IterPreserveTime::IterPreserveTime(	LogGroup*	lg,	set<int>&	logIndices,
+																																				double	frequency,
+																																				double	startTime,	double	stopTime	)
 {
-        unsigned int ii ;
-
-        lg_ = lg ;
-        startTime_ = startTime ;
-        stopTime_ = stopTime ;
-        logIndices_ = logIndices ;
-        frequency_ = frequency ;
-        frequencyMultiple_ = 1.0 ;
-
-        // If there is an external program, make sure there is at least
-        // one log group other than the external one in logIndices
-        if ( logIndices.size() == 1 ) {
-                logIdx_ = logIndices.begin() ;
-        }
-
-        eof_ = new bool[logIndices.size()] ;
-        for (ii = 0; ii < logIndices.size() ; ii++) {
-                eof_[ii] = 0 ;
-        }
-
-        // Allocate a time idx for log member
-        timeIdx_ = new int[logIndices.size()];
-        for (ii = 0; ii < logIndices.size(); ii++ ) {
-                // TODO: get real time stamp
-                // It is safe for now to assume it's
-                // the first param logged
-                timeIdx_[ii] = 0 ;
-        }
-
-        currTime_ = new double[logIndices.size()] ;
+								unsigned	int	ii	;
+
+								lg_	=	lg	;
+								startTime_	=	startTime	;
+								stopTime_	=	stopTime	;
+								logIndices_	=	logIndices	;
+								frequency_	=	frequency	;
+								frequencyMultiple_	=	1.0	;
+
+								//	If	there	is	an	external	program,	make	sure	there	is	at	least
+								//	one	log	group	other	than	the	external	one	in	logIndices
+								if	(	logIndices.size()	==	1	)	{
+																logIdx_	=	logIndices.begin()	;
+								}
+
+								eof_	=	new	bool[logIndices.size()]	;
+								for	(ii	=	0;	ii	<	logIndices.size()	;	ii++)	{
+																eof_[ii]	=	0	;
+								}
+
+								//	Allocate	a	time	idx	for	log	member
+								timeIdx_	=	new	int[logIndices.size()];
+								for	(ii	=	0;	ii	<	logIndices.size();	ii++	)	{
+																//	TODO:	get	real	time	stamp
+																//	It	is	safe	for	now	to	assume	it's
+																//	the	first	param	logged
+																timeIdx_[ii]	=	0	;
+								}
+
+								currTime_	=	new	double[logIndices.size()]	;
 }
 
 IterPreserveTime::~IterPreserveTime()
@@ -1736,201 +1736,201 @@ IterPreserveTime::~IterPreserveTime()
 }
 
 
-void IterPreserveTime::begin()
+void	IterPreserveTime::begin()
 {
-        double timeStamp;
-
-        lg_->rewind();
-
-        // Reset frequency
-        if ( frequency_ == 0.0 ) {
-                nextFrequencyCheck_ = DBL_MAX;
-        } else {
-                if ( startTime_ == 0.0 ) {
-                        nextFrequencyCheck_ = startTime_ + frequency_ ;
-                } else {
-                        nextFrequencyCheck_ = startTime_ ;
-                }
-        }
-        frequencyMultiple_ = 1.0 ;
-
-        // Need to initialize by reading in all records
-        for (logIdx_ = logIndices_.begin() ; logIdx_ != logIndices_.end() ;
-                logIdx_++) {
-
-                lg_->log[*logIdx_]->getNextRecord() ;
-        }
-
-        // If time < start time requested by user,
-        // continue marching through time until start time reached
-        timeStamp = 0.0 ;
-        while ( timeStamp < startTime_ ) {
-                (*this)++ ;
-                timeStamp = getTime();
-        }
-}
-
-bool IterPreserveTime::end()
+								double	timeStamp;
+
+								lg_->rewind();
+
+								//	Reset	frequency
+								if	(	frequency_	==	0.0	)	{
+																nextFrequencyCheck_	=	DBL_MAX;
+								}	else	{
+																if	(	startTime_	==	0.0	)	{
+																								nextFrequencyCheck_	=	startTime_	+	frequency_	;
+																}	else	{
+																								nextFrequencyCheck_	=	startTime_	;
+																}
+								}
+								frequencyMultiple_	=	1.0	;
+
+								//	Need	to	initialize	by	reading	in	all	records
+								for	(logIdx_	=	logIndices_.begin()	;	logIdx_	!=	logIndices_.end()	;
+																logIdx_++)	{
+
+																lg_->log[*logIdx_]->getNextRecord()	;
+								}
+
+								//	If	time	<	start	time	requested	by	user,
+								//	continue	marching	through	time	until	start	time	reached
+								timeStamp	=	0.0	;
+								while	(	timeStamp	<	startTime_	)	{
+																(*this)++	;
+																timeStamp	=	getTime();
+								}
+}
+
+bool	IterPreserveTime::end()
 {
-        if ( lg_->isEOF_ ) {
-                return( 1 ) ;
-        } else {
-                return( 0 ) ;
-        }
+								if	(	lg_->isEOF_	)	{
+																return(	1	)	;
+								}	else	{
+																return(	0	)	;
+								}
 }
 
-void IterPreserveTime::operator++(int) {
+void	IterPreserveTime::operator++(int)	{
 
-        // I did it this way to avoid recursion
-        // The stack got out of hand with recursion
-        while ( ! stepInTime() ) {
-        }
+								//	I	did	it	this	way	to	avoid	recursion
+								//	The	stack	got	out	of	hand	with	recursion
+								while	(	!	stepInTime()	)	{
+								}
 }
 
-// This returns minimum time stamp across all data logs
+//	This	returns	minimum	time	stamp	across	all	data	logs
 //
-// If one log has logged more data in time,
-// (i.e. one log has 100 seconds of data, another 300 seconds)
-// by default getTime() will ignore the log that has expired
-// all of its data.  Therefore, the data from the short log
-// will not force the longer to be truncated.
+//	If	one	log	has	logged	more	data	in	time,
+//	(i.e.	one	log	has	100	seconds	of	data,	another	300	seconds)
+//	by	default	getTime()	will	ignore	the	log	that	has	expired
+//	all	of	its	data.		Therefore,	the	data	from	the	short	log
+//	will	not	force	the	longer	to	be	truncated.
 //
-// In the case of error plotting, you do not want any extra
-// data points if the time stamps do not match
-double IterPreserveTime::getTime( ) {
+//	In	the	case	of	error	plotting,	you	do	not	want	any	extra
+//	data	points	if	the	time	stamps	do	not	match
+double	IterPreserveTime::getTime(	)	{
 
-        double minTime = DBL_MAX;
-        int ii = 0 ;
+								double	minTime	=	DBL_MAX;
+								int	ii	=	0	;
 
-        for (logIdx_ = logIndices_.begin() ; logIdx_ != logIndices_.end() ;
-                logIdx_++) {
+								for	(logIdx_	=	logIndices_.begin()	;	logIdx_	!=	logIndices_.end()	;
+																logIdx_++)	{
 
-                if ( ! lg_->log[*logIdx_]->isEOF() ) {
-                        currTime_[ii] = *((double *) lg_->log[*logIdx_]->
-                                                getVal(timeIdx_[ii])) ;
-                } else {
-                        currTime_[ii] = DBL_MAX ;
-                }
+																if	(	!	lg_->log[*logIdx_]->isEOF()	)	{
+																								currTime_[ii]	=	*((double	*)	lg_->log[*logIdx_]->
+																																																getVal(timeIdx_[ii]))	;
+																}	else	{
+																								currTime_[ii]	=	DBL_MAX	;
+																}
 
-                if (currTime_[ii] < minTime) {
-                        minTime = currTime_[ii];
-                }
-                ii++ ;
-        }
+																if	(currTime_[ii]	<	minTime)	{
+																								minTime	=	currTime_[ii];
+																}
+																ii++	;
+								}
 
-        return( minTime ) ;
+								return(	minTime	)	;
 }
 
-// Advance through records in each data log synchronously
+//	Advance	through	records	in	each	data	log	synchronously
 //
-// Example: If data log "A" is recorded at 1.0 second,
-// and "B" at 10 seconds.  Both will advance at time zero.
-// Then at time=1.0, log "A" will have a record read.  "B" will not be read.
-// At time=2.0 through time=9.0 the same will occur. A advances, B stays put.
-// At time=10.0, both A and B will be read from.  Both will advance.
-// This keeps the data on the same time stamp on like intervals.
+//	Example:	If	data	log	"A"	is	recorded	at	1.0	second,
+//	and	"B"	at	10	seconds.		Both	will	advance	at	time	zero.
+//	Then	at	time=1.0,	log	"A"	will	have	a	record	read.		"B"	will	not	be	read.
+//	At	time=2.0	through	time=9.0	the	same	will	occur.	A	advances,	B	stays	put.
+//	At	time=10.0,	both	A	and	B	will	be	read	from.		Both	will	advance.
+//	This	keeps	the	data	on	the	same	time	stamp	on	like	intervals.
 //
-// If A has more records than B in time, by default, read all of A's
-// data.  E.g. 'A' logged for 300 seconds,  while 'B' 100 seconds, by default
-// walk through all of A's data
-int IterPreserveTime::stepInTime() {
+//	If	A	has	more	records	than	B	in	time,	by	default,	read	all	of	A's
+//	data.		E.g.	'A'	logged	for	300	seconds,		while	'B'	100	seconds,	by	default
+//	walk	through	all	of	A's	data
+int	IterPreserveTime::stepInTime()	{
 
 
-#define DPLOG_ABS(x) ((x) < 0.0 ? -(x) : (x))
+#define	DPLOG_ABS(x)	((x)	<	0.0	?	-(x)	:	(x))
 
-#define NEXTFREQ_EQUALS_MINTIME \
-        (DPLOG_ABS(nextFrequencyCheck_ - minTime) < 0.000000001)
+#define	NEXTFREQ_EQUALS_MINTIME	\
+								(DPLOG_ABS(nextFrequencyCheck_	-	minTime)	<	0.000000001)
 
-#define NEXTFREQ_LESSTHAN_MINTIME \
-        ((nextFrequencyCheck_ - minTime < 0.0) && ! NEXTFREQ_EQUALS_MINTIME)
+#define	NEXTFREQ_LESSTHAN_MINTIME	\
+								((nextFrequencyCheck_	-	minTime	<	0.0)	&&	!	NEXTFREQ_EQUALS_MINTIME)
 
-#define NEXTFREQ_INCR \
-        frequencyMultiple_++ ; \
-        nextFrequencyCheck_ = frequencyMultiple_*frequency_ ;
+#define	NEXTFREQ_INCR	\
+								frequencyMultiple_++	;	\
+								nextFrequencyCheck_	=	frequencyMultiple_*frequency_	;
 
 
-        int ii ;
-        double minTime ;
-        int isEOF ;
-        char* rec ;
+								int	ii	;
+								double	minTime	;
+								int	isEOF	;
+								char*	rec	;
 
-        // Get all values in all data log groups
-        // Also get mininum time stamp from all log data files
-        minTime = getTime();
+								//	Get	all	values	in	all	data	log	groups
+								//	Also	get	mininum	time	stamp	from	all	log	data	files
+								minTime	=	getTime();
 
-        // Take a step through time (sounds like a song)
-        // Check for EOF along the way
-        isEOF = 1 ;
-        ii = 0 ;
-        for (logIdx_ = logIndices_.begin() ; logIdx_ != logIndices_.end() ;
-                logIdx_++) {
-                if (currTime_[ii] == minTime ) {
+								//	Take	a	step	through	time	(sounds	like	a	song)
+								//	Check	for	EOF	along	the	way
+								isEOF	=	1	;
+								ii	=	0	;
+								for	(logIdx_	=	logIndices_.begin()	;	logIdx_	!=	logIndices_.end()	;
+																logIdx_++)	{
+																if	(currTime_[ii]	==	minTime	)	{
 
-                        rec = lg_->log[*logIdx_]->getNextRecord() ;
-                        if (rec) {
-                                isEOF = 0 ;
-                        }
-                }
-                ii++ ;
-        }
-        if (isEOF) {
-                lg_->isEOF_ = 1 ;
-                return(1) ;
-        }
+																								rec	=	lg_->log[*logIdx_]->getNextRecord()	;
+																								if	(rec)	{
+																																isEOF	=	0	;
+																								}
+																}
+																ii++	;
+								}
+								if	(isEOF)	{
+																lg_->isEOF_	=	1	;
+																return(1)	;
+								}
 
-        // Now that a time step has occured
-        // Get the new mininum time stamp and associated
-        // values from all log data files
-        minTime = getTime();
+								//	Now	that	a	time	step	has	occured
+								//	Get	the	new	mininum	time	stamp	and	associated
+								//	values	from	all	log	data	files
+								minTime	=	getTime();
 
-        // Step depending on frequency
-        if (minTime <= stopTime_) {
+								//	Step	depending	on	frequency
+								if	(minTime	<=	stopTime_)	{
 
-                // Handle Frequency (if specified)
-                if ( nextFrequencyCheck_ != DBL_MAX ) {
+																//	Handle	Frequency	(if	specified)
+																if	(	nextFrequencyCheck_	!=	DBL_MAX	)	{
 
-                        if ( NEXTFREQ_EQUALS_MINTIME ) {
+																								if	(	NEXTFREQ_EQUALS_MINTIME	)	{
 
-                                // Frequency synced with a data point
-                                // Stops recursion
-                                NEXTFREQ_INCR ;
+																																//	Frequency	synced	with	a	data	point
+																																//	Stops	recursion
+																																NEXTFREQ_INCR	;
 
-                        } else if ( minTime - nextFrequencyCheck_ > 0 ) {
+																								}	else	if	(	minTime	-	nextFrequencyCheck_	>	0	)	{
 
-                                // Mintime exceeded nextFreqCheck
-                                // Frequency must be higher than
-                                // data frequency
+																																//	Mintime	exceeded	nextFreqCheck
+																																//	Frequency	must	be	higher	than
+																																//	data	frequency
 
-                                // Bump nextFrequencyCheck past minTime
-                                while ( NEXTFREQ_LESSTHAN_MINTIME ) {
+																																//	Bump	nextFrequencyCheck	past	minTime
+																																while	(	NEXTFREQ_LESSTHAN_MINTIME	)	{
 
-                                        NEXTFREQ_INCR ;
-                                }
+																																								NEXTFREQ_INCR	;
+																																}
 
-                                if ( NEXTFREQ_EQUALS_MINTIME ) {
+																																if	(	NEXTFREQ_EQUALS_MINTIME	)	{
 
-                                       // We synced
-                                       NEXTFREQ_INCR ;
+																																							//	We	synced
+																																							NEXTFREQ_INCR	;
 
-                                } else {
+																																}	else	{
 
-                                        // No sync, keep iterating through data
-                                        return(0);
-                                }
-                        } else {
+																																								//	No	sync,	keep	iterating	through	data
+																																								return(0);
+																																}
+																								}	else	{
 
-                                // Mintime is less than nextFreq check
-                                // Need to iterate again
-                                return(0) ;
-                        }
-                }
-        }
+																																//	Mintime	is	less	than	nextFreq	check
+																																//	Need	to	iterate	again
+																																return(0)	;
+																								}
+																}
+								}
 
-        if (minTime > stopTime_) {
-                lg_->isEOF_ = 1 ;
-                return(1) ;
-        }
+								if	(minTime	>	stopTime_)	{
+																lg_->isEOF_	=	1	;
+																return(1)	;
+								}
 
-        // Tells caller that time step did indeed occur
-        return(1) ;
+								//	Tells	caller	that	time	step	did	indeed	occur
+								return(1)	;
 }
diff --git a/trick_source/data_products/Log/multiLog.cpp b/trick_source/data_products/Log/multiLog.cpp
index f352a973a..8bdc4a75a 100644
--- a/trick_source/data_products/Log/multiLog.cpp
+++ b/trick_source/data_products/Log/multiLog.cpp
@@ -1,203 +1,203 @@
-#include <stdio.h>
-#include <string.h>
-#include "log.h"
+#include	<stdio.h>
+#include	<string.h>
+#include	"log.h"
 
-// For DBL_MIN, DBL_MAX defs
-#include <float.h>
+//	For	DBL_MIN,	DBL_MAX	defs
+#include	<float.h>
 
 /**
- * LogMultiGroup constructor
- */
-LogMultiGroup::LogMultiGroup( vector<string>& runDirs ) {
+	*	LogMultiGroup	constructor
+	*/
+LogMultiGroup::LogMultiGroup(	vector<string>&	runDirs	)	{
 
-        char* path ;
+								char*	path	;
 
-        path = new char[1024] ;
+								path	=	new	char[1024]	;
 
-        vector < string >::const_iterator run;
-        for (run = runDirs.begin(); run != runDirs.end() ; run++) {
-                strcpy(path, (*run).c_str());
-                LogGroup* lg = new LogGroup(path) ;
-                logGroups_.push_back(lg);
-        }
+								vector	<	string	>::const_iterator	run;
+								for	(run	=	runDirs.begin();	run	!=	runDirs.end()	;	run++)	{
+																strcpy(path,	(*run).c_str());
+																LogGroup*	lg	=	new	LogGroup(path)	;
+																logGroups_.push_back(lg);
+								}
 
-        delete[] path ;
-} ;
+								delete[]	path	;
+}	;
 
 /**
- * LogMultiGroup destructor
- */
-LogMultiGroup::~LogMultiGroup( )
+	*	LogMultiGroup	destructor
+	*/
+LogMultiGroup::~LogMultiGroup(	)
 {
 
-        vector < LogGroup* >::const_iterator lg;
-        for (lg = logGroups_.begin(); lg != logGroups_.end() ; lg++) {
-                delete *lg ;
-        }
+								vector	<	LogGroup*	>::const_iterator	lg;
+								for	(lg	=	logGroups_.begin();	lg	!=	logGroups_.end()	;	lg++)	{
+																delete	*lg	;
+								}
 
-} ;
+}	;
 
 
 
 /**
- * Iterate over log groups constructor
- */
-IterOverLogGroups::IterOverLogGroups( LogMultiGroup* lmg,
-                                      vector<string>& runs,
-                                      vector<string>& paramNames )
+	*	Iterate	over	log	groups	constructor
+	*/
+IterOverLogGroups::IterOverLogGroups(	LogMultiGroup*	lmg,
+																																						vector<string>&	runs,
+																																						vector<string>&	paramNames	)
 {
-        int found ;
-        string runDirName ;
-        int tIdx, tLogIdx ;
-        int vIdx, vLogIdx ;
-
-        lmg_ = lmg ;
-
-        // Mapping from log group to an array of log indices
-        map< LogGroup*, set< int > > lg2log ;
-
-        vector < LogGroup* >::const_iterator lg;
-        vector < string >::const_iterator ss;
-        set < int >::const_iterator ii ;
-
-        // Make list of log groups to iterate over
-        // Go ahead and convert to doubles as well
-        int idx = 0 ;
-        for (lg = lmg->logGroups_.begin(); lg != lmg->logGroups_.end(); lg++) {
-
-                (*lg)->convertToDoubleYes();
-
-                runDirName = (*lg)->getDataDir() ;
-                for (ss = runs.begin(); ss != runs.end(); ss++ ) {
-                        if ( runDirName == *ss ) {
-                                iterLogGroups_.push_back(*lg);
-                                runDirName2lg_[*ss] = *lg ;
-                                runDirName2runIdx_[*ss] = idx ;
-                                break ;
-                        }
-                }
-
-                idx++ ;
-        }
-
-        // Foreach log group, we need a log and param idx list per param
-        for (lg = iterLogGroups_.begin(); lg != iterLogGroups_.end(); lg++) {
-
-                set< int > logIndices ;
-
-                for (ss = paramNames.begin(); ss != paramNames.end(); ss++ ) {
-
-                        (*lg)->getParamIdx( "sys.exec.out.time",
-                                            &tIdx, &tLogIdx,
-                                            (*ss).c_str(),
-                                            &vIdx, &vLogIdx ) ;
-
-                        ParamIdx* pi = new ParamIdx ;
-                        pi->logIdx = vLogIdx ;
-                        pi->varIdx = vIdx ;
-                        paramMap_[*ss] = pi;
-
-                        // Keep list of log data sets with this group
-                        // Weed out duplicates
-                        found = 0 ;
-                        for (ii = logIndices.begin();
-                                 ii != logIndices.end(); ii++ ) {
-
-                                if (vLogIdx == *ii) {
-                                        found = 1 ;
-                                        break ;
-                                }
-                        }
-                        if (!found) {
-                                logIndices.insert(vLogIdx);
-                        }
-
-                }
-
-                // Map this log group to its log data sets indices
-                lg2log[(*lg)] = logIndices ;
-
-                runs_.push_back(paramMap_) ;
-        }
-
-        // Make list of iterators for iterating over each log group
-        LogGroup* key ;
-        vector < int > val ;
-        map < LogGroup*, set< int > >::const_iterator ll;
-        listLogGroupIterators_.reserve(listLogGroupIterators_.size()
-                                       + lg2log.size());
-        for (ll = lg2log.begin(); ll != lg2log.end(); ll++) {
-
-                key = (*ll).first ;
-
-                IterPreserveTime* iter = new IterPreserveTime(
-                                                key,
-                                                lg2log[key],
-                                                0.0, 0.0, DBL_MAX ) ;
-
-                listLogGroupIterators_.push_back(iter);
-        }
+								int	found	;
+								string	runDirName	;
+								int	tIdx,	tLogIdx	;
+								int	vIdx,	vLogIdx	;
+
+								lmg_	=	lmg	;
+
+								//	Mapping	from	log	group	to	an	array	of	log	indices
+								map<	LogGroup*,	set<	int	>	>	lg2log	;
+
+								vector	<	LogGroup*	>::const_iterator	lg;
+								vector	<	string	>::const_iterator	ss;
+								set	<	int	>::const_iterator	ii	;
+
+								//	Make	list	of	log	groups	to	iterate	over
+								//	Go	ahead	and	convert	to	doubles	as	well
+								int	idx	=	0	;
+								for	(lg	=	lmg->logGroups_.begin();	lg	!=	lmg->logGroups_.end();	lg++)	{
+
+																(*lg)->convertToDoubleYes();
+
+																runDirName	=	(*lg)->getDataDir()	;
+																for	(ss	=	runs.begin();	ss	!=	runs.end();	ss++	)	{
+																								if	(	runDirName	==	*ss	)	{
+																																iterLogGroups_.push_back(*lg);
+																																runDirName2lg_[*ss]	=	*lg	;
+																																runDirName2runIdx_[*ss]	=	idx	;
+																																break	;
+																								}
+																}
+
+																idx++	;
+								}
+
+								//	Foreach	log	group,	we	need	a	log	and	param	idx	list	per	param
+								for	(lg	=	iterLogGroups_.begin();	lg	!=	iterLogGroups_.end();	lg++)	{
+
+																set<	int	>	logIndices	;
+
+																for	(ss	=	paramNames.begin();	ss	!=	paramNames.end();	ss++	)	{
+
+																								(*lg)->getParamIdx(	"sys.exec.out.time",
+																																												&tIdx,	&tLogIdx,
+																																												(*ss).c_str(),
+																																												&vIdx,	&vLogIdx	)	;
+
+																								ParamIdx*	pi	=	new	ParamIdx	;
+																								pi->logIdx	=	vLogIdx	;
+																								pi->varIdx	=	vIdx	;
+																								paramMap_[*ss]	=	pi;
+
+																								//	Keep	list	of	log	data	sets	with	this	group
+																								//	Weed	out	duplicates
+																								found	=	0	;
+																								for	(ii	=	logIndices.begin();
+																																	ii	!=	logIndices.end();	ii++	)	{
+
+																																if	(vLogIdx	==	*ii)	{
+																																								found	=	1	;
+																																								break	;
+																																}
+																								}
+																								if	(!found)	{
+																																logIndices.insert(vLogIdx);
+																								}
+
+																}
+
+																//	Map	this	log	group	to	its	log	data	sets	indices
+																lg2log[(*lg)]	=	logIndices	;
+
+																runs_.push_back(paramMap_)	;
+								}
+
+								//	Make	list	of	iterators	for	iterating	over	each	log	group
+								LogGroup*	key	;
+								vector	<	int	>	val	;
+								map	<	LogGroup*,	set<	int	>	>::const_iterator	ll;
+								listLogGroupIterators_.reserve(listLogGroupIterators_.size()
+																																							+	lg2log.size());
+								for	(ll	=	lg2log.begin();	ll	!=	lg2log.end();	ll++)	{
+
+																key	=	(*ll).first	;
+
+																IterPreserveTime*	iter	=	new	IterPreserveTime(
+																																																key,
+																																																lg2log[key],
+																																																0.0,	0.0,	DBL_MAX	)	;
+
+																listLogGroupIterators_.push_back(iter);
+								}
 }
 
 IterOverLogGroups::~IterOverLogGroups()
 {
 }
 
-// For each log group: set log group to begin()
-void IterOverLogGroups::begin()
+//	For	each	log	group:	set	log	group	to	begin()
+void	IterOverLogGroups::begin()
 {
 
-        vector< LogGroup* >::const_iterator lg ;
+								vector<	LogGroup*	>::const_iterator	lg	;
 
-        for (lg = iterLogGroups_.begin(); lg != iterLogGroups_.end(); lg++) {
+								for	(lg	=	iterLogGroups_.begin();	lg	!=	iterLogGroups_.end();	lg++)	{
 
-                (*lg)->begin();
-        }
+																(*lg)->begin();
+								}
 }
 
-// Finished iterating on all log groups in multigroup?
-bool IterOverLogGroups::end()
+//	Finished	iterating	on	all	log	groups	in	multigroup?
+bool	IterOverLogGroups::end()
 {
-        int end = 1 ;
-        vector< LogGroup* >::const_iterator lg ;
+								int	end	=	1	;
+								vector<	LogGroup*	>::const_iterator	lg	;
 
-        for (lg = iterLogGroups_.begin(); lg != iterLogGroups_.end(); lg++) {
-                if ( ! (*lg)->end() ) {
-                        end = 0 ;
-                        break ;
-                }
-        }
+								for	(lg	=	iterLogGroups_.begin();	lg	!=	iterLogGroups_.end();	lg++)	{
+																if	(	!	(*lg)->end()	)	{
+																								end	=	0	;
+																								break	;
+																}
+								}
 
-        return( end ) ;
+								return(	end	)	;
 }
 
-// Increment list of iterators which operate on each log group
-void IterOverLogGroups::operator++(int)
+//	Increment	list	of	iterators	which	operate	on	each	log	group
+void	IterOverLogGroups::operator++(int)
 {
 
-        static vector < IterPreserveTime* >::const_iterator ili ;
+								static	vector	<	IterPreserveTime*	>::const_iterator	ili	;
 
-        for (ili = listLogGroupIterators_.begin();
-                 ili != listLogGroupIterators_.end(); ili++) {
+								for	(ili	=	listLogGroupIterators_.begin();
+																	ili	!=	listLogGroupIterators_.end();	ili++)	{
 
-                // *ili is an element of list of iterators...
-                // *(*ili) is the iterator to iterate  --- Confusing!
-                (*(*ili))++ ;
-        }
+																//	*ili	is	an	element	of	list	of	iterators...
+																//	*(*ili)	is	the	iterator	to	iterate		---	Confusing!
+																(*(*ili))++	;
+								}
 }
 
-double IterOverLogGroups::getVal(string runName, string paramName)
+double	IterOverLogGroups::getVal(string	runName,	string	paramName)
 {
-        static LogGroup* lg ;
-        static int logIdx ;
-        static int varIdx ;
-        static int runIdx ;
+								static	LogGroup*	lg	;
+								static	int	logIdx	;
+								static	int	varIdx	;
+								static	int	runIdx	;
 
 
-        lg     = runDirName2lg_[runName] ;
-        runIdx = runDirName2runIdx_[runName] ;
-        logIdx = runs_[runIdx][paramName]->logIdx ;
-        varIdx = runs_[runIdx][paramName]->varIdx ;
+								lg					=	runDirName2lg_[runName]	;
+								runIdx	=	runDirName2runIdx_[runName]	;
+								logIdx	=	runs_[runIdx][paramName]->logIdx	;
+								varIdx	=	runs_[runIdx][paramName]->varIdx	;
 
-        return( *((double *) lg->log[logIdx]->getVal(varIdx)) ) ;
+								return(	*((double	*)	lg->log[logIdx]->getVal(varIdx))	)	;
 }
diff --git a/trick_source/data_products/Log/parseLogHeader.cpp b/trick_source/data_products/Log/parseLogHeader.cpp
index 55f0db18f..701ed1bf3 100644
--- a/trick_source/data_products/Log/parseLogHeader.cpp
+++ b/trick_source/data_products/Log/parseLogHeader.cpp
@@ -1,191 +1,191 @@
 /**
-    Used to parse a Trick log header file, and load info for Log Classes
-    @author Keith Vetter
-    @version May 2002
+				Used	to	parse	a	Trick	log	header	file,	and	load	info	for	Log	Classes
+				@author	Keith	Vetter
+				@version	May	2002
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <unistd.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<ctype.h>
+#include	<unistd.h>
 
-#include "log.h"
+#include	"log.h"
 
-#include "trick/units_conv.h"
-#include "trick/map_trick_units_to_udunits.hh"
+#include	"trick/units_conv.h"
+#include	"trick/map_trick_units_to_udunits.hh"
 
-// index labels for char arrays
-enum strIndex {
-        LINE,
-        STR1,
-        STR2,
-        STR3,
-        STR4,
-        NUM_STR
+//	index	labels	for	char	arrays
+enum	strIndex	{
+								LINE,
+								STR1,
+								STR2,
+								STR3,
+								STR4,
+								NUM_STR
 };
 
-// helper function to free memory before successful or unsuccessful return
-void shutdown(FILE*, char**, char*);
+//	helper	function	to	free	memory	before	successful	or	unsuccessful	return
+void	shutdown(FILE*,	char**,	char*);
 
-/* A private function for parsing log header files.
- * This is responsible for initialize the Log classes as well
- */
-int LogGroup::parseLogHeaders()
+/*	A	private	function	for	parsing	log	header	files.
+	*	This	is	responsible	for	initialize	the	Log	classes	as	well
+	*/
+int	LogGroup::parseLogHeaders()
 {
 
-        int nVars;
-        int lineNum;
-        char** strs = new char*[NUM_STR];
-        char *headerName;
-        int i;
-        int headerSize;
-        int len;
-
-        LogData *currLogData = 0;
-        Var *currVar;
-
-
-        // Foreach log header
-        for (i = 0; i < nHeaders_; i++) {
-
-                // Allocate headerName
-                len = strlen(pathToBinaryData_) + strlen(headers_[i]) + 2;
-                headerName = new char[len];
-
-                // Full path of log header
-                snprintf(headerName, len, "%s/%s", pathToBinaryData_, headers_[i]);
-
-                // Open log header
-                if ((fp_ = fopen(headerName, "r")) == NULL) {
-                        fprintf(stderr,
-                                "\nERROR:\nCouldn't open file \"%s\" \n",
-                                headerName);
-                        delete[] strs;
-                        delete[] headerName;
-                        return (-1);
-                }
-                // Allocate strings, we know that buffers can't be
-                // longer than file!
-                // Since headers are typically small, allocate them at ]
-                // the header size
-                fseek(fp_, 0, SEEK_END);
-                headerSize = ftell(fp_);
-                ::rewind(fp_);
-                for(int i = 0; i < NUM_STR; i++){
-                        strs[i] = new char[headerSize + 1]; // Not sure about +1 :)
-                }
-
-                // Parse rest of file
-                lineNum = 0;
-                while (fgets(strs[LINE], headerSize, fp_) != NULL) {
-
-                        lineNum++;
-
-                        /* <log_file_name> <data_type> <units>    <param_name>
-                           or
-                           <log_file_name>  byte_order    is   [lit|big]_endian
-                         */
-                        if ( sscanf(strs[LINE], "%s %s %s %s", strs[STR1], strs[STR2], strs[STR3], strs[STR4]) == 4 ) {
-
-                                // Byte order statement and top of a log group?
-                                if (!strcmp(strs[STR2], "byte_order")) {
-
-                                        LogData *ld = new LogData;
-                                        log.push_back(ld);
-                                        currLogData = log[nGroups_];
-                                        nGroups_++;
-
-                                        // New binary file
-                                        currLogData->setBinaryFileName(strs[STR1]);
-
-                                        // Set byte order
-                                        if (!strcmp(strs[STR4], "big_endian")) {
-                                                currLogData->dataByteOrder = 1;
-                                        } else {
-                                                currLogData->dataByteOrder = 0;
-                                        }
-
-                                        continue;
-                                }
-                                // Check for binary file name mismatches
-                                if (currLogData && strcmp(strs[STR1], currLogData->getBinaryFileName())) {
-                                        printf("ERROR: Parsing log header \"%s\".\n"
-                                               "       Line %d. Binary file name "
-                                               "mismatch with \"%s\".\n"
-                                               "       May need little/big endian "
-                                               "specification.\n\n",
-                                               headerName, lineNum,
-                                               currLogData->getBinaryFileName());
-                                        shutdown(fp_, strs, headerName);
-                                        return (-1);
-                                }
-                                // New variable
-                                Var *v = new Var;
-                                currLogData->vars.push_back(v);
-                                nVars = currLogData->getNumVars();
-                                currVar = currLogData->vars[nVars];
-                                nVars++;
-                                currLogData->setNumVars(nVars);
-
-                                // Set Type
-                                if (currVar->setType(strs[STR2]) < 0) {
-                                        printf("ERROR: In log header \"%s\".\n"
-                                               "       Line %d. Type \"%s\" is "
-                                               "not supported.\n",
-                                               headerName, lineNum, strs[STR2]);
-                                        shutdown(fp_, strs, headerName);
-                                        return (-1);
-                                }
-
-                                // For Release-07 we need to convert the old unit specs by
-                                // adding explicit asterisk for multiplication. )
-                                {
-                                        char new_units_spec[100];
-                                        new_units_spec[0] = 0;
-                                        if ( convert_units_spec (strs[STR3], new_units_spec) != 0 ) {
-                                                printf (" ERROR: Attempt to convert old units-spec, \"%s\" failed.\n\n",strs[STR3]);
-                                                shutdown(fp_, strs, headerName);
-
-                                                return (-1);
-                                        }
-                                        delete [] strs[STR3];
-                                        len = strlen(new_units_spec);
-                                        strs[STR3] = new char[len + 1] ;
-                                        strcpy(strs[STR3], new_units_spec);
-                                }
-
-                                // Initialize Unit class
-                                if ( ! strcmp(strs[STR3],"--")) {
-                                    currVar->setUnit(strs[STR3]);
-                                } else {
-                                    currVar->setUnit(map_trick_units_to_udunits(strs[STR3]));
-                                }
-
-                                // Set Var Name
-                                currVar->setVarName(strs[STR4]) ;
-                                if (currVar->getSize() < 0) {
-                                        printf("ERROR: In log header \"%s\".\n"
-                                               "       Line %d. Problem with var "
-                                               "name \"%s\" . \n",
-                                               headerName, lineNum, strs[STR4]);
-                                        shutdown(fp_, strs, headerName);
-                                        return (-1);
-                                }
-                        }
-                }
-        shutdown(fp_, strs, headerName);
-        }
-        delete[] strs;
-        return 1;
+								int	nVars;
+								int	lineNum;
+								char**	strs	=	new	char*[NUM_STR];
+								char	*headerName;
+								int	i;
+								int	headerSize;
+								int	len;
+
+								LogData	*currLogData	=	0;
+								Var	*currVar;
+
+
+								//	Foreach	log	header
+								for	(i	=	0;	i	<	nHeaders_;	i++)	{
+
+																//	Allocate	headerName
+																len	=	strlen(pathToBinaryData_)	+	strlen(headers_[i])	+	2;
+																headerName	=	new	char[len];
+
+																//	Full	path	of	log	header
+																snprintf(headerName,	len,	"%s/%s",	pathToBinaryData_,	headers_[i]);
+
+																//	Open	log	header
+																if	((fp_	=	fopen(headerName,	"r"))	==	NULL)	{
+																								fprintf(stderr,
+																																"\nERROR:\nCouldn't	open	file	\"%s\"	\n",
+																																headerName);
+																								delete[]	strs;
+																								delete[]	headerName;
+																								return	(-1);
+																}
+																//	Allocate	strings,	we	know	that	buffers	can't	be
+																//	longer	than	file!
+																//	Since	headers	are	typically	small,	allocate	them	at	]
+																//	the	header	size
+																fseek(fp_,	0,	SEEK_END);
+																headerSize	=	ftell(fp_);
+																::rewind(fp_);
+																for(int	i	=	0;	i	<	NUM_STR;	i++){
+																								strs[i]	=	new	char[headerSize	+	1];	//	Not	sure	about	+1	:)
+																}
+
+																//	Parse	rest	of	file
+																lineNum	=	0;
+																while	(fgets(strs[LINE],	headerSize,	fp_)	!=	NULL)	{
+
+																								lineNum++;
+
+																								/*	<log_file_name>	<data_type>	<units>				<param_name>
+																											or
+																											<log_file_name>		byte_order				is			[lit|big]_endian
+																									*/
+																								if	(	sscanf(strs[LINE],	"%s	%s	%s	%s",	strs[STR1],	strs[STR2],	strs[STR3],	strs[STR4])	==	4	)	{
+
+																																//	Byte	order	statement	and	top	of	a	log	group?
+																																if	(!strcmp(strs[STR2],	"byte_order"))	{
+
+																																								LogData	*ld	=	new	LogData;
+																																								log.push_back(ld);
+																																								currLogData	=	log[nGroups_];
+																																								nGroups_++;
+
+																																								//	New	binary	file
+																																								currLogData->setBinaryFileName(strs[STR1]);
+
+																																								//	Set	byte	order
+																																								if	(!strcmp(strs[STR4],	"big_endian"))	{
+																																																currLogData->dataByteOrder	=	1;
+																																								}	else	{
+																																																currLogData->dataByteOrder	=	0;
+																																								}
+
+																																								continue;
+																																}
+																																//	Check	for	binary	file	name	mismatches
+																																if	(currLogData	&&	strcmp(strs[STR1],	currLogData->getBinaryFileName()))	{
+																																								printf("ERROR:	Parsing	log	header	\"%s\".\n"
+																																															"							Line	%d.	Binary	file	name	"
+																																															"mismatch	with	\"%s\".\n"
+																																															"							May	need	little/big	endian	"
+																																															"specification.\n\n",
+																																															headerName,	lineNum,
+																																															currLogData->getBinaryFileName());
+																																								shutdown(fp_,	strs,	headerName);
+																																								return	(-1);
+																																}
+																																//	New	variable
+																																Var	*v	=	new	Var;
+																																currLogData->vars.push_back(v);
+																																nVars	=	currLogData->getNumVars();
+																																currVar	=	currLogData->vars[nVars];
+																																nVars++;
+																																currLogData->setNumVars(nVars);
+
+																																//	Set	Type
+																																if	(currVar->setType(strs[STR2])	<	0)	{
+																																								printf("ERROR:	In	log	header	\"%s\".\n"
+																																															"							Line	%d.	Type	\"%s\"	is	"
+																																															"not	supported.\n",
+																																															headerName,	lineNum,	strs[STR2]);
+																																								shutdown(fp_,	strs,	headerName);
+																																								return	(-1);
+																																}
+
+																																//	For	Release-07	we	need	to	convert	the	old	unit	specs	by
+																																//	adding	explicit	asterisk	for	multiplication.	)
+																																{
+																																								char	new_units_spec[100];
+																																								new_units_spec[0]	=	0;
+																																								if	(	convert_units_spec	(strs[STR3],	new_units_spec)	!=	0	)	{
+																																																printf	("	ERROR:	Attempt	to	convert	old	units-spec,	\"%s\"	failed.\n\n",strs[STR3]);
+																																																shutdown(fp_,	strs,	headerName);
+
+																																																return	(-1);
+																																								}
+																																								delete	[]	strs[STR3];
+																																								len	=	strlen(new_units_spec);
+																																								strs[STR3]	=	new	char[len	+	1]	;
+																																								strcpy(strs[STR3],	new_units_spec);
+																																}
+
+																																//	Initialize	Unit	class
+																																if	(	!	strcmp(strs[STR3],"--"))	{
+																																				currVar->setUnit(strs[STR3]);
+																																}	else	{
+																																				currVar->setUnit(map_trick_units_to_udunits(strs[STR3]));
+																																}
+
+																																//	Set	Var	Name
+																																currVar->setVarName(strs[STR4])	;
+																																if	(currVar->getSize()	<	0)	{
+																																								printf("ERROR:	In	log	header	\"%s\".\n"
+																																															"							Line	%d.	Problem	with	var	"
+																																															"name	\"%s\"	.	\n",
+																																															headerName,	lineNum,	strs[STR4]);
+																																								shutdown(fp_,	strs,	headerName);
+																																								return	(-1);
+																																}
+																								}
+																}
+								shutdown(fp_,	strs,	headerName);
+								}
+								delete[]	strs;
+								return	1;
 }
 
-void shutdown (FILE* fp_, char** strs, char* headerName) {
-        fclose(fp_);
-        for(int i = 0; i < NUM_STR; i++) {
-                delete[] strs[i];
-        }
-        delete[] headerName;
+void	shutdown	(FILE*	fp_,	char**	strs,	char*	headerName)	{
+								fclose(fp_);
+								for(int	i	=	0;	i	<	NUM_STR;	i++)	{
+																delete[]	strs[i];
+								}
+								delete[]	headerName;
 }
diff --git a/trick_source/data_products/Log/trick_byteswap.cpp b/trick_source/data_products/Log/trick_byteswap.cpp
index c82ff94de..dc692ba6c 100644
--- a/trick_source/data_products/Log/trick_byteswap.cpp
+++ b/trick_source/data_products/Log/trick_byteswap.cpp
@@ -1,136 +1,136 @@
 /*
 PURPOSE:
-     (Routines for swapping byte order.  Borrowed from ISP.)
+					(Routines	for	swapping	byte	order.		Borrowed	from	ISP.)
 REFERENCE:
-     ((None))
-ASSUMPTIONS AND LIMITATIONS:
-     ((None))
+					((None))
+ASSUMPTIONS	AND	LIMITATIONS:
+					((None))
 CLASS:
-     (N/A)
-LIBRARY DEPENDENCY:
-    ((trick_byteswap.o))
+					(N/A)
+LIBRARY	DEPENDENCY:
+				((trick_byteswap.o))
 PROGRAMMERS:
-     (((Jane B. Falgout) (LinCom) (08 May 98) (--) (generic HC)))
+					(((Jane	B.	Falgout)	(LinCom)	(08	May	98)	(--)	(generic	HC)))
 */
 
 
-/* (note from ISP developers)
- * Normally this routine would just zip through the double a byte
- * at a time and reassign them, but the optimizing compiler on the
- * alpha core dumps on this file, after many iterations this "reloading"
- * of bytes into the "output" double works with the alpha
- */
+/*	(note	from	ISP	developers)
+	*	Normally	this	routine	would	just	zip	through	the	double	a	byte
+	*	at	a	time	and	reassign	them,	but	the	optimizing	compiler	on	the
+	*	alpha	core	dumps	on	this	file,	after	many	iterations	this	"reloading"
+	*	of	bytes	into	the	"output"	double	works	with	the	alpha
+	*/
 
-#include "trick_byteswap.h"
+#include	"trick_byteswap.h"
 
-extern "C" {
+extern	"C"	{
 
-long long trick_byteswap_long_long(       /* RETURN: -- swapped byte */
-                 long long input)         /* IN: -- bytes to be swapped */
+long	long	trick_byteswap_long_long(							/*	RETURN:	--	swapped	byte	*/
+																	long	long	input)									/*	IN:	--	bytes	to	be	swapped	*/
 {
 
-       long long output;
-       unsigned char *out = (unsigned char *)&output;
+							long	long	output;
+							unsigned	char	*out	=	(unsigned	char	*)&output;
 
-       *(((unsigned char *)&output)    ) = *(((unsigned char *)&input) + 7);
-       *(((unsigned char *)&output) + 1) = *( ((unsigned char *)&input) + 6);
-       *(((unsigned char *)&output) + 2) = *( ((unsigned char *)&input) + 5);
-       *(((unsigned char *)&output) + 3) = *( ((unsigned char *)&input) + 4);
+							*(((unsigned	char	*)&output)				)	=	*(((unsigned	char	*)&input)	+	7);
+							*(((unsigned	char	*)&output)	+	1)	=	*(	((unsigned	char	*)&input)	+	6);
+							*(((unsigned	char	*)&output)	+	2)	=	*(	((unsigned	char	*)&input)	+	5);
+							*(((unsigned	char	*)&output)	+	3)	=	*(	((unsigned	char	*)&input)	+	4);
 
-       out += 4;
-       *(((unsigned char *)out)    ) = *(((unsigned char *)&input) + 3);
-       *(((unsigned char *)out) + 1) = *(((unsigned char *)&input) + 2);
-       *(((unsigned char *)out) + 2) = *(((unsigned char *)&input) + 1);
-       *(((unsigned char *)out) + 3) = *(((unsigned char *)&input)    );
+							out	+=	4;
+							*(((unsigned	char	*)out)				)	=	*(((unsigned	char	*)&input)	+	3);
+							*(((unsigned	char	*)out)	+	1)	=	*(((unsigned	char	*)&input)	+	2);
+							*(((unsigned	char	*)out)	+	2)	=	*(((unsigned	char	*)&input)	+	1);
+							*(((unsigned	char	*)out)	+	3)	=	*(((unsigned	char	*)&input)				);
 
-       return(output);
+							return(output);
 }
 
-double trick_byteswap_double(       /* RETURN: -- swapped byte */
-                 double input)      /* IN: -- bytes to be swapped */
+double	trick_byteswap_double(							/*	RETURN:	--	swapped	byte	*/
+																	double	input)						/*	IN:	--	bytes	to	be	swapped	*/
 {
 
-       double output;
-       unsigned char *out = (unsigned char *)&output;
+							double	output;
+							unsigned	char	*out	=	(unsigned	char	*)&output;
 
-       *(((unsigned char *)&output)    ) = *(((unsigned char *)&input) + 7);
-       *(((unsigned char *)&output) + 1) = *( ((unsigned char *)&input) + 6);
-       *(((unsigned char *)&output) + 2) = *( ((unsigned char *)&input) + 5);
-       *(((unsigned char *)&output) + 3) = *( ((unsigned char *)&input) + 4);
+							*(((unsigned	char	*)&output)				)	=	*(((unsigned	char	*)&input)	+	7);
+							*(((unsigned	char	*)&output)	+	1)	=	*(	((unsigned	char	*)&input)	+	6);
+							*(((unsigned	char	*)&output)	+	2)	=	*(	((unsigned	char	*)&input)	+	5);
+							*(((unsigned	char	*)&output)	+	3)	=	*(	((unsigned	char	*)&input)	+	4);
 
-       out += 4;
-       *(((unsigned char *)out)    ) = *(((unsigned char *)&input) + 3);
-       *(((unsigned char *)out) + 1) = *(((unsigned char *)&input) + 2);
-       *(((unsigned char *)out) + 2) = *(((unsigned char *)&input) + 1);
-       *(((unsigned char *)out) + 3) = *(((unsigned char *)&input)    );
+							out	+=	4;
+							*(((unsigned	char	*)out)				)	=	*(((unsigned	char	*)&input)	+	3);
+							*(((unsigned	char	*)out)	+	1)	=	*(((unsigned	char	*)&input)	+	2);
+							*(((unsigned	char	*)out)	+	2)	=	*(((unsigned	char	*)&input)	+	1);
+							*(((unsigned	char	*)out)	+	3)	=	*(((unsigned	char	*)&input)				);
 
-       return(output);
+							return(output);
 }
 
-float trick_byteswap_float(       /* RETURN: -- swapped bytes */
-                float input)      /* IN: -- bytes to be swapped */
+float	trick_byteswap_float(							/*	RETURN:	--	swapped	bytes	*/
+																float	input)						/*	IN:	--	bytes	to	be	swapped	*/
 {
-       float output;
+							float	output;
 
-       *(((unsigned char *)&output)    ) = *(((unsigned char *)&input) + 3);
-       *(((unsigned char *)&output) + 1) = *(((unsigned char *)&input) + 2);
-       *(((unsigned char *)&output) + 2) = *(((unsigned char *)&input) + 1);
-       *(((unsigned char *)&output) + 3) = *(((unsigned char *)&input));
+							*(((unsigned	char	*)&output)				)	=	*(((unsigned	char	*)&input)	+	3);
+							*(((unsigned	char	*)&output)	+	1)	=	*(((unsigned	char	*)&input)	+	2);
+							*(((unsigned	char	*)&output)	+	2)	=	*(((unsigned	char	*)&input)	+	1);
+							*(((unsigned	char	*)&output)	+	3)	=	*(((unsigned	char	*)&input));
 
-       return(output);
+							return(output);
 }
 
-long trick_byteswap_long(         /* RETURN: -- swapped byte */
-                 long input)      /* IN: -- bytes to be swapped */
+long	trick_byteswap_long(									/*	RETURN:	--	swapped	byte	*/
+																	long	input)						/*	IN:	--	bytes	to	be	swapped	*/
 {
 
-       long output;
-       unsigned char *out = (unsigned char *)&output;
-
-       if (sizeof(long) == 4) {
-               /* long is 4 bytes */
-               *(((unsigned char*)&output)  ) = *(((unsigned char*)&input)+3);
-               *(((unsigned char*)&output)+1) = *(((unsigned char*)&input)+2);
-               *(((unsigned char*)&output)+2) = *(((unsigned char*)&input)+1);
-               *(((unsigned char*)&output)+3) = *(((unsigned char*)&input)  );
-       } else {
-               /* long is 8 bytes  (e.g., dec alpha) */
-
-               *(((unsigned char*)&output)  ) = *(((unsigned char*)&input)+7);
-               *(((unsigned char*)&output)+1) = *(((unsigned char*)&input)+6);
-               *(((unsigned char*)&output)+2) = *(((unsigned char*)&input)+5);
-               *(((unsigned char*)&output)+3) = *(((unsigned char*)&input)+4);
-
-               out += 4;
-               *(((unsigned char*)out)   ) = *(((unsigned char*)&input)+3);
-               *(((unsigned char*)out)+ 1) = *(((unsigned char*)&input)+2);
-               *(((unsigned char*)out)+ 2) = *(((unsigned char*)&input)+1);
-               *(((unsigned char*)out)+ 3) = *(((unsigned char*)&input)  );
-       }
-
-       return(output);
+							long	output;
+							unsigned	char	*out	=	(unsigned	char	*)&output;
+
+							if	(sizeof(long)	==	4)	{
+															/*	long	is	4	bytes	*/
+															*(((unsigned	char*)&output)		)	=	*(((unsigned	char*)&input)+3);
+															*(((unsigned	char*)&output)+1)	=	*(((unsigned	char*)&input)+2);
+															*(((unsigned	char*)&output)+2)	=	*(((unsigned	char*)&input)+1);
+															*(((unsigned	char*)&output)+3)	=	*(((unsigned	char*)&input)		);
+							}	else	{
+															/*	long	is	8	bytes		(e.g.,	dec	alpha)	*/
+
+															*(((unsigned	char*)&output)		)	=	*(((unsigned	char*)&input)+7);
+															*(((unsigned	char*)&output)+1)	=	*(((unsigned	char*)&input)+6);
+															*(((unsigned	char*)&output)+2)	=	*(((unsigned	char*)&input)+5);
+															*(((unsigned	char*)&output)+3)	=	*(((unsigned	char*)&input)+4);
+
+															out	+=	4;
+															*(((unsigned	char*)out)			)	=	*(((unsigned	char*)&input)+3);
+															*(((unsigned	char*)out)+	1)	=	*(((unsigned	char*)&input)+2);
+															*(((unsigned	char*)out)+	2)	=	*(((unsigned	char*)&input)+1);
+															*(((unsigned	char*)out)+	3)	=	*(((unsigned	char*)&input)		);
+							}
+
+							return(output);
 }
 
-int trick_byteswap_int(       /* RETURN: -- swapped bytes */
-              int input)      /* IN: -- bytes to be swapped */
+int	trick_byteswap_int(							/*	RETURN:	--	swapped	bytes	*/
+														int	input)						/*	IN:	--	bytes	to	be	swapped	*/
 {
-       int output;
+							int	output;
 
-       *( ((unsigned char *)&output)     ) = *( ((unsigned char *)&input) + 3 );
-       *( ((unsigned char *)&output) + 1 ) = *( ((unsigned char *)&input) + 2 );
-       *( ((unsigned char *)&output) + 2 ) = *( ((unsigned char *)&input) + 1 );
-       *( ((unsigned char *)&output) + 3 ) = *( ((unsigned char *)&input)  );
-       return(output);
+							*(	((unsigned	char	*)&output)					)	=	*(	((unsigned	char	*)&input)	+	3	);
+							*(	((unsigned	char	*)&output)	+	1	)	=	*(	((unsigned	char	*)&input)	+	2	);
+							*(	((unsigned	char	*)&output)	+	2	)	=	*(	((unsigned	char	*)&input)	+	1	);
+							*(	((unsigned	char	*)&output)	+	3	)	=	*(	((unsigned	char	*)&input)		);
+							return(output);
 }
 
-short trick_byteswap_short(        /* RETURN: -- swapped bytes   */
-                 short input)      /* IN: -- bytes to be swapped */
+short	trick_byteswap_short(								/*	RETURN:	--	swapped	bytes			*/
+																	short	input)						/*	IN:	--	bytes	to	be	swapped	*/
 {
-       short output;
+							short	output;
 
-       *( ((unsigned char *)&output)     ) = *( ((unsigned char *)&input) + 1 );
-       *( ((unsigned char *)&output) + 1 ) = *( ((unsigned char *)&input)  );
-       return(output);
+							*(	((unsigned	char	*)&output)					)	=	*(	((unsigned	char	*)&input)	+	1	);
+							*(	((unsigned	char	*)&output)	+	1	)	=	*(	((unsigned	char	*)&input)		);
+							return(output);
 }
 
 }
diff --git a/trick_source/data_products/Var/var.cpp b/trick_source/data_products/Var/var.cpp
index d7da0ff12..53718eec6 100644
--- a/trick_source/data_products/Var/var.cpp
+++ b/trick_source/data_products/Var/var.cpp
@@ -1,865 +1,865 @@
 /**
-    A class interface for variables
-    @author Keith Vetter
-    @version May 2002
+				A	class	interface	for	variables
+				@author	Keith	Vetter
+				@version	May	2002
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <float.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<ctype.h>
+#include	<float.h>
 
-#include <string.h>
-#include <iostream>
+#include	<string.h>
+#include	<iostream>
 
-#include "var.h"
+#include	"var.h"
 
-#define VAR_DELETE \
-       delete[] str ;  \
-       delete[] v1name ; \
-       delete[] v2name ; \
-       delete[] offsets ; \
-       delete[] sizedims ; \
-       delete[] sizeproducts ; \
-       delete[] v1.dims ; \
-       delete[] v2.dims ; \
-       for ( i = 0 ; i < nParms ; i++ ) {  \
-          delete[] v1.parName[i] ; \
-          delete[] v2.parName[i] ; \
-       } \
-       delete[] v1.parName ; \
-       delete[] v2.parName ;
+#define	VAR_DELETE	\
+							delete[]	str	;		\
+							delete[]	v1name	;	\
+							delete[]	v2name	;	\
+							delete[]	offsets	;	\
+							delete[]	sizedims	;	\
+							delete[]	sizeproducts	;	\
+							delete[]	v1.dims	;	\
+							delete[]	v2.dims	;	\
+							for	(	i	=	0	;	i	<	nParms	;	i++	)	{		\
+										delete[]	v1.parName[i]	;	\
+										delete[]	v2.parName[i]	;	\
+							}	\
+							delete[]	v1.parName	;	\
+							delete[]	v2.parName	;
 
-/** Variable Constructor */
-Var::Var() {
+/**	Variable	Constructor	*/
+Var::Var()	{
 
-       scaleFactor_ = 1.0 ;
-       bias_ = 0 ;
-       minRange_ = -DBL_MAX ;
-       maxRange_ = DBL_MAX ;
-       varType_ = NONE ;
-       byteSize_ = 0 ;
-       isProgramOutput = 0 ;
+							scaleFactor_	=	1.0	;
+							bias_	=	0	;
+							minRange_	=	-DBL_MAX	;
+							maxRange_	=	DBL_MAX	;
+							varType_	=	NONE	;
+							byteSize_	=	0	;
+							isProgramOutput	=	0	;
 
 }
 
-/** Var Destructor */
-Var::~Var() {
+/**	Var	Destructor	*/
+Var::~Var()	{
 }
 
-/** Copy constructor */
-Var::Var(const Var &src) {
+/**	Copy	constructor	*/
+Var::Var(const	Var	&src)	{
 
-       varName_ = src.varName_ ;
-       shortName_ = src.shortName_ ;
+							varName_	=	src.varName_	;
+							shortName_	=	src.shortName_	;
 
 }
 
 /**
- * Get number dimensions a variable has e.g. a[8].b[9].c has 72 dimensions
- *
- * varName -must- be set before calling this
- */
-int Var::getNumDims() {
+	*	Get	number	dimensions	a	variable	has	e.g.	a[8].b[9].c	has	72	dimensions
+	*
+	*	varName	-must-	be	set	before	calling	this
+	*/
+int	Var::getNumDims()	{
 
-       if ( varName_[0] == '\0' ) {
-               printf("ERROR: Must set varName before calling getNumDims().\n");
-               return( -1 ) ;
-       }
+							if	(	varName_[0]	==	'\0'	)	{
+															printf("ERROR:	Must	set	varName	before	calling	getNumDims().\n");
+															return(	-1	)	;
+							}
 
-       // numDimensions was previously calculated
-       return ( nDimensions_ ) ;
+							//	numDimensions	was	previously	calculated
+							return	(	nDimensions_	)	;
 }
 
-/** Get the string name of var e.g. "a[8].b[9].c" */
-const char* Var::getVarName(  ) {
-       return( varName_.c_str() ) ;
+/**	Get	the	string	name	of	var	e.g.	"a[8].b[9].c"	*/
+const	char*	Var::getVarName(		)	{
+							return(	varName_.c_str()	)	;
 }
 
-const char* Var::getTimeName(  ) {
-       return( timeName_.c_str() ) ;
+const	char*	Var::getTimeName(		)	{
+							return(	timeName_.c_str()	)	;
 }
 
-string Var::setTimeName(const char * name ) {
-       timeName_ = name ;
-       return( timeName_) ;
+string	Var::setTimeName(const	char	*	name	)	{
+							timeName_	=	name	;
+							return(	timeName_)	;
 }
 
-/**  Get variable name e.g. getVarName() returns the string "a[8].b[9].c" */
-double Var::getScaleFactor() {
-       return ( scaleFactor_ ) ;
+/**		Get	variable	name	e.g.	getVarName()	returns	the	string	"a[8].b[9].c"	*/
+double	Var::getScaleFactor()	{
+							return	(	scaleFactor_	)	;
 }
 
-/** Get variable's bias (offset or shift)
- *
- *  bias is the shift value for a variable
- *  So for a list of values 1.0, 2.0, 3.0 with a bias of say 8.0
- *  My list becomes 9.0, 10.0, 11.0
- */
-double Var::getBias() {
-       return ( bias_ ) ;
+/**	Get	variable's	bias	(offset	or	shift)
+	*
+	*		bias	is	the	shift	value	for	a	variable
+	*		So	for	a	list	of	values	1.0,	2.0,	3.0	with	a	bias	of	say	8.0
+	*		My	list	becomes	9.0,	10.0,	11.0
+	*/
+double	Var::getBias()	{
+							return	(	bias_	)	;
 }
 
-/** Get variable's minimal possible value
- *
- */
-double Var::getMinRange() {
-       return ( minRange_ ) ;
+/**	Get	variable's	minimal	possible	value
+	*
+	*/
+double	Var::getMinRange()	{
+							return	(	minRange_	)	;
 }
 
-/** Get variable's maximal possible value
- *
- */
-double Var::getMaxRange() {
-       return ( maxRange_ ) ;
+/**	Get	variable's	maximal	possible	value
+	*
+	*/
+double	Var::getMaxRange()	{
+							return	(	maxRange_	)	;
 }
 
-/** Get variable's unit
- */
-std::string Var::getUnit() {
-       return ( unit_ ) ;
+/**	Get	variable's	unit
+	*/
+std::string	Var::getUnit()	{
+							return	(	unit_	)	;
 }
 
-std::string Var::setUnit(std::string unit_name) {
-       unit_ = unit_name ;
-       return ( unit_ ) ;
+std::string	Var::setUnit(std::string	unit_name)	{
+							unit_	=	unit_name	;
+							return	(	unit_	)	;
 }
 
-std::string Var::getTimeUnit() {
-       return ( timeUnit_ ) ;
+std::string	Var::getTimeUnit()	{
+							return	(	timeUnit_	)	;
 }
 
-std::string Var::setTimeUnit(std::string unit_name) {
-       timeUnit_ = unit_name ;
-       return ( timeUnit_ ) ;
+std::string	Var::setTimeUnit(std::string	unit_name)	{
+							timeUnit_	=	unit_name	;
+							return	(	timeUnit_	)	;
 }
 
 /**
- * Return variable name without dimensions
- * e.g. if varName == a[0-9].b[1-2].c
- *         a.b.c will be returned
- */
-const char* Var::getVarNameNoDims( ) {
-
-       int ii, jj ;
-       int len;
-       char * temp_name ;
-
-       // Reallocate short name
-       len = varName_.length() ;
-       temp_name = new char[len + 1] ;
-
-       jj = 0 ;
-       for ( ii = 0; ii < len ; ii++ ) {
-               temp_name[jj] = varName_[ii];
-               if ( varName_[ii] == '[' || varName_[ii] == '(' ) {
-                       jj--;
-                       while ( varName_[ii] != ']' &&
-                               varName_[ii] != ')' && ii < len ) {
-                               ii++;
-                       }
-               }
-               jj++;
-       }
-       temp_name[jj] = '\0' ;
-       shortName_ = temp_name ;
-       delete[] temp_name ;
-
-       return(shortName_.c_str());
-}
-
-/** Compare two names (ignoring dimensions)  Returns 0 if same */
-int Var::compareNames( const char* name ) {
-
-       int ret ;
-
-       Var* v = new Var() ;
-       v->setType((char *)"void");                  // All new vars need a type
-       v->setVarName(name) ;
-       if ( v->getSize() == -1 ) {
-               fprintf(stderr, "ERROR: \"%s\" is not a valid variable name.\n",
-                                name);
-               return( -1 );
-       }
-
-       ret = strcmp(this->getVarNameNoDims(),v->getVarNameNoDims());
-       delete v ;
-
-       return(ret);
+	*	Return	variable	name	without	dimensions
+	*	e.g.	if	varName	==	a[0-9].b[1-2].c
+	*									a.b.c	will	be	returned
+	*/
+const	char*	Var::getVarNameNoDims(	)	{
+
+							int	ii,	jj	;
+							int	len;
+							char	*	temp_name	;
+
+							//	Reallocate	short	name
+							len	=	varName_.length()	;
+							temp_name	=	new	char[len	+	1]	;
+
+							jj	=	0	;
+							for	(	ii	=	0;	ii	<	len	;	ii++	)	{
+															temp_name[jj]	=	varName_[ii];
+															if	(	varName_[ii]	==	'['	||	varName_[ii]	==	'('	)	{
+																							jj--;
+																							while	(	varName_[ii]	!=	']'	&&
+																															varName_[ii]	!=	')'	&&	ii	<	len	)	{
+																															ii++;
+																							}
+															}
+															jj++;
+							}
+							temp_name[jj]	=	'\0'	;
+							shortName_	=	temp_name	;
+							delete[]	temp_name	;
+
+							return(shortName_.c_str());
+}
+
+/**	Compare	two	names	(ignoring	dimensions)		Returns	0	if	same	*/
+int	Var::compareNames(	const	char*	name	)	{
+
+							int	ret	;
+
+							Var*	v	=	new	Var()	;
+							v->setType((char	*)"void");																		//	All	new	vars	need	a	type
+							v->setVarName(name)	;
+							if	(	v->getSize()	==	-1	)	{
+															fprintf(stderr,	"ERROR:	\"%s\"	is	not	a	valid	variable	name.\n",
+																																name);
+															return(	-1	);
+							}
+
+							ret	=	strcmp(this->getVarNameNoDims(),v->getVarNameNoDims());
+							delete	v	;
+
+							return(ret);
 }
 
 /**
- * Returns index offset of name relative to Var (doesn't return byte offset)
- *
- * e.g. Say the variable is a.b[3-24].c[8],
- *      getDimOffset("a.b[7].c[8]") returns 4
- *      since a.b[7] is the 4rth element of a.b[3-24].c[8] .
- *      a.b[3].c[8] is 0th, a.b[4].c[8] is the 1rst etc...
- */
-int Var::getDimOffset( const char* param ) {
-
-       unsigned int i,j,k ;
-       char* str ;
-       char* v1name ;
-       char* v2name ;
-
-       // Need this for sizing of arrays
-       const unsigned int nParms = getNumParms() ;
-
-       enum DIMENSION { MULTI, SINGLE, NONE } ;
-
-       typedef struct  {
-               enum DIMENSION dimensional ;
-               int lower ;
-               int upper ;
-       } DIM ;
-
-       struct variable {
-
-               // a[0-1].b[8].c has 3 params -> "a" "b" "c"
-               unsigned int  numParams ;
-
-               /*
-                * a[0-1].b[8].c has (0,1),(8,8),(?,?) as dims
-                * a, b & c are MULTI, SINGLE & NONE dimensional
-                */
-               DIM * dims;
-
-               // a[0-1].b[8].c parNames "a[0-1]" "b[8]" & "c"
-               char** parName ;
-
-       } v1, v2 ;
-
-       int offset ;
-       int* offsets      = new int[nParms] ;  // Used for calculating offset
-       int* sizedims     = new int[nParms];   //             ""
-       int* sizeproducts = new int[nParms] ;  //             ""
-       v1.dims           = new DIM[nParms] ;
-       v2.dims           = new DIM[nParms] ;
-
-       // Allocate parName 2-d array
-       v1.parName        = new char*[nParms] ;
-       v2.parName        = new char*[nParms] ;
-       int len = varName_.size() + 1 ;
-       for ( i = 0 ; i < nParms ; i++ ) {
-               v1.parName[i] = new char[len] ;
-               v2.parName[i] = new char[len] ;
-       }
-
-       // Do some allocation
-       // Added nParms, since multidims expanded outgrow original string
-       // e.g. a[0-2][2-3].b[0-9].c -> a[0-2].[2-3].b[0-9].c
-       str    = new char[varName_.size()+1+nParms] ;
-       v1name = new char[varName_.size()+1+nParms] ;
-       v2name = new char[strlen(param)+1+nParms] ;
-
-       // Initialize v1 and v2 strings
-       strcpy(v1name, varName_.c_str());
-       strcpy(v2name, param);
-
-       /*
-        * To handle multi dim specs, do the following ugliness
-        * change things like a[0].b[0-2][9-18][3-4] -> a[0].b[0-2].[9-18].[3-4]
-        * Unfortunately, this was an afterthought, and it was hurried (sorry)
-        */
-       j = 0 ;
-       for ( i = 0 ; i < strlen(v1name) ; i++ ) {
-               if ( v1name[i] == ']' && v1name[i+1] == '[' ) {
-                       str[j] = ']' ; j++;
-                       str[j] = '.' ; j++;
-               } else {
-                       str[j] = v1name[i] ; j++ ;
-               }
-       }
-       str[j] = '\0' ;
-       strcpy(v1name, str);
-
-       j = 0 ;
-       for ( i = 0 ; i < strlen(v2name) ; i++ ) {
-               if ( v2name[i] == ']' && v2name[i+1] == '[' ) {
-                        str[j] = ']' ; j++;
-                        str[j] = '.' ; j++;
-               } else {
-                        str[j] = v2name[i] ; j++ ;
-               }
-      }
-      str[j] = '\0' ;
-      strcpy(v2name, str);
-
-
-      /* Get param names out of variable name */
-      /* a[0-1].b[8].c -> "a[0-1]", "b[8]", "c" */
-      j = 0 ;
-      v1.numParams = 0 ;
-      for ( i = 0 ; i < strlen(v1name) ; i++ ) {
-               str[j] = v1name[i] ; j++ ;
-               if ( v1name[i] == '.' ) {
-                       str[j-1] = '\0' ;
-                       strcpy(v1.parName[v1.numParams], str);
-                       j = 0 ;
-                       v1.numParams++ ;
-               }
-      }
-      str[j] = '\0' ;
-      strcpy(v1.parName[v1.numParams], str);
-      v1.numParams++ ;
-
-      /* Get dimensions for each param name */
-      for ( i = 0 ; i < v1.numParams; i++ ) {
-
-               v1.dims[i].dimensional = NONE ;
-               v1.dims[i].lower = -1 ;
-               v1.dims[i].upper = -1 ;
-
-               for ( j = 0 ; j < strlen(v1.parName[i]) ; j++ ) {
-
-                       if ( v1.parName[i][j] == '[' ) {
-                               j++ ;
-
-                               /* Assign lower dimension of param */
-                               k = 0 ;
-                               while ( isdigit( v1.parName[i][j] ) ) {
-                                       str[k] = v1.parName[i][j] ;
-                                       k++ ; j++ ;
-                               }
-                               str[k] = '\0' ;
-                               v1.dims[i].lower = atoi(str) ;
-
-                               /* Handle upper dimension */
-                               if ( v1.parName[i][j] == '-' ) {
-                                       /* Multi-dimensional */
-                                       v1.dims[i].dimensional = MULTI ;
-                                       k = 0 ;
-                                       j++ ;
-                                       while ( isdigit( v1.parName[i][j] ) ) {
-                                               str[k] = v1.parName[i][j] ;
-                                               k++ ; j++ ;
-                                       }
-                                       str[k] = '\0' ;
-                                       v1.dims[i].upper = atoi(str) ;
-                               } else {
-                                       /* Single-dimesional */
-                                       v1.dims[i].dimensional = SINGLE ;
-                                       v1.dims[i].upper = v1.dims[i].lower ;
-                               }
-                       }
-               }
-      }
-
-      /* Get param names out of variable name */
-      /* a[0-1].b[8].c -> "a[0-1]", "b[8]", "c" */
-      j = 0 ;
-      v2.numParams = 0 ;
-      for ( i = 0 ; i < strlen(v2name) ; i++ ) {
-               str[j] = v2name[i] ; j++ ;
-               if ( v2name[i] == '.' ) {
-                       str[j-1] = '\0' ;
-                       strcpy(v2.parName[v2.numParams], str);
-                       j = 0 ;
-                       v2.numParams++ ;
-               }
-      }
-      str[j] = '\0' ;
-      strcpy(v2.parName[v2.numParams], str);
-      v2.numParams++ ;
-
-
-      /* Get dimensions for each param name */
-      for ( i = 0 ; i < v2.numParams; i++ ) {
-               v2.dims[i].dimensional = NONE ;
-               v2.dims[i].lower = -1 ;
-               v2.dims[i].upper = -1 ;
-               for ( j = 0 ; j < strlen(v2.parName[i]) ; j++ ) {
-
-                       if ( v2.parName[i][j] == '[' ) {
-                               j++ ;
-
-                               /* Assign lower dimension of param */
-                               k = 0 ;
-                               while ( isdigit( v2.parName[i][j] ) ) {
-                                       str[k] = v2.parName[i][j] ;
-                                       k++ ; j++ ;
-                               }
-                               str[k] = '\0' ;
-                               v2.dims[i].lower = atoi(str) ;
-
-                               /* Handle upper dimension */
-                               if ( v2.parName[i][j] == '-' ) {
-                                       /* Multi-dimensional */
-                                       v2.dims[i].dimensional = MULTI ;
-                                       k = 0 ;
-                                       j++ ;
-                                       while ( isdigit( v2.parName[i][j] ) ) {
-                                               str[k] = v2.parName[i][j] ;
-                                               k++ ; j++ ;
-                                       }
-                                       str[k] = '\0' ;
-                                       v2.dims[i].upper = atoi(str) ;
-                               } else {
-                                       /* Single-dimesional */
-                                       v2.dims[i].dimensional = SINGLE ;
-                                       v2.dims[i].upper = v2.dims[i].lower ;
-                               }
-                       }
-               }
-      }
-
-      /* First make sure that v2 is in v1's space */
-      for ( i = 0 ; i < v1.numParams ; i++ ) {
-               if ( v1.dims[i].dimensional == MULTI ) {
-                       if ( v2.dims[i].lower < v1.dims[i].lower ||
-                               v2.dims[i].upper > v1.dims[i].upper )  {
-                               VAR_DELETE ;
-                               return ( -1 ) ; /* v2 not in v1's space */
-                       }
-               }
-               if ( v1.dims[i].dimensional == SINGLE ) {
-                       if ( v1.dims[i].lower != v2.dims[i].lower ) {
-                               VAR_DELETE ;
-                               return ( -1 ) ; /* v2 not in v1's space */
-                       }
-               }
-      }
-
-      /* Next make sure that v2 is a single dimensional var */
-      for ( i = 0 ; i < v2.numParams ; i++ ) {
-               if ( v2.dims[i].dimensional == MULTI ) {
-                       VAR_DELETE ;
-                       return(-1);
-               }
-      }
-
-      /* Calculate offset of v2 into v1's space */
-
-      /* First, get all offsets into each dimension & size of each dimension */
-      for ( i = 0 ; i < v1.numParams ; i++ ) {
-               offsets[i] = v2.dims[i].upper - v1.dims[i].lower ;
-               sizedims[i] = v1.dims[i].upper - v1.dims[i].lower + 1 ;
-      }
-
-      /*
-       * Now go through magical algorithm to get offset
-       * Think of it like an odometer where each cylinder has a different
-       * number of numbers, and the numbers on each cylinder can
-       * range from any start to stop point
-       *
-       * say v1 = x0[a0-b0].x1[a1-b1]...xN[aN-bN]
-       * say v2 = x0[y0].x1[y1]...xN[yN]
-       *
-       * let si = ai - bi + 1  (i = 0..N)
-       * let oi = yi - ai      (i = 0..N)
-       *
-       * offset= sN*sN-1*...s1(o0) + sN*sN-1*...s2(o1) + ... + sN(oN-1) + oN + 1
-       *
-       * Then offset = offset - 1 for indexing
-       */
-       for ( i = 0 ; i < v1.numParams ; i++ ) {
-               sizeproducts[i] = 1 ;
-               for ( j = i+1 ; j < v1.numParams ; j++ ) {
-                       sizeproducts[i] = sizeproducts[i]*sizedims[j] ;
-               }
-       }
-       offset = 0 ;
-       for ( i = 0 ; i < v1.numParams ; i++ ) {
-               offset = offset + sizeproducts[i]*offsets[i] ;
-               if ( offset < 0 ) {
-                       fprintf(stderr, "ERROR: Integer overflow "
-                                       "calculating offset!\n");
-                       VAR_DELETE;
-                       return(-1);
-               }
-       }
-
-       VAR_DELETE ;
-
-       return ( offset ) ;
+	*	Returns	index	offset	of	name	relative	to	Var	(doesn't	return	byte	offset)
+	*
+	*	e.g.	Say	the	variable	is	a.b[3-24].c[8],
+	*						getDimOffset("a.b[7].c[8]")	returns	4
+	*						since	a.b[7]	is	the	4rth	element	of	a.b[3-24].c[8]	.
+	*						a.b[3].c[8]	is	0th,	a.b[4].c[8]	is	the	1rst	etc...
+	*/
+int	Var::getDimOffset(	const	char*	param	)	{
+
+							unsigned	int	i,j,k	;
+							char*	str	;
+							char*	v1name	;
+							char*	v2name	;
+
+							//	Need	this	for	sizing	of	arrays
+							const	unsigned	int	nParms	=	getNumParms()	;
+
+							enum	DIMENSION	{	MULTI,	SINGLE,	NONE	}	;
+
+							typedef	struct		{
+															enum	DIMENSION	dimensional	;
+															int	lower	;
+															int	upper	;
+							}	DIM	;
+
+							struct	variable	{
+
+															//	a[0-1].b[8].c	has	3	params	->	"a"	"b"	"c"
+															unsigned	int		numParams	;
+
+															/*
+																*	a[0-1].b[8].c	has	(0,1),(8,8),(?,?)	as	dims
+																*	a,	b	&	c	are	MULTI,	SINGLE	&	NONE	dimensional
+																*/
+															DIM	*	dims;
+
+															//	a[0-1].b[8].c	parNames	"a[0-1]"	"b[8]"	&	"c"
+															char**	parName	;
+
+							}	v1,	v2	;
+
+							int	offset	;
+							int*	offsets						=	new	int[nParms]	;		//	Used	for	calculating	offset
+							int*	sizedims					=	new	int[nParms];			//													""
+							int*	sizeproducts	=	new	int[nParms]	;		//													""
+							v1.dims											=	new	DIM[nParms]	;
+							v2.dims											=	new	DIM[nParms]	;
+
+							//	Allocate	parName	2-d	array
+							v1.parName								=	new	char*[nParms]	;
+							v2.parName								=	new	char*[nParms]	;
+							int	len	=	varName_.size()	+	1	;
+							for	(	i	=	0	;	i	<	nParms	;	i++	)	{
+															v1.parName[i]	=	new	char[len]	;
+															v2.parName[i]	=	new	char[len]	;
+							}
+
+							//	Do	some	allocation
+							//	Added	nParms,	since	multidims	expanded	outgrow	original	string
+							//	e.g.	a[0-2][2-3].b[0-9].c	->	a[0-2].[2-3].b[0-9].c
+							str				=	new	char[varName_.size()+1+nParms]	;
+							v1name	=	new	char[varName_.size()+1+nParms]	;
+							v2name	=	new	char[strlen(param)+1+nParms]	;
+
+							//	Initialize	v1	and	v2	strings
+							strcpy(v1name,	varName_.c_str());
+							strcpy(v2name,	param);
+
+							/*
+								*	To	handle	multi	dim	specs,	do	the	following	ugliness
+								*	change	things	like	a[0].b[0-2][9-18][3-4]	->	a[0].b[0-2].[9-18].[3-4]
+								*	Unfortunately,	this	was	an	afterthought,	and	it	was	hurried	(sorry)
+								*/
+							j	=	0	;
+							for	(	i	=	0	;	i	<	strlen(v1name)	;	i++	)	{
+															if	(	v1name[i]	==	']'	&&	v1name[i+1]	==	'['	)	{
+																							str[j]	=	']'	;	j++;
+																							str[j]	=	'.'	;	j++;
+															}	else	{
+																							str[j]	=	v1name[i]	;	j++	;
+															}
+							}
+							str[j]	=	'\0'	;
+							strcpy(v1name,	str);
+
+							j	=	0	;
+							for	(	i	=	0	;	i	<	strlen(v2name)	;	i++	)	{
+															if	(	v2name[i]	==	']'	&&	v2name[i+1]	==	'['	)	{
+																								str[j]	=	']'	;	j++;
+																								str[j]	=	'.'	;	j++;
+															}	else	{
+																								str[j]	=	v2name[i]	;	j++	;
+															}
+						}
+						str[j]	=	'\0'	;
+						strcpy(v2name,	str);
+
+
+						/*	Get	param	names	out	of	variable	name	*/
+						/*	a[0-1].b[8].c	->	"a[0-1]",	"b[8]",	"c"	*/
+						j	=	0	;
+						v1.numParams	=	0	;
+						for	(	i	=	0	;	i	<	strlen(v1name)	;	i++	)	{
+															str[j]	=	v1name[i]	;	j++	;
+															if	(	v1name[i]	==	'.'	)	{
+																							str[j-1]	=	'\0'	;
+																							strcpy(v1.parName[v1.numParams],	str);
+																							j	=	0	;
+																							v1.numParams++	;
+															}
+						}
+						str[j]	=	'\0'	;
+						strcpy(v1.parName[v1.numParams],	str);
+						v1.numParams++	;
+
+						/*	Get	dimensions	for	each	param	name	*/
+						for	(	i	=	0	;	i	<	v1.numParams;	i++	)	{
+
+															v1.dims[i].dimensional	=	NONE	;
+															v1.dims[i].lower	=	-1	;
+															v1.dims[i].upper	=	-1	;
+
+															for	(	j	=	0	;	j	<	strlen(v1.parName[i])	;	j++	)	{
+
+																							if	(	v1.parName[i][j]	==	'['	)	{
+																															j++	;
+
+																															/*	Assign	lower	dimension	of	param	*/
+																															k	=	0	;
+																															while	(	isdigit(	v1.parName[i][j]	)	)	{
+																																							str[k]	=	v1.parName[i][j]	;
+																																							k++	;	j++	;
+																															}
+																															str[k]	=	'\0'	;
+																															v1.dims[i].lower	=	atoi(str)	;
+
+																															/*	Handle	upper	dimension	*/
+																															if	(	v1.parName[i][j]	==	'-'	)	{
+																																							/*	Multi-dimensional	*/
+																																							v1.dims[i].dimensional	=	MULTI	;
+																																							k	=	0	;
+																																							j++	;
+																																							while	(	isdigit(	v1.parName[i][j]	)	)	{
+																																															str[k]	=	v1.parName[i][j]	;
+																																															k++	;	j++	;
+																																							}
+																																							str[k]	=	'\0'	;
+																																							v1.dims[i].upper	=	atoi(str)	;
+																															}	else	{
+																																							/*	Single-dimesional	*/
+																																							v1.dims[i].dimensional	=	SINGLE	;
+																																							v1.dims[i].upper	=	v1.dims[i].lower	;
+																															}
+																							}
+															}
+						}
+
+						/*	Get	param	names	out	of	variable	name	*/
+						/*	a[0-1].b[8].c	->	"a[0-1]",	"b[8]",	"c"	*/
+						j	=	0	;
+						v2.numParams	=	0	;
+						for	(	i	=	0	;	i	<	strlen(v2name)	;	i++	)	{
+															str[j]	=	v2name[i]	;	j++	;
+															if	(	v2name[i]	==	'.'	)	{
+																							str[j-1]	=	'\0'	;
+																							strcpy(v2.parName[v2.numParams],	str);
+																							j	=	0	;
+																							v2.numParams++	;
+															}
+						}
+						str[j]	=	'\0'	;
+						strcpy(v2.parName[v2.numParams],	str);
+						v2.numParams++	;
+
+
+						/*	Get	dimensions	for	each	param	name	*/
+						for	(	i	=	0	;	i	<	v2.numParams;	i++	)	{
+															v2.dims[i].dimensional	=	NONE	;
+															v2.dims[i].lower	=	-1	;
+															v2.dims[i].upper	=	-1	;
+															for	(	j	=	0	;	j	<	strlen(v2.parName[i])	;	j++	)	{
+
+																							if	(	v2.parName[i][j]	==	'['	)	{
+																															j++	;
+
+																															/*	Assign	lower	dimension	of	param	*/
+																															k	=	0	;
+																															while	(	isdigit(	v2.parName[i][j]	)	)	{
+																																							str[k]	=	v2.parName[i][j]	;
+																																							k++	;	j++	;
+																															}
+																															str[k]	=	'\0'	;
+																															v2.dims[i].lower	=	atoi(str)	;
+
+																															/*	Handle	upper	dimension	*/
+																															if	(	v2.parName[i][j]	==	'-'	)	{
+																																							/*	Multi-dimensional	*/
+																																							v2.dims[i].dimensional	=	MULTI	;
+																																							k	=	0	;
+																																							j++	;
+																																							while	(	isdigit(	v2.parName[i][j]	)	)	{
+																																															str[k]	=	v2.parName[i][j]	;
+																																															k++	;	j++	;
+																																							}
+																																							str[k]	=	'\0'	;
+																																							v2.dims[i].upper	=	atoi(str)	;
+																															}	else	{
+																																							/*	Single-dimesional	*/
+																																							v2.dims[i].dimensional	=	SINGLE	;
+																																							v2.dims[i].upper	=	v2.dims[i].lower	;
+																															}
+																							}
+															}
+						}
+
+						/*	First	make	sure	that	v2	is	in	v1's	space	*/
+						for	(	i	=	0	;	i	<	v1.numParams	;	i++	)	{
+															if	(	v1.dims[i].dimensional	==	MULTI	)	{
+																							if	(	v2.dims[i].lower	<	v1.dims[i].lower	||
+																															v2.dims[i].upper	>	v1.dims[i].upper	)		{
+																															VAR_DELETE	;
+																															return	(	-1	)	;	/*	v2	not	in	v1's	space	*/
+																							}
+															}
+															if	(	v1.dims[i].dimensional	==	SINGLE	)	{
+																							if	(	v1.dims[i].lower	!=	v2.dims[i].lower	)	{
+																															VAR_DELETE	;
+																															return	(	-1	)	;	/*	v2	not	in	v1's	space	*/
+																							}
+															}
+						}
+
+						/*	Next	make	sure	that	v2	is	a	single	dimensional	var	*/
+						for	(	i	=	0	;	i	<	v2.numParams	;	i++	)	{
+															if	(	v2.dims[i].dimensional	==	MULTI	)	{
+																							VAR_DELETE	;
+																							return(-1);
+															}
+						}
+
+						/*	Calculate	offset	of	v2	into	v1's	space	*/
+
+						/*	First,	get	all	offsets	into	each	dimension	&	size	of	each	dimension	*/
+						for	(	i	=	0	;	i	<	v1.numParams	;	i++	)	{
+															offsets[i]	=	v2.dims[i].upper	-	v1.dims[i].lower	;
+															sizedims[i]	=	v1.dims[i].upper	-	v1.dims[i].lower	+	1	;
+						}
+
+						/*
+							*	Now	go	through	magical	algorithm	to	get	offset
+							*	Think	of	it	like	an	odometer	where	each	cylinder	has	a	different
+							*	number	of	numbers,	and	the	numbers	on	each	cylinder	can
+							*	range	from	any	start	to	stop	point
+							*
+							*	say	v1	=	x0[a0-b0].x1[a1-b1]...xN[aN-bN]
+							*	say	v2	=	x0[y0].x1[y1]...xN[yN]
+							*
+							*	let	si	=	ai	-	bi	+	1		(i	=	0..N)
+							*	let	oi	=	yi	-	ai						(i	=	0..N)
+							*
+							*	offset=	sN*sN-1*...s1(o0)	+	sN*sN-1*...s2(o1)	+	...	+	sN(oN-1)	+	oN	+	1
+							*
+							*	Then	offset	=	offset	-	1	for	indexing
+							*/
+							for	(	i	=	0	;	i	<	v1.numParams	;	i++	)	{
+															sizeproducts[i]	=	1	;
+															for	(	j	=	i+1	;	j	<	v1.numParams	;	j++	)	{
+																							sizeproducts[i]	=	sizeproducts[i]*sizedims[j]	;
+															}
+							}
+							offset	=	0	;
+							for	(	i	=	0	;	i	<	v1.numParams	;	i++	)	{
+															offset	=	offset	+	sizeproducts[i]*offsets[i]	;
+															if	(	offset	<	0	)	{
+																							fprintf(stderr,	"ERROR:	Integer	overflow	"
+																																							"calculating	offset!\n");
+																							VAR_DELETE;
+																							return(-1);
+															}
+							}
+
+							VAR_DELETE	;
+
+							return	(	offset	)	;
 }
 
 /**
- * Get byte size of variable e.g.
- *
- *  a[0-5]: 6*(4bytes/double) = 24 bytes in all
- *
- */
-int Var::getSize(  ) {
-       return( byteSize_ ) ;
-}
-
-/** Set variable name string */
-string Var::setVarName( const char* name ) {
-
-       // Reallocate varName_
-       varName_ = name ;
-
-       // Set number of dimensions for variable
-       nDimensions_ = calcNumDimensions();
-
-       // Set byte size
-       if ( varType_ != NONE ) {
-          byteSize_ = calcByteSize();
-       }
-
-       return( varName_ ) ;
-}
-
-/** Get variable type (double, float, int ...) */
-Var::enumType Var::getType ( ) {
-       return( varType_ ) ;
-}
-
-/** Get variable's type size (double->8, float->4 ...)*/
-int Var::getTypeSize () {
-
-       // I am avoiding another switch statement on type here
-
-       int totalSize ;
-       int numDims ;
-
-       // Get total byte size for variable and number of dimensions
-       totalSize = calcByteSize() ;
-       numDims   = getNumDims() ;
-
-       // So type size will be total size divided by number of dims
-       return ( totalSize/numDims ) ;
-}
-
-/** Set variable type (double, float, int...) */
-int Var::setType ( char* type ) {
-
-       if         ( !strcasecmp(type, "char") ) {
-                varType_ = CHAR ;
-       } else if  ( !strcasecmp(type, "short") ) {
-                varType_ = SHORT ;
-       } else if  ( !strcasecmp(type, "int") ) {
-                varType_ = INT ;
-       } else if  ( !strcasecmp(type, "long") ) {
-                varType_ = LONG ;
-       } else if  ( !strcasecmp(type, "unsigned_char") ) {
-                varType_ = UNSIGNED_CHAR ;
-       } else if  ( !strcasecmp(type, "unsigned_short") ) {
-                varType_ = UNSIGNED_SHORT ;
-       } else if  ( !strcasecmp(type, "unsigned_int") ) {
-                varType_ = UNSIGNED_INTEGER ;
-       } else if  ( !strcasecmp(type, "unsigned_long") ) {
-                varType_ = UNSIGNED_LONG ;
-       } else if  ( !strcasecmp(type, "float") ) {
-                varType_ = FLOAT ;
-       } else if  ( !strcasecmp(type, "double") ) {
-                varType_ = DOUBLE ;
-       } else if  ( !strcasecmp(type, "long_long") ) {
-                varType_ = LONG_LONG ;
-       } else if  ( !strcasecmp(type, "unsigned_long_long") ) {
-                varType_ = UNSIGNED_LONG_LONG ;
-       } else if  ( !strcasecmp(type, "void") ) {
-                varType_ = VOID ;
-       } else {
-                varType_ = NONE ;
-                return( -1 ) ;
-       }
-
-       return ( 0 ) ;
-}
-
-/** Calculates and returns -total- bytesize of variable */
-int Var::calcByteSize() {
-
-       int size;
-       int totalSize;
-
-       // Make sure that num dimensions set (user should never see this)
-       if ( nDimensions_ < 1 ) {
-               printf("ERROR: nDimensions must be set before "
-                      "calculating size.\n");
-               return( -1 );
-       }
-
-       switch ( varType_ ) {
-               case CHAR:
-                        size = sizeof(char);
-                        break;
-               case SHORT:
-                        size = sizeof(short);
-                        break;
-               case INT:
-                        size = sizeof(int);
-                        break;
-               case LONG:
-                        size = sizeof(long);
-                        break;
-               case UNSIGNED_CHAR:
-                        size = sizeof(unsigned char);
-                        break;
-               case UNSIGNED_SHORT:
-                        size = sizeof(unsigned short);
-                        break;
-               case UNSIGNED_INTEGER:
-                        size = sizeof(unsigned int);
-                        break ;
-               case UNSIGNED_LONG:
-                        size = sizeof(unsigned long);
-                        break ;
-               case FLOAT:
-                        size = sizeof(float);
-                        break;
-               case DOUBLE:
-                        size = sizeof(double);
-                        break;
-               case LONG_LONG:
-                        size = sizeof(long long);
-                        break ;
-               case UNSIGNED_LONG_LONG:
-                        size = sizeof(unsigned long long);
-                        break ;
-               case VOID:
-                        size = 0;
-                        break;
-               case NONE:
-                        printf("ERROR: Type must be set before "
-                               "calculating size.\n");
-                        return( -1 );
-                        break;
-               default:
-                        printf("ERROR: Type must be set before "
-                               "calculating size.\n");
-                        return( -1 );
-       }
-
-       totalSize = size*nDimensions_ ;
-
-       return( totalSize );
-}
-
-/* Calculate and return total number of dimensions of variable e.g.
- *
- * Input a[0-4].b[8-9],
- * Returns: 5*2 = 10 dimensions
- */
-int Var::calcNumDimensions() {
-
-       int i,j;
-       int stringLen;
-       char* dim1;
-       char* dim2;
-       int  d1, d2;
-       int  numDims;
-       int  numDimSpecs;
-
-       // Dims can't be longer than varName
-       stringLen = varName_.size();
-       dim1 = new char[stringLen+1] ;
-       dim2 = new char[stringLen+1] ;
-
-       numDimSpecs = 0 ;
-       numDims = 1 ;
-       for ( i = 0; i < stringLen; i++ ) {
-
-                if ( varName_[i] == ']' ) {
-                               cerr << "ERROR: Missing open bracket in"
-                                    << varName_ << endl ;
-                               delete[] dim1 ;
-                               delete[] dim2 ;
-                               return( -1 );
-                }
-
-                if ( varName_[i] == '[' ) {
-
-                       while ( varName_[i] != ']' ) {
-
-                              i++ ;
-
-                              // Missing close bracket?
-                              if ( i == stringLen ) {
-                                       cerr << "ERROR: Missing close bracket in"
-                                            << varName_ << endl ;
-                                       delete[] dim1 ;
-                                       delete[] dim2 ;
-                                       return( -1 ) ;
-                              }
-
-                              // Get dimension 1
-                              j = 0;
-                              dim1[0] = '\0';
-                              while ( isdigit(varName_[i]) ) {
-
-                                      dim1[j] = varName_[i] ;
-
-                                       i++; j++;
-
-                                       if ( i == stringLen  ) {
-                                              cerr << "ERROR: Missing close "
-                                                   << "bracket in "
-                                                   << varName_ << endl ;
-                                              delete[] dim1 ;
-                                              delete[] dim2 ;
-                                              return( -1 ) ;
-                                       }
-                                       if ( j > 7 ) {
-                                              printf("ERROR: Dimension spec "
-                                                     "too long.\n");
-                                              delete[] dim1 ;
-                                              delete[] dim2 ;
-                                              return( -1 ) ;
-                                       }
-                              }
-                              dim1[j] = '\0';
-
-                              // Get dimension 2
-                              j = 0 ;
-                              if ( varName_[i] == '-' ) {
-
-                                       i++ ;
-
-                                       // Multi-dimensional
-                                       while ( isdigit(varName_[i]) ) {
-
-                                               dim2[j] = varName_[i] ;
-
-                                               i++; j++;
-
-                                               if ( i == stringLen  ) {
-                                                       cerr << "ERROR: Missing "
-                                                            << "close bracket"
-                                                            << " in "
-                                                            << varName_
-                                                            << endl ;
-                                                       delete[] dim1 ;
-                                                       delete[] dim2 ;
-                                                       return( -1 ) ;
-                                               }
-                                               if ( j > 7 ) {
-                                                       cerr << "ERROR: Dim "
-                                                            << "spec too long "
-                                                            << "in "
-                                                            << varName_
-                                                            << endl ;
-                                                       delete[] dim1 ;
-                                                       delete[] dim2 ;
-                                                       return( -1 ) ;
-                                               }
-
-                                       }
-                                       dim2[j] = '\0';
-
-                               } else if ( varName_[i] == ']' ) {
-
-                                       // Single dimensional
-                                       strcpy(dim2, dim1);
-
-                               } else {
-                                       cerr << "ERROR: Dimension has syntax "
-                                            << "error with "
-                                            << varName_ << endl ;
-                                       delete[] dim1 ;
-                                       delete[] dim2 ;
-                                       return( -1 ) ;
-                               }
-                       }
-
-                       if ( dim1[0] == '\0' || dim2[0] == '\0' ) {
-                               cerr << "ERROR: Bad syntax in dimension "
-                                    << "specification for "
-                                    << varName_ << endl ;
-                               delete[] dim1 ;
-                               delete[] dim2 ;
-                               return( -1 );
-                       }
-
-                       // Calculate number of dimensions
-                       d1 = atoi(dim1);
-                       d2 = atoi(dim2);
-                       numDims = numDims * ( d2 - d1 + 1 ) ;
-
-                       // Increment number of dimension specs
-                       numDimSpecs++ ;
-               }
-       }
-
-       // Free dims
-       delete[] dim1 ;
-       delete[] dim2 ;
-
-       return( numDims );
-}
-
-/** Return number of parameters in variable e.g.
-  * a[0-9].b[2-3].c has 3 parms "a[0-9], b[2-3] & c"
-  *
-  * For multi-dimensional vars it's weird
-  * a[0-9][0-2].b[2-3].c has 4 parms "a[0-9], a[0-2], b[2-3] & c"
-  */
-int Var::getNumParms() {
-
-       unsigned int i ;
-       int nParms ;
-
-       if ( varName_[0] == '\0' ) {
-               return(0);
-       }
-
-       nParms = 1 ;
-       for ( i = 0 ; i < varName_.size() ; i++ ) {
-               if ( varName_[i] == '.' ) {
-                       nParms++ ;
-               }
-               if ( varName_[i] == ']' && varName_[i+1] == '['  ) {
-                       nParms++ ;
-               }
-       }
-
-       return(nParms);
-}
-
-/** Set variable's minimum range */
-void Var::setMinRange(double minRange) {
-       minRange_ = minRange ;
-}
-
-/** Set variable's maximum range */
-void Var::setMaxRange(double maxRange) {
-       maxRange_ = maxRange ;
-}
-
-/** Set variable's scale factor */
-void Var::setScaleFactor(double scaleFactor) {
-       scaleFactor_ = scaleFactor ;
-}
-
-/** Set variable's bias @see getBias() */
-void Var::setBias(double bias) {
-       bias_ = bias ;
-}
+	*	Get	byte	size	of	variable	e.g.
+	*
+	*		a[0-5]:	6*(4bytes/double)	=	24	bytes	in	all
+	*
+	*/
+int	Var::getSize(		)	{
+							return(	byteSize_	)	;
+}
+
+/**	Set	variable	name	string	*/
+string	Var::setVarName(	const	char*	name	)	{
+
+							//	Reallocate	varName_
+							varName_	=	name	;
+
+							//	Set	number	of	dimensions	for	variable
+							nDimensions_	=	calcNumDimensions();
+
+							//	Set	byte	size
+							if	(	varType_	!=	NONE	)	{
+										byteSize_	=	calcByteSize();
+							}
+
+							return(	varName_	)	;
+}
+
+/**	Get	variable	type	(double,	float,	int	...)	*/
+Var::enumType	Var::getType	(	)	{
+							return(	varType_	)	;
+}
+
+/**	Get	variable's	type	size	(double->8,	float->4	...)*/
+int	Var::getTypeSize	()	{
+
+							//	I	am	avoiding	another	switch	statement	on	type	here
+
+							int	totalSize	;
+							int	numDims	;
+
+							//	Get	total	byte	size	for	variable	and	number	of	dimensions
+							totalSize	=	calcByteSize()	;
+							numDims			=	getNumDims()	;
+
+							//	So	type	size	will	be	total	size	divided	by	number	of	dims
+							return	(	totalSize/numDims	)	;
+}
+
+/**	Set	variable	type	(double,	float,	int...)	*/
+int	Var::setType	(	char*	type	)	{
+
+							if									(	!strcasecmp(type,	"char")	)	{
+																varType_	=	CHAR	;
+							}	else	if		(	!strcasecmp(type,	"short")	)	{
+																varType_	=	SHORT	;
+							}	else	if		(	!strcasecmp(type,	"int")	)	{
+																varType_	=	INT	;
+							}	else	if		(	!strcasecmp(type,	"long")	)	{
+																varType_	=	LONG	;
+							}	else	if		(	!strcasecmp(type,	"unsigned_char")	)	{
+																varType_	=	UNSIGNED_CHAR	;
+							}	else	if		(	!strcasecmp(type,	"unsigned_short")	)	{
+																varType_	=	UNSIGNED_SHORT	;
+							}	else	if		(	!strcasecmp(type,	"unsigned_int")	)	{
+																varType_	=	UNSIGNED_INTEGER	;
+							}	else	if		(	!strcasecmp(type,	"unsigned_long")	)	{
+																varType_	=	UNSIGNED_LONG	;
+							}	else	if		(	!strcasecmp(type,	"float")	)	{
+																varType_	=	FLOAT	;
+							}	else	if		(	!strcasecmp(type,	"double")	)	{
+																varType_	=	DOUBLE	;
+							}	else	if		(	!strcasecmp(type,	"long_long")	)	{
+																varType_	=	LONG_LONG	;
+							}	else	if		(	!strcasecmp(type,	"unsigned_long_long")	)	{
+																varType_	=	UNSIGNED_LONG_LONG	;
+							}	else	if		(	!strcasecmp(type,	"void")	)	{
+																varType_	=	VOID	;
+							}	else	{
+																varType_	=	NONE	;
+																return(	-1	)	;
+							}
+
+							return	(	0	)	;
+}
+
+/**	Calculates	and	returns	-total-	bytesize	of	variable	*/
+int	Var::calcByteSize()	{
+
+							int	size;
+							int	totalSize;
+
+							//	Make	sure	that	num	dimensions	set	(user	should	never	see	this)
+							if	(	nDimensions_	<	1	)	{
+															printf("ERROR:	nDimensions	must	be	set	before	"
+																						"calculating	size.\n");
+															return(	-1	);
+							}
+
+							switch	(	varType_	)	{
+															case	CHAR:
+																								size	=	sizeof(char);
+																								break;
+															case	SHORT:
+																								size	=	sizeof(short);
+																								break;
+															case	INT:
+																								size	=	sizeof(int);
+																								break;
+															case	LONG:
+																								size	=	sizeof(long);
+																								break;
+															case	UNSIGNED_CHAR:
+																								size	=	sizeof(unsigned	char);
+																								break;
+															case	UNSIGNED_SHORT:
+																								size	=	sizeof(unsigned	short);
+																								break;
+															case	UNSIGNED_INTEGER:
+																								size	=	sizeof(unsigned	int);
+																								break	;
+															case	UNSIGNED_LONG:
+																								size	=	sizeof(unsigned	long);
+																								break	;
+															case	FLOAT:
+																								size	=	sizeof(float);
+																								break;
+															case	DOUBLE:
+																								size	=	sizeof(double);
+																								break;
+															case	LONG_LONG:
+																								size	=	sizeof(long	long);
+																								break	;
+															case	UNSIGNED_LONG_LONG:
+																								size	=	sizeof(unsigned	long	long);
+																								break	;
+															case	VOID:
+																								size	=	0;
+																								break;
+															case	NONE:
+																								printf("ERROR:	Type	must	be	set	before	"
+																															"calculating	size.\n");
+																								return(	-1	);
+																								break;
+															default:
+																								printf("ERROR:	Type	must	be	set	before	"
+																															"calculating	size.\n");
+																								return(	-1	);
+							}
+
+							totalSize	=	size*nDimensions_	;
+
+							return(	totalSize	);
+}
+
+/*	Calculate	and	return	total	number	of	dimensions	of	variable	e.g.
+	*
+	*	Input	a[0-4].b[8-9],
+	*	Returns:	5*2	=	10	dimensions
+	*/
+int	Var::calcNumDimensions()	{
+
+							int	i,j;
+							int	stringLen;
+							char*	dim1;
+							char*	dim2;
+							int		d1,	d2;
+							int		numDims;
+							int		numDimSpecs;
+
+							//	Dims	can't	be	longer	than	varName
+							stringLen	=	varName_.size();
+							dim1	=	new	char[stringLen+1]	;
+							dim2	=	new	char[stringLen+1]	;
+
+							numDimSpecs	=	0	;
+							numDims	=	1	;
+							for	(	i	=	0;	i	<	stringLen;	i++	)	{
+
+																if	(	varName_[i]	==	']'	)	{
+																															cerr	<<	"ERROR:	Missing	open	bracket	in"
+																																				<<	varName_	<<	endl	;
+																															delete[]	dim1	;
+																															delete[]	dim2	;
+																															return(	-1	);
+																}
+
+																if	(	varName_[i]	==	'['	)	{
+
+																							while	(	varName_[i]	!=	']'	)	{
+
+																														i++	;
+
+																														//	Missing	close	bracket?
+																														if	(	i	==	stringLen	)	{
+																																							cerr	<<	"ERROR:	Missing	close	bracket	in"
+																																												<<	varName_	<<	endl	;
+																																							delete[]	dim1	;
+																																							delete[]	dim2	;
+																																							return(	-1	)	;
+																														}
+
+																														//	Get	dimension	1
+																														j	=	0;
+																														dim1[0]	=	'\0';
+																														while	(	isdigit(varName_[i])	)	{
+
+																																						dim1[j]	=	varName_[i]	;
+
+																																							i++;	j++;
+
+																																							if	(	i	==	stringLen		)	{
+																																														cerr	<<	"ERROR:	Missing	close	"
+																																																			<<	"bracket	in	"
+																																																			<<	varName_	<<	endl	;
+																																														delete[]	dim1	;
+																																														delete[]	dim2	;
+																																														return(	-1	)	;
+																																							}
+																																							if	(	j	>	7	)	{
+																																														printf("ERROR:	Dimension	spec	"
+																																																					"too	long.\n");
+																																														delete[]	dim1	;
+																																														delete[]	dim2	;
+																																														return(	-1	)	;
+																																							}
+																														}
+																														dim1[j]	=	'\0';
+
+																														//	Get	dimension	2
+																														j	=	0	;
+																														if	(	varName_[i]	==	'-'	)	{
+
+																																							i++	;
+
+																																							//	Multi-dimensional
+																																							while	(	isdigit(varName_[i])	)	{
+
+																																															dim2[j]	=	varName_[i]	;
+
+																																															i++;	j++;
+
+																																															if	(	i	==	stringLen		)	{
+																																																							cerr	<<	"ERROR:	Missing	"
+																																																												<<	"close	bracket"
+																																																												<<	"	in	"
+																																																												<<	varName_
+																																																												<<	endl	;
+																																																							delete[]	dim1	;
+																																																							delete[]	dim2	;
+																																																							return(	-1	)	;
+																																															}
+																																															if	(	j	>	7	)	{
+																																																							cerr	<<	"ERROR:	Dim	"
+																																																												<<	"spec	too	long	"
+																																																												<<	"in	"
+																																																												<<	varName_
+																																																												<<	endl	;
+																																																							delete[]	dim1	;
+																																																							delete[]	dim2	;
+																																																							return(	-1	)	;
+																																															}
+
+																																							}
+																																							dim2[j]	=	'\0';
+
+																															}	else	if	(	varName_[i]	==	']'	)	{
+
+																																							//	Single	dimensional
+																																							strcpy(dim2,	dim1);
+
+																															}	else	{
+																																							cerr	<<	"ERROR:	Dimension	has	syntax	"
+																																												<<	"error	with	"
+																																												<<	varName_	<<	endl	;
+																																							delete[]	dim1	;
+																																							delete[]	dim2	;
+																																							return(	-1	)	;
+																															}
+																							}
+
+																							if	(	dim1[0]	==	'\0'	||	dim2[0]	==	'\0'	)	{
+																															cerr	<<	"ERROR:	Bad	syntax	in	dimension	"
+																																				<<	"specification	for	"
+																																				<<	varName_	<<	endl	;
+																															delete[]	dim1	;
+																															delete[]	dim2	;
+																															return(	-1	);
+																							}
+
+																							//	Calculate	number	of	dimensions
+																							d1	=	atoi(dim1);
+																							d2	=	atoi(dim2);
+																							numDims	=	numDims	*	(	d2	-	d1	+	1	)	;
+
+																							//	Increment	number	of	dimension	specs
+																							numDimSpecs++	;
+															}
+							}
+
+							//	Free	dims
+							delete[]	dim1	;
+							delete[]	dim2	;
+
+							return(	numDims	);
+}
+
+/**	Return	number	of	parameters	in	variable	e.g.
+		*	a[0-9].b[2-3].c	has	3	parms	"a[0-9],	b[2-3]	&	c"
+		*
+		*	For	multi-dimensional	vars	it's	weird
+		*	a[0-9][0-2].b[2-3].c	has	4	parms	"a[0-9],	a[0-2],	b[2-3]	&	c"
+		*/
+int	Var::getNumParms()	{
+
+							unsigned	int	i	;
+							int	nParms	;
+
+							if	(	varName_[0]	==	'\0'	)	{
+															return(0);
+							}
+
+							nParms	=	1	;
+							for	(	i	=	0	;	i	<	varName_.size()	;	i++	)	{
+															if	(	varName_[i]	==	'.'	)	{
+																							nParms++	;
+															}
+															if	(	varName_[i]	==	']'	&&	varName_[i+1]	==	'['		)	{
+																							nParms++	;
+															}
+							}
+
+							return(nParms);
+}
+
+/**	Set	variable's	minimum	range	*/
+void	Var::setMinRange(double	minRange)	{
+							minRange_	=	minRange	;
+}
+
+/**	Set	variable's	maximum	range	*/
+void	Var::setMaxRange(double	maxRange)	{
+							maxRange_	=	maxRange	;
+}
+
+/**	Set	variable's	scale	factor	*/
+void	Var::setScaleFactor(double	scaleFactor)	{
+							scaleFactor_	=	scaleFactor	;
+}
+
+/**	Set	variable's	bias	@see	getBias()	*/
+void	Var::setBias(double	bias)	{
+							bias_	=	bias	;
+}
 
-/** Assignment */
-const Var& Var::operator= ( Var& right )
+/**	Assignment	*/
+const	Var&	Var::operator=	(	Var&	right	)
 {
-        if ( this == &right ) {
-                fprintf(stderr, "Attempted self assignment in Xvar "
-                                "operator=. \n");
-                return *this;
-        }
-
-        this->setVarName( right.getVarName() ) ;
-        this->setTimeName( right.getTimeName() ) ;
-        this->setMinRange( right.getMinRange() ) ;
-        this->setMaxRange( right.getMaxRange() ) ;
-        this->setScaleFactor( right.getScaleFactor() ) ;
-        this->setBias( right.getBias() ) ;
-        this->setLabel( right.getLabel() ) ;
-        this->setUnit( right.getUnit()) ;
-        this->setTimeUnit( right.getTimeUnit()) ;
-        this->isProgramOutput = right.isProgramOutput ;
-
-        return *this ;  // Allows concatenated assignments
-}
-
-/** Get the label of the var */
-const char* Var::getLabel(  ) {
-       return( label_.c_str() ) ;
-}
-
-/** Get the label of the var */
-string Var::setLabel(const char * label ) {
-       label_ = label ;
-       return( label_ ) ;
+								if	(	this	==	&right	)	{
+																fprintf(stderr,	"Attempted	self	assignment	in	Xvar	"
+																																"operator=.	\n");
+																return	*this;
+								}
+
+								this->setVarName(	right.getVarName()	)	;
+								this->setTimeName(	right.getTimeName()	)	;
+								this->setMinRange(	right.getMinRange()	)	;
+								this->setMaxRange(	right.getMaxRange()	)	;
+								this->setScaleFactor(	right.getScaleFactor()	)	;
+								this->setBias(	right.getBias()	)	;
+								this->setLabel(	right.getLabel()	)	;
+								this->setUnit(	right.getUnit())	;
+								this->setTimeUnit(	right.getTimeUnit())	;
+								this->isProgramOutput	=	right.isProgramOutput	;
+
+								return	*this	;		//	Allows	concatenated	assignments
+}
+
+/**	Get	the	label	of	the	var	*/
+const	char*	Var::getLabel(		)	{
+							return(	label_.c_str()	)	;
+}
+
+/**	Get	the	label	of	the	var	*/
+string	Var::setLabel(const	char	*	label	)	{
+							label_	=	label	;
+							return(	label_	)	;
 }
diff --git a/trick_source/data_products/units/init_units_system.cpp b/trick_source/data_products/units/init_units_system.cpp
index bc6475fc3..e24f7bcc7 100644
--- a/trick_source/data_products/units/init_units_system.cpp
+++ b/trick_source/data_products/units/init_units_system.cpp
@@ -1,19 +1,19 @@
 
-#include <iostream>
-#include <udunits2.h>
+#include	<iostream>
+#include	<udunits2.h>
 
-ut_system * init_unit_system() {
-    ut_system * u_system ;
-    /* Initialize the udunits-2 library */
-    ut_set_error_message_handler(ut_ignore) ;
-    if( (u_system = ut_read_xml( NULL )) == NULL ) {
-        std::cerr << "Error initializing udunits-2 unit system" << std::endl ;
-        return NULL ;
-    }
-    ut_set_error_message_handler(ut_write_to_stderr) ;
-    return u_system ;
+ut_system	*	init_unit_system()	{
+				ut_system	*	u_system	;
+				/*	Initialize	the	udunits-2	library	*/
+				ut_set_error_message_handler(ut_ignore)	;
+				if(	(u_system	=	ut_read_xml(	NULL	))	==	NULL	)	{
+								std::cerr	<<	"Error	initializing	udunits-2	unit	system"	<<	std::endl	;
+								return	NULL	;
+				}
+				ut_set_error_message_handler(ut_write_to_stderr)	;
+				return	u_system	;
 }
 
-// Global units system pointer
-ut_system * u_system = init_unit_system() ;
+//	Global	units	system	pointer
+ut_system	*	u_system	=	init_unit_system()	;
 
diff --git a/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp b/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp
index 1624e47a3..e7a98f560 100644
--- a/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp
+++ b/trick_source/sim_services/CheckPointAgent/CheckPointAgent.cpp
@@ -1,51 +1,51 @@
-#include "trick/CheckPointAgent.hh"
+#include	"trick/CheckPointAgent.hh"
 
-// MEMBER FUNCTION
-void Trick::CheckPointAgent::push_basename( const char* name) {
+//	MEMBER	FUNCTION
+void	Trick::CheckPointAgent::push_basename(	const	char*	name)	{
 
-    VarNameElement part ;
+				VarNameElement	part	;
 
-    part.type = BASE_NAME;
-    part.name = name;
-    leftside_stack.push_back(part);
+				part.type	=	BASE_NAME;
+				part.name	=	name;
+				leftside_stack.push_back(part);
 }
 
-// MEMBER FUNCTION
-void Trick::CheckPointAgent::push_struct_elem( const char* name) {
+//	MEMBER	FUNCTION
+void	Trick::CheckPointAgent::push_struct_elem(	const	char*	name)	{
 
-    VarNameElement part ;
+				VarNameElement	part	;
 
-    part.type = ELEM_NAME;
-    part.name = name;
-    leftside_stack.push_back( part);
+				part.type	=	ELEM_NAME;
+				part.name	=	name;
+				leftside_stack.push_back(	part);
 }
 
-// MEMBER FUNCTION
-void Trick::CheckPointAgent::push_array_elem( int index) {
+//	MEMBER	FUNCTION
+void	Trick::CheckPointAgent::push_array_elem(	int	index)	{
 
-    VarNameElement part ;
+				VarNameElement	part	;
 
-    part.type = ARRAY_INDEX;
-    part.index = index;
-    leftside_stack.push_back( part);
+				part.type	=	ARRAY_INDEX;
+				part.index	=	index;
+				leftside_stack.push_back(	part);
 }
 
-// MEMBER FUNCTION
-void Trick::CheckPointAgent::pop_elem() {
+//	MEMBER	FUNCTION
+void	Trick::CheckPointAgent::pop_elem()	{
 
-    leftside_stack.pop_back();
+				leftside_stack.pop_back();
 
 }
 
-void Trick::CheckPointAgent::set_debug_level(int level) {
-    debug_level = level;
+void	Trick::CheckPointAgent::set_debug_level(int	level)	{
+				debug_level	=	level;
 }
 
-void Trick::CheckPointAgent::set_reduced_checkpoint(bool flag) {
-    reduced_checkpoint = flag;
+void	Trick::CheckPointAgent::set_reduced_checkpoint(bool	flag)	{
+				reduced_checkpoint	=	flag;
 }
 
-void Trick::CheckPointAgent::set_hexfloat_checkpoint(bool flag) {
-    hexfloat_checkpoint = flag;
+void	Trick::CheckPointAgent::set_hexfloat_checkpoint(bool	flag)	{
+				hexfloat_checkpoint	=	flag;
 }
 
diff --git a/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp b/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp
index 59a5e0ccf..c9cc2cfa0 100644
--- a/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp
+++ b/trick_source/sim_services/CheckPointAgent/ChkPtParseContext.cpp
@@ -1,34 +1,34 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "trick/ChkPtParseContext.hh"
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	"trick/ChkPtParseContext.hh"
 
 /**
- Constructor
- */
-ChkPtParseContext::ChkPtParseContext( Trick::MemoryManager *mem_mgr, std::istream* is = &std::cin ) {
+	Constructor
+	*/
+ChkPtParseContext::ChkPtParseContext(	Trick::MemoryManager	*mem_mgr,	std::istream*	is	=	&std::cin	)	{
 
-   // Set verif input and echo input flags.
-   verify_input = 0;
-   echo_input = 0;
+			//	Set	verif	input	and	echo	input	flags.
+			verify_input	=	0;
+			echo_input	=	0;
 
-   // Initialize the scanner
-   init_scanner();
+			//	Initialize	the	scanner
+			init_scanner();
 
-   this->buf = (char*)calloc( 0xffff, sizeof(char));
+			this->buf	=	(char*)calloc(	0xffff,	sizeof(char));
 
-   this->bad_declaration_count = 0;
-   this->bad_assignment_count = 0;
+			this->bad_declaration_count	=	0;
+			this->bad_assignment_count	=	0;
 
-   this->is = is;
-   this->mem_mgr = mem_mgr;
+			this->is	=	is;
+			this->mem_mgr	=	mem_mgr;
 
 }
 
 /**
- Destructor
- */
-ChkPtParseContext::~ChkPtParseContext() {
-    destroy_scanner();
-    free( this->buf );
+	Destructor
+	*/
+ChkPtParseContext::~ChkPtParseContext()	{
+				destroy_scanner();
+				free(	this->buf	);
 }
 
diff --git a/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
index 12301fa3e..40c78a97b 100644
--- a/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
+++ b/trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp
@@ -1,1149 +1,1149 @@
-#include "trick/MemoryManager.hh"
-#include "trick/parameter_types.h"
-#include "trick/io_alloc.h"
-#include "trick/wcs_ext.h"
-#include "trick/bitfield_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-#include "trick/ClassicCheckPointAgent.hh"
-#include "trick/ChkPtParseContext.hh"
-
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-const int Trick::ClassicCheckPointAgent::array_elements_per_line[TRICK_NUMBER_OF_TYPES] = {
-     5, /** TRICK_VOID (for pointers) */
-    20, /** TRICK_CHARACTER */
-    20, /** TRICK_UNSIGNED_CHARACTER */
-     1, /** TRICK_STRING */
-    10, /** TRICK_SHORT */
-    10, /** TRICK_UNSIGNED_SHORT */
-     5, /** TRICK_INTEGER */
-     5, /** TRICK_UNSIGNED_INTEGER */
-     5, /** TRICK_LONG */
-     5, /** TRICK_UNSIGNED_LONG */
-     5, /** TRICK_FLOAT */
-     5, /** TRICK_DOUBLE */
-     5, /** TRICK_BITFIELD */
-     5, /** TRICK_UNSIGNED_BITFIELD */
-     5, /** TRICK_LONG_LONG */
-     5, /** TRICK_UNSIGNED_LONG_LONG */
-     5, /** TRICK_FILE_PTR */
-    10, /** TRICK_BOOLEAN */
-    10, /** TRICK_WCHAR */
-     1, /** TRICK_WSTRING */
-     5, /** TRICK_VOID_PTR */
-    10, /** TRICK_ENUMERATED */
-     5, /** TRICK_STRUCTURED (for pointers) */
-     5, /** TRICK_OPAQUE_TYPE */
-     1  /** TRICK_STL */
+#include	"trick/MemoryManager.hh"
+#include	"trick/parameter_types.h"
+#include	"trick/io_alloc.h"
+#include	"trick/wcs_ext.h"
+#include	"trick/bitfield_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+#include	"trick/ClassicCheckPointAgent.hh"
+#include	"trick/ChkPtParseContext.hh"
+
+#include	<string>
+#include	<iostream>
+#include	<iomanip>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<math.h>
+#include	<string.h>
+
+const	int	Trick::ClassicCheckPointAgent::array_elements_per_line[TRICK_NUMBER_OF_TYPES]	=	{
+					5,	/**	TRICK_VOID	(for	pointers)	*/
+				20,	/**	TRICK_CHARACTER	*/
+				20,	/**	TRICK_UNSIGNED_CHARACTER	*/
+					1,	/**	TRICK_STRING	*/
+				10,	/**	TRICK_SHORT	*/
+				10,	/**	TRICK_UNSIGNED_SHORT	*/
+					5,	/**	TRICK_INTEGER	*/
+					5,	/**	TRICK_UNSIGNED_INTEGER	*/
+					5,	/**	TRICK_LONG	*/
+					5,	/**	TRICK_UNSIGNED_LONG	*/
+					5,	/**	TRICK_FLOAT	*/
+					5,	/**	TRICK_DOUBLE	*/
+					5,	/**	TRICK_BITFIELD	*/
+					5,	/**	TRICK_UNSIGNED_BITFIELD	*/
+					5,	/**	TRICK_LONG_LONG	*/
+					5,	/**	TRICK_UNSIGNED_LONG_LONG	*/
+					5,	/**	TRICK_FILE_PTR	*/
+				10,	/**	TRICK_BOOLEAN	*/
+				10,	/**	TRICK_WCHAR	*/
+					1,	/**	TRICK_WSTRING	*/
+					5,	/**	TRICK_VOID_PTR	*/
+				10,	/**	TRICK_ENUMERATED	*/
+					5,	/**	TRICK_STRUCTURED	(for	pointers)	*/
+					5,	/**	TRICK_OPAQUE_TYPE	*/
+					1		/**	TRICK_STL	*/
 };
 
-// MEMBER FUNCTION
-Trick::ClassicCheckPointAgent::ClassicCheckPointAgent( Trick::MemoryManager *MM) {
+//	MEMBER	FUNCTION
+Trick::ClassicCheckPointAgent::ClassicCheckPointAgent(	Trick::MemoryManager	*MM)	{
 
-   mem_mgr = MM;
-   reduced_checkpoint = 1;
-   hexfloat_checkpoint = 0;
-   debug_level = 0;
+			mem_mgr	=	MM;
+			reduced_checkpoint	=	1;
+			hexfloat_checkpoint	=	0;
+			debug_level	=	0;
 }
 
-// MEMBER FUNCTION
-Trick::ClassicCheckPointAgent::~ClassicCheckPointAgent() { }
+//	MEMBER	FUNCTION
+Trick::ClassicCheckPointAgent::~ClassicCheckPointAgent()	{	}
 
-// MEMBER FUNCTION
-bool Trick::ClassicCheckPointAgent::input_perm_check(ATTRIBUTES * attr) {
-    return (attr->io & TRICK_CHKPNT_INPUT) ;
+//	MEMBER	FUNCTION
+bool	Trick::ClassicCheckPointAgent::input_perm_check(ATTRIBUTES	*	attr)	{
+				return	(attr->io	&	TRICK_CHKPNT_INPUT)	;
 }
 
-bool Trick::ClassicCheckPointAgent::output_perm_check(ATTRIBUTES * attr) {
-    return (attr->io & TRICK_CHKPNT_OUTPUT) ;
+bool	Trick::ClassicCheckPointAgent::output_perm_check(ATTRIBUTES	*	attr)	{
+				return	(attr->io	&	TRICK_CHKPNT_OUTPUT)	;
 }
 
-// MEMBER FUNCTION
-std::string Trick::ClassicCheckPointAgent::left_side_name() {
+//	MEMBER	FUNCTION
+std::string	Trick::ClassicCheckPointAgent::left_side_name()	{
 
-    std::string name ;
-    int ii;
-    int n_elements = leftside_stack.size();
+				std::string	name	;
+				int	ii;
+				int	n_elements	=	leftside_stack.size();
 
-    for (ii = 0; ii < n_elements ; ii++) {
+				for	(ii	=	0;	ii	<	n_elements	;	ii++)	{
 
-        VarNameElement & element = leftside_stack[ii];
+								VarNameElement	&	element	=	leftside_stack[ii];
 
-        switch( element.type) {
+								switch(	element.type)	{
 
-            case BASE_NAME: {
-                name = element.name;
-            } break;
+												case	BASE_NAME:	{
+																name	=	element.name;
+												}	break;
 
-            case ELEM_NAME: {
-                name += '.' + element.name;
-            } break;
+												case	ELEM_NAME:	{
+																name	+=	'.'	+	element.name;
+												}	break;
 
-            case ARRAY_INDEX: {
-                std::stringstream index_string;
-                index_string << element.index;
-                name += '[';
-                name += index_string.str();
-                name += ']';
-            } break;
+												case	ARRAY_INDEX:	{
+																std::stringstream	index_string;
+																index_string	<<	element.index;
+																name	+=	'[';
+																name	+=	index_string.str();
+																name	+=	']';
+												}	break;
 
-            default: {
-                message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Left side name-stack appears to be corrupted.\n") ;
-            }
-        }
-    }
-    return( name);
+												default:	{
+																message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Left	side	name-stack	appears	to	be	corrupted.\n")	;
+												}
+								}
+				}
+				return(	name);
 }
 
-// MEMBER FUNCTION
-void Trick::ClassicCheckPointAgent::write_decl(std::ostream& chkpnt_os, ALLOC_INFO *info) {
+//	MEMBER	FUNCTION
+void	Trick::ClassicCheckPointAgent::write_decl(std::ostream&	chkpnt_os,	ALLOC_INFO	*info)	{
 
-    const char *type_spec;
+				const	char	*type_spec;
 
-    type_spec = trickTypeCharString(info->type, info->user_type_name);
+				type_spec	=	trickTypeCharString(info->type,	info->user_type_name);
 
-    if (info->stcl == TRICK_EXTERN) {
-        chkpnt_os << "// extern ";
-    }
+				if	(info->stcl	==	TRICK_EXTERN)	{
+								chkpnt_os	<<	"//	extern	";
+				}
 
-    if ( info->num_index == 0 ) {
+				if	(	info->num_index	==	0	)	{
 
-        chkpnt_os << type_spec << " " << info->name << ";\n";
+								chkpnt_os	<<	type_spec	<<	"	"	<<	info->name	<<	";\n";
 
-    } else if ((info->num_index > 0) && (info->num_index <= TRICK_MAX_INDEX)) {
-        int ii;
+				}	else	if	((info->num_index	>	0)	&&	(info->num_index	<=	TRICK_MAX_INDEX))	{
+								int	ii;
 
-        chkpnt_os << type_spec;
+								chkpnt_os	<<	type_spec;
 
-        ii = info->num_index-1;
-        while ((ii >= 0) && (info->index[ii] == 0)) {
-            chkpnt_os << "*";
-            ii --;
-        }
+								ii	=	info->num_index-1;
+								while	((ii	>=	0)	&&	(info->index[ii]	==	0))	{
+												chkpnt_os	<<	"*";
+												ii	--;
+								}
 
-        chkpnt_os << " " << info->name ;
+								chkpnt_os	<<	"	"	<<	info->name	;
 
-        ii = 0;
-        while ((ii < info->num_index) && (info->index[ii] != 0)) {
-            chkpnt_os << "[" << info->index[ii] << "]" ;
-            ii ++;
-        }
-          chkpnt_os << ";" << std::endl;
+								ii	=	0;
+								while	((ii	<	info->num_index)	&&	(info->index[ii]	!=	0))	{
+												chkpnt_os	<<	"["	<<	info->index[ii]	<<	"]"	;
+												ii	++;
+								}
+										chkpnt_os	<<	";"	<<	std::endl;
 
-    } else {
-        // ERROR - num_index cant be negative.
-    }
+				}	else	{
+								//	ERROR	-	num_index	cant	be	negative.
+				}
 }
 
 
-// STATIC FUNCTION
-/* 
-   Given an offset, that is within the bounds of a composite
-   object (i.e., a struct or class instance), return the corresponding 
-   ATTRIBUTES pointer (singular).
+//	STATIC	FUNCTION
+/*	
+			Given	an	offset,	that	is	within	the	bounds	of	a	composite
+			object	(i.e.,	a	struct	or	class	instance),	return	the	corresponding	
+			ATTRIBUTES	pointer	(singular).
 
-   Helper function for getCompositeSubReference.
+			Helper	function	for	getCompositeSubReference.
 .
 */
 
-static ATTRIBUTES* findMember(ATTRIBUTES* A, long referenceOffset) {
-    int i = 0;
-    int j;
-    int temp_size;
-    /* Find the member which contains the address pointed to by rAddr */
-    while ((A[i].name[0] != '\0')) {
-
-        // if mod bit 0 is set, A[i] is a reference. Width of reference is stored
-        // in mod bits 3-8. We could use sizeof(void*), but that is implementation
-        // specific and not required by C++ standard.
-        if ((A[i].mods & 1) == 1) {
-          temp_size = ((A[i].mods >> 3) & 0x3F);
-          // Calculate the size (temp_size) of the referenced member variable.
-        } else if (A[i].num_index != 0) {
-            // if size of last valid index is 0, then we are looking at a pointer
-            if (A[i].index[A[i].num_index - 1].size == 0) {
-                temp_size = sizeof(void*);
-            } else {
-                temp_size = A[i].size;
-            }
-            for (j = 0; j < A[i].num_index; j++) {
-                if (A[i].index[j].size != 0) {
-                    temp_size *= A[i].index[j].size;
-                } else {
-                    break;
-                }
-            }
-        } else {
-            temp_size = A[i].size;
-        }
-
-        // if the reference is not to this member variable, move on to the next member variable.
-        if ( ( referenceOffset <  (long) ( A[i].offset)   ) ||
-             ( referenceOffset >= (long) ( A[i].offset + temp_size))
-           ) {
-            i++;
-        } else {
-            break;
-        }
-    }
-
-    return &(A[i]);
+static	ATTRIBUTES*	findMember(ATTRIBUTES*	A,	long	referenceOffset)	{
+				int	i	=	0;
+				int	j;
+				int	temp_size;
+				/*	Find	the	member	which	contains	the	address	pointed	to	by	rAddr	*/
+				while	((A[i].name[0]	!=	'\0'))	{
+
+								//	if	mod	bit	0	is	set,	A[i]	is	a	reference.	Width	of	reference	is	stored
+								//	in	mod	bits	3-8.	We	could	use	sizeof(void*),	but	that	is	implementation
+								//	specific	and	not	required	by	C++	standard.
+								if	((A[i].mods	&	1)	==	1)	{
+										temp_size	=	((A[i].mods	>>	3)	&	0x3F);
+										//	Calculate	the	size	(temp_size)	of	the	referenced	member	variable.
+								}	else	if	(A[i].num_index	!=	0)	{
+												//	if	size	of	last	valid	index	is	0,	then	we	are	looking	at	a	pointer
+												if	(A[i].index[A[i].num_index	-	1].size	==	0)	{
+																temp_size	=	sizeof(void*);
+												}	else	{
+																temp_size	=	A[i].size;
+												}
+												for	(j	=	0;	j	<	A[i].num_index;	j++)	{
+																if	(A[i].index[j].size	!=	0)	{
+																				temp_size	*=	A[i].index[j].size;
+																}	else	{
+																				break;
+																}
+												}
+								}	else	{
+												temp_size	=	A[i].size;
+								}
+
+								//	if	the	reference	is	not	to	this	member	variable,	move	on	to	the	next	member	variable.
+								if	(	(	referenceOffset	<		(long)	(	A[i].offset)			)	||
+													(	referenceOffset	>=	(long)	(	A[i].offset	+	temp_size))
+											)	{
+												i++;
+								}	else	{
+												break;
+								}
+				}
+
+				return	&(A[i]);
 }
 
-// STATIC FUNCTION
+//	STATIC	FUNCTION
 /*
-   Given an address, that is within the bounds of a composite
-   object (i.e., a struct or class instance), store the corresponding sub-name
-   in reference_name buffer and return.
+			Given	an	address,	that	is	within	the	bounds	of	a	composite
+			object	(i.e.,	a	struct	or	class	instance),	store	the	corresponding	sub-name
+			in	reference_name	buffer	and	return.
 
-   A return value of 1 indicates an error occured. A return value of 0 indicates
-   success.
+			A	return	value	of	1	indicates	an	error	occured.	A	return	value	of	0	indicates
+			success.
 
-   The following BNF production describes a valid sub-reference:
+			The	following	BNF	production	describes	a	valid	sub-reference:
 
-   <sub_reference> --> ""
-                     | "+" + <offset>
-                     | "[" + <index>+ "]" + <sub_reference>
-                     | "." + <member_name> + <sub_reference>
+			<sub_reference>	-->	""
+																					|	"+"	+	<offset>
+																					|	"["	+	<index>+	"]"	+	<sub_reference>
+																					|	"."	+	<member_name>	+	<sub_reference>
 
-   <offset> is an integer. It is the the reference offset minus the offset of
-   the last data member.
-   <index> is an integer. It is an array index.
-   <member_name> is a name of a member of the given composite type.
+			<offset>	is	an	integer.	It	is	the	the	reference	offset	minus	the	offset	of
+			the	last	data	member.
+			<index>	is	an	integer.	It	is	an	array	index.
+			<member_name>	is	a	name	of	a	member	of	the	given	composite	type.
 */
 
-static int getCompositeSubReference(
-    void*        reference_address, /* Address we are looking for */
-    ATTRIBUTES** left_type,         /* Attributes of type we are looking for */
-    void*        structure_address, /* Address of struct we are in */
-    ATTRIBUTES*  A,                 /* Attributes of current struct we are in */
-    char* reference_name            /* destination buffer of composite subreference */
-    ) {
-
-    int   j, m;
-    long  offset;
-    int   my_index[9];
-    int   ret;
-    int   size, last_size;
-
-    char* rAddr = (char*)reference_address;
-    char* sAddr = (char*)structure_address;
-
-    long referenceOffset = (long)rAddr - (long)sAddr;
-
-    // selected ATTRIBUTES stucture from A (singular)
-    ATTRIBUTES* Ai;
-
-
-    if ( referenceOffset < 0) {
-        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Address to find is less than struct address.\n") ;
-        return 1;
-    }
-
-    // Find the structure member that corresponds to the reference address.
-    // If name is empty, we have failed. 
-    Ai = findMember(A, referenceOffset);
-
-/******If failed to find member, set reference_name to offset only and return ****/
-    if (Ai->name[0] == '\0') {
-        /* If we fail to find a member corresponding to the reference address,
-           it must mean that the ATTRIBUTES don't contain a description for
-           that particular member, i.e., it was **'ed out. In this case, we can only
-           represent the reference_address as a byte offset into the structure.
-         */
-        if (referenceOffset == 0) {
-            reference_name[0] = '\0' ;
-        } else if (referenceOffset > 0) {
-            snprintf(reference_name, (size_t)256, " + %ld" , referenceOffset);
-        } else {
-            return 1; // ERROR
-        }
-        return 0;
-    }
+static	int	getCompositeSubReference(
+				void*								reference_address,	/*	Address	we	are	looking	for	*/
+				ATTRIBUTES**	left_type,									/*	Attributes	of	type	we	are	looking	for	*/
+				void*								structure_address,	/*	Address	of	struct	we	are	in	*/
+				ATTRIBUTES*		A,																	/*	Attributes	of	current	struct	we	are	in	*/
+				char*	reference_name												/*	destination	buffer	of	composite	subreference	*/
+				)	{
+
+				int			j,	m;
+				long		offset;
+				int			my_index[9];
+				int			ret;
+				int			size,	last_size;
+
+				char*	rAddr	=	(char*)reference_address;
+				char*	sAddr	=	(char*)structure_address;
+
+				long	referenceOffset	=	(long)rAddr	-	(long)sAddr;
+
+				//	selected	ATTRIBUTES	stucture	from	A	(singular)
+				ATTRIBUTES*	Ai;
+
+
+				if	(	referenceOffset	<	0)	{
+								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Address	to	find	is	less	than	struct	address.\n")	;
+								return	1;
+				}
+
+				//	Find	the	structure	member	that	corresponds	to	the	reference	address.
+				//	If	name	is	empty,	we	have	failed.	
+				Ai	=	findMember(A,	referenceOffset);
+
+/******If	failed	to	find	member,	set	reference_name	to	offset	only	and	return	****/
+				if	(Ai->name[0]	==	'\0')	{
+								/*	If	we	fail	to	find	a	member	corresponding	to	the	reference	address,
+											it	must	mean	that	the	ATTRIBUTES	don't	contain	a	description	for
+											that	particular	member,	i.e.,	it	was	**'ed	out.	In	this	case,	we	can	only
+											represent	the	reference_address	as	a	byte	offset	into	the	structure.
+									*/
+								if	(referenceOffset	==	0)	{
+												reference_name[0]	=	'\0'	;
+								}	else	if	(referenceOffset	>	0)	{
+												snprintf(reference_name,	(size_t)256,	"	+	%ld"	,	referenceOffset);
+								}	else	{
+												return	1;	//	ERROR
+								}
+								return	0;
+				}
 
 /******************************************************************************/
-    
-/* We found a member corresponding to the reference address, so print it's name. */
-    snprintf(reference_name, (size_t)256, ".%s", Ai->name);
-
-/* If the referenced member variable is an intrinsic type */
-    if (Ai->type != TRICK_STRUCTURED) {
-
-/* If the reference address is non-array or a pointer, return reference_name as is */
-        if((Ai->num_index == 0) || (Ai->index[0].size == 0)) {
-            return 0;
-        }
-
-/* else, rAddr is pointing to an array, determine its dimensions and determine 
-   the element pointed to by rAddr. Then print the index and return */
-
-        offset = (long) rAddr - ((long) sAddr + Ai->offset);
-        size = last_size = Ai->size;
-
-        /* Calculate the number of fixed dimensions. */
-        int num_fixed_dims = 0;
-        for (j = 0; j < Ai->num_index; j++) {
-            if (Ai->index[j].size > 0) {
-                num_fixed_dims++;
-            }
-        }
-
-        // Calculate the array indices for the right-side.
-        for (j = num_fixed_dims - 1; j >= 0; j--) {
-            size *= Ai->index[j].size;
-            if(!size) {
-              std::cerr << "Checkpoint Agent " << __FUNCTION__ << " ERROR: divide by zero during array indices calculation" << std::endl;
-              return 1;
-            }
-            my_index[j] = (int) ((offset % size) / last_size);
-            offset -= last_size * my_index[j];
-            last_size = size;
-        }
-
-        for (j = 0; j < num_fixed_dims; j++) {
-            size_t len = strlen(reference_name);
-            size_t rem = (size_t)256 - len;
-            snprintf(&reference_name[len], rem, "[%d]", my_index[j]);
-        }
-    return 0;
-    }
-/******** TRICK_STRUCTURED ****************************************************/
-    /* if it is a reference, do nothing and return */
-    if ((Ai->mods & 1) == 1) { // Ai->type == TRICK_STRUCTURED
-        return 0;
-    }
-/*if member is an unarrayed struct, continue to call getCompositeSubReference.*/
-    if (Ai->num_index == 0) {
-        char buf[256];
-        ret = getCompositeSubReference( rAddr, left_type, sAddr + Ai->offset, (ATTRIBUTES *) Ai->attr, buf);
-
-        if (ret == 0) {
-            size_t len = strlen(reference_name);
-            size_t rem = (size_t)256 - len;
-            snprintf(&reference_name[len], rem, "%s", buf);
-        } else {
-            return 1; // ERROR.
-        }
-    return 0;
-    }
-
-/***** If the member is not a pointer do nothing and return *******************/
-    if (Ai->index[0].size == 0) {
-        return 0;
-    }
-
-/*********** Member is an arrayed struct **************************************/ 
-
-    offset = (long) rAddr - ((long) sAddr + Ai->offset);
-    size = last_size = Ai->size;
-
-    /* Calculate the indices into the array */
-    for (j = Ai->num_index - 1; j >= 0; j--) {
-        if (Ai->index[j].size != 0) {
-            size *= Ai->index[j].size;
-        }
-        my_index[j] = (int) ((offset % size) / last_size);
-        offset -= last_size * my_index[j];
-        last_size = size;
-    }
-
-
-    for (j = 0; j < Ai->num_index; j++) {
-        size_t len = strlen(reference_name);
-        size_t rem = (size_t)256 - len;
-        snprintf(&reference_name[len], rem, "[%d]", my_index[j]);
-    }
-
-    /* if left_type specifies the current member, stop here */
-    if ( (left_type != NULL) && (*left_type != NULL) && (Ai->attr == (*left_type)->attr)) {
-        return 0;
-    } 
-
-/**** Go find the subreference for the arrayed struct member and append *********/
-
-    /* get the offset into the array that rAddr points to */
-    offset = 0;
-    for (j = 0; j < Ai->num_index; j++) {
-      m = my_index[j];
-      for(int k = j + 1; m && (k < Ai->num_index); k++) {
-        m *= Ai->index[k].size;
-      }
-      offset += m*Ai->size;
-    }
-
-    {
-        char buf[256];
-        ret = getCompositeSubReference( rAddr, left_type, sAddr + Ai->offset + offset, (ATTRIBUTES *) Ai->attr, buf);
-
-        if (ret == 0) {
-            size_t len = strlen(reference_name);
-            size_t rem = (size_t)256 - len;
-            snprintf(&reference_name[len], rem, "%s", buf);
-        } else {
-            return 1; // ERROR
-        }
-    }
-
-    return 0;
+				
+/*	We	found	a	member	corresponding	to	the	reference	address,	so	print	it's	name.	*/
+				snprintf(reference_name,	(size_t)256,	".%s",	Ai->name);
+
+/*	If	the	referenced	member	variable	is	an	intrinsic	type	*/
+				if	(Ai->type	!=	TRICK_STRUCTURED)	{
+
+/*	If	the	reference	address	is	non-array	or	a	pointer,	return	reference_name	as	is	*/
+								if((Ai->num_index	==	0)	||	(Ai->index[0].size	==	0))	{
+												return	0;
+								}
+
+/*	else,	rAddr	is	pointing	to	an	array,	determine	its	dimensions	and	determine	
+			the	element	pointed	to	by	rAddr.	Then	print	the	index	and	return	*/
+
+								offset	=	(long)	rAddr	-	((long)	sAddr	+	Ai->offset);
+								size	=	last_size	=	Ai->size;
+
+								/*	Calculate	the	number	of	fixed	dimensions.	*/
+								int	num_fixed_dims	=	0;
+								for	(j	=	0;	j	<	Ai->num_index;	j++)	{
+												if	(Ai->index[j].size	>	0)	{
+																num_fixed_dims++;
+												}
+								}
+
+								//	Calculate	the	array	indices	for	the	right-side.
+								for	(j	=	num_fixed_dims	-	1;	j	>=	0;	j--)	{
+												size	*=	Ai->index[j].size;
+												if(!size)	{
+														std::cerr	<<	"Checkpoint	Agent	"	<<	__FUNCTION__	<<	"	ERROR:	divide	by	zero	during	array	indices	calculation"	<<	std::endl;
+														return	1;
+												}
+												my_index[j]	=	(int)	((offset	%	size)	/	last_size);
+												offset	-=	last_size	*	my_index[j];
+												last_size	=	size;
+								}
+
+								for	(j	=	0;	j	<	num_fixed_dims;	j++)	{
+												size_t	len	=	strlen(reference_name);
+												size_t	rem	=	(size_t)256	-	len;
+												snprintf(&reference_name[len],	rem,	"[%d]",	my_index[j]);
+								}
+				return	0;
+				}
+/********	TRICK_STRUCTURED	****************************************************/
+				/*	if	it	is	a	reference,	do	nothing	and	return	*/
+				if	((Ai->mods	&	1)	==	1)	{	//	Ai->type	==	TRICK_STRUCTURED
+								return	0;
+				}
+/*if	member	is	an	unarrayed	struct,	continue	to	call	getCompositeSubReference.*/
+				if	(Ai->num_index	==	0)	{
+								char	buf[256];
+								ret	=	getCompositeSubReference(	rAddr,	left_type,	sAddr	+	Ai->offset,	(ATTRIBUTES	*)	Ai->attr,	buf);
+
+								if	(ret	==	0)	{
+												size_t	len	=	strlen(reference_name);
+												size_t	rem	=	(size_t)256	-	len;
+												snprintf(&reference_name[len],	rem,	"%s",	buf);
+								}	else	{
+												return	1;	//	ERROR.
+								}
+				return	0;
+				}
+
+/*****	If	the	member	is	not	a	pointer	do	nothing	and	return	*******************/
+				if	(Ai->index[0].size	==	0)	{
+								return	0;
+				}
+
+/***********	Member	is	an	arrayed	struct	**************************************/	
+
+				offset	=	(long)	rAddr	-	((long)	sAddr	+	Ai->offset);
+				size	=	last_size	=	Ai->size;
+
+				/*	Calculate	the	indices	into	the	array	*/
+				for	(j	=	Ai->num_index	-	1;	j	>=	0;	j--)	{
+								if	(Ai->index[j].size	!=	0)	{
+												size	*=	Ai->index[j].size;
+								}
+								my_index[j]	=	(int)	((offset	%	size)	/	last_size);
+								offset	-=	last_size	*	my_index[j];
+								last_size	=	size;
+				}
+
+
+				for	(j	=	0;	j	<	Ai->num_index;	j++)	{
+								size_t	len	=	strlen(reference_name);
+								size_t	rem	=	(size_t)256	-	len;
+								snprintf(&reference_name[len],	rem,	"[%d]",	my_index[j]);
+				}
+
+				/*	if	left_type	specifies	the	current	member,	stop	here	*/
+				if	(	(left_type	!=	NULL)	&&	(*left_type	!=	NULL)	&&	(Ai->attr	==	(*left_type)->attr))	{
+								return	0;
+				}	
+
+/****	Go	find	the	subreference	for	the	arrayed	struct	member	and	append	*********/
+
+				/*	get	the	offset	into	the	array	that	rAddr	points	to	*/
+				offset	=	0;
+				for	(j	=	0;	j	<	Ai->num_index;	j++)	{
+						m	=	my_index[j];
+						for(int	k	=	j	+	1;	m	&&	(k	<	Ai->num_index);	k++)	{
+								m	*=	Ai->index[k].size;
+						}
+						offset	+=	m*Ai->size;
+				}
+
+				{
+								char	buf[256];
+								ret	=	getCompositeSubReference(	rAddr,	left_type,	sAddr	+	Ai->offset	+	offset,	(ATTRIBUTES	*)	Ai->attr,	buf);
+
+								if	(ret	==	0)	{
+												size_t	len	=	strlen(reference_name);
+												size_t	rem	=	(size_t)256	-	len;
+												snprintf(&reference_name[len],	rem,	"%s",	buf);
+								}	else	{
+												return	1;	//	ERROR
+								}
+				}
+
+				return	0;
 }
 
 
-// MEMBER FUNCTION
-// Get the fully qualified varible name of the Allocation, given the address.
-
-std::string Trick::ClassicCheckPointAgent::get_var_name( void* addr,
-                                                         ATTRIBUTES* A,
-                                                         void* struct_addr,
-                                                         std::string name,
-                                                         ATTRIBUTES** left_type) {
-    char reference_name[256];
-    int ret;
-    std::string var_name;
-
-    var_name = name;
-    ret = getCompositeSubReference( addr, left_type, struct_addr, A, reference_name );
-
-    if (ret == 0) {
-        var_name += reference_name;
-    } else {
-          std::stringstream ss;
-          ss << "Checkpoint Agent ERROR: Unable to create a subreference of variable \"" << name << "\"."
-             << std::endl;
-          message_publish(MSG_ERROR, ss.str().c_str() );
-    }
-    return (var_name);
+//	MEMBER	FUNCTION
+//	Get	the	fully	qualified	varible	name	of	the	Allocation,	given	the	address.
+
+std::string	Trick::ClassicCheckPointAgent::get_var_name(	void*	addr,
+																																																									ATTRIBUTES*	A,
+																																																									void*	struct_addr,
+																																																									std::string	name,
+																																																									ATTRIBUTES**	left_type)	{
+				char	reference_name[256];
+				int	ret;
+				std::string	var_name;
+
+				var_name	=	name;
+				ret	=	getCompositeSubReference(	addr,	left_type,	struct_addr,	A,	reference_name	);
+
+				if	(ret	==	0)	{
+								var_name	+=	reference_name;
+				}	else	{
+										std::stringstream	ss;
+										ss	<<	"Checkpoint	Agent	ERROR:	Unable	to	create	a	subreference	of	variable	\""	<<	name	<<	"\"."
+													<<	std::endl;
+										message_publish(MSG_ERROR,	ss.str().c_str()	);
+				}
+				return	(var_name);
 }
 
-// MEMBER FUNCTION
-int Trick::ClassicCheckPointAgent::restore( std::istream* checkpoint_stream) {
-
-    ChkPtParseContext* context = new ChkPtParseContext( mem_mgr, checkpoint_stream);
-    int status = 0;
-
-    if ( CCP_parse( context)) {
-        status = 1;
-    } else if ((context->bad_declaration_count > 0) ||
-               (context->bad_assignment_count > 0)) {
-        std::stringstream ss;
-        ss << "Checkpoint Agent ERROR: " << context->bad_declaration_count << " invalid declaration(s) "
-           << "and " << context->bad_assignment_count << " invalid assignment(s)."
-           << std::endl;
-        message_publish(MSG_ERROR, ss.str().c_str() );
-        status = 1;
-    }
-
-    if (status) {
-        std::stringstream ss;
-        ss << "Checkpoint Agent ERROR: Checkpoint restore failed."
-           << std::endl;
-        message_publish(MSG_INFO, ss.str().c_str() );
-    }
-    delete context ;
-    return (status);
+//	MEMBER	FUNCTION
+int	Trick::ClassicCheckPointAgent::restore(	std::istream*	checkpoint_stream)	{
+
+				ChkPtParseContext*	context	=	new	ChkPtParseContext(	mem_mgr,	checkpoint_stream);
+				int	status	=	0;
+
+				if	(	CCP_parse(	context))	{
+								status	=	1;
+				}	else	if	((context->bad_declaration_count	>	0)	||
+															(context->bad_assignment_count	>	0))	{
+								std::stringstream	ss;
+								ss	<<	"Checkpoint	Agent	ERROR:	"	<<	context->bad_declaration_count	<<	"	invalid	declaration(s)	"
+											<<	"and	"	<<	context->bad_assignment_count	<<	"	invalid	assignment(s)."
+											<<	std::endl;
+								message_publish(MSG_ERROR,	ss.str().c_str()	);
+								status	=	1;
+				}
+
+				if	(status)	{
+								std::stringstream	ss;
+								ss	<<	"Checkpoint	Agent	ERROR:	Checkpoint	restore	failed."
+											<<	std::endl;
+								message_publish(MSG_INFO,	ss.str().c_str()	);
+				}
+				delete	context	;
+				return	(status);
 }
 
-// MEMBER FUNCTION
-int Trick::ClassicCheckPointAgent::is_nil_valued( void* address,
-                                                  ATTRIBUTES* attr,
-                                                  int curr_dim,
-                                                  int offset
-                                                ) {
-
-    char* test_addr;
-    int remaining_dimensions = attr->num_index - curr_dim;
-
-    /** @par Detailed Description: */
-
-    /** @par
-        If we're referencing a singleton then calculate the test-address
-        from the (base) address, the offset and the data-type. Then
-        test that calculated address (with the given type) for nil.
-        If it's nil return 1, otherwise return 0.
-     */
-    if (remaining_dimensions ==0) {
-
-        switch (attr->type) {
-           case TRICK_CHARACTER :
-           case TRICK_UNSIGNED_CHARACTER :
-               test_addr = (char*)address + offset * sizeof(char);
-               if (*(char*)test_addr == '\0') return(1);
-               break;
-           case TRICK_BOOLEAN:
-               test_addr = (char*)address + offset * sizeof(bool);
-               if (*(bool*)test_addr == false) return(1);
-               break;
-           case TRICK_WCHAR :
-               test_addr = (char*)address + offset * sizeof(wchar_t);
-               if (*(wchar_t*)test_addr == 0) return(1);
-               break;
-           case TRICK_SHORT :
-           case TRICK_UNSIGNED_SHORT :
-               test_addr = (char*)address + offset * sizeof(short);
-               if (*(short*)test_addr == 0) return(1);
-               break;
-           case TRICK_INTEGER :
-           case TRICK_UNSIGNED_INTEGER :
-               test_addr = (char*)address + offset * sizeof(int);
-               if (*(int*)test_addr == 0) return(1);
-               break;
-           case TRICK_ENUMERATED :
-               if ((size_t)attr->size == sizeof(int)) {
-                   test_addr = (char*)address + offset * sizeof(int);
-                   if (*(int*)test_addr == 0) return(1);
-               } else if ((size_t)attr->size == sizeof(short)) {
-                   test_addr = (char*)address + offset * sizeof(short);
-                   if (*(short*)test_addr == 0) return(1);
-               } else {
-                   return(-1);
-               }
-               break;
-           case TRICK_LONG :
-           case TRICK_UNSIGNED_LONG :
-               test_addr = (char*)address + offset * sizeof(long);
-               if (*(long*)test_addr == 0) return(1);
-               break;
-           case TRICK_FLOAT :
-               test_addr = (char*)address + offset * sizeof(float);
-               if (fpclassify( *(float*)test_addr) == FP_ZERO) return(1);
-               break;
-           case TRICK_DOUBLE :
-               test_addr = (char*)address + offset * sizeof(double);
-               if (fpclassify( *(double*)test_addr) == FP_ZERO) return(1);
-               break;
-           case TRICK_LONG_LONG :
-           case TRICK_UNSIGNED_LONG_LONG :
-               test_addr = (char*)address + offset * sizeof(long long);
-               if (*(long long*)test_addr == 0) return(1);
-               break;
-           case TRICK_BITFIELD :
-           case TRICK_UNSIGNED_BITFIELD :
-               test_addr = (char*)address + offset * (size_t)attr->size;
-               if (attr->size == sizeof(int)) {
-                   if (*(int*)test_addr == 0) return(1);
-               } else if (attr->size == sizeof(short)) {
-                   if (*(short*)test_addr == 0) return(1);
-               } else if (attr->size == sizeof(char)) {
-                   if (*(char*)test_addr == 0) return(1);
-               } else {
-                   message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-                                              "Unhandled bitfield struct size (%d) in bitfield assignment.\n", attr->size) ;
-                   return(-1);
-               }
-               break;
-           case TRICK_FILE_PTR :
-               // FIXME
-               return(0);
-               break;
-           case TRICK_STRING :
-               test_addr = (char*)address + offset * sizeof(void*);
-               if (*(std::string*)test_addr == "") return(1);
-               break;
-           case TRICK_STL :
-               // Can't test properly, always return 0 to indicate the STL is not empty.
-               return(0);
-               break;
-           default :
-               message_publish(MSG_ERROR, "Checkpoint Agent file %s: Unhandled Type (%d).\n", __FILE__, attr->type) ;
-               return(-1);
-               break;
-        }
-        return(0);
-
-    /** @par
-        If on the otherhand we are referencing an array, then we must consider two cases.
-     */
-    } else if (remaining_dimensions > 0) {
-       int curr_dim_size;
-       curr_dim_size = attr->index[curr_dim].size ;
-
-       /**  @par
-            If the array is unconstrained (i.e., it's a pointer) then we just need to check
-            whether the pointer is NULL.
-        */
-       if ( curr_dim_size == 0) {
-           test_addr = ((char*)address) + (offset*sizeof(void *));
-           if (*(char**)test_addr == NULL) return(1);
-
-       /** @par
-           If the array (at this dimension) is constrained (i.e., it's a fixed array )
-           then it is nil if and only if each of it's sub-elements (at the next dimension,
-           which can themselves be arrays) are nil. So, for each of the elements in current
-           dimension, we recursively call is_nil_valued() on each of the sub-elements to
-           find out whether this array is nil valued and return the result.
-           */
-       } else {
-           int ii;
-           int zerotest;
-
-           for (ii=0; ii < curr_dim_size; ii++) {
-               zerotest = is_nil_valued( address, attr, curr_dim+1, offset*curr_dim_size+ii);
-               if (!(zerotest == 1)) return(zerotest);
-           }
-           return(1);
-       }
-
-    } else {
-        return(-1);
-    }
-    return(0);
+//	MEMBER	FUNCTION
+int	Trick::ClassicCheckPointAgent::is_nil_valued(	void*	address,
+																																																		ATTRIBUTES*	attr,
+																																																		int	curr_dim,
+																																																		int	offset
+																																																)	{
+
+				char*	test_addr;
+				int	remaining_dimensions	=	attr->num_index	-	curr_dim;
+
+				/**	@par	Detailed	Description:	*/
+
+				/**	@par
+								If	we're	referencing	a	singleton	then	calculate	the	test-address
+								from	the	(base)	address,	the	offset	and	the	data-type.	Then
+								test	that	calculated	address	(with	the	given	type)	for	nil.
+								If	it's	nil	return	1,	otherwise	return	0.
+					*/
+				if	(remaining_dimensions	==0)	{
+
+								switch	(attr->type)	{
+											case	TRICK_CHARACTER	:
+											case	TRICK_UNSIGNED_CHARACTER	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(char);
+															if	(*(char*)test_addr	==	'\0')	return(1);
+															break;
+											case	TRICK_BOOLEAN:
+															test_addr	=	(char*)address	+	offset	*	sizeof(bool);
+															if	(*(bool*)test_addr	==	false)	return(1);
+															break;
+											case	TRICK_WCHAR	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(wchar_t);
+															if	(*(wchar_t*)test_addr	==	0)	return(1);
+															break;
+											case	TRICK_SHORT	:
+											case	TRICK_UNSIGNED_SHORT	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(short);
+															if	(*(short*)test_addr	==	0)	return(1);
+															break;
+											case	TRICK_INTEGER	:
+											case	TRICK_UNSIGNED_INTEGER	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(int);
+															if	(*(int*)test_addr	==	0)	return(1);
+															break;
+											case	TRICK_ENUMERATED	:
+															if	((size_t)attr->size	==	sizeof(int))	{
+																			test_addr	=	(char*)address	+	offset	*	sizeof(int);
+																			if	(*(int*)test_addr	==	0)	return(1);
+															}	else	if	((size_t)attr->size	==	sizeof(short))	{
+																			test_addr	=	(char*)address	+	offset	*	sizeof(short);
+																			if	(*(short*)test_addr	==	0)	return(1);
+															}	else	{
+																			return(-1);
+															}
+															break;
+											case	TRICK_LONG	:
+											case	TRICK_UNSIGNED_LONG	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(long);
+															if	(*(long*)test_addr	==	0)	return(1);
+															break;
+											case	TRICK_FLOAT	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(float);
+															if	(fpclassify(	*(float*)test_addr)	==	FP_ZERO)	return(1);
+															break;
+											case	TRICK_DOUBLE	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(double);
+															if	(fpclassify(	*(double*)test_addr)	==	FP_ZERO)	return(1);
+															break;
+											case	TRICK_LONG_LONG	:
+											case	TRICK_UNSIGNED_LONG_LONG	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(long	long);
+															if	(*(long	long*)test_addr	==	0)	return(1);
+															break;
+											case	TRICK_BITFIELD	:
+											case	TRICK_UNSIGNED_BITFIELD	:
+															test_addr	=	(char*)address	+	offset	*	(size_t)attr->size;
+															if	(attr->size	==	sizeof(int))	{
+																			if	(*(int*)test_addr	==	0)	return(1);
+															}	else	if	(attr->size	==	sizeof(short))	{
+																			if	(*(short*)test_addr	==	0)	return(1);
+															}	else	if	(attr->size	==	sizeof(char))	{
+																			if	(*(char*)test_addr	==	0)	return(1);
+															}	else	{
+																			message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+																																														"Unhandled	bitfield	struct	size	(%d)	in	bitfield	assignment.\n",	attr->size)	;
+																			return(-1);
+															}
+															break;
+											case	TRICK_FILE_PTR	:
+															//	FIXME
+															return(0);
+															break;
+											case	TRICK_STRING	:
+															test_addr	=	(char*)address	+	offset	*	sizeof(void*);
+															if	(*(std::string*)test_addr	==	"")	return(1);
+															break;
+											case	TRICK_STL	:
+															//	Can't	test	properly,	always	return	0	to	indicate	the	STL	is	not	empty.
+															return(0);
+															break;
+											default	:
+															message_publish(MSG_ERROR,	"Checkpoint	Agent	file	%s:	Unhandled	Type	(%d).\n",	__FILE__,	attr->type)	;
+															return(-1);
+															break;
+								}
+								return(0);
+
+				/**	@par
+								If	on	the	otherhand	we	are	referencing	an	array,	then	we	must	consider	two	cases.
+					*/
+				}	else	if	(remaining_dimensions	>	0)	{
+							int	curr_dim_size;
+							curr_dim_size	=	attr->index[curr_dim].size	;
+
+							/**		@par
+												If	the	array	is	unconstrained	(i.e.,	it's	a	pointer)	then	we	just	need	to	check
+												whether	the	pointer	is	NULL.
+								*/
+							if	(	curr_dim_size	==	0)	{
+											test_addr	=	((char*)address)	+	(offset*sizeof(void	*));
+											if	(*(char**)test_addr	==	NULL)	return(1);
+
+							/**	@par
+											If	the	array	(at	this	dimension)	is	constrained	(i.e.,	it's	a	fixed	array	)
+											then	it	is	nil	if	and	only	if	each	of	it's	sub-elements	(at	the	next	dimension,
+											which	can	themselves	be	arrays)	are	nil.	So,	for	each	of	the	elements	in	current
+											dimension,	we	recursively	call	is_nil_valued()	on	each	of	the	sub-elements	to
+											find	out	whether	this	array	is	nil	valued	and	return	the	result.
+											*/
+							}	else	{
+											int	ii;
+											int	zerotest;
+
+											for	(ii=0;	ii	<	curr_dim_size;	ii++)	{
+															zerotest	=	is_nil_valued(	address,	attr,	curr_dim+1,	offset*curr_dim_size+ii);
+															if	(!(zerotest	==	1))	return(zerotest);
+											}
+											return(1);
+							}
+
+				}	else	{
+								return(-1);
+				}
+				return(0);
 }
 
-// STATIC FUNCTION
-static void write_quoted_str( std::ostream& os, const char* s) {
-    int ii;
-    int len = strlen(s);
-    os << "\"" ;
-    for (ii=0 ; ii<len ; ii++) {
-        switch ((s)[ii]) {
-        case '\n': os << "\\n"; break;
-        case '\t': os << "\\t"; break;
-        case '\b': os << "\\b"; break;
-        case '\"': os << "\\\""; break;
-        default  : os << s[ii] ; break;
-        }
-    }
-    os << "\"" ;
+//	STATIC	FUNCTION
+static	void	write_quoted_str(	std::ostream&	os,	const	char*	s)	{
+				int	ii;
+				int	len	=	strlen(s);
+				os	<<	"\""	;
+				for	(ii=0	;	ii<len	;	ii++)	{
+								switch	((s)[ii])	{
+								case	'\n':	os	<<	"\\n";	break;
+								case	'\t':	os	<<	"\\t";	break;
+								case	'\b':	os	<<	"\\b";	break;
+								case	'\"':	os	<<	"\\\"";	break;
+								default		:	os	<<	s[ii]	;	break;
+								}
+				}
+				os	<<	"\""	;
 }
 
-void Trick::ClassicCheckPointAgent::write_singleton( std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int offset ) {
-
-    void* src_addr;
-
-    switch(attr->type) {
-        case TRICK_VOID:
-            chkpnt_os << std::endl << "// ERROR - VOID data type cannot be checkpointed." << std::endl;
-            message_publish(MSG_ERROR, "Checkpoint Agent ERROR: VOID data type cannot be checkpointed.\n") ;
-        break;
-        case TRICK_UNSIGNED_CHARACTER:
-            src_addr = (char*)address + offset * sizeof(unsigned char);
-            chkpnt_os << std::dec << (int)*(unsigned char*)src_addr ;
-        break;
-        case TRICK_BOOLEAN:
-            src_addr = (char*)address + offset * sizeof(bool);
-            if (*(bool*)src_addr) {
-                chkpnt_os << "true" ;
-            } else {
-                chkpnt_os << "false" ;
-            }
-        break;
-        case TRICK_CHARACTER:
-            src_addr = (char*)address + offset * sizeof(char);
-            if (isprint( *(char*)src_addr) ) {
-                chkpnt_os << "'" << *(char*)src_addr << "'" ;
-            } else {
-                unsigned int ch = *(unsigned char*)src_addr;
-                  chkpnt_os << "'\\x" << std::hex << ch << "'" ;
-            }
-        break;
-        case TRICK_WCHAR:
-            src_addr = (char*)address + offset * sizeof(wchar_t);
-            chkpnt_os << std::dec << *(wchar_t*)src_addr;
-            break;
-        case TRICK_SHORT:
-            src_addr = (char*)address + offset * sizeof(short);
-            chkpnt_os << std::dec << *(short*)src_addr;
-            break;
-        case TRICK_UNSIGNED_SHORT:
-            src_addr = (char*)address + offset * sizeof(unsigned short);
-            chkpnt_os << std::dec << *(unsigned short*)src_addr;
-            break;
-        case TRICK_ENUMERATED: {
-                int ii = 0;
-                int found = 0;
-                int value;
-                ENUM_ATTR* enum_attr;
-
-                if ((size_t)attr->size == sizeof(int)) {
-                    src_addr = (char*)address + offset * sizeof(int);
-                    value =  *(int*)src_addr;
-                } else if ((size_t)attr->size == sizeof(short)) {
-                    src_addr = (char*)address + offset * sizeof(short);
-                    value =  *(short*)src_addr;
-                } else {
-                    std::cerr << __FUNCTION__ << ": enumeration size error." << std::endl;
-                    std::cerr.flush();
-                    value = -1;
-                }
-
-                enum_attr = (ENUM_ATTR*)attr->attr;
-
-                while ( !found && (enum_attr[ii].label[0] != '\0')) {
-                   if (value == enum_attr[ii].value) {
-                       chkpnt_os << enum_attr[ii].label;
-                       found = 1;
-                   }
-                   ii++;
-                }
-                if (!found) {
-                    chkpnt_os << std::dec << value;
-                }
-
-            } break;
-        case TRICK_INTEGER:
-            src_addr = (char*)address + offset * sizeof(int);
-            chkpnt_os << std::dec << *(int*)src_addr;
-            break;
-        case TRICK_UNSIGNED_INTEGER:
-            src_addr = (char*)address + offset * sizeof(unsigned int);
-            chkpnt_os << std::dec << *(unsigned int*)src_addr;
-            break;
-        case TRICK_LONG:
-            src_addr = (char*)address + offset * sizeof(long);
-            chkpnt_os << std::dec << *(long*)src_addr;
-            break;
-        case TRICK_UNSIGNED_LONG:
-            src_addr = (char*)address + offset * sizeof(unsigned long);
-            chkpnt_os << std::dec << *(unsigned long*)src_addr;
-            break;
-        case TRICK_FLOAT:
-            src_addr = (char*)address + offset * sizeof(float);
-            if (fpclassify( *(float*)src_addr) != FP_NAN) {
-                if (hexfloat_checkpoint) {
-                    double temp_dbl = *(float*)src_addr;
-                    unsigned char* byte_p = (unsigned char*)&temp_dbl;
-                    chkpnt_os << "0g";
-                    for (int ii=sizeof(double)-1 ; ii>= 0 ; ii--) {
-                        chkpnt_os << std::hex << std::setw(2) << std::setfill('0') << (unsigned int)byte_p[ii];
-                    }
-                } else {
-                    chkpnt_os << std::setprecision(8) << *(float*)src_addr;
-                }
-            } else {
-                chkpnt_os << "NAN";
-            }
-            break;
-        case TRICK_DOUBLE:
-            src_addr = (char*)address + offset * sizeof(double);
-            if (fpclassify( *(double*)src_addr) != FP_NAN) {
-                if (hexfloat_checkpoint) {
-                    double temp_dbl = *(double*)src_addr;
-                    unsigned char* byte_p = (unsigned char*)&temp_dbl;
-                    chkpnt_os << "0g";
-                    for (int ii=sizeof(double)-1 ; ii>= 0 ; ii--) {
-                        chkpnt_os << std::hex << std::setw(2) << std::setfill('0') << (unsigned int)byte_p[ii];
-                    }
-                } else {
-                    chkpnt_os << std::setprecision(16) << *(double*)src_addr;
-                }
-            } else {
-                chkpnt_os << "NAN";
-            }
-            break;
-        case TRICK_BITFIELD: {
-                int sbf = 0;
-                src_addr = (char*)address + offset * (size_t)attr->size;
-                if (attr->size == sizeof(int)) {
-                     sbf = extract_bitfield_any( *(int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(short)) {
-                     sbf = extract_bitfield_any( *(short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(char)) {
-                     sbf = extract_bitfield_any( *(char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else {
-                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-                }
-                chkpnt_os << std::dec << sbf;
-            } break;
-        case TRICK_UNSIGNED_BITFIELD: {
-                int bf = 0;
-                src_addr = (char*)address + offset * (size_t)attr->size;
-                if (attr->size == sizeof(int)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(short)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(char)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else {
-                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-                }
-                chkpnt_os << std::dec << bf;
-            } break;
-        case TRICK_LONG_LONG:
-            src_addr = (char*)address + offset * sizeof(long long);
-            chkpnt_os << std::dec << *(long long*)src_addr;
-            break;
-        case TRICK_UNSIGNED_LONG_LONG:
-            src_addr = (char*)address + offset * sizeof(unsigned long long);
-            chkpnt_os << std::dec << *(unsigned long long*)src_addr;
-            break;
-        case  TRICK_FILE_PTR:
-            src_addr = (char*)address + offset * sizeof(void*);
-            chkpnt_os << *(void**)src_addr;
-            break;
-        case TRICK_STRING:
-            src_addr = (char*)address + offset * sizeof(std::string);
-            write_quoted_str(chkpnt_os, (*(std::string*)src_addr).c_str());
-            break;
-        case TRICK_OPAQUE_TYPE:
-            chkpnt_os << std::endl << "// ERROR - OPAQUE data type (" << attr->type_name << ") cannot be checkpointed." << std::endl;
-            message_publish(MSG_ERROR, "Checkpoint Agent ERROR: OPAQUE data type (%s) cannot be checkpointed.\n", attr->type_name) ;
-        break;
-        default:
-            chkpnt_os << "0";
-            message_publish(MSG_ERROR, "Checkpoint Agent file %s: Unhandled Type (%d).\n", __FILE__, attr->type) ;
-            break;
-    }
+void	Trick::ClassicCheckPointAgent::write_singleton(	std::ostream&	chkpnt_os,	void*	address,	ATTRIBUTES*	attr,	int	offset	)	{
+
+				void*	src_addr;
+
+				switch(attr->type)	{
+								case	TRICK_VOID:
+												chkpnt_os	<<	std::endl	<<	"//	ERROR	-	VOID	data	type	cannot	be	checkpointed."	<<	std::endl;
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	VOID	data	type	cannot	be	checkpointed.\n")	;
+								break;
+								case	TRICK_UNSIGNED_CHARACTER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	char);
+												chkpnt_os	<<	std::dec	<<	(int)*(unsigned	char*)src_addr	;
+								break;
+								case	TRICK_BOOLEAN:
+												src_addr	=	(char*)address	+	offset	*	sizeof(bool);
+												if	(*(bool*)src_addr)	{
+																chkpnt_os	<<	"true"	;
+												}	else	{
+																chkpnt_os	<<	"false"	;
+												}
+								break;
+								case	TRICK_CHARACTER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(char);
+												if	(isprint(	*(char*)src_addr)	)	{
+																chkpnt_os	<<	"'"	<<	*(char*)src_addr	<<	"'"	;
+												}	else	{
+																unsigned	int	ch	=	*(unsigned	char*)src_addr;
+																		chkpnt_os	<<	"'\\x"	<<	std::hex	<<	ch	<<	"'"	;
+												}
+								break;
+								case	TRICK_WCHAR:
+												src_addr	=	(char*)address	+	offset	*	sizeof(wchar_t);
+												chkpnt_os	<<	std::dec	<<	*(wchar_t*)src_addr;
+												break;
+								case	TRICK_SHORT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(short);
+												chkpnt_os	<<	std::dec	<<	*(short*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_SHORT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	short);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	short*)src_addr;
+												break;
+								case	TRICK_ENUMERATED:	{
+																int	ii	=	0;
+																int	found	=	0;
+																int	value;
+																ENUM_ATTR*	enum_attr;
+
+																if	((size_t)attr->size	==	sizeof(int))	{
+																				src_addr	=	(char*)address	+	offset	*	sizeof(int);
+																				value	=		*(int*)src_addr;
+																}	else	if	((size_t)attr->size	==	sizeof(short))	{
+																				src_addr	=	(char*)address	+	offset	*	sizeof(short);
+																				value	=		*(short*)src_addr;
+																}	else	{
+																				std::cerr	<<	__FUNCTION__	<<	":	enumeration	size	error."	<<	std::endl;
+																				std::cerr.flush();
+																				value	=	-1;
+																}
+
+																enum_attr	=	(ENUM_ATTR*)attr->attr;
+
+																while	(	!found	&&	(enum_attr[ii].label[0]	!=	'\0'))	{
+																			if	(value	==	enum_attr[ii].value)	{
+																							chkpnt_os	<<	enum_attr[ii].label;
+																							found	=	1;
+																			}
+																			ii++;
+																}
+																if	(!found)	{
+																				chkpnt_os	<<	std::dec	<<	value;
+																}
+
+												}	break;
+								case	TRICK_INTEGER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(int);
+												chkpnt_os	<<	std::dec	<<	*(int*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_INTEGER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	int);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	int*)src_addr;
+												break;
+								case	TRICK_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(long);
+												chkpnt_os	<<	std::dec	<<	*(long*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	long);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	long*)src_addr;
+												break;
+								case	TRICK_FLOAT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(float);
+												if	(fpclassify(	*(float*)src_addr)	!=	FP_NAN)	{
+																if	(hexfloat_checkpoint)	{
+																				double	temp_dbl	=	*(float*)src_addr;
+																				unsigned	char*	byte_p	=	(unsigned	char*)&temp_dbl;
+																				chkpnt_os	<<	"0g";
+																				for	(int	ii=sizeof(double)-1	;	ii>=	0	;	ii--)	{
+																								chkpnt_os	<<	std::hex	<<	std::setw(2)	<<	std::setfill('0')	<<	(unsigned	int)byte_p[ii];
+																				}
+																}	else	{
+																				chkpnt_os	<<	std::setprecision(8)	<<	*(float*)src_addr;
+																}
+												}	else	{
+																chkpnt_os	<<	"NAN";
+												}
+												break;
+								case	TRICK_DOUBLE:
+												src_addr	=	(char*)address	+	offset	*	sizeof(double);
+												if	(fpclassify(	*(double*)src_addr)	!=	FP_NAN)	{
+																if	(hexfloat_checkpoint)	{
+																				double	temp_dbl	=	*(double*)src_addr;
+																				unsigned	char*	byte_p	=	(unsigned	char*)&temp_dbl;
+																				chkpnt_os	<<	"0g";
+																				for	(int	ii=sizeof(double)-1	;	ii>=	0	;	ii--)	{
+																								chkpnt_os	<<	std::hex	<<	std::setw(2)	<<	std::setfill('0')	<<	(unsigned	int)byte_p[ii];
+																				}
+																}	else	{
+																				chkpnt_os	<<	std::setprecision(16)	<<	*(double*)src_addr;
+																}
+												}	else	{
+																chkpnt_os	<<	"NAN";
+												}
+												break;
+								case	TRICK_BITFIELD:	{
+																int	sbf	=	0;
+																src_addr	=	(char*)address	+	offset	*	(size_t)attr->size;
+																if	(attr->size	==	sizeof(int))	{
+																					sbf	=	extract_bitfield_any(	*(int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(short))	{
+																					sbf	=	extract_bitfield_any(	*(short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(char))	{
+																					sbf	=	extract_bitfield_any(	*(char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	{
+																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+																}
+																chkpnt_os	<<	std::dec	<<	sbf;
+												}	break;
+								case	TRICK_UNSIGNED_BITFIELD:	{
+																int	bf	=	0;
+																src_addr	=	(char*)address	+	offset	*	(size_t)attr->size;
+																if	(attr->size	==	sizeof(int))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(short))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(char))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	{
+																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+																}
+																chkpnt_os	<<	std::dec	<<	bf;
+												}	break;
+								case	TRICK_LONG_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(long	long);
+												chkpnt_os	<<	std::dec	<<	*(long	long*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_LONG_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	long	long);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	long	long*)src_addr;
+												break;
+								case		TRICK_FILE_PTR:
+												src_addr	=	(char*)address	+	offset	*	sizeof(void*);
+												chkpnt_os	<<	*(void**)src_addr;
+												break;
+								case	TRICK_STRING:
+												src_addr	=	(char*)address	+	offset	*	sizeof(std::string);
+												write_quoted_str(chkpnt_os,	(*(std::string*)src_addr).c_str());
+												break;
+								case	TRICK_OPAQUE_TYPE:
+												chkpnt_os	<<	std::endl	<<	"//	ERROR	-	OPAQUE	data	type	("	<<	attr->type_name	<<	")	cannot	be	checkpointed."	<<	std::endl;
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	OPAQUE	data	type	(%s)	cannot	be	checkpointed.\n",	attr->type_name)	;
+								break;
+								default:
+												chkpnt_os	<<	"0";
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	file	%s:	Unhandled	Type	(%d).\n",	__FILE__,	attr->type)	;
+												break;
+				}
 }
 
-// MEMBER FUNCTION
-// Get the variable-name associated with the given variable-address and data-type.
-// If no data-type is specified, (i.e., if attr == NULL), then the name will refer
-// to the (inner-most) primitive data-type associated with the address.
-
-// attr and curr_dim together specify the expected data-type.
-// If (attr == NULL) then type checking can't and won't be performed.
-
-std::string Trick::ClassicCheckPointAgent::
-    ref_string_from_ptr( void* pointer, ATTRIBUTES* attr, int curr_dim) {
-
-    std::string reference_string;
-
-    if ((attr != NULL) && ((curr_dim >= attr->num_index) || (attr->index[curr_dim].size != 0))) {
-        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: ref_string_from_ptr called with a non-pointer type.\n") ;
-    }
-
-    if (pointer == NULL) {
-        reference_string = "NULL";
-    } else {
-        ALLOC_INFO *alloc_info;
-
-        /** Find the allocation that contains the pointer-address. */
-        alloc_info = mem_mgr->get_alloc_info_of( pointer);
-
-        if (alloc_info != NULL) {
-            int alloc_elem_size;
-            int alloc_elem_index;
-            int misalignment;
-
-            alloc_elem_size = alloc_info->size;
-            alloc_elem_index = (int) (((long) pointer - (long) alloc_info->start) / alloc_elem_size);
-            misalignment = (int) (((long) pointer - (long) alloc_info->start) % alloc_elem_size);
-
-            // If type-checking AND the type specifiers match AND  the type we're looking for
-            // is either not structured or if it is, the attr-list that describes the contents
-            // of the structure is the same.
-
-            if ( (attr != NULL) && (attr->type == alloc_info->type) &&
-                 ( (attr->type != TRICK_STRUCTURED) || (attr->attr == alloc_info->attr))) {
-
-                int ii;
-                int n_l_ptrs, n_r_ptrs;
-
-                // Calculate the number of pointers (asterisks) on the left side of the assignment.
-                n_l_ptrs = attr->num_index - curr_dim;
-
-                // Calculate the number of pointers (asterisks) on the right side of the assignment.
-                n_r_ptrs = 0;
-                for (ii=0 ; ii <alloc_info->num_index ; ii++) {
-                    if (alloc_info->index[ii] == 0) n_r_ptrs++;
-                }
-
-                if (n_l_ptrs != (n_r_ptrs + 1)) {
-                    reference_string = "NULL /*ERROR: # asterisks disagree.*/";
-                } else {
-                    if (misalignment == 0) {
-                        std::stringstream workss;
-                        if (alloc_info->name != NULL) {
-                            workss << "&" << alloc_info->name;
-                            if (alloc_info->num_index != 0) {
-                                workss << "[" << alloc_elem_index << "]";
-                            }
-                            reference_string = workss.str();
-                        } else {
-                            std::stringstream ss;
-                            ss << "Checkpoint Agent ERROR: The name of the allocation at " << alloc_info->start << " is NULL."
-                               << "Therefore, Trick::ClassicCheckPointAgent::ref_string_from_ptr() can't generate a textual reference to it."
-                               << std::endl;
-                            message_publish(MSG_ERROR, ss.str().c_str() );
-                            reference_string = "ERROR - Allocation name is NULL";
-                        }
-
-                    } else {
-                        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Badly aligned pointer.\n"
-                                                   "   It is not aligned with the data object\n"
-                                                   "   (of the same type) into which it is pointing.\n") ;
-                        reference_string = "ERROR - Badly aligned pointer";
-                    }
-                }
-            } else if (alloc_info->type == TRICK_STRUCTURED) {
-                // The type specifications don't match, but the right-side is structured,
-                // so we apparently the matching type is buried in the right hand side structure.
-
-                if (alloc_info->name != NULL) {
-                    std::string rightside;
-                    std::stringstream element_name;
-                    element_name << "&" << alloc_info->name;
-                    if (alloc_info->num_index != 0) {
-                        element_name << '[' << alloc_elem_index << ']';
-                    }
-                    rightside = get_var_name( pointer,
-                                              alloc_info->attr,
-                                              (char *) alloc_info->start + (alloc_elem_index * alloc_info->size),
-                                              element_name.str(),
-                                              &attr
-                                            );
-                    reference_string = rightside;
-                } else {
-                    std::stringstream ss;
-                    ss << "Checkpoint Agent ERROR: The name of the allocation at " << alloc_info->start << " is NULL."
-                       << "Therefore, Trick::ClassicCheckPointAgent::ref_string_from_ptr() can't generate a textual reference to it."
-                       << std::endl;
-                    message_publish(MSG_ERROR, ss.str().c_str() );
-                    reference_string = "ERROR - Allocation name is NULL";
-                }
-            } else { // The type specifications don't match, and the right hand side is not structured
-
-                if (attr != NULL) {
-                    const char* left_type_spec  = trickTypeCharString(attr->type, "");
-                    const char* right_type_spec = trickTypeCharString(alloc_info->type, alloc_info->user_type_name);
-                    message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Type mismatch. Type specifications disagree.\n"
-                                               "   The left side type specifier is \"%s\" but the right side is \"%s\".\n",
-                                    left_type_spec, right_type_spec) ;
-                    reference_string = "ERROR - Type specifications disagree";
-                } else {
-
-                    if (misalignment == 0) {
-                        std::stringstream workss;
-
-                        if (alloc_info->name != NULL) {
-                            workss << "&" << alloc_info->name;
-                            if (alloc_info->num_index != 0) {
-                                workss << "[" << alloc_elem_index << "]";
-                            }
-                            reference_string = workss.str();
-                        } else {
-                            std::stringstream ss;
-                            ss << "Checkpoint Agent ERROR: The name of the allocation at " << alloc_info->start << " is NULL."
-                               << "Therefore, Trick::ClassicCheckPointAgent::ref_string_from_ptr() can't generate a textual reference to it."
-                               << std::endl;
-                            message_publish(MSG_ERROR, ss.str().c_str() );
-                            reference_string = "ERROR - Allocation name is NULL";
-                        }
-
-                    } else {
-                        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Badly aligned pointer.\n"
-                                                   "   It is not aligned with the data object\n"
-                                                   "   (of the same type) into which it is pointing.\n") ;
-                        reference_string = "ERROR - Badly Aligned Pointer";
-                    }
-                }
-
-            }
-        } else if ((attr != NULL) && ((curr_dim + 1) == attr->num_index)) {
-
-            if (attr->type == TRICK_CHARACTER) {
-                std::stringstream ss;
-                write_quoted_str( ss, (const char*)pointer);
-                reference_string = ss.str();
-            } else if (attr->type == TRICK_WCHAR) {
-                message_publish(MSG_ERROR, "Checkpoint Agent ERROR: TRICK_WCHAR not fully supported yet.\n") ;
-                reference_string = "ERROR: TRICK_WCHAR not fully supported yet.";
-            } else {
-                std::string lname = left_side_name();
-                message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Pointer <%p> in \"%s\" is not in Trick managed memory\n"
-                                           "nor is it a character pointer.\n", pointer, lname.c_str()) ;
-                reference_string = "ERROR - Pointer not in Trick managed memory";
-            }
-
-        } else {
-            std::string lname = left_side_name();
-            message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Pointer <%p> in \"%s\" is not in Trick managed memory\n"
-                                       "nor is it a character pointer.\n", pointer, lname.c_str()) ;
-            reference_string = "ERROR - Pointer not in Trick managed memory";
-        }
-    }
-    return( reference_string);
+//	MEMBER	FUNCTION
+//	Get	the	variable-name	associated	with	the	given	variable-address	and	data-type.
+//	If	no	data-type	is	specified,	(i.e.,	if	attr	==	NULL),	then	the	name	will	refer
+//	to	the	(inner-most)	primitive	data-type	associated	with	the	address.
+
+//	attr	and	curr_dim	together	specify	the	expected	data-type.
+//	If	(attr	==	NULL)	then	type	checking	can't	and	won't	be	performed.
+
+std::string	Trick::ClassicCheckPointAgent::
+				ref_string_from_ptr(	void*	pointer,	ATTRIBUTES*	attr,	int	curr_dim)	{
+
+				std::string	reference_string;
+
+				if	((attr	!=	NULL)	&&	((curr_dim	>=	attr->num_index)	||	(attr->index[curr_dim].size	!=	0)))	{
+								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	ref_string_from_ptr	called	with	a	non-pointer	type.\n")	;
+				}
+
+				if	(pointer	==	NULL)	{
+								reference_string	=	"NULL";
+				}	else	{
+								ALLOC_INFO	*alloc_info;
+
+								/**	Find	the	allocation	that	contains	the	pointer-address.	*/
+								alloc_info	=	mem_mgr->get_alloc_info_of(	pointer);
+
+								if	(alloc_info	!=	NULL)	{
+												int	alloc_elem_size;
+												int	alloc_elem_index;
+												int	misalignment;
+
+												alloc_elem_size	=	alloc_info->size;
+												alloc_elem_index	=	(int)	(((long)	pointer	-	(long)	alloc_info->start)	/	alloc_elem_size);
+												misalignment	=	(int)	(((long)	pointer	-	(long)	alloc_info->start)	%	alloc_elem_size);
+
+												//	If	type-checking	AND	the	type	specifiers	match	AND		the	type	we're	looking	for
+												//	is	either	not	structured	or	if	it	is,	the	attr-list	that	describes	the	contents
+												//	of	the	structure	is	the	same.
+
+												if	(	(attr	!=	NULL)	&&	(attr->type	==	alloc_info->type)	&&
+																	(	(attr->type	!=	TRICK_STRUCTURED)	||	(attr->attr	==	alloc_info->attr)))	{
+
+																int	ii;
+																int	n_l_ptrs,	n_r_ptrs;
+
+																//	Calculate	the	number	of	pointers	(asterisks)	on	the	left	side	of	the	assignment.
+																n_l_ptrs	=	attr->num_index	-	curr_dim;
+
+																//	Calculate	the	number	of	pointers	(asterisks)	on	the	right	side	of	the	assignment.
+																n_r_ptrs	=	0;
+																for	(ii=0	;	ii	<alloc_info->num_index	;	ii++)	{
+																				if	(alloc_info->index[ii]	==	0)	n_r_ptrs++;
+																}
+
+																if	(n_l_ptrs	!=	(n_r_ptrs	+	1))	{
+																				reference_string	=	"NULL	/*ERROR:	#	asterisks	disagree.*/";
+																}	else	{
+																				if	(misalignment	==	0)	{
+																								std::stringstream	workss;
+																								if	(alloc_info->name	!=	NULL)	{
+																												workss	<<	"&"	<<	alloc_info->name;
+																												if	(alloc_info->num_index	!=	0)	{
+																																workss	<<	"["	<<	alloc_elem_index	<<	"]";
+																												}
+																												reference_string	=	workss.str();
+																								}	else	{
+																												std::stringstream	ss;
+																												ss	<<	"Checkpoint	Agent	ERROR:	The	name	of	the	allocation	at	"	<<	alloc_info->start	<<	"	is	NULL."
+																															<<	"Therefore,	Trick::ClassicCheckPointAgent::ref_string_from_ptr()	can't	generate	a	textual	reference	to	it."
+																															<<	std::endl;
+																												message_publish(MSG_ERROR,	ss.str().c_str()	);
+																												reference_string	=	"ERROR	-	Allocation	name	is	NULL";
+																								}
+
+																				}	else	{
+																								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Badly	aligned	pointer.\n"
+																																																			"			It	is	not	aligned	with	the	data	object\n"
+																																																			"			(of	the	same	type)	into	which	it	is	pointing.\n")	;
+																								reference_string	=	"ERROR	-	Badly	aligned	pointer";
+																				}
+																}
+												}	else	if	(alloc_info->type	==	TRICK_STRUCTURED)	{
+																//	The	type	specifications	don't	match,	but	the	right-side	is	structured,
+																//	so	we	apparently	the	matching	type	is	buried	in	the	right	hand	side	structure.
+
+																if	(alloc_info->name	!=	NULL)	{
+																				std::string	rightside;
+																				std::stringstream	element_name;
+																				element_name	<<	"&"	<<	alloc_info->name;
+																				if	(alloc_info->num_index	!=	0)	{
+																								element_name	<<	'['	<<	alloc_elem_index	<<	']';
+																				}
+																				rightside	=	get_var_name(	pointer,
+																																														alloc_info->attr,
+																																														(char	*)	alloc_info->start	+	(alloc_elem_index	*	alloc_info->size),
+																																														element_name.str(),
+																																														&attr
+																																												);
+																				reference_string	=	rightside;
+																}	else	{
+																				std::stringstream	ss;
+																				ss	<<	"Checkpoint	Agent	ERROR:	The	name	of	the	allocation	at	"	<<	alloc_info->start	<<	"	is	NULL."
+																							<<	"Therefore,	Trick::ClassicCheckPointAgent::ref_string_from_ptr()	can't	generate	a	textual	reference	to	it."
+																							<<	std::endl;
+																				message_publish(MSG_ERROR,	ss.str().c_str()	);
+																				reference_string	=	"ERROR	-	Allocation	name	is	NULL";
+																}
+												}	else	{	//	The	type	specifications	don't	match,	and	the	right	hand	side	is	not	structured
+
+																if	(attr	!=	NULL)	{
+																				const	char*	left_type_spec		=	trickTypeCharString(attr->type,	"");
+																				const	char*	right_type_spec	=	trickTypeCharString(alloc_info->type,	alloc_info->user_type_name);
+																				message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Type	mismatch.	Type	specifications	disagree.\n"
+																																															"			The	left	side	type	specifier	is	\"%s\"	but	the	right	side	is	\"%s\".\n",
+																																				left_type_spec,	right_type_spec)	;
+																				reference_string	=	"ERROR	-	Type	specifications	disagree";
+																}	else	{
+
+																				if	(misalignment	==	0)	{
+																								std::stringstream	workss;
+
+																								if	(alloc_info->name	!=	NULL)	{
+																												workss	<<	"&"	<<	alloc_info->name;
+																												if	(alloc_info->num_index	!=	0)	{
+																																workss	<<	"["	<<	alloc_elem_index	<<	"]";
+																												}
+																												reference_string	=	workss.str();
+																								}	else	{
+																												std::stringstream	ss;
+																												ss	<<	"Checkpoint	Agent	ERROR:	The	name	of	the	allocation	at	"	<<	alloc_info->start	<<	"	is	NULL."
+																															<<	"Therefore,	Trick::ClassicCheckPointAgent::ref_string_from_ptr()	can't	generate	a	textual	reference	to	it."
+																															<<	std::endl;
+																												message_publish(MSG_ERROR,	ss.str().c_str()	);
+																												reference_string	=	"ERROR	-	Allocation	name	is	NULL";
+																								}
+
+																				}	else	{
+																								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Badly	aligned	pointer.\n"
+																																																			"			It	is	not	aligned	with	the	data	object\n"
+																																																			"			(of	the	same	type)	into	which	it	is	pointing.\n")	;
+																								reference_string	=	"ERROR	-	Badly	Aligned	Pointer";
+																				}
+																}
+
+												}
+								}	else	if	((attr	!=	NULL)	&&	((curr_dim	+	1)	==	attr->num_index))	{
+
+												if	(attr->type	==	TRICK_CHARACTER)	{
+																std::stringstream	ss;
+																write_quoted_str(	ss,	(const	char*)pointer);
+																reference_string	=	ss.str();
+												}	else	if	(attr->type	==	TRICK_WCHAR)	{
+																message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	TRICK_WCHAR	not	fully	supported	yet.\n")	;
+																reference_string	=	"ERROR:	TRICK_WCHAR	not	fully	supported	yet.";
+												}	else	{
+																std::string	lname	=	left_side_name();
+																message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Pointer	<%p>	in	\"%s\"	is	not	in	Trick	managed	memory\n"
+																																											"nor	is	it	a	character	pointer.\n",	pointer,	lname.c_str())	;
+																reference_string	=	"ERROR	-	Pointer	not	in	Trick	managed	memory";
+												}
+
+								}	else	{
+												std::string	lname	=	left_side_name();
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Pointer	<%p>	in	\"%s\"	is	not	in	Trick	managed	memory\n"
+																																							"nor	is	it	a	character	pointer.\n",	pointer,	lname.c_str())	;
+												reference_string	=	"ERROR	-	Pointer	not	in	Trick	managed	memory";
+								}
+				}
+				return(	reference_string);
 }
 
-// MEMBER FUNCTION
-void Trick::ClassicCheckPointAgent::write_rvalue( std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
+//	MEMBER	FUNCTION
+void	Trick::ClassicCheckPointAgent::write_rvalue(	std::ostream&	chkpnt_os,	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
 
-    // If the variable that we are pointing to is Un-arrayed
-    if (curr_dim == attr->num_index) {
+				//	If	the	variable	that	we	are	pointing	to	is	Un-arrayed
+				if	(curr_dim	==	attr->num_index)	{
 
-        write_singleton( chkpnt_os, address, attr, offset);
+								write_singleton(	chkpnt_os,	address,	attr,	offset);
 
-    // If the variable that we are pointing to is Arrayed
-    } else if (curr_dim < attr->num_index) {
+				//	If	the	variable	that	we	are	pointing	to	is	Arrayed
+				}	else	if	(curr_dim	<	attr->num_index)	{
 
-        // If the variable is a pointer
-        if (attr->index[curr_dim].size == 0) {
-            std::string ref_string;
+								//	If	the	variable	is	a	pointer
+								if	(attr->index[curr_dim].size	==	0)	{
+												std::string	ref_string;
 
-            void* pointer = *(void**)((char*)address + offset * sizeof(void*));
+												void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
 
-            ref_string = ref_string_from_ptr( pointer, attr, curr_dim);
+												ref_string	=	ref_string_from_ptr(	pointer,	attr,	curr_dim);
 
-            chkpnt_os << ref_string.c_str() ;
+												chkpnt_os	<<	ref_string.c_str()	;
 
-        } else { // Fixed dimension
+								}	else	{	//	Fixed	dimension
 
-            char* src_addr;
+												char*	src_addr;
 
-            // If this is the final, fixed dimension
-            if (((curr_dim + 1) == attr->num_index) ||
-                (attr->index[curr_dim + 1].size == 0)) {
+												//	If	this	is	the	final,	fixed	dimension
+												if	(((curr_dim	+	1)	==	attr->num_index)	||
+																(attr->index[curr_dim	+	1].size	==	0))	{
 
-                int use_quoted_string;
+																int	use_quoted_string;
 
-                // If ALL but the last of the elements of a character array
-                // "isprintable" AND the last is '\0' then print out the array
-                // as a quoted string. Otherwise print out each of the characters.
+																//	If	ALL	but	the	last	of	the	elements	of	a	character	array
+																//	"isprintable"	AND	the	last	is	'\0'	then	print	out	the	array
+																//	as	a	quoted	string.	Otherwise	print	out	each	of	the	characters.
 
-                use_quoted_string = 1;
-                if (attr->type == TRICK_CHARACTER) {
+																use_quoted_string	=	1;
+																if	(attr->type	==	TRICK_CHARACTER)	{
 
-                    int array_len = attr->index[curr_dim].size;
-                    int ii = array_len - 1;
-                    src_addr = (char*)address + offset * array_len * sizeof(char);
-                    if (src_addr[ii] != '\0') {
-                        use_quoted_string = 0;
-                    }
-                    ii--;
-                    while ( use_quoted_string && (ii >= 0) ) {
-                        use_quoted_string = isprint( src_addr[ii]);
-                        ii--;
-                    }
-                }
+																				int	array_len	=	attr->index[curr_dim].size;
+																				int	ii	=	array_len	-	1;
+																				src_addr	=	(char*)address	+	offset	*	array_len	*	sizeof(char);
+																				if	(src_addr[ii]	!=	'\0')	{
+																								use_quoted_string	=	0;
+																				}
+																				ii--;
+																				while	(	use_quoted_string	&&	(ii	>=	0)	)	{
+																								use_quoted_string	=	isprint(	src_addr[ii]);
+																								ii--;
+																				}
+																}
 
 
-                // This is necessary due to https://github.com/nasa/trick/issues/1399
-                // If there is a string array where the memory is not initialized, the code above
-                // can incorrectly decide to write it as a quoted string when it should be an
-                // empty array, causing a segfault when the checkpoint is reloaded.
-                if (attr->index[curr_dim + 1].size == 0 && ((curr_dim + 1) != attr->num_index)) {
-                    use_quoted_string = 0;
-                } 
+																//	This	is	necessary	due	to	https://github.com/nasa/trick/issues/1399
+																//	If	there	is	a	string	array	where	the	memory	is	not	initialized,	the	code	above
+																//	can	incorrectly	decide	to	write	it	as	a	quoted	string	when	it	should	be	an
+																//	empty	array,	causing	a	segfault	when	the	checkpoint	is	reloaded.
+																if	(attr->index[curr_dim	+	1].size	==	0	&&	((curr_dim	+	1)	!=	attr->num_index))	{
+																				use_quoted_string	=	0;
+																}	
 
 
-                if ((attr->type == TRICK_CHARACTER) && use_quoted_string)  {
+																if	((attr->type	==	TRICK_CHARACTER)	&&	use_quoted_string)		{
 
-                    write_quoted_str(chkpnt_os, src_addr);
+																				write_quoted_str(chkpnt_os,	src_addr);
 
-                } else {
+																}	else	{
 
-                    int ii, jj;
-                    int array_len;
+																				int	ii,	jj;
+																				int	array_len;
 
-                    // Determine the number of array elements we need to print out
-                    // to get all of the non-zero values.
+																				//	Determine	the	number	of	array	elements	we	need	to	print	out
+																				//	to	get	all	of	the	non-zero	values.
 
-                    array_len = attr->index[curr_dim].size ;
+																				array_len	=	attr->index[curr_dim].size	;
 
-                    chkpnt_os << "\n";
+																				chkpnt_os	<<	"\n";
 
-                    for (ii=0 ; ii < curr_dim+1 ; ii++) {
-                        chkpnt_os << "    ";
-                    }
-                    chkpnt_os << "{";
+																				for	(ii=0	;	ii	<	curr_dim+1	;	ii++)	{
+																								chkpnt_os	<<	"				";
+																				}
+																				chkpnt_os	<<	"{";
 
-                    for (ii = 0; ii < array_len ; ii++ ) {
+																				for	(ii	=	0;	ii	<	array_len	;	ii++	)	{
 
-                        if (ii > 0) {
-                            chkpnt_os << ", ";
+																								if	(ii	>	0)	{
+																												chkpnt_os	<<	",	";
 
-                            // Conditionally line-break and indent.
-                            if (( (ii+1) % array_elements_per_line[attr->type]) == 0 ) {
-                                // Line-break.
-                                chkpnt_os << "\n";
-                                // Indent.
-                                for (jj=0 ; jj < curr_dim+1 ; jj++) {
-                                    chkpnt_os << "    ";
-                                }
-                                chkpnt_os << " ";
-                            }
-                        }
-                        write_rvalue( chkpnt_os, address, attr, curr_dim + 1, offset * attr->index[curr_dim].size + ii);
-                    }
-                    chkpnt_os << "}";
+																												//	Conditionally	line-break	and	indent.
+																												if	((	(ii+1)	%	array_elements_per_line[attr->type])	==	0	)	{
+																																//	Line-break.
+																																chkpnt_os	<<	"\n";
+																																//	Indent.
+																																for	(jj=0	;	jj	<	curr_dim+1	;	jj++)	{
+																																				chkpnt_os	<<	"				";
+																																}
+																																chkpnt_os	<<	"	";
+																												}
+																								}
+																								write_rvalue(	chkpnt_os,	address,	attr,	curr_dim	+	1,	offset	*	attr->index[curr_dim].size	+	ii);
+																				}
+																				chkpnt_os	<<	"}";
 
-                }
+																}
 
-            } else { // Not the final fixed dimension.
+												}	else	{	//	Not	the	final	fixed	dimension.
 
-                int ii;
+																int	ii;
 
-                chkpnt_os << "\n";
-                for (ii=0 ; ii < curr_dim+1 ; ii++) {
-                    chkpnt_os << "    ";
-                }
-                chkpnt_os << "{";
+																chkpnt_os	<<	"\n";
+																for	(ii=0	;	ii	<	curr_dim+1	;	ii++)	{
+																				chkpnt_os	<<	"				";
+																}
+																chkpnt_os	<<	"{";
 
-                for (ii=0 ; ii< attr->index[curr_dim].size ; ii++) {
-                    if (ii > 0) {
-                        chkpnt_os << ",";
-                    }
-                    write_rvalue( chkpnt_os, address, attr, curr_dim + 1, offset * attr->index[curr_dim].size + ii);
-                }
+																for	(ii=0	;	ii<	attr->index[curr_dim].size	;	ii++)	{
+																				if	(ii	>	0)	{
+																								chkpnt_os	<<	",";
+																				}
+																				write_rvalue(	chkpnt_os,	address,	attr,	curr_dim	+	1,	offset	*	attr->index[curr_dim].size	+	ii);
+																}
 
-                chkpnt_os << "\n";
+																chkpnt_os	<<	"\n";
 
-                for (ii=0 ; ii < curr_dim+1 ; ii++) {
-                    chkpnt_os << "    " ;
-                }
-                chkpnt_os << "}";
-            }
-        }
+																for	(ii=0	;	ii	<	curr_dim+1	;	ii++)	{
+																				chkpnt_os	<<	"				"	;
+																}
+																chkpnt_os	<<	"}";
+												}
+								}
 
-    } else {
-        chkpnt_os << "/*ERROR*/";
+				}	else	{
+								chkpnt_os	<<	"/*ERROR*/";
 
-        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: The specified current dimension \"%d\" is greater\n"
-                                   "than the number of dimensions specified in the type ATTRIBUTES.\n", curr_dim) ;
+								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	The	specified	current	dimension	\"%d\"	is	greater\n"
+																																			"than	the	number	of	dimensions	specified	in	the	type	ATTRIBUTES.\n",	curr_dim)	;
 
-        return;
-    }
+								return;
+				}
 }
 
-// MEMBER FUNCTION
-// Create an assignment statement.
-void Trick::ClassicCheckPointAgent::assign_rvalue(std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
-
-    std::string lname = left_side_name();
-
-    if (!output_perm_check(attr)) {
-        if (debug_level) {
-            message_publish(MSG_DEBUG, "Checkpoint Agent INFO: No assignment generated for \"%s\" "
-                                       "because its io specification does not allow it.\n", lname.c_str()) ;
-        }
-        return;
-    }
-
-    if ((reduced_checkpoint && is_nil_valued( (void*)address, attr, curr_dim, offset ) ) ) {
-        if (debug_level) {
-            message_publish(MSG_DEBUG, "Checkpoint Agent INFO: No assignment generated for \"%s\" "
-                                       "because its value is nil and the reduced_checkpoint flag is set.\n", lname.c_str()) ;
-        }
-        return;
-    }
-
-    if (debug_level) {
-        message_publish(MSG_DEBUG, "Checkpoint Agent INFO: Generating assignment for [%p] %s.\n",(void*)address, lname.c_str()) ;
-    }
-
-    if (!input_perm_check(attr)) {
-        chkpnt_os << "/* OUTPUT-ONLY: ";
-    }
-    if ( attr->type == TRICK_STL ) {
-        chkpnt_os << "// STL: " << lname ;
-    } else {
-        chkpnt_os << lname << " = ";
-        write_rvalue( chkpnt_os, (void*)address, attr, curr_dim, offset);
-        chkpnt_os << ";";
-    }
-    if (!input_perm_check(attr)) {
-        chkpnt_os << "*/";
-    }
-    chkpnt_os << std::endl;
-    chkpnt_os.flush();
+//	MEMBER	FUNCTION
+//	Create	an	assignment	statement.
+void	Trick::ClassicCheckPointAgent::assign_rvalue(std::ostream&	chkpnt_os,	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
+
+				std::string	lname	=	left_side_name();
+
+				if	(!output_perm_check(attr))	{
+								if	(debug_level)	{
+												message_publish(MSG_DEBUG,	"Checkpoint	Agent	INFO:	No	assignment	generated	for	\"%s\"	"
+																																							"because	its	io	specification	does	not	allow	it.\n",	lname.c_str())	;
+								}
+								return;
+				}
+
+				if	((reduced_checkpoint	&&	is_nil_valued(	(void*)address,	attr,	curr_dim,	offset	)	)	)	{
+								if	(debug_level)	{
+												message_publish(MSG_DEBUG,	"Checkpoint	Agent	INFO:	No	assignment	generated	for	\"%s\"	"
+																																							"because	its	value	is	nil	and	the	reduced_checkpoint	flag	is	set.\n",	lname.c_str())	;
+								}
+								return;
+				}
+
+				if	(debug_level)	{
+								message_publish(MSG_DEBUG,	"Checkpoint	Agent	INFO:	Generating	assignment	for	[%p]	%s.\n",(void*)address,	lname.c_str())	;
+				}
+
+				if	(!input_perm_check(attr))	{
+								chkpnt_os	<<	"/*	OUTPUT-ONLY:	";
+				}
+				if	(	attr->type	==	TRICK_STL	)	{
+								chkpnt_os	<<	"//	STL:	"	<<	lname	;
+				}	else	{
+								chkpnt_os	<<	lname	<<	"	=	";
+								write_rvalue(	chkpnt_os,	(void*)address,	attr,	curr_dim,	offset);
+								chkpnt_os	<<	";";
+				}
+				if	(!input_perm_check(attr))	{
+								chkpnt_os	<<	"*/";
+				}
+				chkpnt_os	<<	std::endl;
+				chkpnt_os.flush();
 
 }
diff --git a/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp b/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp
index ed529875f..70bcfe0d0 100644
--- a/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp
+++ b/trick_source/sim_services/CheckPointAgent/PythonPrint.cpp
@@ -1,419 +1,419 @@
-#include <string>
-#include <cstring>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <stdlib.h>
-#include <math.h>
-
-#include "trick/PythonPrint.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/parameter_types.h"
-#include "trick/bitfield_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-// MEMBER FUNCTION
-bool Trick::PythonPrint::input_perm_check(ATTRIBUTES * attr __attribute__((unused))) {
-    return true ;
+#include	<string>
+#include	<cstring>
+#include	<iostream>
+#include	<iomanip>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<math.h>
+
+#include	"trick/PythonPrint.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/parameter_types.h"
+#include	"trick/bitfield_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+//	MEMBER	FUNCTION
+bool	Trick::PythonPrint::input_perm_check(ATTRIBUTES	*	attr	__attribute__((unused)))	{
+				return	true	;
 }
 
-// MEMBER FUNCTION
-bool Trick::PythonPrint::output_perm_check(ATTRIBUTES * attr __attribute__((unused))) {
-    return true ;
+//	MEMBER	FUNCTION
+bool	Trick::PythonPrint::output_perm_check(ATTRIBUTES	*	attr	__attribute__((unused)))	{
+				return	true	;
 }
 
 
-// MEMBER FUNCTION
-void Trick::PythonPrint::write_decl(std::ostream& chkpnt_os, ALLOC_INFO *info) {
-    (void)chkpnt_os ;
-    (void)info ;
-    return ;
+//	MEMBER	FUNCTION
+void	Trick::PythonPrint::write_decl(std::ostream&	chkpnt_os,	ALLOC_INFO	*info)	{
+				(void)chkpnt_os	;
+				(void)info	;
+				return	;
 }
 
-// MEMBER FUNCTION
-void Trick::PythonPrint::assign_rvalue(std::ostream& chkpnt_os, void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
+//	MEMBER	FUNCTION
+void	Trick::PythonPrint::assign_rvalue(std::ostream&	chkpnt_os,	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
 
-    chkpnt_os << left_side_name() << " = ";
-    write_rvalue( chkpnt_os, (void*)address, attr, curr_dim, offset);
-    chkpnt_os << ";" << std::endl;
+				chkpnt_os	<<	left_side_name()	<<	"	=	";
+				write_rvalue(	chkpnt_os,	(void*)address,	attr,	curr_dim,	offset);
+				chkpnt_os	<<	";"	<<	std::endl;
 
-    return ;
+				return	;
 }
 
-// MEMBER FUNCTION
-int Trick::PythonPrint::restore( std::istream* checkpoint_stream) {
-    (void)checkpoint_stream ;
-    return 0 ;
+//	MEMBER	FUNCTION
+int	Trick::PythonPrint::restore(	std::istream*	checkpoint_stream)	{
+				(void)checkpoint_stream	;
+				return	0	;
 }
 
 
-// STATIC FUNCTION
-static void write_quoted_str( std::ostream& os, const char* s, bool in_list) {
-    int ii;
-    int len = strlen(s);
-    if ( in_list ) { os << "\"" ; }
-    for (ii=0 ; ii<len ; ii++) {
-        switch ((s)[ii]) {
-        case '\n': os << "\\n"; break;
-        case '\t': os << "\\t"; break;
-        case '\b': os << "\\b"; break;
-        case '\"': os << "\\\""; break;
-        default  : os << s[ii] ; break;
-        }
-    }
-    if ( in_list ) { os << "\"" ; }
+//	STATIC	FUNCTION
+static	void	write_quoted_str(	std::ostream&	os,	const	char*	s,	bool	in_list)	{
+				int	ii;
+				int	len	=	strlen(s);
+				if	(	in_list	)	{	os	<<	"\""	;	}
+				for	(ii=0	;	ii<len	;	ii++)	{
+								switch	((s)[ii])	{
+								case	'\n':	os	<<	"\\n";	break;
+								case	'\t':	os	<<	"\\t";	break;
+								case	'\b':	os	<<	"\\b";	break;
+								case	'\"':	os	<<	"\\\"";	break;
+								default		:	os	<<	s[ii]	;	break;
+								}
+				}
+				if	(	in_list	)	{	os	<<	"\""	;	}
 }
 
-void Trick::PythonPrint::write_singleton( std::ostream& chkpnt_os, void* address,
- ATTRIBUTES* attr, int offset, bool write_units , bool in_list ) {
-
-    void* src_addr;
-
-    switch(attr->type) {
-        case TRICK_UNSIGNED_CHARACTER:
-            src_addr = (char*)address + offset * sizeof(unsigned char);
-            chkpnt_os << std::dec << (int)*(unsigned char*)src_addr ;
-        break;
-        case TRICK_BOOLEAN:
-            src_addr = (char*)address + offset * sizeof(bool);
-            if (*(bool*)src_addr) {
-                chkpnt_os << "True" ;
-            } else {
-                chkpnt_os << "False" ;
-            }
-        break;
-        case TRICK_CHARACTER:
-            src_addr = (char*)address + offset * sizeof(char);
-            if (isprint( *(char*)src_addr) ) {
-                chkpnt_os << "'" << *(char*)src_addr << "'" ;
-            } else {
-                //unsigned int ch = *(unsigned char*)src_addr;
-                //chkpnt_os << "'\\x" << hex << ch << "'" ;
-                int ch = *(char*)src_addr;
-                chkpnt_os << ch ;
-            }
-        break;
-        case TRICK_WCHAR:
-            src_addr = (char*)address + offset * sizeof(wchar_t);
-            chkpnt_os << std::dec << *(wchar_t*)src_addr;
-            break;
-        case TRICK_SHORT:
-            src_addr = (char*)address + offset * sizeof(short);
-            chkpnt_os << std::dec << *(short*)src_addr;
-            break;
-        case TRICK_UNSIGNED_SHORT:
-            src_addr = (char*)address + offset * sizeof(unsigned short);
-            chkpnt_os << std::dec << *(unsigned short*)src_addr;
-            break;
-        case TRICK_ENUMERATED: {
-                int ii = 0;
-                int found = 0;
-                int value;
-                ENUM_ATTR* enum_attr;
-
-                if ((size_t)attr->size == sizeof(int)) {
-                    src_addr = (char*)address + offset * sizeof(int);
-                    value =  *(int*)src_addr;
-                } else if ((size_t)attr->size == sizeof(short)) {
-                    src_addr = (char*)address + offset * sizeof(short);
-                    value =  *(short*)src_addr;
-                } else {
-                    std::cerr << __FUNCTION__ << " enumeration size error." << std::endl;
-                    std::cerr.flush();
-                    value = -1;
-                }
-
-                enum_attr = (ENUM_ATTR*)attr->attr;
-
-                while ( !found && (enum_attr[ii].label[0] != '\0')) {
-                   if (value == enum_attr[ii].value) {
-                       chkpnt_os << enum_attr[ii].label;
-                       found = 1;
-                   }
-                   ii++;
-                }
-                if (!found) {
-                    chkpnt_os << std::dec << value;
-                }
-
-            } break;
-        case TRICK_INTEGER:
-            src_addr = (char*)address + offset * sizeof(int);
-            chkpnt_os << std::dec << *(int*)src_addr;
-            break;
-        case TRICK_UNSIGNED_INTEGER:
-            src_addr = (char*)address + offset * sizeof(unsigned int);
-            chkpnt_os << std::dec << *(unsigned int*)src_addr;
-            break;
-        case TRICK_LONG:
-            src_addr = (char*)address + offset * sizeof(long);
-            chkpnt_os << std::dec << *(long*)src_addr;
-            break;
-        case TRICK_UNSIGNED_LONG:
-            src_addr = (char*)address + offset * sizeof(unsigned long);
-            chkpnt_os << std::dec << *(unsigned long*)src_addr;
-            break;
-        case TRICK_FLOAT:
-            src_addr = (char*)address + offset * sizeof(float);
-            if (fpclassify( *(float*)src_addr) != FP_NAN) {
-                chkpnt_os << std::setprecision(8) << *(float*)src_addr;
-            } else {
-                chkpnt_os << "nan";
-            }
-            break;
-        case TRICK_DOUBLE:
-            src_addr = (char*)address + offset * sizeof(double);
-            if (fpclassify( *(float*)src_addr) != FP_NAN) {
-                chkpnt_os << std::setprecision(16) << *(double*)src_addr;
-            } else {
-                chkpnt_os << "nan";
-            }
-            break;
-        case TRICK_BITFIELD: {
-                int sbf = 0;
-                src_addr = (char*)address + offset * (size_t)attr->size;
-                if (attr->size == sizeof(int)) {
-                     sbf = extract_bitfield_any( *(int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(short)) {
-                     sbf = extract_bitfield_any( *(short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(char)) {
-                     sbf = extract_bitfield_any( *(char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else {
-                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-                }
-                chkpnt_os << std::dec << sbf;
-            } break;
-        case TRICK_UNSIGNED_BITFIELD: {
-                int bf = 0;
-                src_addr = (char*)address + offset * (size_t)attr->size;
-                if (attr->size == sizeof(int)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(short)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else if (attr->size == sizeof(char)) {
-                     bf = extract_unsigned_bitfield_any( *(unsigned char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-                } else {
-                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-                }
-                chkpnt_os << std::dec << bf;
-            } break;
-        case TRICK_LONG_LONG:
-            src_addr = (char*)address + offset * sizeof(long long);
-            chkpnt_os << std::dec << *(long long*)src_addr;
-            break;
-        case TRICK_UNSIGNED_LONG_LONG:
-            src_addr = (char*)address + offset * sizeof(unsigned long long);
-            chkpnt_os << std::dec << *(unsigned long long*)src_addr;
-            break;
-        case  TRICK_FILE_PTR:
-            src_addr = (char*)address + offset * sizeof(void*);
-            chkpnt_os << *(void**)src_addr;
-            break;
-        case TRICK_STRING:
-            src_addr = (char*)address + offset * sizeof(std::string);
-            write_quoted_str(chkpnt_os, (*(std::string*)src_addr).c_str(), in_list);
-            break;
-        case TRICK_OPAQUE_TYPE:
-            chkpnt_os << "ERROR";
-            break;
-        default:
-            chkpnt_os << "0";
-            message_publish(MSG_ERROR, "Checkpoint Agent file %s: Unhandled Type (%d).\n", __FILE__, attr->type) ;
-            break;
-    }
-
-    if ( write_units && attr->units != NULL && strcmp(attr->units, "1") ) {
-            chkpnt_os << " " << attr->units ;
-    }
+void	Trick::PythonPrint::write_singleton(	std::ostream&	chkpnt_os,	void*	address,
+	ATTRIBUTES*	attr,	int	offset,	bool	write_units	,	bool	in_list	)	{
+
+				void*	src_addr;
+
+				switch(attr->type)	{
+								case	TRICK_UNSIGNED_CHARACTER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	char);
+												chkpnt_os	<<	std::dec	<<	(int)*(unsigned	char*)src_addr	;
+								break;
+								case	TRICK_BOOLEAN:
+												src_addr	=	(char*)address	+	offset	*	sizeof(bool);
+												if	(*(bool*)src_addr)	{
+																chkpnt_os	<<	"True"	;
+												}	else	{
+																chkpnt_os	<<	"False"	;
+												}
+								break;
+								case	TRICK_CHARACTER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(char);
+												if	(isprint(	*(char*)src_addr)	)	{
+																chkpnt_os	<<	"'"	<<	*(char*)src_addr	<<	"'"	;
+												}	else	{
+																//unsigned	int	ch	=	*(unsigned	char*)src_addr;
+																//chkpnt_os	<<	"'\\x"	<<	hex	<<	ch	<<	"'"	;
+																int	ch	=	*(char*)src_addr;
+																chkpnt_os	<<	ch	;
+												}
+								break;
+								case	TRICK_WCHAR:
+												src_addr	=	(char*)address	+	offset	*	sizeof(wchar_t);
+												chkpnt_os	<<	std::dec	<<	*(wchar_t*)src_addr;
+												break;
+								case	TRICK_SHORT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(short);
+												chkpnt_os	<<	std::dec	<<	*(short*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_SHORT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	short);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	short*)src_addr;
+												break;
+								case	TRICK_ENUMERATED:	{
+																int	ii	=	0;
+																int	found	=	0;
+																int	value;
+																ENUM_ATTR*	enum_attr;
+
+																if	((size_t)attr->size	==	sizeof(int))	{
+																				src_addr	=	(char*)address	+	offset	*	sizeof(int);
+																				value	=		*(int*)src_addr;
+																}	else	if	((size_t)attr->size	==	sizeof(short))	{
+																				src_addr	=	(char*)address	+	offset	*	sizeof(short);
+																				value	=		*(short*)src_addr;
+																}	else	{
+																				std::cerr	<<	__FUNCTION__	<<	"	enumeration	size	error."	<<	std::endl;
+																				std::cerr.flush();
+																				value	=	-1;
+																}
+
+																enum_attr	=	(ENUM_ATTR*)attr->attr;
+
+																while	(	!found	&&	(enum_attr[ii].label[0]	!=	'\0'))	{
+																			if	(value	==	enum_attr[ii].value)	{
+																							chkpnt_os	<<	enum_attr[ii].label;
+																							found	=	1;
+																			}
+																			ii++;
+																}
+																if	(!found)	{
+																				chkpnt_os	<<	std::dec	<<	value;
+																}
+
+												}	break;
+								case	TRICK_INTEGER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(int);
+												chkpnt_os	<<	std::dec	<<	*(int*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_INTEGER:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	int);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	int*)src_addr;
+												break;
+								case	TRICK_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(long);
+												chkpnt_os	<<	std::dec	<<	*(long*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	long);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	long*)src_addr;
+												break;
+								case	TRICK_FLOAT:
+												src_addr	=	(char*)address	+	offset	*	sizeof(float);
+												if	(fpclassify(	*(float*)src_addr)	!=	FP_NAN)	{
+																chkpnt_os	<<	std::setprecision(8)	<<	*(float*)src_addr;
+												}	else	{
+																chkpnt_os	<<	"nan";
+												}
+												break;
+								case	TRICK_DOUBLE:
+												src_addr	=	(char*)address	+	offset	*	sizeof(double);
+												if	(fpclassify(	*(float*)src_addr)	!=	FP_NAN)	{
+																chkpnt_os	<<	std::setprecision(16)	<<	*(double*)src_addr;
+												}	else	{
+																chkpnt_os	<<	"nan";
+												}
+												break;
+								case	TRICK_BITFIELD:	{
+																int	sbf	=	0;
+																src_addr	=	(char*)address	+	offset	*	(size_t)attr->size;
+																if	(attr->size	==	sizeof(int))	{
+																					sbf	=	extract_bitfield_any(	*(int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(short))	{
+																					sbf	=	extract_bitfield_any(	*(short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(char))	{
+																					sbf	=	extract_bitfield_any(	*(char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	{
+																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+																}
+																chkpnt_os	<<	std::dec	<<	sbf;
+												}	break;
+								case	TRICK_UNSIGNED_BITFIELD:	{
+																int	bf	=	0;
+																src_addr	=	(char*)address	+	offset	*	(size_t)attr->size;
+																if	(attr->size	==	sizeof(int))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(short))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	if	(attr->size	==	sizeof(char))	{
+																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																}	else	{
+																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+																}
+																chkpnt_os	<<	std::dec	<<	bf;
+												}	break;
+								case	TRICK_LONG_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(long	long);
+												chkpnt_os	<<	std::dec	<<	*(long	long*)src_addr;
+												break;
+								case	TRICK_UNSIGNED_LONG_LONG:
+												src_addr	=	(char*)address	+	offset	*	sizeof(unsigned	long	long);
+												chkpnt_os	<<	std::dec	<<	*(unsigned	long	long*)src_addr;
+												break;
+								case		TRICK_FILE_PTR:
+												src_addr	=	(char*)address	+	offset	*	sizeof(void*);
+												chkpnt_os	<<	*(void**)src_addr;
+												break;
+								case	TRICK_STRING:
+												src_addr	=	(char*)address	+	offset	*	sizeof(std::string);
+												write_quoted_str(chkpnt_os,	(*(std::string*)src_addr).c_str(),	in_list);
+												break;
+								case	TRICK_OPAQUE_TYPE:
+												chkpnt_os	<<	"ERROR";
+												break;
+								default:
+												chkpnt_os	<<	"0";
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	file	%s:	Unhandled	Type	(%d).\n",	__FILE__,	attr->type)	;
+												break;
+				}
+
+				if	(	write_units	&&	attr->units	!=	NULL	&&	strcmp(attr->units,	"1")	)	{
+												chkpnt_os	<<	"	"	<<	attr->units	;
+				}
 }
 
-// MEMBER FUNCTION
-std::string Trick::PythonPrint::
-    ref_string_from_ptr( void* pointer, ATTRIBUTES* attr, int curr_dim) {
-
-    /** Notice that attr and curr_dim together specify the type. */
-
-    std::string reference_string;
-
-    if ((curr_dim >= attr->num_index) || (attr->index[curr_dim].size != 0)) {
-        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: ref_string_from_ptr called with a non-pointer type.\n") ;
-    }
-
-    if (pointer == NULL) {
-        reference_string = "NULL";
-    } else {
-        ALLOC_INFO *alloc_info;
-
-        /** Find the allocation that contains the pointer-address. */
-        alloc_info = get_alloc_info_of( pointer);
-
-        if (alloc_info != NULL) {
-            std::stringstream workss;
-
-            if ( *(void **)pointer == NULL ) {
-                workss << "NULL" ;
-            } else if (((curr_dim + 1) == attr->num_index) && (attr->type == TRICK_CHARACTER)) {
-                workss << "\"" << *(char**)pointer << "\"" ;
-            } else {
-                workss << *(void **)pointer ;
-            }
-
-            reference_string = workss.str() ;
-
-        } else if (((curr_dim + 1) == attr->num_index) && (attr->type == TRICK_CHARACTER)) {
-            reference_string += (char*)pointer;
-        } else if (((curr_dim + 1) == attr->num_index) && (attr->type == TRICK_WCHAR)) {
-            message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR: TRICK_WCHAR not fully supported yet.\n") ;
-            reference_string = "NULL /* INTERNAL ERROR: TRICK_WCHAR not fully supported yet.*/";
-        } else {
-            message_publish(MSG_ERROR, "Checkpoint Agent ERROR: Pointer <%p> is not in Trick managed memory\n"
-                                       "nor is it a character pointer.\n", pointer) ;
-            reference_string = "NULL /*ERROR*/";
-        }
-    }
-    return( reference_string);
+//	MEMBER	FUNCTION
+std::string	Trick::PythonPrint::
+				ref_string_from_ptr(	void*	pointer,	ATTRIBUTES*	attr,	int	curr_dim)	{
+
+				/**	Notice	that	attr	and	curr_dim	together	specify	the	type.	*/
+
+				std::string	reference_string;
+
+				if	((curr_dim	>=	attr->num_index)	||	(attr->index[curr_dim].size	!=	0))	{
+								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	ref_string_from_ptr	called	with	a	non-pointer	type.\n")	;
+				}
+
+				if	(pointer	==	NULL)	{
+								reference_string	=	"NULL";
+				}	else	{
+								ALLOC_INFO	*alloc_info;
+
+								/**	Find	the	allocation	that	contains	the	pointer-address.	*/
+								alloc_info	=	get_alloc_info_of(	pointer);
+
+								if	(alloc_info	!=	NULL)	{
+												std::stringstream	workss;
+
+												if	(	*(void	**)pointer	==	NULL	)	{
+																workss	<<	"NULL"	;
+												}	else	if	(((curr_dim	+	1)	==	attr->num_index)	&&	(attr->type	==	TRICK_CHARACTER))	{
+																workss	<<	"\""	<<	*(char**)pointer	<<	"\""	;
+												}	else	{
+																workss	<<	*(void	**)pointer	;
+												}
+
+												reference_string	=	workss.str()	;
+
+								}	else	if	(((curr_dim	+	1)	==	attr->num_index)	&&	(attr->type	==	TRICK_CHARACTER))	{
+												reference_string	+=	(char*)pointer;
+								}	else	if	(((curr_dim	+	1)	==	attr->num_index)	&&	(attr->type	==	TRICK_WCHAR))	{
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:	TRICK_WCHAR	not	fully	supported	yet.\n")	;
+												reference_string	=	"NULL	/*	INTERNAL	ERROR:	TRICK_WCHAR	not	fully	supported	yet.*/";
+								}	else	{
+												message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	Pointer	<%p>	is	not	in	Trick	managed	memory\n"
+																																							"nor	is	it	a	character	pointer.\n",	pointer)	;
+												reference_string	=	"NULL	/*ERROR*/";
+								}
+				}
+				return(	reference_string);
 }
 
-// MEMBER FUNCTION
-void Trick::PythonPrint::write_rvalue( std::ostream& chkpnt_os, void* address,
- ATTRIBUTES* attr, int curr_dim, int offset, bool write_units , bool in_list ) {
+//	MEMBER	FUNCTION
+void	Trick::PythonPrint::write_rvalue(	std::ostream&	chkpnt_os,	void*	address,
+	ATTRIBUTES*	attr,	int	curr_dim,	int	offset,	bool	write_units	,	bool	in_list	)	{
 
-    // If the variable that we are pointing to is Un-arrayed
-    if (curr_dim == attr->num_index) {
+				//	If	the	variable	that	we	are	pointing	to	is	Un-arrayed
+				if	(curr_dim	==	attr->num_index)	{
 
-        write_singleton( chkpnt_os, address, attr, offset, write_units, in_list);
+								write_singleton(	chkpnt_os,	address,	attr,	offset,	write_units,	in_list);
 
-    // If the variable that we are pointing to is Arrayed
-    } else if (curr_dim < attr->num_index) {
+				//	If	the	variable	that	we	are	pointing	to	is	Arrayed
+				}	else	if	(curr_dim	<	attr->num_index)	{
 
-        // If the variable is a pointer
-        if (attr->index[curr_dim].size == 0) {
-            std::string ref_string;
+								//	If	the	variable	is	a	pointer
+								if	(attr->index[curr_dim].size	==	0)	{
+												std::string	ref_string;
 
-            //void* pointer = *(void**)((char*)address + offset * sizeof(void*));
+												//void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
 
-            void* pointer = (char*)address + offset * sizeof(void*);
-            ref_string = ref_string_from_ptr( pointer, attr, curr_dim);
+												void*	pointer	=	(char*)address	+	offset	*	sizeof(void*);
+												ref_string	=	ref_string_from_ptr(	pointer,	attr,	curr_dim);
 
-            chkpnt_os << ref_string.c_str() ;
+												chkpnt_os	<<	ref_string.c_str()	;
 
-        } else { // Fixed dimension
+								}	else	{	//	Fixed	dimension
 
-            char* src_addr;
+												char*	src_addr;
 
-            // If this is the final, fixed dimension
-            if (((curr_dim + 1) == attr->num_index) ||
-                (attr->index[curr_dim + 1].size == 0)) {
+												//	If	this	is	the	final,	fixed	dimension
+												if	(((curr_dim	+	1)	==	attr->num_index)	||
+																(attr->index[curr_dim	+	1].size	==	0))	{
 
-                int use_quoted_string;
+																int	use_quoted_string;
 
-                // If ALL but the last of the elements of a character array
-                // "isprintable" AND the last is '\0' then print out the array
-                // as a quoted string. Otherwise print out each of the characters.
+																//	If	ALL	but	the	last	of	the	elements	of	a	character	array
+																//	"isprintable"	AND	the	last	is	'\0'	then	print	out	the	array
+																//	as	a	quoted	string.	Otherwise	print	out	each	of	the	characters.
 
-                use_quoted_string = 1;
-                if (attr->type == TRICK_CHARACTER) {
-                    int ii = attr->index[curr_dim].size - 1;
-                    src_addr = (char*)address + offset * attr->index[curr_dim].size;
+																use_quoted_string	=	1;
+																if	(attr->type	==	TRICK_CHARACTER)	{
+																				int	ii	=	attr->index[curr_dim].size	-	1;
+																				src_addr	=	(char*)address	+	offset	*	attr->index[curr_dim].size;
 
-                    if (src_addr[ii] != '\0' || src_addr[0] == '\0' ) {
-                        use_quoted_string = 0;
-                    }
-                    ii--;
-                    while ( use_quoted_string && (ii >= 0) ) {
-                        use_quoted_string = isprint( src_addr[ii]) || src_addr[ii] == '\0' ;
-                        ii--;
-                    }
-                }
+																				if	(src_addr[ii]	!=	'\0'	||	src_addr[0]	==	'\0'	)	{
+																								use_quoted_string	=	0;
+																				}
+																				ii--;
+																				while	(	use_quoted_string	&&	(ii	>=	0)	)	{
+																								use_quoted_string	=	isprint(	src_addr[ii])	||	src_addr[ii]	==	'\0'	;
+																								ii--;
+																				}
+																}
 
-                if ((attr->type == TRICK_CHARACTER) && use_quoted_string)  {
-                    write_quoted_str(chkpnt_os, src_addr, in_list);
-                } else {
+																if	((attr->type	==	TRICK_CHARACTER)	&&	use_quoted_string)		{
+																				write_quoted_str(chkpnt_os,	src_addr,	in_list);
+																}	else	{
 
-                    int ii;
-                    int array_len;
+																				int	ii;
+																				int	array_len;
 
-                    // Determine the number of array elements we need to print out
-                    // to get all of the non-zero values.
+																				//	Determine	the	number	of	array	elements	we	need	to	print	out
+																				//	to	get	all	of	the	non-zero	values.
 
-                    array_len = attr->index[curr_dim].size ;
-                    chkpnt_os << "[";
+																				array_len	=	attr->index[curr_dim].size	;
+																				chkpnt_os	<<	"[";
 
-                    for (ii = 0; ii < array_len ; ii++ ) {
+																				for	(ii	=	0;	ii	<	array_len	;	ii++	)	{
 
-                        if (ii > 0) {
-                            chkpnt_os << ", ";
-                        }
-                        write_rvalue( chkpnt_os, address, attr, curr_dim + 1,
-                         offset * attr->index[curr_dim].size + ii, write_units, true);
-                    }
-                    chkpnt_os << "]";
+																								if	(ii	>	0)	{
+																												chkpnt_os	<<	",	";
+																								}
+																								write_rvalue(	chkpnt_os,	address,	attr,	curr_dim	+	1,
+																									offset	*	attr->index[curr_dim].size	+	ii,	write_units,	true);
+																				}
+																				chkpnt_os	<<	"]";
 
-                }
+																}
 
-            } else { // Not the final fixed dimension.
+												}	else	{	//	Not	the	final	fixed	dimension.
 
-                int ii;
+																int	ii;
 
-                chkpnt_os << "[";
+																chkpnt_os	<<	"[";
 
-                for (ii=0 ; ii< attr->index[curr_dim].size ; ii++) {
-                    if (ii > 0) {
-                        chkpnt_os << ",";
-                    }
-                    write_rvalue( chkpnt_os, address, attr, curr_dim + 1,
-                     offset * attr->index[curr_dim].size + ii, write_units, true);
-                }
+																for	(ii=0	;	ii<	attr->index[curr_dim].size	;	ii++)	{
+																				if	(ii	>	0)	{
+																								chkpnt_os	<<	",";
+																				}
+																				write_rvalue(	chkpnt_os,	address,	attr,	curr_dim	+	1,
+																					offset	*	attr->index[curr_dim].size	+	ii,	write_units,	true);
+																}
 
-                chkpnt_os << "]";
-            }
-        }
+																chkpnt_os	<<	"]";
+												}
+								}
 
-    } else {
-        chkpnt_os << "/*ERROR*/";
+				}	else	{
+								chkpnt_os	<<	"/*ERROR*/";
 
-        message_publish(MSG_ERROR, "Checkpoint Agent ERROR: The specified current dimension \"%d\" is greater\n"
-                                   "than the number of dimensions specified in the type ATTRIBUTES.\n", curr_dim) ;
+								message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	The	specified	current	dimension	\"%d\"	is	greater\n"
+																																			"than	the	number	of	dimensions	specified	in	the	type	ATTRIBUTES.\n",	curr_dim)	;
 
-        return;
-    }
+								return;
+				}
 }
 
-std::string Trick::PythonPrint::left_side_name() {
+std::string	Trick::PythonPrint::left_side_name()	{
 
-    std::string name ;
-    int ii;
-    int n_elements = leftside_stack.size();
+				std::string	name	;
+				int	ii;
+				int	n_elements	=	leftside_stack.size();
 
-    for (ii = 0; ii < n_elements ; ii++) {
+				for	(ii	=	0;	ii	<	n_elements	;	ii++)	{
 
-        VarNameElement & element = leftside_stack[ii];
+								VarNameElement	&	element	=	leftside_stack[ii];
 
-        switch( element.type) {
+								switch(	element.type)	{
 
-            case BASE_NAME: {
-                name = element.name;
-            } break;
+												case	BASE_NAME:	{
+																name	=	element.name;
+												}	break;
 
-            case ELEM_NAME: {
-                name += '.' + element.name;
-            } break;
+												case	ELEM_NAME:	{
+																name	+=	'.'	+	element.name;
+												}	break;
 
-            case ARRAY_INDEX: {
-                std::stringstream index_string;
-                index_string << element.index;
-                name += '[';
-                name += index_string.str();
-                name += ']';
-            } break;
+												case	ARRAY_INDEX:	{
+																std::stringstream	index_string;
+																index_string	<<	element.index;
+																name	+=	'[';
+																name	+=	index_string.str();
+																name	+=	']';
+												}	break;
 
-            default: {
-                message_publish(MSG_ERROR, "Checkpoint Agent ERROR: BADNESS!!\n") ;
-            }
-        }
-    }
-    return( name);
+												default:	{
+																message_publish(MSG_ERROR,	"Checkpoint	Agent	ERROR:	BADNESS!!\n")	;
+												}
+								}
+				}
+				return(	name);
 }
diff --git a/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
index 002f12896..be6e38a4c 100644
--- a/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
+++ b/trick_source/sim_services/CheckPointRestart/CheckPointRestart.cpp
@@ -1,404 +1,404 @@
 
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#include "trick/CheckPointRestart.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/SimObject.hh"
-#include "trick/Executive.hh"
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/TrickConstant.hh"
-
-Trick::CheckPointRestart * the_cpr ;
-
-Trick::CheckPointRestart::CheckPointRestart() {
-
-    int num_classes = 0 ;
-
-    pre_init_checkpoint = false ;
-    post_init_checkpoint = false ;
-    end_checkpoint = false ;
-    safestore_enabled = false ;
-    cpu_num = -1 ;
-    safestore_time = TRICK_MAX_LONG_LONG ;
-    load_checkpoint_file_name.clear() ;
-
-    write_checkpoint_job = NULL ;
-    safestore_checkpoint_job = NULL ;
-
-    class_map["checkpoint"] = num_classes ;
-    class_to_queue[num_classes++] = &checkpoint_queue ;
-
-    class_map["post_checkpoint"] = num_classes ;
-    class_to_queue[num_classes++] = &post_checkpoint_queue ;
-
-    class_map["preload_checkpoint"] = num_classes ;
-    class_to_queue[num_classes++] = &preload_checkpoint_queue ;
-
-    class_map["restart"] = num_classes ;
-    class_to_queue[num_classes++] = &restart_queue ;
-
-    the_cpr = this ;
+#include	<iostream>
+#include	<iomanip>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<sys/types.h>
+#include	<unistd.h>
+#include	<sys/syscall.h>
+#include	<sys/stat.h>
+#include	<string.h>
+
+#include	"trick/CheckPointRestart.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/TrickConstant.hh"
+
+Trick::CheckPointRestart	*	the_cpr	;
+
+Trick::CheckPointRestart::CheckPointRestart()	{
+
+				int	num_classes	=	0	;
+
+				pre_init_checkpoint	=	false	;
+				post_init_checkpoint	=	false	;
+				end_checkpoint	=	false	;
+				safestore_enabled	=	false	;
+				cpu_num	=	-1	;
+				safestore_time	=	TRICK_MAX_LONG_LONG	;
+				load_checkpoint_file_name.clear()	;
+
+				write_checkpoint_job	=	NULL	;
+				safestore_checkpoint_job	=	NULL	;
+
+				class_map["checkpoint"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&checkpoint_queue	;
+
+				class_map["post_checkpoint"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&post_checkpoint_queue	;
+
+				class_map["preload_checkpoint"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&preload_checkpoint_queue	;
+
+				class_map["restart"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&restart_queue	;
+
+				the_cpr	=	this	;
 }
 
-int Trick::CheckPointRestart::set_pre_init_checkpoint(bool yes_no) {
-    pre_init_checkpoint = yes_no ;
-    return(0) ;
+int	Trick::CheckPointRestart::set_pre_init_checkpoint(bool	yes_no)	{
+				pre_init_checkpoint	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::set_post_init_checkpoint(bool yes_no) {
-    post_init_checkpoint = yes_no ;
-    return(0) ;
+int	Trick::CheckPointRestart::set_post_init_checkpoint(bool	yes_no)	{
+				post_init_checkpoint	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::set_end_checkpoint(bool yes_no) {
-    end_checkpoint = yes_no ;
-    return(0) ;
+int	Trick::CheckPointRestart::set_end_checkpoint(bool	yes_no)	{
+				end_checkpoint	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::set_safestore_enabled(bool yes_no) {
-    safestore_enabled = yes_no ;
-    return(0) ;
+int	Trick::CheckPointRestart::set_safestore_enabled(bool	yes_no)	{
+				safestore_enabled	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::set_cpu_num(int in_cpu_num) {
-    if ( in_cpu_num <= 0 ) {
-        cpu_num = -1 ;
-    } else {
-        cpu_num = in_cpu_num ;
-    }
-    return(0) ;
+int	Trick::CheckPointRestart::set_cpu_num(int	in_cpu_num)	{
+				if	(	in_cpu_num	<=	0	)	{
+								cpu_num	=	-1	;
+				}	else	{
+								cpu_num	=	in_cpu_num	;
+				}
+				return(0)	;
 }
 
 
-const char * Trick::CheckPointRestart::get_output_file() {
-    return output_file.c_str() ;
+const	char	*	Trick::CheckPointRestart::get_output_file()	{
+				return	output_file.c_str()	;
 }
 
-const char * Trick::CheckPointRestart::get_load_file() {
-    return load_checkpoint_file_name.c_str() ;
+const	char	*	Trick::CheckPointRestart::get_load_file()	{
+				return	load_checkpoint_file_name.c_str()	;
 }
 
-int Trick::CheckPointRestart::find_write_checkpoint_jobs(std::string sim_object_name) {
+int	Trick::CheckPointRestart::find_write_checkpoint_jobs(std::string	sim_object_name)	{
 
-    write_checkpoint_job = exec_get_job(std::string(sim_object_name + ".write_checkpoint").c_str()) ;
-    if ( write_checkpoint_job == NULL ) {
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , "CheckPointRestart could not find write_checkpoint job" ) ;
-    } else {
-        write_checkpoint_job->next_tics = TRICK_MAX_LONG_LONG ;
-    }
+				write_checkpoint_job	=	exec_get_job(std::string(sim_object_name	+	".write_checkpoint").c_str())	;
+				if	(	write_checkpoint_job	==	NULL	)	{
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	"CheckPointRestart	could	not	find	write_checkpoint	job"	)	;
+				}	else	{
+								write_checkpoint_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
 
-    safestore_checkpoint_job = exec_get_job(std::string(sim_object_name + ".safestore_checkpoint").c_str()) ;
-    if ( safestore_checkpoint_job == NULL ) {
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , "CheckPointRestart could not find safestore_checkpoint job" ) ;
-    } else {
-        safestore_checkpoint_job->next_tics = TRICK_MAX_LONG_LONG ;
-    }
+				safestore_checkpoint_job	=	exec_get_job(std::string(sim_object_name	+	".safestore_checkpoint").c_str())	;
+				if	(	safestore_checkpoint_job	==	NULL	)	{
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	"CheckPointRestart	could	not	find	safestore_checkpoint	job"	)	;
+				}	else	{
+								safestore_checkpoint_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::checkpoint(double in_time) {
+int	Trick::CheckPointRestart::checkpoint(double	in_time)	{
 
-    long long curr_time = exec_get_time_tics() ;
-    long long new_time ;
+				long	long	curr_time	=	exec_get_time_tics()	;
+				long	long	new_time	;
 
-    new_time = (long long)(in_time * exec_get_time_tic_value()) ;
+				new_time	=	(long	long)(in_time	*	exec_get_time_tic_value())	;
 
-    if (new_time >= curr_time ) {
-        checkpoint_times.push(new_time) ;
-        if ( new_time < write_checkpoint_job->next_tics ) {
-            write_checkpoint_job->next_tics = new_time ;
-        }
-        //std::cout << "\033[33mSET CHECKPOINT TIME " << in_time << " " << new_time << "\033[0m" << std::endl ;
-    } else {
-        message_publish(MSG_ERROR, "Checkpoint time specified in the past. specified %f, current_time %f\n",
-         in_time , exec_get_sim_time()) ;
-    }
+				if	(new_time	>=	curr_time	)	{
+								checkpoint_times.push(new_time)	;
+								if	(	new_time	<	write_checkpoint_job->next_tics	)	{
+												write_checkpoint_job->next_tics	=	new_time	;
+								}
+								//std::cout	<<	"\033[33mSET	CHECKPOINT	TIME	"	<<	in_time	<<	"	"	<<	new_time	<<	"\033[0m"	<<	std::endl	;
+				}	else	{
+								message_publish(MSG_ERROR,	"Checkpoint	time	specified	in	the	past.	specified	%f,	current_time	%f\n",
+									in_time	,	exec_get_sim_time())	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::set_safestore_time(double in_time) {
+int	Trick::CheckPointRestart::set_safestore_time(double	in_time)	{
 
-    long long software_frame_tics ;
+				long	long	software_frame_tics	;
 
-    safestore_period = (long long)(in_time * exec_get_time_tic_value()) ;
-    software_frame_tics = exec_get_software_frame_tics() ;
+				safestore_period	=	(long	long)(in_time	*	exec_get_time_tic_value())	;
+				software_frame_tics	=	exec_get_software_frame_tics()	;
 
-    if ( safestore_period % software_frame_tics ) {
-        safestore_period = ((safestore_time / software_frame_tics) + 1 ) * software_frame_tics ;
-    }
-    safestore_time = safestore_period ;
+				if	(	safestore_period	%	software_frame_tics	)	{
+								safestore_period	=	((safestore_time	/	software_frame_tics)	+	1	)	*	software_frame_tics	;
+				}
+				safestore_time	=	safestore_period	;
 
-    if ( safestore_checkpoint_job != NULL ) {
-        safestore_checkpoint_job->next_tics = safestore_time ;
-    }
+				if	(	safestore_checkpoint_job	!=	NULL	)	{
+								safestore_checkpoint_job->next_tics	=	safestore_time	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::checkpoint(std::string file_name, bool print_status, std::string obj_list_str ) {
+int	Trick::CheckPointRestart::checkpoint(std::string	file_name,	bool	print_status,	std::string	obj_list_str	)	{
 
-    // first, empty the sim obj list to make sure there is nothing left from last time
-    obj_list.clear();
+				//	first,	empty	the	sim	obj	list	to	make	sure	there	is	nothing	left	from	last	time
+				obj_list.clear();
 
-    if (obj_list_str.compare("")) {
-        const char * tok = strtok((char*)obj_list_str.c_str(), ",");
-        while (tok != NULL) {
-            obj_list.push_back(tok);
-            tok = strtok(NULL, ",");
-        }
-    }
+				if	(obj_list_str.compare(""))	{
+								const	char	*	tok	=	strtok((char*)obj_list_str.c_str(),	",");
+								while	(tok	!=	NULL)	{
+												obj_list.push_back(tok);
+												tok	=	strtok(NULL,	",");
+								}
+				}
 
-    do_checkpoint(file_name, print_status) ;
+				do_checkpoint(file_name,	print_status)	;
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::do_checkpoint(std::string file_name, bool print_status) {
-
-    JobData * curr_job ;
-    pid_t pid;
-
-    if ( ! file_name.compare("") ) {
-        std::stringstream file_name_stream ;
-        file_name_stream << "chkpnt_" << std::fixed << std::setprecision(6) << exec_get_sim_time() ;
-        file_name = file_name_stream.str() ;
-    }
-    output_file = std::string(command_line_args_get_output_dir()) + "/" + file_name ;
-
-    checkpoint_queue.reset_curr_index() ;
-    while ( (curr_job = checkpoint_queue.get_next_job()) != NULL ) {
-        curr_job->parent_object->call_function(curr_job) ;
-    }
-
-    if ( cpu_num != -1 ) {
-    // if the user specified a cpu number for the checkpoint, fork a process to write the checkpoint
-        if ((pid = fork()) == 0) {
-#if __linux
-            if ( cpu_num >= 0 ) {
-                unsigned long mask;
-                mask = 1 << cpu_num ;
-                syscall((long) __NR_sched_setaffinity, 0, sizeof(mask), &mask);
-            }
+int	Trick::CheckPointRestart::do_checkpoint(std::string	file_name,	bool	print_status)	{
+
+				JobData	*	curr_job	;
+				pid_t	pid;
+
+				if	(	!	file_name.compare("")	)	{
+								std::stringstream	file_name_stream	;
+								file_name_stream	<<	"chkpnt_"	<<	std::fixed	<<	std::setprecision(6)	<<	exec_get_sim_time()	;
+								file_name	=	file_name_stream.str()	;
+				}
+				output_file	=	std::string(command_line_args_get_output_dir())	+	"/"	+	file_name	;
+
+				checkpoint_queue.reset_curr_index()	;
+				while	(	(curr_job	=	checkpoint_queue.get_next_job())	!=	NULL	)	{
+								curr_job->parent_object->call_function(curr_job)	;
+				}
+
+				if	(	cpu_num	!=	-1	)	{
+				//	if	the	user	specified	a	cpu	number	for	the	checkpoint,	fork	a	process	to	write	the	checkpoint
+								if	((pid	=	fork())	==	0)	{
+#if	__linux
+												if	(	cpu_num	>=	0	)	{
+																unsigned	long	mask;
+																mask	=	1	<<	cpu_num	;
+																syscall((long)	__NR_sched_setaffinity,	0,	sizeof(mask),	&mask);
+												}
 #endif
-#if __APPLE__
-            if ( cpu_num >= 0 ) {
-            }
+#if	__APPLE__
+												if	(	cpu_num	>=	0	)	{
+												}
 #endif
-            if (obj_list.empty()) {
-                trick_MM->write_checkpoint(output_file.c_str()) ;
-            } else {
-                trick_MM->write_checkpoint(output_file.c_str(), obj_list);
-            }
-            _Exit(0) ;
-        }
-    }
-    else {
-    // no fork
-        if (obj_list.empty()) {
-            trick_MM->write_checkpoint(output_file.c_str()) ;
-        } else {
-            trick_MM->write_checkpoint(output_file.c_str(), obj_list);
-        }
-    }
-
-    post_checkpoint_queue.reset_curr_index() ;
-    while ( (curr_job = post_checkpoint_queue.get_next_job()) != NULL ) {
-        curr_job->parent_object->call_function(curr_job) ;
-    }
-
-    if ( print_status ) {
-        message_publish(MSG_INFO, "Dumped ASCII Checkpoint %s.\n", file_name.c_str()) ;
-    }
-
-    return 0 ;
+												if	(obj_list.empty())	{
+																trick_MM->write_checkpoint(output_file.c_str())	;
+												}	else	{
+																trick_MM->write_checkpoint(output_file.c_str(),	obj_list);
+												}
+												_Exit(0)	;
+								}
+				}
+				else	{
+				//	no	fork
+								if	(obj_list.empty())	{
+												trick_MM->write_checkpoint(output_file.c_str())	;
+								}	else	{
+												trick_MM->write_checkpoint(output_file.c_str(),	obj_list);
+								}
+				}
+
+				post_checkpoint_queue.reset_curr_index()	;
+				while	(	(curr_job	=	post_checkpoint_queue.get_next_job())	!=	NULL	)	{
+								curr_job->parent_object->call_function(curr_job)	;
+				}
+
+				if	(	print_status	)	{
+								message_publish(MSG_INFO,	"Dumped	ASCII	Checkpoint	%s.\n",	file_name.c_str())	;
+				}
+
+				return	0	;
 }
 
-int Trick::CheckPointRestart::write_checkpoint() {
+int	Trick::CheckPointRestart::write_checkpoint()	{
 
-    long long curr_time = exec_get_time_tics() ;
+				long	long	curr_time	=	exec_get_time_tics()	;
 
-    // checkpoint time is set in a read event that occurs at top of frame
-    if ( curr_time == checkpoint_times.top() ) {
+				//	checkpoint	time	is	set	in	a	read	event	that	occurs	at	top	of	frame
+				if	(	curr_time	==	checkpoint_times.top()	)	{
 
-        // remove all times at the top of the queue that match the current time.
-        while ( !checkpoint_times.empty() and (checkpoint_times.top() == curr_time) ) {
-            checkpoint_times.pop() ;
-        }
+								//	remove	all	times	at	the	top	of	the	queue	that	match	the	current	time.
+								while	(	!checkpoint_times.empty()	and	(checkpoint_times.top()	==	curr_time)	)	{
+												checkpoint_times.pop()	;
+								}
 
-        if ( !checkpoint_times.empty() ) {
-            write_checkpoint_job->next_tics = checkpoint_times.top() ;
-        } else {
-            write_checkpoint_job->next_tics = TRICK_MAX_LONG_LONG ;
-        }
+								if	(	!checkpoint_times.empty()	)	{
+												write_checkpoint_job->next_tics	=	checkpoint_times.top()	;
+								}	else	{
+												write_checkpoint_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+								}
 
-        double sim_time = exec_get_sim_time() ;
-        std::stringstream chk_name_stream ;
+								double	sim_time	=	exec_get_sim_time()	;
+								std::stringstream	chk_name_stream	;
 
-        chk_name_stream << "chkpnt_" << std::fixed << std::setprecision(6) << sim_time ;
+								chk_name_stream	<<	"chkpnt_"	<<	std::fixed	<<	std::setprecision(6)	<<	sim_time	;
 
-        checkpoint( chk_name_stream.str() );
+								checkpoint(	chk_name_stream.str()	);
 
-    }
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::write_pre_init_checkpoint() {
-    if ( pre_init_checkpoint ) {
-        checkpoint(std::string("chkpnt_pre_init")) ;
-    }
-    return 0  ;
+int	Trick::CheckPointRestart::write_pre_init_checkpoint()	{
+				if	(	pre_init_checkpoint	)	{
+								checkpoint(std::string("chkpnt_pre_init"))	;
+				}
+				return	0		;
 }
 
-int Trick::CheckPointRestart::write_post_init_checkpoint() {
-    if ( post_init_checkpoint ) {
-        checkpoint(std::string("chkpnt_post_init")) ;
-    }
-    return 0  ;
+int	Trick::CheckPointRestart::write_post_init_checkpoint()	{
+				if	(	post_init_checkpoint	)	{
+								checkpoint(std::string("chkpnt_post_init"))	;
+				}
+				return	0		;
 }
 
-int Trick::CheckPointRestart::write_end_checkpoint() {
-    if ( end_checkpoint ) {
-        checkpoint(std::string("chkpnt_end")) ;
-    }
-    return 0  ;
+int	Trick::CheckPointRestart::write_end_checkpoint()	{
+				if	(	end_checkpoint	)	{
+								checkpoint(std::string("chkpnt_end"))	;
+				}
+				return	0		;
 }
 
-int Trick::CheckPointRestart::safestore_checkpoint() {
+int	Trick::CheckPointRestart::safestore_checkpoint()	{
 
-    if ( safestore_enabled) {
-        checkpoint(std::string("chkpnt_safestore"), false) ;
-        safestore_time += safestore_period ;
-    }
+				if	(	safestore_enabled)	{
+								checkpoint(std::string("chkpnt_safestore"),	false)	;
+								safestore_time	+=	safestore_period	;
+				}
 
-    if ( safestore_checkpoint_job != NULL ) {
-        safestore_checkpoint_job->next_tics = safestore_time ;
-    }
+				if	(	safestore_checkpoint_job	!=	NULL	)	{
+								safestore_checkpoint_job->next_tics	=	safestore_time	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-void Trick::CheckPointRestart::load_checkpoint(std::string file_name) {
-    load_checkpoint_file_name = file_name ;
+void	Trick::CheckPointRestart::load_checkpoint(std::string	file_name)	{
+				load_checkpoint_file_name	=	file_name	;
 }
 
-void Trick::CheckPointRestart::load_checkpoint(std::string file_name, bool stls_on) {
-    trick_MM->set_restore_stls_default(stls_on);
-    load_checkpoint(file_name);
+void	Trick::CheckPointRestart::load_checkpoint(std::string	file_name,	bool	stls_on)	{
+				trick_MM->set_restore_stls_default(stls_on);
+				load_checkpoint(file_name);
 }
 
-int Trick::CheckPointRestart::load_checkpoint_job() {
+int	Trick::CheckPointRestart::load_checkpoint_job()	{
 
-    JobData * curr_job ;
-    struct stat temp_buf ;
+				JobData	*	curr_job	;
+				struct	stat	temp_buf	;
 
-    if ( ! load_checkpoint_file_name.empty() ) {
+				if	(	!	load_checkpoint_file_name.empty()	)	{
 
-        if ( stat( load_checkpoint_file_name.c_str() , &temp_buf) == 0 ) {
-            preload_checkpoint_queue.reset_curr_index() ;
-            while ( (curr_job = preload_checkpoint_queue.get_next_job()) != NULL ) {
-                curr_job->call() ;
-            }
+								if	(	stat(	load_checkpoint_file_name.c_str()	,	&temp_buf)	==	0	)	{
+												preload_checkpoint_queue.reset_curr_index()	;
+												while	(	(curr_job	=	preload_checkpoint_queue.get_next_job())	!=	NULL	)	{
+																curr_job->call()	;
+												}
 
-            // clear the queues!  They will be rebuilt when the executive calls its restart job.
-            checkpoint_queue.clear() ;
-            post_checkpoint_queue.clear() ;
-            preload_checkpoint_queue.clear() ;
-            restart_queue.clear() ;
+												//	clear	the	queues!		They	will	be	rebuilt	when	the	executive	calls	its	restart	job.
+												checkpoint_queue.clear()	;
+												post_checkpoint_queue.clear()	;
+												preload_checkpoint_queue.clear()	;
+												restart_queue.clear()	;
 
-            message_publish(MSG_INFO, "Load checkpoint file %s.\n", load_checkpoint_file_name.c_str()) ;
-            trick_MM->init_from_checkpoint(load_checkpoint_file_name.c_str()) ;
+												message_publish(MSG_INFO,	"Load	checkpoint	file	%s.\n",	load_checkpoint_file_name.c_str())	;
+												trick_MM->init_from_checkpoint(load_checkpoint_file_name.c_str())	;
 
-            message_publish(MSG_INFO, "Finished loading checkpoint file.  Calling restart jobs.\n") ;
+												message_publish(MSG_INFO,	"Finished	loading	checkpoint	file.		Calling	restart	jobs.\n")	;
 
-            // bootstrap the sim_objects back into the executive!
-            // TODO: MAKE AN exec_restart() CALL THAT DOES NOT REQUIRE WE USE the_exec.
-            the_exec->restart() ;
+												//	bootstrap	the	sim_objects	back	into	the	executive!
+												//	TODO:	MAKE	AN	exec_restart()	CALL	THAT	DOES	NOT	REQUIRE	WE	USE	the_exec.
+												the_exec->restart()	;
 
-            // the restart queue will be rebuilt by the executive.
-            restart_queue.reset_curr_index() ;
-            while ( (curr_job = restart_queue.get_next_job()) != NULL ) {
-                curr_job->call() ;
-            }
-        } else {
-            message_publish(MSG_INFO, "Could not find checkpoint file %s.\n", load_checkpoint_file_name.c_str()) ;
-        }
-        load_checkpoint_file_name.clear() ;
-    }
+												//	the	restart	queue	will	be	rebuilt	by	the	executive.
+												restart_queue.reset_curr_index()	;
+												while	(	(curr_job	=	restart_queue.get_next_job())	!=	NULL	)	{
+																curr_job->call()	;
+												}
+								}	else	{
+												message_publish(MSG_INFO,	"Could	not	find	checkpoint	file	%s.\n",	load_checkpoint_file_name.c_str())	;
+								}
+								load_checkpoint_file_name.clear()	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::CheckPointRestart::write_s_job_execution(FILE *fp) {
+int	Trick::CheckPointRestart::write_s_job_execution(FILE	*fp)	{
 
-    if ( fp == NULL ) {
-        return(0) ;
-    }
+				if	(	fp	==	NULL	)	{
+								return(0)	;
+				}
 
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "CheckPointRestart :\n\n") ;
-    checkpoint_queue.write_non_sched_queue(fp) ;
-    post_checkpoint_queue.write_non_sched_queue(fp) ;
-    preload_checkpoint_queue.write_non_sched_queue(fp) ;
-    restart_queue.write_non_sched_queue(fp) ;
-    return 0 ;
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"CheckPointRestart	:\n\n")	;
+				checkpoint_queue.write_non_sched_queue(fp)	;
+				post_checkpoint_queue.write_non_sched_queue(fp)	;
+				preload_checkpoint_queue.write_non_sched_queue(fp)	;
+				restart_queue.write_non_sched_queue(fp)	;
+				return	0	;
 }
 
-int Trick::CheckPointRestart::instrument_job_before( Trick::JobData * instrument_job ) {
+int	Trick::CheckPointRestart::instrument_job_before(	Trick::JobData	*	instrument_job	)	{
 
-    int count = 0 ;
+				int	count	=	0	;
 
-    /** @par Detailed Design: */
+				/**	@par	Detailed	Design:	*/
 
-    /** @li if target_job specified, instrument job will only be inserted before it
-        note: when more than one target job with same name, this will insert instrument job for 1st occurrence of target_job in each queue
-     */
-    count += checkpoint_queue.instrument_before(instrument_job) ;
-    count += preload_checkpoint_queue.instrument_before(instrument_job) ;
-    count += restart_queue.instrument_before(instrument_job) ;
+				/**	@li	if	target_job	specified,	instrument	job	will	only	be	inserted	before	it
+								note:	when	more	than	one	target	job	with	same	name,	this	will	insert	instrument	job	for	1st	occurrence	of	target_job	in	each	queue
+					*/
+				count	+=	checkpoint_queue.instrument_before(instrument_job)	;
+				count	+=	preload_checkpoint_queue.instrument_before(instrument_job)	;
+				count	+=	restart_queue.instrument_before(instrument_job)	;
 
-    /** @li Return how many insertions were done. */
-    return(count) ;
+				/**	@li	Return	how	many	insertions	were	done.	*/
+				return(count)	;
 
 }
 
-int Trick::CheckPointRestart::instrument_job_after( Trick::JobData * instrument_job ) {
+int	Trick::CheckPointRestart::instrument_job_after(	Trick::JobData	*	instrument_job	)	{
 
-    int count = 0 ;
+				int	count	=	0	;
 
-    /** @par Detailed Design */
-    // if target_job specified, instrument job will only be inserted after it
-    // note: when more than one target job with same name, this will insert instrument job for 1st occurrence of target_job in each queue
+				/**	@par	Detailed	Design	*/
+				//	if	target_job	specified,	instrument	job	will	only	be	inserted	after	it
+				//	note:	when	more	than	one	target	job	with	same	name,	this	will	insert	instrument	job	for	1st	occurrence	of	target_job	in	each	queue
 
-    count += checkpoint_queue.instrument_after(instrument_job) ;
-    count += preload_checkpoint_queue.instrument_after(instrument_job) ;
-    count += restart_queue.instrument_after(instrument_job) ;
+				count	+=	checkpoint_queue.instrument_after(instrument_job)	;
+				count	+=	preload_checkpoint_queue.instrument_after(instrument_job)	;
+				count	+=	restart_queue.instrument_after(instrument_job)	;
 
-    /** @li Return how many insertions were done. */
-    return(count) ;
+				/**	@li	Return	how	many	insertions	were	done.	*/
+				return(count)	;
 
 }
 
-int Trick::CheckPointRestart::instrument_job_remove(std::string in_job) {
+int	Trick::CheckPointRestart::instrument_job_remove(std::string	in_job)	{
 
-    checkpoint_queue.instrument_remove(in_job) ;
-    preload_checkpoint_queue.instrument_remove(in_job) ;
-    restart_queue.instrument_remove(in_job) ;
+				checkpoint_queue.instrument_remove(in_job)	;
+				preload_checkpoint_queue.instrument_remove(in_job)	;
+				restart_queue.instrument_remove(in_job)	;
 
-    return(0) ;
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp b/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp
index 71215aeff..6662b8503 100644
--- a/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp
+++ b/trick_source/sim_services/CheckPointRestart/CheckPointRestart_c_intf.cpp
@@ -1,217 +1,217 @@
 
-#include <stdlib.h>
+#include	<stdlib.h>
 
-#include "trick/CheckPointRestart.hh"
-#include "trick/CheckPointRestart_c_intf.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/CheckPointRestart.hh"
+#include	"trick/CheckPointRestart_c_intf.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-/** Global singleton pointer to the CheckPointRestart. */
-extern Trick::CheckPointRestart * the_cpr ;
+/**	Global	singleton	pointer	to	the	CheckPointRestart.	*/
+extern	Trick::CheckPointRestart	*	the_cpr	;
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_pre_init_checkpoint
- */
-extern "C" int checkpoint_pre_init( int yes_no ) {
-    the_cpr->set_pre_init_checkpoint(bool(yes_no)) ;
-    return(0) ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_pre_init_checkpoint
+	*/
+extern	"C"	int	checkpoint_pre_init(	int	yes_no	)	{
+				the_cpr->set_pre_init_checkpoint(bool(yes_no))	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_post_init_checkpoint
- */
-extern "C" int checkpoint_post_init( int yes_no ) {
-    the_cpr->set_post_init_checkpoint(bool(yes_no)) ;
-    return(0) ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_post_init_checkpoint
+	*/
+extern	"C"	int	checkpoint_post_init(	int	yes_no	)	{
+				the_cpr->set_post_init_checkpoint(bool(yes_no))	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_end_checkpoint
- */
-extern "C" int checkpoint_end( int yes_no ) {
-    the_cpr->set_end_checkpoint(bool(yes_no)) ;
-    return(0) ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_end_checkpoint
+	*/
+extern	"C"	int	checkpoint_end(	int	yes_no	)	{
+				the_cpr->set_end_checkpoint(bool(yes_no))	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_pre_init_checkpoint
- */
-extern "C" int get_checkpoint_pre_init() {
-    return (int)the_cpr->pre_init_checkpoint ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_pre_init_checkpoint
+	*/
+extern	"C"	int	get_checkpoint_pre_init()	{
+				return	(int)the_cpr->pre_init_checkpoint	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_post_init_checkpoint
- */
-extern "C" int get_checkpoint_post_init() {
-    return (int)the_cpr->post_init_checkpoint ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_post_init_checkpoint
+	*/
+extern	"C"	int	get_checkpoint_post_init()	{
+				return	(int)the_cpr->post_init_checkpoint	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_end_checkpoint
- */
-extern "C" int get_checkpoint_end() {
-    return (int)the_cpr->end_checkpoint ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_end_checkpoint
+	*/
+extern	"C"	int	get_checkpoint_end()	{
+				return	(int)the_cpr->end_checkpoint	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_safestore_enabled
- */
-extern "C" int checkpoint_safestore( int yes_no ) {
-    the_cpr->set_safestore_enabled(bool(yes_no)) ;
-    return(0) ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_safestore_enabled
+	*/
+extern	"C"	int	checkpoint_safestore(	int	yes_no	)	{
+				the_cpr->set_safestore_enabled(bool(yes_no))	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_safestore_time
- */
-extern "C" int checkpoint_safestore_period( double in_time ) {
-    the_cpr->set_safestore_time(in_time) ;
-    return(0) ;
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_safestore_time
+	*/
+extern	"C"	int	checkpoint_safestore_period(	double	in_time	)	{
+				the_cpr->set_safestore_time(in_time)	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::set_cpu_num
- */
-extern "C" int checkpoint_cpu( int in_cpu_num ) {
-    the_cpr->set_cpu_num(in_cpu_num) ;
-#if __APPLE__
-    message_publish(MSG_WARNING, "Warning: (Setting checkpoint cpu) Trick on Darwin does not yet support processor assignment.\n");
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::set_cpu_num
+	*/
+extern	"C"	int	checkpoint_cpu(	int	in_cpu_num	)	{
+				the_cpr->set_cpu_num(in_cpu_num)	;
+#if	__APPLE__
+				message_publish(MSG_WARNING,	"Warning:	(Setting	checkpoint	cpu)	Trick	on	Darwin	does	not	yet	support	processor	assignment.\n");
 #endif
-    return(0) ;
+				return(0)	;
 }
 
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::get_output_file
- */
-extern "C" const char * checkpoint_get_output_file() {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::get_output_file
+	*/
+extern	"C"	const	char	*	checkpoint_get_output_file()	{
 
-   return the_cpr->get_output_file() ;
+			return	the_cpr->get_output_file()	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::get_load_file
- */
-extern "C" const char * checkpoint_get_load_file() {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::get_load_file
+	*/
+extern	"C"	const	char	*	checkpoint_get_load_file()	{
 
-   return the_cpr->get_load_file() ;
+			return	the_cpr->get_load_file()	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- @brief @userdesc Command to dump a checkpoint now to the specified file.
- This is invoked when the user clicks the "Dump ASCII Chkpnt" button on the sim control panel.
- @par Python Usage:
- @code trick.checkpoint("<file_name>") @endcode
- @param file_name - name of checkpoint file to dump (leave blank and Trick will use filename "chkpnt_<simtime>"
- @return always 0
- */
-extern "C" int checkpoint( const char * file_name ) {
+	*	@relates	Trick::CheckPointRestart
+	@brief	@userdesc	Command	to	dump	a	checkpoint	now	to	the	specified	file.
+	This	is	invoked	when	the	user	clicks	the	"Dump	ASCII	Chkpnt"	button	on	the	sim	control	panel.
+	@par	Python	Usage:
+	@code	trick.checkpoint("<file_name>")	@endcode
+	@param	file_name	-	name	of	checkpoint	file	to	dump	(leave	blank	and	Trick	will	use	filename	"chkpnt_<simtime>"
+	@return	always	0
+	*/
+extern	"C"	int	checkpoint(	const	char	*	file_name	)	{
 
-    the_cpr->checkpoint(std::string(file_name)) ;
+				the_cpr->checkpoint(std::string(file_name))	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- @brief @userdesc Command to dump a checkpoint now to the specified file, only dumping the specified sim objects.
- This is invoked when the user clicks the "Dump ASCII Chkpnt" button on the sim control panel after having set "Checkpoint Objects" under the "Actions" menu.
- @par Python Usage:
- @code trick.checkpoint_objects("<file_name>", "<object>[,<object>,...]") @endcode
- @param file_name - name of checkpoint file to dump (leave blank and Trick will use filename "chkpnt_<simtime>"
- @param objects - string of comma separated sim object names to dump
- @return always 0
- */
-extern "C" int checkpoint_objects( const char * file_name , const char * objects ) {
+	*	@relates	Trick::CheckPointRestart
+	@brief	@userdesc	Command	to	dump	a	checkpoint	now	to	the	specified	file,	only	dumping	the	specified	sim	objects.
+	This	is	invoked	when	the	user	clicks	the	"Dump	ASCII	Chkpnt"	button	on	the	sim	control	panel	after	having	set	"Checkpoint	Objects"	under	the	"Actions"	menu.
+	@par	Python	Usage:
+	@code	trick.checkpoint_objects("<file_name>",	"<object>[,<object>,...]")	@endcode
+	@param	file_name	-	name	of	checkpoint	file	to	dump	(leave	blank	and	Trick	will	use	filename	"chkpnt_<simtime>"
+	@param	objects	-	string	of	comma	separated	sim	object	names	to	dump
+	@return	always	0
+	*/
+extern	"C"	int	checkpoint_objects(	const	char	*	file_name	,	const	char	*	objects	)	{
 
-	the_cpr->checkpoint(std::string(file_name), true, std::string(objects)) ;
+	the_cpr->checkpoint(std::string(file_name),	true,	std::string(objects))	;
 
-	return(0) ;
+	return(0)	;
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::load_checkpoint
- */
-extern "C" int load_checkpoint( const char * file_name ) {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::load_checkpoint
+	*/
+extern	"C"	int	load_checkpoint(	const	char	*	file_name	)	{
 
-    the_cpr->load_checkpoint(std::string(file_name)) ;
+				the_cpr->load_checkpoint(std::string(file_name))	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::load_checkpoint
- */
-extern "C" int load_checkpoint_stls( const char * file_name, int on_off ) {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::load_checkpoint
+	*/
+extern	"C"	int	load_checkpoint_stls(	const	char	*	file_name,	int	on_off	)	{
 
-    the_cpr->load_checkpoint(std::string(file_name), (bool) on_off) ;
+				the_cpr->load_checkpoint(std::string(file_name),	(bool)	on_off)	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::load_checkpoint
- */
-extern "C" int load_checkpoint_objects( const char * file_name ) {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::load_checkpoint
+	*/
+extern	"C"	int	load_checkpoint_objects(	const	char	*	file_name	)	{
 
-    the_cpr->load_checkpoint(std::string(file_name)) ;
+				the_cpr->load_checkpoint(std::string(file_name))	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * @copydoc Trick::CheckPointRestart::load_checkpoint_job
- */
-extern "C" int load_checkpoint_job() {
+	*	@relates	Trick::CheckPointRestart
+	*	@copydoc	Trick::CheckPointRestart::load_checkpoint_job
+	*/
+extern	"C"	int	load_checkpoint_job()	{
 
-    the_cpr->load_checkpoint_job() ;
+				the_cpr->load_checkpoint_job()	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
- * @relates Trick::CheckPointRestart
- * This get_address has C bindings and is callable from regular C code.
- * @param var_name - name of variable
- */
-extern "C" void * get_address( const char * var_name ) {
+	*	@relates	Trick::CheckPointRestart
+	*	This	get_address	has	C	bindings	and	is	callable	from	regular	C	code.
+	*	@param	var_name	-	name	of	variable
+	*/
+extern	"C"	void	*	get_address(	const	char	*	var_name	)	{
 
-    REF2 * new_ref ;
-    new_ref = ref_attributes(var_name) ;
-    void * address ;
+				REF2	*	new_ref	;
+				new_ref	=	ref_attributes(var_name)	;
+				void	*	address	;
 
-    if ( new_ref != NULL ) {
-        address = new_ref->address ;
-        ref_free(new_ref) ;
-        free(new_ref) ;
-        return(address) ;
-    }
+				if	(	new_ref	!=	NULL	)	{
+								address	=	new_ref->address	;
+								ref_free(new_ref)	;
+								free(new_ref)	;
+								return(address)	;
+				}
 
-    return(NULL) ;
+				return(NULL)	;
 
 }
diff --git a/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp b/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp
index 4c69fc0af..5eead0879 100644
--- a/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp
+++ b/trick_source/sim_services/CheckPointRestart/next_attr_name.cpp
@@ -1,20 +1,20 @@
 
-#include <string>
-#include "trick/CheckPointRestart_c_intf.hh"
+#include	<string>
+#include	"trick/CheckPointRestart_c_intf.hh"
 
 /**
- This function strips off any dimensions from the type_id call in the io_src.
- E.g.  "blah [3][3]" becomes "blah"
+	This	function	strips	off	any	dimensions	from	the	type_id	call	in	the	io_src.
+	E.g.		"blah	[3][3]"	becomes	"blah"
 */
-int next_attr_name( std::string & name ) {
+int	next_attr_name(	std::string	&	name	)	{
 
-    size_t found ;
+				size_t	found	;
 
-    found = name.find(" [") ;
-    if ( found != std::string::npos ) {
-        name.erase(found) ;
-    }
+				found	=	name.find("	[")	;
+				if	(	found	!=	std::string::npos	)	{
+								name.erase(found)	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/CheckPointRestart/stl_type_name_convert.cpp b/trick_source/sim_services/CheckPointRestart/stl_type_name_convert.cpp
index 6dbac9c0e..001b10bc4 100644
--- a/trick_source/sim_services/CheckPointRestart/stl_type_name_convert.cpp
+++ b/trick_source/sim_services/CheckPointRestart/stl_type_name_convert.cpp
@@ -1,13 +1,13 @@
 
-#include <string>
+#include	<string>
 
-std::string stl_type_name_convert(std::string in_type) {
-    std::string type_string(in_type) ;
-    std::string basic_string("std::__1::basic_string") ;
-    std::string cxx11_string("std::__cxx11::basic_string") ;
-    if ( !type_string.compare(0, basic_string.length(), basic_string) ||
-         !type_string.compare(0, cxx11_string.length(), cxx11_string)) {
-        type_string = "std::string" ;
-    }
-    return type_string ;
+std::string	stl_type_name_convert(std::string	in_type)	{
+				std::string	type_string(in_type)	;
+				std::string	basic_string("std::__1::basic_string")	;
+				std::string	cxx11_string("std::__cxx11::basic_string")	;
+				if	(	!type_string.compare(0,	basic_string.length(),	basic_string)	||
+									!type_string.compare(0,	cxx11_string.length(),	cxx11_string))	{
+								type_string	=	"std::string"	;
+				}
+				return	type_string	;
 }
diff --git a/trick_source/sim_services/Clock/Clock.cpp b/trick_source/sim_services/Clock/Clock.cpp
index 420ded5ad..9a7531b31 100644
--- a/trick_source/sim_services/Clock/Clock.cpp
+++ b/trick_source/sim_services/Clock/Clock.cpp
@@ -1,126 +1,126 @@
 
 /*
 PURPOSE:
-    ( Clock clock )
+				(	Clock	clock	)
 PROGRAMMERS:
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include <stdlib.h>
+#include	<stdlib.h>
 
-#include "trick/Clock.hh"
-#include "trick/exec_proto.h"
-#include "trick/release.h"
+#include	"trick/Clock.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/release.h"
 
-Trick::Clock * the_clock = NULL ;
+Trick::Clock	*	the_clock	=	NULL	;
 
 /**
 @details
--# Sets the global clock pointer to the current instance
+-#	Sets	the	global	clock	pointer	to	the	current	instance
 */
-Trick::Clock::Clock(unsigned long long in_clock_tics_per_sec, std::string in_name) :
- name(in_name) ,
- clock_tics_per_sec(in_clock_tics_per_sec) ,
- rt_clock_ratio(1.0) ,
- sim_tic_ratio(1.0) ,
- ref_time_tics(0) { }
-
-int Trick::Clock::set_global_clock() {
-    the_clock = this ;
-    return 0 ;
+Trick::Clock::Clock(unsigned	long	long	in_clock_tics_per_sec,	std::string	in_name)	:
+	name(in_name)	,
+	clock_tics_per_sec(in_clock_tics_per_sec)	,
+	rt_clock_ratio(1.0)	,
+	sim_tic_ratio(1.0)	,
+	ref_time_tics(0)	{	}
+
+int	Trick::Clock::set_global_clock()	{
+				the_clock	=	this	;
+				return	0	;
 }
 
-int Trick::Clock::calc_sim_time_ratio(int in_time_tic_value ) {
-    sim_tic_ratio = in_time_tic_value / (double)clock_tics_per_sec ;
-    return 0 ;
+int	Trick::Clock::calc_sim_time_ratio(int	in_time_tic_value	)	{
+				sim_tic_ratio	=	in_time_tic_value	/	(double)clock_tics_per_sec	;
+				return	0	;
 }
 
-double Trick::Clock::get_rt_clock_ratio() {
-    return rt_clock_ratio ;
+double	Trick::Clock::get_rt_clock_ratio()	{
+				return	rt_clock_ratio	;
 }
 
-int Trick::Clock::set_rt_clock_ratio(double in_rt_clock_ratio) {
-    long long curr_time = clock_time() ;
-    rt_clock_ratio = in_rt_clock_ratio ;
-    clock_reset(curr_time) ;
-    return 0 ;
+int	Trick::Clock::set_rt_clock_ratio(double	in_rt_clock_ratio)	{
+				long	long	curr_time	=	clock_time()	;
+				rt_clock_ratio	=	in_rt_clock_ratio	;
+				clock_reset(curr_time)	;
+				return	0	;
 }
 
-int Trick::Clock::adjust_ref_time(long long in_tics) {
-    ref_time_tics += (long long)(in_tics / ( rt_clock_ratio * sim_tic_ratio )) ;
-    return 0 ;
+int	Trick::Clock::adjust_ref_time(long	long	in_tics)	{
+				ref_time_tics	+=	(long	long)(in_tics	/	(	rt_clock_ratio	*	sim_tic_ratio	))	;
+				return	0	;
 }
 
-int Trick::Clock::sync_to_wall_clock(double align_tic_mult, int tics_per_sec) {
+int	Trick::Clock::sync_to_wall_clock(double	align_tic_mult,	int	tics_per_sec)	{
 
-    long long curr_time ;
-    long long sync_time ;
+				long	long	curr_time	;
+				long	long	sync_time	;
 
-    curr_time = wall_clock_time() ;
-    sync_time = curr_time - ( curr_time % int(align_tic_mult * tics_per_sec / (rt_clock_ratio * sim_tic_ratio) ) ) +
-     int(align_tic_mult * tics_per_sec / (rt_clock_ratio * sim_tic_ratio) ) ;
-    set_reference(sync_time) ;
-    return 0 ;
+				curr_time	=	wall_clock_time()	;
+				sync_time	=	curr_time	-	(	curr_time	%	int(align_tic_mult	*	tics_per_sec	/	(rt_clock_ratio	*	sim_tic_ratio)	)	)	+
+					int(align_tic_mult	*	tics_per_sec	/	(rt_clock_ratio	*	sim_tic_ratio)	)	;
+				set_reference(sync_time)	;
+				return	0	;
 }
 
 /**
 @details
--# Get the hardware specific wall clock time
--# Subtract the simulation time to give a reference time.
--# Save the reference time.
+-#	Get	the	hardware	specific	wall	clock	time
+-#	Subtract	the	simulation	time	to	give	a	reference	time.
+-#	Save	the	reference	time.
 */
-long long Trick::Clock::clock_time() {
-    long long curr_time ;
-    curr_time = wall_clock_time() ;
-    return ((long long)((curr_time - ref_time_tics) * rt_clock_ratio * sim_tic_ratio));
+long	long	Trick::Clock::clock_time()	{
+				long	long	curr_time	;
+				curr_time	=	wall_clock_time()	;
+				return	((long	long)((curr_time	-	ref_time_tics)	*	rt_clock_ratio	*	sim_tic_ratio));
 }
 
 /**
 @details
--# Get the current real time.
--# While the current real time is less than the requested time
-   -# Release the processor momentarily
-   -# Get the current real time.
+-#	Get	the	current	real	time.
+-#	While	the	current	real	time	is	less	than	the	requested	time
+			-#	Release	the	processor	momentarily
+			-#	Get	the	current	real	time.
 */
-long long Trick::Clock::clock_spin(long long req_time) {
-    long long curr_time ;
-    curr_time = clock_time() ;
-    /* Perform spin loop to allow current time to catch up to requested time */
-    while (curr_time < req_time) {
-        if ( exec_get_rt_nap() == 1 ) {
-            RELEASE();
-        }
-        curr_time = clock_time();
-    }
-    return curr_time ;
+long	long	Trick::Clock::clock_spin(long	long	req_time)	{
+				long	long	curr_time	;
+				curr_time	=	clock_time()	;
+				/*	Perform	spin	loop	to	allow	current	time	to	catch	up	to	requested	time	*/
+				while	(curr_time	<	req_time)	{
+								if	(	exec_get_rt_nap()	==	1	)	{
+												RELEASE();
+								}
+								curr_time	=	clock_time();
+				}
+				return	curr_time	;
 }
 
 /**
 @details
--# Call the hardware specific wall clock time
--# Subtract the reference time to give the elapsed real time.
--# return the elapsed real time.
+-#	Call	the	hardware	specific	wall	clock	time
+-#	Subtract	the	reference	time	to	give	the	elapsed	real	time.
+-#	return	the	elapsed	real	time.
 */
-long long Trick::Clock::clock_reset(long long ref) {
-    long long curr_time ;
-    curr_time = wall_clock_time() ;
-    ref_time_tics = curr_time - (long long)(ref / (rt_clock_ratio * sim_tic_ratio));
-    return (long long)(ref_time_tics * sim_tic_ratio * rt_clock_ratio ) ;
+long	long	Trick::Clock::clock_reset(long	long	ref)	{
+				long	long	curr_time	;
+				curr_time	=	wall_clock_time()	;
+				ref_time_tics	=	curr_time	-	(long	long)(ref	/	(rt_clock_ratio	*	sim_tic_ratio));
+				return	(long	long)(ref_time_tics	*	sim_tic_ratio	*	rt_clock_ratio	)	;
 }
 
 /**
 @details
--# Sets the clock's reference time to incoming value
+-#	Sets	the	clock's	reference	time	to	incoming	value
 */
-int Trick::Clock::set_reference(long long ref) {
-    ref_time_tics = ref ;
-    return 0 ;
+int	Trick::Clock::set_reference(long	long	ref)	{
+				ref_time_tics	=	ref	;
+				return	0	;
 }
 
 /**
 @details
--# Return the name of the clock
+-#	Return	the	name	of	the	clock
 */
-const char * Trick::Clock::get_name() {
-    return name.c_str() ;
+const	char	*	Trick::Clock::get_name()	{
+				return	name.c_str()	;
 }
diff --git a/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp b/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp
index 6761ace42..7b15099e1 100644
--- a/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp
+++ b/trick_source/sim_services/Clock/GetTimeOfDayClock.cpp
@@ -1,93 +1,93 @@
 /*
 PURPOSE:
-    ( gettimeofday clock )
+				(	gettimeofday	clock	)
 PROGRAMMERS:
-    (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime.))
-     ((Robert W. Bailey) (LinCom) (7/22/92) (--) (--))
-     ((Eddie J. Paddock) (MDSSC) (Oct 1992) (--) (Realtime.)))
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+				(((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime.))
+					((Robert	W.	Bailey)	(LinCom)	(7/22/92)	(--)	(--))
+					((Eddie	J.	Paddock)	(MDSSC)	(Oct	1992)	(--)	(Realtime.)))
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#ifdef __APPLE__
-#include <sys/time.h>
+#ifdef	__APPLE__
+#include	<sys/time.h>
 #else
-#include <time.h>
+#include	<time.h>
 #endif
 
-#include "trick/GetTimeOfDayClock.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/GetTimeOfDayClock.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# Calls the base Clock constructor
+-#	Calls	the	base	Clock	constructor
 */
-Trick::GetTimeOfDayClock::GetTimeOfDayClock() : Clock(1000000, "GetTimeOfDay - CLOCK_REALTIME")
-#if ( __linux )
- , clk_id(CLOCK_REALTIME)
+Trick::GetTimeOfDayClock::GetTimeOfDayClock()	:	Clock(1000000,	"GetTimeOfDay	-	CLOCK_REALTIME")
+#if	(	__linux	)
+	,	clk_id(CLOCK_REALTIME)
 #endif
- { }
+	{	}
 
 /**
 @details
--# This function is empty
+-#	This	function	is	empty
 */
-Trick::GetTimeOfDayClock::~GetTimeOfDayClock() { }
+Trick::GetTimeOfDayClock::~GetTimeOfDayClock()	{	}
 
 /**
 @details
--# Set the global "the_clock" pointer to this instance
+-#	Set	the	global	"the_clock"	pointer	to	this	instance
 */
-int Trick::GetTimeOfDayClock::clock_init() {
-    set_global_clock() ;
-    return 0 ;
+int	Trick::GetTimeOfDayClock::clock_init()	{
+				set_global_clock()	;
+				return	0	;
 }
 
 /**
 @details
--# Call the system clock_gettime to get the current real time.
--# Return the current real time as a count of microseconds
+-#	Call	the	system	clock_gettime	to	get	the	current	real	time.
+-#	Return	the	current	real	time	as	a	count	of	microseconds
 */
-long long Trick::GetTimeOfDayClock::wall_clock_time() {
-#if ( __linux )
-    struct timespec tp ;
-    clock_gettime( clk_id, &tp ) ;
-    return (long long)tp.tv_sec * 1000000LL + (long long)((tp.tv_nsec) / 1000)  ;
+long	long	Trick::GetTimeOfDayClock::wall_clock_time()	{
+#if	(	__linux	)
+				struct	timespec	tp	;
+				clock_gettime(	clk_id,	&tp	)	;
+				return	(long	long)tp.tv_sec	*	1000000LL	+	(long	long)((tp.tv_nsec)	/	1000)		;
 #else
-    struct timeval tp ;
-    gettimeofday(&tp,(struct timezone *)NULL) ;
-    return (long long)tp.tv_sec * 1000000LL + tp.tv_usec ;
+				struct	timeval	tp	;
+				gettimeofday(&tp,(struct	timezone	*)NULL)	;
+				return	(long	long)tp.tv_sec	*	1000000LL	+	tp.tv_usec	;
 #endif
 }
 
 /**
 @details
--# This function is empty
+-#	This	function	is	empty
 */
-int Trick::GetTimeOfDayClock::clock_stop() {
-    return 0 ;
+int	Trick::GetTimeOfDayClock::clock_stop()	{
+				return	0	;
 }
 
-void Trick::GetTimeOfDayClock::set_clock_ID( int id ) {
-#if ( __linux )
-    clk_id = (clockid_t)id ;
-    switch ( clk_id ) {
-        case CLOCK_REALTIME: name = "GetTimeOfDay - CLOCK_REALTIME" ; break ;
-        case CLOCK_MONOTONIC: name = "GetTimeOfDay - CLOCK_MONOTONIC" ; break ;
-        case CLOCK_MONOTONIC_RAW: name = "GetTimeOfDay - CLOCK_MONOTONIC_RAW" ; break ;
-        default: name = "GetTimeOfDay - other" ; break ;
-    }
+void	Trick::GetTimeOfDayClock::set_clock_ID(	int	id	)	{
+#if	(	__linux	)
+				clk_id	=	(clockid_t)id	;
+				switch	(	clk_id	)	{
+								case	CLOCK_REALTIME:	name	=	"GetTimeOfDay	-	CLOCK_REALTIME"	;	break	;
+								case	CLOCK_MONOTONIC:	name	=	"GetTimeOfDay	-	CLOCK_MONOTONIC"	;	break	;
+								case	CLOCK_MONOTONIC_RAW:	name	=	"GetTimeOfDay	-	CLOCK_MONOTONIC_RAW"	;	break	;
+								default:	name	=	"GetTimeOfDay	-	other"	;	break	;
+				}
 #else
-    message_publish(MSG_ERROR, "set_clock_ID has no effect\n");
+				message_publish(MSG_ERROR,	"set_clock_ID	has	no	effect\n");
 #endif
 }
 
-int Trick::GetTimeOfDayClock::get_clock_ID() {
-#if ( __linux )
-    return clk_id ;
+int	Trick::GetTimeOfDayClock::get_clock_ID()	{
+#if	(	__linux	)
+				return	clk_id	;
 #else
-    message_publish(MSG_ERROR, "get_clock_ID not implemented\n");
-    return -1 ;
+				message_publish(MSG_ERROR,	"get_clock_ID	not	implemented\n");
+				return	-1	;
 #endif
 }
 
diff --git a/trick_source/sim_services/Clock/clock_c_intf.cpp b/trick_source/sim_services/Clock/clock_c_intf.cpp
index f51ceae18..dd1e5c08b 100644
--- a/trick_source/sim_services/Clock/clock_c_intf.cpp
+++ b/trick_source/sim_services/Clock/clock_c_intf.cpp
@@ -1,37 +1,37 @@
 
-#include "trick/Clock.hh"
-#include "trick/clock_proto.h"
+#include	"trick/Clock.hh"
+#include	"trick/clock_proto.h"
 
-extern Trick::Clock * the_clock ;
+extern	Trick::Clock	*	the_clock	;
 
-extern "C" long long clock_time(void) {
-    return the_clock->clock_time() ;
+extern	"C"	long	long	clock_time(void)	{
+				return	the_clock->clock_time()	;
 }
 
-extern "C" long long clock_wall_time(void) {
-    return the_clock->wall_clock_time() ;
+extern	"C"	long	long	clock_wall_time(void)	{
+				return	the_clock->wall_clock_time()	;
 }
 
-extern "C" long long clock_reset(long long ref) {
-    return the_clock->clock_reset(ref) ;
+extern	"C"	long	long	clock_reset(long	long	ref)	{
+				return	the_clock->clock_reset(ref)	;
 }
 
-extern "C" int clock_set_reference(long long ref) {
-    return the_clock->set_reference(ref) ;
+extern	"C"	int	clock_set_reference(long	long	ref)	{
+				return	the_clock->set_reference(ref)	;
 }
 
-extern "C" int clock_spin(long long ref) {
-    return the_clock->clock_spin(ref) ;
+extern	"C"	int	clock_spin(long	long	ref)	{
+				return	the_clock->clock_spin(ref)	;
 }
 
-extern "C" double clock_get_rt_clock_ratio(void) {
-    return the_clock->get_rt_clock_ratio() ;
+extern	"C"	double	clock_get_rt_clock_ratio(void)	{
+				return	the_clock->get_rt_clock_ratio()	;
 }
 
-extern "C" int clock_set_rt_clock_ratio(double in_clock_ratio) {
-    return the_clock->set_rt_clock_ratio(in_clock_ratio) ;
+extern	"C"	int	clock_set_rt_clock_ratio(double	in_clock_ratio)	{
+				return	the_clock->set_rt_clock_ratio(in_clock_ratio)	;
 }
 
-extern "C" unsigned long long clock_tics_per_sec(void) {
-	return the_clock->clock_tics_per_sec;
+extern	"C"	unsigned	long	long	clock_tics_per_sec(void)	{
+	return	the_clock->clock_tics_per_sec;
 }
diff --git a/trick_source/sim_services/Clock/test/Clocks_test.cpp b/trick_source/sim_services/Clock/test/Clocks_test.cpp
index 7b40c624b..f3f3fe7b1 100644
--- a/trick_source/sim_services/Clock/test/Clocks_test.cpp
+++ b/trick_source/sim_services/Clock/test/Clocks_test.cpp
@@ -1,27 +1,27 @@
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
 
-#include "gtest/gtest.h"
-#include "trick/Clock.hh"
-#include "trick/clock_proto.h"
-#include "trick/GetTimeOfDayClock.hh"
-#include "trick/JobData.hh"
+#include	"gtest/gtest.h"
+#include	"trick/Clock.hh"
+#include	"trick/clock_proto.h"
+#include	"trick/GetTimeOfDayClock.hh"
+#include	"trick/JobData.hh"
 
-namespace Trick {
+namespace	Trick	{
 
-class ClocksTest : public ::testing::Test {
+class	ClocksTest	:	public	::testing::Test	{
 
 	protected:
-		Trick::GetTimeOfDayClock timclk;
+		Trick::GetTimeOfDayClock	timclk;
 
-		GetTimeOfDayClockTest() {}
-		~GetTimeOfDayClockTest() {}
-		virtual void SetUp() {}
-		virtual void TearDown() {}
-} ;
+		GetTimeOfDayClockTest()	{}
+		~GetTimeOfDayClockTest()	{}
+		virtual	void	SetUp()	{}
+		virtual	void	TearDown()	{}
+}	;
 
-TEST_F(ClocksTest, ExampleTest) {
+TEST_F(ClocksTest,	ExampleTest)	{
 
 }
 
diff --git a/trick_source/sim_services/Clock/test/GetTimeOfDayClock_test.cpp b/trick_source/sim_services/Clock/test/GetTimeOfDayClock_test.cpp
index e09e0101c..1f28f78fd 100644
--- a/trick_source/sim_services/Clock/test/GetTimeOfDayClock_test.cpp
+++ b/trick_source/sim_services/Clock/test/GetTimeOfDayClock_test.cpp
@@ -1,167 +1,167 @@
-/* Listed requirements are under requirement Trick-153 (3.7.1.1) */
-/*    Real-time control shall be able to use a system clock source */
+/*	Listed	requirements	are	under	requirement	Trick-153	(3.7.1.1)	*/
+/*				Real-time	control	shall	be	able	to	use	a	system	clock	source	*/
 
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <map>
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
+#include	<sys/time.h>
+#include	<map>
 
-#include "gtest/gtest.h"
-#include "trick/GetTimeOfDayClock.hh"
-#include "trick/JobData.hh"
-//#include "trick/RequirementScribe.hh"
+#include	"gtest/gtest.h"
+#include	"trick/GetTimeOfDayClock.hh"
+#include	"trick/JobData.hh"
+//#include	"trick/RequirementScribe.hh"
 
-#define TIME_TOL 1e3
-#define RATIO_TOL 1e-9
-#define TICS_PER_SEC 1000000
+#define	TIME_TOL	1e3
+#define	RATIO_TOL	1e-9
+#define	TICS_PER_SEC	1000000
 
-// Stub for message_publish
-extern "C" int message_publish(int level, const char * format_msg, ...) { (void)level; (void)format_msg; return 0; }
+//	Stub	for	message_publish
+extern	"C"	int	message_publish(int	level,	const	char	*	format_msg,	...)	{	(void)level;	(void)format_msg;	return	0;	}
 
-class GetTimeOfDayClockTest : public ::testing::Test {
+class	GetTimeOfDayClockTest	:	public	::testing::Test	{
 
-    protected:
-        Trick::GetTimeOfDayClock dClk;
-        //Trick::RequirementScribe req;
+				protected:
+								Trick::GetTimeOfDayClock	dClk;
+								//Trick::RequirementScribe	req;
 
-        GetTimeOfDayClockTest() {}
-        ~GetTimeOfDayClockTest() {}
-        virtual void SetUp() {}
-        virtual void TearDown() {}
-} ;
+								GetTimeOfDayClockTest()	{}
+								~GetTimeOfDayClockTest()	{}
+								virtual	void	SetUp()	{}
+								virtual	void	TearDown()	{}
+}	;
 
-/* Ensure clock initializes correctly */
-TEST_F(GetTimeOfDayClockTest, Initialize) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall initialize with time equal to computer system time, reference time of 0, and all ratios set to 1.");
+/*	Ensure	clock	initializes	correctly	*/
+TEST_F(GetTimeOfDayClockTest,	Initialize)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	initialize	with	time	equal	to	computer	system	time,	reference	time	of	0,	and	all	ratios	set	to	1.");
 
-    struct timeval res;
-    Trick::GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				struct	timeval	res;
+				Trick::GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    timclk->clock_init();
+				timclk->clock_init();
 
-    /* General expected clock initialization */
-    ASSERT_EQ(timclk->get_rt_clock_ratio() , 1.0);
-    ASSERT_EQ(timclk->sim_tic_ratio, 1.0);
-    ASSERT_EQ(timclk->ref_time_tics, 0);
+				/*	General	expected	clock	initialization	*/
+				ASSERT_EQ(timclk->get_rt_clock_ratio()	,	1.0);
+				ASSERT_EQ(timclk->sim_tic_ratio,	1.0);
+				ASSERT_EQ(timclk->ref_time_tics,	0);
 
-    /* Time of Day clock initialization tests */
-    EXPECT_STREQ(timclk->get_name() , "GetTimeOfDay - CLOCK_REALTIME");
+				/*	Time	of	Day	clock	initialization	tests	*/
+				EXPECT_STREQ(timclk->get_name()	,	"GetTimeOfDay	-	CLOCK_REALTIME");
 
-    gettimeofday(&res, NULL);
+				gettimeofday(&res,	NULL);
 
-    EXPECT_NEAR(timclk->wall_clock_time(), (res.tv_sec * 1000000LL + res.tv_usec), TIME_TOL);
+				EXPECT_NEAR(timclk->wall_clock_time(),	(res.tv_sec	*	1000000LL	+	res.tv_usec),	TIME_TOL);
 }
 
-TEST_F(GetTimeOfDayClockTest, ClockSimRatio) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall provide the ability to change the sim time-to-real time ratio.");
+TEST_F(GetTimeOfDayClockTest,	ClockSimRatio)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	provide	the	ability	to	change	the	sim	time-to-real	time	ratio.");
 
-    long long tim_curr;
-    double tic_ratio, tic_val;
-    Trick::GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				long	long	tim_curr;
+				double	tic_ratio,	tic_val;
+				Trick::GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    tic_val = 100000;
+				tic_val	=	100000;
 
-    timclk->calc_sim_time_ratio(tic_val);
+				timclk->calc_sim_time_ratio(tic_val);
 
-    usleep(100000);
-    tim_curr = timclk->wall_clock_time();
-    tic_ratio = (double) timclk->clock_time() / (double) tim_curr;
+				usleep(100000);
+				tim_curr	=	timclk->wall_clock_time();
+				tic_ratio	=	(double)	timclk->clock_time()	/	(double)	tim_curr;
 
-    EXPECT_NEAR(tic_ratio, (double) tic_val / (double) TICS_PER_SEC, RATIO_TOL);
+				EXPECT_NEAR(tic_ratio,	(double)	tic_val	/	(double)	TICS_PER_SEC,	RATIO_TOL);
 
-    delete timclk;
+				delete	timclk;
 }
 
-TEST_F(GetTimeOfDayClockTest, ClockRTRatio) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall provide the ability to adjust the reference time ratio.");
+TEST_F(GetTimeOfDayClockTest,	ClockRTRatio)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	provide	the	ability	to	adjust	the	reference	time	ratio.");
 
-    long long tim_curr, tim_diff;
-    double tic_ratio;
-    int rt_ratio;
-    Trick::GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				long	long	tim_curr,	tim_diff;
+				double	tic_ratio;
+				int	rt_ratio;
+				Trick::GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    rt_ratio = 6.0;
-    ASSERT_EQ(timclk->sim_tic_ratio, 1);
+				rt_ratio	=	6.0;
+				ASSERT_EQ(timclk->sim_tic_ratio,	1);
 
-    timclk->calc_sim_time_ratio(TICS_PER_SEC);
+				timclk->calc_sim_time_ratio(TICS_PER_SEC);
 
-    timclk->set_rt_clock_ratio(rt_ratio);
-    tim_diff = timclk->wall_clock_time() - timclk->ref_time_tics;
-    EXPECT_NEAR(tim_diff, (long long) (timclk->wall_clock_time() / rt_ratio), TIME_TOL);
+				timclk->set_rt_clock_ratio(rt_ratio);
+				tim_diff	=	timclk->wall_clock_time()	-	timclk->ref_time_tics;
+				EXPECT_NEAR(tim_diff,	(long	long)	(timclk->wall_clock_time()	/	rt_ratio),	TIME_TOL);
 
-    timclk->set_reference(0);
+				timclk->set_reference(0);
 
-    usleep(100000);
-    tim_curr = timclk->wall_clock_time();
-    tic_ratio = (double) timclk->clock_time() / (double) tim_curr;
+				usleep(100000);
+				tim_curr	=	timclk->wall_clock_time();
+				tic_ratio	=	(double)	timclk->clock_time()	/	(double)	tim_curr;
 
-    EXPECT_NEAR(tic_ratio, rt_ratio, RATIO_TOL);
+				EXPECT_NEAR(tic_ratio,	rt_ratio,	RATIO_TOL);
 
-    delete timclk;
+				delete	timclk;
 }
 
-TEST_F(GetTimeOfDayClockTest, ClockSpin) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall provide the ability to spin (wait) until a specified time is reached.");
+TEST_F(GetTimeOfDayClockTest,	ClockSpin)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	provide	the	ability	to	spin	(wait)	until	a	specified	time	is	reached.");
 
-    long long tim_curr, spin_time;
-    Trick:: GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				long	long	tim_curr,	spin_time;
+				Trick::	GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    spin_time = 100000;
+				spin_time	=	100000;
 
-    tim_curr = timclk->wall_clock_time();
+				tim_curr	=	timclk->wall_clock_time();
 
-    dClk.clock_spin(tim_curr + spin_time);
+				dClk.clock_spin(tim_curr	+	spin_time);
 
-    // We know that the time difference must be at least as long as the spin_time.
-    // But that's all we know.
-    EXPECT_GE((timclk->wall_clock_time() - tim_curr), spin_time);
+				//	We	know	that	the	time	difference	must	be	at	least	as	long	as	the	spin_time.
+				//	But	that's	all	we	know.
+				EXPECT_GE((timclk->wall_clock_time()	-	tim_curr),	spin_time);
 
-    delete timclk;
+				delete	timclk;
 }
 
-/* Change and test reference times */
-TEST_F(GetTimeOfDayClockTest, ReferenceTime) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall provide the ability to set a reference time.");
+/*	Change	and	test	reference	times	*/
+TEST_F(GetTimeOfDayClockTest,	ReferenceTime)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	provide	the	ability	to	set	a	reference	time.");
 
-    long long tic_adjust;
-    Trick:: GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				long	long	tic_adjust;
+				Trick::	GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    timclk->clock_init();
+				timclk->clock_init();
 
-    tic_adjust = 50000;
-    timclk->set_reference(tic_adjust);
+				tic_adjust	=	50000;
+				timclk->set_reference(tic_adjust);
 
-    EXPECT_NEAR(timclk->clock_time(), timclk->wall_clock_time() - tic_adjust, TIME_TOL);
+				EXPECT_NEAR(timclk->clock_time(),	timclk->wall_clock_time()	-	tic_adjust,	TIME_TOL);
 
-    timclk->adjust_ref_time(2*tic_adjust);
+				timclk->adjust_ref_time(2*tic_adjust);
 
-    EXPECT_EQ(timclk->ref_time_tics, tic_adjust + 2*tic_adjust);
+				EXPECT_EQ(timclk->ref_time_tics,	tic_adjust	+	2*tic_adjust);
 
-    delete timclk;
+				delete	timclk;
 }
 
-TEST_F(GetTimeOfDayClockTest, ClockSync) {
-    //req.add_requirement("timeofday_clock");
-    //"The system clock shall provide the ability to sync reference time to wall clock time");
+TEST_F(GetTimeOfDayClockTest,	ClockSync)	{
+				//req.add_requirement("timeofday_clock");
+				//"The	system	clock	shall	provide	the	ability	to	sync	reference	time	to	wall	clock	time");
 
-    double align_tics_mult;
-    int clock_unit;
-    Trick::GetTimeOfDayClock * timclk = new Trick::GetTimeOfDayClock;
+				double	align_tics_mult;
+				int	clock_unit;
+				Trick::GetTimeOfDayClock	*	timclk	=	new	Trick::GetTimeOfDayClock;
 
-    align_tics_mult = 1.5;
-    clock_unit = int((TICS_PER_SEC * align_tics_mult) /
-                    (timclk->rt_clock_ratio * timclk->sim_tic_ratio));
+				align_tics_mult	=	1.5;
+				clock_unit	=	int((TICS_PER_SEC	*	align_tics_mult)	/
+																				(timclk->rt_clock_ratio	*	timclk->sim_tic_ratio));
 
-    timclk->sync_to_wall_clock(align_tics_mult, TICS_PER_SEC);
+				timclk->sync_to_wall_clock(align_tics_mult,	TICS_PER_SEC);
 
-    EXPECT_EQ((timclk->ref_time_tics%clock_unit), 0);
+				EXPECT_EQ((timclk->ref_time_tics%clock_unit),	0);
 
-    delete timclk;
+				delete	timclk;
 }
 
diff --git a/trick_source/sim_services/Clock/test/exec_get_rt_nap_stub.cpp b/trick_source/sim_services/Clock/test/exec_get_rt_nap_stub.cpp
index 7701f4677..ff1a71987 100644
--- a/trick_source/sim_services/Clock/test/exec_get_rt_nap_stub.cpp
+++ b/trick_source/sim_services/Clock/test/exec_get_rt_nap_stub.cpp
@@ -1,4 +1,4 @@
 
-extern "C" int exec_get_rt_nap() {
-    return 0 ;
+extern	"C"	int	exec_get_rt_nap()	{
+				return	0	;
 }
diff --git a/trick_source/sim_services/Collect/collect.cpp b/trick_source/sim_services/Collect/collect.cpp
index c479ece68..1fabbf143 100644
--- a/trick_source/sim_services/Collect/collect.cpp
+++ b/trick_source/sim_services/Collect/collect.cpp
@@ -1,101 +1,101 @@
 
-#include <stdlib.h>
-#include <string.h>
-#include "trick/collect_macros.h"
+#include	<stdlib.h>
+#include	<string.h>
+#include	"trick/collect_macros.h"
 
 /**
 @brief
-Adds the addess, collectee, to the list pointed to by collector.  Returns a new pointer
-to the new list.  The old list a collector will be freed.
+Adds	the	addess,	collectee,	to	the	list	pointed	to	by	collector.		Returns	a	new	pointer
+to	the	new	list.		The	old	list	a	collector	will	be	freed.
 @details
--# Get the current list length
--# Allocate enough space to accomodate the current list + 1. (+1 for the size of the list)
--# Set the size of the new list in the first slot of the new list.
--# Copy the old list to the new.
--# Append the new item to the new list.
--# Delete the old list
--# Return the new list
+-#	Get	the	current	list	length
+-#	Allocate	enough	space	to	accomodate	the	current	list	+	1.	(+1	for	the	size	of	the	list)
+-#	Set	the	size	of	the	new	list	in	the	first	slot	of	the	new	list.
+-#	Copy	the	old	list	to	the	new.
+-#	Append	the	new	item	to	the	new	list.
+-#	Delete	the	old	list
+-#	Return	the	new	list
 */
-void ** add_collect( void ** collector , void * collectee ) {
+void	**	add_collect(	void	**	collector	,	void	*	collectee	)	{
 
-    int collect_size = NUM_COLLECT(collector) ;
-    void ** new_list ;
-    long * lp ;
+				int	collect_size	=	NUM_COLLECT(collector)	;
+				void	**	new_list	;
+				long	*	lp	;
 
-    // create a new list
-    new_list = (void**)malloc((collect_size + 2) * sizeof(void*));
+				//	create	a	new	list
+				new_list	=	(void**)malloc((collect_size	+	2)	*	sizeof(void*));
 
-    // set the list size
-    lp = ( long *)new_list ;
-    *lp = collect_size + 1 ;
+				//	set	the	list	size
+				lp	=	(	long	*)new_list	;
+				*lp	=	collect_size	+	1	;
 
-    // copy old list
-    new_list++ ;
-    if ( collect_size > 0 ) {
-        memcpy( new_list , collector , collect_size * sizeof(void *)) ;
-    }
-    new_list[collect_size] = collectee ;
+				//	copy	old	list
+				new_list++	;
+				if	(	collect_size	>	0	)	{
+								memcpy(	new_list	,	collector	,	collect_size	*	sizeof(void	*))	;
+				}
+				new_list[collect_size]	=	collectee	;
 
-    // remove old list
-    if ( collector ) {
-        free(collector - 1) ;
-    }
+				//	remove	old	list
+				if	(	collector	)	{
+								free(collector	-	1)	;
+				}
 
-    return new_list ;
+				return	new_list	;
 }
 
 /**
 @brief
-Deletes the addess, collectee, from the list pointed to by collector.  Returns a new pointer
-to the new list.  The old list a collector will be freed.
+Deletes	the	addess,	collectee,	from	the	list	pointed	to	by	collector.		Returns	a	new	pointer
+to	the	new	list.		The	old	list	a	collector	will	be	freed.
 @details
--# Get the current list length
--# Count the number of items in the list that do not match the collectee.
--# Allocate enough space to accomodate the new list. (+1 for the size of the list)
--# Set the size of the new list in the first slot of the new list.
--# Copy all of the items that do not match collectee to the new list
--# Delete the old list
--# Return the new list
+-#	Get	the	current	list	length
+-#	Count	the	number	of	items	in	the	list	that	do	not	match	the	collectee.
+-#	Allocate	enough	space	to	accomodate	the	new	list.	(+1	for	the	size	of	the	list)
+-#	Set	the	size	of	the	new	list	in	the	first	slot	of	the	new	list.
+-#	Copy	all	of	the	items	that	do	not	match	collectee	to	the	new	list
+-#	Delete	the	old	list
+-#	Return	the	new	list
 */
-void ** delete_collect( void ** collector , void * collectee ) {
-
-    int collect_size = NUM_COLLECT(collector) ;
-    int new_count = 0 ;
-    void ** new_list ;
-    long * lp ;
-    int ii , jj ;
-
-
-    for ( ii = 0 ; ii < collect_size ; ii++ ) {
-        if ( collector[ii] != collectee ) {
-            new_count++ ;
-        }
-    }
-
-    if ( new_count > 0 ) {
-        // create a new list
-        new_list = (void**)malloc((new_count + 1) * sizeof(void*));
-
-        // set the list size
-        lp = ( long *)new_list ;
-        *lp = new_count ;
-
-        // copy old list
-        new_list++ ;
-        jj = 0 ;
-        for ( ii = 0 ; ii < collect_size ; ii++ ) {
-            if ( collector[ii] != collectee ) {
-                new_list[jj++] = collector[ii] ;
-            }
-        }
-    } else {
-        new_list = NULL ;
-    }
-
-    // remove old list
-    if ( collector ) {
-        free(collector - 1) ;
-    }
-
-    return new_list ;
+void	**	delete_collect(	void	**	collector	,	void	*	collectee	)	{
+
+				int	collect_size	=	NUM_COLLECT(collector)	;
+				int	new_count	=	0	;
+				void	**	new_list	;
+				long	*	lp	;
+				int	ii	,	jj	;
+
+
+				for	(	ii	=	0	;	ii	<	collect_size	;	ii++	)	{
+								if	(	collector[ii]	!=	collectee	)	{
+												new_count++	;
+								}
+				}
+
+				if	(	new_count	>	0	)	{
+								//	create	a	new	list
+								new_list	=	(void**)malloc((new_count	+	1)	*	sizeof(void*));
+
+								//	set	the	list	size
+								lp	=	(	long	*)new_list	;
+								*lp	=	new_count	;
+
+								//	copy	old	list
+								new_list++	;
+								jj	=	0	;
+								for	(	ii	=	0	;	ii	<	collect_size	;	ii++	)	{
+												if	(	collector[ii]	!=	collectee	)	{
+																new_list[jj++]	=	collector[ii]	;
+												}
+								}
+				}	else	{
+								new_list	=	NULL	;
+				}
+
+				//	remove	old	list
+				if	(	collector	)	{
+								free(collector	-	1)	;
+				}
+
+				return	new_list	;
 }
diff --git a/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
index 800bd130a..8aaa3cc11 100644
--- a/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
+++ b/trick_source/sim_services/CommandLineArguments/CommandLineArguments.cpp
@@ -1,348 +1,348 @@
 /*
-   PURPOSE: ( Handle the simulation command line args )
+			PURPOSE:	(	Handle	the	simulation	command	line	args	)
 
-   REFERENCE: ( Trick Simulation Environment )
+			REFERENCE:	(	Trick	Simulation	Environment	)
 
-   ASSUMPTIONS AND LIMITATIONS: ( None )
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
 
-   CLASS: ( N/A )
+			CLASS:	(	N/A	)
 
-   LIBRARY DEPENDENCY: ( None )
+			LIBRARY	DEPENDENCY:	(	None	)
 
-   PROGRAMMERS: ( Keith Vetter LinCom 6/2003 ) */
+			PROGRAMMERS:	(	Keith	Vetter	LinCom	6/2003	)	*/
 
 
-#include <iostream>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <cstring>
-#include <cerrno>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
+#include	<iostream>
+#include	<sys/stat.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<unistd.h>
+#include	<cstring>
+#include	<cerrno>
+#include	<unistd.h>
+#include	<sys/types.h>
+#include	<pwd.h>
 
-#include "trick/CommandLineArguments.hh"
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/CommandLineArguments.hh"
+#include	"trick/memorymanager_c_intf.h"
 
-Trick::CommandLineArguments * the_cmd_args ;
+Trick::CommandLineArguments	*	the_cmd_args	;
 
-Trick::CommandLineArguments::CommandLineArguments() {
-    the_cmd_args = this ;
+Trick::CommandLineArguments::CommandLineArguments()	{
+				the_cmd_args	=	this	;
 
-    output_dir = std::string(".") ;
-    default_dir = std::string(".") ;
+				output_dir	=	std::string(".")	;
+				default_dir	=	std::string(".")	;
 
-    argc = 0;
-    argv = NULL;
+				argc	=	0;
+				argv	=	NULL;
 }
 
-int Trick::CommandLineArguments::get_argc() {
-    return(argc) ;
+int	Trick::CommandLineArguments::get_argc()	{
+				return(argc)	;
 }
 
-char ** Trick::CommandLineArguments::get_argv() {
-    return(argv) ;
+char	**	Trick::CommandLineArguments::get_argv()	{
+				return(argv)	;
 }
 
-std::string Trick::CommandLineArguments::get_output_dir() {
-    return(output_dir) ;
+std::string	Trick::CommandLineArguments::get_output_dir()	{
+				return(output_dir)	;
 }
 
-std::string & Trick::CommandLineArguments::get_output_dir_ref() {
-    return(output_dir) ;
+std::string	&	Trick::CommandLineArguments::get_output_dir_ref()	{
+				return(output_dir)	;
 }
 
-std::string Trick::CommandLineArguments::get_user_output_dir() {
-    return(user_output_dir) ;
+std::string	Trick::CommandLineArguments::get_user_output_dir()	{
+				return(user_output_dir)	;
 }
 
-std::string & Trick::CommandLineArguments::get_user_output_dir_ref() {
-    return(user_output_dir) ;
+std::string	&	Trick::CommandLineArguments::get_user_output_dir_ref()	{
+				return(user_output_dir)	;
 }
 
-std::string Trick::CommandLineArguments::get_input_file() {
-    return(input_file) ;
+std::string	Trick::CommandLineArguments::get_input_file()	{
+				return(input_file)	;
 }
 
-std::string & Trick::CommandLineArguments::get_input_file_ref() {
-    return(input_file) ;
+std::string	&	Trick::CommandLineArguments::get_input_file_ref()	{
+				return(input_file)	;
 }
 
-std::string Trick::CommandLineArguments::get_default_dir() {
-    return(default_dir) ;
+std::string	Trick::CommandLineArguments::get_default_dir()	{
+				return(default_dir)	;
 }
 
-std::string & Trick::CommandLineArguments::get_default_dir_ref() {
-    return(default_dir) ;
+std::string	&	Trick::CommandLineArguments::get_default_dir_ref()	{
+				return(default_dir)	;
 }
 
-std::string Trick::CommandLineArguments::get_cmdline_name() {
-    return(cmdline_name) ;
+std::string	Trick::CommandLineArguments::get_cmdline_name()	{
+				return(cmdline_name)	;
 }
 
-std::string & Trick::CommandLineArguments::get_cmdline_name_ref() {
-    return(cmdline_name) ;
+std::string	&	Trick::CommandLineArguments::get_cmdline_name_ref()	{
+				return(cmdline_name)	;
 }
 
-// Helper function - create a full path with error checking along the way
-int Trick::CommandLineArguments::create_path(const std::string& dirname) {
-    size_t cur_index = 0;
-
-    std::string full_dir (dirname);
-
-    // These syscalls don't seem to take care of home special character, so do it manually
-    // I think the shell should handle it before it gets here, but just in case check for it
-    if (dirname.at(0) == '~') {
-        struct passwd *pw = getpwuid(getuid());
-        full_dir = std::string(pw->pw_dir) + dirname.substr(1, dirname.size());
-    }
-
-    while (cur_index != full_dir.size()) {
-        cur_index = full_dir.find('/', cur_index+1);
-        if (cur_index == std::string::npos) {
-            cur_index = full_dir.size();
-        }
-        std::string cur_dir = full_dir.substr(0, cur_index);
-        
-        struct stat info;
-        if(stat( cur_dir.c_str(), &info ) != 0) {
-            // does not exist - make it
-            if (mkdir(cur_dir.c_str(), 0775) == -1) {
-                std::cerr << "Error creating directory " << cur_dir << std::endl;
-                return 1;
-            }
-        } else {
-            // Does exist
-            if(info.st_mode & S_IFDIR) {
-                // Is a directory
-                if (info.st_mode & S_IWUSR) {
-                    // Perfect, nothing to do here
-                } else {
-                    // Not writeable
-                    std::cerr << "Intermediate directory " << cur_dir << " is not writable, unable to create output directory." << std::endl;
-                    return 1;
-                }
-            } else {
-                // Does exist, but is a file
-                std::cerr << "Intermediate directory " << cur_dir << " is not a directory, unable to create output directory." << std::endl;
-                return 1;
-            }
-        }
-    }
-    return 0;
+//	Helper	function	-	create	a	full	path	with	error	checking	along	the	way
+int	Trick::CommandLineArguments::create_path(const	std::string&	dirname)	{
+				size_t	cur_index	=	0;
+
+				std::string	full_dir	(dirname);
+
+				//	These	syscalls	don't	seem	to	take	care	of	home	special	character,	so	do	it	manually
+				//	I	think	the	shell	should	handle	it	before	it	gets	here,	but	just	in	case	check	for	it
+				if	(dirname.at(0)	==	'~')	{
+								struct	passwd	*pw	=	getpwuid(getuid());
+								full_dir	=	std::string(pw->pw_dir)	+	dirname.substr(1,	dirname.size());
+				}
+
+				while	(cur_index	!=	full_dir.size())	{
+								cur_index	=	full_dir.find('/',	cur_index+1);
+								if	(cur_index	==	std::string::npos)	{
+												cur_index	=	full_dir.size();
+								}
+								std::string	cur_dir	=	full_dir.substr(0,	cur_index);
+								
+								struct	stat	info;
+								if(stat(	cur_dir.c_str(),	&info	)	!=	0)	{
+												//	does	not	exist	-	make	it
+												if	(mkdir(cur_dir.c_str(),	0775)	==	-1)	{
+																std::cerr	<<	"Error	creating	directory	"	<<	cur_dir	<<	std::endl;
+																return	1;
+												}
+								}	else	{
+												//	Does	exist
+												if(info.st_mode	&	S_IFDIR)	{
+																//	Is	a	directory
+																if	(info.st_mode	&	S_IWUSR)	{
+																				//	Perfect,	nothing	to	do	here
+																}	else	{
+																				//	Not	writeable
+																				std::cerr	<<	"Intermediate	directory	"	<<	cur_dir	<<	"	is	not	writable,	unable	to	create	output	directory."	<<	std::endl;
+																				return	1;
+																}
+												}	else	{
+																//	Does	exist,	but	is	a	file
+																std::cerr	<<	"Intermediate	directory	"	<<	cur_dir	<<	"	is	not	a	directory,	unable	to	create	output	directory."	<<	std::endl;
+																return	1;
+												}
+								}
+				}
+				return	0;
 }
 
 /**
 @details
--# Save the number of command line arguments.
--# Save the command line arguments.
--# Determine the directory and simulation executable name from the first
-   command line argument
-   -# If no directory is specified
-      -# Save the simulation executable name as the full first argument
-      -# Get the current working directory
-      -# Save the current working directory as the default input directory.
-   -# If a relative or full directory is present in the command line arguments
-      -# split the command line argument on the last "/" character
-      -# Save the back half of the split as the simulation executable name
-      -# Save the current working directory
-      -# Change the current working directory to the first half of the split
-         command line argument.
-      -# Get the current working directory
-      -# Save the current working directory as the default input directory.
-      -# Change the current working directory to the saved working directory
--# If present, the second argument will be the run directory and the input file.
-   -# Save the run input file  name as the full second argument
-   -# Split the second argument on the last "/" character
-   -# If no directory is specified set the default output and current output
-      directories to the current directory
-   -# Else set the default and the current output directories to the first
-      half of the split
--# Search the remaining command line arguments for "-O" or "-OO"
-   -# If found set the output direcory to the following argument
-   -# Attempt to create the output directory if it does not exist.
-      -# Exit if the simulation cannot be created.
+-#	Save	the	number	of	command	line	arguments.
+-#	Save	the	command	line	arguments.
+-#	Determine	the	directory	and	simulation	executable	name	from	the	first
+			command	line	argument
+			-#	If	no	directory	is	specified
+						-#	Save	the	simulation	executable	name	as	the	full	first	argument
+						-#	Get	the	current	working	directory
+						-#	Save	the	current	working	directory	as	the	default	input	directory.
+			-#	If	a	relative	or	full	directory	is	present	in	the	command	line	arguments
+						-#	split	the	command	line	argument	on	the	last	"/"	character
+						-#	Save	the	back	half	of	the	split	as	the	simulation	executable	name
+						-#	Save	the	current	working	directory
+						-#	Change	the	current	working	directory	to	the	first	half	of	the	split
+									command	line	argument.
+						-#	Get	the	current	working	directory
+						-#	Save	the	current	working	directory	as	the	default	input	directory.
+						-#	Change	the	current	working	directory	to	the	saved	working	directory
+-#	If	present,	the	second	argument	will	be	the	run	directory	and	the	input	file.
+			-#	Save	the	run	input	file		name	as	the	full	second	argument
+			-#	Split	the	second	argument	on	the	last	"/"	character
+			-#	If	no	directory	is	specified	set	the	default	output	and	current	output
+						directories	to	the	current	directory
+			-#	Else	set	the	default	and	the	current	output	directories	to	the	first
+						half	of	the	split
+-#	Search	the	remaining	command	line	arguments	for	"-O"	or	"-OO"
+			-#	If	found	set	the	output	direcory	to	the	following	argument
+			-#	Attempt	to	create	the	output	directory	if	it	does	not	exist.
+						-#	Exit	if	the	simulation	cannot	be	created.
 */
-int Trick::CommandLineArguments::process_sim_args(int nargs , char **args) {
-
-    char *buf, *buf2;
-    size_t found ;
-
-    argc = nargs ;
-    argv = (char **)TMM_declare_var_1d("char *", argc) ;
-    for (int ii = 0 ; ii < argc ; ii++ ) {
-       argv[ii] = TMM_strdup(args[ii]) ;
-    }
-
-    buf = (char *)malloc(4096) ;
-    buf2 = (char *)malloc(4096) ;
-
-    default_dir = argv[0] ;
-    found = default_dir.find_last_of("/") ;
-    if ( found == std::string::npos ) {
-        cmdline_name = default_dir ;
-        getcwd(buf, (size_t) 256);
-        default_dir = buf ;
-    } else {
-        cmdline_name = default_dir.substr(found + 1) ;
-
-        // save the current directory
-        getcwd(buf, (size_t) 256);
-
-        // change to the default directory
-        chdir(default_dir.substr(0,found).c_str());
-
-        // get the full path default directory
-        getcwd(buf2, (size_t) 256);
-        default_dir = buf2 ;
-
-        // change back to the current directory
-        chdir(buf);
-    }
-
-    free(buf) ;
-    free(buf2) ;
-
-    if ( argc > 1 ) {
-
-    /* First occurnance of "RUN_*" is the input file name: '<Run_dir>/<file_name>'. 
-       If not found, defaults to first argument */
-        
-        input_file = argv[1];
-        run_dir = argv[1];
-
-        for(int ii = 1; ii < argc; ii++) {
-            if(std::string(argv[ii]).find("RUN_") != std::string::npos) {
-              input_file = argv[ii];
-              run_dir = argv[ii];
-              break;
-            }
-        }
-
-        if (access(input_file.c_str(), F_OK) != 0) {
-          input_file = "";
-            if(strcmp(argv[1], "trick_version") && strcmp(argv[1], "sie") && strcmp(argv[1], "-help")  && strcmp(argv[1], "--help") &&
-                strcmp(argv[1], "-h") && strcmp(argv[1], "help")) {
-                std::cerr << "\nERROR: Invalid input file or command line argument." << std::endl;
-                exit(1);
-            }
-        }
-
-        found = run_dir.find_last_of("/") ;
-        if ( found != std::string::npos ) {
-            run_dir.erase(found) ;
-        } else {
-            run_dir = "." ;
-        }
-        /* check existence of run directory */
-        if (access(run_dir.c_str(), F_OK) != 0) {
-            std::cerr << "\nERROR: while accessing input file directory \"" << run_dir << "\" : " << std::strerror(errno) << std::endl ;
-            exit(1);
-        }
-
-        output_dir = run_dir ;
-
-        for (int ii = 1; ii < argc; ii++) {
-            if (!strncmp("-OO", argv[ii], (size_t) 3) || !strncmp("-O", argv[ii], (size_t) 2)) {
-                if (ii == ( argc - 1 )) {
-                    std::cerr << "\nERROR: No directory specified after -O or -OO argument" << std::endl ;
-                    exit(1) ;
-                }
-                /* Output data directory */
-                output_dir = user_output_dir = argv[++ii];
-                if (!strncmp("-OO", argv[ii-1], (size_t) 3)) {
-                    output_dir = output_dir + "/" + run_dir;
-                } 
-            }
-        }
-
-        /* Create output directory if necessary. */
-        if (access(output_dir.c_str(), F_OK) != 0) {
-            if (create_path(output_dir) != 0) {
-                std::cerr << "\nERROR: While trying to create output directory \"" << output_dir << "\" : " << std::strerror(errno) << std::endl ;
-                exit(1) ;
-            }
-        } else {
-            /* check permissions on output directory */
-            if (access(output_dir.c_str(), (W_OK|X_OK) ) == -1) {
-                std::cerr << "\nERROR: while writing to output directory \"" << output_dir << "\" : " << std::strerror(errno) << std::endl ;
-                exit(2) ;
-            }
-        }
-    }
-
-    return(0) ;
+int	Trick::CommandLineArguments::process_sim_args(int	nargs	,	char	**args)	{
+
+				char	*buf,	*buf2;
+				size_t	found	;
+
+				argc	=	nargs	;
+				argv	=	(char	**)TMM_declare_var_1d("char	*",	argc)	;
+				for	(int	ii	=	0	;	ii	<	argc	;	ii++	)	{
+							argv[ii]	=	TMM_strdup(args[ii])	;
+				}
+
+				buf	=	(char	*)malloc(4096)	;
+				buf2	=	(char	*)malloc(4096)	;
+
+				default_dir	=	argv[0]	;
+				found	=	default_dir.find_last_of("/")	;
+				if	(	found	==	std::string::npos	)	{
+								cmdline_name	=	default_dir	;
+								getcwd(buf,	(size_t)	256);
+								default_dir	=	buf	;
+				}	else	{
+								cmdline_name	=	default_dir.substr(found	+	1)	;
+
+								//	save	the	current	directory
+								getcwd(buf,	(size_t)	256);
+
+								//	change	to	the	default	directory
+								chdir(default_dir.substr(0,found).c_str());
+
+								//	get	the	full	path	default	directory
+								getcwd(buf2,	(size_t)	256);
+								default_dir	=	buf2	;
+
+								//	change	back	to	the	current	directory
+								chdir(buf);
+				}
+
+				free(buf)	;
+				free(buf2)	;
+
+				if	(	argc	>	1	)	{
+
+				/*	First	occurnance	of	"RUN_*"	is	the	input	file	name:	'<Run_dir>/<file_name>'.	
+							If	not	found,	defaults	to	first	argument	*/
+								
+								input_file	=	argv[1];
+								run_dir	=	argv[1];
+
+								for(int	ii	=	1;	ii	<	argc;	ii++)	{
+												if(std::string(argv[ii]).find("RUN_")	!=	std::string::npos)	{
+														input_file	=	argv[ii];
+														run_dir	=	argv[ii];
+														break;
+												}
+								}
+
+								if	(access(input_file.c_str(),	F_OK)	!=	0)	{
+										input_file	=	"";
+												if(strcmp(argv[1],	"trick_version")	&&	strcmp(argv[1],	"sie")	&&	strcmp(argv[1],	"-help")		&&	strcmp(argv[1],	"--help")	&&
+																strcmp(argv[1],	"-h")	&&	strcmp(argv[1],	"help"))	{
+																std::cerr	<<	"\nERROR:	Invalid	input	file	or	command	line	argument."	<<	std::endl;
+																exit(1);
+												}
+								}
+
+								found	=	run_dir.find_last_of("/")	;
+								if	(	found	!=	std::string::npos	)	{
+												run_dir.erase(found)	;
+								}	else	{
+												run_dir	=	"."	;
+								}
+								/*	check	existence	of	run	directory	*/
+								if	(access(run_dir.c_str(),	F_OK)	!=	0)	{
+												std::cerr	<<	"\nERROR:	while	accessing	input	file	directory	\""	<<	run_dir	<<	"\"	:	"	<<	std::strerror(errno)	<<	std::endl	;
+												exit(1);
+								}
+
+								output_dir	=	run_dir	;
+
+								for	(int	ii	=	1;	ii	<	argc;	ii++)	{
+												if	(!strncmp("-OO",	argv[ii],	(size_t)	3)	||	!strncmp("-O",	argv[ii],	(size_t)	2))	{
+																if	(ii	==	(	argc	-	1	))	{
+																				std::cerr	<<	"\nERROR:	No	directory	specified	after	-O	or	-OO	argument"	<<	std::endl	;
+																				exit(1)	;
+																}
+																/*	Output	data	directory	*/
+																output_dir	=	user_output_dir	=	argv[++ii];
+																if	(!strncmp("-OO",	argv[ii-1],	(size_t)	3))	{
+																				output_dir	=	output_dir	+	"/"	+	run_dir;
+																}	
+												}
+								}
+
+								/*	Create	output	directory	if	necessary.	*/
+								if	(access(output_dir.c_str(),	F_OK)	!=	0)	{
+												if	(create_path(output_dir)	!=	0)	{
+																std::cerr	<<	"\nERROR:	While	trying	to	create	output	directory	\""	<<	output_dir	<<	"\"	:	"	<<	std::strerror(errno)	<<	std::endl	;
+																exit(1)	;
+												}
+								}	else	{
+												/*	check	permissions	on	output	directory	*/
+												if	(access(output_dir.c_str(),	(W_OK|X_OK)	)	==	-1)	{
+																std::cerr	<<	"\nERROR:	while	writing	to	output	directory	\""	<<	output_dir	<<	"\"	:	"	<<	std::strerror(errno)	<<	std::endl	;
+																exit(2)	;
+												}
+								}
+				}
+
+				return(0)	;
 
 }
 
 
 /**
 @design
--# Get the current system date and time.
--# Set the subdirectory within the current output directory to
-   DATA_<year>_<month>_<day>_<hour>_<minute>_<second>
-   -# Attempt to create the output directory if it does not exist.
-      -# Exit if the simulation cannot be created.
+-#	Get	the	current	system	date	and	time.
+-#	Set	the	subdirectory	within	the	current	output	directory	to
+			DATA_<year>_<month>_<day>_<hour>_<minute>_<second>
+			-#	Attempt	to	create	the	output	directory	if	it	does	not	exist.
+						-#	Exit	if	the	simulation	cannot	be	created.
 */
-int Trick::CommandLineArguments::output_dir_timestamped_on() {
+int	Trick::CommandLineArguments::output_dir_timestamped_on()	{
 
-    time_t date ;
-    struct tm *curr_time ;
-    char temp_str[256] ;
+				time_t	date	;
+				struct	tm	*curr_time	;
+				char	temp_str[256]	;
 
-    date = time(NULL) ;
-    curr_time = localtime(&date) ;
+				date	=	time(NULL)	;
+				curr_time	=	localtime(&date)	;
 
-    snprintf(temp_str, sizeof(temp_str), "DATA_%4d_%02d_%02d_%02d_%02d_%02d",
-            curr_time->tm_year + 1900 , curr_time->tm_mon + 1 , curr_time->tm_mday,
-            curr_time->tm_hour , curr_time->tm_min , curr_time->tm_sec );
+				snprintf(temp_str,	sizeof(temp_str),	"DATA_%4d_%02d_%02d_%02d_%02d_%02d",
+												curr_time->tm_year	+	1900	,	curr_time->tm_mon	+	1	,	curr_time->tm_mday,
+												curr_time->tm_hour	,	curr_time->tm_min	,	curr_time->tm_sec	);
 
-    time_stamp_dir = std::string(temp_str) ;
+				time_stamp_dir	=	std::string(temp_str)	;
 
-    if ( ! user_output_dir.empty() ) {
-        output_dir = user_output_dir + "/" + time_stamp_dir ;
-    } else {
-        output_dir = run_dir + "/" + time_stamp_dir ;
-    }
+				if	(	!	user_output_dir.empty()	)	{
+								output_dir	=	user_output_dir	+	"/"	+	time_stamp_dir	;
+				}	else	{
+								output_dir	=	run_dir	+	"/"	+	time_stamp_dir	;
+				}
 
-    /* Create directories if necessary. */
-    if (access(output_dir.c_str(), F_OK) != 0) {
-        if (mkdir(output_dir.c_str(), 0775) == -1) {
-            std::cerr << "\nERROR: While trying to create dir \"" << output_dir << "\" Exiting!" << std::endl ;
-            exit(1) ;
-        }
-    }
+				/*	Create	directories	if	necessary.	*/
+				if	(access(output_dir.c_str(),	F_OK)	!=	0)	{
+								if	(mkdir(output_dir.c_str(),	0775)	==	-1)	{
+												std::cerr	<<	"\nERROR:	While	trying	to	create	dir	\""	<<	output_dir	<<	"\"	Exiting!"	<<	std::endl	;
+												exit(1)	;
+								}
+				}
 
-    output_dir_timestamped = 1 ;
-    return(0) ;
+				output_dir_timestamped	=	1	;
+				return(0)	;
 }
 
 /**
 @design
--# If the user had specified an output directory reset
-   the output directory to the user specified directory
--# Else set the output directory to the run directory.
+-#	If	the	user	had	specified	an	output	directory	reset
+			the	output	directory	to	the	user	specified	directory
+-#	Else	set	the	output	directory	to	the	run	directory.
 */
-int Trick::CommandLineArguments::output_dir_timestamped_off() {
+int	Trick::CommandLineArguments::output_dir_timestamped_off()	{
 
-    if ( ! user_output_dir.empty() ) {
-        output_dir = user_output_dir ;
-    } else {
-        output_dir = run_dir ;
-    }
+				if	(	!	user_output_dir.empty()	)	{
+								output_dir	=	user_output_dir	;
+				}	else	{
+								output_dir	=	run_dir	;
+				}
 
-    output_dir_timestamped = 0 ;
-    return(0) ;
+				output_dir_timestamped	=	0	;
+				return(0)	;
 
 }
 
 /**
 @design
--#  Sets the value of output_dir
+-#		Sets	the	value	of	output_dir
 */
-void Trick::CommandLineArguments::set_output_dir(std::string output_directory) {
-    output_dir = output_directory;
+void	Trick::CommandLineArguments::set_output_dir(std::string	output_directory)	{
+				output_dir	=	output_directory;
 }
diff --git a/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp b/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp
index 9181ab695..03b941448 100644
--- a/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp
+++ b/trick_source/sim_services/CommandLineArguments/command_line_c_intf.cpp
@@ -1,119 +1,119 @@
 /*
-   PURPOSE: ( Handle the simulation command line args )
+			PURPOSE:	(	Handle	the	simulation	command	line	args	)
 
-   REFERENCE: ( Trick Simulation Environment )
+			REFERENCE:	(	Trick	Simulation	Environment	)
 
-   ASSUMPTIONS AND LIMITATIONS: ( None )
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
 
-   CLASS: ( N/A )
+			CLASS:	(	N/A	)
 
-   LIBRARY DEPENDENCY: ( None )
+			LIBRARY	DEPENDENCY:	(	None	)
 
-   PROGRAMMERS: ( Keith Vetter LinCom 6/2003 ) */
+			PROGRAMMERS:	(	Keith	Vetter	LinCom	6/2003	)	*/
 
-#include <iostream>
-#include "trick/CommandLineArguments.hh"
+#include	<iostream>
+#include	"trick/CommandLineArguments.hh"
 
-extern Trick::CommandLineArguments * the_cmd_args ;
+extern	Trick::CommandLineArguments	*	the_cmd_args	;
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::process_sim_args(int argc , char **argv)
- */
-extern "C" int command_line_args_process_sim_args(int argc , char **argv) {
-    return(the_cmd_args->process_sim_args(argc, argv)) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::process_sim_args(int	argc	,	char	**argv)
+	*/
+extern	"C"	int	command_line_args_process_sim_args(int	argc	,	char	**argv)	{
+				return(the_cmd_args->process_sim_args(argc,	argv))	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_argc()
- */
-extern "C" int command_line_args_get_argc(void) {
-    return(the_cmd_args->get_argc()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_argc()
+	*/
+extern	"C"	int	command_line_args_get_argc(void)	{
+				return(the_cmd_args->get_argc())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_argv()
- */
-extern "C" char ** command_line_args_get_argv(void) {
-    return(the_cmd_args->get_argv()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_argv()
+	*/
+extern	"C"	char	**	command_line_args_get_argv(void)	{
+				return(the_cmd_args->get_argv())	;
 }
 
-const char * empty_string = "" ;
+const	char	*	empty_string	=	""	;
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_output_dir()
- */
-extern "C" const char * command_line_args_get_output_dir(void) {
-    return(the_cmd_args->get_output_dir_ref().c_str()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_output_dir()
+	*/
+extern	"C"	const	char	*	command_line_args_get_output_dir(void)	{
+				return(the_cmd_args->get_output_dir_ref().c_str())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_user_output_dir()
- */
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_user_output_dir()
+	*/
 
-extern "C" const char * command_line_args_get_user_output_dir(void) {
-    return(the_cmd_args->get_user_output_dir_ref().c_str()) ;
+extern	"C"	const	char	*	command_line_args_get_user_output_dir(void)	{
+				return(the_cmd_args->get_user_output_dir_ref().c_str())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_input_file()
- */
-extern "C" const char * command_line_args_get_input_file(void) {
-    return(the_cmd_args->get_input_file_ref().c_str()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_input_file()
+	*/
+extern	"C"	const	char	*	command_line_args_get_input_file(void)	{
+				return(the_cmd_args->get_input_file_ref().c_str())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_default_dir()
- */
-extern "C" const char * command_line_args_get_default_dir(void) {
-    return(the_cmd_args->get_default_dir_ref().c_str()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_default_dir()
+	*/
+extern	"C"	const	char	*	command_line_args_get_default_dir(void)	{
+				return(the_cmd_args->get_default_dir_ref().c_str())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_cmdline_name()
- */
-extern "C" const char * command_line_args_get_cmdline_name(void) {
-    return(the_cmd_args->get_cmdline_name_ref().c_str()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_cmdline_name()
+	*/
+extern	"C"	const	char	*	command_line_args_get_cmdline_name(void)	{
+				return(the_cmd_args->get_cmdline_name_ref().c_str())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::output_dir_timestamped_on()
- */
-extern "C" int output_dir_timestamped_on(void) {
-    return(the_cmd_args->output_dir_timestamped_on()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::output_dir_timestamped_on()
+	*/
+extern	"C"	int	output_dir_timestamped_on(void)	{
+				return(the_cmd_args->output_dir_timestamped_on())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::output_dir_timestamped_off()
- */
-extern "C" int output_dir_timestamped_off(void) {
-    return(the_cmd_args->output_dir_timestamped_off()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::output_dir_timestamped_off()
+	*/
+extern	"C"	int	output_dir_timestamped_off(void)	{
+				return(the_cmd_args->output_dir_timestamped_off())	;
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::set_output_dir(std::string)
- */
-extern "C" void set_output_dir(const char* output_directory) {
-    the_cmd_args->set_output_dir(output_directory);
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::set_output_dir(std::string)
+	*/
+extern	"C"	void	set_output_dir(const	char*	output_directory)	{
+				the_cmd_args->set_output_dir(output_directory);
 }
 
 /**
- @relates Trick::CommandLineArguments
- @copydoc Trick::CommandLineArguments::get_input_file_ref()
- */
-std::string & command_line_args_get_input_file_ref(void) {
-    return(the_cmd_args->get_input_file_ref()) ;
+	@relates	Trick::CommandLineArguments
+	@copydoc	Trick::CommandLineArguments::get_input_file_ref()
+	*/
+std::string	&	command_line_args_get_input_file_ref(void)	{
+				return(the_cmd_args->get_input_file_ref())	;
 }
 
-void create_path(const char* directory) {
-    Trick::CommandLineArguments::create_path(directory);
+void	create_path(const	char*	directory)	{
+				Trick::CommandLineArguments::create_path(directory);
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/CommandLineArguments/test/create_path_test.cpp b/trick_source/sim_services/CommandLineArguments/test/create_path_test.cpp
index c0daa9cc5..d811ab8a8 100644
--- a/trick_source/sim_services/CommandLineArguments/test/create_path_test.cpp
+++ b/trick_source/sim_services/CommandLineArguments/test/create_path_test.cpp
@@ -1,97 +1,97 @@
-#include <iostream>
-#include <stdio.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
-
-
-#include "gtest/gtest.h"
-#include "trick/CommandLineArguments.hh"
-
-namespace Trick {
-
-
-// Clean up the directory created
-void rm_dir(const std::string& dir) {
-    const int result = remove( dir.c_str() );
-    if( result != 0 && errno == 66){
-        // Failed because directory is not empty
-        // Remove stuff and try again
-        DIR *temp_dir;
-        struct dirent *ent;
-        if ((temp_dir = opendir (dir.c_str())) != NULL) {
-            // Go through everything in this directory
-            while ((ent = readdir (temp_dir)) != NULL) {
-                if (!(strcmp(".", ent->d_name) == 0 || strcmp("..", ent->d_name) == 0 )) {
-                    // remove it
-                    rm_dir(dir + "/" + std::string(ent->d_name));
-                }
-            }
-            closedir (temp_dir);
-        }
-
-        // Try again
-        remove( dir.c_str() );
-    }
+#include	<iostream>
+#include	<stdio.h>
+#include	<dirent.h>
+#include	<unistd.h>
+#include	<sys/types.h>
+#include	<pwd.h>
+
+
+#include	"gtest/gtest.h"
+#include	"trick/CommandLineArguments.hh"
+
+namespace	Trick	{
+
+
+//	Clean	up	the	directory	created
+void	rm_dir(const	std::string&	dir)	{
+				const	int	result	=	remove(	dir.c_str()	);
+				if(	result	!=	0	&&	errno	==	66){
+								//	Failed	because	directory	is	not	empty
+								//	Remove	stuff	and	try	again
+								DIR	*temp_dir;
+								struct	dirent	*ent;
+								if	((temp_dir	=	opendir	(dir.c_str()))	!=	NULL)	{
+												//	Go	through	everything	in	this	directory
+												while	((ent	=	readdir	(temp_dir))	!=	NULL)	{
+																if	(!(strcmp(".",	ent->d_name)	==	0	||	strcmp("..",	ent->d_name)	==	0	))	{
+																				//	remove	it
+																				rm_dir(dir	+	"/"	+	std::string(ent->d_name));
+																}
+												}
+												closedir	(temp_dir);
+								}
+
+								//	Try	again
+								remove(	dir.c_str()	);
+				}
 }
 
-bool dir_correct(const std::string& dir) {
-    // Make sure that the directory exists and is writeable
-    struct stat info;
-    if(stat( dir.c_str(), &info ) == 0) {
-        if (info.st_mode & S_IFDIR && info.st_mode & S_IWUSR ) {
-            return true;
-        }
-    }
+bool	dir_correct(const	std::string&	dir)	{
+				//	Make	sure	that	the	directory	exists	and	is	writeable
+				struct	stat	info;
+				if(stat(	dir.c_str(),	&info	)	==	0)	{
+								if	(info.st_mode	&	S_IFDIR	&&	info.st_mode	&	S_IWUSR	)	{
+												return	true;
+								}
+				}
 
-    return false;
+				return	false;
 }
 
-TEST(CreatePathTest, BasicTest) {
-    std::string dir = "a/b/c";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 0);
-    ASSERT_TRUE(dir_correct(dir));
+TEST(CreatePathTest,	BasicTest)	{
+				std::string	dir	=	"a/b/c";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	0);
+				ASSERT_TRUE(dir_correct(dir));
 
-    rm_dir("a");
+				rm_dir("a");
 }
 
-TEST(CreatePathTest, PreExistingDir) {
-    std::string dir = "pre_existing_output_dir";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 0);
-    ASSERT_TRUE(dir_correct(dir));
+TEST(CreatePathTest,	PreExistingDir)	{
+				std::string	dir	=	"pre_existing_output_dir";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	0);
+				ASSERT_TRUE(dir_correct(dir));
 }
 
-TEST(CreatePathTest, PreExistingInPath) {
-    std::string dir = "pre_existing_output_dir/a/b/c";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 0);
-    ASSERT_TRUE(dir_correct(dir));
+TEST(CreatePathTest,	PreExistingInPath)	{
+				std::string	dir	=	"pre_existing_output_dir/a/b/c";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	0);
+				ASSERT_TRUE(dir_correct(dir));
 
-    rm_dir("pre_existing_output_dir/a");
+				rm_dir("pre_existing_output_dir/a");
 }
 
-TEST(CreatePathTest, FileInPath) {
-    std::string dir = "pre_existing_output_dir/some_file/a";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 1);
+TEST(CreatePathTest,	FileInPath)	{
+				std::string	dir	=	"pre_existing_output_dir/some_file/a";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	1);
 }
 
 
-TEST(CreatePathTest, AbsolutePath) {
-    char buf[1024];
-    getcwd(buf, 1024);
-    std::string dir = std::string(buf) + "/a/b/c";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 0);
-    ASSERT_TRUE(dir_correct(dir));
+TEST(CreatePathTest,	AbsolutePath)	{
+				char	buf[1024];
+				getcwd(buf,	1024);
+				std::string	dir	=	std::string(buf)	+	"/a/b/c";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	0);
+				ASSERT_TRUE(dir_correct(dir));
 
-    rm_dir(std::string(buf) + std::string("/a"));
+				rm_dir(std::string(buf)	+	std::string("/a"));
 }
 
-TEST(CreatePathTest, dotdotinpath) {
-    std::string dir = "../a/b/c";
-    ASSERT_EQ(CommandLineArguments::create_path(dir), 0);
-    ASSERT_TRUE(dir_correct(dir));
+TEST(CreatePathTest,	dotdotinpath)	{
+				std::string	dir	=	"../a/b/c";
+				ASSERT_EQ(CommandLineArguments::create_path(dir),	0);
+				ASSERT_TRUE(dir_correct(dir));
 
-    rm_dir("../a");
+				rm_dir("../a");
 }
 
 
diff --git a/trick_source/sim_services/DataRecord/DRAscii.cpp b/trick_source/sim_services/DataRecord/DRAscii.cpp
index 1d6f80ceb..16b33ac1f 100644
--- a/trick_source/sim_services/DataRecord/DRAscii.cpp
+++ b/trick_source/sim_services/DataRecord/DRAscii.cpp
@@ -1,262 +1,262 @@
- 
+	
 /*
 PURPOSE:
-    (Data record in ascii format.)
+				(Data	record	in	ascii	format.)
 PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom Corp) (3/96) (SES upgrades)
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+					(((Robert	W.	Bailey)	(LinCom	Corp)	(3/96)	(SES	upgrades)
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include	<iostream>
+#include	<stdlib.h>
+#include	<string.h>
 
-#include "trick/DRAscii.hh"
-#include "trick/command_line_protos.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/bitfield_proto.h"
+#include	"trick/DRAscii.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/bitfield_proto.h"
 
-Trick::DRAscii::DRAscii( std::string in_name ) : Trick::DataRecordGroup( in_name ) {
+Trick::DRAscii::DRAscii(	std::string	in_name	)	:	Trick::DataRecordGroup(	in_name	)	{
 
-    ascii_float_format = "%20.8g" ;
-    ascii_double_format = "%20.16g" ;
-    delimiter = ",";
-    register_group_with_mm(this, "Trick::DRAscii") ;
+				ascii_float_format	=	"%20.8g"	;
+				ascii_double_format	=	"%20.16g"	;
+				delimiter	=	",";
+				register_group_with_mm(this,	"Trick::DRAscii")	;
 }
 
-int Trick::DRAscii::format_specific_header( std::fstream & out_st ) {
-    out_st << " is in ASCII" << std::endl ;
-    return(0) ;
+int	Trick::DRAscii::format_specific_header(	std::fstream	&	out_st	)	{
+				out_st	<<	"	is	in	ASCII"	<<	std::endl	;
+				return(0)	;
 }
 
 /**
 @details
--# If the #delimiter is not empty and not a comma then set the file extension to ".txt"
--# Else set the file extension to ".csv"
--# Allocate enough memory to hold #record_size of records in memory
--# Open the log file
-   -# Return an error if the open failed.
--# Write out the title line of the log file.  The title line includes the names of
-   recorded variables and the units of measurement separated by the #delimiter
--# Declare the recording group to the memory manager so that the group can be checkpointed
-   and restored
+-#	If	the	#delimiter	is	not	empty	and	not	a	comma	then	set	the	file	extension	to	".txt"
+-#	Else	set	the	file	extension	to	".csv"
+-#	Allocate	enough	memory	to	hold	#record_size	of	records	in	memory
+-#	Open	the	log	file
+			-#	Return	an	error	if	the	open	failed.
+-#	Write	out	the	title	line	of	the	log	file.		The	title	line	includes	the	names	of
+			recorded	variables	and	the	units	of	measurement	separated	by	the	#delimiter
+-#	Declare	the	recording	group	to	the	memory	manager	so	that	the	group	can	be	checkpointed
+			and	restored
 */
-int Trick::DRAscii::format_specific_init() {
-
-    unsigned int jj ;
-    std::streampos before_write;
-
-    /* Store log information in csv/txt file */
-    if ( ! delimiter.empty()  &&  delimiter.compare(",") != 0 ) {
-        file_name.append(".txt");
-    } else {
-        file_name.append(".csv");
-    }
-
-    /* Calculate a "worst case" for space used for 1 record. */
-    writer_buff_size = record_size * rec_buffer.size();
-    writer_buff = (char *)calloc(1 , writer_buff_size) ;
-
-    /* This loop touches all of the memory locations in the allocation forcing the
-       system to actually do the allocation */
-    for ( jj= 0 ; jj < record_size * rec_buffer.size() ; jj += 1024 ) {
-        writer_buff[jj] = 1 ;
-    }
-    writer_buff[record_size * rec_buffer.size() - 1] = 1 ;
-
-    out_stream.open(file_name.c_str(), std::fstream::out | std::fstream::app ) ;
-    if ( !out_stream || !out_stream.good() ) {
-        message_publish(MSG_ERROR, "Can't open Data Record file %s.\n", file_name.c_str()) ;
-        record = false ;
-        return -1 ;
-    }
-    before_write = out_stream.tellp();
-    // Write out the title line of the recording file
-    /* Start with the 1st item in the buffer which should be "sys.exec.out.time" */
-    out_stream << rec_buffer[0]->ref->reference ;
-    if ( rec_buffer[0]->ref->attr->units != NULL ) {
-        if ( rec_buffer[0]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-            out_stream << " {--}" ;
-        } else {
-            out_stream << " {" << rec_buffer[0]->ref->attr->units << "}" ;
-        }
-    }
-    
-    /* Write out specified recorded parameters */
-    for (jj = 1; jj < rec_buffer.size() ; jj++) {
-        out_stream << delimiter << rec_buffer[jj]->ref->reference ;
-
-        if ( rec_buffer[jj]->ref->attr->units != NULL ) {
-            if ( rec_buffer[jj]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-                out_stream << " {--}" ;
-            } else {
-                out_stream << " {" << rec_buffer[jj]->ref->attr->units << "}" ;
-            }
-        }
-    }
-    out_stream << std::endl ;
-    total_bytes_written += out_stream.tellp() - before_write;
-    return(0) ;
+int	Trick::DRAscii::format_specific_init()	{
+
+				unsigned	int	jj	;
+				std::streampos	before_write;
+
+				/*	Store	log	information	in	csv/txt	file	*/
+				if	(	!	delimiter.empty()		&&		delimiter.compare(",")	!=	0	)	{
+								file_name.append(".txt");
+				}	else	{
+								file_name.append(".csv");
+				}
+
+				/*	Calculate	a	"worst	case"	for	space	used	for	1	record.	*/
+				writer_buff_size	=	record_size	*	rec_buffer.size();
+				writer_buff	=	(char	*)calloc(1	,	writer_buff_size)	;
+
+				/*	This	loop	touches	all	of	the	memory	locations	in	the	allocation	forcing	the
+							system	to	actually	do	the	allocation	*/
+				for	(	jj=	0	;	jj	<	record_size	*	rec_buffer.size()	;	jj	+=	1024	)	{
+								writer_buff[jj]	=	1	;
+				}
+				writer_buff[record_size	*	rec_buffer.size()	-	1]	=	1	;
+
+				out_stream.open(file_name.c_str(),	std::fstream::out	|	std::fstream::app	)	;
+				if	(	!out_stream	||	!out_stream.good()	)	{
+								message_publish(MSG_ERROR,	"Can't	open	Data	Record	file	%s.\n",	file_name.c_str())	;
+								record	=	false	;
+								return	-1	;
+				}
+				before_write	=	out_stream.tellp();
+				//	Write	out	the	title	line	of	the	recording	file
+				/*	Start	with	the	1st	item	in	the	buffer	which	should	be	"sys.exec.out.time"	*/
+				out_stream	<<	rec_buffer[0]->ref->reference	;
+				if	(	rec_buffer[0]->ref->attr->units	!=	NULL	)	{
+								if	(	rec_buffer[0]->ref->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+												out_stream	<<	"	{--}"	;
+								}	else	{
+												out_stream	<<	"	{"	<<	rec_buffer[0]->ref->attr->units	<<	"}"	;
+								}
+				}
+				
+				/*	Write	out	specified	recorded	parameters	*/
+				for	(jj	=	1;	jj	<	rec_buffer.size()	;	jj++)	{
+								out_stream	<<	delimiter	<<	rec_buffer[jj]->ref->reference	;
+
+								if	(	rec_buffer[jj]->ref->attr->units	!=	NULL	)	{
+												if	(	rec_buffer[jj]->ref->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+																out_stream	<<	"	{--}"	;
+												}	else	{
+																out_stream	<<	"	{"	<<	rec_buffer[jj]->ref->attr->units	<<	"}"	;
+												}
+								}
+				}
+				out_stream	<<	std::endl	;
+				total_bytes_written	+=	out_stream.tellp()	-	before_write;
+				return(0)	;
 }
 
 /**
 @details
--# While there is data in memory that has not been written to disk
-   -# Write out the time to a temporary #writer_buff
-   -# Write out each of the other parameter values preceded by the delimiter to the temporary #writer_buff
-   -# Write #writer_buff to the output file
--# Flush the output file stream
--# Return the number of bytes written
+-#	While	there	is	data	in	memory	that	has	not	been	written	to	disk
+			-#	Write	out	the	time	to	a	temporary	#writer_buff
+			-#	Write	out	each	of	the	other	parameter	values	preceded	by	the	delimiter	to	the	temporary	#writer_buff
+			-#	Write	#writer_buff	to	the	output	file
+-#	Flush	the	output	file	stream
+-#	Return	the	number	of	bytes	written
 */
-int Trick::DRAscii::format_specific_write_data(unsigned int writer_offset) {
-    unsigned int ii ;
-    char *buf;
-
-    buf = writer_buff ;
-
-    /* Write out the first parameters (time) */
-    copy_data_ascii_item(rec_buffer[0], writer_offset, buf );
-    buf += strlen(buf);
-
-    /* Write out all other parameters */
-    for (ii = 1; ii < rec_buffer.size() ; ii++) {
-        strcat(buf, delimiter.c_str() );
-        buf += delimiter.length() ;
-        copy_data_ascii_item(rec_buffer[ii], writer_offset, buf );
-        buf += strlen(buf);
-    }
-
-    out_stream << writer_buff << std::endl ;
-
-    /*! Flush the output */
-    out_stream.flush() ;
-    /*! +1 for endl */
-    return(strlen(writer_buff) + 1) ;
+int	Trick::DRAscii::format_specific_write_data(unsigned	int	writer_offset)	{
+				unsigned	int	ii	;
+				char	*buf;
+
+				buf	=	writer_buff	;
+
+				/*	Write	out	the	first	parameters	(time)	*/
+				copy_data_ascii_item(rec_buffer[0],	writer_offset,	buf	);
+				buf	+=	strlen(buf);
+
+				/*	Write	out	all	other	parameters	*/
+				for	(ii	=	1;	ii	<	rec_buffer.size()	;	ii++)	{
+								strcat(buf,	delimiter.c_str()	);
+								buf	+=	delimiter.length()	;
+								copy_data_ascii_item(rec_buffer[ii],	writer_offset,	buf	);
+								buf	+=	strlen(buf);
+				}
+
+				out_stream	<<	writer_buff	<<	std::endl	;
+
+				/*!	Flush	the	output	*/
+				out_stream.flush()	;
+				/*!	+1	for	endl	*/
+				return(strlen(writer_buff)	+	1)	;
 }
 
 /**
 @details
--# Close the output file stream
+-#	Close	the	output	file	stream
 */
-int Trick::DRAscii::format_specific_shutdown() {
+int	Trick::DRAscii::format_specific_shutdown()	{
 
-    if ( inited ) {
-        out_stream.close() ;
-    }
-    return(0) ;
+				if	(	inited	)	{
+								out_stream.close()	;
+				}
+				return(0)	;
 }
 
-int Trick::DRAscii::set_ascii_float_format( std::string in_float_format ) {
-    ascii_float_format = in_float_format ;
-    return(0) ;
+int	Trick::DRAscii::set_ascii_float_format(	std::string	in_float_format	)	{
+				ascii_float_format	=	in_float_format	;
+				return(0)	;
 }
 
-int Trick::DRAscii::set_ascii_double_format( std::string in_double_format ) {
-    ascii_double_format = in_double_format ;
-    return(0) ;
+int	Trick::DRAscii::set_ascii_double_format(	std::string	in_double_format	)	{
+				ascii_double_format	=	in_double_format	;
+				return(0)	;
 }
 
-int Trick::DRAscii::set_delimiter( std::string in_delimiter ) {
-    delimiter = in_delimiter ;
-    return(0) ;
+int	Trick::DRAscii::set_delimiter(	std::string	in_delimiter	)	{
+				delimiter	=	in_delimiter	;
+				return(0)	;
 }
 
-int Trick::DRAscii::set_single_prec_only( bool in_single_prec_only ) {
-    Trick::DataRecordGroup::set_single_prec_only(in_single_prec_only) ;
-    if( single_prec_only ) {
-        ascii_double_format = "%20.8g";
-    }
-    else {
-        ascii_double_format = "%20.16g";
-    }
-    return(0) ;
+int	Trick::DRAscii::set_single_prec_only(	bool	in_single_prec_only	)	{
+				Trick::DataRecordGroup::set_single_prec_only(in_single_prec_only)	;
+				if(	single_prec_only	)	{
+								ascii_double_format	=	"%20.8g";
+				}
+				else	{
+								ascii_double_format	=	"%20.16g";
+				}
+				return(0)	;
 }
 
-int Trick::DRAscii::copy_data_ascii_item( Trick::DataRecordBuffer * DI, int item_num, char *buf ) {
+int	Trick::DRAscii::copy_data_ascii_item(	Trick::DataRecordBuffer	*	DI,	int	item_num,	char	*buf	)	{
 
-    char *address = 0;
+				char	*address	=	0;
 
-    unsigned long bf;
-    int sbf;
+				unsigned	long	bf;
+				int	sbf;
 
-    address = DI->buffer + (item_num * DI->ref->attr->size) ;
+				address	=	DI->buffer	+	(item_num	*	DI->ref->attr->size)	;
 
-    size_t writer_buf_spare = writer_buff + writer_buff_size - buf;
+				size_t	writer_buf_spare	=	writer_buff	+	writer_buff_size	-	buf;
 
-    switch (DI->ref->attr->type) {
-        case TRICK_CHARACTER:
-            snprintf(buf, writer_buf_spare, "%c", *((char *) address));
-            break;
+				switch	(DI->ref->attr->type)	{
+								case	TRICK_CHARACTER:
+												snprintf(buf,	writer_buf_spare,	"%c",	*((char	*)	address));
+												break;
 
-        case TRICK_UNSIGNED_CHARACTER:
-#if ( __linux | __sgi )
-        case TRICK_BOOLEAN:
+								case	TRICK_UNSIGNED_CHARACTER:
+#if	(	__linux	|	__sgi	)
+								case	TRICK_BOOLEAN:
 #endif
-            snprintf(buf, writer_buf_spare, "%u", *((unsigned char *) address));
-            break;
+												snprintf(buf,	writer_buf_spare,	"%u",	*((unsigned	char	*)	address));
+												break;
 
-        case TRICK_STRING:
-            snprintf(buf, writer_buf_spare, "%s", *((char **) address));
-            break;
+								case	TRICK_STRING:
+												snprintf(buf,	writer_buf_spare,	"%s",	*((char	**)	address));
+												break;
 
-        case TRICK_SHORT:
-            snprintf(buf, writer_buf_spare, "%d", *((short *) address));
-            break;
+								case	TRICK_SHORT:
+												snprintf(buf,	writer_buf_spare,	"%d",	*((short	*)	address));
+												break;
 
-        case TRICK_UNSIGNED_SHORT:
-            snprintf(buf, writer_buf_spare, "%u", *((unsigned short *) address));
-            break;
+								case	TRICK_UNSIGNED_SHORT:
+												snprintf(buf,	writer_buf_spare,	"%u",	*((unsigned	short	*)	address));
+												break;
 
-        case TRICK_ENUMERATED:
-        case TRICK_INTEGER:
-#if ( __sun | __APPLE__ )
-        case TRICK_BOOLEAN:
+								case	TRICK_ENUMERATED:
+								case	TRICK_INTEGER:
+#if	(	__sun	|	__APPLE__	)
+								case	TRICK_BOOLEAN:
 #endif
-            snprintf(buf, writer_buf_spare, "%d", *((int *) address));
-            break;
-
-        case TRICK_UNSIGNED_INTEGER:
-            snprintf(buf, writer_buf_spare, "%u", *((unsigned int *) address));
-            break;
-
-        case TRICK_LONG:
-            snprintf(buf, writer_buf_spare, "%ld", *((long *) address));
-            break;
-
-        case TRICK_UNSIGNED_LONG:
-            snprintf(buf, writer_buf_spare, "%lu", *((unsigned long *) address));
-            break;
-
-        case TRICK_FLOAT:
-            snprintf(buf, writer_buf_spare, ascii_float_format.c_str() , *((float *) address));
-            break;
-
-        case TRICK_DOUBLE:
-            snprintf(buf, writer_buf_spare, ascii_double_format.c_str() , *((double *) address));
-            break;
-
-        case TRICK_BITFIELD:
-            sbf = GET_BITFIELD(address, DI->ref->attr->size, DI->ref->attr->index[0].start, DI->ref->attr->index[0].size);
-            snprintf(buf, writer_buf_spare, "%d", sbf);
-            break;
-
-        case TRICK_UNSIGNED_BITFIELD:
-            bf = GET_UNSIGNED_BITFIELD(address, DI->ref->attr->size, DI->ref->attr->index[0].start, DI->ref->attr->index[0].size);
-            snprintf(buf, writer_buf_spare, "%lu", bf);
-            break;
-
-        case TRICK_LONG_LONG:
-            snprintf(buf, writer_buf_spare, "%lld", *((long long *) address));
-            break;
-
-        case TRICK_UNSIGNED_LONG_LONG:
-            snprintf(buf, writer_buf_spare, "%llu", *((unsigned long long *) address));
-            break;
-        default:
-            break;
-    }
-
-    return(0) ;
+												snprintf(buf,	writer_buf_spare,	"%d",	*((int	*)	address));
+												break;
+
+								case	TRICK_UNSIGNED_INTEGER:
+												snprintf(buf,	writer_buf_spare,	"%u",	*((unsigned	int	*)	address));
+												break;
+
+								case	TRICK_LONG:
+												snprintf(buf,	writer_buf_spare,	"%ld",	*((long	*)	address));
+												break;
+
+								case	TRICK_UNSIGNED_LONG:
+												snprintf(buf,	writer_buf_spare,	"%lu",	*((unsigned	long	*)	address));
+												break;
+
+								case	TRICK_FLOAT:
+												snprintf(buf,	writer_buf_spare,	ascii_float_format.c_str()	,	*((float	*)	address));
+												break;
+
+								case	TRICK_DOUBLE:
+												snprintf(buf,	writer_buf_spare,	ascii_double_format.c_str()	,	*((double	*)	address));
+												break;
+
+								case	TRICK_BITFIELD:
+												sbf	=	GET_BITFIELD(address,	DI->ref->attr->size,	DI->ref->attr->index[0].start,	DI->ref->attr->index[0].size);
+												snprintf(buf,	writer_buf_spare,	"%d",	sbf);
+												break;
+
+								case	TRICK_UNSIGNED_BITFIELD:
+												bf	=	GET_UNSIGNED_BITFIELD(address,	DI->ref->attr->size,	DI->ref->attr->index[0].start,	DI->ref->attr->index[0].size);
+												snprintf(buf,	writer_buf_spare,	"%lu",	bf);
+												break;
+
+								case	TRICK_LONG_LONG:
+												snprintf(buf,	writer_buf_spare,	"%lld",	*((long	long	*)	address));
+												break;
+
+								case	TRICK_UNSIGNED_LONG_LONG:
+												snprintf(buf,	writer_buf_spare,	"%llu",	*((unsigned	long	long	*)	address));
+												break;
+								default:
+												break;
+				}
+
+				return(0)	;
 }
diff --git a/trick_source/sim_services/DataRecord/DRBinary.cpp b/trick_source/sim_services/DataRecord/DRBinary.cpp
index eaa8f314a..2b5790ea3 100644
--- a/trick_source/sim_services/DataRecord/DRBinary.cpp
+++ b/trick_source/sim_services/DataRecord/DRBinary.cpp
@@ -1,193 +1,193 @@
 /*
 PURPOSE:
-    (Data record to disk in binary format.)
+				(Data	record	to	disk	in	binary	format.)
 PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom Corp) (3/96) (SES upgrades)
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+					(((Robert	W.	Bailey)	(LinCom	Corp)	(3/96)	(SES	upgrades)
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include	<iostream>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<fcntl.h>
+#include	<sys/stat.h>
+#include	<unistd.h>
 
-#include "trick/DRBinary.hh"
-#include "trick/command_line_protos.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/bitfield_proto.h"
+#include	"trick/DRBinary.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/bitfield_proto.h"
 
 /*
-   Other classes inherit from DRBinary. In these cases, we don't want to register the memory as DRBinary,
-   so register_group will be set to false.
+			Other	classes	inherit	from	DRBinary.	In	these	cases,	we	don't	want	to	register	the	memory	as	DRBinary,
+			so	register_group	will	be	set	to	false.
 */
-Trick::DRBinary::DRBinary( std::string in_name , bool register_group ) : Trick::DataRecordGroup(in_name) {
-    if ( register_group ) {
-        register_group_with_mm(this, "Trick::DRBinary") ;
-    }
+Trick::DRBinary::DRBinary(	std::string	in_name	,	bool	register_group	)	:	Trick::DataRecordGroup(in_name)	{
+				if	(	register_group	)	{
+								register_group_with_mm(this,	"Trick::DRBinary")	;
+				}
 }
 
-int Trick::DRBinary::format_specific_header( std::fstream & out_stream ) {
-    out_stream << " byte_order is " << byte_order << std::endl ;
-    return(0) ;
+int	Trick::DRBinary::format_specific_header(	std::fstream	&	out_stream	)	{
+				out_stream	<<	"	byte_order	is	"	<<	byte_order	<<	std::endl	;
+				return(0)	;
 }
 
 /**
 @details
--# Set the file extension to ".trk"
--# Allocate enough memory to hold #record_size of records in memory
--# Open the log file
-   -# Return an error if the open failed
--# Write out the magic Trick-07-[LB] keyword, L for little endian, B for big.
--# Write out the number of variables recorded
--# For each variable to be recorded
-   -# Write out the name
-   -# Write out the units
-   -# Write out the type
-   -# Write out the size
--# Declare the recording group to the memory manager so that the group can be checkpointed
-   and restored
+-#	Set	the	file	extension	to	".trk"
+-#	Allocate	enough	memory	to	hold	#record_size	of	records	in	memory
+-#	Open	the	log	file
+			-#	Return	an	error	if	the	open	failed
+-#	Write	out	the	magic	Trick-07-[LB]	keyword,	L	for	little	endian,	B	for	big.
+-#	Write	out	the	number	of	variables	recorded
+-#	For	each	variable	to	be	recorded
+			-#	Write	out	the	name
+			-#	Write	out	the	units
+			-#	Write	out	the	type
+			-#	Write	out	the	size
+-#	Declare	the	recording	group	to	the	memory	manager	so	that	the	group	can	be	checkpointed
+			and	restored
 */
-int Trick::DRBinary::format_specific_init() {
-
-    unsigned int jj ;
-    int write_value ;
-    /* number of bytes written to data record */
-    int bytes = 0 ;
-
-    union {
-        long l;
-        char c[sizeof(long)];
-    } byte_order_union;
-
-    file_name.append(".trk");
-
-    /* Calculate a "worst case" for space used for 1 record. */
-    writer_buff = (char *)calloc(1 , record_size * rec_buffer.size()) ;
-
-    /* This loop touches all of the memory locations in the allocation forcing the
-       system to actually do the allocation */
-    for ( jj= 0 ; jj < record_size * rec_buffer.size() ; jj += 1024 ) {
-        writer_buff[jj] = 1 ;
-    }
-    writer_buff[record_size * rec_buffer.size() - 1] = 1 ;
-
-    /* start header information in trk file */
-    if ((fd = creat(file_name.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) == -1) {
-        record = false ;
-        return (-1) ;
-    }
-
-
-    /* Check to see if data is being recorded in little endian
-     * byte order, and add little endian line if so.
-     */
-    byte_order_union.l = 1 ;
-    if (byte_order_union.c[sizeof(long)-1] != 1) {
-        bytes += write( fd , "Trick-10-L", (size_t)10 ) ;
-        
-    } else {
-        bytes += write( fd , "Trick-10-B", (size_t)10 ) ;
-    }
-    write_value = rec_buffer.size() ;
-    bytes += write( fd , &write_value , sizeof(int) ) ;
-
-    for (jj = 0; jj < rec_buffer.size(); jj++) {
-        /* name */
-        write_value = strlen(rec_buffer[jj]->ref->reference) ;
-        bytes += write( fd , &write_value , sizeof(int)) ;
-        bytes += write( fd , rec_buffer[jj]->ref->reference , write_value ) ;
-
-        /* units */
-        if ( rec_buffer[jj]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-            write_value = strlen("--") ;
-            bytes += write( fd , &write_value , sizeof(int)) ;
-            bytes += write( fd , "--" , write_value ) ;
-        } else {
-            write_value = strlen(rec_buffer[jj]->ref->attr->units) ;
-            bytes += write( fd , &write_value , sizeof(int)) ;
-            bytes += write( fd , rec_buffer[jj]->ref->attr->units , write_value ) ;
-        }
-
-        write_value = rec_buffer[jj]->ref->attr->type ;
-        bytes += write( fd , &write_value , sizeof(int)) ;
-
-        bytes += write( fd , &rec_buffer[jj]->ref->attr->size , sizeof(int)) ;
-    }
-    total_bytes_written += bytes;
-    return(0) ;
+int	Trick::DRBinary::format_specific_init()	{
+
+				unsigned	int	jj	;
+				int	write_value	;
+				/*	number	of	bytes	written	to	data	record	*/
+				int	bytes	=	0	;
+
+				union	{
+								long	l;
+								char	c[sizeof(long)];
+				}	byte_order_union;
+
+				file_name.append(".trk");
+
+				/*	Calculate	a	"worst	case"	for	space	used	for	1	record.	*/
+				writer_buff	=	(char	*)calloc(1	,	record_size	*	rec_buffer.size())	;
+
+				/*	This	loop	touches	all	of	the	memory	locations	in	the	allocation	forcing	the
+							system	to	actually	do	the	allocation	*/
+				for	(	jj=	0	;	jj	<	record_size	*	rec_buffer.size()	;	jj	+=	1024	)	{
+								writer_buff[jj]	=	1	;
+				}
+				writer_buff[record_size	*	rec_buffer.size()	-	1]	=	1	;
+
+				/*	start	header	information	in	trk	file	*/
+				if	((fd	=	creat(file_name.c_str(),	S_IRUSR	|	S_IWUSR	|	S_IRGRP	|	S_IWGRP	|	S_IROTH	|	S_IWOTH))	==	-1)	{
+								record	=	false	;
+								return	(-1)	;
+				}
+
+
+				/*	Check	to	see	if	data	is	being	recorded	in	little	endian
+					*	byte	order,	and	add	little	endian	line	if	so.
+					*/
+				byte_order_union.l	=	1	;
+				if	(byte_order_union.c[sizeof(long)-1]	!=	1)	{
+								bytes	+=	write(	fd	,	"Trick-10-L",	(size_t)10	)	;
+								
+				}	else	{
+								bytes	+=	write(	fd	,	"Trick-10-B",	(size_t)10	)	;
+				}
+				write_value	=	rec_buffer.size()	;
+				bytes	+=	write(	fd	,	&write_value	,	sizeof(int)	)	;
+
+				for	(jj	=	0;	jj	<	rec_buffer.size();	jj++)	{
+								/*	name	*/
+								write_value	=	strlen(rec_buffer[jj]->ref->reference)	;
+								bytes	+=	write(	fd	,	&write_value	,	sizeof(int))	;
+								bytes	+=	write(	fd	,	rec_buffer[jj]->ref->reference	,	write_value	)	;
+
+								/*	units	*/
+								if	(	rec_buffer[jj]->ref->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+												write_value	=	strlen("--")	;
+												bytes	+=	write(	fd	,	&write_value	,	sizeof(int))	;
+												bytes	+=	write(	fd	,	"--"	,	write_value	)	;
+								}	else	{
+												write_value	=	strlen(rec_buffer[jj]->ref->attr->units)	;
+												bytes	+=	write(	fd	,	&write_value	,	sizeof(int))	;
+												bytes	+=	write(	fd	,	rec_buffer[jj]->ref->attr->units	,	write_value	)	;
+								}
+
+								write_value	=	rec_buffer[jj]->ref->attr->type	;
+								bytes	+=	write(	fd	,	&write_value	,	sizeof(int))	;
+
+								bytes	+=	write(	fd	,	&rec_buffer[jj]->ref->attr->size	,	sizeof(int))	;
+				}
+				total_bytes_written	+=	bytes;
+				return(0)	;
 }
 
 /**
 @details
--# While there is data in memory that has not been written to disk
-   -# Write out each of the other parameter values to the temporary #writer_buff
-   -# Write #writer_buff to the output file
--# return the number of bytes written
+-#	While	there	is	data	in	memory	that	has	not	been	written	to	disk
+			-#	Write	out	each	of	the	other	parameter	values	to	the	temporary	#writer_buff
+			-#	Write	#writer_buff	to	the	output	file
+-#	return	the	number	of	bytes	written
 */
-int Trick::DRBinary::format_specific_write_data(unsigned int writer_offset) {
-
-	unsigned long bf;
-	int sbf;
-    unsigned int ii ;
-    unsigned int len = 0 ;
-    char *address = 0 ;
-
-    /* Write out all parameters */
-    for (ii = 0; ii < rec_buffer.size() ; ii++) {
-
-        address = rec_buffer[ii]->buffer + ( writer_offset * rec_buffer[ii]->ref->attr->size ) ;
-
-        switch (rec_buffer[ii]->ref->attr->type) {
-            case TRICK_CHARACTER:
-            case TRICK_UNSIGNED_CHARACTER:
-            case TRICK_SHORT:
-            case TRICK_UNSIGNED_SHORT:
-            case TRICK_BOOLEAN:
-            case TRICK_ENUMERATED:
-            case TRICK_INTEGER:
-            case TRICK_UNSIGNED_INTEGER:
-            case TRICK_FLOAT:
-            case TRICK_LONG:
-            case TRICK_UNSIGNED_LONG:
-            case TRICK_LONG_LONG:
-            case TRICK_UNSIGNED_LONG_LONG:
-            case TRICK_STRUCTURED:
-            case TRICK_DOUBLE:
-                memcpy(writer_buff + len, address, (size_t)rec_buffer[ii]->ref->attr->size);
-                break;
-
-            case TRICK_BITFIELD:
-                sbf = GET_BITFIELD(address, rec_buffer[ii]->ref->attr->size,
-                 rec_buffer[ii]->ref->attr->index[0].start, rec_buffer[ii]->ref->attr->index[0].size);
-                memcpy(writer_buff + len, &sbf, (size_t)rec_buffer[ii]->ref->attr->size);
-                break;
-
-            case TRICK_UNSIGNED_BITFIELD:
-                bf = GET_UNSIGNED_BITFIELD(address, rec_buffer[ii]->ref->attr->size,
-                 rec_buffer[ii]->ref->attr->index[0].start, rec_buffer[ii]->ref->attr->index[0].size);
-                memcpy(writer_buff + len, &bf, (size_t)rec_buffer[ii]->ref->attr->size);
-                break;
-
-            default:
-                break;
-        }
-        len += rec_buffer[ii]->ref->attr->size ;
-
-    }
-
-    return write( fd , writer_buff , len) ;
+int	Trick::DRBinary::format_specific_write_data(unsigned	int	writer_offset)	{
+
+	unsigned	long	bf;
+	int	sbf;
+				unsigned	int	ii	;
+				unsigned	int	len	=	0	;
+				char	*address	=	0	;
+
+				/*	Write	out	all	parameters	*/
+				for	(ii	=	0;	ii	<	rec_buffer.size()	;	ii++)	{
+
+								address	=	rec_buffer[ii]->buffer	+	(	writer_offset	*	rec_buffer[ii]->ref->attr->size	)	;
+
+								switch	(rec_buffer[ii]->ref->attr->type)	{
+												case	TRICK_CHARACTER:
+												case	TRICK_UNSIGNED_CHARACTER:
+												case	TRICK_SHORT:
+												case	TRICK_UNSIGNED_SHORT:
+												case	TRICK_BOOLEAN:
+												case	TRICK_ENUMERATED:
+												case	TRICK_INTEGER:
+												case	TRICK_UNSIGNED_INTEGER:
+												case	TRICK_FLOAT:
+												case	TRICK_LONG:
+												case	TRICK_UNSIGNED_LONG:
+												case	TRICK_LONG_LONG:
+												case	TRICK_UNSIGNED_LONG_LONG:
+												case	TRICK_STRUCTURED:
+												case	TRICK_DOUBLE:
+																memcpy(writer_buff	+	len,	address,	(size_t)rec_buffer[ii]->ref->attr->size);
+																break;
+
+												case	TRICK_BITFIELD:
+																sbf	=	GET_BITFIELD(address,	rec_buffer[ii]->ref->attr->size,
+																	rec_buffer[ii]->ref->attr->index[0].start,	rec_buffer[ii]->ref->attr->index[0].size);
+																memcpy(writer_buff	+	len,	&sbf,	(size_t)rec_buffer[ii]->ref->attr->size);
+																break;
+
+												case	TRICK_UNSIGNED_BITFIELD:
+																bf	=	GET_UNSIGNED_BITFIELD(address,	rec_buffer[ii]->ref->attr->size,
+																	rec_buffer[ii]->ref->attr->index[0].start,	rec_buffer[ii]->ref->attr->index[0].size);
+																memcpy(writer_buff	+	len,	&bf,	(size_t)rec_buffer[ii]->ref->attr->size);
+																break;
+
+												default:
+																break;
+								}
+								len	+=	rec_buffer[ii]->ref->attr->size	;
+
+				}
+
+				return	write(	fd	,	writer_buff	,	len)	;
 }
 
 /**
 @details
--# Close the output file stream
+-#	Close	the	output	file	stream
 */
-int Trick::DRBinary::format_specific_shutdown() {
+int	Trick::DRBinary::format_specific_shutdown()	{
 
-    if ( inited ) {
-        close(fd) ;
-    }
-    return(0) ;
+				if	(	inited	)	{
+								close(fd)	;
+				}
+				return(0)	;
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/DataRecord/DRHDF5.cpp b/trick_source/sim_services/DataRecord/DRHDF5.cpp
index 8f70f1966..ace0814eb 100644
--- a/trick_source/sim_services/DataRecord/DRHDF5.cpp
+++ b/trick_source/sim_services/DataRecord/DRHDF5.cpp
@@ -1,334 +1,334 @@
 /*
 PURPOSE:
-    (Data record to disk in HDF5 format.)
+				(Data	record	to	disk	in	HDF5	format.)
 PROGRAMMERS:
-     ((Warwick Woodard) (NASA) (February 2010) (--) (Initial version))
+					((Warwick	Woodard)	(NASA)	(February	2010)	(--)	(Initial	version))
 */
 
-#include <iostream>
-#include <stdlib.h>
+#include	<iostream>
+#include	<stdlib.h>
 
-#include "trick/DRHDF5.hh"
-#include "trick/parameter_types.h"
-#include "trick/command_line_protos.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
+#include	"trick/DRHDF5.hh"
+#include	"trick/parameter_types.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
 
-Trick::DRHDF5::DRHDF5( std::string in_name ) : Trick::DataRecordGroup(in_name) {
-    register_group_with_mm(this, "Trick::DRHDF5") ;
+Trick::DRHDF5::DRHDF5(	std::string	in_name	)	:	Trick::DataRecordGroup(in_name)	{
+				register_group_with_mm(this,	"Trick::DRHDF5")	;
 }
 
-int Trick::DRHDF5::format_specific_header( std::fstream & out_stream ) {
-    out_stream << " byte_order is HDF5" << std::endl ;
-    return(0) ;
+int	Trick::DRHDF5::format_specific_header(	std::fstream	&	out_stream	)	{
+				out_stream	<<	"	byte_order	is	HDF5"	<<	std::endl	;
+				return(0)	;
 }
 
 /**
 @details
--# Set the file extension to ".h5"
--# Open the log file
--# Create the root directory in the HDF5 file
--# For each variable to be recorded
-   -# Create a fixed length packet table
-   -# Associate the packet table with the temporary memory buffer storing the simulation data
--# Declare the recording group to the memory manager so that the group can be checkpointed
-   and restored.
+-#	Set	the	file	extension	to	".h5"
+-#	Open	the	log	file
+-#	Create	the	root	directory	in	the	HDF5	file
+-#	For	each	variable	to	be	recorded
+			-#	Create	a	fixed	length	packet	table
+			-#	Associate	the	packet	table	with	the	temporary	memory	buffer	storing	the	simulation	data
+-#	Declare	the	recording	group	to	the	memory	manager	so	that	the	group	can	be	checkpointed
+			and	restored.
 */
-int Trick::DRHDF5::format_specific_init() {
-
-#ifdef HDF5
-    unsigned int ii ;
-    HDF5_INFO *hdf5_info ;
-    hsize_t chunk_size = 1024;
-    hid_t byte_id ;
-    hid_t file_names_id, param_types_id, param_units_id, param_names_id ;
-    hid_t datatype ;
-    hid_t s256 ;
-    std::string buf;
-
-    file_name.append(".h5") ;
-
-    s256 = H5Tcopy(H5T_C_S1);
-    H5Tset_size(s256, 256);
-
-    // Create a new HDF5 file with the specified name; overwrite if it exists.
-    if ((file = H5Fcreate(file_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        message_publish(MSG_ERROR, "Can't open Data Record file %s.\n", file_name.c_str()) ;
-        record = false ;
-        return -1 ;
-    }
-
-    // All HDF5 objects live in the top-level "/" (root) group.
-    root_group = H5Gopen(file, "/", H5P_DEFAULT);
-
-    // Create a new group named "header" at the root ("/") level.
-    header_group = H5Gcreate(file, "/header", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    // Create a packet table (PT) that stores byte order.
-    byte_id = H5PTcreate_fl(header_group, "byte_order", s256, chunk_size, 1) ;
-    // Add the byte order value to the byte packet table.
-    H5PTappend( byte_id, 1, byte_order.c_str() );
-    // Create a packet table (PT) that stores each parameter's file location.
-    file_names_id = H5PTcreate_fl(header_group, "file_names", s256, chunk_size, 1) ;
-    // Create a packet table (PT) that stores each parameter's type.
-    param_types_id = H5PTcreate_fl(header_group, "param_types", s256, chunk_size, 1) ;
-    // Create a packet table (PT) that stores each parameter's unit.
-    param_units_id = H5PTcreate_fl(header_group, "param_units", s256, chunk_size, 1) ;
-    // Create a packet table (PT) that stores each parameter's name.
-    param_names_id =  H5PTcreate_fl(header_group, "param_names", s256, chunk_size, 1) ;
-
-    // Create a table for each requested parameter.
-    for (ii = 0; ii < rec_buffer.size(); ii++) {
-
-        hdf5_info = (HDF5_INFO *)malloc(sizeof(HDF5_INFO));
-
-        /* Case statements taken from "parameter_types.h."
-         *  HDF5 Native types found in "H5Tpublic.h." */
-        switch (rec_buffer[ii]->ref->attr->type) {
-            case TRICK_CHARACTER:
-                datatype = H5T_NATIVE_CHAR;
-                break;
-            case TRICK_UNSIGNED_CHARACTER:
-                datatype = H5T_NATIVE_UCHAR;
-                break;
-            case TRICK_STRING:
-                datatype = s256;
-                break;
-            case TRICK_SHORT:
-                datatype = H5T_NATIVE_SHORT;
-                break;
-            case TRICK_UNSIGNED_SHORT:
-                datatype = H5T_NATIVE_USHORT;
-                break;
-            case TRICK_ENUMERATED:
-            case TRICK_INTEGER:
-                datatype = H5T_NATIVE_INT;
-                break;
-            case TRICK_UNSIGNED_INTEGER:
-                datatype = H5T_NATIVE_UINT;
-                break;
-            case TRICK_LONG:
-                datatype = H5T_NATIVE_LONG;
-                break;
-            case TRICK_UNSIGNED_LONG:
-                datatype = H5T_NATIVE_ULONG;
-                break;
-            case TRICK_FLOAT:
-                datatype = H5T_NATIVE_FLOAT;
-                break;
-            case TRICK_DOUBLE:
-                datatype = H5T_NATIVE_DOUBLE;
-                break;
-            case TRICK_BITFIELD:
-                if (rec_buffer[ii]->ref->attr->size == sizeof(int)) {
-                    datatype = H5T_NATIVE_INT;
-                } else if (rec_buffer[ii]->ref->attr->size == sizeof(short)) {
-                    datatype = H5T_NATIVE_SHORT;
-                } else {
-                    datatype = H5T_NATIVE_CHAR;
-                }
-                break;
-            case TRICK_UNSIGNED_BITFIELD:
-                if (rec_buffer[ii]->ref->attr->size == sizeof(int)) {
-                    datatype = H5T_NATIVE_UINT;
-                } else if (rec_buffer[ii]->ref->attr->size == sizeof(short)) {
-                    datatype = H5T_NATIVE_USHORT;
-                } else {
-                    datatype = H5T_NATIVE_UCHAR;
-                }
-                break;
-            case TRICK_LONG_LONG:
-                datatype = H5T_NATIVE_LLONG;
-                break;
-            case TRICK_UNSIGNED_LONG_LONG:
-                datatype = H5T_NATIVE_ULLONG;
-                break;
-            case TRICK_BOOLEAN:
-#if ( __sun | __APPLE__ )
-                datatype = H5T_NATIVE_INT;
+int	Trick::DRHDF5::format_specific_init()	{
+
+#ifdef	HDF5
+				unsigned	int	ii	;
+				HDF5_INFO	*hdf5_info	;
+				hsize_t	chunk_size	=	1024;
+				hid_t	byte_id	;
+				hid_t	file_names_id,	param_types_id,	param_units_id,	param_names_id	;
+				hid_t	datatype	;
+				hid_t	s256	;
+				std::string	buf;
+
+				file_name.append(".h5")	;
+
+				s256	=	H5Tcopy(H5T_C_S1);
+				H5Tset_size(s256,	256);
+
+				//	Create	a	new	HDF5	file	with	the	specified	name;	overwrite	if	it	exists.
+				if	((file	=	H5Fcreate(file_name.c_str(),	H5F_ACC_TRUNC,	H5P_DEFAULT,	H5P_DEFAULT))	<	0)	{
+								message_publish(MSG_ERROR,	"Can't	open	Data	Record	file	%s.\n",	file_name.c_str())	;
+								record	=	false	;
+								return	-1	;
+				}
+
+				//	All	HDF5	objects	live	in	the	top-level	"/"	(root)	group.
+				root_group	=	H5Gopen(file,	"/",	H5P_DEFAULT);
+
+				//	Create	a	new	group	named	"header"	at	the	root	("/")	level.
+				header_group	=	H5Gcreate(file,	"/header",	H5P_DEFAULT,	H5P_DEFAULT,	H5P_DEFAULT);
+				//	Create	a	packet	table	(PT)	that	stores	byte	order.
+				byte_id	=	H5PTcreate_fl(header_group,	"byte_order",	s256,	chunk_size,	1)	;
+				//	Add	the	byte	order	value	to	the	byte	packet	table.
+				H5PTappend(	byte_id,	1,	byte_order.c_str()	);
+				//	Create	a	packet	table	(PT)	that	stores	each	parameter's	file	location.
+				file_names_id	=	H5PTcreate_fl(header_group,	"file_names",	s256,	chunk_size,	1)	;
+				//	Create	a	packet	table	(PT)	that	stores	each	parameter's	type.
+				param_types_id	=	H5PTcreate_fl(header_group,	"param_types",	s256,	chunk_size,	1)	;
+				//	Create	a	packet	table	(PT)	that	stores	each	parameter's	unit.
+				param_units_id	=	H5PTcreate_fl(header_group,	"param_units",	s256,	chunk_size,	1)	;
+				//	Create	a	packet	table	(PT)	that	stores	each	parameter's	name.
+				param_names_id	=		H5PTcreate_fl(header_group,	"param_names",	s256,	chunk_size,	1)	;
+
+				//	Create	a	table	for	each	requested	parameter.
+				for	(ii	=	0;	ii	<	rec_buffer.size();	ii++)	{
+
+								hdf5_info	=	(HDF5_INFO	*)malloc(sizeof(HDF5_INFO));
+
+								/*	Case	statements	taken	from	"parameter_types.h."
+									*		HDF5	Native	types	found	in	"H5Tpublic.h."	*/
+								switch	(rec_buffer[ii]->ref->attr->type)	{
+												case	TRICK_CHARACTER:
+																datatype	=	H5T_NATIVE_CHAR;
+																break;
+												case	TRICK_UNSIGNED_CHARACTER:
+																datatype	=	H5T_NATIVE_UCHAR;
+																break;
+												case	TRICK_STRING:
+																datatype	=	s256;
+																break;
+												case	TRICK_SHORT:
+																datatype	=	H5T_NATIVE_SHORT;
+																break;
+												case	TRICK_UNSIGNED_SHORT:
+																datatype	=	H5T_NATIVE_USHORT;
+																break;
+												case	TRICK_ENUMERATED:
+												case	TRICK_INTEGER:
+																datatype	=	H5T_NATIVE_INT;
+																break;
+												case	TRICK_UNSIGNED_INTEGER:
+																datatype	=	H5T_NATIVE_UINT;
+																break;
+												case	TRICK_LONG:
+																datatype	=	H5T_NATIVE_LONG;
+																break;
+												case	TRICK_UNSIGNED_LONG:
+																datatype	=	H5T_NATIVE_ULONG;
+																break;
+												case	TRICK_FLOAT:
+																datatype	=	H5T_NATIVE_FLOAT;
+																break;
+												case	TRICK_DOUBLE:
+																datatype	=	H5T_NATIVE_DOUBLE;
+																break;
+												case	TRICK_BITFIELD:
+																if	(rec_buffer[ii]->ref->attr->size	==	sizeof(int))	{
+																				datatype	=	H5T_NATIVE_INT;
+																}	else	if	(rec_buffer[ii]->ref->attr->size	==	sizeof(short))	{
+																				datatype	=	H5T_NATIVE_SHORT;
+																}	else	{
+																				datatype	=	H5T_NATIVE_CHAR;
+																}
+																break;
+												case	TRICK_UNSIGNED_BITFIELD:
+																if	(rec_buffer[ii]->ref->attr->size	==	sizeof(int))	{
+																				datatype	=	H5T_NATIVE_UINT;
+																}	else	if	(rec_buffer[ii]->ref->attr->size	==	sizeof(short))	{
+																				datatype	=	H5T_NATIVE_USHORT;
+																}	else	{
+																				datatype	=	H5T_NATIVE_UCHAR;
+																}
+																break;
+												case	TRICK_LONG_LONG:
+																datatype	=	H5T_NATIVE_LLONG;
+																break;
+												case	TRICK_UNSIGNED_LONG_LONG:
+																datatype	=	H5T_NATIVE_ULLONG;
+																break;
+												case	TRICK_BOOLEAN:
+#if	(	__sun	|	__APPLE__	)
+																datatype	=	H5T_NATIVE_INT;
 #else
-                datatype = H5T_NATIVE_UCHAR;
+																datatype	=	H5T_NATIVE_UCHAR;
 #endif
-                break;
-            default:
-                free(hdf5_info);
-                continue;
-        }
-
-        /* Create packet table(s) to store "fixed-length" packets.
-         *  A separate packet table (PT) is created for each variable.
-         * PARAMETERS:
-         *     IN: Identifier of the file or group to create the table within.
-         *     IN: The name of the dataset (i.e. variable).
-         *     IN: The datatype of a packet.
-         *     IN: The packet table uses HDF5 chunked storage to allow it to
-         *         grow. This value allows the user to set the size of a chunk.
-         *         The chunk size affects performance.
-         *     IN: Compression level, a value of 0 through 9. Level 0 is faster
-         *         but offers the least compression; level 9 is slower but
-         *         offers maximum compression. A setting of -1 indicates that
-         *         no compression is desired.
-         * RETURN:
-         *     Returns an identifier for the new packet table, or H5I_BADID on error.
-         */
-        hdf5_info->dataset = H5PTcreate_fl(root_group, rec_buffer[ii]->ref->reference, datatype, chunk_size, 1) ;
-
-        if ( hdf5_info->dataset == H5I_BADID ) {
-            message_publish(MSG_ERROR, "An error occured in data record group \"%s\" when adding \"%s\".\n",
-             group_name.c_str() , rec_buffer[ii]->ref->reference) ;
-        }
-
-        hdf5_info->drb = rec_buffer[ii] ;
-        /* Add the new parameter element to the end of the vector.
-         *  This effectively increases the vector size by one. */
-        parameters.push_back(hdf5_info);
-
-        // As a bonus, add a header entry for each parameter.
-        /* File Name */
-        buf = "log_" + group_name ;
-        H5PTappend( file_names_id, 1, buf.c_str() );
-        /* Param Type */
-        buf = type_string(rec_buffer[ii]->ref->attr->type, rec_buffer[ii]->ref->attr->size );
-        H5PTappend( param_types_id, 1, buf.c_str() );
-        /* Param Units */
-        if ( rec_buffer[ii]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-            H5PTappend( param_units_id, 1, "--" );
-        } else {
-            H5PTappend( param_units_id, 1, rec_buffer[ii]->ref->attr->units );
-        }
-        /* Param Name */
-        H5PTappend( param_names_id, 1, rec_buffer[ii]->ref->reference );
-
-    }
-    H5PTclose( byte_id );
-    H5PTclose( file_names_id );
-    H5PTclose( param_types_id );
-    H5PTclose( param_units_id );
-    H5PTclose( param_names_id );
-    H5Gclose( header_group );
+																break;
+												default:
+																free(hdf5_info);
+																continue;
+								}
+
+								/*	Create	packet	table(s)	to	store	"fixed-length"	packets.
+									*		A	separate	packet	table	(PT)	is	created	for	each	variable.
+									*	PARAMETERS:
+									*					IN:	Identifier	of	the	file	or	group	to	create	the	table	within.
+									*					IN:	The	name	of	the	dataset	(i.e.	variable).
+									*					IN:	The	datatype	of	a	packet.
+									*					IN:	The	packet	table	uses	HDF5	chunked	storage	to	allow	it	to
+									*									grow.	This	value	allows	the	user	to	set	the	size	of	a	chunk.
+									*									The	chunk	size	affects	performance.
+									*					IN:	Compression	level,	a	value	of	0	through	9.	Level	0	is	faster
+									*									but	offers	the	least	compression;	level	9	is	slower	but
+									*									offers	maximum	compression.	A	setting	of	-1	indicates	that
+									*									no	compression	is	desired.
+									*	RETURN:
+									*					Returns	an	identifier	for	the	new	packet	table,	or	H5I_BADID	on	error.
+									*/
+								hdf5_info->dataset	=	H5PTcreate_fl(root_group,	rec_buffer[ii]->ref->reference,	datatype,	chunk_size,	1)	;
+
+								if	(	hdf5_info->dataset	==	H5I_BADID	)	{
+												message_publish(MSG_ERROR,	"An	error	occured	in	data	record	group	\"%s\"	when	adding	\"%s\".\n",
+													group_name.c_str()	,	rec_buffer[ii]->ref->reference)	;
+								}
+
+								hdf5_info->drb	=	rec_buffer[ii]	;
+								/*	Add	the	new	parameter	element	to	the	end	of	the	vector.
+									*		This	effectively	increases	the	vector	size	by	one.	*/
+								parameters.push_back(hdf5_info);
+
+								//	As	a	bonus,	add	a	header	entry	for	each	parameter.
+								/*	File	Name	*/
+								buf	=	"log_"	+	group_name	;
+								H5PTappend(	file_names_id,	1,	buf.c_str()	);
+								/*	Param	Type	*/
+								buf	=	type_string(rec_buffer[ii]->ref->attr->type,	rec_buffer[ii]->ref->attr->size	);
+								H5PTappend(	param_types_id,	1,	buf.c_str()	);
+								/*	Param	Units	*/
+								if	(	rec_buffer[ii]->ref->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+												H5PTappend(	param_units_id,	1,	"--"	);
+								}	else	{
+												H5PTappend(	param_units_id,	1,	rec_buffer[ii]->ref->attr->units	);
+								}
+								/*	Param	Name	*/
+								H5PTappend(	param_names_id,	1,	rec_buffer[ii]->ref->reference	);
+
+				}
+				H5PTclose(	byte_id	);
+				H5PTclose(	file_names_id	);
+				H5PTclose(	param_types_id	);
+				H5PTclose(	param_units_id	);
+				H5PTclose(	param_names_id	);
+				H5Gclose(	header_group	);
 #endif
 
-    return(0);
+				return(0);
 }
 
 /*
-   HDF5 logging is done on a per variable basis instead of per time step like the
-   other recording methods.  This write_data routine overrides the default in
-   DataRecordGroup.  This routine writes out all of the buffered data of a variable
-   in one or two HDF5 calls.
+			HDF5	logging	is	done	on	a	per	variable	basis	instead	of	per	time	step	like	the
+			other	recording	methods.		This	write_data	routine	overrides	the	default	in
+			DataRecordGroup.		This	routine	writes	out	all	of	the	buffered	data	of	a	variable
+			in	one	or	two	HDF5	calls.
 */
-int Trick::DRHDF5::write_data(bool must_write) {
-
-#ifdef HDF5
-    unsigned int local_buffer_num ;
-    unsigned int num_to_write ;
-    unsigned int ii;
-    char *buf = 0;
-
-    if ( record and inited and (buffer_type == DR_No_Buffer or must_write)) {
-
-        // buffer_mutex is used in this one place to prevent forced calls of write_data
-        // to not overwrite data being written by the asynchronous thread.
-        pthread_mutex_lock(&buffer_mutex) ;
-        local_buffer_num = buffer_num ;
-        if ( (local_buffer_num - writer_num) > max_num ) {
-            num_to_write = max_num ;
-        } else {
-            num_to_write = (local_buffer_num - writer_num) ;
-        }
-        writer_num = local_buffer_num - num_to_write ;
-
-        if ( writer_num != local_buffer_num ) {
-            // Test if the writer pointer to the right of the buffer pointer in the ring
-            if ( (writer_num % max_num) > (local_buffer_num % max_num) ) {
-               // we have 2 segments to write per variable
-               for (ii = 0; ii < parameters.size(); ii++) {
-                   HDF5_INFO * hi = parameters[ii] ;
-                   unsigned int writer_offset = writer_num % max_num ;
-                   buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
-
-                   /* Append all of the data on the end of the buffer to the packet table. */
-                   H5PTappend( hi->dataset, max_num - writer_offset , buf );
-
-                   buf = hi->drb->buffer ;
-                   /* Append all of the data at the beginning of the buffer to the packet table. */
-                   H5PTappend( hi->dataset, local_buffer_num % max_num , buf );
-               }
-            }  else {
-               // we have 1 continous segment to write per variable
-               for (ii = 0; ii < parameters.size(); ii++) {
-                   HDF5_INFO * hi = parameters[ii] ;
-                   unsigned int writer_offset = writer_num % max_num ;
-                   buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
-
-                   /* Append all of the data to the packet table. */
-                   H5PTappend( hi->dataset, local_buffer_num - writer_num , buf );
-
-               }
-            }
-            writer_num = local_buffer_num ;
-        }
-        pthread_mutex_unlock(&buffer_mutex) ;
-
-    }
+int	Trick::DRHDF5::write_data(bool	must_write)	{
+
+#ifdef	HDF5
+				unsigned	int	local_buffer_num	;
+				unsigned	int	num_to_write	;
+				unsigned	int	ii;
+				char	*buf	=	0;
+
+				if	(	record	and	inited	and	(buffer_type	==	DR_No_Buffer	or	must_write))	{
+
+								//	buffer_mutex	is	used	in	this	one	place	to	prevent	forced	calls	of	write_data
+								//	to	not	overwrite	data	being	written	by	the	asynchronous	thread.
+								pthread_mutex_lock(&buffer_mutex)	;
+								local_buffer_num	=	buffer_num	;
+								if	(	(local_buffer_num	-	writer_num)	>	max_num	)	{
+												num_to_write	=	max_num	;
+								}	else	{
+												num_to_write	=	(local_buffer_num	-	writer_num)	;
+								}
+								writer_num	=	local_buffer_num	-	num_to_write	;
+
+								if	(	writer_num	!=	local_buffer_num	)	{
+												//	Test	if	the	writer	pointer	to	the	right	of	the	buffer	pointer	in	the	ring
+												if	(	(writer_num	%	max_num)	>	(local_buffer_num	%	max_num)	)	{
+															//	we	have	2	segments	to	write	per	variable
+															for	(ii	=	0;	ii	<	parameters.size();	ii++)	{
+																			HDF5_INFO	*	hi	=	parameters[ii]	;
+																			unsigned	int	writer_offset	=	writer_num	%	max_num	;
+																			buf	=	hi->drb->buffer	+	(writer_offset	*	hi->drb->ref->attr->size)	;
+
+																			/*	Append	all	of	the	data	on	the	end	of	the	buffer	to	the	packet	table.	*/
+																			H5PTappend(	hi->dataset,	max_num	-	writer_offset	,	buf	);
+
+																			buf	=	hi->drb->buffer	;
+																			/*	Append	all	of	the	data	at	the	beginning	of	the	buffer	to	the	packet	table.	*/
+																			H5PTappend(	hi->dataset,	local_buffer_num	%	max_num	,	buf	);
+															}
+												}		else	{
+															//	we	have	1	continous	segment	to	write	per	variable
+															for	(ii	=	0;	ii	<	parameters.size();	ii++)	{
+																			HDF5_INFO	*	hi	=	parameters[ii]	;
+																			unsigned	int	writer_offset	=	writer_num	%	max_num	;
+																			buf	=	hi->drb->buffer	+	(writer_offset	*	hi->drb->ref->attr->size)	;
+
+																			/*	Append	all	of	the	data	to	the	packet	table.	*/
+																			H5PTappend(	hi->dataset,	local_buffer_num	-	writer_num	,	buf	);
+
+															}
+												}
+												writer_num	=	local_buffer_num	;
+								}
+								pthread_mutex_unlock(&buffer_mutex)	;
+
+				}
 #else
-    (void)must_write;
+				(void)must_write;
 #endif
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# Snapshot the index of the most recent temporary memory buffer to write to disk to curr_buffer_num
--# For each parameter to be recorded
-   -# Point a pointer to the beginning of the data in the memory buffer to be written to disk
-   -# Append one packet to the packet table.
+-#	Snapshot	the	index	of	the	most	recent	temporary	memory	buffer	to	write	to	disk	to	curr_buffer_num
+-#	For	each	parameter	to	be	recorded
+			-#	Point	a	pointer	to	the	beginning	of	the	data	in	the	memory	buffer	to	be	written	to	disk
+			-#	Append	one	packet	to	the	packet	table.
 */
-int Trick::DRHDF5::format_specific_write_data(unsigned int writer_offset __attribute__((unused))) {
+int	Trick::DRHDF5::format_specific_write_data(unsigned	int	writer_offset	__attribute__((unused)))	{
 
-#ifdef HDF5
-    unsigned int ii;
-    char *buf = 0;
+#ifdef	HDF5
+				unsigned	int	ii;
+				char	*buf	=	0;
 
-    /* Loop through each parameter. */
-    for (ii = 0; ii < parameters.size(); ii++) {
+				/*	Loop	through	each	parameter.	*/
+				for	(ii	=	0;	ii	<	parameters.size();	ii++)	{
 
-        /* Each parameters[] element contains a DataRecordBuffer class.
-         * So there is a seperate DataRecordBuffer per variable.
-         * Point to the value to be recorded. */
-        HDF5_INFO * hi = parameters[ii] ;
-        buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
+								/*	Each	parameters[]	element	contains	a	DataRecordBuffer	class.
+									*	So	there	is	a	seperate	DataRecordBuffer	per	variable.
+									*	Point	to	the	value	to	be	recorded.	*/
+								HDF5_INFO	*	hi	=	parameters[ii]	;
+								buf	=	hi->drb->buffer	+	(writer_offset	*	hi->drb->ref->attr->size)	;
 
-        /* Append 1 value to the packet table. */
-        H5PTappend( hi->dataset, 1, buf );
+								/*	Append	1	value	to	the	packet	table.	*/
+								H5PTappend(	hi->dataset,	1,	buf	);
 
-    }
+				}
 #endif
 
-    return(0);
+				return(0);
 }
 
 /**
 @details
--# For each parameter being recorded
-   -# Close the HDF5 packet table
--# Close the HDF5 root
--# Close the HDF5 file
+-#	For	each	parameter	being	recorded
+			-#	Close	the	HDF5	packet	table
+-#	Close	the	HDF5	root
+-#	Close	the	HDF5	file
 */
-int Trick::DRHDF5::format_specific_shutdown() {
+int	Trick::DRHDF5::format_specific_shutdown()	{
 
-#ifdef HDF5
-    unsigned int ii ;
+#ifdef	HDF5
+				unsigned	int	ii	;
 
-    if ( inited ) {
-        for (ii = 0; ii < parameters.size(); ii++) {
-            HDF5_INFO * hi = parameters[ii] ;
-            H5PTclose( hi->dataset );
-        }
-        H5Gclose(root_group);
-        H5Fclose(file);
+				if	(	inited	)	{
+								for	(ii	=	0;	ii	<	parameters.size();	ii++)	{
+												HDF5_INFO	*	hi	=	parameters[ii]	;
+												H5PTclose(	hi->dataset	);
+								}
+								H5Gclose(root_group);
+								H5Fclose(file);
 
-    }
+				}
 #endif
-    return(0);
+				return(0);
 }
 
diff --git a/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp b/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp
index ac75689c0..acff3145d 100644
--- a/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp
+++ b/trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp
@@ -1,315 +1,315 @@
 /*
-   PURPOSE: (Copy data out of structures into data recording memory.)
-   PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom Corp) (3/96) (SES upgrades))
-      ((Alex Lin) (NASA) (6/02) (DR_changes upgrade)))
- */
-
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <signal.h>
-#if __linux
-#include <sys/syscall.h>
+			PURPOSE:	(Copy	data	out	of	structures	into	data	recording	memory.)
+			PROGRAMMERS:
+					(((Robert	W.	Bailey)	(LinCom	Corp)	(3/96)	(SES	upgrades))
+						((Alex	Lin)	(NASA)	(6/02)	(DR_changes	upgrade)))
+	*/
+
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<unistd.h>
+
+#include	<signal.h>
+#if	__linux
+#include	<sys/syscall.h>
 #endif
 
-#include "trick/DataRecordDispatcher.hh"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/command_line_protos.h"
-
-Trick::DataRecordDispatcher * the_drd = NULL ;
-
-Trick::DRDMutexes::DRDMutexes() {
-    pthread_cond_init(&dr_go_cv, NULL);
-    pthread_mutex_init(&dr_go_mutex, NULL);
-    pthread_cond_init(&init_complete_cv, NULL);
-    pthread_mutex_init(&init_complete_mutex, NULL);
-    cancelled = false;
+#include	"trick/DataRecordDispatcher.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/command_line_protos.h"
+
+Trick::DataRecordDispatcher	*	the_drd	=	NULL	;
+
+Trick::DRDMutexes::DRDMutexes()	{
+				pthread_cond_init(&dr_go_cv,	NULL);
+				pthread_mutex_init(&dr_go_mutex,	NULL);
+				pthread_cond_init(&init_complete_cv,	NULL);
+				pthread_mutex_init(&init_complete_mutex,	NULL);
+				cancelled	=	false;
 }
 
-Trick::DRDWriterThread::DRDWriterThread(DRDMutexes & in_mutexes, std::vector <Trick::DataRecordGroup *> & in_groups) :
- SysThread("DR_Writer"),
- drd_mutexes(in_mutexes) ,
- groups(in_groups) {}
-
-void * Trick::DRDWriterThread::thread_body() {
-    pthread_mutex_lock(&(drd_mutexes.dr_go_mutex));
-
-    /* tell the main thread that the writer is ready to go */
-    pthread_mutex_lock(&(drd_mutexes.init_complete_mutex));
-    pthread_cond_signal(&(drd_mutexes.init_complete_cv));
-    pthread_mutex_unlock(&(drd_mutexes.init_complete_mutex));
-
-    /* from now until death, wait for the condition variable,
-       then call the write_data method for all of the groups */
-    while(1) {
-        pthread_cond_wait(&(drd_mutexes.dr_go_cv), &(drd_mutexes.dr_go_mutex));
-        if (drd_mutexes.cancelled) {
-            pthread_mutex_unlock(&(drd_mutexes.dr_go_mutex));
-            pthread_exit(0);
-        }
-        for ( unsigned int ii = 0 ; ii < groups.size() ; ii++ ) {
-            if ( groups[ii]->buffer_type == Trick::DR_Buffer ) {
-                groups[ii]->write_data(true) ;
-            }
-        }
-    }
-    pthread_mutex_unlock(&(drd_mutexes.dr_go_mutex));
-    return NULL ;
+Trick::DRDWriterThread::DRDWriterThread(DRDMutexes	&	in_mutexes,	std::vector	<Trick::DataRecordGroup	*>	&	in_groups)	:
+	SysThread("DR_Writer"),
+	drd_mutexes(in_mutexes)	,
+	groups(in_groups)	{}
+
+void	*	Trick::DRDWriterThread::thread_body()	{
+				pthread_mutex_lock(&(drd_mutexes.dr_go_mutex));
+
+				/*	tell	the	main	thread	that	the	writer	is	ready	to	go	*/
+				pthread_mutex_lock(&(drd_mutexes.init_complete_mutex));
+				pthread_cond_signal(&(drd_mutexes.init_complete_cv));
+				pthread_mutex_unlock(&(drd_mutexes.init_complete_mutex));
+
+				/*	from	now	until	death,	wait	for	the	condition	variable,
+							then	call	the	write_data	method	for	all	of	the	groups	*/
+				while(1)	{
+								pthread_cond_wait(&(drd_mutexes.dr_go_cv),	&(drd_mutexes.dr_go_mutex));
+								if	(drd_mutexes.cancelled)	{
+												pthread_mutex_unlock(&(drd_mutexes.dr_go_mutex));
+												pthread_exit(0);
+								}
+								for	(	unsigned	int	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+												if	(	groups[ii]->buffer_type	==	Trick::DR_Buffer	)	{
+																groups[ii]->write_data(true)	;
+												}
+								}
+				}
+				pthread_mutex_unlock(&(drd_mutexes.dr_go_mutex));
+				return	NULL	;
 }
 
-void Trick::DRDWriterThread::dump( std::ostream & oss ) {
-    oss << "Trick::DRDWriterThread (" << name << ")" << std::endl ;
-    oss << "    number of data record groups = " << groups.size() << std::endl ;
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::DRDWriterThread::dump(	std::ostream	&	oss	)	{
+				oss	<<	"Trick::DRDWriterThread	("	<<	name	<<	")"	<<	std::endl	;
+				oss	<<	"				number	of	data	record	groups	=	"	<<	groups.size()	<<	std::endl	;
+				Trick::ThreadBase::dump(oss)	;
 }
 
-Trick::DataRecordDispatcher::DataRecordDispatcher() : drd_writer_thread(drd_mutexes, groups) {
-    the_drd = this ;
+Trick::DataRecordDispatcher::DataRecordDispatcher()	:	drd_writer_thread(drd_mutexes,	groups)	{
+				the_drd	=	this	;
 }
 
-Trick::DataRecordDispatcher::~DataRecordDispatcher() {
+Trick::DataRecordDispatcher::~DataRecordDispatcher()	{
 }
 
-int Trick::DataRecordDispatcher::remove_files() {
+int	Trick::DataRecordDispatcher::remove_files()	{
 
-    std::string command;
-    command = std::string("/bin/rm -rf ") + command_line_args_get_output_dir() + std::string("/log_*") ;
-    system(command.c_str());
-    return 0 ;
+				std::string	command;
+				command	=	std::string("/bin/rm	-rf	")	+	command_line_args_get_output_dir()	+	std::string("/log_*")	;
+				system(command.c_str());
+				return	0	;
 }
 
 /**
 @details
--# Initialize thread mutex and condition variable
--# Create a new thread calling the DataRecordThreaded Writer routine.
--# Wait for the data record thread to initialize before continuing.
+-#	Initialize	thread	mutex	and	condition	variable
+-#	Create	a	new	thread	calling	the	DataRecordThreaded	Writer	routine.
+-#	Wait	for	the	data	record	thread	to	initialize	before	continuing.
 */
-int Trick::DataRecordDispatcher::init() {
+int	Trick::DataRecordDispatcher::init()	{
 
-    pthread_mutex_lock(&drd_mutexes.init_complete_mutex);
-    drd_writer_thread.create_thread() ;
-    pthread_cond_wait(&drd_mutexes.init_complete_cv, &drd_mutexes.init_complete_mutex);
-    pthread_mutex_unlock(&drd_mutexes.init_complete_mutex);
+				pthread_mutex_lock(&drd_mutexes.init_complete_mutex);
+				drd_writer_thread.create_thread()	;
+				pthread_cond_wait(&drd_mutexes.init_complete_cv,	&drd_mutexes.init_complete_mutex);
+				pthread_mutex_unlock(&drd_mutexes.init_complete_mutex);
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
-add_sim_object is called by the executive when a new sim_object is added to the sim.
+add_sim_object	is	called	by	the	executive	when	a	new	sim_object	is	added	to	the	sim.
 @details
--# Test if the incoming object is a DataRecordGroup.
- -# If it is add it to the list of groups we save
+-#	Test	if	the	incoming	object	is	a	DataRecordGroup.
+	-#	If	it	is	add	it	to	the	list	of	groups	we	save
 */
-int Trick::DataRecordDispatcher::add_sim_object(Trick::SimObject * in_object ) {
-    Trick::DataRecordGroup * drg = dynamic_cast< Trick::DataRecordGroup * >(in_object) ;
-    if ( drg != NULL ) {
-        groups.push_back(drg) ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::add_sim_object(Trick::SimObject	*	in_object	)	{
+				Trick::DataRecordGroup	*	drg	=	dynamic_cast<	Trick::DataRecordGroup	*	>(in_object)	;
+				if	(	drg	!=	NULL	)	{
+								groups.push_back(drg)	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# Test if the incoming data record group name has been used.
- -# If true return an error.
--# Set the group buffering type to the incoming type
--# Add the group to the executive.
+-#	Test	if	the	incoming	data	record	group	name	has	been	used.
+	-#	If	true	return	an	error.
+-#	Set	the	group	buffering	type	to	the	incoming	type
+-#	Add	the	group	to	the	executive.
 */
-int Trick::DataRecordDispatcher::add_group(Trick::DataRecordGroup * in_group, Trick::DR_Buffering buffering) {
-
-    unsigned int ii ;
-    for (  ii = 0 ; ii < groups.size() ; ii++ ) {
-        if ( !groups[ii]->group_name.compare(in_group->group_name) ) {
-            message_publish(MSG_ERROR, "Data Record group with duplicate name %s.\n", in_group->group_name.c_str()) ;
-            return -1 ;
-        }
-    }
-    if ( buffering != Trick::DR_Not_Specified ) {
-        in_group->set_buffer_type(buffering) ;
-    }
-
-    exec_add_sim_object(in_group , (char *)in_group->name.c_str()) ;
-
-    return 0 ;
+int	Trick::DataRecordDispatcher::add_group(Trick::DataRecordGroup	*	in_group,	Trick::DR_Buffering	buffering)	{
+
+				unsigned	int	ii	;
+				for	(		ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								if	(	!groups[ii]->group_name.compare(in_group->group_name)	)	{
+												message_publish(MSG_ERROR,	"Data	Record	group	with	duplicate	name	%s.\n",	in_group->group_name.c_str())	;
+												return	-1	;
+								}
+				}
+				if	(	buffering	!=	Trick::DR_Not_Specified	)	{
+								in_group->set_buffer_type(buffering)	;
+				}
+
+				exec_add_sim_object(in_group	,	(char	*)in_group->name.c_str())	;
+
+				return	0	;
 }
 
 
 /**
 @details
--# Remove the data recording group from the dispatcher's list of groups
--# Remove the group from the executive.
+-#	Remove	the	data	recording	group	from	the	dispatcher's	list	of	groups
+-#	Remove	the	group	from	the	executive.
 */
-int Trick::DataRecordDispatcher::remove_group(Trick::DataRecordGroup * in_group) {
+int	Trick::DataRecordDispatcher::remove_group(Trick::DataRecordGroup	*	in_group)	{
 
-    std::vector <Trick::DataRecordGroup *>::iterator drg_it ;
+				std::vector	<Trick::DataRecordGroup	*>::iterator	drg_it	;
 
 
-    // remove the group from the dispatcher vector of jobs.
-    for ( drg_it = groups.begin() ; drg_it != groups.end() ; ) {
-        if ( (*drg_it) == in_group ) {
-            // erase the group from the dispatcher. Lock the mutex so we aren't in the
-            // middle of writing data as we delete the group.
-            pthread_mutex_lock(&drd_mutexes.dr_go_mutex) ;
-            drg_it = groups.erase(drg_it) ;
-            pthread_mutex_unlock(&drd_mutexes.dr_go_mutex) ;
+				//	remove	the	group	from	the	dispatcher	vector	of	jobs.
+				for	(	drg_it	=	groups.begin()	;	drg_it	!=	groups.end()	;	)	{
+								if	(	(*drg_it)	==	in_group	)	{
+												//	erase	the	group	from	the	dispatcher.	Lock	the	mutex	so	we	aren't	in	the
+												//	middle	of	writing	data	as	we	delete	the	group.
+												pthread_mutex_lock(&drd_mutexes.dr_go_mutex)	;
+												drg_it	=	groups.erase(drg_it)	;
+												pthread_mutex_unlock(&drd_mutexes.dr_go_mutex)	;
 
-            // call exec_remove_sim_object to remove the data recording jobs from the sim.
-            exec_remove_sim_object(in_group) ;
+												//	call	exec_remove_sim_object	to	remove	the	data	recording	jobs	from	the	sim.
+												exec_remove_sim_object(in_group)	;
 
-            // shutdown recording for the group
-            in_group->shutdown() ;
-        } else {
-            drg_it++ ;
-        }
-    }
+												//	shutdown	recording	for	the	group
+												in_group->shutdown()	;
+								}	else	{
+												drg_it++	;
+								}
+				}
 
 
 
-    return 0 ;
+				return	0	;
 }
 
-void Trick::DataRecordDispatcher::remove_all_groups() {
-    while (!groups.empty()) {
-        remove_group(groups[0]);
-    }
+void	Trick::DataRecordDispatcher::remove_all_groups()	{
+				while	(!groups.empty())	{
+								remove_group(groups[0]);
+				}
 }
 
-Trick::DataRecordGroup * Trick::DataRecordDispatcher::get_group(std::string in_name) {
-    std::vector <Trick::DataRecordGroup *>::iterator it ;
-    for ( it = groups.begin() ; it != groups.end() ; ++it ) {
-        if ( ! (*it)->get_group_name().compare(in_name) )
-            return *it ;
-    }
-    return NULL ;
+Trick::DataRecordGroup	*	Trick::DataRecordDispatcher::get_group(std::string	in_name)	{
+				std::vector	<Trick::DataRecordGroup	*>::iterator	it	;
+				for	(	it	=	groups.begin()	;	it	!=	groups.end()	;	++it	)	{
+								if	(	!	(*it)->get_group_name().compare(in_name)	)
+												return	*it	;
+				}
+				return	NULL	;
 }
 
 /**
 @details
--# If the writer thread condition variable is unlocked
-   -# Signal the thread to go
+-#	If	the	writer	thread	condition	variable	is	unlocked
+			-#	Signal	the	thread	to	go
 */
-int Trick::DataRecordDispatcher::signal_thread() {
+int	Trick::DataRecordDispatcher::signal_thread()	{
 
-    if (!pthread_mutex_trylock(&drd_mutexes.dr_go_mutex)) {
-        pthread_cond_signal(&drd_mutexes.dr_go_cv);
-        pthread_mutex_unlock(&drd_mutexes.dr_go_mutex);
-    }
+				if	(!pthread_mutex_trylock(&drd_mutexes.dr_go_mutex))	{
+								pthread_cond_signal(&drd_mutexes.dr_go_cv);
+								pthread_mutex_unlock(&drd_mutexes.dr_go_mutex);
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
 @details
--# Close out current data record groups
--# Clears the data record groups we are tracking.  The checkpoint reload will
-   repopluate this list.
+-#	Close	out	current	data	record	groups
+-#	Clears	the	data	record	groups	we	are	tracking.		The	checkpoint	reload	will
+			repopluate	this	list.
 */
-int Trick::DataRecordDispatcher::preload_checkpoint() {
-    unsigned int ii ;
-    // close out current data record groups
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        groups[ii]->shutdown() ;
-    }
-    groups.clear() ;
-    return 0 ;
+int	Trick::DataRecordDispatcher::preload_checkpoint()	{
+				unsigned	int	ii	;
+				//	close	out	current	data	record	groups
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								groups[ii]->shutdown()	;
+				}
+				groups.clear()	;
+				return	0	;
 }
 
 /**
 @details
--# If we have not called init yet (pthread_id == 0), call init.
--# Delete existing log files.
+-#	If	we	have	not	called	init	yet	(pthread_id	==	0),	call	init.
+-#	Delete	existing	log	files.
 */
-int Trick::DataRecordDispatcher::restart() {
-    // if we restarted from scratch without calling init jobs, need to call init
-    if ( drd_writer_thread.get_pthread_id() == 0 ) {
-        init() ;
-    }
-    // remove the current log files
-    remove_files() ;
-    return 0 ;
+int	Trick::DataRecordDispatcher::restart()	{
+				//	if	we	restarted	from	scratch	without	calling	init	jobs,	need	to	call	init
+				if	(	drd_writer_thread.get_pthread_id()	==	0	)	{
+								init()	;
+				}
+				//	remove	the	current	log	files
+				remove_files()	;
+				return	0	;
 }
 
 /**
 @details
--# If the thread was started,
-   -# Wait for the thread to be available
-   -# Cancel the thread
+-#	If	the	thread	was	started,
+			-#	Wait	for	the	thread	to	be	available
+			-#	Cancel	the	thread
 */
-int Trick::DataRecordDispatcher::shutdown() {
+int	Trick::DataRecordDispatcher::shutdown()	{
 
-    if ( drd_writer_thread.get_pthread_id() != 0 ) {
-        pthread_mutex_lock( &drd_mutexes.dr_go_mutex);
-        // pthread_cancel( drd_writer_thread.get_pthread_id()) ;
-        drd_mutexes.cancelled = true;
-        pthread_cond_signal(&drd_mutexes.dr_go_cv);
-        pthread_mutex_unlock( &drd_mutexes.dr_go_mutex);
-    }
+				if	(	drd_writer_thread.get_pthread_id()	!=	0	)	{
+								pthread_mutex_lock(	&drd_mutexes.dr_go_mutex);
+								//	pthread_cancel(	drd_writer_thread.get_pthread_id())	;
+								drd_mutexes.cancelled	=	true;
+								pthread_cond_signal(&drd_mutexes.dr_go_cv);
+								pthread_mutex_unlock(	&drd_mutexes.dr_go_mutex);
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::DataRecordDispatcher::enable( const char * in_name ) {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        if ( in_name == NULL or !groups[ii]->get_group_name().compare(in_name) )
-            groups[ii]->enable() ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::enable(	const	char	*	in_name	)	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								if	(	in_name	==	NULL	or	!groups[ii]->get_group_name().compare(in_name)	)
+												groups[ii]->enable()	;
+				}
+				return	0	;
 }
 
-int Trick::DataRecordDispatcher::disable( const char * in_name ) {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        if ( in_name == NULL or !groups[ii]->get_group_name().compare(in_name) )
-            groups[ii]->disable() ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::disable(	const	char	*	in_name	)	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								if	(	in_name	==	NULL	or	!groups[ii]->get_group_name().compare(in_name)	)
+												groups[ii]->disable()	;
+				}
+				return	0	;
 }
 
-int Trick::DataRecordDispatcher::record_now_group( const char * in_name ) {
-    unsigned int ii ;
-    if ( in_name != NULL ) {
-        for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-            if ( !groups[ii]->get_group_name().compare(in_name) )
-                groups[ii]->data_record(exec_get_sim_time()) ;
-        }
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::record_now_group(	const	char	*	in_name	)	{
+				unsigned	int	ii	;
+				if	(	in_name	!=	NULL	)	{
+								for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+												if	(	!groups[ii]->get_group_name().compare(in_name)	)
+																groups[ii]->data_record(exec_get_sim_time())	;
+								}
+				}
+				return	0	;
 }
 
-int Trick::DataRecordDispatcher::set_group_max_file_size(const char * in_name, uint64_t bytes){
-    unsigned int ii ;
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        if ( in_name == NULL or !groups[ii]->get_group_name().compare(in_name) )
-            groups[ii]->set_max_file_size(bytes) ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::set_group_max_file_size(const	char	*	in_name,	uint64_t	bytes){
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								if	(	in_name	==	NULL	or	!groups[ii]->get_group_name().compare(in_name)	)
+												groups[ii]->set_max_file_size(bytes)	;
+				}
+				return	0	;
 }
 
-int Trick::DataRecordDispatcher::set_max_file_size(uint64_t bytes) {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        groups[ii]->set_max_file_size(bytes) ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::set_max_file_size(uint64_t	bytes)	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								groups[ii]->set_max_file_size(bytes)	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# Call every group's init job - only needed when restoring checkpoint
--# during initialization, and the user is responsible for calling this.
+-#	Call	every	group's	init	job	-	only	needed	when	restoring	checkpoint
+-#	during	initialization,	and	the	user	is	responsible	for	calling	this.
 */
-int Trick::DataRecordDispatcher::init_groups() {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < groups.size() ; ii++ ) {
-        groups[ii]->init() ;
-    }
-    return 0 ;
+int	Trick::DataRecordDispatcher::init_groups()	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	groups.size()	;	ii++	)	{
+								groups[ii]->init()	;
+				}
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/DataRecord/DataRecordGroup.cpp b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp
index 5808e9dcd..d5f66b3a0 100644
--- a/trick_source/sim_services/DataRecord/DataRecordGroup.cpp
+++ b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp
@@ -1,858 +1,858 @@
 
-#include <algorithm>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <string.h>
-#include <stdlib.h>
-#include <iomanip>
-
-#ifdef __GNUC__
-#include <cxxabi.h>
+#include	<algorithm>
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<string.h>
+#include	<stdlib.h>
+#include	<iomanip>
+
+#ifdef	__GNUC__
+#include	<cxxabi.h>
 #endif
 
-#include "trick/DataRecordGroup.hh"
-#include "trick/command_line_protos.h"
-#include "trick/exec_proto.h"
-#include "trick/reference.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/DataRecordGroup.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/exec_proto.h"
+#include	"trick/reference.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# The recording group is enabled
--# The recording group is set to always record data (not changes only)
--# The recording group is set to allocate a maximum of 100,000 records in memory
--# The recording group is set to record at a cycle period of 0.1 seconds.
--# The first recording parameter is assigned to simulation time.  The name of
-   the parmeter is named "sys.exec.out.time" to preserve backwards compatibility
-   with older %Trick releases.
--# The call_function and call_function_double functions inherited from the SimObject
-   are populated.  The data_record function is added as a job for this SimObject.
-
-A sim object is created named @c data_record_group<n> where <n> is a unique group number. A
-data_record class job within this sim object is also created that will write the group's
-recorded data to disk. The job's name is <tt> data_record_group<n>.<in_name></tt>.
+-#	The	recording	group	is	enabled
+-#	The	recording	group	is	set	to	always	record	data	(not	changes	only)
+-#	The	recording	group	is	set	to	allocate	a	maximum	of	100,000	records	in	memory
+-#	The	recording	group	is	set	to	record	at	a	cycle	period	of	0.1	seconds.
+-#	The	first	recording	parameter	is	assigned	to	simulation	time.		The	name	of
+			the	parmeter	is	named	"sys.exec.out.time"	to	preserve	backwards	compatibility
+			with	older	%Trick	releases.
+-#	The	call_function	and	call_function_double	functions	inherited	from	the	SimObject
+			are	populated.		The	data_record	function	is	added	as	a	job	for	this	SimObject.
+
+A	sim	object	is	created	named	@c	data_record_group<n>	where	<n>	is	a	unique	group	number.	A
+data_record	class	job	within	this	sim	object	is	also	created	that	will	write	the	group's
+recorded	data	to	disk.	The	job's	name	is	<tt>	data_record_group<n>.<in_name></tt>.
 
 */
-Trick::DataRecordBuffer::DataRecordBuffer() {
-    buffer = last_value = NULL ;
-    ref = NULL ;
-    ref_searched = false ;
-}
-
-Trick::DataRecordBuffer::~DataRecordBuffer() {
-    if ( buffer ) {
-        free(buffer) ;
-    }
-    if ( last_value ) {
-        free(last_value) ;
-    }
-
-    ref_free(ref) ;
-    free(ref) ;
-}
-
-Trick::DataRecordGroup::DataRecordGroup( std::string in_name ) :
- record(true) ,
- inited(false) ,
- group_name(in_name) ,
- freq(DR_Always),
- start(0.0) ,
- cycle(0.1) ,
- time_value_attr() ,
- num_variable_names(0),
- variable_names(NULL),
- variable_alias(NULL),
- num_change_variable_names(0),
- change_variable_names(NULL),
- change_variable_alias(NULL),
- max_num(100000),
- buffer_num(0),
- writer_num(0),
- max_file_size(1<<30), // 1 GB
- total_bytes_written(0),
- max_size_warning(false),
- writer_buff(NULL),
- single_prec_only(false),
- buffer_type(DR_Buffer),
- job_class("data_record"),
- curr_time(0.0)
+Trick::DataRecordBuffer::DataRecordBuffer()	{
+				buffer	=	last_value	=	NULL	;
+				ref	=	NULL	;
+				ref_searched	=	false	;
+}
+
+Trick::DataRecordBuffer::~DataRecordBuffer()	{
+				if	(	buffer	)	{
+								free(buffer)	;
+				}
+				if	(	last_value	)	{
+								free(last_value)	;
+				}
+
+				ref_free(ref)	;
+				free(ref)	;
+}
+
+Trick::DataRecordGroup::DataRecordGroup(	std::string	in_name	)	:
+	record(true)	,
+	inited(false)	,
+	group_name(in_name)	,
+	freq(DR_Always),
+	start(0.0)	,
+	cycle(0.1)	,
+	time_value_attr()	,
+	num_variable_names(0),
+	variable_names(NULL),
+	variable_alias(NULL),
+	num_change_variable_names(0),
+	change_variable_names(NULL),
+	change_variable_alias(NULL),
+	max_num(100000),
+	buffer_num(0),
+	writer_num(0),
+	max_file_size(1<<30),	//	1	GB
+	total_bytes_written(0),
+	max_size_warning(false),
+	writer_buff(NULL),
+	single_prec_only(false),
+	buffer_type(DR_Buffer),
+	job_class("data_record"),
+	curr_time(0.0)
 {
 
-    union {
-        long l;
-        char c[sizeof(long)];
-    } byte_order_union;
+				union	{
+								long	l;
+								char	c[sizeof(long)];
+				}	byte_order_union;
 
-    byte_order_union.l = 1;
-    if (byte_order_union.c[sizeof(long) - 1] != 1) {
-        byte_order = "little_endian" ;
-    } else {
-        byte_order = "big_endian" ;
-    }
+				byte_order_union.l	=	1;
+				if	(byte_order_union.c[sizeof(long)	-	1]	!=	1)	{
+								byte_order	=	"little_endian"	;
+				}	else	{
+								byte_order	=	"big_endian"	;
+				}
 
-    // sim object name
-    name = std::string("trick_data_record_group_") + in_name ;
+				//	sim	object	name
+				name	=	std::string("trick_data_record_group_")	+	in_name	;
 
-    // add_jobs_to_queue will fill in job_id later
-    // make the init job run after all other initialization jobs but before the post init checkpoint
-    // job so users can allocate memory in initialization jobs and checkpointing data rec groups will work
-    add_job(0, 1, (char *)"initialization", NULL, cycle, (char *)"init", (char *)"TRK", 65534) ;
-    add_job(0, 2, (char *)"end_of_frame", NULL, 1.0, (char *)"write_data", (char *)"TRK") ;
-    add_job(0, 3, (char *)"checkpoint", NULL, 1.0, (char *)"checkpoint", (char *)"TRK") ;
-    add_job(0, 4, (char *)"post_checkpoint", NULL, 1.0, (char *)"clear_checkpoint_vars", (char *)"TRK") ;
-    // run the restart job in phase 60001
-    add_job(0, 5, (char *)"restart", NULL, 1.0, (char *)"restart", (char *)"TRK", 60001) ;
-    add_job(0, 6, (char *)"shutdown", NULL, 1.0, (char *)"shutdown", (char *)"TRK") ;
+				//	add_jobs_to_queue	will	fill	in	job_id	later
+				//	make	the	init	job	run	after	all	other	initialization	jobs	but	before	the	post	init	checkpoint
+				//	job	so	users	can	allocate	memory	in	initialization	jobs	and	checkpointing	data	rec	groups	will	work
+				add_job(0,	1,	(char	*)"initialization",	NULL,	cycle,	(char	*)"init",	(char	*)"TRK",	65534)	;
+				add_job(0,	2,	(char	*)"end_of_frame",	NULL,	1.0,	(char	*)"write_data",	(char	*)"TRK")	;
+				add_job(0,	3,	(char	*)"checkpoint",	NULL,	1.0,	(char	*)"checkpoint",	(char	*)"TRK")	;
+				add_job(0,	4,	(char	*)"post_checkpoint",	NULL,	1.0,	(char	*)"clear_checkpoint_vars",	(char	*)"TRK")	;
+				//	run	the	restart	job	in	phase	60001
+				add_job(0,	5,	(char	*)"restart",	NULL,	1.0,	(char	*)"restart",	(char	*)"TRK",	60001)	;
+				add_job(0,	6,	(char	*)"shutdown",	NULL,	1.0,	(char	*)"shutdown",	(char	*)"TRK")	;
 
-    write_job = add_job(0, 99, (char *)job_class.c_str(), NULL, cycle, (char *)"data_record" , (char *)"TRK") ;
+				write_job	=	add_job(0,	99,	(char	*)job_class.c_str(),	NULL,	cycle,	(char	*)"data_record"	,	(char	*)"TRK")	;
 
-    add_time_variable() ;
+				add_time_variable()	;
 }
 
-Trick::DataRecordGroup::~DataRecordGroup() {
-    free((void *)time_value_attr.units) ;
+Trick::DataRecordGroup::~DataRecordGroup()	{
+				free((void	*)time_value_attr.units)	;
 }
 
-int Trick::DataRecordGroup::call_function( Trick::JobData * curr_job ) {
+int	Trick::DataRecordGroup::call_function(	Trick::JobData	*	curr_job	)	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    switch (curr_job->id) {
-        case 1:
-            ret = init() ;
-            break ;
-        case 2:
-            ret = write_data(false) ;
-            break ;
-        case 3:
-            ret = checkpoint() ;
-            break ;
-        case 4:
-            clear_checkpoint_vars() ;
-            break ;
-        case 5:
-            ret = restart() ;
-            break ;
-        case 6:
-            ret = shutdown() ;
-            break ;
-        default:
-            ret = data_record(exec_get_sim_time()) ;
-            break ;
-    }
+				switch	(curr_job->id)	{
+								case	1:
+												ret	=	init()	;
+												break	;
+								case	2:
+												ret	=	write_data(false)	;
+												break	;
+								case	3:
+												ret	=	checkpoint()	;
+												break	;
+								case	4:
+												clear_checkpoint_vars()	;
+												break	;
+								case	5:
+												ret	=	restart()	;
+												break	;
+								case	6:
+												ret	=	shutdown()	;
+												break	;
+								default:
+												ret	=	data_record(exec_get_sim_time())	;
+												break	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
 
-double Trick::DataRecordGroup::call_function_double( Trick::JobData * curr_job ) {
-    (void) curr_job ;
-    return(0.0) ;
+double	Trick::DataRecordGroup::call_function_double(	Trick::JobData	*	curr_job	)	{
+				(void)	curr_job	;
+				return(0.0)	;
 }
 
-void Trick::DataRecordGroup::register_group_with_mm(void * address , const char * type) {
-    // Only add to the memory manager if it has not already been added
-    if ( TMM_var_exists(name.c_str()) == 0 ) {
-        // Declare this to the memory manager.  Must be done here to get the correct type name
-        TMM_declare_ext_var(address , TRICK_STRUCTURED, type , 0 , name.c_str() , 0 , NULL ) ;
-        ALLOC_INFO * alloc_info = get_alloc_info_at(address) ;
-        alloc_info->stcl = TRICK_LOCAL ;
-        alloc_info->alloc_type = TRICK_ALLOC_NEW ;
-    }
+void	Trick::DataRecordGroup::register_group_with_mm(void	*	address	,	const	char	*	type)	{
+				//	Only	add	to	the	memory	manager	if	it	has	not	already	been	added
+				if	(	TMM_var_exists(name.c_str())	==	0	)	{
+								//	Declare	this	to	the	memory	manager.		Must	be	done	here	to	get	the	correct	type	name
+								TMM_declare_ext_var(address	,	TRICK_STRUCTURED,	type	,	0	,	name.c_str()	,	0	,	NULL	)	;
+								ALLOC_INFO	*	alloc_info	=	get_alloc_info_at(address)	;
+								alloc_info->stcl	=	TRICK_LOCAL	;
+								alloc_info->alloc_type	=	TRICK_ALLOC_NEW	;
+				}
 }
 
-const std::string & Trick::DataRecordGroup::get_group_name() {
-    return group_name ;
+const	std::string	&	Trick::DataRecordGroup::get_group_name()	{
+				return	group_name	;
 }
 
-int Trick::DataRecordGroup::set_cycle( double in_cycle ) {
-    write_job->set_cycle(in_cycle) ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_cycle(	double	in_cycle	)	{
+				write_job->set_cycle(in_cycle)	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_phase( unsigned short in_phase ) {
-    write_job->phase = in_phase ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_phase(	unsigned	short	in_phase	)	{
+				write_job->phase	=	in_phase	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_freq( DR_Freq in_freq ) {
-    freq = in_freq ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_freq(	DR_Freq	in_freq	)	{
+				freq	=	in_freq	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_max_buffer_size( int num ) {
-    max_num = num ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_max_buffer_size(	int	num	)	{
+				max_num	=	num	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_buffer_type( int in_buffer_type ) {
-    buffer_type = (DR_Buffering)in_buffer_type ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_buffer_type(	int	in_buffer_type	)	{
+				buffer_type	=	(DR_Buffering)in_buffer_type	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_max_file_size( uint64_t bytes ) {
-    if(bytes == 0) {
-        max_file_size = UINT64_MAX ;
-    } else {
-    max_file_size = bytes ; 
-    }
-    return(0) ;
+int	Trick::DataRecordGroup::set_max_file_size(	uint64_t	bytes	)	{
+				if(bytes	==	0)	{
+								max_file_size	=	UINT64_MAX	;
+				}	else	{
+				max_file_size	=	bytes	;	
+				}
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_single_prec_only( bool in_single_prec_only ) {
-    single_prec_only = in_single_prec_only ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_single_prec_only(	bool	in_single_prec_only	)	{
+				single_prec_only	=	in_single_prec_only	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::set_thread( unsigned int in_thread_id ) {
+int	Trick::DataRecordGroup::set_thread(	unsigned	int	in_thread_id	)	{
 
-    unsigned int jj ;
-    Trick::JobData * temp_job  ;
+				unsigned	int	jj	;
+				Trick::JobData	*	temp_job		;
 
-    /* make all data_record_groups have same sim object id as data_record */
-    for ( jj = 0 ; jj < jobs.size() ; jj++ ) {
-        temp_job = jobs[jj] ;
-        temp_job->thread = in_thread_id ;
-    }
-    return 0 ;
+				/*	make	all	data_record_groups	have	same	sim	object	id	as	data_record	*/
+				for	(	jj	=	0	;	jj	<	jobs.size()	;	jj++	)	{
+								temp_job	=	jobs[jj]	;
+								temp_job->thread	=	in_thread_id	;
+				}
+				return	0	;
 }
 
-int Trick::DataRecordGroup::set_job_class( std::string in_class ) {
-    write_job->job_class_name = job_class = in_class ;
-    return(0) ;
+int	Trick::DataRecordGroup::set_job_class(	std::string	in_class	)	{
+				write_job->job_class_name	=	job_class	=	in_class	;
+				return(0)	;
 }
 
-int Trick::DataRecordGroup::add_time_variable() {
-    REF2 * new_ref ;
+int	Trick::DataRecordGroup::add_time_variable()	{
+				REF2	*	new_ref	;
 
-    // Create attributes for time recorded as a double
-    time_value_attr.type = TRICK_DOUBLE ;
-    time_value_attr.size = sizeof(double) ;
-    time_value_attr.units = strdup("s") ;
+				//	Create	attributes	for	time	recorded	as	a	double
+				time_value_attr.type	=	TRICK_DOUBLE	;
+				time_value_attr.size	=	sizeof(double)	;
+				time_value_attr.units	=	strdup("s")	;
 
-    // Create a reference that records time as sys.exec.out.time
-    new_ref = (REF2 *)calloc( 1 , sizeof(REF2));
-    new_ref->reference = strdup("sys.exec.out.time") ;
-    new_ref->address = &curr_time ;
-    new_ref->attr = &time_value_attr ;
-    add_variable(new_ref) ;
+				//	Create	a	reference	that	records	time	as	sys.exec.out.time
+				new_ref	=	(REF2	*)calloc(	1	,	sizeof(REF2));
+				new_ref->reference	=	strdup("sys.exec.out.time")	;
+				new_ref->address	=	&curr_time	;
+				new_ref->attr	=	&time_value_attr	;
+				add_variable(new_ref)	;
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::DataRecordGroup::add_variable( std::string in_name , std::string alias ) {
+int	Trick::DataRecordGroup::add_variable(	std::string	in_name	,	std::string	alias	)	{
 
-    Trick::DataRecordBuffer * new_var = new Trick::DataRecordBuffer ;
-    // Trim leading spaces
-    in_name.erase( 0, in_name.find_first_not_of( " \t" ) );
-    // Trim trailing spaces
-    in_name.erase( in_name.find_last_not_of( " \t" ) + 1);
-    new_var->name = in_name ;
-    new_var->alias = alias ;
-    rec_buffer.push_back(new_var) ;
-    return 0 ;
+				Trick::DataRecordBuffer	*	new_var	=	new	Trick::DataRecordBuffer	;
+				//	Trim	leading	spaces
+				in_name.erase(	0,	in_name.find_first_not_of(	"	\t"	)	);
+				//	Trim	trailing	spaces
+				in_name.erase(	in_name.find_last_not_of(	"	\t"	)	+	1);
+				new_var->name	=	in_name	;
+				new_var->alias	=	alias	;
+				rec_buffer.push_back(new_var)	;
+				return	0	;
 }
 
-void Trick::DataRecordGroup::remove_variable( std::string in_name ) {
-    // Trim leading spaces++ 
-    in_name.erase( 0, in_name.find_first_not_of( " \t" ) );
-    // Trim trailing spaces
-    in_name.erase( in_name.find_last_not_of( " \t" ) + 1);
+void	Trick::DataRecordGroup::remove_variable(	std::string	in_name	)	{
+				//	Trim	leading	spaces++	
+				in_name.erase(	0,	in_name.find_first_not_of(	"	\t"	)	);
+				//	Trim	trailing	spaces
+				in_name.erase(	in_name.find_last_not_of(	"	\t"	)	+	1);
 
-    if (!in_name.compare("sys.exec.out.time")) {
-        // This class assumes sim time is always the first variable.
-        // Removing it results in errors.
-        return;
-    }
+				if	(!in_name.compare("sys.exec.out.time"))	{
+								//	This	class	assumes	sim	time	is	always	the	first	variable.
+								//	Removing	it	results	in	errors.
+								return;
+				}
 
-    auto remove_from = [&](std::vector<DataRecordBuffer*>& buffer) {
-        for (auto i = buffer.begin(); i != buffer.end(); ++i) {
-            if (!(*i)->name.compare(in_name)) {
-                delete *i;
-                buffer.erase(i);
-                break;
-            }
-        }
-    };
+				auto	remove_from	=	[&](std::vector<DataRecordBuffer*>&	buffer)	{
+								for	(auto	i	=	buffer.begin();	i	!=	buffer.end();	++i)	{
+												if	(!(*i)->name.compare(in_name))	{
+																delete	*i;
+																buffer.erase(i);
+																break;
+												}
+								}
+				};
 
-    remove_from(rec_buffer);
-    remove_from(change_buffer);
+				remove_from(rec_buffer);
+				remove_from(change_buffer);
 }
 
-void Trick::DataRecordGroup::remove_all_variables() {
-    // remove all but the first variable, which is sim time
-    if(!rec_buffer.empty()) {
-        for (auto i = rec_buffer.begin() + 1; i != rec_buffer.end(); ++i) {
-            delete *i;
-        }
-        rec_buffer.erase(rec_buffer.begin() + 1, rec_buffer.end());
-    }
+void	Trick::DataRecordGroup::remove_all_variables()	{
+				//	remove	all	but	the	first	variable,	which	is	sim	time
+				if(!rec_buffer.empty())	{
+								for	(auto	i	=	rec_buffer.begin()	+	1;	i	!=	rec_buffer.end();	++i)	{
+												delete	*i;
+								}
+								rec_buffer.erase(rec_buffer.begin()	+	1,	rec_buffer.end());
+				}
 
-    // remove everything
-    for (auto variable : change_buffer) {
-        delete variable;
-    }
+				//	remove	everything
+				for	(auto	variable	:	change_buffer)	{
+								delete	variable;
+				}
 
-    change_buffer.clear();
+				change_buffer.clear();
 }
 
-int Trick::DataRecordGroup::add_variable( REF2 * ref2 ) {
+int	Trick::DataRecordGroup::add_variable(	REF2	*	ref2	)	{
 
-    if ( ref2 == NULL || ref2->attr == NULL ) {
-        return(-1) ;
-    }
+				if	(	ref2	==	NULL	||	ref2->attr	==	NULL	)	{
+								return(-1)	;
+				}
 
-    Trick::DataRecordBuffer * new_var = new Trick::DataRecordBuffer ;
-    new_var->name = std::string(ref2->reference) ;
-    new_var->ref_searched = true ;
-    new_var->ref = ref2 ;
-    new_var->last_value = (char *)calloc(1 , new_var->ref->attr->size) ;
-    // Don't allocate space for the temp storage buffer until "init"
-    rec_buffer.push_back(new_var) ;
+				Trick::DataRecordBuffer	*	new_var	=	new	Trick::DataRecordBuffer	;
+				new_var->name	=	std::string(ref2->reference)	;
+				new_var->ref_searched	=	true	;
+				new_var->ref	=	ref2	;
+				new_var->last_value	=	(char	*)calloc(1	,	new_var->ref->attr->size)	;
+				//	Don't	allocate	space	for	the	temp	storage	buffer	until	"init"
+				rec_buffer.push_back(new_var)	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::DataRecordGroup::add_change_variable( std::string in_name ) {
+int	Trick::DataRecordGroup::add_change_variable(	std::string	in_name	)	{
 
-    REF2 * ref2 ;
+				REF2	*	ref2	;
 
-    ref2 = ref_attributes(in_name.c_str()) ;
+				ref2	=	ref_attributes(in_name.c_str())	;
 
-    if ( ref2 == NULL || ref2->attr == NULL ) {
-        message_publish(MSG_WARNING, "Could not find Data Record change variable %s.\n", in_name.c_str()) ;
-        return(-1) ;
-    }
+				if	(	ref2	==	NULL	||	ref2->attr	==	NULL	)	{
+								message_publish(MSG_WARNING,	"Could	not	find	Data	Record	change	variable	%s.\n",	in_name.c_str())	;
+								return(-1)	;
+				}
 
-    Trick::DataRecordBuffer * new_var = new Trick::DataRecordBuffer ;
-    new_var->ref = ref2 ;
-    new_var->name = in_name;
-    new_var->buffer = (char *)malloc(ref2->attr->size) ;
-    new_var->last_value =  NULL ;
-    memcpy(new_var->buffer , ref2->address , ref2->attr->size) ;
-    change_buffer.push_back(new_var) ;
+				Trick::DataRecordBuffer	*	new_var	=	new	Trick::DataRecordBuffer	;
+				new_var->ref	=	ref2	;
+				new_var->name	=	in_name;
+				new_var->buffer	=	(char	*)malloc(ref2->attr->size)	;
+				new_var->last_value	=		NULL	;
+				memcpy(new_var->buffer	,	ref2->address	,	ref2->attr->size)	;
+				change_buffer.push_back(new_var)	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-bool Trick::DataRecordGroup::isSupportedType(REF2 * ref2, std::string& message) {
-    if (ref2->attr->type == TRICK_STRING || ref2->attr->type == TRICK_STL || ref2->attr->type == TRICK_STRUCTURED) {
-        message = "Cannot Data Record variable " + std::string(ref2->reference) + " of unsupported type " + std::to_string(ref2->attr->type);
-        return false;
-    }
-    
-    // If this is an array and not a single value, don't record it
-    if (ref2->num_index != ref2->attr->num_index) {
-        message = "Cannot Data Record arrayed variable " + std::string(ref2->reference);
-        return false;
-    }
+bool	Trick::DataRecordGroup::isSupportedType(REF2	*	ref2,	std::string&	message)	{
+				if	(ref2->attr->type	==	TRICK_STRING	||	ref2->attr->type	==	TRICK_STL	||	ref2->attr->type	==	TRICK_STRUCTURED)	{
+								message	=	"Cannot	Data	Record	variable	"	+	std::string(ref2->reference)	+	"	of	unsupported	type	"	+	std::to_string(ref2->attr->type);
+								return	false;
+				}
+				
+				//	If	this	is	an	array	and	not	a	single	value,	don't	record	it
+				if	(ref2->num_index	!=	ref2->attr->num_index)	{
+								message	=	"Cannot	Data	Record	arrayed	variable	"	+	std::string(ref2->reference);
+								return	false;
+				}
 
-    return true;
+				return	true;
 }
 
 /**
 @details
--# The simulation output directory is retrieved from the CommandLineArguments
--# The log header file is created
-   -# The endianness of the log file is written to the log header.
-   -# The names of the parameters contained in the log file are written to the header.
--# Memory buffers are allocated to store simulation data
--# The DataRecordGroupObject (a derived SimObject) is added to the Scheduler.
+-#	The	simulation	output	directory	is	retrieved	from	the	CommandLineArguments
+-#	The	log	header	file	is	created
+			-#	The	endianness	of	the	log	file	is	written	to	the	log	header.
+			-#	The	names	of	the	parameters	contained	in	the	log	file	are	written	to	the	header.
+-#	Memory	buffers	are	allocated	to	store	simulation	data
+-#	The	DataRecordGroupObject	(a	derived	SimObject)	is	added	to	the	Scheduler.
 */
-int Trick::DataRecordGroup::init() {
-
-    unsigned int jj ;
-    int ret ;
-
-    // reset counter here so we can "re-init" our recording
-    buffer_num = writer_num = total_bytes_written = 0 ;
-
-    output_dir = command_line_args_get_output_dir() ;
-    /* this is the common part of the record file name, the format specific will add the correct suffix */
-    file_name = output_dir + "/log_" + group_name ;
-
-    pthread_mutex_init(&buffer_mutex, NULL);
-
-    // Allocate recording space for time.
-    rec_buffer[0]->buffer = (char *)calloc(max_num , rec_buffer[0]->ref->attr->size) ;
-    rec_buffer[0]->last_value = (char *)calloc(1 , rec_buffer[0]->ref->attr->size) ;
-
-    /* Loop through all variables looking up names.  Allocate recording space
-       according to size of the variable */
-    for (jj = 1; jj < rec_buffer.size() ; jj++) {
-        Trick::DataRecordBuffer * drb = rec_buffer[jj] ;
-        if ( drb->ref_searched == false ) {
-            REF2 * ref2 ;
-
-            ref2 = ref_attributes(drb->name.c_str()) ;
-            if ( ref2 == NULL || ref2->attr == NULL ) {
-                message_publish(MSG_WARNING, "Could not find Data Record variable %s.\n", drb->name.c_str()) ;
-                rec_buffer.erase(rec_buffer.begin() + jj--) ;
-                delete drb ;
-                continue ;
-            } else {
-                std::string message;
-                if (!isSupportedType(ref2, message)) {
-                    message_publish(MSG_WARNING, "%s\n", message.c_str()) ;
-                    rec_buffer.erase(rec_buffer.begin() + jj--) ;
-                    delete drb ;
-                    continue ;
-                } else {
-                    drb->ref = ref2 ;
-                }
-            }
-        }
-        if ( drb->alias.compare("") ) {
-            drb->ref->reference = strdup(drb->alias.c_str()) ;
-        }
-        drb->last_value = (char *)calloc(1 , drb->ref->attr->size) ;
-        drb->buffer = (char *)calloc(max_num , drb->ref->attr->size) ;
-        drb->ref_searched = true ;
-    }
-
-    write_header() ;
-
-    // call format specific initialization to open destination and write header
-    ret = format_specific_init() ;
-
-    // set the inited flag to true when all initialization is done
-    if ( ret == 0 ) {
-        inited = true ;
-    }
-
-    return(0) ;
-
-}
-
-int Trick::DataRecordGroup::checkpoint() {
-    unsigned int jj ;
-
-    /*
-       Save the names of the variables and the aliases to the checkpoint,
-       the rest of the DataRecordBuffer will be reconstructed during restart.
-       The first variable is time which we do not have to save.
-     */
-    if ( rec_buffer.size() > 1 ) {
-        num_variable_names = rec_buffer.size() - 1 ;
-        variable_names = (char **)TMM_declare_var_1d("char *", (int)rec_buffer.size() - 1) ;
-        variable_alias = (char **)TMM_declare_var_1d("char *", (int)rec_buffer.size() - 1) ;
-
-        for (jj = 1; jj < rec_buffer.size() ; jj++) {
-            Trick::DataRecordBuffer * drb = rec_buffer[jj] ;
-
-            variable_names[jj-1] = TMM_strdup((char *)drb->name.c_str()) ;
-            variable_alias[jj-1] = TMM_strdup((char *)drb->alias.c_str()) ;
-        }
-    }
-
-    /*
-       Save the names of the change variables and the aliases to the checkpoint,
-       the rest of the DataRecordBuffer will be reconstructed during restart
-     */
-    if ( change_buffer.size() > 0 ) {
-        num_change_variable_names = change_buffer.size() ;
-        change_variable_names = (char **)TMM_declare_var_1d("char *", (int)change_buffer.size()) ;
-        change_variable_alias = (char **)TMM_declare_var_1d("char *", (int)change_buffer.size()) ;
-
-        for (jj = 0; jj < change_buffer.size() ; jj++) {
-            Trick::DataRecordBuffer * drb = change_buffer[jj] ;
-
-            change_variable_names[jj] = TMM_strdup((char *)drb->name.c_str()) ;
-            change_variable_alias[jj] = TMM_strdup((char *)drb->alias.c_str()) ;
-        }
-    }
-
-    return 0 ;
-}
-
-void Trick::DataRecordGroup::clear_checkpoint_vars() {
-    
-    if ( variable_names ) {
-        for(unsigned int jj = 0; jj < num_variable_names; jj++) {
-            TMM_delete_var_a(variable_names[jj]);
-        }
-        TMM_delete_var_a(variable_names) ;
-    }
-
-    if ( variable_alias ) {
-        for(unsigned int jj = 0; jj < num_variable_names; jj++) {
-            TMM_delete_var_a(variable_alias[jj]);
-        }
-        TMM_delete_var_a(variable_alias) ;
-    }
-
-    if ( change_variable_names ) {
-        for(unsigned int jj = 0; jj < num_change_variable_names; jj++) {
-            TMM_delete_var_a(change_variable_names[jj]);
-        }
-        TMM_delete_var_a(change_variable_names) ;
-    }
-
-    if ( change_variable_alias ) {
-        for(unsigned int jj = 0; jj < num_change_variable_names; jj++) {
-            TMM_delete_var_a(change_variable_alias[jj]);
-        }
-        TMM_delete_var_a(change_variable_alias) ;
-    }
-
-    variable_names = NULL ;
-    variable_alias = NULL ;
-    change_variable_names = NULL ;
-    change_variable_alias = NULL ;
-    num_variable_names = 0 ;
-    num_change_variable_names = 0 ;
-}
-
-int Trick::DataRecordGroup::restart() {
-    std::vector <Trick::DataRecordBuffer *>::iterator drb_it ;
-
-    /* delete the current rec_buffer */
-    for ( drb_it = rec_buffer.begin() ; drb_it != rec_buffer.end() ; ++drb_it ) {
-        delete *drb_it ;
-    }
-    rec_buffer.clear() ;
-    /* Add back the time variable */
-    add_time_variable() ;
-
-    /* delete the current change_buffer contents */
-    for ( drb_it = change_buffer.begin() ; drb_it != change_buffer.end() ; ++drb_it ) {
-        delete *drb_it ;
-    }
-    change_buffer.clear() ;
-
-    unsigned int jj ;
-    /* add the variable names listed in the checkpoint file */
-    for ( jj = 0 ; jj < num_variable_names ; jj++ ) {
-        add_variable( variable_names[jj] , variable_alias[jj] ) ;
-    }
-    for ( jj = 0 ; jj < num_change_variable_names ; jj++ ) {
-        add_change_variable( change_variable_names[jj] ) ;
-    }
-
-    clear_checkpoint_vars() ;
-
-    // set the write job class to what is in the checkpoint file.
-    write_job->job_class_name = job_class ;
-
-    // reset the sim_object name.
-    name = std::string("data_record_group_") + group_name ;
-
-    /* call init to open the recording file and look up variable name addresses */
-    init() ;
-
-    return 0 ;
-}
-
-int Trick::DataRecordGroup::write_header() {
-
-    unsigned int jj ;
-    std::string header_name ;
-    std::fstream out_stream ;
-
-    /*! create the header file used by the GUIs */
-    header_name = output_dir + "/log_" + group_name + ".header" ;
-
-    out_stream.open(header_name.c_str(), std::fstream::out ) ;
-    if ( ! out_stream  ||  ! out_stream.good() ) {
-        return -1;
-    }
-
-    /* Header file first line is created in format specific header */
-    out_stream << "log_" << group_name ;
-
-    format_specific_header(out_stream) ;
-
-    /* Output the file name, variable size, units, and variable name
-     * to the rest of recorded data header file.
-     * (e.g. file_name  C_type  units  sim_name)
-     * Note: "sys.exec.out.time" should be the first variable in the buffer.
-     */
-    for (jj = 0; jj < rec_buffer.size() ; jj++) {
-        /*! recording single data item */
-        out_stream << "log_" << group_name << "\t"
-            << type_string(rec_buffer[jj]->ref->attr->type,
-                           rec_buffer[jj]->ref->attr->size) << "\t"
-            << std::setw(6) ;
-
-        if ( rec_buffer[jj]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-            out_stream << "--" ;
-        } else {
-            out_stream << rec_buffer[jj]->ref->attr->units ;
-        }
-        out_stream << "\t" << rec_buffer[jj]->ref->reference << std::endl ;
-    }
-
-    // Send all unwritten characters in the buffer to its output/file.
-    out_stream.flush() ;
-    out_stream.close() ;
-
-    return(0) ;
-
-}
-
-int Trick::DataRecordGroup::data_record(double in_time) {
-
-    unsigned int jj ;
-    unsigned int buffer_offset ;
-    Trick::DataRecordBuffer * drb ;
-    bool change_detected = false ;
-
-    //TODO: does not handle bitfields correctly!
-    if ( record == true ) {
-        if ( freq != DR_Always ) {
-            for (jj = 0; jj < change_buffer.size() ; jj++) {
-                drb = change_buffer[jj] ;
-                REF2 * ref = drb->ref ;
-                if ( ref->pointer_present == 1 ) {
-                    ref->address = follow_address_path(ref) ;
-                }
-                if ( memcmp( drb->buffer , drb->ref->address , drb->ref->attr->size) ) {
-                    change_detected = true ;
-                    memcpy( drb->buffer , drb->ref->address , drb->ref->attr->size) ;
-                }
-            }
-
-        }
-
-        if ( freq == DR_Always || change_detected == true ) {
-
-            // If this is not the ring buffer and
-            // we are going to have trouble fitting 2 data sets then write the data now.
-            if ( buffer_type != DR_Ring_Buffer ) {
-                if ( buffer_num - writer_num >= (max_num - 2) ) {
-                    write_data(true) ;
-                }
-            }
-
-            curr_time = in_time ;
-
-            if ( freq == DR_Changes_Step ) {
-                buffer_offset = buffer_num % max_num ;
-                *((double *)(rec_buffer[0]->last_value)) = in_time ;
-                for (jj = 0; jj < rec_buffer.size() ; jj++) {
-                    drb = rec_buffer[jj] ;
-                    REF2 * ref = drb->ref ;
-                    int param_size = ref->attr->size ;
-                    if ( buffer_offset == 0 ) {
-                       drb->curr_buffer = drb->buffer ;
-                    } else {
-                       drb->curr_buffer += param_size ;
-                    }
-                    switch ( param_size ) {
-                        case 8:
-                            *(int64_t *)drb->curr_buffer = *(int64_t *)drb->last_value ;
-                            break ;
-                        case 4:
-                            *(int32_t *)drb->curr_buffer = *(int32_t *)drb->last_value ;
-                            break ;
-                        case 2:
-                            *(int16_t *)drb->curr_buffer = *(int16_t *)drb->last_value ;
-                            break ;
-                        case 1:
-                            *(int8_t *)drb->curr_buffer = *(int8_t *)drb->last_value ;
-                            break ;
-                        default:
-                            memcpy( drb->curr_buffer , drb->last_value , param_size ) ;
-                            break ;
-                    }
-                }
-                buffer_num++ ;
-            }
-
-            buffer_offset = buffer_num % max_num ;
-            for (jj = 0; jj < rec_buffer.size() ; jj++) {
-                drb = rec_buffer[jj] ;
-                REF2 * ref = drb->ref ;
-                if ( ref->pointer_present == 1 ) {
-                    ref->address = follow_address_path(ref) ;
-                }
-                int param_size = ref->attr->size ;
-                if ( buffer_offset == 0 ) {
-                   drb->curr_buffer = drb->buffer ;
-                } else {
-                   drb->curr_buffer += param_size ;
-                }
-                switch ( param_size ) {
-                    case 8:
-                        *(int64_t *)drb->curr_buffer = *(int64_t *)ref->address ;
-                        break ;
-                    case 4:
-                        *(int32_t *)drb->curr_buffer = *(int32_t *)ref->address ;
-                        break ;
-                    case 2:
-                        *(int16_t *)drb->curr_buffer = *(int16_t *)ref->address ;
-                        break ;
-                    case 1:
-                        *(int8_t *)drb->curr_buffer = *(int8_t *)ref->address ;
-                        break ;
-                    default:
-                        memcpy( drb->curr_buffer , ref->address , param_size ) ;
-                        break ;
-                }
-            }
-            buffer_num++ ;
-        }
-    }
-
-    return(0) ;
-
-}
-
-int Trick::DataRecordGroup::write_data(bool must_write) {
-
-    unsigned int local_buffer_num ;
-    unsigned int num_to_write ;
-    unsigned int writer_offset ;
-
-    if ( record and inited and (buffer_type == DR_No_Buffer or must_write) and (total_bytes_written <= max_file_size)) {
-
-        // buffer_mutex is used in this one place to prevent forced calls of write_data
-        // to not overwrite data being written by the asynchronous thread.
-        pthread_mutex_lock(&buffer_mutex) ;
-
-        local_buffer_num = buffer_num ;
-        if ( (local_buffer_num - writer_num) > max_num ) {
-            num_to_write = max_num ;
-        } else {
-            num_to_write = (local_buffer_num - writer_num) ;
-        }
-        writer_num = local_buffer_num - num_to_write ;
-
-        //! This loop pulls a "row" of time homogeneous data and writes it to the file
-        while ( writer_num != local_buffer_num ) {
-
-            writer_offset = writer_num % max_num ;
-            //! keep record of bytes written to file. Default max is 1GB
-            total_bytes_written += format_specific_write_data(writer_offset) ;
-            writer_num++ ;
-
-        }
-
-        if(!max_size_warning && (total_bytes_written > max_file_size)) {
-            std::cerr << "WARNING: Data record max file size " << (static_cast<double>(max_file_size))/(1<<20) << "MB reached.\n"
-            "https://nasa.github.io/trick/documentation/simulation_capabilities/Data-Record#changing-the-max-file-size-of-a-data-record-group-ascii-and-binary-only" 
-            << std::endl;
-            max_size_warning = true;
-        }
-
-        pthread_mutex_unlock(&buffer_mutex) ;
-
-    }
-
-    return 0 ;
-}
-
-int Trick::DataRecordGroup::enable() {
-    record = true ;
-    return(0) ;
-}
-
-int Trick::DataRecordGroup::disable() {
-    record = false ;
-    return(0) ;
-}
-
-int Trick::DataRecordGroup::shutdown() {
-
-    // Force write out all data
-    record = true ; // If user disabled group, make sure any recorded data gets written out
-    write_data(true) ;
-    format_specific_shutdown() ;
-
-    remove_all_variables();
-
-    // remove_all_variables does not remove sim time
-    if(!rec_buffer.empty()){
-        delete rec_buffer[0];
-        rec_buffer.clear();
-    }
-
-    if ( writer_buff ) {
-        free(writer_buff) ;
-        writer_buff = NULL ;
-    }
-
-    return 0 ;
-}
-
-std::string Trick::DataRecordGroup::type_string( int item_type, int item_size ) {
-    switch (item_type) {
-        case TRICK_CHARACTER:
-                return "char";
-                break;
-        case TRICK_UNSIGNED_CHARACTER:
-                return "unsigned_char";
-                break;
-        case TRICK_STRING:
-                return "string";
-                break;
-        case TRICK_SHORT:
-                return "short";
-                break;
-        case TRICK_UNSIGNED_SHORT:
-                return "unsigned_short";
-                break;
-        case TRICK_ENUMERATED:
-        case TRICK_INTEGER:
-                return "int";
-                break;
-        case TRICK_UNSIGNED_INTEGER:
-                return "unsigned_int";
-                break;
-        case TRICK_LONG:
-                return "long";
-                break;
-        case TRICK_UNSIGNED_LONG:
-                return "unsigned_long";
-                break;
-        case TRICK_FLOAT:
-                return "float";
-                break;
-        case TRICK_DOUBLE:
-                if ( single_prec_only ) {
-                        return "float";
-                }
-                else {
-                        return "double";
-                }
-                break;
-        case TRICK_BITFIELD:
-                if (item_size == sizeof(int)) {
-                        return "int";
-                } else if (item_size == sizeof(short)) {
-                        return "short";
-                } else {
-                        return "char";
-                }
-                break;
-        case TRICK_UNSIGNED_BITFIELD:
-                if (item_size == sizeof(int)) {
-                        return "unsigned_int";
-                } else if (item_size == sizeof(short)) {
-                        return "unsigned_short";
-                } else {
-                        return "unsigned_char";
-                }
-                break;
-        case TRICK_LONG_LONG:
-                return "long_long";
-                break;
-        case TRICK_UNSIGNED_LONG_LONG:
-                return "unsigned_long_long";
-                break;
-        case TRICK_BOOLEAN:
-#if ( __sun | __APPLE__ )
-                return "int";
+int	Trick::DataRecordGroup::init()	{
+
+				unsigned	int	jj	;
+				int	ret	;
+
+				//	reset	counter	here	so	we	can	"re-init"	our	recording
+				buffer_num	=	writer_num	=	total_bytes_written	=	0	;
+
+				output_dir	=	command_line_args_get_output_dir()	;
+				/*	this	is	the	common	part	of	the	record	file	name,	the	format	specific	will	add	the	correct	suffix	*/
+				file_name	=	output_dir	+	"/log_"	+	group_name	;
+
+				pthread_mutex_init(&buffer_mutex,	NULL);
+
+				//	Allocate	recording	space	for	time.
+				rec_buffer[0]->buffer	=	(char	*)calloc(max_num	,	rec_buffer[0]->ref->attr->size)	;
+				rec_buffer[0]->last_value	=	(char	*)calloc(1	,	rec_buffer[0]->ref->attr->size)	;
+
+				/*	Loop	through	all	variables	looking	up	names.		Allocate	recording	space
+							according	to	size	of	the	variable	*/
+				for	(jj	=	1;	jj	<	rec_buffer.size()	;	jj++)	{
+								Trick::DataRecordBuffer	*	drb	=	rec_buffer[jj]	;
+								if	(	drb->ref_searched	==	false	)	{
+												REF2	*	ref2	;
+
+												ref2	=	ref_attributes(drb->name.c_str())	;
+												if	(	ref2	==	NULL	||	ref2->attr	==	NULL	)	{
+																message_publish(MSG_WARNING,	"Could	not	find	Data	Record	variable	%s.\n",	drb->name.c_str())	;
+																rec_buffer.erase(rec_buffer.begin()	+	jj--)	;
+																delete	drb	;
+																continue	;
+												}	else	{
+																std::string	message;
+																if	(!isSupportedType(ref2,	message))	{
+																				message_publish(MSG_WARNING,	"%s\n",	message.c_str())	;
+																				rec_buffer.erase(rec_buffer.begin()	+	jj--)	;
+																				delete	drb	;
+																				continue	;
+																}	else	{
+																				drb->ref	=	ref2	;
+																}
+												}
+								}
+								if	(	drb->alias.compare("")	)	{
+												drb->ref->reference	=	strdup(drb->alias.c_str())	;
+								}
+								drb->last_value	=	(char	*)calloc(1	,	drb->ref->attr->size)	;
+								drb->buffer	=	(char	*)calloc(max_num	,	drb->ref->attr->size)	;
+								drb->ref_searched	=	true	;
+				}
+
+				write_header()	;
+
+				//	call	format	specific	initialization	to	open	destination	and	write	header
+				ret	=	format_specific_init()	;
+
+				//	set	the	inited	flag	to	true	when	all	initialization	is	done
+				if	(	ret	==	0	)	{
+								inited	=	true	;
+				}
+
+				return(0)	;
+
+}
+
+int	Trick::DataRecordGroup::checkpoint()	{
+				unsigned	int	jj	;
+
+				/*
+							Save	the	names	of	the	variables	and	the	aliases	to	the	checkpoint,
+							the	rest	of	the	DataRecordBuffer	will	be	reconstructed	during	restart.
+							The	first	variable	is	time	which	we	do	not	have	to	save.
+					*/
+				if	(	rec_buffer.size()	>	1	)	{
+								num_variable_names	=	rec_buffer.size()	-	1	;
+								variable_names	=	(char	**)TMM_declare_var_1d("char	*",	(int)rec_buffer.size()	-	1)	;
+								variable_alias	=	(char	**)TMM_declare_var_1d("char	*",	(int)rec_buffer.size()	-	1)	;
+
+								for	(jj	=	1;	jj	<	rec_buffer.size()	;	jj++)	{
+												Trick::DataRecordBuffer	*	drb	=	rec_buffer[jj]	;
+
+												variable_names[jj-1]	=	TMM_strdup((char	*)drb->name.c_str())	;
+												variable_alias[jj-1]	=	TMM_strdup((char	*)drb->alias.c_str())	;
+								}
+				}
+
+				/*
+							Save	the	names	of	the	change	variables	and	the	aliases	to	the	checkpoint,
+							the	rest	of	the	DataRecordBuffer	will	be	reconstructed	during	restart
+					*/
+				if	(	change_buffer.size()	>	0	)	{
+								num_change_variable_names	=	change_buffer.size()	;
+								change_variable_names	=	(char	**)TMM_declare_var_1d("char	*",	(int)change_buffer.size())	;
+								change_variable_alias	=	(char	**)TMM_declare_var_1d("char	*",	(int)change_buffer.size())	;
+
+								for	(jj	=	0;	jj	<	change_buffer.size()	;	jj++)	{
+												Trick::DataRecordBuffer	*	drb	=	change_buffer[jj]	;
+
+												change_variable_names[jj]	=	TMM_strdup((char	*)drb->name.c_str())	;
+												change_variable_alias[jj]	=	TMM_strdup((char	*)drb->alias.c_str())	;
+								}
+				}
+
+				return	0	;
+}
+
+void	Trick::DataRecordGroup::clear_checkpoint_vars()	{
+				
+				if	(	variable_names	)	{
+								for(unsigned	int	jj	=	0;	jj	<	num_variable_names;	jj++)	{
+												TMM_delete_var_a(variable_names[jj]);
+								}
+								TMM_delete_var_a(variable_names)	;
+				}
+
+				if	(	variable_alias	)	{
+								for(unsigned	int	jj	=	0;	jj	<	num_variable_names;	jj++)	{
+												TMM_delete_var_a(variable_alias[jj]);
+								}
+								TMM_delete_var_a(variable_alias)	;
+				}
+
+				if	(	change_variable_names	)	{
+								for(unsigned	int	jj	=	0;	jj	<	num_change_variable_names;	jj++)	{
+												TMM_delete_var_a(change_variable_names[jj]);
+								}
+								TMM_delete_var_a(change_variable_names)	;
+				}
+
+				if	(	change_variable_alias	)	{
+								for(unsigned	int	jj	=	0;	jj	<	num_change_variable_names;	jj++)	{
+												TMM_delete_var_a(change_variable_alias[jj]);
+								}
+								TMM_delete_var_a(change_variable_alias)	;
+				}
+
+				variable_names	=	NULL	;
+				variable_alias	=	NULL	;
+				change_variable_names	=	NULL	;
+				change_variable_alias	=	NULL	;
+				num_variable_names	=	0	;
+				num_change_variable_names	=	0	;
+}
+
+int	Trick::DataRecordGroup::restart()	{
+				std::vector	<Trick::DataRecordBuffer	*>::iterator	drb_it	;
+
+				/*	delete	the	current	rec_buffer	*/
+				for	(	drb_it	=	rec_buffer.begin()	;	drb_it	!=	rec_buffer.end()	;	++drb_it	)	{
+								delete	*drb_it	;
+				}
+				rec_buffer.clear()	;
+				/*	Add	back	the	time	variable	*/
+				add_time_variable()	;
+
+				/*	delete	the	current	change_buffer	contents	*/
+				for	(	drb_it	=	change_buffer.begin()	;	drb_it	!=	change_buffer.end()	;	++drb_it	)	{
+								delete	*drb_it	;
+				}
+				change_buffer.clear()	;
+
+				unsigned	int	jj	;
+				/*	add	the	variable	names	listed	in	the	checkpoint	file	*/
+				for	(	jj	=	0	;	jj	<	num_variable_names	;	jj++	)	{
+								add_variable(	variable_names[jj]	,	variable_alias[jj]	)	;
+				}
+				for	(	jj	=	0	;	jj	<	num_change_variable_names	;	jj++	)	{
+								add_change_variable(	change_variable_names[jj]	)	;
+				}
+
+				clear_checkpoint_vars()	;
+
+				//	set	the	write	job	class	to	what	is	in	the	checkpoint	file.
+				write_job->job_class_name	=	job_class	;
+
+				//	reset	the	sim_object	name.
+				name	=	std::string("data_record_group_")	+	group_name	;
+
+				/*	call	init	to	open	the	recording	file	and	look	up	variable	name	addresses	*/
+				init()	;
+
+				return	0	;
+}
+
+int	Trick::DataRecordGroup::write_header()	{
+
+				unsigned	int	jj	;
+				std::string	header_name	;
+				std::fstream	out_stream	;
+
+				/*!	create	the	header	file	used	by	the	GUIs	*/
+				header_name	=	output_dir	+	"/log_"	+	group_name	+	".header"	;
+
+				out_stream.open(header_name.c_str(),	std::fstream::out	)	;
+				if	(	!	out_stream		||		!	out_stream.good()	)	{
+								return	-1;
+				}
+
+				/*	Header	file	first	line	is	created	in	format	specific	header	*/
+				out_stream	<<	"log_"	<<	group_name	;
+
+				format_specific_header(out_stream)	;
+
+				/*	Output	the	file	name,	variable	size,	units,	and	variable	name
+					*	to	the	rest	of	recorded	data	header	file.
+					*	(e.g.	file_name		C_type		units		sim_name)
+					*	Note:	"sys.exec.out.time"	should	be	the	first	variable	in	the	buffer.
+					*/
+				for	(jj	=	0;	jj	<	rec_buffer.size()	;	jj++)	{
+								/*!	recording	single	data	item	*/
+								out_stream	<<	"log_"	<<	group_name	<<	"\t"
+												<<	type_string(rec_buffer[jj]->ref->attr->type,
+																											rec_buffer[jj]->ref->attr->size)	<<	"\t"
+												<<	std::setw(6)	;
+
+								if	(	rec_buffer[jj]->ref->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+												out_stream	<<	"--"	;
+								}	else	{
+												out_stream	<<	rec_buffer[jj]->ref->attr->units	;
+								}
+								out_stream	<<	"\t"	<<	rec_buffer[jj]->ref->reference	<<	std::endl	;
+				}
+
+				//	Send	all	unwritten	characters	in	the	buffer	to	its	output/file.
+				out_stream.flush()	;
+				out_stream.close()	;
+
+				return(0)	;
+
+}
+
+int	Trick::DataRecordGroup::data_record(double	in_time)	{
+
+				unsigned	int	jj	;
+				unsigned	int	buffer_offset	;
+				Trick::DataRecordBuffer	*	drb	;
+				bool	change_detected	=	false	;
+
+				//TODO:	does	not	handle	bitfields	correctly!
+				if	(	record	==	true	)	{
+								if	(	freq	!=	DR_Always	)	{
+												for	(jj	=	0;	jj	<	change_buffer.size()	;	jj++)	{
+																drb	=	change_buffer[jj]	;
+																REF2	*	ref	=	drb->ref	;
+																if	(	ref->pointer_present	==	1	)	{
+																				ref->address	=	follow_address_path(ref)	;
+																}
+																if	(	memcmp(	drb->buffer	,	drb->ref->address	,	drb->ref->attr->size)	)	{
+																				change_detected	=	true	;
+																				memcpy(	drb->buffer	,	drb->ref->address	,	drb->ref->attr->size)	;
+																}
+												}
+
+								}
+
+								if	(	freq	==	DR_Always	||	change_detected	==	true	)	{
+
+												//	If	this	is	not	the	ring	buffer	and
+												//	we	are	going	to	have	trouble	fitting	2	data	sets	then	write	the	data	now.
+												if	(	buffer_type	!=	DR_Ring_Buffer	)	{
+																if	(	buffer_num	-	writer_num	>=	(max_num	-	2)	)	{
+																				write_data(true)	;
+																}
+												}
+
+												curr_time	=	in_time	;
+
+												if	(	freq	==	DR_Changes_Step	)	{
+																buffer_offset	=	buffer_num	%	max_num	;
+																*((double	*)(rec_buffer[0]->last_value))	=	in_time	;
+																for	(jj	=	0;	jj	<	rec_buffer.size()	;	jj++)	{
+																				drb	=	rec_buffer[jj]	;
+																				REF2	*	ref	=	drb->ref	;
+																				int	param_size	=	ref->attr->size	;
+																				if	(	buffer_offset	==	0	)	{
+																							drb->curr_buffer	=	drb->buffer	;
+																				}	else	{
+																							drb->curr_buffer	+=	param_size	;
+																				}
+																				switch	(	param_size	)	{
+																								case	8:
+																												*(int64_t	*)drb->curr_buffer	=	*(int64_t	*)drb->last_value	;
+																												break	;
+																								case	4:
+																												*(int32_t	*)drb->curr_buffer	=	*(int32_t	*)drb->last_value	;
+																												break	;
+																								case	2:
+																												*(int16_t	*)drb->curr_buffer	=	*(int16_t	*)drb->last_value	;
+																												break	;
+																								case	1:
+																												*(int8_t	*)drb->curr_buffer	=	*(int8_t	*)drb->last_value	;
+																												break	;
+																								default:
+																												memcpy(	drb->curr_buffer	,	drb->last_value	,	param_size	)	;
+																												break	;
+																				}
+																}
+																buffer_num++	;
+												}
+
+												buffer_offset	=	buffer_num	%	max_num	;
+												for	(jj	=	0;	jj	<	rec_buffer.size()	;	jj++)	{
+																drb	=	rec_buffer[jj]	;
+																REF2	*	ref	=	drb->ref	;
+																if	(	ref->pointer_present	==	1	)	{
+																				ref->address	=	follow_address_path(ref)	;
+																}
+																int	param_size	=	ref->attr->size	;
+																if	(	buffer_offset	==	0	)	{
+																			drb->curr_buffer	=	drb->buffer	;
+																}	else	{
+																			drb->curr_buffer	+=	param_size	;
+																}
+																switch	(	param_size	)	{
+																				case	8:
+																								*(int64_t	*)drb->curr_buffer	=	*(int64_t	*)ref->address	;
+																								break	;
+																				case	4:
+																								*(int32_t	*)drb->curr_buffer	=	*(int32_t	*)ref->address	;
+																								break	;
+																				case	2:
+																								*(int16_t	*)drb->curr_buffer	=	*(int16_t	*)ref->address	;
+																								break	;
+																				case	1:
+																								*(int8_t	*)drb->curr_buffer	=	*(int8_t	*)ref->address	;
+																								break	;
+																				default:
+																								memcpy(	drb->curr_buffer	,	ref->address	,	param_size	)	;
+																								break	;
+																}
+												}
+												buffer_num++	;
+								}
+				}
+
+				return(0)	;
+
+}
+
+int	Trick::DataRecordGroup::write_data(bool	must_write)	{
+
+				unsigned	int	local_buffer_num	;
+				unsigned	int	num_to_write	;
+				unsigned	int	writer_offset	;
+
+				if	(	record	and	inited	and	(buffer_type	==	DR_No_Buffer	or	must_write)	and	(total_bytes_written	<=	max_file_size))	{
+
+								//	buffer_mutex	is	used	in	this	one	place	to	prevent	forced	calls	of	write_data
+								//	to	not	overwrite	data	being	written	by	the	asynchronous	thread.
+								pthread_mutex_lock(&buffer_mutex)	;
+
+								local_buffer_num	=	buffer_num	;
+								if	(	(local_buffer_num	-	writer_num)	>	max_num	)	{
+												num_to_write	=	max_num	;
+								}	else	{
+												num_to_write	=	(local_buffer_num	-	writer_num)	;
+								}
+								writer_num	=	local_buffer_num	-	num_to_write	;
+
+								//!	This	loop	pulls	a	"row"	of	time	homogeneous	data	and	writes	it	to	the	file
+								while	(	writer_num	!=	local_buffer_num	)	{
+
+												writer_offset	=	writer_num	%	max_num	;
+												//!	keep	record	of	bytes	written	to	file.	Default	max	is	1GB
+												total_bytes_written	+=	format_specific_write_data(writer_offset)	;
+												writer_num++	;
+
+								}
+
+								if(!max_size_warning	&&	(total_bytes_written	>	max_file_size))	{
+												std::cerr	<<	"WARNING:	Data	record	max	file	size	"	<<	(static_cast<double>(max_file_size))/(1<<20)	<<	"MB	reached.\n"
+												"https://nasa.github.io/trick/documentation/simulation_capabilities/Data-Record#changing-the-max-file-size-of-a-data-record-group-ascii-and-binary-only"	
+												<<	std::endl;
+												max_size_warning	=	true;
+								}
+
+								pthread_mutex_unlock(&buffer_mutex)	;
+
+				}
+
+				return	0	;
+}
+
+int	Trick::DataRecordGroup::enable()	{
+				record	=	true	;
+				return(0)	;
+}
+
+int	Trick::DataRecordGroup::disable()	{
+				record	=	false	;
+				return(0)	;
+}
+
+int	Trick::DataRecordGroup::shutdown()	{
+
+				//	Force	write	out	all	data
+				record	=	true	;	//	If	user	disabled	group,	make	sure	any	recorded	data	gets	written	out
+				write_data(true)	;
+				format_specific_shutdown()	;
+
+				remove_all_variables();
+
+				//	remove_all_variables	does	not	remove	sim	time
+				if(!rec_buffer.empty()){
+								delete	rec_buffer[0];
+								rec_buffer.clear();
+				}
+
+				if	(	writer_buff	)	{
+								free(writer_buff)	;
+								writer_buff	=	NULL	;
+				}
+
+				return	0	;
+}
+
+std::string	Trick::DataRecordGroup::type_string(	int	item_type,	int	item_size	)	{
+				switch	(item_type)	{
+								case	TRICK_CHARACTER:
+																return	"char";
+																break;
+								case	TRICK_UNSIGNED_CHARACTER:
+																return	"unsigned_char";
+																break;
+								case	TRICK_STRING:
+																return	"string";
+																break;
+								case	TRICK_SHORT:
+																return	"short";
+																break;
+								case	TRICK_UNSIGNED_SHORT:
+																return	"unsigned_short";
+																break;
+								case	TRICK_ENUMERATED:
+								case	TRICK_INTEGER:
+																return	"int";
+																break;
+								case	TRICK_UNSIGNED_INTEGER:
+																return	"unsigned_int";
+																break;
+								case	TRICK_LONG:
+																return	"long";
+																break;
+								case	TRICK_UNSIGNED_LONG:
+																return	"unsigned_long";
+																break;
+								case	TRICK_FLOAT:
+																return	"float";
+																break;
+								case	TRICK_DOUBLE:
+																if	(	single_prec_only	)	{
+																								return	"float";
+																}
+																else	{
+																								return	"double";
+																}
+																break;
+								case	TRICK_BITFIELD:
+																if	(item_size	==	sizeof(int))	{
+																								return	"int";
+																}	else	if	(item_size	==	sizeof(short))	{
+																								return	"short";
+																}	else	{
+																								return	"char";
+																}
+																break;
+								case	TRICK_UNSIGNED_BITFIELD:
+																if	(item_size	==	sizeof(int))	{
+																								return	"unsigned_int";
+																}	else	if	(item_size	==	sizeof(short))	{
+																								return	"unsigned_short";
+																}	else	{
+																								return	"unsigned_char";
+																}
+																break;
+								case	TRICK_LONG_LONG:
+																return	"long_long";
+																break;
+								case	TRICK_UNSIGNED_LONG_LONG:
+																return	"unsigned_long_long";
+																break;
+								case	TRICK_BOOLEAN:
+#if	(	__sun	|	__APPLE__	)
+																return	"int";
 #else
-                return "unsigned_char";
+																return	"unsigned_char";
 #endif
-                break;
-    }
-    return "";
+																break;
+				}
+				return	"";
 }
 
diff --git a/trick_source/sim_services/DataRecord/data_record_utilities.cpp b/trick_source/sim_services/DataRecord/data_record_utilities.cpp
index 479ac758d..cd5645dda 100644
--- a/trick_source/sim_services/DataRecord/data_record_utilities.cpp
+++ b/trick_source/sim_services/DataRecord/data_record_utilities.cpp
@@ -1,94 +1,94 @@
 /*
 PURPOSE:
-    (Data recording access functions)
+				(Data	recording	access	functions)
 PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom Corp) (3/96) (SES upgrades)
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+					(((Robert	W.	Bailey)	(LinCom	Corp)	(3/96)	(SES	upgrades)
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include "trick/data_record_proto.h"
-#include "trick/DataRecordDispatcher.hh"
-#include "trick/DataRecordGroup.hh"
+#include	"trick/data_record_proto.h"
+#include	"trick/DataRecordDispatcher.hh"
+#include	"trick/DataRecordGroup.hh"
 
-extern Trick::DataRecordDispatcher * the_drd  ;
+extern	Trick::DataRecordDispatcher	*	the_drd		;
 
-extern "C" int dr_remove_files(void) {
-    if ( the_drd != NULL ) {
-        return the_drd->remove_files() ;
-    }
-    return -1 ;
+extern	"C"	int	dr_remove_files(void)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->remove_files()	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_enable(void) {
-    if ( the_drd != NULL ) {
-        return the_drd->enable() ;
-    }
-    return -1 ;
+extern	"C"	int	dr_enable(void)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->enable()	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_enable_group( const char * in_name ) {
-    if ( the_drd != NULL ) {
-        return the_drd->enable( in_name ) ;
-    }
-    return -1 ;
+extern	"C"	int	dr_enable_group(	const	char	*	in_name	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->enable(	in_name	)	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_disable(void) {
-    if ( the_drd != NULL ) {
-        return the_drd->disable() ;
-    }
-    return -1 ;
+extern	"C"	int	dr_disable(void)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->disable()	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_disable_group( const char * in_name ) {
-    if ( the_drd != NULL ) {
-        return the_drd->disable( in_name ) ;
-    }
-    return -1 ;
+extern	"C"	int	dr_disable_group(	const	char	*	in_name	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->disable(	in_name	)	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_record_now_group( const char * in_name ) {
-    if ( the_drd != NULL ) {
-        return the_drd->record_now_group( in_name ) ;
-    }
-    return -1 ;
+extern	"C"	int	dr_record_now_group(	const	char	*	in_name	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->record_now_group(	in_name	)	;
+				}
+				return	-1	;
 }
 
-extern "C" int add_data_record_group( Trick::DataRecordGroup * in_group, Trick::DR_Buffering buffering ) {
-    if ( the_drd != NULL ) {
-        return the_drd->add_group(in_group, buffering) ;
-    }
-    return -1 ;
+extern	"C"	int	add_data_record_group(	Trick::DataRecordGroup	*	in_group,	Trick::DR_Buffering	buffering	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->add_group(in_group,	buffering)	;
+				}
+				return	-1	;
 }
 
-extern "C" int remove_data_record_group( Trick::DataRecordGroup * in_group ) {
-    if ( the_drd != NULL ) {
-        return the_drd->remove_group(in_group) ;
-    }
-    return -1 ;
+extern	"C"	int	remove_data_record_group(	Trick::DataRecordGroup	*	in_group	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->remove_group(in_group)	;
+				}
+				return	-1	;
 }
 
-extern "C" void remove_all_data_record_groups(void) {
-    the_drd->remove_all_groups() ;
+extern	"C"	void	remove_all_data_record_groups(void)	{
+				the_drd->remove_all_groups()	;
 }
 
-extern "C" Trick::DataRecordGroup * get_data_record_group( std::string in_name ) {
-    if ( the_drd != NULL ) {
-        return the_drd->get_group(in_name) ;
-    }
-    return NULL ;
+extern	"C"	Trick::DataRecordGroup	*	get_data_record_group(	std::string	in_name	)	{
+				if	(	the_drd	!=	NULL	)	{
+								return	the_drd->get_group(in_name)	;
+				}
+				return	NULL	;
 }
 
-extern "C" int set_max_size_record_group (const char * in_name, uint64_t bytes ) {
-    if ( the_drd != NULL ) {
-    return the_drd->set_group_max_file_size(in_name, bytes ) ;
-    }
-    return -1 ;
+extern	"C"	int	set_max_size_record_group	(const	char	*	in_name,	uint64_t	bytes	)	{
+				if	(	the_drd	!=	NULL	)	{
+				return	the_drd->set_group_max_file_size(in_name,	bytes	)	;
+				}
+				return	-1	;
 }
 
-extern "C" int dr_set_max_file_size ( uint64_t bytes ) {
-    if ( the_drd != NULL ) {
-    return the_drd->set_max_file_size( bytes ) ;
-    }
-    return -1 ;
+extern	"C"	int	dr_set_max_file_size	(	uint64_t	bytes	)	{
+				if	(	the_drd	!=	NULL	)	{
+				return	the_drd->set_max_file_size(	bytes	)	;
+				}
+				return	-1	;
 }
diff --git a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
index 6e3ba14da..62b74a7ae 100644
--- a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
+++ b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
@@ -1,408 +1,408 @@
-#include "AllocInfo.hh"
-#include "PointerDataType.hh"
-#include "ArrayDataType.hh"
-#include "CompositeDataType.hh"
-#include "NormalStructMember.hh"
-#include "StaticStructMember.hh"
-#include "TypeDictionary.hh"
-#include "ChkPtAgent.hh"
-#include "MemMgr.hh"
-#include "ParsedDeclaration.hh"
-#include <sstream>
-#include <string.h> // for memcpy
-
-const std::string AllocInfo::localPrefix = "trick_local_";
-const std::string AllocInfo::externPrefix = "trick_extern_";
-unsigned int AllocInfo::nextSerialNumber = 0;
-
-// PRIVATE MEMBER FUNCTION
-void AllocInfo::initialize( const std::string& varName,
-                            const std::string& typeSpecName,
-                            unsigned int       dimsCount,
-                            int *              dims,
-                            TypeDictionary*    typeDictionary,
-                            void*              suppliedAllocation)  {
-
-    // Because they can be resized, all allocations are really arrays,
-    // whether they have 0, 1, or many elements.
-    name = varName;
-    typeSpecifierName = typeSpecName;
-
-    // If it's not specified as an array, then make it an array of 1.
-    if ((dimsCount == 0) || (dims[0] < 0)) {
-        for( int ii=0 ; ii < dimsCount ; ii++ ) {
-            dimensions[ii+1] = dims[ii];
-        }
-        dimensionsCount = dimsCount + 1;
-        dimensions[0] = 1;
-    } else {
-        dimensionsCount = dimsCount;
-        for( int ii=0; ii < dimensionsCount ; ii++ ) {
-            dimensions[ii] = dims[ii];
-        }
-    }
-
-    ownDataType = new ArrayDataType( typeDictionary, typeSpecifierName, dimensionsCount, dimensions);
-
-    if (ownDataType->validate()) {
-        if (ownDataType->getSize() > 0 ) {   // FIXME: Is this correct? Shouldn't it be: ( ownDataType->getSubType()->getSize() > 0 ) ?
-            dataType = ownDataType;
-        } else {
-            std::stringstream errorStream ;
-            errorStream << "ERROR: Data type \"" << ownDataType->makeDeclaration( name, true)
-                        << "\" is a useless type because it's size can only ever be 0."
-                        << std::endl;
-            delete ownDataType;
-            throw std::logic_error( errorStream.str());
-        }
-    } else {
-        std::stringstream errorStream ;
-        errorStream << "ERROR: Data type \"" << ownDataType->makeDeclaration( name, true)
-                    << "\" can not be validated. Perhaps the typespecifier \""
-                    << typeSpecifierName << "\" is mis-spelled?"
-                    << std::endl;
-        delete ownDataType;
-        throw std::logic_error( errorStream.str());
-    }
-
-    if ( suppliedAllocation != 0 ) {
-        start = suppliedAllocation;
-        storageClass = StorageClass::EXTERN;
-    } else {
-//        start = dataType->createInstance( dimensions[0] );
-        start = dataType->createInstance(1);
-        storageClass = StorageClass::LOCAL;
-    }
-
-    serialNumber = nextSerialNumber;
-    nextSerialNumber ++ ;
-
-    end = (char*)start + dataType->getSize();
+#include	"AllocInfo.hh"
+#include	"PointerDataType.hh"
+#include	"ArrayDataType.hh"
+#include	"CompositeDataType.hh"
+#include	"NormalStructMember.hh"
+#include	"StaticStructMember.hh"
+#include	"TypeDictionary.hh"
+#include	"ChkPtAgent.hh"
+#include	"MemMgr.hh"
+#include	"ParsedDeclaration.hh"
+#include	<sstream>
+#include	<string.h>	//	for	memcpy
+
+const	std::string	AllocInfo::localPrefix	=	"trick_local_";
+const	std::string	AllocInfo::externPrefix	=	"trick_extern_";
+unsigned	int	AllocInfo::nextSerialNumber	=	0;
+
+//	PRIVATE	MEMBER	FUNCTION
+void	AllocInfo::initialize(	const	std::string&	varName,
+																												const	std::string&	typeSpecName,
+																												unsigned	int							dimsCount,
+																												int	*														dims,
+																												TypeDictionary*				typeDictionary,
+																												void*														suppliedAllocation)		{
+
+				//	Because	they	can	be	resized,	all	allocations	are	really	arrays,
+				//	whether	they	have	0,	1,	or	many	elements.
+				name	=	varName;
+				typeSpecifierName	=	typeSpecName;
+
+				//	If	it's	not	specified	as	an	array,	then	make	it	an	array	of	1.
+				if	((dimsCount	==	0)	||	(dims[0]	<	0))	{
+								for(	int	ii=0	;	ii	<	dimsCount	;	ii++	)	{
+												dimensions[ii+1]	=	dims[ii];
+								}
+								dimensionsCount	=	dimsCount	+	1;
+								dimensions[0]	=	1;
+				}	else	{
+								dimensionsCount	=	dimsCount;
+								for(	int	ii=0;	ii	<	dimensionsCount	;	ii++	)	{
+												dimensions[ii]	=	dims[ii];
+								}
+				}
+
+				ownDataType	=	new	ArrayDataType(	typeDictionary,	typeSpecifierName,	dimensionsCount,	dimensions);
+
+				if	(ownDataType->validate())	{
+								if	(ownDataType->getSize()	>	0	)	{			//	FIXME:	Is	this	correct?	Shouldn't	it	be:	(	ownDataType->getSubType()->getSize()	>	0	)	?
+												dataType	=	ownDataType;
+								}	else	{
+												std::stringstream	errorStream	;
+												errorStream	<<	"ERROR:	Data	type	\""	<<	ownDataType->makeDeclaration(	name,	true)
+																								<<	"\"	is	a	useless	type	because	it's	size	can	only	ever	be	0."
+																								<<	std::endl;
+												delete	ownDataType;
+												throw	std::logic_error(	errorStream.str());
+								}
+				}	else	{
+								std::stringstream	errorStream	;
+								errorStream	<<	"ERROR:	Data	type	\""	<<	ownDataType->makeDeclaration(	name,	true)
+																				<<	"\"	can	not	be	validated.	Perhaps	the	typespecifier	\""
+																				<<	typeSpecifierName	<<	"\"	is	mis-spelled?"
+																				<<	std::endl;
+								delete	ownDataType;
+								throw	std::logic_error(	errorStream.str());
+				}
+
+				if	(	suppliedAllocation	!=	0	)	{
+								start	=	suppliedAllocation;
+								storageClass	=	StorageClass::EXTERN;
+				}	else	{
+//								start	=	dataType->createInstance(	dimensions[0]	);
+								start	=	dataType->createInstance(1);
+								storageClass	=	StorageClass::LOCAL;
+				}
+
+				serialNumber	=	nextSerialNumber;
+				nextSerialNumber	++	;
+
+				end	=	(char*)start	+	dataType->getSize();
 }
 
-// CONSTRUCTOR
-AllocInfo::AllocInfo( const std::string& varName,
-                      const std::string& typeSpecName,
-                      unsigned int       dimsCount,
-                      int *              dims,
-                      TypeDictionary*    typeDictionary,
-                      void*              suppliedAllocation)  {
+//	CONSTRUCTOR
+AllocInfo::AllocInfo(	const	std::string&	varName,
+																						const	std::string&	typeSpecName,
+																						unsigned	int							dimsCount,
+																						int	*														dims,
+																						TypeDictionary*				typeDictionary,
+																						void*														suppliedAllocation)		{
 
-    initialize(varName, typeSpecName, dimsCount, dims, typeDictionary, suppliedAllocation);
+				initialize(varName,	typeSpecName,	dimsCount,	dims,	typeDictionary,	suppliedAllocation);
 }
 
-// CONSTRUCTOR
-AllocInfo::AllocInfo( const std::string& declaration,
-                      TypeDictionary*    typeDictionary,
-                      void*              suppliedAllocation)  {
-
-    int dims[TRICK_MAX_INDEX];
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration( declaration );
-
-    std::string variableName = parsedDeclaration->getVariableName();
-    std::string typeSpecifier = parsedDeclaration->getTypeSpecifier();
-    unsigned int dimsCount = parsedDeclaration->getNumberOfDimensions();
-    for (int ii=0 ; ii<dimsCount ; ii++ ) {
-        dims[ii] = parsedDeclaration->getDimensionSize(ii);
-    }
-    initialize(variableName, typeSpecifier, dimsCount, dims, typeDictionary, suppliedAllocation);
+//	CONSTRUCTOR
+AllocInfo::AllocInfo(	const	std::string&	declaration,
+																						TypeDictionary*				typeDictionary,
+																						void*														suppliedAllocation)		{
+
+				int	dims[TRICK_MAX_INDEX];
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration(	declaration	);
+
+				std::string	variableName	=	parsedDeclaration->getVariableName();
+				std::string	typeSpecifier	=	parsedDeclaration->getTypeSpecifier();
+				unsigned	int	dimsCount	=	parsedDeclaration->getNumberOfDimensions();
+				for	(int	ii=0	;	ii<dimsCount	;	ii++	)	{
+								dims[ii]	=	parsedDeclaration->getDimensionSize(ii);
+				}
+				initialize(variableName,	typeSpecifier,	dimsCount,	dims,	typeDictionary,	suppliedAllocation);
 }
 
-// DESTRUCTOR
-AllocInfo::~AllocInfo() {
-    if (ownDataType != (DataType*)NULL) {
-        delete ownDataType;
-    }
-    // FIXME: what about the allocation?
+//	DESTRUCTOR
+AllocInfo::~AllocInfo()	{
+				if	(ownDataType	!=	(DataType*)NULL)	{
+								delete	ownDataType;
+				}
+				//	FIXME:	what	about	the	allocation?
 }
 
-// PUBLIC MEMBER FUNCTION
-std::string AllocInfo::getName() const {
-    return name;
+//	PUBLIC	MEMBER	FUNCTION
+std::string	AllocInfo::getName()	const	{
+				return	name;
 }
 
-// PUBLIC MEMBER FUNCTION
-std::string AllocInfo::getSerialName() const {
-    std::ostringstream oss;
-    if (storageClass == StorageClass::LOCAL) {
-        oss << localPrefix << serialNumber ;
-    } else {
-        oss << externPrefix << serialNumber ;
-    }
-    return oss.str();
+//	PUBLIC	MEMBER	FUNCTION
+std::string	AllocInfo::getSerialName()	const	{
+				std::ostringstream	oss;
+				if	(storageClass	==	StorageClass::LOCAL)	{
+								oss	<<	localPrefix	<<	serialNumber	;
+				}	else	{
+								oss	<<	externPrefix	<<	serialNumber	;
+				}
+				return	oss.str();
 }
 
-// PUBLIC MEMBER FUNCTION
-unsigned int AllocInfo::getSerialNumber() const {
-    return serialNumber;
+//	PUBLIC	MEMBER	FUNCTION
+unsigned	int	AllocInfo::getSerialNumber()	const	{
+				return	serialNumber;
 }
 
-// PUBLIC MEMBER FUNCTION
-void* AllocInfo::getStart() const {
-    return start;
+//	PUBLIC	MEMBER	FUNCTION
+void*	AllocInfo::getStart()	const	{
+				return	start;
 }
 
-// PUBLIC MEMBER FUNCTION
-int AllocInfo::getSize() const {
-    return dataType->getSize();
+//	PUBLIC	MEMBER	FUNCTION
+int	AllocInfo::getSize()	const	{
+				return	dataType->getSize();
 }
 
-// PUBLIC MEMBER FUNCTION
-std::string AllocInfo::getTypeSpecifierName() const {
-    return typeSpecifierName;
+//	PUBLIC	MEMBER	FUNCTION
+std::string	AllocInfo::getTypeSpecifierName()	const	{
+				return	typeSpecifierName;
 }
 
-// PUBLIC MEMBER FUNCTION
-unsigned int AllocInfo::getDimensionsCount() const {
-    return dimensionsCount;
+//	PUBLIC	MEMBER	FUNCTION
+unsigned	int	AllocInfo::getDimensionsCount()	const	{
+				return	dimensionsCount;
 }
 
-// PUBLIC MEMBER FUNCTION
-int AllocInfo::getDimensionSize(unsigned int n) const {
-    if ( n < dimensionsCount ) {
-        return dimensions[n];
-    } else {
-        return 0;
-    }
+//	PUBLIC	MEMBER	FUNCTION
+int	AllocInfo::getDimensionSize(unsigned	int	n)	const	{
+				if	(	n	<	dimensionsCount	)	{
+								return	dimensions[n];
+				}	else	{
+								return	0;
+				}
 }
 
-// PUBLIC MEMBER FUNCTION
-const DataType * AllocInfo::getDataType() const {
-    const DataType * returnType;
-    if ( ownDataType->getElementCount() == 1 ) {
-        returnType = ownDataType->getSubType();
-    } else {
-        returnType = ownDataType;
-    }
-    return returnType;
+//	PUBLIC	MEMBER	FUNCTION
+const	DataType	*	AllocInfo::getDataType()	const	{
+				const	DataType	*	returnType;
+				if	(	ownDataType->getElementCount()	==	1	)	{
+								returnType	=	ownDataType->getSubType();
+				}	else	{
+								returnType	=	ownDataType;
+				}
+				return	returnType;
 }
 
-// PUBLIC MEMBER FUNCTION
-StorageClass::e AllocInfo::getStorageClass() const {
-    return storageClass;
+//	PUBLIC	MEMBER	FUNCTION
+StorageClass::e	AllocInfo::getStorageClass()	const	{
+				return	storageClass;
 }
 
-// PUBLIC MEMBER FUNCTION
-void AllocInfo::clear() const {
-    dataType->clearValue(start);
+//	PUBLIC	MEMBER	FUNCTION
+void	AllocInfo::clear()	const	{
+				dataType->clearValue(start);
 }
 
-// PUBLIC MEMBER FUNCTION
-void* AllocInfo::resize( size_t newElementCount ) {
-
-    // We should not attempt to resize memory objects that were supplied
-    // to us. We should only attempt to resize objects that we created.
-    if ( storageClass != StorageClass::LOCAL ) {
-        // ERROR CONDITION
-        return NULL;
-    }
-    ArrayDataType* oldType = ownDataType;
-    void * oldMemoryObject = start;
-    size_t oldByteCount = oldType->getSize();
-
-    ArrayDataType* newType = new ArrayDataType( *oldType, newElementCount );
-    void * newMemoryObject = newType->createInstance(1);
-    size_t newByteCount = newType->getSize();
-
-    size_t minByteCount;
-    if ( oldByteCount < newByteCount ) {
-        minByteCount = oldByteCount;
-    } else {
-        minByteCount = newByteCount;
-    }
-
-    if (minByteCount > 0) {
-        memcpy( newMemoryObject, oldMemoryObject, minByteCount);
-    }
-
-    delete oldType;
-    oldType->deleteInstance( oldMemoryObject );
-    start = newMemoryObject;
-    end = (char*)start + newType->getSize();
-    ownDataType = newType;
-    dataType = newType;
-    dimensions[0] = newElementCount;
-    return start;
+//	PUBLIC	MEMBER	FUNCTION
+void*	AllocInfo::resize(	size_t	newElementCount	)	{
+
+				//	We	should	not	attempt	to	resize	memory	objects	that	were	supplied
+				//	to	us.	We	should	only	attempt	to	resize	objects	that	we	created.
+				if	(	storageClass	!=	StorageClass::LOCAL	)	{
+								//	ERROR	CONDITION
+								return	NULL;
+				}
+				ArrayDataType*	oldType	=	ownDataType;
+				void	*	oldMemoryObject	=	start;
+				size_t	oldByteCount	=	oldType->getSize();
+
+				ArrayDataType*	newType	=	new	ArrayDataType(	*oldType,	newElementCount	);
+				void	*	newMemoryObject	=	newType->createInstance(1);
+				size_t	newByteCount	=	newType->getSize();
+
+				size_t	minByteCount;
+				if	(	oldByteCount	<	newByteCount	)	{
+								minByteCount	=	oldByteCount;
+				}	else	{
+								minByteCount	=	newByteCount;
+				}
+
+				if	(minByteCount	>	0)	{
+								memcpy(	newMemoryObject,	oldMemoryObject,	minByteCount);
+				}
+
+				delete	oldType;
+				oldType->deleteInstance(	oldMemoryObject	);
+				start	=	newMemoryObject;
+				end	=	(char*)start	+	newType->getSize();
+				ownDataType	=	newType;
+				dataType	=	newType;
+				dimensions[0]	=	newElementCount;
+				return	start;
 }
 
-// PUBLIC MEMBER FUNCTION
-bool AllocInfo::contains(void* address) const {
+//	PUBLIC	MEMBER	FUNCTION
+bool	AllocInfo::contains(void*	address)	const	{
 
-    if (( address >= start) && (address <= end)) {
-        return true;
-    }
-    return false;
+				if	((	address	>=	start)	&&	(address	<=	end))	{
+								return	true;
+				}
+				return	false;
 }
 
-// PUBLIC MEMBER FUNCTION
-void AllocInfo::appendDependenciesfromComposite( const CompositeDataType * compDataType,
-                                                 void *address,
-                                                 MemMgr* memMgr,
-                                                 std::vector<AllocInfo*>& dependencies) {
-
-    int memberCount = compDataType->getMemberCount();
-
-    for (int ii = 0; ii < memberCount; ii++) {
-
-        StructMember* structMember = compDataType->getStructMember(ii);
-        //int ioControl = structMember->getIoControl();
-        int ioControl = 1; // FIXME
-
-        if ( ioControl == 1 || ioControl == 3) {
-
-            // Get the Member address.
-            char *memberAddress;
-            const DataType* memberDataType;
-
-            NormalStructMember* normalStructMember = dynamic_cast<NormalStructMember*>(structMember);
-            if ( normalStructMember ) {
-               memberAddress = (char*)address + normalStructMember->getOffset();
-               memberDataType = normalStructMember->getDataType();
-            } else {
-                StaticStructMember* staticStructMember = dynamic_cast<StaticStructMember*>(structMember);
-                if ( staticStructMember ) {
-                    memberAddress =  (char*)staticStructMember->getAddress();
-                    memberDataType = staticStructMember->getDataType();
-                } else {
-                    memberAddress =  NULL; // For a bitfield.
-                    memberDataType = NULL;
-                }
-            }
-            if (memberAddress != NULL)  {
-                const ArrayDataType* memberArrayDataType = dynamic_cast<const ArrayDataType*>(memberDataType);
-                if ( memberArrayDataType ) {
-                    appendDependenciesfromArray( memberArrayDataType, memberAddress, memMgr, dependencies);
-                } else {
-                    const CompositeDataType* memberCompositeDataType = dynamic_cast<const CompositeDataType*>(memberDataType);
-                    if ( memberCompositeDataType ) {
-                        appendDependenciesfromComposite( memberCompositeDataType, memberAddress, memMgr, dependencies);
-                    }
-                }
-            }
-        }
-    }
+//	PUBLIC	MEMBER	FUNCTION
+void	AllocInfo::appendDependenciesfromComposite(	const	CompositeDataType	*	compDataType,
+																																																	void	*address,
+																																																	MemMgr*	memMgr,
+																																																	std::vector<AllocInfo*>&	dependencies)	{
+
+				int	memberCount	=	compDataType->getMemberCount();
+
+				for	(int	ii	=	0;	ii	<	memberCount;	ii++)	{
+
+								StructMember*	structMember	=	compDataType->getStructMember(ii);
+								//int	ioControl	=	structMember->getIoControl();
+								int	ioControl	=	1;	//	FIXME
+
+								if	(	ioControl	==	1	||	ioControl	==	3)	{
+
+												//	Get	the	Member	address.
+												char	*memberAddress;
+												const	DataType*	memberDataType;
+
+												NormalStructMember*	normalStructMember	=	dynamic_cast<NormalStructMember*>(structMember);
+												if	(	normalStructMember	)	{
+															memberAddress	=	(char*)address	+	normalStructMember->getOffset();
+															memberDataType	=	normalStructMember->getDataType();
+												}	else	{
+																StaticStructMember*	staticStructMember	=	dynamic_cast<StaticStructMember*>(structMember);
+																if	(	staticStructMember	)	{
+																				memberAddress	=		(char*)staticStructMember->getAddress();
+																				memberDataType	=	staticStructMember->getDataType();
+																}	else	{
+																				memberAddress	=		NULL;	//	For	a	bitfield.
+																				memberDataType	=	NULL;
+																}
+												}
+												if	(memberAddress	!=	NULL)		{
+																const	ArrayDataType*	memberArrayDataType	=	dynamic_cast<const	ArrayDataType*>(memberDataType);
+																if	(	memberArrayDataType	)	{
+																				appendDependenciesfromArray(	memberArrayDataType,	memberAddress,	memMgr,	dependencies);
+																}	else	{
+																				const	CompositeDataType*	memberCompositeDataType	=	dynamic_cast<const	CompositeDataType*>(memberDataType);
+																				if	(	memberCompositeDataType	)	{
+																								appendDependenciesfromComposite(	memberCompositeDataType,	memberAddress,	memMgr,	dependencies);
+																				}
+																}
+												}
+								}
+				}
 }
 
-// PUBLIC MEMBER FUNCTION
-void AllocInfo::appendDependenciesfromArray( const ArrayDataType* arrayDataType,
-                                             void* address,
-                                             MemMgr* memMgr,
-                                             std::vector<AllocInfo*>& dependencies) {
-
-    int elementCount = arrayDataType->getElementCount();
-    if ( elementCount == 0 ) {
-        void* ptr = *(void**)address;
-        AllocInfo* allocInfo = memMgr->getAllocInfoOf(ptr);
-        allocInfo->appendDependencies( memMgr, dependencies );
-    } else if ( arrayDataType->containsPointers() ){
-        const DataType* elementType = arrayDataType->getSubType();
-        int elementTypeSize = elementType->getSize();
-        const ArrayDataType* memberArrayDataType = dynamic_cast<const ArrayDataType*>(elementType);
-        if ( memberArrayDataType ) {
-            for (int ii=0; ii < elementCount; ii++) {
-                void * elementAddress = (char*) address + (ii * elementTypeSize );
-                appendDependenciesfromArray( memberArrayDataType, elementAddress, memMgr, dependencies);
-            }
-        } else {
-            const CompositeDataType* memberCompositeDataType = dynamic_cast<const CompositeDataType*>(elementType);
-            if ( memberCompositeDataType ) {
-                for (int ii=0; ii < elementCount; ii++) {
-                    void * elementAddress = (char*) address + (ii * elementTypeSize );
-                    appendDependenciesfromComposite( memberCompositeDataType, elementAddress, memMgr, dependencies);
-                }
-            }
-        }
-    }
+//	PUBLIC	MEMBER	FUNCTION
+void	AllocInfo::appendDependenciesfromArray(	const	ArrayDataType*	arrayDataType,
+																																													void*	address,
+																																													MemMgr*	memMgr,
+																																													std::vector<AllocInfo*>&	dependencies)	{
+
+				int	elementCount	=	arrayDataType->getElementCount();
+				if	(	elementCount	==	0	)	{
+								void*	ptr	=	*(void**)address;
+								AllocInfo*	allocInfo	=	memMgr->getAllocInfoOf(ptr);
+								allocInfo->appendDependencies(	memMgr,	dependencies	);
+				}	else	if	(	arrayDataType->containsPointers()	){
+								const	DataType*	elementType	=	arrayDataType->getSubType();
+								int	elementTypeSize	=	elementType->getSize();
+								const	ArrayDataType*	memberArrayDataType	=	dynamic_cast<const	ArrayDataType*>(elementType);
+								if	(	memberArrayDataType	)	{
+												for	(int	ii=0;	ii	<	elementCount;	ii++)	{
+																void	*	elementAddress	=	(char*)	address	+	(ii	*	elementTypeSize	);
+																appendDependenciesfromArray(	memberArrayDataType,	elementAddress,	memMgr,	dependencies);
+												}
+								}	else	{
+												const	CompositeDataType*	memberCompositeDataType	=	dynamic_cast<const	CompositeDataType*>(elementType);
+												if	(	memberCompositeDataType	)	{
+																for	(int	ii=0;	ii	<	elementCount;	ii++)	{
+																				void	*	elementAddress	=	(char*)	address	+	(ii	*	elementTypeSize	);
+																				appendDependenciesfromComposite(	memberCompositeDataType,	elementAddress,	memMgr,	dependencies);
+																}
+												}
+								}
+				}
 }
 
-// PUBLIC MEMBER FUNCTION
-void AllocInfo::appendDependencies( MemMgr* memMgr, std::vector<AllocInfo*>& dependencies ) {
-
-    bool found = false;
-    int n_depends = dependencies.size();
-
-    // Search through the dependencies to see if "this" is in it.
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        if (dependencies[ii] == this) {
-            found = true;
-            return;
-        }
-    }
-
-    if (!found) {
-        // An allocation is dependent on itself.
-        dependencies.push_back(this);
-        const CompositeDataType* compositeDataType = dynamic_cast<const CompositeDataType *>(dataType);
-        if (compositeDataType) {
-            // Get the dependencies in the allocation of the composite type.
-            appendDependenciesfromComposite( compositeDataType, start, memMgr, dependencies );
-        } else {
-            const ArrayDataType* arrayDataType =  dynamic_cast<const ArrayDataType *>(dataType);
-            if ( arrayDataType ) {
-                appendDependenciesfromArray( arrayDataType, start, memMgr, dependencies );
-            }
-        }
-    }
+//	PUBLIC	MEMBER	FUNCTION
+void	AllocInfo::appendDependencies(	MemMgr*	memMgr,	std::vector<AllocInfo*>&	dependencies	)	{
+
+				bool	found	=	false;
+				int	n_depends	=	dependencies.size();
+
+				//	Search	through	the	dependencies	to	see	if	"this"	is	in	it.
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								if	(dependencies[ii]	==	this)	{
+												found	=	true;
+												return;
+								}
+				}
+
+				if	(!found)	{
+								//	An	allocation	is	dependent	on	itself.
+								dependencies.push_back(this);
+								const	CompositeDataType*	compositeDataType	=	dynamic_cast<const	CompositeDataType	*>(dataType);
+								if	(compositeDataType)	{
+												//	Get	the	dependencies	in	the	allocation	of	the	composite	type.
+												appendDependenciesfromComposite(	compositeDataType,	start,	memMgr,	dependencies	);
+								}	else	{
+												const	ArrayDataType*	arrayDataType	=		dynamic_cast<const	ArrayDataType	*>(dataType);
+												if	(	arrayDataType	)	{
+																appendDependenciesfromArray(	arrayDataType,	start,	memMgr,	dependencies	);
+												}
+								}
+				}
 }
 
-// PUBLIC MEMBER FUNCTION
-std::string AllocInfo::toString() const {
-
-    std::ostringstream oss;
-    if (storageClass == StorageClass::LOCAL) {
-        oss << "LOCAL ";
-    } else {
-        oss << "EXTERN ";
-    }
-    oss << "<" << getDataType()->makeDeclaration( name, true) << ">";
-    oss << " @";
-    oss << std::hex << start << ".." ;
-    oss << std::hex << end   << " " ;
-    oss << std::endl;
-    return oss.str();
+//	PUBLIC	MEMBER	FUNCTION
+std::string	AllocInfo::toString()	const	{
+
+				std::ostringstream	oss;
+				if	(storageClass	==	StorageClass::LOCAL)	{
+								oss	<<	"LOCAL	";
+				}	else	{
+								oss	<<	"EXTERN	";
+				}
+				oss	<<	"<"	<<	getDataType()->makeDeclaration(	name,	true)	<<	">";
+				oss	<<	"	@";
+				oss	<<	std::hex	<<	start	<<	".."	;
+				oss	<<	std::hex	<<	end			<<	"	"	;
+				oss	<<	std::endl;
+				return	oss.str();
 }
 
-#ifdef NEWSTUFF
-// PUBLIC MEMBER FUNCTION
-bool AllocInfo::getVarAccessInfo( LexicalAnalyzer* lexer, VarAccessInfo& varAccessInfo ) {
-
-     bool errorCondition = false;
-
-     if (dimensions[0] == 1) {
-         searchType = dataType->subType();
-     } else {
-         searchType = dataType;
-     }
-
-     TypeClass::e typeClass = searchType->getTypeClass();
-
-     nextToken = lexer->getToken();
-     if (nextToken = Token::Identifier) {
-         std::string temp = lexer->getText();
-         if (temp != name) {
-              errorCondition = true;
-         }
-         nextToken = lexer->getToken();
-     }
-
-     if (nextToken == Token::EndOfFile) {
-         varAccessInfo.dataType = dataType;
-         varAccessInfo.address = start;
-     } else if ( nextToken == Token::period) {
-         if (typeClass == TypeClass::COMPOSITE) {
-              errorCondition |= ((const CompositeDataType*)searchType)->getMemberInfo( lexer, start, varAccessInfo);
-         } else {
-              errorCondition = true;
-         }
-     } else if (nextToken == Token::LeftBracket) {
-         if ( typeClass == TypeClass::ARRAY ) {
-             errorCondition |= ((const ArrayDataType*)searchType)->getElementInfo( lexer, start, varAccessInfo);
-         } else {
-             errorCondition = true;
-         }
-     } else {
-         errorCondition = true;
-     }
-     return errorCondition;
+#ifdef	NEWSTUFF
+//	PUBLIC	MEMBER	FUNCTION
+bool	AllocInfo::getVarAccessInfo(	LexicalAnalyzer*	lexer,	VarAccessInfo&	varAccessInfo	)	{
+
+					bool	errorCondition	=	false;
+
+					if	(dimensions[0]	==	1)	{
+									searchType	=	dataType->subType();
+					}	else	{
+									searchType	=	dataType;
+					}
+
+					TypeClass::e	typeClass	=	searchType->getTypeClass();
+
+					nextToken	=	lexer->getToken();
+					if	(nextToken	=	Token::Identifier)	{
+									std::string	temp	=	lexer->getText();
+									if	(temp	!=	name)	{
+														errorCondition	=	true;
+									}
+									nextToken	=	lexer->getToken();
+					}
+
+					if	(nextToken	==	Token::EndOfFile)	{
+									varAccessInfo.dataType	=	dataType;
+									varAccessInfo.address	=	start;
+					}	else	if	(	nextToken	==	Token::period)	{
+									if	(typeClass	==	TypeClass::COMPOSITE)	{
+														errorCondition	|=	((const	CompositeDataType*)searchType)->getMemberInfo(	lexer,	start,	varAccessInfo);
+									}	else	{
+														errorCondition	=	true;
+									}
+					}	else	if	(nextToken	==	Token::LeftBracket)	{
+									if	(	typeClass	==	TypeClass::ARRAY	)	{
+													errorCondition	|=	((const	ArrayDataType*)searchType)->getElementInfo(	lexer,	start,	varAccessInfo);
+									}	else	{
+													errorCondition	=	true;
+									}
+					}	else	{
+									errorCondition	=	true;
+					}
+					return	errorCondition;
 }
 #endif
diff --git a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
index 1ca69db78..bce446959 100644
--- a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
@@ -1,349 +1,349 @@
-#include "ArrayDataType.hh"
-#include "PointerDataType.hh"
-#include "TypeDictionary.hh"
-#include "PointerValue.hh"
-#include "CompositeValue.hh"
-#include <iostream>
-#include <sstream>
-
-bool ArrayDataType::initArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[] ) {
-
-    bool errorCondition = false;
-    // NOTE: (dim[0] >= 0) indicates an array. (dim[0] < 0) indicates a pointer.
-    if (( n_dims >= 1 ) && ( dims[0] >= 0 )) {
-        if ( n_dims == 1 ) {
-            this->typeSpecName = typeSpecName;
-            ownDataType = NULL;
-            this->subType = NULL;
-        } else if (n_dims > 1) {
-            this->typeSpecName.clear();
-            if (dims[1] < 0) {
-                this->ownDataType = new PointerDataType( typeDictionary, typeSpecName, n_dims-1, &dims[1] );
-            } else {
-                this->ownDataType = new ArrayDataType( typeDictionary, typeSpecName, n_dims-1, &dims[1] );
-            }
-            this->subType = ownDataType;
-        }
-        elementCount = dims[0];
-        this->typeDictionary = typeDictionary;
-
-        is_valid = false;
-        typeSize = 0; // This is set when this ArrayDataType is validated.
-    } else {
-        // n_dims and dims don't specify an array.
-        errorCondition= true;
-    }
-
-    return errorCondition;
+#include	"ArrayDataType.hh"
+#include	"PointerDataType.hh"
+#include	"TypeDictionary.hh"
+#include	"PointerValue.hh"
+#include	"CompositeValue.hh"
+#include	<iostream>
+#include	<sstream>
+
+bool	ArrayDataType::initArrayDataType(	TypeDictionary*	typeDictionary,	std::string	typeSpecName,	unsigned	int	n_dims,	int	dims[]	)	{
+
+				bool	errorCondition	=	false;
+				//	NOTE:	(dim[0]	>=	0)	indicates	an	array.	(dim[0]	<	0)	indicates	a	pointer.
+				if	((	n_dims	>=	1	)	&&	(	dims[0]	>=	0	))	{
+								if	(	n_dims	==	1	)	{
+												this->typeSpecName	=	typeSpecName;
+												ownDataType	=	NULL;
+												this->subType	=	NULL;
+								}	else	if	(n_dims	>	1)	{
+												this->typeSpecName.clear();
+												if	(dims[1]	<	0)	{
+																this->ownDataType	=	new	PointerDataType(	typeDictionary,	typeSpecName,	n_dims-1,	&dims[1]	);
+												}	else	{
+																this->ownDataType	=	new	ArrayDataType(	typeDictionary,	typeSpecName,	n_dims-1,	&dims[1]	);
+												}
+												this->subType	=	ownDataType;
+								}
+								elementCount	=	dims[0];
+								this->typeDictionary	=	typeDictionary;
+
+								is_valid	=	false;
+								typeSize	=	0;	//	This	is	set	when	this	ArrayDataType	is	validated.
+				}	else	{
+								//	n_dims	and	dims	don't	specify	an	array.
+								errorCondition=	true;
+				}
+
+				return	errorCondition;
 }
 
-// CONSTRUCTOR
-ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[] )  {
+//	CONSTRUCTOR
+ArrayDataType::	ArrayDataType(	TypeDictionary*	typeDictionary,	std::string	typeSpecName,	unsigned	int	n_dims,	int	dims[]	)		{
 
-    if( this->initArrayDataType( typeDictionary, typeSpecName, n_dims, dims) ) {
-        throw std::logic_error("ArrayDataType constructor(1) error.");
-    }
+				if(	this->initArrayDataType(	typeDictionary,	typeSpecName,	n_dims,	dims)	)	{
+								throw	std::logic_error("ArrayDataType	constructor(1)	error.");
+				}
 }
 
-// CONSTRUCTOR
-ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int dimensionSize )  {
+//	CONSTRUCTOR
+ArrayDataType::	ArrayDataType(	TypeDictionary*	typeDictionary,	std::string	typeSpecName,	unsigned	int	dimensionSize	)		{
 
-    int n = dimensionSize;
-    if( this->initArrayDataType( typeDictionary, typeSpecName, 1, &n) ) {
-        throw std::logic_error("ArrayDataType constructor(2) error.");
-    }
+				int	n	=	dimensionSize;
+				if(	this->initArrayDataType(	typeDictionary,	typeSpecName,	1,	&n)	)	{
+								throw	std::logic_error("ArrayDataType	constructor(2)	error.");
+				}
 }
 
-// CONSTRUCTOR
-ArrayDataType::ArrayDataType ( ArrayDataType const & original, unsigned int newSize ) {
-
-    is_valid = original.is_valid;
-    typeSpecName = original.typeSpecName;
-    elementCount = newSize;
-    typeDictionary = original.typeDictionary;
-
-    if (original.ownDataType != NULL) {
-        ownDataType = original.ownDataType->clone();
-    } else {
-        ownDataType = NULL;
-    }
-
-    if ( typeSpecName.empty())  {
-        subType = ownDataType;
-    } else {
-        if ( is_valid ) {
-            subType = original.subType;
-        } else {
-            subType = NULL;
-        }
-    }
+//	CONSTRUCTOR
+ArrayDataType::ArrayDataType	(	ArrayDataType	const	&	original,	unsigned	int	newSize	)	{
+
+				is_valid	=	original.is_valid;
+				typeSpecName	=	original.typeSpecName;
+				elementCount	=	newSize;
+				typeDictionary	=	original.typeDictionary;
+
+				if	(original.ownDataType	!=	NULL)	{
+								ownDataType	=	original.ownDataType->clone();
+				}	else	{
+								ownDataType	=	NULL;
+				}
+
+				if	(	typeSpecName.empty())		{
+								subType	=	ownDataType;
+				}	else	{
+								if	(	is_valid	)	{
+												subType	=	original.subType;
+								}	else	{
+												subType	=	NULL;
+								}
+				}
 }
 
-// COPY CONSTRUCTOR
-ArrayDataType::ArrayDataType ( ArrayDataType const & original) {
-
-    is_valid = original.is_valid;
-    typeSpecName = original.typeSpecName;
-    elementCount = original.elementCount;
-    typeDictionary = original.typeDictionary;
-
-    if (original.ownDataType != NULL) {
-        ownDataType = original.ownDataType->clone();
-    } else {
-        ownDataType = NULL;
-    }
-
-    if ( typeSpecName.empty())  {
-        subType = ownDataType;
-    } else {
-        if ( is_valid ) {
-            subType = original.subType;
-        } else {
-            subType = NULL;
-        }
-    }
+//	COPY	CONSTRUCTOR
+ArrayDataType::ArrayDataType	(	ArrayDataType	const	&	original)	{
+
+				is_valid	=	original.is_valid;
+				typeSpecName	=	original.typeSpecName;
+				elementCount	=	original.elementCount;
+				typeDictionary	=	original.typeDictionary;
+
+				if	(original.ownDataType	!=	NULL)	{
+								ownDataType	=	original.ownDataType->clone();
+				}	else	{
+								ownDataType	=	NULL;
+				}
+
+				if	(	typeSpecName.empty())		{
+								subType	=	ownDataType;
+				}	else	{
+								if	(	is_valid	)	{
+												subType	=	original.subType;
+								}	else	{
+												subType	=	NULL;
+								}
+				}
 }
 
-DataType * ArrayDataType::clone () const {
-    return new ArrayDataType( *this );
+DataType	*	ArrayDataType::clone	()	const	{
+				return	new	ArrayDataType(	*this	);
 }
 
-// DESTRUCTOR
-ArrayDataType::~ArrayDataType () {
-    if ( typeSpecName.empty()) {
-        delete subType;
-    }
+//	DESTRUCTOR
+ArrayDataType::~ArrayDataType	()	{
+				if	(	typeSpecName.empty())	{
+								delete	subType;
+				}
 }
 
-// ASSIGNMENT OPERATOR
-ArrayDataType& ArrayDataType::operator=( const ArrayDataType & rhs ) {
-
-    if ( this != &rhs ) {
-
-        // Copy the RHS members before messing with the LHS.
-        DataType *clonedDataType;
-        if ( rhs.typeSpecName.empty() ) {
-            clonedDataType = rhs.subType->clone();
-        }
-
-        // Delete any pre-existing LHS members.
-        if ( typeSpecName.empty() ) {
-            delete subType;
-        }
-
-        // Assign the copied RHS members to the LHS.
-        elementCount = rhs.elementCount;
-        is_valid = rhs.is_valid;
-        typeSpecName = rhs.typeSpecName;
-
-        if ( typeSpecName.empty() ) {
-            subType = clonedDataType;
-        } else {
-            subType = rhs.subType;
-        }
-    }
-    return *this;
+//	ASSIGNMENT	OPERATOR
+ArrayDataType&	ArrayDataType::operator=(	const	ArrayDataType	&	rhs	)	{
+
+				if	(	this	!=	&rhs	)	{
+
+								//	Copy	the	RHS	members	before	messing	with	the	LHS.
+								DataType	*clonedDataType;
+								if	(	rhs.typeSpecName.empty()	)	{
+												clonedDataType	=	rhs.subType->clone();
+								}
+
+								//	Delete	any	pre-existing	LHS	members.
+								if	(	typeSpecName.empty()	)	{
+												delete	subType;
+								}
+
+								//	Assign	the	copied	RHS	members	to	the	LHS.
+								elementCount	=	rhs.elementCount;
+								is_valid	=	rhs.is_valid;
+								typeSpecName	=	rhs.typeSpecName;
+
+								if	(	typeSpecName.empty()	)	{
+												subType	=	clonedDataType;
+								}	else	{
+												subType	=	rhs.subType;
+								}
+				}
+				return	*this;
 }
 
-// MEMBER FUNCTION
-bool ArrayDataType::validate() {
-
-    if (!is_valid) {
-        // if we're not referencing a dictionary type.
-        if (typeSpecName.empty()) {
-            is_valid = ownDataType->validate();
-            if (is_valid) {
-                subType = ownDataType;
-                typeSize = elementCount * subType->getSize();
-            }
-        } else {
-            subType = typeDictionary->getDataType( typeSpecName );
-
-            if (subType == NULL) {
-                std::cerr << "ERROR: Type \"" << typeSpecName << "\" not found." << std::endl;
-            } else if (subType->isVoid()) {
-                std::cerr << "ERROR: Cannot make an array of type void." << std::endl;
-            } else {
-                is_valid = true;
-                typeSize = elementCount * subType->getSize();
-            }
-        }
-    }
-    return is_valid;
+//	MEMBER	FUNCTION
+bool	ArrayDataType::validate()	{
+
+				if	(!is_valid)	{
+								//	if	we're	not	referencing	a	dictionary	type.
+								if	(typeSpecName.empty())	{
+												is_valid	=	ownDataType->validate();
+												if	(is_valid)	{
+																subType	=	ownDataType;
+																typeSize	=	elementCount	*	subType->getSize();
+												}
+								}	else	{
+												subType	=	typeDictionary->getDataType(	typeSpecName	);
+
+												if	(subType	==	NULL)	{
+																std::cerr	<<	"ERROR:	Type	\""	<<	typeSpecName	<<	"\"	not	found."	<<	std::endl;
+												}	else	if	(subType->isVoid())	{
+																std::cerr	<<	"ERROR:	Cannot	make	an	array	of	type	void."	<<	std::endl;
+												}	else	{
+																is_valid	=	true;
+																typeSize	=	elementCount	*	subType->getSize();
+												}
+								}
+				}
+				return	is_valid;
 }
 
-// MEMBER FUNCTION
-size_t ArrayDataType::getSize() const {
+//	MEMBER	FUNCTION
+size_t	ArrayDataType::getSize()	const	{
 
-    if (is_valid) {
-        return typeSize;
-    } else {
-        std::cerr << "ERROR: Can't getSize() because type hasn't been validated." << std::endl;
-        return 0;
-    }
+				if	(is_valid)	{
+								return	typeSize;
+				}	else	{
+								std::cerr	<<	"ERROR:	Can't	getSize()	because	type	hasn't	been	validated."	<<	std::endl;
+								return	0;
+				}
 }
 
-// MEMBER FUNCTION
-unsigned int ArrayDataType::getTotalElementCount() const {
-    unsigned int totalElementCount = elementCount * ownDataType->getTotalElementCount();
-    return totalElementCount;
+//	MEMBER	FUNCTION
+unsigned	int	ArrayDataType::getTotalElementCount()	const	{
+				unsigned	int	totalElementCount	=	elementCount	*	ownDataType->getTotalElementCount();
+				return	totalElementCount;
 }
 
-// MEMBER FUNCTION
-bool ArrayDataType::containsPointers() const {
+//	MEMBER	FUNCTION
+bool	ArrayDataType::containsPointers()	const	{
 
-    if ((subType->containsPointers())) {
-        return true;
-    }
-    return false;
+				if	((subType->containsPointers()))	{
+								return	true;
+				}
+				return	false;
 }
 
-// MEMBER FUNCTION
-void* ArrayDataType::createInstance(unsigned int num) const {
+//	MEMBER	FUNCTION
+void*	ArrayDataType::createInstance(unsigned	int	num)	const	{
 
-    if (subType != NULL) {
-        return subType->createInstance( num * elementCount );
-    } else {
-        std::cerr << "ERROR: Can't create an instance of an unvalidated type." << std::endl;
-        return (void*) NULL;
-    }
+				if	(subType	!=	NULL)	{
+								return	subType->createInstance(	num	*	elementCount	);
+				}	else	{
+								std::cerr	<<	"ERROR:	Can't	create	an	instance	of	an	unvalidated	type."	<<	std::endl;
+								return	(void*)	NULL;
+				}
 }
 
-// MEMBER FUNCTION
-void ArrayDataType::deleteInstance(void* address) const {
-    if (subType != NULL) {
-        return subType->deleteInstance(address);
-    } else {
-        std::cout << "WARNING: Can't delete an instance of an unvalidated type." << std::endl;
-    }
+//	MEMBER	FUNCTION
+void	ArrayDataType::deleteInstance(void*	address)	const	{
+				if	(subType	!=	NULL)	{
+								return	subType->deleteInstance(address);
+				}	else	{
+								std::cout	<<	"WARNING:	Can't	delete	an	instance	of	an	unvalidated	type."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-void ArrayDataType::clearValue(void * address) const {
-    if (is_valid) {
-        for (int ii=0; ii < elementCount ; ii++) {
-            void * elementAddress = (char*)address + (ii * subType->getSize());
-            subType->clearValue( elementAddress );
-        }
-    } else {
-        std::cerr << "ERROR: Type is not yet validated.";
-    }
+//	MEMBER	FUNCTION
+void	ArrayDataType::clearValue(void	*	address)	const	{
+				if	(is_valid)	{
+								for	(int	ii=0;	ii	<	elementCount	;	ii++)	{
+												void	*	elementAddress	=	(char*)address	+	(ii	*	subType->getSize());
+												subType->clearValue(	elementAddress	);
+								}
+				}	else	{
+								std::cerr	<<	"ERROR:	Type	is	not	yet	validated.";
+				}
 }
 
-// MEMBER FUNCTION
-void ArrayDataType::assignValue(void * address, Value*value) const {
-
-    if (is_valid) {
-        CompositeValue * composite_value_p = dynamic_cast<CompositeValue*>(value);
-        if (composite_value_p) {
-            for (int ii=0; ii < elementCount ; ii++) {
-                void * elementAddress = (char*)address + (ii * subType->getSize());
-                subType->assignValue( elementAddress, (*composite_value_p)[ii] );
-            }
-        } else {
-            std::cerr << "ERROR: Value assigned to an array must be a composite value.";
-        }
-    } else {
-        std::cerr << "ERROR: Type is not valid for assignment.";
-    }
+//	MEMBER	FUNCTION
+void	ArrayDataType::assignValue(void	*	address,	Value*value)	const	{
+
+				if	(is_valid)	{
+								CompositeValue	*	composite_value_p	=	dynamic_cast<CompositeValue*>(value);
+								if	(composite_value_p)	{
+												for	(int	ii=0;	ii	<	elementCount	;	ii++)	{
+																void	*	elementAddress	=	(char*)address	+	(ii	*	subType->getSize());
+																subType->assignValue(	elementAddress,	(*composite_value_p)[ii]	);
+												}
+								}	else	{
+												std::cerr	<<	"ERROR:	Value	assigned	to	an	array	must	be	a	composite	value.";
+								}
+				}	else	{
+								std::cerr	<<	"ERROR:	Type	is	not	valid	for	assignment.";
+				}
 }
 
-// MEMBER FUNCTION
-void ArrayDataType::printValue(std::ostream &s, void * address) const {
-
-    if (is_valid) {
-        s << "{";
-        for (int ii=0; ii < elementCount ; ii++) {
-            if (ii) {
-            s << ",";
-            }
-            void * elementAddress = (char*) address + (ii * subType->getSize());
-            subType->printValue( s, elementAddress );
-        }
-        s << "}";
-    } else {
-        std::cerr << "ERROR: Type is not valid.";
-    }
+//	MEMBER	FUNCTION
+void	ArrayDataType::printValue(std::ostream	&s,	void	*	address)	const	{
+
+				if	(is_valid)	{
+								s	<<	"{";
+								for	(int	ii=0;	ii	<	elementCount	;	ii++)	{
+												if	(ii)	{
+												s	<<	",";
+												}
+												void	*	elementAddress	=	(char*)	address	+	(ii	*	subType->getSize());
+												subType->printValue(	s,	elementAddress	);
+								}
+								s	<<	"}";
+				}	else	{
+								std::cerr	<<	"ERROR:	Type	is	not	valid.";
+				}
 }
 
-// MEMBER FUNCTION
-std::string ArrayDataType::getTypeSpecName() const {
-    if ( !typeSpecName.empty())  {
-        return typeSpecName;
-    } else {
-        return subType->getTypeSpecName();
-    }
+//	MEMBER	FUNCTION
+std::string	ArrayDataType::getTypeSpecName()	const	{
+				if	(	!typeSpecName.empty())		{
+								return	typeSpecName;
+				}	else	{
+								return	subType->getTypeSpecName();
+				}
 }
 
-// MEMBER FUNCTION
-std::string ArrayDataType::makeDeclaration(std::string declarator, bool isDirectDeclarator) const {
-    std::string outTypeName;
-    std::stringstream ss;
-
-    if ( isDirectDeclarator ) {
-        ss << declarator << "[" << getElementCount() << "]" ;
-    } else {
-        ss << "(" << declarator << ")" << "[" << getElementCount() << "]" ;
-    }
-    if (subType != NULL) {
-        outTypeName = subType->makeDeclaration( ss.str(), true );
-    } else {
-        outTypeName = getTypeSpecName() + ss.str();
-    }
-    return outTypeName;
+//	MEMBER	FUNCTION
+std::string	ArrayDataType::makeDeclaration(std::string	declarator,	bool	isDirectDeclarator)	const	{
+				std::string	outTypeName;
+				std::stringstream	ss;
+
+				if	(	isDirectDeclarator	)	{
+								ss	<<	declarator	<<	"["	<<	getElementCount()	<<	"]"	;
+				}	else	{
+								ss	<<	"("	<<	declarator	<<	")"	<<	"["	<<	getElementCount()	<<	"]"	;
+				}
+				if	(subType	!=	NULL)	{
+								outTypeName	=	subType->makeDeclaration(	ss.str(),	true	);
+				}	else	{
+								outTypeName	=	getTypeSpecName()	+	ss.str();
+				}
+				return	outTypeName;
 }
 
-// MEMBER FUNCTION
-unsigned int ArrayDataType::getElementCount() const {
-    return elementCount;
+//	MEMBER	FUNCTION
+unsigned	int	ArrayDataType::getElementCount()	const	{
+				return	elementCount;
 }
 
-// MEMBER FUNCTION
-const DataType * ArrayDataType::getSubType() const {
-    return subType;
+//	MEMBER	FUNCTION
+const	DataType	*	ArrayDataType::getSubType()	const	{
+				return	subType;
 }
 
-#ifdef NEWSTUFF
-// MEMBER FUNCTION
-bool ArrayDataType::getElementInfo( LexicalAnalyzer* lexer, void* baseAddress, VarAccessInfo& varAccessInfo ) {
-
-    bool errorCondition = false;
-    nextToken = lexer->getToken();
-    if (nextToken = Token::Integer) {
-       int index = std::atoi( (lexer->getText()).c_str() );
-    }
-    if ( (index >= 0) && (index < elementCount)) {
-        const DataType*   elementDataType = subType->getDataType();
-        TypeClass::e elementDataTypeClass = subType->getTypeClass();
-        void*              elementAddress = (char*) baseAddress + (index * subType->getSize());
-        nextToken = lexer->getToken();
-        if (nextToken == Token::RightBracket) {
-
-            nextToken = lexer->getToken();
-            if (nextToken == Token::EndOfFile) {
-                varAccessInfo.dataType = elementDataType;
-                varAccessInfo.address  = elementAddress;
-            } else if ( nextToken == Token::period) {
-                if (elementDataTypeClass == TypeClass::COMPOSITE) {
-                    errorCondition |= ((const CompositeDataType*)searchType)->getMemberInfo( lexer, elementAddress, varAccessInfo);
-                } else {
-                    errorCondition = true;
-                }
-            } else if (nextToken == Token::LeftBracket) {
-                if ( typeClass == TypeClass::ARRAY ) {
-                    errorCondition |= ((const ArrayDataType*)searchType)->getElementInfo( lexer, elementAddress, varAccessInfo);
-                } else {
-                    errorCondition = true;
-                }
-            } else {
-                errorCondition = true;
-            }
-        } else {
-            errorCondition = true;
-        }
-    } else {
-        errorCondition = true;
-    }
-    return errorCondition;
+#ifdef	NEWSTUFF
+//	MEMBER	FUNCTION
+bool	ArrayDataType::getElementInfo(	LexicalAnalyzer*	lexer,	void*	baseAddress,	VarAccessInfo&	varAccessInfo	)	{
+
+				bool	errorCondition	=	false;
+				nextToken	=	lexer->getToken();
+				if	(nextToken	=	Token::Integer)	{
+							int	index	=	std::atoi(	(lexer->getText()).c_str()	);
+				}
+				if	(	(index	>=	0)	&&	(index	<	elementCount))	{
+								const	DataType*			elementDataType	=	subType->getDataType();
+								TypeClass::e	elementDataTypeClass	=	subType->getTypeClass();
+								void*														elementAddress	=	(char*)	baseAddress	+	(index	*	subType->getSize());
+								nextToken	=	lexer->getToken();
+								if	(nextToken	==	Token::RightBracket)	{
+
+												nextToken	=	lexer->getToken();
+												if	(nextToken	==	Token::EndOfFile)	{
+																varAccessInfo.dataType	=	elementDataType;
+																varAccessInfo.address		=	elementAddress;
+												}	else	if	(	nextToken	==	Token::period)	{
+																if	(elementDataTypeClass	==	TypeClass::COMPOSITE)	{
+																				errorCondition	|=	((const	CompositeDataType*)searchType)->getMemberInfo(	lexer,	elementAddress,	varAccessInfo);
+																}	else	{
+																				errorCondition	=	true;
+																}
+												}	else	if	(nextToken	==	Token::LeftBracket)	{
+																if	(	typeClass	==	TypeClass::ARRAY	)	{
+																				errorCondition	|=	((const	ArrayDataType*)searchType)->getElementInfo(	lexer,	elementAddress,	varAccessInfo);
+																}	else	{
+																				errorCondition	=	true;
+																}
+												}	else	{
+																errorCondition	=	true;
+												}
+								}	else	{
+												errorCondition	=	true;
+								}
+				}	else	{
+								errorCondition	=	true;
+				}
+				return	errorCondition;
 }
 #endif
diff --git a/trick_source/sim_services/DataTypes/src/BitfieldStructMember.cpp b/trick_source/sim_services/DataTypes/src/BitfieldStructMember.cpp
index 5ad52dc32..cf00e0558 100644
--- a/trick_source/sim_services/DataTypes/src/BitfieldStructMember.cpp
+++ b/trick_source/sim_services/DataTypes/src/BitfieldStructMember.cpp
@@ -1,36 +1,36 @@
-#include "BitfieldStructMember.hh"
+#include	"BitfieldStructMember.hh"
 
 /*
- Template specializations for BitfieldStructMember<T>::getTypeSpecName()
- */
-template <> std::string BitfieldStructMember<char>::getTypeSpecName() const {
-    std::string s("char"); return s;
+	Template	specializations	for	BitfieldStructMember<T>::getTypeSpecName()
+	*/
+template	<>	std::string	BitfieldStructMember<char>::getTypeSpecName()	const	{
+				std::string	s("char");	return	s;
 }
-template <> std::string BitfieldStructMember<short>::getTypeSpecName() const {
-    std::string s("short"); return s;
+template	<>	std::string	BitfieldStructMember<short>::getTypeSpecName()	const	{
+				std::string	s("short");	return	s;
 }
-template <> std::string BitfieldStructMember<int>::getTypeSpecName() const {
-    std::string s("int"); return s;
+template	<>	std::string	BitfieldStructMember<int>::getTypeSpecName()	const	{
+				std::string	s("int");	return	s;
 }
-template <> std::string BitfieldStructMember<long>::getTypeSpecName() const {
-    std::string s("long"); return s;
+template	<>	std::string	BitfieldStructMember<long>::getTypeSpecName()	const	{
+				std::string	s("long");	return	s;
 }
-template <> std::string BitfieldStructMember<long long>::getTypeSpecName() const {
-    std::string s("long long"); return s;
+template	<>	std::string	BitfieldStructMember<long	long>::getTypeSpecName()	const	{
+				std::string	s("long	long");	return	s;
 }
-template <> std::string BitfieldStructMember<unsigned char>::getTypeSpecName() const {
-    std::string s("unsigned char"); return s;
+template	<>	std::string	BitfieldStructMember<unsigned	char>::getTypeSpecName()	const	{
+				std::string	s("unsigned	char");	return	s;
 }
-template <> std::string BitfieldStructMember<unsigned short>::getTypeSpecName() const {
-    std::string s("unsigned short"); return s;
+template	<>	std::string	BitfieldStructMember<unsigned	short>::getTypeSpecName()	const	{
+				std::string	s("unsigned	short");	return	s;
 }
-template <> std::string BitfieldStructMember<unsigned int>::getTypeSpecName() const {
-    std::string s("unsigned int"); return s;
+template	<>	std::string	BitfieldStructMember<unsigned	int>::getTypeSpecName()	const	{
+				std::string	s("unsigned	int");	return	s;
 }
-template <> std::string BitfieldStructMember<unsigned long>::getTypeSpecName() const {
-    std::string s("unsigned long"); return s;
+template	<>	std::string	BitfieldStructMember<unsigned	long>::getTypeSpecName()	const	{
+				std::string	s("unsigned	long");	return	s;
 }
-template <> std::string BitfieldStructMember<unsigned long long>::getTypeSpecName() const {
-    std::string s("unsigned long long"); return s;
+template	<>	std::string	BitfieldStructMember<unsigned	long	long>::getTypeSpecName()	const	{
+				std::string	s("unsigned	long	long");	return	s;
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/ClassicChkPtAgent.cpp b/trick_source/sim_services/DataTypes/src/ClassicChkPtAgent.cpp
index 8e361a7dd..2172b1521 100644
--- a/trick_source/sim_services/DataTypes/src/ClassicChkPtAgent.cpp
+++ b/trick_source/sim_services/DataTypes/src/ClassicChkPtAgent.cpp
@@ -1,397 +1,397 @@
-#include "ClassicChkPtAgent.hh"
-
-#include "DataType.hh"
-
-#include "AllocInfo.hh"
-
-#include "PrimitiveDataType.hh"
-#include "ArrayDataType.hh"
-#include "PointerDataType.hh"
-#include "CompositeDataType.hh"
-#include "EnumDataType.hh"
-
-#include "StructMember.hh"
-#include "NormalStructMember.hh"
-#include "StaticStructMember.hh"
-#include "BitfieldStructMember.hh"
-
-#include "MemMgr.hh"
-
-// STATIC FUNCTION
-static void writeStringLiteral( std::ostream& os, const char* s) {
-    int ii;
-    int len = strlen(s);
-    os << "\"" ;
-    for (ii=0 ; ii<len ; ii++) {
-        switch ((s)[ii]) {
-        case '\n': os << "\\n"; break;
-        case '\t': os << "\\t"; break;
-        case '\b': os << "\\b"; break;
-        case '\"': os << "\\\""; break;
-        default  : os << s[ii] ; break;
-        }
-    }
-    os << "\"" ;
+#include	"ClassicChkPtAgent.hh"
+
+#include	"DataType.hh"
+
+#include	"AllocInfo.hh"
+
+#include	"PrimitiveDataType.hh"
+#include	"ArrayDataType.hh"
+#include	"PointerDataType.hh"
+#include	"CompositeDataType.hh"
+#include	"EnumDataType.hh"
+
+#include	"StructMember.hh"
+#include	"NormalStructMember.hh"
+#include	"StaticStructMember.hh"
+#include	"BitfieldStructMember.hh"
+
+#include	"MemMgr.hh"
+
+//	STATIC	FUNCTION
+static	void	writeStringLiteral(	std::ostream&	os,	const	char*	s)	{
+				int	ii;
+				int	len	=	strlen(s);
+				os	<<	"\""	;
+				for	(ii=0	;	ii<len	;	ii++)	{
+								switch	((s)[ii])	{
+								case	'\n':	os	<<	"\\n";	break;
+								case	'\t':	os	<<	"\\t";	break;
+								case	'\b':	os	<<	"\\b";	break;
+								case	'\"':	os	<<	"\\\"";	break;
+								default		:	os	<<	s[ii]	;	break;
+								}
+				}
+				os	<<	"\""	;
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: pushName( const std::string& name ) {
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	pushName(	const	std::string&	name	)	{
 
-    std::stringstream nameStream;
-    if (leftSideNameStack.size() == 0) {
-        nameStream << name;
-    } else {
-        nameStream <<  '.' << name ;
-    }
-    leftSideNameStack.push_back( nameStream.str() );
+				std::stringstream	nameStream;
+				if	(leftSideNameStack.size()	==	0)	{
+								nameStream	<<	name;
+				}	else	{
+								nameStream	<<		'.'	<<	name	;
+				}
+				leftSideNameStack.push_back(	nameStream.str()	);
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: pushIndex( int index) {
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	pushIndex(	int	index)	{
 
-    std::stringstream nameStream;
-    nameStream << '[' << index << ']';
-    leftSideNameStack.push_back( nameStream.str() );
+				std::stringstream	nameStream;
+				nameStream	<<	'['	<<	index	<<	']';
+				leftSideNameStack.push_back(	nameStream.str()	);
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: popNameElement() {
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	popNameElement()	{
 
-    int numElements = leftSideNameStack.size();
-    if (numElements > 0) {
-        leftSideNameStack.pop_back();
-    } else {
-        errorStream << "WARNING: ClassicChkPtAgent::popNameElement called with an empty name stack." << std::endl;
-    }
+				int	numElements	=	leftSideNameStack.size();
+				if	(numElements	>	0)	{
+								leftSideNameStack.pop_back();
+				}	else	{
+								errorStream	<<	"WARNING:	ClassicChkPtAgent::popNameElement	called	with	an	empty	name	stack."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-std::string ClassicChkPtAgent::getLeftSideName() {
+//	MEMBER	FUNCTION
+std::string	ClassicChkPtAgent::getLeftSideName()	{
 
-    std::stringstream nameStream;
-    int numElements = leftSideNameStack.size();
-    for (int ii = 0; ii < numElements; ii ++ ) {
-        std::string element = leftSideNameStack[ii];
-        nameStream << element;
-    }
-    return nameStream.str();
+				std::stringstream	nameStream;
+				int	numElements	=	leftSideNameStack.size();
+				for	(int	ii	=	0;	ii	<	numElements;	ii	++	)	{
+								std::string	element	=	leftSideNameStack[ii];
+								nameStream	<<	element;
+				}
+				return	nameStream.str();
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent:: writeDeclaration( std::ostream& out_s, std::string name, const DataType * dataType) {
-    bool errorCondition = false;
-    if (dataType != NULL) {
-        out_s << dataType->makeDeclaration(name, true);
-        out_s << ";\n";
-    } else {
-        errorCondition = true;
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::	writeDeclaration(	std::ostream&	out_s,	std::string	name,	const	DataType	*	dataType)	{
+				bool	errorCondition	=	false;
+				if	(dataType	!=	NULL)	{
+								out_s	<<	dataType->makeDeclaration(name,	true);
+								out_s	<<	";\n";
+				}	else	{
+								errorCondition	=	true;
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent::writeVariable( std::ostream& out_s, MemMgr* memMgr, void* address, const DataType* dataType ) {
-
-    bool errorCondition = false;
-    TypeClass::e typeClass = dataType->getTypeClass();
-    if ( ( typeClass == TypeClass::PRIMITIVE ) || ( typeClass == TypeClass::ENUMERATION ) ) {
-        std::stringstream rightHandSide;
-        dataType->printValue( rightHandSide, address );
-        writeAssignment( out_s, rightHandSide.str() );
-        out_s << "\n";
-    } else if ( typeClass == TypeClass::POINTER ) {
-        std::stringstream pointerName;
-        errorCondition |= writePointerValue( pointerName, memMgr, address, (const PointerDataType*) dataType);
-        writeAssignment(out_s, pointerName.str());
-        out_s << "\n";
-    } else if ( typeClass == TypeClass::COMPOSITE ) {
-        errorCondition |= writeCompositeAssignments( out_s, memMgr, address, (const CompositeDataType*)dataType);
-    } else if ( typeClass == TypeClass::ARRAY ) {
-        errorCondition |= writeArrayAssignments(  out_s, memMgr, address, (const ArrayDataType*)dataType);
-    } else {
-        errorCondition = true;
-        errorStream << "ERROR: Unknown TypeClass in ClassicChkPtAgent::writeVariable." << std::endl;
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::writeVariable(	std::ostream&	out_s,	MemMgr*	memMgr,	void*	address,	const	DataType*	dataType	)	{
+
+				bool	errorCondition	=	false;
+				TypeClass::e	typeClass	=	dataType->getTypeClass();
+				if	(	(	typeClass	==	TypeClass::PRIMITIVE	)	||	(	typeClass	==	TypeClass::ENUMERATION	)	)	{
+								std::stringstream	rightHandSide;
+								dataType->printValue(	rightHandSide,	address	);
+								writeAssignment(	out_s,	rightHandSide.str()	);
+								out_s	<<	"\n";
+				}	else	if	(	typeClass	==	TypeClass::POINTER	)	{
+								std::stringstream	pointerName;
+								errorCondition	|=	writePointerValue(	pointerName,	memMgr,	address,	(const	PointerDataType*)	dataType);
+								writeAssignment(out_s,	pointerName.str());
+								out_s	<<	"\n";
+				}	else	if	(	typeClass	==	TypeClass::COMPOSITE	)	{
+								errorCondition	|=	writeCompositeAssignments(	out_s,	memMgr,	address,	(const	CompositeDataType*)dataType);
+				}	else	if	(	typeClass	==	TypeClass::ARRAY	)	{
+								errorCondition	|=	writeArrayAssignments(		out_s,	memMgr,	address,	(const	ArrayDataType*)dataType);
+				}	else	{
+								errorCondition	=	true;
+								errorStream	<<	"ERROR:	Unknown	TypeClass	in	ClassicChkPtAgent::writeVariable."	<<	std::endl;
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent::writePointerValue( std::ostream& out_s, MemMgr* memMgr, void* address, const PointerDataType* pointerDataType ) {
-
-    bool errorCondition = false;
-    void* pointerValue = *(void**)address;
-    const DataType* subType = pointerDataType->getSubType(); // FIXME: this can return NULL
-    const AllocInfo* allocInfo = memMgr->getAllocInfoOf( pointerValue );
-
-    if (allocInfo != NULL) {
-        out_s << "&" << allocInfo->getName();
-        errorCondition |= getSubName( out_s, pointerValue, subType, allocInfo->getStart(), allocInfo->getDataType() );
-    } else if ( subType == memMgr->getDataType( "char" )) {
-        writeStringLiteral( out_s, (char*)pointerValue );
-    } else {
-        errorCondition = true;
-        errorStream << "ERROR: The variable \"" << getLeftSideName() << "\" contains ";
-        errorStream << "a pointer to memory that isnt managed by Trick ";
-        errorStream << "and it isn't a char pointer." << std::endl;
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::writePointerValue(	std::ostream&	out_s,	MemMgr*	memMgr,	void*	address,	const	PointerDataType*	pointerDataType	)	{
+
+				bool	errorCondition	=	false;
+				void*	pointerValue	=	*(void**)address;
+				const	DataType*	subType	=	pointerDataType->getSubType();	//	FIXME:	this	can	return	NULL
+				const	AllocInfo*	allocInfo	=	memMgr->getAllocInfoOf(	pointerValue	);
+
+				if	(allocInfo	!=	NULL)	{
+								out_s	<<	"&"	<<	allocInfo->getName();
+								errorCondition	|=	getSubName(	out_s,	pointerValue,	subType,	allocInfo->getStart(),	allocInfo->getDataType()	);
+				}	else	if	(	subType	==	memMgr->getDataType(	"char"	))	{
+								writeStringLiteral(	out_s,	(char*)pointerValue	);
+				}	else	{
+								errorCondition	=	true;
+								errorStream	<<	"ERROR:	The	variable	\""	<<	getLeftSideName()	<<	"\"	contains	";
+								errorStream	<<	"a	pointer	to	memory	that	isnt	managed	by	Trick	";
+								errorStream	<<	"and	it	isn't	a	char	pointer."	<<	std::endl;
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent:: writeArrayAssignments( std::ostream& out_s, MemMgr* memMgr, void* address, const ArrayDataType* arrayDataType ) {
-
-    bool errorCondition = false;
-    int              elementCount     = arrayDataType->getElementCount();
-    const DataType * elementType      = arrayDataType->getSubType(); // FIXME: this can return NULL
-    size_t           elementTypeSize  = elementType->getSize();
-
-    TypeClass::e elementTypeClass = elementType->getTypeClass();
-
-    if ( makeCompactArrays &&
-         (( elementTypeClass == TypeClass::PRIMITIVE) ||
-          ( elementTypeClass == TypeClass::ENUMERATION) ||
-          ( elementTypeClass == TypeClass::POINTER))) {
-
-        std::stringstream rightHandSide;
-        rightHandSide << "{" ;
-        for (int ii=0; ii < elementCount; ii++) {
-            void * elementAddress = (char*) address + (ii * elementTypeSize );
-            if (ii != 0) {
-                rightHandSide << ",";
-            }
-            if ( elementTypeClass == TypeClass::POINTER ) {
-                errorCondition |= writePointerValue( rightHandSide, memMgr, elementAddress, (const PointerDataType*) elementType);
-            } else {
-                elementType->printValue( rightHandSide, elementAddress );
-            }
-        }
-        rightHandSide << "}";
-        writeAssignment( out_s, rightHandSide.str() );
-        out_s << "\n";
-    } else {
-        for (int ii=0; ii < elementCount; ii++) {
-            void * elementAddress = (char*) address + (ii * elementTypeSize );
-            pushIndex(ii);
-            errorCondition |= writeVariable( out_s, memMgr, elementAddress, elementType );
-            popNameElement();
-        }
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::	writeArrayAssignments(	std::ostream&	out_s,	MemMgr*	memMgr,	void*	address,	const	ArrayDataType*	arrayDataType	)	{
+
+				bool	errorCondition	=	false;
+				int														elementCount					=	arrayDataType->getElementCount();
+				const	DataType	*	elementType						=	arrayDataType->getSubType();	//	FIXME:	this	can	return	NULL
+				size_t											elementTypeSize		=	elementType->getSize();
+
+				TypeClass::e	elementTypeClass	=	elementType->getTypeClass();
+
+				if	(	makeCompactArrays	&&
+									((	elementTypeClass	==	TypeClass::PRIMITIVE)	||
+										(	elementTypeClass	==	TypeClass::ENUMERATION)	||
+										(	elementTypeClass	==	TypeClass::POINTER)))	{
+
+								std::stringstream	rightHandSide;
+								rightHandSide	<<	"{"	;
+								for	(int	ii=0;	ii	<	elementCount;	ii++)	{
+												void	*	elementAddress	=	(char*)	address	+	(ii	*	elementTypeSize	);
+												if	(ii	!=	0)	{
+																rightHandSide	<<	",";
+												}
+												if	(	elementTypeClass	==	TypeClass::POINTER	)	{
+																errorCondition	|=	writePointerValue(	rightHandSide,	memMgr,	elementAddress,	(const	PointerDataType*)	elementType);
+												}	else	{
+																elementType->printValue(	rightHandSide,	elementAddress	);
+												}
+								}
+								rightHandSide	<<	"}";
+								writeAssignment(	out_s,	rightHandSide.str()	);
+								out_s	<<	"\n";
+				}	else	{
+								for	(int	ii=0;	ii	<	elementCount;	ii++)	{
+												void	*	elementAddress	=	(char*)	address	+	(ii	*	elementTypeSize	);
+												pushIndex(ii);
+												errorCondition	|=	writeVariable(	out_s,	memMgr,	elementAddress,	elementType	);
+												popNameElement();
+								}
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent::writeCompositeAssignments( std::ostream& out_s, MemMgr* memMgr, void* address, const CompositeDataType* compDataType) {
-
-    bool errorCondition = false;
-
-    int memberCount = compDataType->getMemberCount();
-
-    for (int ii = 0; ii < memberCount; ii++) {
-
-        //int ioControl = structMember->getIoControl();
-        int ioControl = 1; // FIXME: implement Trick's IOControl.
-
-        if ( ioControl == 1 || ioControl == 3) {
-
-            StructMember* structMember = compDataType->getStructMember(ii);
-            MemberClass::e memberClass = structMember->getMemberClass();
-
-            if ( memberClass == MemberClass::BITFIELD ) {
-                std::stringstream rightHandSide;
-                structMember->printValue( rightHandSide, address );
-                writeAssignment( out_s, rightHandSide.str() );
-                out_s << "\n";
-            } else {
-                char* memberAddress;
-                const DataType* memberDataType;
-                if ( memberClass == MemberClass::NORMAL ) {
-                   NormalStructMember* normalStructMember = (NormalStructMember*)structMember;
-                   memberAddress = (char*)address + normalStructMember->getOffset();
-                   memberDataType = normalStructMember->getDataType();
-                } else if ( memberClass == MemberClass::STATIC ) {
-                    StaticStructMember* staticStructMember = (StaticStructMember*)structMember;
-                    memberAddress =  (char*)staticStructMember->getAddress();
-                    memberDataType = staticStructMember->getDataType();
-                } else {
-                    errorCondition = true;
-                    errorStream << "ERROR: " << std::endl;
-                    return errorCondition;
-                }
-                std::string memberName = structMember->getName();
-
-                pushName(memberName.c_str());
-                errorCondition |= writeVariable( out_s, memMgr, memberAddress, memberDataType);
-                popNameElement();
-            }
-        }
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::writeCompositeAssignments(	std::ostream&	out_s,	MemMgr*	memMgr,	void*	address,	const	CompositeDataType*	compDataType)	{
+
+				bool	errorCondition	=	false;
+
+				int	memberCount	=	compDataType->getMemberCount();
+
+				for	(int	ii	=	0;	ii	<	memberCount;	ii++)	{
+
+								//int	ioControl	=	structMember->getIoControl();
+								int	ioControl	=	1;	//	FIXME:	implement	Trick's	IOControl.
+
+								if	(	ioControl	==	1	||	ioControl	==	3)	{
+
+												StructMember*	structMember	=	compDataType->getStructMember(ii);
+												MemberClass::e	memberClass	=	structMember->getMemberClass();
+
+												if	(	memberClass	==	MemberClass::BITFIELD	)	{
+																std::stringstream	rightHandSide;
+																structMember->printValue(	rightHandSide,	address	);
+																writeAssignment(	out_s,	rightHandSide.str()	);
+																out_s	<<	"\n";
+												}	else	{
+																char*	memberAddress;
+																const	DataType*	memberDataType;
+																if	(	memberClass	==	MemberClass::NORMAL	)	{
+																			NormalStructMember*	normalStructMember	=	(NormalStructMember*)structMember;
+																			memberAddress	=	(char*)address	+	normalStructMember->getOffset();
+																			memberDataType	=	normalStructMember->getDataType();
+																}	else	if	(	memberClass	==	MemberClass::STATIC	)	{
+																				StaticStructMember*	staticStructMember	=	(StaticStructMember*)structMember;
+																				memberAddress	=		(char*)staticStructMember->getAddress();
+																				memberDataType	=	staticStructMember->getDataType();
+																}	else	{
+																				errorCondition	=	true;
+																				errorStream	<<	"ERROR:	"	<<	std::endl;
+																				return	errorCondition;
+																}
+																std::string	memberName	=	structMember->getName();
+
+																pushName(memberName.c_str());
+																errorCondition	|=	writeVariable(	out_s,	memMgr,	memberAddress,	memberDataType);
+																popNameElement();
+												}
+								}
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: writeAssignment( std::ostream& out_s, std::string rightHandSide ) {
-    out_s << getLeftSideName() << " = " << rightHandSide << ";" ;
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	writeAssignment(	std::ostream&	out_s,	std::string	rightHandSide	)	{
+				out_s	<<	getLeftSideName()	<<	"	=	"	<<	rightHandSide	<<	";"	;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent:: getArraySubName( std::ostream& nameStream,
-                                          void * searchAddress,
-                                          const DataType * searchType,
-                                          void * baseAddress,
-                                          const ArrayDataType * baseType ) {
-    bool   errorCondition = false;
-    size_t baseTypeSize =  baseType->getSize();
-
-    if (( searchAddress >= (char *)baseAddress ) &&
-        ( searchAddress <  (char *)baseAddress + baseTypeSize)) {
-
-        const DataType * elementType      = baseType->getSubType(); // FIXME: this can return NULL
-        size_t           elementTypeSize  = elementType->getSize();
-        long             elementIndex     = ((long)searchAddress - (long)baseAddress) / elementTypeSize;
-        void *           elementAddress   = (char*) baseAddress + ( elementIndex * elementTypeSize );
-
-        nameStream << "[" << elementIndex << "]";
-
-        errorCondition = getSubName( nameStream, searchAddress, searchType, elementAddress, elementType);
-
-    } else {
-        errorCondition = true;
-        errorStream << "ERROR: Bad call to ClassicChkPtAgent::getArraySubName(). "
-                    << "The searchAddress (" << searchAddress << ") "
-                    << "is not within the bounds of the base-object "
-                    << "(" << baseAddress << ".."
-                    << (void*)((char *)baseAddress + baseTypeSize) << ")" << std::endl;
-    }
-
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::	getArraySubName(	std::ostream&	nameStream,
+																																										void	*	searchAddress,
+																																										const	DataType	*	searchType,
+																																										void	*	baseAddress,
+																																										const	ArrayDataType	*	baseType	)	{
+				bool			errorCondition	=	false;
+				size_t	baseTypeSize	=		baseType->getSize();
+
+				if	((	searchAddress	>=	(char	*)baseAddress	)	&&
+								(	searchAddress	<		(char	*)baseAddress	+	baseTypeSize))	{
+
+								const	DataType	*	elementType						=	baseType->getSubType();	//	FIXME:	this	can	return	NULL
+								size_t											elementTypeSize		=	elementType->getSize();
+								long													elementIndex					=	((long)searchAddress	-	(long)baseAddress)	/	elementTypeSize;
+								void	*											elementAddress			=	(char*)	baseAddress	+	(	elementIndex	*	elementTypeSize	);
+
+								nameStream	<<	"["	<<	elementIndex	<<	"]";
+
+								errorCondition	=	getSubName(	nameStream,	searchAddress,	searchType,	elementAddress,	elementType);
+
+				}	else	{
+								errorCondition	=	true;
+								errorStream	<<	"ERROR:	Bad	call	to	ClassicChkPtAgent::getArraySubName().	"
+																				<<	"The	searchAddress	("	<<	searchAddress	<<	")	"
+																				<<	"is	not	within	the	bounds	of	the	base-object	"
+																				<<	"("	<<	baseAddress	<<	".."
+																				<<	(void*)((char	*)baseAddress	+	baseTypeSize)	<<	")"	<<	std::endl;
+				}
+
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent::getCompositeSubName( std::ostream& nameStream,
-                                              void * searchAddress,
-                                              const DataType * searchType,
-                                              void * baseAddress,
-                                              const CompositeDataType * baseType ) {
-    bool   errorCondition = false;
-    size_t baseTypeSize = baseType->getSize();
-
-    if (( searchAddress >= (char *)baseAddress ) &&
-        ( searchAddress <  (char *)baseAddress + baseTypeSize)) {
-
-        int  memberCount = baseType->getMemberCount();
-        int  memberIndex = 0;
-        bool memberFound = false;
-
-        while ((memberIndex < memberCount) && (memberFound == false)) {
-
-            StructMember* structMember = baseType->getStructMember(memberIndex);
-            MemberClass::e memberClass = structMember->getMemberClass();
-
-            /*
-            We don't consider BITFIELD members because pointers to bitfields are meaningless.
-            Also note that we don't consider STATIC class members. This is because static
-            members aren't really class object members, rather they are global variables.
-            */
-
-            // FIXME: Static class variables are dealt with else where.
-
-            if ( memberClass == MemberClass::NORMAL ) {
-
-                NormalStructMember* normalStructMember = (NormalStructMember *)structMember;
-
-                const DataType * memberDataType  = normalStructMember->getDataType(); // FIXME: this can return NULL
-                size_t           memberTypeSize  = memberDataType->getSize();
-                int              memberOffset    = normalStructMember->getOffset();
-                char *           memberAddress   = (char*)baseAddress + memberOffset;
-
-                if ( ( searchAddress >= (char *)memberAddress ) &&
-                     ( searchAddress < (char *)memberAddress + memberTypeSize )) {
-
-                    memberFound = true;
-                    nameStream << "." << structMember->getName();
-                    errorCondition = getSubName( nameStream, searchAddress, searchType, memberAddress, memberDataType);
-
-                }
-            }
-            memberIndex ++;
-        }
-
-        if (!memberFound) {
-            errorCondition = true;
-            errorStream << "ERROR: Bad call to ClassicChkPtAgent::getCompositeSubName(). "
-                        << "The searchAddress (" << searchAddress << ") "
-                        << "is not within the bounds of the base-object "
-                        << "(" << baseAddress << ".."
-                        << (void*)((char *)baseAddress + baseTypeSize) << ")" << std::endl;
-        }
-
-    } else {
-        errorCondition = true;
-        errorStream << "ERROR: Bad call to ClassicChkPtAgent::getCompositeSubName(). The address in "
-                    << "the parameter <searchAddress> is not within the bounds of the object "
-                    << "at <baseAddress>." << std::endl;
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::getCompositeSubName(	std::ostream&	nameStream,
+																																														void	*	searchAddress,
+																																														const	DataType	*	searchType,
+																																														void	*	baseAddress,
+																																														const	CompositeDataType	*	baseType	)	{
+				bool			errorCondition	=	false;
+				size_t	baseTypeSize	=	baseType->getSize();
+
+				if	((	searchAddress	>=	(char	*)baseAddress	)	&&
+								(	searchAddress	<		(char	*)baseAddress	+	baseTypeSize))	{
+
+								int		memberCount	=	baseType->getMemberCount();
+								int		memberIndex	=	0;
+								bool	memberFound	=	false;
+
+								while	((memberIndex	<	memberCount)	&&	(memberFound	==	false))	{
+
+												StructMember*	structMember	=	baseType->getStructMember(memberIndex);
+												MemberClass::e	memberClass	=	structMember->getMemberClass();
+
+												/*
+												We	don't	consider	BITFIELD	members	because	pointers	to	bitfields	are	meaningless.
+												Also	note	that	we	don't	consider	STATIC	class	members.	This	is	because	static
+												members	aren't	really	class	object	members,	rather	they	are	global	variables.
+												*/
+
+												//	FIXME:	Static	class	variables	are	dealt	with	else	where.
+
+												if	(	memberClass	==	MemberClass::NORMAL	)	{
+
+																NormalStructMember*	normalStructMember	=	(NormalStructMember	*)structMember;
+
+																const	DataType	*	memberDataType		=	normalStructMember->getDataType();	//	FIXME:	this	can	return	NULL
+																size_t											memberTypeSize		=	memberDataType->getSize();
+																int														memberOffset				=	normalStructMember->getOffset();
+																char	*											memberAddress			=	(char*)baseAddress	+	memberOffset;
+
+																if	(	(	searchAddress	>=	(char	*)memberAddress	)	&&
+																					(	searchAddress	<	(char	*)memberAddress	+	memberTypeSize	))	{
+
+																				memberFound	=	true;
+																				nameStream	<<	"."	<<	structMember->getName();
+																				errorCondition	=	getSubName(	nameStream,	searchAddress,	searchType,	memberAddress,	memberDataType);
+
+																}
+												}
+												memberIndex	++;
+								}
+
+								if	(!memberFound)	{
+												errorCondition	=	true;
+												errorStream	<<	"ERROR:	Bad	call	to	ClassicChkPtAgent::getCompositeSubName().	"
+																								<<	"The	searchAddress	("	<<	searchAddress	<<	")	"
+																								<<	"is	not	within	the	bounds	of	the	base-object	"
+																								<<	"("	<<	baseAddress	<<	".."
+																								<<	(void*)((char	*)baseAddress	+	baseTypeSize)	<<	")"	<<	std::endl;
+								}
+
+				}	else	{
+								errorCondition	=	true;
+								errorStream	<<	"ERROR:	Bad	call	to	ClassicChkPtAgent::getCompositeSubName().	The	address	in	"
+																				<<	"the	parameter	<searchAddress>	is	not	within	the	bounds	of	the	object	"
+																				<<	"at	<baseAddress>."	<<	std::endl;
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-bool ClassicChkPtAgent:: getSubName( std::ostream& nameStream,
-                                     void * searchAddress,
-                                     const DataType * searchType,
-                                     void * baseAddress,
-                                     const DataType * baseType ) {
-    bool   errorCondition = false;
-    size_t baseTypeSize =  baseType->getSize();
-
-    if ( ( searchAddress >= (char *)baseAddress ) &&
-         ( searchAddress < (char *)baseAddress + baseTypeSize)) {
-
-        if ( searchType == baseType ) {
-            if ( searchAddress != baseAddress ) {
-                errorCondition = true;
-                errorStream << "ERROR: Something is messed up. Misaligned pointer." << std::endl;
-                nameStream << " + " << ((long)searchAddress - (long)baseAddress);
-            }
-        } else {
-            TypeClass::e typeClass = baseType->getTypeClass();
-
-            if ( typeClass == TypeClass::COMPOSITE ) {
-                errorCondition = getCompositeSubName( nameStream, searchAddress, searchType, baseAddress, (const CompositeDataType *)baseType );
-            } else if ( typeClass == TypeClass::ARRAY ) {
-                errorCondition = getArraySubName( nameStream, searchAddress, searchType, baseAddress, (const ArrayDataType *)baseType );
-            } else {
-                errorCondition = true;
-                errorStream << "ERROR: The data-type of \"" << getLeftSideName() << " doesnt match what it's pointing to." << std::endl;
-            }
-        }
-    } else {
-        errorCondition = true;
-        errorStream << "ERROR: Bad call to ClassicChkPtAgent::getSubName(). "
-                    << "The searchAddress (" << searchAddress << ") "
-                    << "is not within the bounds of the base-object "
-                    << "(" << baseAddress << ".."
-                    << (void*)((char *)baseAddress + baseTypeSize) << ")" << std::endl;
-    }
-    return errorCondition;
+//	MEMBER	FUNCTION
+bool	ClassicChkPtAgent::	getSubName(	std::ostream&	nameStream,
+																																					void	*	searchAddress,
+																																					const	DataType	*	searchType,
+																																					void	*	baseAddress,
+																																					const	DataType	*	baseType	)	{
+				bool			errorCondition	=	false;
+				size_t	baseTypeSize	=		baseType->getSize();
+
+				if	(	(	searchAddress	>=	(char	*)baseAddress	)	&&
+									(	searchAddress	<	(char	*)baseAddress	+	baseTypeSize))	{
+
+								if	(	searchType	==	baseType	)	{
+												if	(	searchAddress	!=	baseAddress	)	{
+																errorCondition	=	true;
+																errorStream	<<	"ERROR:	Something	is	messed	up.	Misaligned	pointer."	<<	std::endl;
+																nameStream	<<	"	+	"	<<	((long)searchAddress	-	(long)baseAddress);
+												}
+								}	else	{
+												TypeClass::e	typeClass	=	baseType->getTypeClass();
+
+												if	(	typeClass	==	TypeClass::COMPOSITE	)	{
+																errorCondition	=	getCompositeSubName(	nameStream,	searchAddress,	searchType,	baseAddress,	(const	CompositeDataType	*)baseType	);
+												}	else	if	(	typeClass	==	TypeClass::ARRAY	)	{
+																errorCondition	=	getArraySubName(	nameStream,	searchAddress,	searchType,	baseAddress,	(const	ArrayDataType	*)baseType	);
+												}	else	{
+																errorCondition	=	true;
+																errorStream	<<	"ERROR:	The	data-type	of	\""	<<	getLeftSideName()	<<	"	doesnt	match	what	it's	pointing	to."	<<	std::endl;
+												}
+								}
+				}	else	{
+								errorCondition	=	true;
+								errorStream	<<	"ERROR:	Bad	call	to	ClassicChkPtAgent::getSubName().	"
+																				<<	"The	searchAddress	("	<<	searchAddress	<<	")	"
+																				<<	"is	not	within	the	bounds	of	the	base-object	"
+																				<<	"("	<<	baseAddress	<<	".."
+																				<<	(void*)((char	*)baseAddress	+	baseTypeSize)	<<	")"	<<	std::endl;
+				}
+				return	errorCondition;
 }
 
-// MEMBER FUNCTION
-int ClassicChkPtAgent:: restore( std::istream* checkpoint_stream) { return(0); }
+//	MEMBER	FUNCTION
+int	ClassicChkPtAgent::	restore(	std::istream*	checkpoint_stream)	{	return(0);	}
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: setReducedCheckpoint(bool flag) {
-    reducedCheckpoint = flag;
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	setReducedCheckpoint(bool	flag)	{
+				reducedCheckpoint	=	flag;
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: setHexfloatCheckpoint(bool flag) {
-    hexfloatCheckpoint = flag;
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	setHexfloatCheckpoint(bool	flag)	{
+				hexfloatCheckpoint	=	flag;
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: setMakeCompactArrays(bool flag) {
-    makeCompactArrays = flag;
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	setMakeCompactArrays(bool	flag)	{
+				makeCompactArrays	=	flag;
 }
 
-// MEMBER FUNCTION
-void ClassicChkPtAgent:: setDebugLevel(int level) { }
+//	MEMBER	FUNCTION
+void	ClassicChkPtAgent::	setDebugLevel(int	level)	{	}
diff --git a/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp b/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
index 242456ed4..26cb15d44 100644
--- a/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
@@ -1,349 +1,349 @@
-#include "TypeDictionary.hh"
-#include "CompositeDataType.hh"
-#include "CompositeValue.hh"
-#include "NormalStructMember.hh"
-#include "StaticStructMember.hh"
-#include "BitfieldStructMember.hh"
-#include "LexicalAnalyzer.hh"
-#include <iostream>
-
-CompositeDataType::CompositeDataType() {
-
-    this->is_valid = false;
-    this->structSize = 0;
+#include	"TypeDictionary.hh"
+#include	"CompositeDataType.hh"
+#include	"CompositeValue.hh"
+#include	"NormalStructMember.hh"
+#include	"StaticStructMember.hh"
+#include	"BitfieldStructMember.hh"
+#include	"LexicalAnalyzer.hh"
+#include	<iostream>
+
+CompositeDataType::CompositeDataType()	{
+
+				this->is_valid	=	false;
+				this->structSize	=	0;
 }
 
-// CONSTRUCTOR
-CompositeDataType::CompositeDataType( TypeDictionary* typeDictionary,
-                                      std::string name,
-                                      size_t structSize,
-                                      void* (*allocator)(int),
-                                      void (*deAllocator)(void*) ) {
-    this->is_valid = false;
-    this->name = name;
-    this->structSize = structSize;
-    this->allocator = allocator;
-    this->deAllocator = deAllocator;
-    this->typeDictionary = typeDictionary;
+//	CONSTRUCTOR
+CompositeDataType::CompositeDataType(	TypeDictionary*	typeDictionary,
+																																						std::string	name,
+																																						size_t	structSize,
+																																						void*	(*allocator)(int),
+																																						void	(*deAllocator)(void*)	)	{
+				this->is_valid	=	false;
+				this->name	=	name;
+				this->structSize	=	structSize;
+				this->allocator	=	allocator;
+				this->deAllocator	=	deAllocator;
+				this->typeDictionary	=	typeDictionary;
 }
 
-// CONSTRUCTOR
-CompositeDataType::CompositeDataType ( const CompositeDataType & original ) {
+//	CONSTRUCTOR
+CompositeDataType::CompositeDataType	(	const	CompositeDataType	&	original	)	{
 
-    this->structSize = original.structSize;
-    this->is_valid = original.is_valid;
+				this->structSize	=	original.structSize;
+				this->is_valid	=	original.is_valid;
 
-    int memberCount = original.memberList.size() ;
-    for (int ii=0; ii < memberCount ; ii++) {
-        StructMember* cloned_member = original.memberList[ii]->clone();
-        this->memberList.push_back( cloned_member );
-    }
+				int	memberCount	=	original.memberList.size()	;
+				for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+								StructMember*	cloned_member	=	original.memberList[ii]->clone();
+								this->memberList.push_back(	cloned_member	);
+				}
 }
 
-DataType * CompositeDataType::clone() const {
-    return new CompositeDataType( *this );
+DataType	*	CompositeDataType::clone()	const	{
+				return	new	CompositeDataType(	*this	);
 }
 
-// DESTRUCTOR
-CompositeDataType::~CompositeDataType() {
-    int memberCount = memberList.size() ;
-    for (int ii=0; ii < memberCount ; ii++) {
-        delete memberList[ii];
-    }
+//	DESTRUCTOR
+CompositeDataType::~CompositeDataType()	{
+				int	memberCount	=	memberList.size()	;
+				for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+								delete	memberList[ii];
+				}
 }
 
-bool CompositeDataType::validate() {
+bool	CompositeDataType::validate()	{
 
-    // FIXME: Check for circular dependencies.
-    // Also need a to check that this->subType (ptr) is not equal
-    // to any of the  member->subType's. Otherwise we will have a circular reference.
+				//	FIXME:	Check	for	circular	dependencies.
+				//	Also	need	a	to	check	that	this->subType	(ptr)	is	not	equal
+				//	to	any	of	the		member->subType's.	Otherwise	we	will	have	a	circular	reference.
 
-    if (!is_valid) {
+				if	(!is_valid)	{
 
-        is_valid = true;
+								is_valid	=	true;
 
-        int memberCount = memberList.size() ;
-        for (int ii=0 ; ii < memberCount ; ii++) {
-            is_valid = is_valid && memberList[ii]->validate();
-        }
+								int	memberCount	=	memberList.size()	;
+								for	(int	ii=0	;	ii	<	memberCount	;	ii++)	{
+												is_valid	=	is_valid	&&	memberList[ii]->validate();
+								}
 
-        /* FIXME: Also need to verify that the structSize is at least as great as the max
-        member offset plus the size of that member. This may require StructMember to have
-        virtual members for getSize and getOffset. Note that this has to work with bitfields. */
+								/*	FIXME:	Also	need	to	verify	that	the	structSize	is	at	least	as	great	as	the	max
+								member	offset	plus	the	size	of	that	member.	This	may	require	StructMember	to	have
+								virtual	members	for	getSize	and	getOffset.	Note	that	this	has	to	work	with	bitfields.	*/
 
-    }
-    return is_valid;
+				}
+				return	is_valid;
 }
 
-// MEMBER FUNCTION
-size_t CompositeDataType::getSize() const {
-    return structSize;
+//	MEMBER	FUNCTION
+size_t	CompositeDataType::getSize()	const	{
+				return	structSize;
 }
 
-// OPERATOR=
-CompositeDataType & CompositeDataType::operator=(const CompositeDataType & rhs)  {
-// FIXME:
-//    int memberCount;
-//    if (this != &rhs) {
-//        std::vector<StructMember*> new_member_list;
+//	OPERATOR=
+CompositeDataType	&	CompositeDataType::operator=(const	CompositeDataType	&	rhs)		{
+//	FIXME:
+//				int	memberCount;
+//				if	(this	!=	&rhs)	{
+//								std::vector<StructMember*>	new_member_list;
 //
-//        // Copy the RHS members before messing with the LHS.
-//        try {
-//            memberCount = rhs.memberList.size() ;
-//            for (int ii=0; ii < memberCount ; ii++) {
-//                StructMember* cloned_member = rhs.memberList[ii]->clone();
-//                new_member_list.push_back( cloned_member );
-//            }
-//        } catch (std::logic_error) {
-//            memberCount = new_member_list.size() ;
-//            for (int ii=0; ii < memberCount ; ii++) {
-//                delete new_member_list[ii];
-//            }
-//            throw;
-//        }
+//								//	Copy	the	RHS	members	before	messing	with	the	LHS.
+//								try	{
+//												memberCount	=	rhs.memberList.size()	;
+//												for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+//																StructMember*	cloned_member	=	rhs.memberList[ii]->clone();
+//																new_member_list.push_back(	cloned_member	);
+//												}
+//								}	catch	(std::logic_error)	{
+//												memberCount	=	new_member_list.size()	;
+//												for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+//																delete	new_member_list[ii];
+//												}
+//												throw;
+//								}
 //
-//        // Delete any pre-existing LHS members.
-//        memberCount = memberList.size() ;
-//        for (int ii=0; ii < memberCount ; ii++) {
-//            delete this->memberList[ii];
-//        }
+//								//	Delete	any	pre-existing	LHS	members.
+//								memberCount	=	memberList.size()	;
+//								for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+//												delete	this->memberList[ii];
+//								}
 //
-//        // Assign the copied RHS members to the LHS.
-//        memberCount = new_member_list.size() ;
-//        for (int ii=0; ii < memberCount ; ii++) {
-//            memberList.push_back( new_member_list[ii] );
-//        }
-//    }
-      return *this;
+//								//	Assign	the	copied	RHS	members	to	the	LHS.
+//								memberCount	=	new_member_list.size()	;
+//								for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+//												memberList.push_back(	new_member_list[ii]	);
+//								}
+//				}
+						return	*this;
 }
 
-// MEMBER FUNCTION
-bool CompositeDataType::containsPointer() const {
+//	MEMBER	FUNCTION
+bool	CompositeDataType::containsPointer()	const	{
 
-    int memberCount = memberList.size() ;
-    for (int ii=0; ii < memberCount ; ii++) {
-        if ( memberList[ii]->containsPointer() ) {
-            return true;
-        }
-    }
-    return false;
+				int	memberCount	=	memberList.size()	;
+				for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+								if	(	memberList[ii]->containsPointer()	)	{
+												return	true;
+								}
+				}
+				return	false;
 }
 
-// MEMBER FUNCTION
-void* CompositeDataType::createInstance(unsigned int num) const {
-
-    void* address;
-    if (allocator == NULL) {
-        // Allocate using calloc.
-        if ((address = calloc( (size_t)num, (size_t)structSize ))  == NULL) {
-            std::cerr << "ERROR: Out of memory." << std::endl;
-            return ((void*)NULL);
-        }
-    } else {
-        // Allocate using the allocator.
-        if ((address = allocator( num)) == NULL) {
-            std::cerr << "ERROR: Out of memory." << std::endl;
-            return ((void*)NULL);
-        }
-    }
-    return address;
+//	MEMBER	FUNCTION
+void*	CompositeDataType::createInstance(unsigned	int	num)	const	{
+
+				void*	address;
+				if	(allocator	==	NULL)	{
+								//	Allocate	using	calloc.
+								if	((address	=	calloc(	(size_t)num,	(size_t)structSize	))		==	NULL)	{
+												std::cerr	<<	"ERROR:	Out	of	memory."	<<	std::endl;
+												return	((void*)NULL);
+								}
+				}	else	{
+								//	Allocate	using	the	allocator.
+								if	((address	=	allocator(	num))	==	NULL)	{
+												std::cerr	<<	"ERROR:	Out	of	memory."	<<	std::endl;
+												return	((void*)NULL);
+								}
+				}
+				return	address;
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::deleteInstance(void* address) const {
-
-    if (allocator != NULL) {
-        if(deAllocator != NULL) {
-            deAllocator(address);
-        } else {
-            // FIXME: WARNING.
-        }
-    } else {
-        free(address);
-    }
+//	MEMBER	FUNCTION
+void	CompositeDataType::deleteInstance(void*	address)	const	{
+
+				if	(allocator	!=	NULL)	{
+								if(deAllocator	!=	NULL)	{
+												deAllocator(address);
+								}	else	{
+												//	FIXME:	WARNING.
+								}
+				}	else	{
+								free(address);
+				}
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::clearValue(void * address) const {
+//	MEMBER	FUNCTION
+void	CompositeDataType::clearValue(void	*	address)	const	{
 
-    int memberCount = memberList.size() ;
-    for (int ii=0; ii < memberCount ; ii++) {
-        memberList[ii]->clearValue( address);
-    }
+				int	memberCount	=	memberList.size()	;
+				for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+								memberList[ii]->clearValue(	address);
+				}
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::assignValue(void * address, Value * value) const {
+//	MEMBER	FUNCTION
+void	CompositeDataType::assignValue(void	*	address,	Value	*	value)	const	{
 
-    // Confirm that the value is a CompositeValue.
-    CompositeValue * composite_value = dynamic_cast<CompositeValue*>(value);
+				//	Confirm	that	the	value	is	a	CompositeValue.
+				CompositeValue	*	composite_value	=	dynamic_cast<CompositeValue*>(value);
 
-    if (composite_value) {
+				if	(composite_value)	{
 
-        int memberCount = memberList.size() ;
+								int	memberCount	=	memberList.size()	;
 
-        int num_values = composite_value->getMemberCount();
-        if ( memberCount != num_values) {
-            std::cerr << "ERROR: number of members (" << memberCount
-                      << ") and number of values (" << num_values
-                      << ") is not the same.";
-        }
+								int	num_values	=	composite_value->getMemberCount();
+								if	(	memberCount	!=	num_values)	{
+												std::cerr	<<	"ERROR:	number	of	members	("	<<	memberCount
+																						<<	")	and	number	of	values	("	<<	num_values
+																						<<	")	is	not	the	same.";
+								}
 
-        for (int ii=0; ii < memberCount ; ii++) {
-            memberList[ii]->assignValue( address, (*composite_value)[ii]);
-        }
+								for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+												memberList[ii]->assignValue(	address,	(*composite_value)[ii]);
+								}
 
-    } else {
-        std::cerr << "ERROR: Cannot assign a non-composite value to a composite type.";
-    }
+				}	else	{
+								std::cerr	<<	"ERROR:	Cannot	assign	a	non-composite	value	to	a	composite	type.";
+				}
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::printValue(std::ostream &s, void *address) const {
-
-   int memberCount = memberList.size() ;
-   s << "{";
-   for (int ii=0; ii < memberCount ; ii++) {
-       if (ii) {
-           s << ", ";
-       }
-       memberList[ii]->printValue(s, address);
-   }
-   s << "}";
+//	MEMBER	FUNCTION
+void	CompositeDataType::printValue(std::ostream	&s,	void	*address)	const	{
+
+			int	memberCount	=	memberList.size()	;
+			s	<<	"{";
+			for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+							if	(ii)	{
+											s	<<	",	";
+							}
+							memberList[ii]->printValue(s,	address);
+			}
+			s	<<	"}";
 }
 
-// MEMBER FUNCTION
-std::string CompositeDataType::toString() const {
-   std::stringstream ss;
-   int memberCount = memberList.size() ;
-   ss << "composite {\n";
-   for (int ii=0; ii < memberCount ; ii++) {
-       ss << memberList[ii]->toString();
-       ss << ";\n";
-   }
-   ss << "}\n";
-   return ss.str();
+//	MEMBER	FUNCTION
+std::string	CompositeDataType::toString()	const	{
+			std::stringstream	ss;
+			int	memberCount	=	memberList.size()	;
+			ss	<<	"composite	{\n";
+			for	(int	ii=0;	ii	<	memberCount	;	ii++)	{
+							ss	<<	memberList[ii]->toString();
+							ss	<<	";\n";
+			}
+			ss	<<	"}\n";
+			return	ss.str();
 }
 
-// MEMBER FUNCTION
-std::string CompositeDataType::getTypeSpecName() const {
-    return name;
+//	MEMBER	FUNCTION
+std::string	CompositeDataType::getTypeSpecName()	const	{
+				return	name;
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::addRegularMember( std::string memberName,
-                                               int member_offset,
-                                               std::string typeSpecName,
-                                               unsigned int n_dims,
-                                               int dims[] )  {
-
-    int memberCount = memberList.size() ;
-    for (int ii=0 ; ii < memberCount ; ii++) {
-        if (memberName == memberList[ii]->getName()) {
-            std::stringstream error_stream ;
-            error_stream << "ERROR: Attempt to re-define member \"" << memberName << "\"." << std::endl;
-            throw std::logic_error( error_stream.str());
-        }
-    }
-
-    memberList.push_back(
-        new NormalStructMember(memberName, member_offset, typeDictionary, typeSpecName, n_dims, dims)
-    );
+//	MEMBER	FUNCTION
+void	CompositeDataType::addRegularMember(	std::string	memberName,
+																																															int	member_offset,
+																																															std::string	typeSpecName,
+																																															unsigned	int	n_dims,
+																																															int	dims[]	)		{
+
+				int	memberCount	=	memberList.size()	;
+				for	(int	ii=0	;	ii	<	memberCount	;	ii++)	{
+								if	(memberName	==	memberList[ii]->getName())	{
+												std::stringstream	error_stream	;
+												error_stream	<<	"ERROR:	Attempt	to	re-define	member	\""	<<	memberName	<<	"\"."	<<	std::endl;
+												throw	std::logic_error(	error_stream.str());
+								}
+				}
+
+				memberList.push_back(
+								new	NormalStructMember(memberName,	member_offset,	typeDictionary,	typeSpecName,	n_dims,	dims)
+				);
 }
 
-// MEMBER FUNCTION
-void CompositeDataType::addStaticMember( std::string memberName,
-                                         void * memberAddress,
-                                         std::string typeSpecName,
-                                         unsigned int n_dims,
-                                         int dims[] )  {
-
-    int memberCount = memberList.size() ;
-    for (int ii=0 ; ii < memberCount ; ii++) {
-        if (memberName == memberList[ii]->getName()) {
-            std::stringstream error_stream ;
-            error_stream << "ERROR: Attempt to re-define member \"" << memberName << "\"." << std::endl;
-            throw std::logic_error( error_stream.str());
-        }
-    }
-
-    memberList.push_back(
-        new StaticStructMember( memberName, memberAddress, typeDictionary, typeSpecName, n_dims, dims )
-    );
+//	MEMBER	FUNCTION
+void	CompositeDataType::addStaticMember(	std::string	memberName,
+																																									void	*	memberAddress,
+																																									std::string	typeSpecName,
+																																									unsigned	int	n_dims,
+																																									int	dims[]	)		{
+
+				int	memberCount	=	memberList.size()	;
+				for	(int	ii=0	;	ii	<	memberCount	;	ii++)	{
+								if	(memberName	==	memberList[ii]->getName())	{
+												std::stringstream	error_stream	;
+												error_stream	<<	"ERROR:	Attempt	to	re-define	member	\""	<<	memberName	<<	"\"."	<<	std::endl;
+												throw	std::logic_error(	error_stream.str());
+								}
+				}
+
+				memberList.push_back(
+								new	StaticStructMember(	memberName,	memberAddress,	typeDictionary,	typeSpecName,	n_dims,	dims	)
+				);
 
 }
 
 
-// MEMBER FUNCTION
-int CompositeDataType::getMemberCount() const {
-    return ( (int)memberList.size() );
+//	MEMBER	FUNCTION
+int	CompositeDataType::getMemberCount()	const	{
+				return	(	(int)memberList.size()	);
 }
 
-// MEMBER FUNCTION
-StructMember* CompositeDataType::getStructMember (const int index) const {
-    return ( memberList[index] );
+//	MEMBER	FUNCTION
+StructMember*	CompositeDataType::getStructMember	(const	int	index)	const	{
+				return	(	memberList[index]	);
 }
 
-#ifdef NEWSTUFF
-// MEMBER FUNCTION
-bool CompositeDataType::getMemberInfo( LexicalAnalyzer* lexer, void* baseAddress, VarAccessInfo& varAccessInfo ) {
-
-    bool errorCondition = false;
-
-    Token::e nextToken = lexer->getToken();
-
-    if (nextToken == Token::Identifier) {
-        std::string memberName = lexer->getText();
-        int memberCount = memberList.size() ;
-        int ii = 0;
-        while ( (ii < memberCount) &&
-                (memberName != memberList[ii]->getName())) {
-            ii ++;
-        }
-        if (ii < memberCount) {
-            StructMember*             member = memberList[ii];
-            MemberClass::e       memberClass = member->getMemberClass();
-            const DataType*   memberDataType = member->getDataType();
-            TypeClass::e memberDataTypeClass = memberDataType->getTypeClass();
-
-            void* memberAddress = NULL;
-            if ( memberClass == MemberClass::BITFIELD ) {
-                memberAddress = baseAddress;
-            } else if ( memberClass == MemberClass::STATIC ) {
-                memberAddress = ((StaticStructMember*)member)->getAddress();
-            } else if ( memberClass == MemberClass::NORMAL ) {
-                memberAddress =  baseAddress + ((NormalStructMember*)member)->getOffset() ;
-            } else {
-                errorCondition = true;
-            }
-
-            if (!errorCondition) {
-                nextToken = lexer->getToken();
-                if (nextToken == Token::EndOfFile) {
-                    varAccessInfo.dataType = memberDataType;
-                    varAccessInfo.address = memberAddress;
-                } else if (nextToken == Token::period) {
-                    if (memberDataTypeClass == TypeClass::COMPOSITE) {
-                        errorCondition |= ((const CompositeDataType*)memberDataType)->getMemberInfo( lexer, memberAddress, varAccessInfo);
-                    } else {
-                        errorCondition = true;
-                    }
-                } else if (nextToken == Token::LeftBracket) {
-                    if ( typeClass == TypeClass::ARRAY ) {
-                        errorCondition |= ((const ArrayDataType*)searchType)->getElementInfo( lexer, memberAddress, varAccessInfo);
-                    } else {
-                        errorCondition = true;
-                    }
-                } else {
-                    errorCondition = true;
-                }
-            }
-        } else {
-            errorCondition = true;
-        }
-    } else {
-        errorCondition = true;
-    }
-    return errorCondition;
+#ifdef	NEWSTUFF
+//	MEMBER	FUNCTION
+bool	CompositeDataType::getMemberInfo(	LexicalAnalyzer*	lexer,	void*	baseAddress,	VarAccessInfo&	varAccessInfo	)	{
+
+				bool	errorCondition	=	false;
+
+				Token::e	nextToken	=	lexer->getToken();
+
+				if	(nextToken	==	Token::Identifier)	{
+								std::string	memberName	=	lexer->getText();
+								int	memberCount	=	memberList.size()	;
+								int	ii	=	0;
+								while	(	(ii	<	memberCount)	&&
+																(memberName	!=	memberList[ii]->getName()))	{
+												ii	++;
+								}
+								if	(ii	<	memberCount)	{
+												StructMember*													member	=	memberList[ii];
+												MemberClass::e							memberClass	=	member->getMemberClass();
+												const	DataType*			memberDataType	=	member->getDataType();
+												TypeClass::e	memberDataTypeClass	=	memberDataType->getTypeClass();
+
+												void*	memberAddress	=	NULL;
+												if	(	memberClass	==	MemberClass::BITFIELD	)	{
+																memberAddress	=	baseAddress;
+												}	else	if	(	memberClass	==	MemberClass::STATIC	)	{
+																memberAddress	=	((StaticStructMember*)member)->getAddress();
+												}	else	if	(	memberClass	==	MemberClass::NORMAL	)	{
+																memberAddress	=		baseAddress	+	((NormalStructMember*)member)->getOffset()	;
+												}	else	{
+																errorCondition	=	true;
+												}
+
+												if	(!errorCondition)	{
+																nextToken	=	lexer->getToken();
+																if	(nextToken	==	Token::EndOfFile)	{
+																				varAccessInfo.dataType	=	memberDataType;
+																				varAccessInfo.address	=	memberAddress;
+																}	else	if	(nextToken	==	Token::period)	{
+																				if	(memberDataTypeClass	==	TypeClass::COMPOSITE)	{
+																								errorCondition	|=	((const	CompositeDataType*)memberDataType)->getMemberInfo(	lexer,	memberAddress,	varAccessInfo);
+																				}	else	{
+																								errorCondition	=	true;
+																				}
+																}	else	if	(nextToken	==	Token::LeftBracket)	{
+																				if	(	typeClass	==	TypeClass::ARRAY	)	{
+																								errorCondition	|=	((const	ArrayDataType*)searchType)->getElementInfo(	lexer,	memberAddress,	varAccessInfo);
+																				}	else	{
+																								errorCondition	=	true;
+																				}
+																}	else	{
+																				errorCondition	=	true;
+																}
+												}
+								}	else	{
+												errorCondition	=	true;
+								}
+				}	else	{
+								errorCondition	=	true;
+				}
+				return	errorCondition;
 }
 #endif
diff --git a/trick_source/sim_services/DataTypes/src/CompositeValue.cpp b/trick_source/sim_services/DataTypes/src/CompositeValue.cpp
index 33892c8f9..23364b9cc 100644
--- a/trick_source/sim_services/DataTypes/src/CompositeValue.cpp
+++ b/trick_source/sim_services/DataTypes/src/CompositeValue.cpp
@@ -1,55 +1,55 @@
-#include "CompositeValue.hh"
-#include <sstream>
-
-// DESTRUCTOR
-CompositeValue::~CompositeValue() {
-    int n = member_list.size();
-    for (int ii= 0 ; ii < n; ii++) {
-        delete( member_list[ii] );
-    }
+#include	"CompositeValue.hh"
+#include	<sstream>
+
+//	DESTRUCTOR
+CompositeValue::~CompositeValue()	{
+				int	n	=	member_list.size();
+				for	(int	ii=	0	;	ii	<	n;	ii++)	{
+								delete(	member_list[ii]	);
+				}
 }
 
-// MEMBER FUNCTION
-void CompositeValue::addMember(Value* value) {
-    member_list.push_back(value);
+//	MEMBER	FUNCTION
+void	CompositeValue::addMember(Value*	value)	{
+				member_list.push_back(value);
 }
 
-// MEMBER FUNCTION
-int CompositeValue::getMemberCount() {
-    return ( (int)member_list.size() );
+//	MEMBER	FUNCTION
+int	CompositeValue::getMemberCount()	{
+				return	(	(int)member_list.size()	);
 }
 
-// MEMBER FUNCTION
-Value*&  CompositeValue::operator[] (const int index) {
-    return ( member_list[index] );
+//	MEMBER	FUNCTION
+Value*&		CompositeValue::operator[]	(const	int	index)	{
+				return	(	member_list[index]	);
 }
 
-// MEMBER FUNCTION
-void  CompositeValue::print(std::ostream &s) {
-   int n = member_list.size();
-    s << "{";
-    for (int ii= 0 ; ii < n; ii++) {
-        if (ii != 0) {
-            s << ",";
-        }
-        member_list[ii]->print(s);
-    }
-    s << "}";
+//	MEMBER	FUNCTION
+void		CompositeValue::print(std::ostream	&s)	{
+			int	n	=	member_list.size();
+				s	<<	"{";
+				for	(int	ii=	0	;	ii	<	n;	ii++)	{
+								if	(ii	!=	0)	{
+												s	<<	",";
+								}
+								member_list[ii]->print(s);
+				}
+				s	<<	"}";
 }
 
-// MEMBER FUNCTION
-std::string  CompositeValue::toString() {
-   std::ostringstream oss;
-
-   int n = member_list.size();
-    oss << "{";
-    for (int ii= 0 ; ii < n; ii++) {
-        if (ii != 0) {
-            oss << ",";
-        }
-        oss << member_list[ii]->toString();
-    }
-    oss << "}";
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string		CompositeValue::toString()	{
+			std::ostringstream	oss;
+
+			int	n	=	member_list.size();
+				oss	<<	"{";
+				for	(int	ii=	0	;	ii	<	n;	ii++)	{
+								if	(ii	!=	0)	{
+												oss	<<	",";
+								}
+								oss	<<	member_list[ii]->toString();
+				}
+				oss	<<	"}";
+				return	oss.str();
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/DataType.cpp b/trick_source/sim_services/DataTypes/src/DataType.cpp
index dab0e3e8b..bf3790eaa 100644
--- a/trick_source/sim_services/DataTypes/src/DataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/DataType.cpp
@@ -1,38 +1,38 @@
-#include "DataType.hh"
-#include <sstream>
+#include	"DataType.hh"
+#include	<sstream>
 
 /*
-    type-name: type-specifier
-             | type-specifier declarator
-             ;
+				type-name:	type-specifier
+													|	type-specifier	declarator
+													;
 
-    declarator : pointer
-               | pointer direct-declarator
-               | direct-declarator
-               ;
+				declarator	:	pointer
+															|	pointer	direct-declarator
+															|	direct-declarator
+															;
 
-    direct-declarator: identifier
-                     | ( declarator )
-                     | [ constant-exp ]
-                     | [ ]
-                     | direct-declarator [ constant-exp ]
-                     | direct-declarator [ ]
-                     ;
+				direct-declarator:	identifier
+																					|	(	declarator	)
+																					|	[	constant-exp	]
+																					|	[	]
+																					|	direct-declarator	[	constant-exp	]
+																					|	direct-declarator	[	]
+																					;
 */
 
-// VIRTUAL MEMBER FUNCTION
-// NOTE: PointerDataType and ArrayDataType overrides this member-function.
-std::string DataType::makeDeclaration(std::string declarator, bool isDirectDeclarator) const {
-    std::stringstream ss;
-    if (declarator.empty()) {
-        ss << getTypeSpecName();
-    } else {
-        ss << getTypeSpecName() << " " << declarator ;
-    }
-    return ss.str();
+//	VIRTUAL	MEMBER	FUNCTION
+//	NOTE:	PointerDataType	and	ArrayDataType	overrides	this	member-function.
+std::string	DataType::makeDeclaration(std::string	declarator,	bool	isDirectDeclarator)	const	{
+				std::stringstream	ss;
+				if	(declarator.empty())	{
+								ss	<<	getTypeSpecName();
+				}	else	{
+								ss	<<	getTypeSpecName()	<<	"	"	<<	declarator	;
+				}
+				return	ss.str();
 }
 
-// VIRTUAL MEMBER FUNCTION
-std::string DataType::toString() const {
-    return makeDeclaration("", true);
+//	VIRTUAL	MEMBER	FUNCTION
+std::string	DataType::toString()	const	{
+				return	makeDeclaration("",	true);
 }
diff --git a/trick_source/sim_services/DataTypes/src/EnumDataType.cpp b/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
index c63dcadf4..7b94482a0 100644
--- a/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
@@ -1,193 +1,193 @@
-#include "EnumDataType.hh"
-#include "EnumDictionary.hh"
-#include "NumericValue.hh"
-#include "IntegerValue.hh"
-#include <iostream>
-#include <sstream>
-
-EnumDataType::EnumDataType( EnumDictionary * enumDictionary,
-                            std::string name,
-                            size_t enumSize) {
-
-    if ((enumSize == sizeof(int)) || (enumSize == sizeof(short)) || (enumSize == sizeof(char))) {
-        this->enumSize = enumSize;
-    } // FIXME: else throw?
-
-    this->enumDictionary = enumDictionary;
-    this->name = name;
+#include	"EnumDataType.hh"
+#include	"EnumDictionary.hh"
+#include	"NumericValue.hh"
+#include	"IntegerValue.hh"
+#include	<iostream>
+#include	<sstream>
+
+EnumDataType::EnumDataType(	EnumDictionary	*	enumDictionary,
+																												std::string	name,
+																												size_t	enumSize)	{
+
+				if	((enumSize	==	sizeof(int))	||	(enumSize	==	sizeof(short))	||	(enumSize	==	sizeof(char)))	{
+								this->enumSize	=	enumSize;
+				}	//	FIXME:	else	throw?
+
+				this->enumDictionary	=	enumDictionary;
+				this->name	=	name;
 }
 
-/* ==================================================================== */
-/*                         RULE OF THREE INTERFACE                      */
-/* ==================================================================== */
+/*	====================================================================	*/
+/*																									RULE	OF	THREE	INTERFACE																						*/
+/*	====================================================================	*/
 
-EnumDataType::EnumDataType ( const EnumDataType & original ) {
-   this->enumSize = original.enumSize;
+EnumDataType::EnumDataType	(	const	EnumDataType	&	original	)	{
+			this->enumSize	=	original.enumSize;
 
-   int enum_count = original.enum_list.size() ;
-   for (int ii=0; ii < enum_count ; ii++) {
-       Enumerator* dupl_enum = new Enumerator( *original.enum_list[ii]);
-       this->enum_list.push_back( dupl_enum );
-   }
+			int	enum_count	=	original.enum_list.size()	;
+			for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+							Enumerator*	dupl_enum	=	new	Enumerator(	*original.enum_list[ii]);
+							this->enum_list.push_back(	dupl_enum	);
+			}
 }
 
-EnumDataType::~EnumDataType () {
+EnumDataType::~EnumDataType	()	{
 
-    int enum_count = enum_list.size() ;
-    for (int ii=0; ii < enum_count ; ii++) {
-        delete enum_list[ii];
-    }
+				int	enum_count	=	enum_list.size()	;
+				for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+								delete	enum_list[ii];
+				}
 }
 
-EnumDataType & EnumDataType::operator=( const EnumDataType & rhs ) {
-    if (this != &rhs) {
-
-        std::vector<Enumerator*> new_enum_list;
-        int enum_count;
-
-        // Copy the RHS members before messing with the LHS.
-        try {
-            enum_count = rhs.enum_list.size() ;
-            for (int ii=0; ii < enum_count ; ii++) {
-                Enumerator* dupl_enum = new Enumerator( *rhs.enum_list[ii]);
-                new_enum_list.push_back( dupl_enum );
-            }
-        } catch (std::logic_error) {
-            enum_count = new_enum_list.size() ;
-            for (int ii=0; ii < enum_count ; ii++) {
-                delete new_enum_list[ii];
-            }
-            throw;
-        }
-
-        // Delete any pre-existing LHS members.
-        enum_count = enum_list.size() ;
-        for (int ii=0; ii < enum_count ; ii++) {
-            delete this->enum_list[ii];
-        }
-
-        // Assign the copied RHS members to the LHS.
-        enum_count = new_enum_list.size() ;
-        for (int ii=0; ii < enum_count ; ii++) {
-            enum_list.push_back( new_enum_list[ii] );
-        }
-
-    }
-    return *this;
+EnumDataType	&	EnumDataType::operator=(	const	EnumDataType	&	rhs	)	{
+				if	(this	!=	&rhs)	{
+
+								std::vector<Enumerator*>	new_enum_list;
+								int	enum_count;
+
+								//	Copy	the	RHS	members	before	messing	with	the	LHS.
+								try	{
+												enum_count	=	rhs.enum_list.size()	;
+												for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+																Enumerator*	dupl_enum	=	new	Enumerator(	*rhs.enum_list[ii]);
+																new_enum_list.push_back(	dupl_enum	);
+												}
+								}	catch	(std::logic_error)	{
+												enum_count	=	new_enum_list.size()	;
+												for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+																delete	new_enum_list[ii];
+												}
+												throw;
+								}
+
+								//	Delete	any	pre-existing	LHS	members.
+								enum_count	=	enum_list.size()	;
+								for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+												delete	this->enum_list[ii];
+								}
+
+								//	Assign	the	copied	RHS	members	to	the	LHS.
+								enum_count	=	new_enum_list.size()	;
+								for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+												enum_list.push_back(	new_enum_list[ii]	);
+								}
+
+				}
+				return	*this;
 }
 
-/* ==================================================================== */
-/*                           VIRTUAL INTERFACE                          */
-/* ==================================================================== */
+/*	====================================================================	*/
+/*																											VIRTUAL	INTERFACE																										*/
+/*	====================================================================	*/
 
-DataType * EnumDataType::clone () const {
-    return new EnumDataType( *this );
+DataType	*	EnumDataType::clone	()	const	{
+				return	new	EnumDataType(	*this	);
 }
 
-bool EnumDataType::validate() {
-    return true;
+bool	EnumDataType::validate()	{
+				return	true;
 }
 
-size_t EnumDataType::getSize() const {
-    return enumSize;
+size_t	EnumDataType::getSize()	const	{
+				return	enumSize;
 }
 
-void* EnumDataType::createInstance(unsigned int num) const {
-    void* temp = (void*)calloc(num, enumSize);
-    return temp;
+void*	EnumDataType::createInstance(unsigned	int	num)	const	{
+				void*	temp	=	(void*)calloc(num,	enumSize);
+				return	temp;
 }
 
-void EnumDataType::deleteInstance(void* address) const {
-    free(address);
+void	EnumDataType::deleteInstance(void*	address)	const	{
+				free(address);
 }
 
-void EnumDataType::clearValue(void * address) const {
-
-   if (enumSize == sizeof(int)) {
-       *(int*)address = 0;
-   } else if (enumSize == sizeof(short)) {
-       *(short*)address = 0;
-   } else if (enumSize == sizeof(char)) {
-       *(char*)address = 0;
-   } else {
-       std::cerr << "ERROR: Enumeration of size " << enumSize << "is not supported.";
-   }
+void	EnumDataType::clearValue(void	*	address)	const	{
+
+			if	(enumSize	==	sizeof(int))	{
+							*(int*)address	=	0;
+			}	else	if	(enumSize	==	sizeof(short))	{
+							*(short*)address	=	0;
+			}	else	if	(enumSize	==	sizeof(char))	{
+							*(char*)address	=	0;
+			}	else	{
+							std::cerr	<<	"ERROR:	Enumeration	of	size	"	<<	enumSize	<<	"is	not	supported.";
+			}
 }
 
-void EnumDataType::assignValue(void * address, Value * value) const {
-
-    NumericValue * numeric_value_p = dynamic_cast<NumericValue*>(value);
-    if (numeric_value_p) {
-
-       if (enumSize == sizeof(int)) {
-           *(int*)address =  numeric_value_p->getIntegerValue();
-       } else if (enumSize == sizeof(short)) {
-           *(short*)address =  numeric_value_p->getIntegerValue();
-       } else if (enumSize == sizeof(char)) {
-           *(char*)address =  numeric_value_p->getIntegerValue();
-       } else {
-           std::cerr << "ERROR: Enumeration of size " << enumSize << "is not supported.";
-       }
-    } else {
-        std::cerr << "ERROR: Attempt to assign non-numeric value to a numeric type.";
-    }
+void	EnumDataType::assignValue(void	*	address,	Value	*	value)	const	{
+
+				NumericValue	*	numeric_value_p	=	dynamic_cast<NumericValue*>(value);
+				if	(numeric_value_p)	{
+
+							if	(enumSize	==	sizeof(int))	{
+											*(int*)address	=		numeric_value_p->getIntegerValue();
+							}	else	if	(enumSize	==	sizeof(short))	{
+											*(short*)address	=		numeric_value_p->getIntegerValue();
+							}	else	if	(enumSize	==	sizeof(char))	{
+											*(char*)address	=		numeric_value_p->getIntegerValue();
+							}	else	{
+											std::cerr	<<	"ERROR:	Enumeration	of	size	"	<<	enumSize	<<	"is	not	supported.";
+							}
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	assign	non-numeric	value	to	a	numeric	type.";
+				}
 }
 
-void EnumDataType::printValue(std::ostream &s, void *address) const {
-
-    int value;
-
-    if (enumSize == sizeof(int)) {
-        value = *(int*)address;
-    } else if (enumSize == sizeof(short)) {
-        value = *(short*)address;
-    } else if (enumSize == sizeof(char)) {
-        value = *(char*)address;
-    } else {
-        std::cerr << "ERROR: Enumeration of size " << enumSize << "is not supported.";
-    }
-
-    // search the enum_list for the name/value pair.
-    int enum_count = enum_list.size() ;
-    int ii = 0;
-    bool found = false;
-    while ((ii < enum_count) && !found ) {
-        if (value == enum_list[ii]->getValue()) {
-             s << enum_list[ii]->getName();
-             found = true;
-        }
-        ii ++;
-    }
-    if (!found) {
-        s << value;
-    }
+void	EnumDataType::printValue(std::ostream	&s,	void	*address)	const	{
+
+				int	value;
+
+				if	(enumSize	==	sizeof(int))	{
+								value	=	*(int*)address;
+				}	else	if	(enumSize	==	sizeof(short))	{
+								value	=	*(short*)address;
+				}	else	if	(enumSize	==	sizeof(char))	{
+								value	=	*(char*)address;
+				}	else	{
+								std::cerr	<<	"ERROR:	Enumeration	of	size	"	<<	enumSize	<<	"is	not	supported.";
+				}
+
+				//	search	the	enum_list	for	the	name/value	pair.
+				int	enum_count	=	enum_list.size()	;
+				int	ii	=	0;
+				bool	found	=	false;
+				while	((ii	<	enum_count)	&&	!found	)	{
+								if	(value	==	enum_list[ii]->getValue())	{
+													s	<<	enum_list[ii]->getName();
+													found	=	true;
+								}
+								ii	++;
+				}
+				if	(!found)	{
+								s	<<	value;
+				}
 }
 
-// MEMBER FUNCTION
-std::string EnumDataType::toString() const {
-    std::stringstream ss;
-    int enum_count = enum_list.size() ;
-    ss << "enum {\n";
-    for (int ii=0; ii < enum_count ; ii++) {
-        if (ii) {
-            ss << ",\n";
-        }
-        ss << enum_list[ii]->toString();
-    }
-    ss << "}\n";
-    return ss.str();
+//	MEMBER	FUNCTION
+std::string	EnumDataType::toString()	const	{
+				std::stringstream	ss;
+				int	enum_count	=	enum_list.size()	;
+				ss	<<	"enum	{\n";
+				for	(int	ii=0;	ii	<	enum_count	;	ii++)	{
+								if	(ii)	{
+												ss	<<	",\n";
+								}
+								ss	<<	enum_list[ii]->toString();
+				}
+				ss	<<	"}\n";
+				return	ss.str();
 }
 
 
-// MEMBER FUNCTION
-std::string EnumDataType::getTypeSpecName() const {
-    return name;
+//	MEMBER	FUNCTION
+std::string	EnumDataType::getTypeSpecName()	const	{
+				return	name;
 }
 
-void EnumDataType::addEnumerator( std::string name, int value)  {
+void	EnumDataType::addEnumerator(	std::string	name,	int	value)		{
 
-    Enumerator* enumerator = new Enumerator( name, value );
-    enum_list.push_back(enumerator);
+				Enumerator*	enumerator	=	new	Enumerator(	name,	value	);
+				enum_list.push_back(enumerator);
 
-    enumDictionary->addEnumerator(name, value);
+				enumDictionary->addEnumerator(name,	value);
 }
diff --git a/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp b/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
index b7f0a85ee..14f848728 100644
--- a/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
+++ b/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
@@ -1,41 +1,41 @@
-#include <iostream>
-#include <sstream>
-#include "EnumDictionary.hh"
-
-int EnumDictionary::getValue(std::string name )  {
-
-    enumDictionaryIterator = enumDictionary.find(name);
-    if (enumDictionaryIterator == enumDictionary.end()) {
-        std::stringstream error_stream ;
-        error_stream << "ERROR: Enumerator \"" << name << "\" not defined." << std::endl;
-        throw std::logic_error( error_stream.str());
-    } else {
-        return( enumDictionaryIterator->second );
-    }
+#include	<iostream>
+#include	<sstream>
+#include	"EnumDictionary.hh"
+
+int	EnumDictionary::getValue(std::string	name	)		{
+
+				enumDictionaryIterator	=	enumDictionary.find(name);
+				if	(enumDictionaryIterator	==	enumDictionary.end())	{
+								std::stringstream	error_stream	;
+								error_stream	<<	"ERROR:	Enumerator	\""	<<	name	<<	"\"	not	defined."	<<	std::endl;
+								throw	std::logic_error(	error_stream.str());
+				}	else	{
+								return(	enumDictionaryIterator->second	);
+				}
 }
 
-void EnumDictionary::addEnumerator(std::string name, int value)  {
+void	EnumDictionary::addEnumerator(std::string	name,	int	value)		{
 
-    enumDictionaryIterator = enumDictionary.find(name);
-    if (enumDictionaryIterator == enumDictionary.end()) {
-        enumDictionary[name] = value;
-    } else {
-        std::stringstream error_stream ;
-        error_stream << "ERROR: Attempt to re-define enumerator \"" << name << "\"." << std::endl;
-        throw std::logic_error( error_stream.str());
-    }
+				enumDictionaryIterator	=	enumDictionary.find(name);
+				if	(enumDictionaryIterator	==	enumDictionary.end())	{
+								enumDictionary[name]	=	value;
+				}	else	{
+								std::stringstream	error_stream	;
+								error_stream	<<	"ERROR:	Attempt	to	re-define	enumerator	\""	<<	name	<<	"\"."	<<	std::endl;
+								throw	std::logic_error(	error_stream.str());
+				}
 }
 
-// MEMBER FUNCTION
-std::string EnumDictionary::toString() {
-    std::ostringstream oss;
+//	MEMBER	FUNCTION
+std::string	EnumDictionary::toString()	{
+				std::ostringstream	oss;
 
-    for ( enumDictionaryIterator  = enumDictionary.begin();
-          enumDictionaryIterator != enumDictionary.end();
-          enumDictionaryIterator++ ) {
+				for	(	enumDictionaryIterator		=	enumDictionary.begin();
+										enumDictionaryIterator	!=	enumDictionary.end();
+										enumDictionaryIterator++	)	{
 
-        oss << enumDictionaryIterator->first << " = " << enumDictionaryIterator->second << std::endl;
-    }
-    return oss.str();
+								oss	<<	enumDictionaryIterator->first	<<	"	=	"	<<	enumDictionaryIterator->second	<<	std::endl;
+				}
+				return	oss.str();
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/Enumerator.cpp b/trick_source/sim_services/DataTypes/src/Enumerator.cpp
index 199504e98..58927b8e3 100644
--- a/trick_source/sim_services/DataTypes/src/Enumerator.cpp
+++ b/trick_source/sim_services/DataTypes/src/Enumerator.cpp
@@ -1,31 +1,31 @@
-#include "Enumerator.hh"
-#include "Enumerator.hh"
-#include <sstream>
+#include	"Enumerator.hh"
+#include	"Enumerator.hh"
+#include	<sstream>
 
-Enumerator::Enumerator( std::string name, int value) {
-    this->name = name;
-    this->value = value;
+Enumerator::Enumerator(	std::string	name,	int	value)	{
+				this->name	=	name;
+				this->value	=	value;
 }
 
-Enumerator::Enumerator( const Enumerator& original) {
-    this->name = original.name;
-    this->value = original.value;
+Enumerator::Enumerator(	const	Enumerator&	original)	{
+				this->name	=	original.name;
+				this->value	=	original.value;
 }
 
-std::string Enumerator::getName() {
-    return name;
+std::string	Enumerator::getName()	{
+				return	name;
 }
 
-int Enumerator::getValue() {
-    return value;
+int	Enumerator::getValue()	{
+				return	value;
 }
 
-// MEMBER FUNCTION
-std::string Enumerator::toString() {
-    std::ostringstream oss;
-    oss << getName();
-    oss << " = ";
-    oss << getValue();
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	Enumerator::toString()	{
+				std::ostringstream	oss;
+				oss	<<	getName();
+				oss	<<	"	=	";
+				oss	<<	getValue();
+				return	oss.str();
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/FloatingPointValue.cpp b/trick_source/sim_services/DataTypes/src/FloatingPointValue.cpp
index 93f8c593c..942ef082e 100644
--- a/trick_source/sim_services/DataTypes/src/FloatingPointValue.cpp
+++ b/trick_source/sim_services/DataTypes/src/FloatingPointValue.cpp
@@ -1,31 +1,31 @@
-#include "FloatingPointValue.hh"
-#include "IntegerValue.hh"
-#include <sstream>
+#include	"FloatingPointValue.hh"
+#include	"IntegerValue.hh"
+#include	<sstream>
 
-// CONSTRUCTOR
-FloatingPointValue::FloatingPointValue(double value) {
-    this->value = value;
+//	CONSTRUCTOR
+FloatingPointValue::FloatingPointValue(double	value)	{
+				this->value	=	value;
 };
 
-// MEMBER FUNCTION
-void FloatingPointValue::print(std::ostream &s) {
-    s << value;
+//	MEMBER	FUNCTION
+void	FloatingPointValue::print(std::ostream	&s)	{
+				s	<<	value;
 }
 
-// MEMBER FUNCTION
-std::string FloatingPointValue::toString() {
-    std::ostringstream oss;
-    oss << value;
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	FloatingPointValue::toString()	{
+				std::ostringstream	oss;
+				oss	<<	value;
+				return	oss.str();
 }
 
-// MEMBER FUNCTION
-double FloatingPointValue::getFloatingPointValue() {
-    return (double)value;
+//	MEMBER	FUNCTION
+double	FloatingPointValue::getFloatingPointValue()	{
+				return	(double)value;
 }
 
-// MEMBER FUNCTION
-long long FloatingPointValue::getIntegerValue() {
-    return (long long)value;
+//	MEMBER	FUNCTION
+long	long	FloatingPointValue::getIntegerValue()	{
+				return	(long	long)value;
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/IntegerValue.cpp b/trick_source/sim_services/DataTypes/src/IntegerValue.cpp
index 600e22b17..597019470 100644
--- a/trick_source/sim_services/DataTypes/src/IntegerValue.cpp
+++ b/trick_source/sim_services/DataTypes/src/IntegerValue.cpp
@@ -1,31 +1,31 @@
-#include "IntegerValue.hh"
-#include "FloatingPointValue.hh"
-#include <sstream>
+#include	"IntegerValue.hh"
+#include	"FloatingPointValue.hh"
+#include	<sstream>
 
-// CONSTRUCTOR
-IntegerValue::IntegerValue(long long value) {
-    this->value = value;
+//	CONSTRUCTOR
+IntegerValue::IntegerValue(long	long	value)	{
+				this->value	=	value;
 };
 
-// MEMBER FUNCTION
-void IntegerValue::print(std::ostream &s) {
-    s << value;
+//	MEMBER	FUNCTION
+void	IntegerValue::print(std::ostream	&s)	{
+				s	<<	value;
 }
 
-// MEMBER FUNCTION
-std::string IntegerValue::toString() {
-    std::ostringstream oss;
-    oss << value;
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	IntegerValue::toString()	{
+				std::ostringstream	oss;
+				oss	<<	value;
+				return	oss.str();
 }
 
-// MEMBER FUNCTION
-double IntegerValue::getFloatingPointValue() {
-    return (double)value;
+//	MEMBER	FUNCTION
+double	IntegerValue::getFloatingPointValue()	{
+				return	(double)value;
 }
 
-// MEMBER FUNCTION
-long long IntegerValue::getIntegerValue() {
-    return (long long)value;
+//	MEMBER	FUNCTION
+long	long	IntegerValue::getIntegerValue()	{
+				return	(long	long)value;
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/LexicalAnalyzer.cpp b/trick_source/sim_services/DataTypes/src/LexicalAnalyzer.cpp
index ac8f6db7e..e15b6e0d6 100644
--- a/trick_source/sim_services/DataTypes/src/LexicalAnalyzer.cpp
+++ b/trick_source/sim_services/DataTypes/src/LexicalAnalyzer.cpp
@@ -1,150 +1,150 @@
-#include "LexicalAnalyzer.hh"
-#include <iostream>
-
-struct {
-    const char *         key;
-    Token::e token;
-} keytable[] = {
-    {"void",     Token::Void},
-    {"bool",     Token::Boolean},
-    {"char",     Token::Char},
-    {"short",    Token::Short},
-    {"int",      Token::Int},
-    {"long",     Token::Long},
-    {"wchar_t",  Token::WideChar},
-    {"signed",   Token::Signed},
-    {"unsigned", Token::Unsigned},
-    {"float",    Token::Float},
-    {"double",   Token::Double}
+#include	"LexicalAnalyzer.hh"
+#include	<iostream>
+
+struct	{
+				const	char	*									key;
+				Token::e	token;
+}	keytable[]	=	{
+				{"void",					Token::Void},
+				{"bool",					Token::Boolean},
+				{"char",					Token::Char},
+				{"short",				Token::Short},
+				{"int",						Token::Int},
+				{"long",					Token::Long},
+				{"wchar_t",		Token::WideChar},
+				{"signed",			Token::Signed},
+				{"unsigned",	Token::Unsigned},
+				{"float",				Token::Float},
+				{"double",			Token::Double}
 };
 
-typedef enum {
-    BEGINNING        = 0,
-    ID_COLLECTION    = 1,
-    INT_COLLECTION   = 2,
-    DONE             = 3
-} LexState;
+typedef	enum	{
+				BEGINNING								=	0,
+				ID_COLLECTION				=	1,
+				INT_COLLECTION			=	2,
+				DONE													=	3
+}	LexState;
 
-#define NKEYS ( sizeof keytable / sizeof keytable[0] )
+#define	NKEYS	(	sizeof	keytable	/	sizeof	keytable[0]	)
 
 
-LexicalAnalyzer::LexicalAnalyzer() {
+LexicalAnalyzer::LexicalAnalyzer()	{
 
-    lexemeText.clear();
-    token = Token::EndOfFile;
+				lexemeText.clear();
+				token	=	Token::EndOfFile;
 }
 
-void LexicalAnalyzer::load( const std::string& s ) {
+void	LexicalAnalyzer::load(	const	std::string&	s	)	{
 
-    inStream << s;
-    lexemeText.clear();
-    inStream >> std::noskipws >> nextChar;
-    token = nextToken();
+				inStream	<<	s;
+				lexemeText.clear();
+				inStream	>>	std::noskipws	>>	nextChar;
+				token	=	nextToken();
 }
 
-Token::e LexicalAnalyzer::matchToken(Token::e expectedToken) {
-    if ( token == expectedToken) {
-        token = nextToken();
-        return token;
-    } else {
-        std::cerr << "Syntax Error. Expected token(" << expectedToken << ")."
-                  << " Found token(" << token << ") instead." << std::endl;
-        return Token::Error;
-    }
+Token::e	LexicalAnalyzer::matchToken(Token::e	expectedToken)	{
+				if	(	token	==	expectedToken)	{
+								token	=	nextToken();
+								return	token;
+				}	else	{
+								std::cerr	<<	"Syntax	Error.	Expected	token("	<<	expectedToken	<<	")."
+																		<<	"	Found	token("	<<	token	<<	")	instead."	<<	std::endl;
+								return	Token::Error;
+				}
 }
 
-std::string LexicalAnalyzer::getText() {
-    return lexemeText;
+std::string	LexicalAnalyzer::getText()	{
+				return	lexemeText;
 }
 
-Token::e LexicalAnalyzer::getToken() {
-    return token;
+Token::e	LexicalAnalyzer::getToken()	{
+				return	token;
 }
 
-Token::e LexicalAnalyzer::nextToken() {
-
-    token = Token::EndOfFile;
-    lexemeText = "EOF";
-
-    LexState state = BEGINNING;
-
-    while ( !inStream.eof() && state != DONE ) {
-
-        switch ( state ) {
-
-            case BEGINNING : {
-                if ( isalpha( nextChar ) ) {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::Identifier;
-                    state = ID_COLLECTION;
-                } else if ( isdigit( nextChar )) {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::Integer;
-                    state = INT_COLLECTION;
-                } else if ( isspace( nextChar )) {
-                    inStream >> std::noskipws >> nextChar;
-                } else if ( nextChar == '*')  {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::Asterisk;
-                    state = DONE;
-                } else if ( nextChar == '(')  {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::LeftParen;
-                    state = DONE;
-                } else if ( nextChar == ')')  {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::RightParen;
-                    state = DONE;
-                } else if ( nextChar == '[')  {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::LeftBracket;
-                    state = DONE;
-                } else if ( nextChar == ']')  {
-                    lexemeText = nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                    token = Token::RightBracket;
-                    state = DONE;
-                } else  {
-                    token = Token::Error;
-                    state = DONE;
-                }
-            } break;
-
-            case ID_COLLECTION : {
-
-                while (!inStream.eof() && isalnum(nextChar)) {
-                    lexemeText += nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                }
-                for (int ii=0; ii < NKEYS; ii++) {
-                    if ( lexemeText.compare( keytable[ii].key ) == 0 ) {
-                        token = keytable[ii].token;
-                        break;
-                    }
-                }
-                state = DONE;
-            } break;
-
-            case INT_COLLECTION : {
-                while (!inStream.eof() && isdigit(nextChar)) {
-                    lexemeText += nextChar;
-                    inStream >> std::noskipws >> nextChar;
-                }
-                state = DONE;
-            } break;
-
-            default: {
-                state = DONE;
-                token = Token::Error;
-            }
-
-        }
-    }
-    return token;
+Token::e	LexicalAnalyzer::nextToken()	{
+
+				token	=	Token::EndOfFile;
+				lexemeText	=	"EOF";
+
+				LexState	state	=	BEGINNING;
+
+				while	(	!inStream.eof()	&&	state	!=	DONE	)	{
+
+								switch	(	state	)	{
+
+												case	BEGINNING	:	{
+																if	(	isalpha(	nextChar	)	)	{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::Identifier;
+																				state	=	ID_COLLECTION;
+																}	else	if	(	isdigit(	nextChar	))	{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::Integer;
+																				state	=	INT_COLLECTION;
+																}	else	if	(	isspace(	nextChar	))	{
+																				inStream	>>	std::noskipws	>>	nextChar;
+																}	else	if	(	nextChar	==	'*')		{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::Asterisk;
+																				state	=	DONE;
+																}	else	if	(	nextChar	==	'(')		{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::LeftParen;
+																				state	=	DONE;
+																}	else	if	(	nextChar	==	')')		{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::RightParen;
+																				state	=	DONE;
+																}	else	if	(	nextChar	==	'[')		{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::LeftBracket;
+																				state	=	DONE;
+																}	else	if	(	nextChar	==	']')		{
+																				lexemeText	=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																				token	=	Token::RightBracket;
+																				state	=	DONE;
+																}	else		{
+																				token	=	Token::Error;
+																				state	=	DONE;
+																}
+												}	break;
+
+												case	ID_COLLECTION	:	{
+
+																while	(!inStream.eof()	&&	isalnum(nextChar))	{
+																				lexemeText	+=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																}
+																for	(int	ii=0;	ii	<	NKEYS;	ii++)	{
+																				if	(	lexemeText.compare(	keytable[ii].key	)	==	0	)	{
+																								token	=	keytable[ii].token;
+																								break;
+																				}
+																}
+																state	=	DONE;
+												}	break;
+
+												case	INT_COLLECTION	:	{
+																while	(!inStream.eof()	&&	isdigit(nextChar))	{
+																				lexemeText	+=	nextChar;
+																				inStream	>>	std::noskipws	>>	nextChar;
+																}
+																state	=	DONE;
+												}	break;
+
+												default:	{
+																state	=	DONE;
+																token	=	Token::Error;
+												}
+
+								}
+				}
+				return	token;
 }
diff --git a/trick_source/sim_services/DataTypes/src/MemMgr.cpp b/trick_source/sim_services/DataTypes/src/MemMgr.cpp
index a2428dd80..b0c92b86f 100644
--- a/trick_source/sim_services/DataTypes/src/MemMgr.cpp
+++ b/trick_source/sim_services/DataTypes/src/MemMgr.cpp
@@ -1,390 +1,390 @@
-#include "MemMgr.hh"
-#include "ClassicChkPtAgent.hh"
-#include "AllocInfo.hh"
-#include "TypeDictionary.hh"
-#include "ArrayDataType.hh"
-#include "ParsedDeclaration.hh"
-#include <iostream>
-#include <fstream>
-
-// Constructor
-MemMgr::MemMgr() {
-
-   debugLevel = 0;
-   reducedCheckpoint = true;
-   hexfloatCheckpoint = false;
-   compactArraysCheckpoint = true;
-   
-   defaultCheckPointAgent = new ClassicChkPtAgent( std::cout );
-   defaultCheckPointAgent->setDebugLevel( debugLevel);
-   defaultCheckPointAgent->setReducedCheckpoint( reducedCheckpoint);
-   defaultCheckPointAgent->setHexfloatCheckpoint( hexfloatCheckpoint);
-   defaultCheckPointAgent->setMakeCompactArrays( compactArraysCheckpoint );
-   
-   currentCheckPointAgent = defaultCheckPointAgent;
-
-   typeDictionary = new TypeDictionary();
+#include	"MemMgr.hh"
+#include	"ClassicChkPtAgent.hh"
+#include	"AllocInfo.hh"
+#include	"TypeDictionary.hh"
+#include	"ArrayDataType.hh"
+#include	"ParsedDeclaration.hh"
+#include	<iostream>
+#include	<fstream>
+
+//	Constructor
+MemMgr::MemMgr()	{
+
+			debugLevel	=	0;
+			reducedCheckpoint	=	true;
+			hexfloatCheckpoint	=	false;
+			compactArraysCheckpoint	=	true;
+			
+			defaultCheckPointAgent	=	new	ClassicChkPtAgent(	std::cout	);
+			defaultCheckPointAgent->setDebugLevel(	debugLevel);
+			defaultCheckPointAgent->setReducedCheckpoint(	reducedCheckpoint);
+			defaultCheckPointAgent->setHexfloatCheckpoint(	hexfloatCheckpoint);
+			defaultCheckPointAgent->setMakeCompactArrays(	compactArraysCheckpoint	);
+			
+			currentCheckPointAgent	=	defaultCheckPointAgent;
+
+			typeDictionary	=	new	TypeDictionary();
 }
 
-// MEMBER FUNCTION
-void* MemMgr::declare_var( const std::string& typeSpecifier,
-                           const std::string& variableName,
-                           unsigned int       dimensionsCount,
-                           int*               dimensions,
-                           void*              suppliedAllocation ) {
-
-    if ( var_exists( variableName )) {
-        std::cerr << "ERROR: Variable " << variableName << " already declared." << std::endl;
-        return ((void*)NULL);
-    }
-
-    AllocInfo* newAllocInfo;
-    void* actualAllocation;
-    try {
-        // FIXME: MUTEX LOCK to protect AllocInfo static variables
-        newAllocInfo = new AllocInfo( variableName,
-                                      typeSpecifier,
-                                      dimensionsCount,
-                                      dimensions,
-                                      typeDictionary,
-                                      suppliedAllocation );
-        actualAllocation = newAllocInfo->getStart();
-        allocInfoByAddressMap[actualAllocation] = newAllocInfo;
-        allocInfoByNameMap[variableName] = newAllocInfo;
-    } catch ( std::logic_error e ) {
-        // FIXME: MUTEX UNLOCK
-        std::cerr << e.what();
-        newAllocInfo = (AllocInfo*)NULL;
-        actualAllocation = (void*)NULL;
-    }
-    if ( debugLevel ) {
-        if ( newAllocInfo == (AllocInfo*)NULL ) {
-            std::cout << "Allocation Failed." << std::endl;
-        } else {
-            std::cout << newAllocInfo->toString() << std::endl;
-        }
-    }
-    return( actualAllocation );
+//	MEMBER	FUNCTION
+void*	MemMgr::declare_var(	const	std::string&	typeSpecifier,
+																											const	std::string&	variableName,
+																											unsigned	int							dimensionsCount,
+																											int*															dimensions,
+																											void*														suppliedAllocation	)	{
+
+				if	(	var_exists(	variableName	))	{
+								std::cerr	<<	"ERROR:	Variable	"	<<	variableName	<<	"	already	declared."	<<	std::endl;
+								return	((void*)NULL);
+				}
+
+				AllocInfo*	newAllocInfo;
+				void*	actualAllocation;
+				try	{
+								//	FIXME:	MUTEX	LOCK	to	protect	AllocInfo	static	variables
+								newAllocInfo	=	new	AllocInfo(	variableName,
+																																						typeSpecifier,
+																																						dimensionsCount,
+																																						dimensions,
+																																						typeDictionary,
+																																						suppliedAllocation	);
+								actualAllocation	=	newAllocInfo->getStart();
+								allocInfoByAddressMap[actualAllocation]	=	newAllocInfo;
+								allocInfoByNameMap[variableName]	=	newAllocInfo;
+				}	catch	(	std::logic_error	e	)	{
+								//	FIXME:	MUTEX	UNLOCK
+								std::cerr	<<	e.what();
+								newAllocInfo	=	(AllocInfo*)NULL;
+								actualAllocation	=	(void*)NULL;
+				}
+				if	(	debugLevel	)	{
+								if	(	newAllocInfo	==	(AllocInfo*)NULL	)	{
+												std::cout	<<	"Allocation	Failed."	<<	std::endl;
+								}	else	{
+												std::cout	<<	newAllocInfo->toString()	<<	std::endl;
+								}
+				}
+				return(	actualAllocation	);
 }
 
-// MEMBER FUNCTION
-void* MemMgr::declare_var( const std::string& declaration,
-                           void*              suppliedAllocation ) {
-
-    ParsedDeclaration* typeName = new ParsedDeclaration( declaration);
-    std::string typeSpecifier = typeName->getTypeSpecifier();
-    std::string variableName = typeName->getVariableName();
-
-    unsigned int dimensionsCount = typeName->getNumberOfDimensions();
-    int dimensions[16];
-    for (int ii=0 ; ii < dimensionsCount; ii++) {
-        dimensions[ii] = typeName->getDimensionSize(ii);
-    }
-    void* actualAllocation = declare_var( typeSpecifier, variableName, dimensionsCount, dimensions, suppliedAllocation );
-    return actualAllocation;
+//	MEMBER	FUNCTION
+void*	MemMgr::declare_var(	const	std::string&	declaration,
+																											void*														suppliedAllocation	)	{
+
+				ParsedDeclaration*	typeName	=	new	ParsedDeclaration(	declaration);
+				std::string	typeSpecifier	=	typeName->getTypeSpecifier();
+				std::string	variableName	=	typeName->getVariableName();
+
+				unsigned	int	dimensionsCount	=	typeName->getNumberOfDimensions();
+				int	dimensions[16];
+				for	(int	ii=0	;	ii	<	dimensionsCount;	ii++)	{
+								dimensions[ii]	=	typeName->getDimensionSize(ii);
+				}
+				void*	actualAllocation	=	declare_var(	typeSpecifier,	variableName,	dimensionsCount,	dimensions,	suppliedAllocation	);
+				return	actualAllocation;
 }
 
-// MEMBER FUNCTION
-void* MemMgr::declare_var( const std::string& typeSpecName,
-                           const std::string& variableName,
-                           int                n,
-                           void*              suppliedAllocation) {
+//	MEMBER	FUNCTION
+void*	MemMgr::declare_var(	const	std::string&	typeSpecName,
+																											const	std::string&	variableName,
+																											int																n,
+																											void*														suppliedAllocation)	{
 
-    void* actualAllocation = declare_var(typeSpecName, variableName, 1, &n, suppliedAllocation );
-    return actualAllocation;
+				void*	actualAllocation	=	declare_var(typeSpecName,	variableName,	1,	&n,	suppliedAllocation	);
+				return	actualAllocation;
 }
 
-// MEMBER FUNCTION
-void* MemMgr::declare_var( const std::string& typeSpecName,
-                           int                n,
-                           void*              suppliedAllocation ) {
-    void* actualAllocation = declare_var(typeSpecName, "", 1, &n, suppliedAllocation);
-    return actualAllocation;
+//	MEMBER	FUNCTION
+void*	MemMgr::declare_var(	const	std::string&	typeSpecName,
+																											int																n,
+																											void*														suppliedAllocation	)	{
+				void*	actualAllocation	=	declare_var(typeSpecName,	"",	1,	&n,	suppliedAllocation);
+				return	actualAllocation;
 }
 
-// MEMBER FUNCTION
-void* MemMgr::resize_var( void* address, size_t newElementCount) {
-    void* newAddress;
-    AllocInfo* allocInfo = getAllocInfoOf(address);
-    if (allocInfo != NULL) {
-        newAddress = allocInfo->resize( newElementCount );
-    } else {
-        std::cerr << __FUNCTION__ << " failed. Address (" << address << ") not in Trick managed memory." << std::endl;
-        newAddress = NULL;
-    }
-    return newAddress;
+//	MEMBER	FUNCTION
+void*	MemMgr::resize_var(	void*	address,	size_t	newElementCount)	{
+				void*	newAddress;
+				AllocInfo*	allocInfo	=	getAllocInfoOf(address);
+				if	(allocInfo	!=	NULL)	{
+								newAddress	=	allocInfo->resize(	newElementCount	);
+				}	else	{
+								std::cerr	<<	__FUNCTION__	<<	"	failed.	Address	("	<<	address	<<	")	not	in	Trick	managed	memory."	<<	std::endl;
+								newAddress	=	NULL;
+				}
+				return	newAddress;
 }
 
-// MEMBER FUNCTION
-void* MemMgr::resize_var( const std::string& name, size_t newElementCount) {
-   void* newAddress;
-   AllocInfo* allocInfo = getAllocInfoNamed(name);
-    if (allocInfo != NULL) {
-        newAddress = allocInfo->resize( newElementCount );
-    } else {
-        std::cerr << __FUNCTION__ << " failed. Name \"" << name << "\" not in Trick managed memory." << std::endl;
-        newAddress = NULL;
-    }
-    return newAddress;
+//	MEMBER	FUNCTION
+void*	MemMgr::resize_var(	const	std::string&	name,	size_t	newElementCount)	{
+			void*	newAddress;
+			AllocInfo*	allocInfo	=	getAllocInfoNamed(name);
+				if	(allocInfo	!=	NULL)	{
+								newAddress	=	allocInfo->resize(	newElementCount	);
+				}	else	{
+								std::cerr	<<	__FUNCTION__	<<	"	failed.	Name	\""	<<	name	<<	"\"	not	in	Trick	managed	memory."	<<	std::endl;
+								newAddress	=	NULL;
+				}
+				return	newAddress;
 }
 
-// MEMBER FUNCTION
-//    void* resize_var( const char* name, int num);
+//	MEMBER	FUNCTION
+//				void*	resize_var(	const	char*	name,	int	num);
 
 
-// MEMBER FUNCTION
-bool MemMgr::var_exists( const std::string& variableName) {
+//	MEMBER	FUNCTION
+bool	MemMgr::var_exists(	const	std::string&	variableName)	{
 
-    if ( !variableName.empty()) {
-        AllocInfo* allocInfo = getAllocInfoNamed( variableName );
-        if ( allocInfo != (AllocInfo*)NULL ) {
-            return true;
-        }
-    }
-    return false;
+				if	(	!variableName.empty())	{
+								AllocInfo*	allocInfo	=	getAllocInfoNamed(	variableName	);
+								if	(	allocInfo	!=	(AllocInfo*)NULL	)	{
+												return	true;
+								}
+				}
+				return	false;
 }
 
-// MEMBER FUNCTION
-void MemMgr::clear_var( void* address) {
-
-    AllocInfo* allocInfo;
-    if ((allocInfo = getAllocInfoOf( address)) != NULL) {
-        allocInfo->clear();
-    } else {
-        std::stringstream ss;
-        ss << "Cannot clear the variable at address ";
-        ss << address;
-        ss << " because memory manager knows nothing about it.";
-        ss << std::endl;
-        std::cerr << ss.str();
-    }
+//	MEMBER	FUNCTION
+void	MemMgr::clear_var(	void*	address)	{
+
+				AllocInfo*	allocInfo;
+				if	((allocInfo	=	getAllocInfoOf(	address))	!=	NULL)	{
+								allocInfo->clear();
+				}	else	{
+								std::stringstream	ss;
+								ss	<<	"Cannot	clear	the	variable	at	address	";
+								ss	<<	address;
+								ss	<<	"	because	memory	manager	knows	nothing	about	it.";
+								ss	<<	std::endl;
+								std::cerr	<<	ss.str();
+				}
 }
 
-// MEMBER FUNCTION
-void MemMgr::clear_var( const std::string& variableName) {
-
-    AllocInfo* allocInfo;
-    if ((allocInfo = getAllocInfoNamed( variableName )) != NULL) {
-        allocInfo->clear();
-    } else {
-        std::stringstream ss;
-        ss << "Cannot clear the variable named ";
-        ss << variableName;
-        ss << " because memory manager knows nothing about it.";
-        ss << std::endl;
-        std::cerr << ss.str();
-    }
+//	MEMBER	FUNCTION
+void	MemMgr::clear_var(	const	std::string&	variableName)	{
+
+				AllocInfo*	allocInfo;
+				if	((allocInfo	=	getAllocInfoNamed(	variableName	))	!=	NULL)	{
+								allocInfo->clear();
+				}	else	{
+								std::stringstream	ss;
+								ss	<<	"Cannot	clear	the	variable	named	";
+								ss	<<	variableName;
+								ss	<<	"	because	memory	manager	knows	nothing	about	it.";
+								ss	<<	std::endl;
+								std::cerr	<<	ss.str();
+				}
 }
 
-// MEMBER FUNCTION
-void MemMgr::clear_all_vars() {
+//	MEMBER	FUNCTION
+void	MemMgr::clear_all_vars()	{
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint( std::ostream& out_s) {
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(	std::ostream&	out_s)	{
 
-    AllocInfo* allocInfo;
-    std::vector<AllocInfo*> allocInfoList;
-    std::map<void*, AllocInfo*>::iterator pos;
+				AllocInfo*	allocInfo;
+				std::vector<AllocInfo*>	allocInfoList;
+				std::map<void*,	AllocInfo*>::iterator	pos;
 
-    pthread_mutex_lock(&allocInfoMapMutex);
+				pthread_mutex_lock(&allocInfoMapMutex);
 
-    for ( pos = allocInfoByAddressMap.begin() ; pos != allocInfoByAddressMap.end() ; pos++ ) {
-        allocInfo = pos->second;
-        allocInfoList.push_back(allocInfo);
-    }
-    write_checkpoint( out_s, allocInfoList);
+				for	(	pos	=	allocInfoByAddressMap.begin()	;	pos	!=	allocInfoByAddressMap.end()	;	pos++	)	{
+								allocInfo	=	pos->second;
+								allocInfoList.push_back(allocInfo);
+				}
+				write_checkpoint(	out_s,	allocInfoList);
 
-    pthread_mutex_unlock(&allocInfoMapMutex);
+				pthread_mutex_unlock(&allocInfoMapMutex);
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint( const std::string& filename) {
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(	const	std::string&	filename)	{
 
-    std::ofstream out_s( filename.c_str(), std::ios::out);
-    if (out_s.is_open()) {
-        write_checkpoint( out_s );
-    } else {
-        std::cerr << "ERROR: Couldn't open \""<< filename <<"\"." << std::endl;
-        std::cerr.flush();
-    }
+				std::ofstream	out_s(	filename.c_str(),	std::ios::out);
+				if	(out_s.is_open())	{
+								write_checkpoint(	out_s	);
+				}	else	{
+								std::cerr	<<	"ERROR:	Couldn't	open	\""<<	filename	<<"\"."	<<	std::endl;
+								std::cerr.flush();
+				}
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint( std::ostream& out_s, const std::string& variableName) {
-
-    std::vector<AllocInfo*> dependencies;
-    pthread_mutex_lock(&allocInfoMapMutex);
-    AllocInfo * allocInfo = getAllocInfoNamed( variableName );
-    if ( allocInfo != NULL ) {
-        allocInfo->appendDependencies( this, dependencies );
-    }
-    pthread_mutex_unlock(&allocInfoMapMutex);
-    write_checkpoint( out_s, dependencies);
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(	std::ostream&	out_s,	const	std::string&	variableName)	{
+
+				std::vector<AllocInfo*>	dependencies;
+				pthread_mutex_lock(&allocInfoMapMutex);
+				AllocInfo	*	allocInfo	=	getAllocInfoNamed(	variableName	);
+				if	(	allocInfo	!=	NULL	)	{
+								allocInfo->appendDependencies(	this,	dependencies	);
+				}
+				pthread_mutex_unlock(&allocInfoMapMutex);
+				write_checkpoint(	out_s,	dependencies);
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint(const std::string& filename, const std::string& variableName) {
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(const	std::string&	filename,	const	std::string&	variableName)	{
 
-    std::ofstream out_s( filename.c_str(), std::ios::out);
-    if (out_s.is_open()) {
-        write_checkpoint( out_s, variableName);
-    } else {
-        std::cerr << "ERROR: Couldn't open \""<< filename <<"\"." << std::endl;
-        std::cerr.flush();
-    }
+				std::ofstream	out_s(	filename.c_str(),	std::ios::out);
+				if	(out_s.is_open())	{
+								write_checkpoint(	out_s,	variableName);
+				}	else	{
+								std::cerr	<<	"ERROR:	Couldn't	open	\""<<	filename	<<"\"."	<<	std::endl;
+								std::cerr.flush();
+				}
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint( std::ostream& out_s, std::vector<const char*>& variableNameList) {
-
-    std::vector<AllocInfo*> dependencies;
-    const char* variableName;
-    int nameCount;
-    nameCount = variableNameList.size();
-    for (int ii=0; ii< nameCount; ii++) {
-        variableName = variableNameList[ii];
-        pthread_mutex_lock(&allocInfoMapMutex);
-        AllocInfo* allocInfo = getAllocInfoNamed( variableName );
-        if ( allocInfo != NULL ) {
-            allocInfo->appendDependencies( this, dependencies );
-        }
-        pthread_mutex_unlock(&allocInfoMapMutex);
-    }
-    write_checkpoint( out_s, dependencies);
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(	std::ostream&	out_s,	std::vector<const	char*>&	variableNameList)	{
+
+				std::vector<AllocInfo*>	dependencies;
+				const	char*	variableName;
+				int	nameCount;
+				nameCount	=	variableNameList.size();
+				for	(int	ii=0;	ii<	nameCount;	ii++)	{
+								variableName	=	variableNameList[ii];
+								pthread_mutex_lock(&allocInfoMapMutex);
+								AllocInfo*	allocInfo	=	getAllocInfoNamed(	variableName	);
+								if	(	allocInfo	!=	NULL	)	{
+												allocInfo->appendDependencies(	this,	dependencies	);
+								}
+								pthread_mutex_unlock(&allocInfoMapMutex);
+				}
+				write_checkpoint(	out_s,	dependencies);
 }
 
-// MEMBER FUNCTION
-void MemMgr::write_checkpoint(const std::string& filename, std::vector<const char*>& variableNameList) {
+//	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(const	std::string&	filename,	std::vector<const	char*>&	variableNameList)	{
 
-    std::ofstream out_s( filename.c_str(), std::ios::out);
-    if (out_s.is_open()) {
-        write_checkpoint( out_s, variableNameList );
-    } else {
-        std::cerr << "ERROR: Couldn't open \""<< filename <<"\"." << std::endl;
-        std::cerr.flush();
-    }
+				std::ofstream	out_s(	filename.c_str(),	std::ios::out);
+				if	(out_s.is_open())	{
+								write_checkpoint(	out_s,	variableNameList	);
+				}	else	{
+								std::cerr	<<	"ERROR:	Couldn't	open	\""<<	filename	<<"\"."	<<	std::endl;
+								std::cerr.flush();
+				}
 }
 
-// STATIC FUNCTION
-static bool allocInfoCompare( AllocInfo* lhs, AllocInfo* rhs ) {
-    bool result;
-    StorageClass::e lhsStorageClass = lhs->getStorageClass();
-    StorageClass::e rhsStorageClass = rhs->getStorageClass();
-    unsigned int lhsSerialNumber = lhs->getSerialNumber();
-    unsigned int rhsSerialNumber = rhs->getSerialNumber();
-
-    if ( lhsStorageClass == rhsStorageClass ) {
-        result = ( lhsSerialNumber < rhsSerialNumber );
-    } else if ( lhsStorageClass == StorageClass:: EXTERN ) {
-        result = true;
-    } else {
-        result = false;
-    }
-    return result;
+//	STATIC	FUNCTION
+static	bool	allocInfoCompare(	AllocInfo*	lhs,	AllocInfo*	rhs	)	{
+				bool	result;
+				StorageClass::e	lhsStorageClass	=	lhs->getStorageClass();
+				StorageClass::e	rhsStorageClass	=	rhs->getStorageClass();
+				unsigned	int	lhsSerialNumber	=	lhs->getSerialNumber();
+				unsigned	int	rhsSerialNumber	=	rhs->getSerialNumber();
+
+				if	(	lhsStorageClass	==	rhsStorageClass	)	{
+								result	=	(	lhsSerialNumber	<	rhsSerialNumber	);
+				}	else	if	(	lhsStorageClass	==	StorageClass::	EXTERN	)	{
+								result	=	true;
+				}	else	{
+								result	=	false;
+				}
+				return	result;
 }
 
-// PRIVATE MEMBER FUNCTION
-void MemMgr::write_checkpoint(std::ostream& outStream, std::vector<AllocInfo*>& allocInfoList) {
-
-    std::sort( allocInfoList.begin(), allocInfoList.end(), allocInfoCompare ) ;
-
-    // 2) Generate declaration statements for each the local allocations.
-    outStream << "// Variable Declarations." << std::endl;
-    outStream.flush();
-
-    int itemCount = allocInfoList.size();
-
-    for (int ii = 0 ; ii < itemCount ; ii ++) {
-        AllocInfo * allocInfo = allocInfoList[ii];
-        StorageClass::e storageClass = allocInfo->getStorageClass();
-        if ( storageClass == StorageClass::LOCAL) {
-                std::string name = allocInfo->getName();
-            if ( !name.empty() ) {
-                currentCheckPointAgent->writeDeclaration( outStream, name, allocInfo->getDataType() );
-            } else {
-                currentCheckPointAgent->writeDeclaration( outStream, allocInfo->getSerialName(), allocInfo->getDataType() );
-            }
-        }
-    }
-
-    // 3) Write a "clear_all_vars" command.
-    outStream << std::endl << std::endl << "// Clear all allocations to 0." << std::endl;
-    outStream << "clear_all_vars();" << std::endl;
-
-    // 4) Dump the contents of each of the local and extern allocations.
-    outStream << std::endl << std::endl << "// Variable Assignments." << std::endl;
-    outStream.flush();
-
-    for (int ii = 0 ; ii < itemCount ; ii ++) {
-        AllocInfo * allocInfo = allocInfoList[ii];
-
-        std::string name = allocInfo->getName();
-        if ( !name.empty() ) {
-            currentCheckPointAgent->pushName( name );
-            currentCheckPointAgent->writeVariable( outStream, this, allocInfo->getStart(), allocInfo->getDataType() );
-        } else {
-            currentCheckPointAgent->pushName( allocInfo->getSerialName() );
-            currentCheckPointAgent->writeVariable( outStream, this, allocInfo->getStart(), allocInfo->getDataType() );
-        }
-        currentCheckPointAgent->popNameElement();
-        outStream << std::endl;
-    }
+//	PRIVATE	MEMBER	FUNCTION
+void	MemMgr::write_checkpoint(std::ostream&	outStream,	std::vector<AllocInfo*>&	allocInfoList)	{
+
+				std::sort(	allocInfoList.begin(),	allocInfoList.end(),	allocInfoCompare	)	;
+
+				//	2)	Generate	declaration	statements	for	each	the	local	allocations.
+				outStream	<<	"//	Variable	Declarations."	<<	std::endl;
+				outStream.flush();
+
+				int	itemCount	=	allocInfoList.size();
+
+				for	(int	ii	=	0	;	ii	<	itemCount	;	ii	++)	{
+								AllocInfo	*	allocInfo	=	allocInfoList[ii];
+								StorageClass::e	storageClass	=	allocInfo->getStorageClass();
+								if	(	storageClass	==	StorageClass::LOCAL)	{
+																std::string	name	=	allocInfo->getName();
+												if	(	!name.empty()	)	{
+																currentCheckPointAgent->writeDeclaration(	outStream,	name,	allocInfo->getDataType()	);
+												}	else	{
+																currentCheckPointAgent->writeDeclaration(	outStream,	allocInfo->getSerialName(),	allocInfo->getDataType()	);
+												}
+								}
+				}
+
+				//	3)	Write	a	"clear_all_vars"	command.
+				outStream	<<	std::endl	<<	std::endl	<<	"//	Clear	all	allocations	to	0."	<<	std::endl;
+				outStream	<<	"clear_all_vars();"	<<	std::endl;
+
+				//	4)	Dump	the	contents	of	each	of	the	local	and	extern	allocations.
+				outStream	<<	std::endl	<<	std::endl	<<	"//	Variable	Assignments."	<<	std::endl;
+				outStream.flush();
+
+				for	(int	ii	=	0	;	ii	<	itemCount	;	ii	++)	{
+								AllocInfo	*	allocInfo	=	allocInfoList[ii];
+
+								std::string	name	=	allocInfo->getName();
+								if	(	!name.empty()	)	{
+												currentCheckPointAgent->pushName(	name	);
+												currentCheckPointAgent->writeVariable(	outStream,	this,	allocInfo->getStart(),	allocInfo->getDataType()	);
+								}	else	{
+												currentCheckPointAgent->pushName(	allocInfo->getSerialName()	);
+												currentCheckPointAgent->writeVariable(	outStream,	this,	allocInfo->getStart(),	allocInfo->getDataType()	);
+								}
+								currentCheckPointAgent->popNameElement();
+								outStream	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-AllocInfo* MemMgr::getAllocInfoOf( void* address ) {
-    AllocInfo* allocInfo;
-    std::map<void*, AllocInfo*>::iterator pos;
-    for ( pos = allocInfoByAddressMap.begin() ; pos != allocInfoByAddressMap.end() ; pos++ ) {
-        allocInfo = pos->second;
-        if ( allocInfo->contains( address )) {
-            return allocInfo;
-        }
-    }
-    return NULL;
+//	MEMBER	FUNCTION
+AllocInfo*	MemMgr::getAllocInfoOf(	void*	address	)	{
+				AllocInfo*	allocInfo;
+				std::map<void*,	AllocInfo*>::iterator	pos;
+				for	(	pos	=	allocInfoByAddressMap.begin()	;	pos	!=	allocInfoByAddressMap.end()	;	pos++	)	{
+								allocInfo	=	pos->second;
+								if	(	allocInfo->contains(	address	))	{
+												return	allocInfo;
+								}
+				}
+				return	NULL;
 }
 
-// MEMBER FUNCTION
-AllocInfo* MemMgr::getAllocInfoAt( void* address ) {
-    std::map<void*, AllocInfo*>::iterator pos;
-    pos = allocInfoByAddressMap.find( address );
-    if ( pos == allocInfoByAddressMap.end()) {
-        return NULL;
-    } else {
-        return pos->second;
-    }
+//	MEMBER	FUNCTION
+AllocInfo*	MemMgr::getAllocInfoAt(	void*	address	)	{
+				std::map<void*,	AllocInfo*>::iterator	pos;
+				pos	=	allocInfoByAddressMap.find(	address	);
+				if	(	pos	==	allocInfoByAddressMap.end())	{
+								return	NULL;
+				}	else	{
+								return	pos->second;
+				}
 }
 
-// MEMBER FUNCTION
-AllocInfo* MemMgr::getAllocInfoNamed( const std::string& name ) {
-    std::map<std::string, AllocInfo*>::iterator pos;
-    pos = allocInfoByNameMap.find(name);
-    if ( pos == allocInfoByNameMap.end()) {
-        return NULL;
-    } else {
-        return pos->second;
-    }
+//	MEMBER	FUNCTION
+AllocInfo*	MemMgr::getAllocInfoNamed(	const	std::string&	name	)	{
+				std::map<std::string,	AllocInfo*>::iterator	pos;
+				pos	=	allocInfoByNameMap.find(name);
+				if	(	pos	==	allocInfoByNameMap.end())	{
+								return	NULL;
+				}	else	{
+								return	pos->second;
+				}
 }
 
 
-// MEMBER FUNCTION
-const DataType* MemMgr::getDataType( std::string typeName ) {
-    return typeDictionary->getDataType(typeName);
+//	MEMBER	FUNCTION
+const	DataType*	MemMgr::getDataType(	std::string	typeName	)	{
+				return	typeDictionary->getDataType(typeName);
 }
 
-#if NEWSTUFF
-void * MemMgr::getVarAccessInfo( const std::string& variableName, VarAccessInfo& varAccessInfo ) {
+#if	NEWSTUFF
+void	*	MemMgr::getVarAccessInfo(	const	std::string&	variableName,	VarAccessInfo&	varAccessInfo	)	{
 
-    std::string varName = variableName;
-    // Get identifier at beginnning of the string and the remiander.
-    // Find the AllocInfoByName ( identifier );
+				std::string	varName	=	variableName;
+				//	Get	identifier	at	beginnning	of	the	string	and	the	remiander.
+				//	Find	the	AllocInfoByName	(	identifier	);
 
-    AllocInfo* allocInfo = getAllocInfoNamed (variableName);
-    if (allocInfo != NULL) {
-    }
-    returnAddress = alloc->getVarAccessInfo( varName, varAccessInfo );
+				AllocInfo*	allocInfo	=	getAllocInfoNamed	(variableName);
+				if	(allocInfo	!=	NULL)	{
+				}
+				returnAddress	=	alloc->getVarAccessInfo(	varName,	varAccessInfo	);
 
-    return returnAddress;
+				return	returnAddress;
 }
 #endif
diff --git a/trick_source/sim_services/DataTypes/src/NormalStructMember.cpp b/trick_source/sim_services/DataTypes/src/NormalStructMember.cpp
index 7c6baf749..b599738b7 100644
--- a/trick_source/sim_services/DataTypes/src/NormalStructMember.cpp
+++ b/trick_source/sim_services/DataTypes/src/NormalStructMember.cpp
@@ -1,143 +1,143 @@
-#include "NormalStructMember.hh"
-#include "TypeDictionary.hh"
-#include "ArrayDataType.hh"
-#include <sstream>
-#include <iostream>
-
-// CONSTRUCTOR
-NormalStructMember::NormalStructMember(std::string memberName,
-                                       int offset,
-                                       TypeDictionary* typeDictionary,
-                                       std::string typeSpecName,
-                                       unsigned int n_dims,
-                                       int dims[] ) : StructMember(memberName) {
-
-   if ( n_dims > 0 ) {
-       this->typeSpecName.clear();
-       declDataType = new ArrayDataType( typeDictionary, typeSpecName, n_dims, dims);
-   } else {
-       this->typeSpecName = typeSpecName;
-       declDataType = NULL;
-   }
-
-   subType = NULL;
-   byte_offset = offset;
-   is_valid = false;
-   this->typeDictionary = typeDictionary;
+#include	"NormalStructMember.hh"
+#include	"TypeDictionary.hh"
+#include	"ArrayDataType.hh"
+#include	<sstream>
+#include	<iostream>
+
+//	CONSTRUCTOR
+NormalStructMember::NormalStructMember(std::string	memberName,
+																																							int	offset,
+																																							TypeDictionary*	typeDictionary,
+																																							std::string	typeSpecName,
+																																							unsigned	int	n_dims,
+																																							int	dims[]	)	:	StructMember(memberName)	{
+
+			if	(	n_dims	>	0	)	{
+							this->typeSpecName.clear();
+							declDataType	=	new	ArrayDataType(	typeDictionary,	typeSpecName,	n_dims,	dims);
+			}	else	{
+							this->typeSpecName	=	typeSpecName;
+							declDataType	=	NULL;
+			}
+
+			subType	=	NULL;
+			byte_offset	=	offset;
+			is_valid	=	false;
+			this->typeDictionary	=	typeDictionary;
 }
 
-// CONSTRUCTOR
-NormalStructMember::NormalStructMember ( const NormalStructMember & original )
-    :StructMember( original ) {
-
-    byte_offset = original.byte_offset;
-    is_valid = original.is_valid;
-    typeSpecName = original.typeSpecName;
-
-    if ( original.declDataType != NULL) {
-        declDataType = original.declDataType->clone();
-    } else {
-        declDataType = NULL;
-    }
-
-    if (is_valid) {
-        if (typeSpecName.empty()) {
-            subType = declDataType;
-        } else {
-            subType = original.subType;
-        }
-    }
+//	CONSTRUCTOR
+NormalStructMember::NormalStructMember	(	const	NormalStructMember	&	original	)
+				:StructMember(	original	)	{
+
+				byte_offset	=	original.byte_offset;
+				is_valid	=	original.is_valid;
+				typeSpecName	=	original.typeSpecName;
+
+				if	(	original.declDataType	!=	NULL)	{
+								declDataType	=	original.declDataType->clone();
+				}	else	{
+								declDataType	=	NULL;
+				}
+
+				if	(is_valid)	{
+								if	(typeSpecName.empty())	{
+												subType	=	declDataType;
+								}	else	{
+												subType	=	original.subType;
+								}
+				}
 }
 
-StructMember * NormalStructMember::clone () const {
-    return new NormalStructMember( *this );
+StructMember	*	NormalStructMember::clone	()	const	{
+				return	new	NormalStructMember(	*this	);
 }
 
-NormalStructMember::~NormalStructMember() {
-    if (declDataType != NULL) {
-        delete declDataType;
-    }
+NormalStructMember::~NormalStructMember()	{
+				if	(declDataType	!=	NULL)	{
+								delete	declDataType;
+				}
 }
 
-bool NormalStructMember::validate() {
-
-    if (!is_valid) {
-        if (typeSpecName.empty()) {
-            is_valid = declDataType->validate();
-            if (is_valid) {
-                subType = declDataType;
-            }
-        } else {
-            subType = typeDictionary->getDataType( typeSpecName );
-
-            if (subType != NULL) {
-                is_valid = true;
-            } else {
-                std::cerr << "ERROR: Type \"" << typeSpecName
-                          << "\" not found in the TypeDictionary." << std::endl;
-            }
-        }
-    }
-    return is_valid;
+bool	NormalStructMember::validate()	{
+
+				if	(!is_valid)	{
+								if	(typeSpecName.empty())	{
+												is_valid	=	declDataType->validate();
+												if	(is_valid)	{
+																subType	=	declDataType;
+												}
+								}	else	{
+												subType	=	typeDictionary->getDataType(	typeSpecName	);
+
+												if	(subType	!=	NULL)	{
+																is_valid	=	true;
+												}	else	{
+																std::cerr	<<	"ERROR:	Type	\""	<<	typeSpecName
+																										<<	"\"	not	found	in	the	TypeDictionary."	<<	std::endl;
+												}
+								}
+				}
+				return	is_valid;
 }
 
-// MEMBER FUNCTION
-bool NormalStructMember::containsPointers() const {
-    if (is_valid) {
-        return subType->containsPointers();
-    }
-    return false;
+//	MEMBER	FUNCTION
+bool	NormalStructMember::containsPointers()	const	{
+				if	(is_valid)	{
+								return	subType->containsPointers();
+				}
+				return	false;
 }
 
-// MEMBER FUNCTION
-const DataType * NormalStructMember::getDataType() {
-    return subType;
+//	MEMBER	FUNCTION
+const	DataType	*	NormalStructMember::getDataType()	{
+				return	subType;
 }
 
-// MEMBER FUNCTION
-int NormalStructMember::getOffset() {
-    return byte_offset;
+//	MEMBER	FUNCTION
+int	NormalStructMember::getOffset()	{
+				return	byte_offset;
 }
 
-// MEMBER FUNCTION
-void NormalStructMember::clearValue(void *struct_address ) const {
+//	MEMBER	FUNCTION
+void	NormalStructMember::clearValue(void	*struct_address	)	const	{
 
-    if (is_valid) {
-        void * member_address = (char*)struct_address + byte_offset;
-        subType->clearValue( member_address);
-    } else {
-        std::cerr << "ERROR: Attempt to clear a value via unvalidate DataType." << std::endl;
-    }
+				if	(is_valid)	{
+								void	*	member_address	=	(char*)struct_address	+	byte_offset;
+								subType->clearValue(	member_address);
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	clear	a	value	via	unvalidate	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-void NormalStructMember::assignValue(void *struct_address, Value *v ) const {
+//	MEMBER	FUNCTION
+void	NormalStructMember::assignValue(void	*struct_address,	Value	*v	)	const	{
 
-    if (is_valid) {
-        void * member_address = (char*)struct_address + byte_offset;
-        subType->assignValue( member_address, v);
-    } else {
-        std::cerr << "ERROR: Attempt to assign a value via unvalidate DataType." << std::endl;
-    }
+				if	(is_valid)	{
+								void	*	member_address	=	(char*)struct_address	+	byte_offset;
+								subType->assignValue(	member_address,	v);
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	assign	a	value	via	unvalidate	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-void NormalStructMember::printValue(std::ostream &s, void *struct_address) const {
-    if (is_valid) {
-        void * member_address = (char*)struct_address + byte_offset;
-        subType->printValue(s, member_address) ;
-    } else {
-        std::cerr << "ERROR: Attempt to print a value via unvalidate DataType." << std::endl;
-    }
+//	MEMBER	FUNCTION
+void	NormalStructMember::printValue(std::ostream	&s,	void	*struct_address)	const	{
+				if	(is_valid)	{
+								void	*	member_address	=	(char*)struct_address	+	byte_offset;
+								subType->printValue(s,	member_address)	;
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	print	a	value	via	unvalidate	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-std::string NormalStructMember:: toString() const {
-    std::ostringstream oss;
-    if (! typeSpecName.empty()) {
-        oss << typeSpecName << " " << getName();
-    } else {
-        oss << subType->makeDeclaration( getName(), true);
-    }
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	NormalStructMember::	toString()	const	{
+				std::ostringstream	oss;
+				if	(!	typeSpecName.empty())	{
+								oss	<<	typeSpecName	<<	"	"	<<	getName();
+				}	else	{
+								oss	<<	subType->makeDeclaration(	getName(),	true);
+				}
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/DataTypes/src/ParsedDeclaration.cpp b/trick_source/sim_services/DataTypes/src/ParsedDeclaration.cpp
index a7eaf346b..7692a3376 100644
--- a/trick_source/sim_services/DataTypes/src/ParsedDeclaration.cpp
+++ b/trick_source/sim_services/DataTypes/src/ParsedDeclaration.cpp
@@ -1,277 +1,277 @@
-#include "ParsedDeclaration.hh"
-#include "LexicalAnalyzer.hh"
-#include <cstdlib>
+#include	"ParsedDeclaration.hh"
+#include	"LexicalAnalyzer.hh"
+#include	<cstdlib>
 
 /*
- type-name: type-specifier
-          | type-specifier declarator
-          ;
+	type-name:	type-specifier
+										|	type-specifier	declarator
+										;
 
- declarator : pointer
-            | pointer direct-declarator
-            | direct-declarator
-            ;
+	declarator	:	pointer
+												|	pointer	direct-declarator
+												|	direct-declarator
+												;
 
- direct-declarator: identifier
-                  | ( declarator )
-                  | [ constant-exp ]
-                  | [ ]
-                  | direct-declarator [ constant-exp ]
-                  | direct-declarator [ ]
-                  ;
+	direct-declarator:	identifier
+																		|	(	declarator	)
+																		|	[	constant-exp	]
+																		|	[	]
+																		|	direct-declarator	[	constant-exp	]
+																		|	direct-declarator	[	]
+																		;
 */
 
-// CONSTRUCTOR
-ParsedDeclaration::ParsedDeclaration( std::string s ) {
-    typeSpec.clear();
-    varName.clear();
-    ndims = 0;
-    for (int ii = 0; ii < MAX_DIMS; ii++){
-        dims[ii] = 0;
-    }
-    lexer.load(s);
-    parseDeclaration();
+//	CONSTRUCTOR
+ParsedDeclaration::ParsedDeclaration(	std::string	s	)	{
+				typeSpec.clear();
+				varName.clear();
+				ndims	=	0;
+				for	(int	ii	=	0;	ii	<	MAX_DIMS;	ii++){
+								dims[ii]	=	0;
+				}
+				lexer.load(s);
+				parseDeclaration();
 }
 
-// ===============================================
-// type-name: type-specifier
-//          | type-specifier declarator
-//          ;
-// ===============================================
-bool ParsedDeclaration::parseDeclaration() {
+//	===============================================
+//	type-name:	type-specifier
+//										|	type-specifier	declarator
+//										;
+//	===============================================
+bool	ParsedDeclaration::parseDeclaration()	{
 
-    std::cout << __FUNCTION__ << std::endl;
-    bool errorCondition = parseTypeSpecifier();
-    if ( !errorCondition ) {
-        Token::e token = lexer.getToken();
-        if ((token == Token::Asterisk) ||
-            (token == Token::Identifier ) ||
-            (token == Token::LeftParen ) ||
-            (token == Token::LeftBracket)) {
-            errorCondition = parseDeclarator();
-        }
-        if (lexer.matchToken(Token::EndOfFile) == Token::Error) {
-            errorCondition = true;
-        }
-    }
-    return errorCondition;
+				std::cout	<<	__FUNCTION__	<<	std::endl;
+				bool	errorCondition	=	parseTypeSpecifier();
+				if	(	!errorCondition	)	{
+								Token::e	token	=	lexer.getToken();
+								if	((token	==	Token::Asterisk)	||
+												(token	==	Token::Identifier	)	||
+												(token	==	Token::LeftParen	)	||
+												(token	==	Token::LeftBracket))	{
+												errorCondition	=	parseDeclarator();
+								}
+								if	(lexer.matchToken(Token::EndOfFile)	==	Token::Error)	{
+												errorCondition	=	true;
+								}
+				}
+				return	errorCondition;
 }
 
-// ==============================================================
-// declarator : pointer
-//            | pointer direct-declarator
-//            | direct-declarator
-//            ;
+//	==============================================================
+//	declarator	:	pointer
+//												|	pointer	direct-declarator
+//												|	direct-declarator
+//												;
 //
-// NOTE: a pointer is one or more asterisks.
-// ==============================================================
-bool ParsedDeclaration::parseDeclarator() {
+//	NOTE:	a	pointer	is	one	or	more	asterisks.
+//	==============================================================
+bool	ParsedDeclaration::parseDeclarator()	{
 
-   std::cout << __FUNCTION__ << std::endl;
-   bool errorCondition = false;
-   int asteriskCount = 0;
+			std::cout	<<	__FUNCTION__	<<	std::endl;
+			bool	errorCondition	=	false;
+			int	asteriskCount	=	0;
 
-   Token::e token = lexer.getToken();
-   while (token == Token::Asterisk ) {
-       token = lexer.matchToken( Token::Asterisk );
-       asteriskCount ++;
-   }
-   if ((token == Token::LeftParen) || (token == Token::LeftBracket) || (token == Token::Identifier)) {
-       errorCondition |= parseDirectDeclarator();
-   }
+			Token::e	token	=	lexer.getToken();
+			while	(token	==	Token::Asterisk	)	{
+							token	=	lexer.matchToken(	Token::Asterisk	);
+							asteriskCount	++;
+			}
+			if	((token	==	Token::LeftParen)	||	(token	==	Token::LeftBracket)	||	(token	==	Token::Identifier))	{
+							errorCondition	|=	parseDirectDeclarator();
+			}
 
-   if (asteriskCount != 0) {
-       for (int ii=0 ; ii < asteriskCount ; ii++) {
-           dims[ndims] = -1;
-           ndims ++;
-       }
-   }
-   return errorCondition;
+			if	(asteriskCount	!=	0)	{
+							for	(int	ii=0	;	ii	<	asteriskCount	;	ii++)	{
+											dims[ndims]	=	-1;
+											ndims	++;
+							}
+			}
+			return	errorCondition;
 }
 
-// ==============================================================
-// direct-declarator: identifier
-//                  | ( declarator )
-//                  | [ integer ]
-//                  | direct-declarator [ integer ]
-//                  ;
-// ==============================================================
-bool ParsedDeclaration::parseDirectDeclarator() {
+//	==============================================================
+//	direct-declarator:	identifier
+//																		|	(	declarator	)
+//																		|	[	integer	]
+//																		|	direct-declarator	[	integer	]
+//																		;
+//	==============================================================
+bool	ParsedDeclaration::parseDirectDeclarator()	{
 
-   std::cout << __FUNCTION__ << std::endl;
-   bool errorCondition = false;
+			std::cout	<<	__FUNCTION__	<<	std::endl;
+			bool	errorCondition	=	false;
 
-   Token::e token = lexer.getToken();
-   if (token == Token::Identifier) {
-       varName = lexer.getText();
-       token = lexer.matchToken( Token::Identifier );
-   } else if (token == Token::LeftParen) {
-       token = lexer.matchToken( Token::LeftParen );
-       errorCondition |= parseDeclarator();
-       if ( !errorCondition ) {
-           if ((token = lexer.matchToken( Token::RightParen )) == Token::Error) {
-           errorCondition = true;
-           }
-       }
-   } else if (token == Token::LeftBracket) {
-       token = lexer.matchToken( Token::LeftBracket );
-       if (token == Token::Integer) {
-           dims[ndims] = std::atoi( (lexer.getText()).c_str() );
-           ndims ++;
-           token = lexer.matchToken(Token::Integer);
-       }
-       if ((token = lexer.matchToken( Token::RightBracket )) == Token::Error) {
-           errorCondition = true;
-       }
-   } else {
-       // Note: this is the case of an anonymous declaration.
-       varName.clear();
-   }
+			Token::e	token	=	lexer.getToken();
+			if	(token	==	Token::Identifier)	{
+							varName	=	lexer.getText();
+							token	=	lexer.matchToken(	Token::Identifier	);
+			}	else	if	(token	==	Token::LeftParen)	{
+							token	=	lexer.matchToken(	Token::LeftParen	);
+							errorCondition	|=	parseDeclarator();
+							if	(	!errorCondition	)	{
+											if	((token	=	lexer.matchToken(	Token::RightParen	))	==	Token::Error)	{
+											errorCondition	=	true;
+											}
+							}
+			}	else	if	(token	==	Token::LeftBracket)	{
+							token	=	lexer.matchToken(	Token::LeftBracket	);
+							if	(token	==	Token::Integer)	{
+											dims[ndims]	=	std::atoi(	(lexer.getText()).c_str()	);
+											ndims	++;
+											token	=	lexer.matchToken(Token::Integer);
+							}
+							if	((token	=	lexer.matchToken(	Token::RightBracket	))	==	Token::Error)	{
+											errorCondition	=	true;
+							}
+			}	else	{
+							//	Note:	this	is	the	case	of	an	anonymous	declaration.
+							varName.clear();
+			}
 
-   while (token == Token::LeftBracket) {
-       token = lexer.matchToken( Token::LeftBracket );
-       if (token == Token::Integer) {
-           dims[ndims] = std::atoi( (lexer.getText()).c_str() );
-           ndims ++;
-           token = lexer.matchToken(Token::Integer);
-       }
-       if ((token = lexer.matchToken( Token::RightBracket )) == Token::Error) {
-           errorCondition = true;
-       }
-   }
-   return errorCondition;
+			while	(token	==	Token::LeftBracket)	{
+							token	=	lexer.matchToken(	Token::LeftBracket	);
+							if	(token	==	Token::Integer)	{
+											dims[ndims]	=	std::atoi(	(lexer.getText()).c_str()	);
+											ndims	++;
+											token	=	lexer.matchToken(Token::Integer);
+							}
+							if	((token	=	lexer.matchToken(	Token::RightBracket	))	==	Token::Error)	{
+											errorCondition	=	true;
+							}
+			}
+			return	errorCondition;
 }
 
-bool ParsedDeclaration::parseTypeSpecifier() {
+bool	ParsedDeclaration::parseTypeSpecifier()	{
 
-    std::cout << __FUNCTION__ << std::endl;
-    bool errorCondition = false;
-    Token::e token = lexer.getToken();
+				std::cout	<<	__FUNCTION__	<<	std::endl;
+				bool	errorCondition	=	false;
+				Token::e	token	=	lexer.getToken();
 
-    switch ( token ) {
-        case Token::Void : {
-            token = lexer.matchToken(Token::Void);
-            typeSpec = "void";
-        } break;
-        case Token::Boolean : {
-            token = lexer.matchToken(Token::Boolean);
-            typeSpec = "bool";
-        } break;
-        case Token::Char : {
-            token = lexer.matchToken(Token::Char);
-            typeSpec = "char";
-        } break;
-        case Token::Short : {
-            token = lexer.matchToken(Token::Short);
-            typeSpec = "short";
-        } break;
-        case Token::Int : {
-            token = lexer.matchToken(Token::Int);
-            typeSpec = "int";
-        } break;
-        case Token::Long : {
-            token = lexer.matchToken(Token::Long);
-            if (token == Token::Long) {
-                token = lexer.matchToken(Token::Long);
-                typeSpec = "long long";
-            } else {
-                typeSpec = "long";
-            }
-        } break;
-        case Token::Unsigned : {
-            token = lexer.matchToken(Token::Unsigned);
-            switch ( token ) {
-                case Token::Char : {
-                    token = lexer.matchToken(Token::Char);
-                    typeSpec = "unsigned char";
-                } break;
-                case Token::Short : {
-                    token = lexer.matchToken(Token::Short);
-                    typeSpec = "unsigned short";
-                } break;
-                case Token::Int : {
-                    token = lexer.matchToken(Token::Int);
-                    typeSpec = "unsigned int";
-                } break;
-                case Token::Long : {
-                    token = lexer.matchToken(Token::Long);
-                    if (token == Token::Long) {
-                        token = lexer.matchToken(Token::Long);
-                        typeSpec = "unsigned long long";
-                    } else {
-                        typeSpec = "unsigned long";
-                    }
-                } break;
-                default: {
-                    typeSpec = "unsigned int";
-                }
-            }
-        } break;
-        case Token::Signed : {
-            token = lexer.matchToken(Token::Signed);
-            switch ( token ) {
-                case Token::Char : {
-                    token = lexer.matchToken(Token::Char);
-                    typeSpec = "char";
-                } break;
-                case Token::Short : {
-                    token = lexer.matchToken(Token::Short);
-                    typeSpec = "short";
-                } break;
-                case Token::Int : {
-                    token = lexer.matchToken(Token::Int);
-                    typeSpec = "int";
-                } break;
-                case Token::Long : {
-                    token = lexer.matchToken(Token::Long);
-                    if (token == Token::Long) {
-                        token = lexer.matchToken(Token::Long);
-                        typeSpec = "long long";
-                    } else {
-                        typeSpec = "long";
-                    }
-                } break;
-                default: {
-                    typeSpec = "int";
-                }
-            }
-        } break;
-        case Token::WideChar : {
-            token = lexer.matchToken(Token::WideChar);
-            typeSpec = "wchar_t";
-        } break;
-        case Token::Float : {
-            token = lexer.matchToken(Token::Float);
-            typeSpec = "float";
-        } break;
-        case Token::Double : {
-            token = lexer.matchToken(Token::Double);
-            typeSpec = "double";
-        } break;
-        case Token::Identifier : {
-            token = lexer.matchToken(Token::Identifier);
-            typeSpec = lexer.getText();
-        } break;
-        default : {
-            errorCondition = true;
-        }
-    }
-    return errorCondition;
+				switch	(	token	)	{
+								case	Token::Void	:	{
+												token	=	lexer.matchToken(Token::Void);
+												typeSpec	=	"void";
+								}	break;
+								case	Token::Boolean	:	{
+												token	=	lexer.matchToken(Token::Boolean);
+												typeSpec	=	"bool";
+								}	break;
+								case	Token::Char	:	{
+												token	=	lexer.matchToken(Token::Char);
+												typeSpec	=	"char";
+								}	break;
+								case	Token::Short	:	{
+												token	=	lexer.matchToken(Token::Short);
+												typeSpec	=	"short";
+								}	break;
+								case	Token::Int	:	{
+												token	=	lexer.matchToken(Token::Int);
+												typeSpec	=	"int";
+								}	break;
+								case	Token::Long	:	{
+												token	=	lexer.matchToken(Token::Long);
+												if	(token	==	Token::Long)	{
+																token	=	lexer.matchToken(Token::Long);
+																typeSpec	=	"long	long";
+												}	else	{
+																typeSpec	=	"long";
+												}
+								}	break;
+								case	Token::Unsigned	:	{
+												token	=	lexer.matchToken(Token::Unsigned);
+												switch	(	token	)	{
+																case	Token::Char	:	{
+																				token	=	lexer.matchToken(Token::Char);
+																				typeSpec	=	"unsigned	char";
+																}	break;
+																case	Token::Short	:	{
+																				token	=	lexer.matchToken(Token::Short);
+																				typeSpec	=	"unsigned	short";
+																}	break;
+																case	Token::Int	:	{
+																				token	=	lexer.matchToken(Token::Int);
+																				typeSpec	=	"unsigned	int";
+																}	break;
+																case	Token::Long	:	{
+																				token	=	lexer.matchToken(Token::Long);
+																				if	(token	==	Token::Long)	{
+																								token	=	lexer.matchToken(Token::Long);
+																								typeSpec	=	"unsigned	long	long";
+																				}	else	{
+																								typeSpec	=	"unsigned	long";
+																				}
+																}	break;
+																default:	{
+																				typeSpec	=	"unsigned	int";
+																}
+												}
+								}	break;
+								case	Token::Signed	:	{
+												token	=	lexer.matchToken(Token::Signed);
+												switch	(	token	)	{
+																case	Token::Char	:	{
+																				token	=	lexer.matchToken(Token::Char);
+																				typeSpec	=	"char";
+																}	break;
+																case	Token::Short	:	{
+																				token	=	lexer.matchToken(Token::Short);
+																				typeSpec	=	"short";
+																}	break;
+																case	Token::Int	:	{
+																				token	=	lexer.matchToken(Token::Int);
+																				typeSpec	=	"int";
+																}	break;
+																case	Token::Long	:	{
+																				token	=	lexer.matchToken(Token::Long);
+																				if	(token	==	Token::Long)	{
+																								token	=	lexer.matchToken(Token::Long);
+																								typeSpec	=	"long	long";
+																				}	else	{
+																								typeSpec	=	"long";
+																				}
+																}	break;
+																default:	{
+																				typeSpec	=	"int";
+																}
+												}
+								}	break;
+								case	Token::WideChar	:	{
+												token	=	lexer.matchToken(Token::WideChar);
+												typeSpec	=	"wchar_t";
+								}	break;
+								case	Token::Float	:	{
+												token	=	lexer.matchToken(Token::Float);
+												typeSpec	=	"float";
+								}	break;
+								case	Token::Double	:	{
+												token	=	lexer.matchToken(Token::Double);
+												typeSpec	=	"double";
+								}	break;
+								case	Token::Identifier	:	{
+												token	=	lexer.matchToken(Token::Identifier);
+												typeSpec	=	lexer.getText();
+								}	break;
+								default	:	{
+												errorCondition	=	true;
+								}
+				}
+				return	errorCondition;
 }
 
-std::string ParsedDeclaration::getTypeSpecifier() {
-    return typeSpec;
+std::string	ParsedDeclaration::getTypeSpecifier()	{
+				return	typeSpec;
 }
 
-std::string ParsedDeclaration::getVariableName() {
-    return varName;
+std::string	ParsedDeclaration::getVariableName()	{
+				return	varName;
 }
 
-unsigned int ParsedDeclaration::getNumberOfDimensions() {
-    return ndims;
+unsigned	int	ParsedDeclaration::getNumberOfDimensions()	{
+				return	ndims;
 }
 
-int ParsedDeclaration::getDimensionSize( unsigned int index) {
-    // FIXME: needs bounds checking.
-    return dims[index];
+int	ParsedDeclaration::getDimensionSize(	unsigned	int	index)	{
+				//	FIXME:	needs	bounds	checking.
+				return	dims[index];
 }
diff --git a/trick_source/sim_services/DataTypes/src/PointerDataType.cpp b/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
index 0caf4afe1..865cc8076 100644
--- a/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
@@ -1,211 +1,211 @@
-#include "PointerDataType.hh"
-#include "ArrayDataType.hh"
-#include "TypeDictionary.hh"
-#include "PointerValue.hh"
-#include "CompositeValue.hh"
-#include <iostream>
-#include <sstream>
-#include <stdlib.h> // for free()
-
-
-
-bool PointerDataType::initPointerDataType( TypeDictionary * typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[]) {
-
-    bool errorCondition = false;
-    // NOTE: (dim[0] < 0) indicates a pointer. (dim[0] >= 0) indicates an array.
-    if (( n_dims >= 1 ) && ( dims[0] < 0 )) {
-        if ( n_dims == 1 ) {
-            this->typeSpecName = typeSpecName;
-            ownDataType = NULL;
-            this->subType = NULL;
-        } else if (n_dims > 1) {
-            this->typeSpecName.clear();
-            if (dims[1] < 0) {
-                this->ownDataType = new PointerDataType( typeDictionary, typeSpecName, n_dims-1, &dims[1] );
-            } else {
-                this->ownDataType = new ArrayDataType( typeDictionary, typeSpecName, n_dims-1, &dims[1] );
-            }
-            this->subType = ownDataType;
-        }
-        is_valid = false;
-        this->typeDictionary = typeDictionary;
-    } else {
-        errorCondition= true;
-    }
-    return errorCondition;
-}
-
-// CONSTRUCTOR
-PointerDataType:: PointerDataType( TypeDictionary * typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[])  {
-
-   if( this->initPointerDataType( typeDictionary, typeSpecName, n_dims, dims) ) {
-       throw std::logic_error("PointerDataType constructor(1) error.");
-   }
-}
-
-// CONSTRUCTOR
-PointerDataType::PointerDataType( TypeDictionary* typeDictionary, std::string typeSpecifierName)  {
-
-   int dims[1] = {-1};
-   if( this->initPointerDataType( typeDictionary, typeSpecName, 1, dims) ) {
-       throw std::logic_error("PointerDataType constructor(2) error.");
-   }
-}
-
-// COPY CONSTRUCTOR
-PointerDataType::PointerDataType ( PointerDataType const & original) {
-
-    is_valid = original.is_valid;
-    typeSpecName = original.typeSpecName;
-    typeDictionary = original.typeDictionary;
-
-    if (original.ownDataType != NULL) {
-        ownDataType = original.ownDataType->clone();
-    } else {
-        ownDataType = NULL;
-    }
-
-    if ( typeSpecName.empty())  {
-        subType = ownDataType;
-    } else {
-        if ( is_valid ) {
-            subType = original.subType;
-        } else {
-            subType = NULL;
-        }
-    }
-}
-
-// DESTRUCTOR
-PointerDataType::~PointerDataType () {
+#include	"PointerDataType.hh"
+#include	"ArrayDataType.hh"
+#include	"TypeDictionary.hh"
+#include	"PointerValue.hh"
+#include	"CompositeValue.hh"
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>	//	for	free()
+
+
+
+bool	PointerDataType::initPointerDataType(	TypeDictionary	*	typeDictionary,	std::string	typeSpecName,	unsigned	int	n_dims,	int	dims[])	{
+
+				bool	errorCondition	=	false;
+				//	NOTE:	(dim[0]	<	0)	indicates	a	pointer.	(dim[0]	>=	0)	indicates	an	array.
+				if	((	n_dims	>=	1	)	&&	(	dims[0]	<	0	))	{
+								if	(	n_dims	==	1	)	{
+												this->typeSpecName	=	typeSpecName;
+												ownDataType	=	NULL;
+												this->subType	=	NULL;
+								}	else	if	(n_dims	>	1)	{
+												this->typeSpecName.clear();
+												if	(dims[1]	<	0)	{
+																this->ownDataType	=	new	PointerDataType(	typeDictionary,	typeSpecName,	n_dims-1,	&dims[1]	);
+												}	else	{
+																this->ownDataType	=	new	ArrayDataType(	typeDictionary,	typeSpecName,	n_dims-1,	&dims[1]	);
+												}
+												this->subType	=	ownDataType;
+								}
+								is_valid	=	false;
+								this->typeDictionary	=	typeDictionary;
+				}	else	{
+								errorCondition=	true;
+				}
+				return	errorCondition;
+}
+
+//	CONSTRUCTOR
+PointerDataType::	PointerDataType(	TypeDictionary	*	typeDictionary,	std::string	typeSpecName,	unsigned	int	n_dims,	int	dims[])		{
+
+			if(	this->initPointerDataType(	typeDictionary,	typeSpecName,	n_dims,	dims)	)	{
+							throw	std::logic_error("PointerDataType	constructor(1)	error.");
+			}
+}
+
+//	CONSTRUCTOR
+PointerDataType::PointerDataType(	TypeDictionary*	typeDictionary,	std::string	typeSpecifierName)		{
+
+			int	dims[1]	=	{-1};
+			if(	this->initPointerDataType(	typeDictionary,	typeSpecName,	1,	dims)	)	{
+							throw	std::logic_error("PointerDataType	constructor(2)	error.");
+			}
+}
+
+//	COPY	CONSTRUCTOR
+PointerDataType::PointerDataType	(	PointerDataType	const	&	original)	{
+
+				is_valid	=	original.is_valid;
+				typeSpecName	=	original.typeSpecName;
+				typeDictionary	=	original.typeDictionary;
+
+				if	(original.ownDataType	!=	NULL)	{
+								ownDataType	=	original.ownDataType->clone();
+				}	else	{
+								ownDataType	=	NULL;
+				}
+
+				if	(	typeSpecName.empty())		{
+								subType	=	ownDataType;
+				}	else	{
+								if	(	is_valid	)	{
+												subType	=	original.subType;
+								}	else	{
+												subType	=	NULL;
+								}
+				}
+}
+
+//	DESTRUCTOR
+PointerDataType::~PointerDataType	()	{
 
-    if ( typeSpecName.empty()) {
-        delete subType;
-    }
+				if	(	typeSpecName.empty())	{
+								delete	subType;
+				}
 }
 
-// ASSIGNMENT OPERATOR
-PointerDataType& PointerDataType::operator=( const PointerDataType & rhs ) {
+//	ASSIGNMENT	OPERATOR
+PointerDataType&	PointerDataType::operator=(	const	PointerDataType	&	rhs	)	{
 
-    if ( this != &rhs ) {
+				if	(	this	!=	&rhs	)	{
 
-        // Copy the RHS members before messing with the LHS.
-        DataType *clonedDataType;
-        if ( rhs.typeSpecName.empty() ) {
-            clonedDataType = rhs.subType->clone();
-        }
+								//	Copy	the	RHS	members	before	messing	with	the	LHS.
+								DataType	*clonedDataType;
+								if	(	rhs.typeSpecName.empty()	)	{
+												clonedDataType	=	rhs.subType->clone();
+								}
 
-        // Delete any pre-existing LHS members.
-        if ( typeSpecName.empty() ) {
-            delete subType;
-        }
+								//	Delete	any	pre-existing	LHS	members.
+								if	(	typeSpecName.empty()	)	{
+												delete	subType;
+								}
 
-        // Assign the copied RHS members to the LHS.
-        elementCount = rhs.elementCount;
-        is_valid = rhs.is_valid;
-        typeSpecName = rhs.typeSpecName;
+								//	Assign	the	copied	RHS	members	to	the	LHS.
+								elementCount	=	rhs.elementCount;
+								is_valid	=	rhs.is_valid;
+								typeSpecName	=	rhs.typeSpecName;
 
-        if ( typeSpecName.empty() ) {
-            subType = clonedDataType;
-        } else {
-            subType = rhs.subType;
-        }
-    }
-    return *this;
+								if	(	typeSpecName.empty()	)	{
+												subType	=	clonedDataType;
+								}	else	{
+												subType	=	rhs.subType;
+								}
+				}
+				return	*this;
 }
 
-// MEMBER FUNCTION
-// FIXME: make sure that this method in other DataTypes checks for PointerData types rather than ArrayDataTypes.
-bool PointerDataType::containsPointers() const {
-    return true;
+//	MEMBER	FUNCTION
+//	FIXME:	make	sure	that	this	method	in	other	DataTypes	checks	for	PointerData	types	rather	than	ArrayDataTypes.
+bool	PointerDataType::containsPointers()	const	{
+				return	true;
 }
 
-// CLONE
-DataType * PointerDataType::clone () const {
-    return new PointerDataType( *this );
+//	CLONE
+DataType	*	PointerDataType::clone	()	const	{
+				return	new	PointerDataType(	*this	);
 }
 
-// MEMBER FUNCTION
-bool PointerDataType::validate() {
+//	MEMBER	FUNCTION
+bool	PointerDataType::validate()	{
 
-    if (!is_valid) {
-        // if we're not referencing a dictionary type.
-        if (typeSpecName.empty()) {
-            is_valid = ownDataType->validate();
-            if (is_valid) {
-                subType = ownDataType;
-            }
-        } else {
-            subType = typeDictionary->getDataType( typeSpecName );
-            if (subType != NULL) {
-                is_valid = true;
-            } else {
-                std::cerr << "ERROR: Type \"" << typeSpecName << "\" not found." << std::endl;
-            }
-        }
-    }
-    return is_valid;
+				if	(!is_valid)	{
+								//	if	we're	not	referencing	a	dictionary	type.
+								if	(typeSpecName.empty())	{
+												is_valid	=	ownDataType->validate();
+												if	(is_valid)	{
+																subType	=	ownDataType;
+												}
+								}	else	{
+												subType	=	typeDictionary->getDataType(	typeSpecName	);
+												if	(subType	!=	NULL)	{
+																is_valid	=	true;
+												}	else	{
+																std::cerr	<<	"ERROR:	Type	\""	<<	typeSpecName	<<	"\"	not	found."	<<	std::endl;
+												}
+								}
+				}
+				return	is_valid;
 }
 
-// MEMBER FUNCTION
-size_t PointerDataType::getSize() const {
-    return sizeof(void*);
+//	MEMBER	FUNCTION
+size_t	PointerDataType::getSize()	const	{
+				return	sizeof(void*);
 }
 
-// MEMBER FUNCTION
-void* PointerDataType::createInstance(unsigned int num) const {
-    void* temp = calloc(num, sizeof(void*));
-    return temp;
+//	MEMBER	FUNCTION
+void*	PointerDataType::createInstance(unsigned	int	num)	const	{
+				void*	temp	=	calloc(num,	sizeof(void*));
+				return	temp;
 }
 
-// MEMBER FUNCTION
-void PointerDataType::deleteInstance(void* address) const {
-    free(address);
+//	MEMBER	FUNCTION
+void	PointerDataType::deleteInstance(void*	address)	const	{
+				free(address);
 }
 
-// MEMBER FUNCTION
-void PointerDataType::clearValue(void * address) const {
-    *(void**)address =  (void*)NULL;
+//	MEMBER	FUNCTION
+void	PointerDataType::clearValue(void	*	address)	const	{
+				*(void**)address	=		(void*)NULL;
 }
 
-// MEMBER FUNCTION
-void PointerDataType::assignValue(void * address, Value*value) const {
+//	MEMBER	FUNCTION
+void	PointerDataType::assignValue(void	*	address,	Value*value)	const	{
 
-    PointerValue * pointer_value_p = dynamic_cast<PointerValue*>(value);
-    if (pointer_value_p) {
-        *(void**)address =  pointer_value_p->getPointer();
-    } else {
-        std::cerr << "ERROR: Attempt to assign non-pointer value to a pointer.";
-    }
+				PointerValue	*	pointer_value_p	=	dynamic_cast<PointerValue*>(value);
+				if	(pointer_value_p)	{
+								*(void**)address	=		pointer_value_p->getPointer();
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	assign	non-pointer	value	to	a	pointer.";
+				}
 }
 
-// MEMBER FUNCTION
-void PointerDataType::printValue(std::ostream &s, void * address) const {
-    s << *(void**)address;
+//	MEMBER	FUNCTION
+void	PointerDataType::printValue(std::ostream	&s,	void	*	address)	const	{
+				s	<<	*(void**)address;
 }
 
-// MEMBER FUNCTION
-std::string PointerDataType::getTypeSpecName() const {
-    return typeSpecName;
+//	MEMBER	FUNCTION
+std::string	PointerDataType::getTypeSpecName()	const	{
+				return	typeSpecName;
 }
 
-// MEMBER FUNCTION
-std::string PointerDataType::makeDeclaration(std::string declarator, bool isDirectDeclarator) const {
-    std::string outTypeName;
-    std::stringstream ss;
+//	MEMBER	FUNCTION
+std::string	PointerDataType::makeDeclaration(std::string	declarator,	bool	isDirectDeclarator)	const	{
+				std::string	outTypeName;
+				std::stringstream	ss;
 
-    ss << "*" << declarator ;
-    if (subType != NULL) {
-        outTypeName = subType->makeDeclaration( ss.str(), false );
-    } else {
-        outTypeName = getTypeSpecName() + ss.str();
-    }
-    return outTypeName;
+				ss	<<	"*"	<<	declarator	;
+				if	(subType	!=	NULL)	{
+								outTypeName	=	subType->makeDeclaration(	ss.str(),	false	);
+				}	else	{
+								outTypeName	=	getTypeSpecName()	+	ss.str();
+				}
+				return	outTypeName;
 }
 
-// MEMBER FUNCTION
-const DataType * PointerDataType::getSubType() const {
-    return subType;
+//	MEMBER	FUNCTION
+const	DataType	*	PointerDataType::getSubType()	const	{
+				return	subType;
 }
 
 
diff --git a/trick_source/sim_services/DataTypes/src/PointerValue.cpp b/trick_source/sim_services/DataTypes/src/PointerValue.cpp
index 3ecd6f133..4db8aae12 100644
--- a/trick_source/sim_services/DataTypes/src/PointerValue.cpp
+++ b/trick_source/sim_services/DataTypes/src/PointerValue.cpp
@@ -1,24 +1,24 @@
-#include "PointerValue.hh"
-#include <sstream>
+#include	"PointerValue.hh"
+#include	<sstream>
 
-// CONSTRUCTOR
-PointerValue::PointerValue(void * value) {
-    this->value = value;
+//	CONSTRUCTOR
+PointerValue::PointerValue(void	*	value)	{
+				this->value	=	value;
 }
 
-// MEMBER FUNCTION
-void* PointerValue::getPointer() {
-    return value;
+//	MEMBER	FUNCTION
+void*	PointerValue::getPointer()	{
+				return	value;
 }
 
-// MEMBER FUNCTION
-void  PointerValue::print(std::ostream &s) {
-    s << value;
+//	MEMBER	FUNCTION
+void		PointerValue::print(std::ostream	&s)	{
+				s	<<	value;
 }
 
-// MEMBER FUNCTION
-std::string PointerValue::toString() {
-    std::ostringstream oss;
-    oss << value;
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	PointerValue::toString()	{
+				std::ostringstream	oss;
+				oss	<<	value;
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/DataTypes/src/PrimitiveDataType.cpp b/trick_source/sim_services/DataTypes/src/PrimitiveDataType.cpp
index 2710a9560..48d5f3dee 100644
--- a/trick_source/sim_services/DataTypes/src/PrimitiveDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/PrimitiveDataType.cpp
@@ -1,118 +1,118 @@
-#include "PrimitiveDataType.hh"
-#include <ctype.h>
-#include <iostream>
+#include	"PrimitiveDataType.hh"
+#include	<ctype.h>
+#include	<iostream>
 
 /*
- Template specializations for PrimitiveDataType<T>::getTypeSpecName()
- */
-template <> std::string PrimitiveDataType<void>::getTypeSpecName() const {
-    std::string s("void"); return s;
+	Template	specializations	for	PrimitiveDataType<T>::getTypeSpecName()
+	*/
+template	<>	std::string	PrimitiveDataType<void>::getTypeSpecName()	const	{
+				std::string	s("void");	return	s;
 }
-template <> std::string PrimitiveDataType<char>::getTypeSpecName() const {
-    std::string s("char"); return s;
+template	<>	std::string	PrimitiveDataType<char>::getTypeSpecName()	const	{
+				std::string	s("char");	return	s;
 }
-template <> std::string PrimitiveDataType<short>::getTypeSpecName() const {
-    std::string s("short"); return s;
+template	<>	std::string	PrimitiveDataType<short>::getTypeSpecName()	const	{
+				std::string	s("short");	return	s;
 }
-template <> std::string PrimitiveDataType<int>::getTypeSpecName() const {
-    std::string s("int"); return s;
+template	<>	std::string	PrimitiveDataType<int>::getTypeSpecName()	const	{
+				std::string	s("int");	return	s;
 }
-template <> std::string PrimitiveDataType<long>::getTypeSpecName() const {
-    std::string s("long"); return s;
+template	<>	std::string	PrimitiveDataType<long>::getTypeSpecName()	const	{
+				std::string	s("long");	return	s;
 }
-template <> std::string PrimitiveDataType<wchar_t>::getTypeSpecName() const {
-    std::string s("wchar_t"); return s;
+template	<>	std::string	PrimitiveDataType<wchar_t>::getTypeSpecName()	const	{
+				std::string	s("wchar_t");	return	s;
 }
-template <> std::string PrimitiveDataType<long long>::getTypeSpecName() const {
-    std::string s("long long"); return s;
+template	<>	std::string	PrimitiveDataType<long	long>::getTypeSpecName()	const	{
+				std::string	s("long	long");	return	s;
 }
-template <> std::string PrimitiveDataType<unsigned char>::getTypeSpecName() const {
-    std::string s("unsigned char"); return s;
+template	<>	std::string	PrimitiveDataType<unsigned	char>::getTypeSpecName()	const	{
+				std::string	s("unsigned	char");	return	s;
 }
-template <> std::string PrimitiveDataType<unsigned short>::getTypeSpecName() const {
-    std::string s("unsigned short"); return s;
+template	<>	std::string	PrimitiveDataType<unsigned	short>::getTypeSpecName()	const	{
+				std::string	s("unsigned	short");	return	s;
 }
-template <> std::string PrimitiveDataType<unsigned int>::getTypeSpecName() const {
-    std::string s("unsigned int"); return s;
+template	<>	std::string	PrimitiveDataType<unsigned	int>::getTypeSpecName()	const	{
+				std::string	s("unsigned	int");	return	s;
 }
-template <> std::string PrimitiveDataType<unsigned long>::getTypeSpecName() const {
-    std::string s("unsigned long"); return s;
+template	<>	std::string	PrimitiveDataType<unsigned	long>::getTypeSpecName()	const	{
+				std::string	s("unsigned	long");	return	s;
 }
-template <> std::string PrimitiveDataType<unsigned long long>::getTypeSpecName() const {
-    std::string s("unsigned long long"); return s;
+template	<>	std::string	PrimitiveDataType<unsigned	long	long>::getTypeSpecName()	const	{
+				std::string	s("unsigned	long	long");	return	s;
 }
-template <> std::string PrimitiveDataType<float>::getTypeSpecName() const {
-    std::string s("float"); return s;
+template	<>	std::string	PrimitiveDataType<float>::getTypeSpecName()	const	{
+				std::string	s("float");	return	s;
 }
-template <> std::string PrimitiveDataType<double>::getTypeSpecName() const {
-    std::string s("double"); return s;
+template	<>	std::string	PrimitiveDataType<double>::getTypeSpecName()	const	{
+				std::string	s("double");	return	s;
 }
 
 /*
- Template specializations for PrimitiveDataType<T>::isFloatingPoint()
- */
-template <> bool PrimitiveDataType<float>::isFloatingPoint() const { return true; }
-template <> bool PrimitiveDataType<double>::isFloatingPoint() const { return true; }
+	Template	specializations	for	PrimitiveDataType<T>::isFloatingPoint()
+	*/
+template	<>	bool	PrimitiveDataType<float>::isFloatingPoint()	const	{	return	true;	}
+template	<>	bool	PrimitiveDataType<double>::isFloatingPoint()	const	{	return	true;	}
 
 /*
- Template specializations for PrimitiveDataType<T>::isSigned()
- */
-template <> bool PrimitiveDataType<char>::isSigned() const { return true; }
-template <> bool PrimitiveDataType<short>::isSigned() const { return true; }
-template <> bool PrimitiveDataType<int>::isSigned() const { return true; }
-template <> bool PrimitiveDataType<long>::isSigned() const { return true; }
-template <> bool PrimitiveDataType<long long>::isSigned() const { return true; }
+	Template	specializations	for	PrimitiveDataType<T>::isSigned()
+	*/
+template	<>	bool	PrimitiveDataType<char>::isSigned()	const	{	return	true;	}
+template	<>	bool	PrimitiveDataType<short>::isSigned()	const	{	return	true;	}
+template	<>	bool	PrimitiveDataType<int>::isSigned()	const	{	return	true;	}
+template	<>	bool	PrimitiveDataType<long>::isSigned()	const	{	return	true;	}
+template	<>	bool	PrimitiveDataType<long	long>::isSigned()	const	{	return	true;	}
 
 /*
- Template specializations for PrimitiveDataType<T>::isVoid()
- */
-template <> bool PrimitiveDataType<void>::isVoid() const { return true; }
+	Template	specializations	for	PrimitiveDataType<T>::isVoid()
+	*/
+template	<>	bool	PrimitiveDataType<void>::isVoid()	const	{	return	true;	}
 
 /*
- Template specializations for PrimitiveDataType<char>::printValue()
+	Template	specializations	for	PrimitiveDataType<char>::printValue()
 */
-template <> void PrimitiveDataType<char>::printValue(std::ostream &s, void *address ) const {
-    if (isprint( (int)*(char*)address) ) {
-        s << "'" << *(char*)address << "'";
-    } else {
-        s << (int)*(char*)address;
-    }
+template	<>	void	PrimitiveDataType<char>::printValue(std::ostream	&s,	void	*address	)	const	{
+				if	(isprint(	(int)*(char*)address)	)	{
+								s	<<	"'"	<<	*(char*)address	<<	"'";
+				}	else	{
+								s	<<	(int)*(char*)address;
+				}
 }
 
-template <> void PrimitiveDataType<unsigned char>::printValue(std::ostream &s, void *address ) const {
-    if (isprint( (int)*(unsigned char*)address) ) {
-        s << "'" << *(unsigned char*)address << "'";
-    } else {
-        s << (int)*(unsigned char*)address;
-    }
+template	<>	void	PrimitiveDataType<unsigned	char>::printValue(std::ostream	&s,	void	*address	)	const	{
+				if	(isprint(	(int)*(unsigned	char*)address)	)	{
+								s	<<	"'"	<<	*(unsigned	char*)address	<<	"'";
+				}	else	{
+								s	<<	(int)*(unsigned	char*)address;
+				}
 }
 
 /*
- Template specializations for PrimitiveDataType<void>
- */
-template <> size_t PrimitiveDataType<void>::getSize() const {
-    std::cerr << "WARNING: Calling PrimitiveDataType<void>::getSize()"
-              << ", i.e., attempting to get the size of void, indicates that"
-              << " you may be up to no good and about to run out of luck." << std::endl;
-    return 0;
-}
-template <> void PrimitiveDataType<void>::deleteInstance(void* address) const {
-    std::cerr << "WARNING: Cannot delete the object, of type <void> at address ("
-              << address << ")." << std::endl;
-}
-template <> void* PrimitiveDataType<void>::createInstance(unsigned int num) const {
-    std::cerr << "WARNING: Cannot create an object, of type <void>." << std::endl;
-    return NULL;
-}
-template <> void PrimitiveDataType<void>:: clearValue(void * address) const {
-    std::cerr << "WARNING: Cannot clear the value of the object, of type <void> at address ("
-              << address << ")." << std::endl;
-}
-template <> void PrimitiveDataType<void>:: assignValue(void * address, Value * value) const {
-    std::cerr << "WARNING: Cannot assign a value to the object, of type <void> at address ("
-              << address << ")." << std::endl;
-}
-template <> void PrimitiveDataType<void>::printValue(std::ostream &s, void *address ) const {
-    std::cerr << "WARNING: Cannot print the value of the object, of type <void> at address (" << address
-              << " of type void." << std::endl;
+	Template	specializations	for	PrimitiveDataType<void>
+	*/
+template	<>	size_t	PrimitiveDataType<void>::getSize()	const	{
+				std::cerr	<<	"WARNING:	Calling	PrimitiveDataType<void>::getSize()"
+														<<	",	i.e.,	attempting	to	get	the	size	of	void,	indicates	that"
+														<<	"	you	may	be	up	to	no	good	and	about	to	run	out	of	luck."	<<	std::endl;
+				return	0;
+}
+template	<>	void	PrimitiveDataType<void>::deleteInstance(void*	address)	const	{
+				std::cerr	<<	"WARNING:	Cannot	delete	the	object,	of	type	<void>	at	address	("
+														<<	address	<<	")."	<<	std::endl;
+}
+template	<>	void*	PrimitiveDataType<void>::createInstance(unsigned	int	num)	const	{
+				std::cerr	<<	"WARNING:	Cannot	create	an	object,	of	type	<void>."	<<	std::endl;
+				return	NULL;
+}
+template	<>	void	PrimitiveDataType<void>::	clearValue(void	*	address)	const	{
+				std::cerr	<<	"WARNING:	Cannot	clear	the	value	of	the	object,	of	type	<void>	at	address	("
+														<<	address	<<	")."	<<	std::endl;
+}
+template	<>	void	PrimitiveDataType<void>::	assignValue(void	*	address,	Value	*	value)	const	{
+				std::cerr	<<	"WARNING:	Cannot	assign	a	value	to	the	object,	of	type	<void>	at	address	("
+														<<	address	<<	")."	<<	std::endl;
+}
+template	<>	void	PrimitiveDataType<void>::printValue(std::ostream	&s,	void	*address	)	const	{
+				std::cerr	<<	"WARNING:	Cannot	print	the	value	of	the	object,	of	type	<void>	at	address	("	<<	address
+														<<	"	of	type	void."	<<	std::endl;
 }
diff --git a/trick_source/sim_services/DataTypes/src/StaticStructMember.cpp b/trick_source/sim_services/DataTypes/src/StaticStructMember.cpp
index e84739b44..8db536e31 100644
--- a/trick_source/sim_services/DataTypes/src/StaticStructMember.cpp
+++ b/trick_source/sim_services/DataTypes/src/StaticStructMember.cpp
@@ -1,144 +1,144 @@
-#include "StaticStructMember.hh"
-#include "TypeDictionary.hh"
-#include "ArrayDataType.hh"
-#include <sstream>
-#include <iostream>
-
-// CONSTRUCTOR
-StaticStructMember::StaticStructMember(std::string memberName,
-                                       void * memberAddress,
-                                       TypeDictionary* typeDictionary,
-                                       std::string typeSpecName,
-                                       unsigned int n_dims,
-                                       int dims[] ) : StructMember(memberName) {
-
-   if ( n_dims > 0 ) {
-       this->typeSpecName.clear();
-       declDataType = new ArrayDataType( typeDictionary, typeSpecName, n_dims, dims);
-   } else {
-       this->typeSpecName = typeSpecName;
-       declDataType = NULL;
-   }
-
-   subType = NULL;
-   this->memberAddress = memberAddress;
-   this->typeDictionary = typeDictionary;
-   is_valid = false;
+#include	"StaticStructMember.hh"
+#include	"TypeDictionary.hh"
+#include	"ArrayDataType.hh"
+#include	<sstream>
+#include	<iostream>
+
+//	CONSTRUCTOR
+StaticStructMember::StaticStructMember(std::string	memberName,
+																																							void	*	memberAddress,
+																																							TypeDictionary*	typeDictionary,
+																																							std::string	typeSpecName,
+																																							unsigned	int	n_dims,
+																																							int	dims[]	)	:	StructMember(memberName)	{
+
+			if	(	n_dims	>	0	)	{
+							this->typeSpecName.clear();
+							declDataType	=	new	ArrayDataType(	typeDictionary,	typeSpecName,	n_dims,	dims);
+			}	else	{
+							this->typeSpecName	=	typeSpecName;
+							declDataType	=	NULL;
+			}
+
+			subType	=	NULL;
+			this->memberAddress	=	memberAddress;
+			this->typeDictionary	=	typeDictionary;
+			is_valid	=	false;
 }
 
-// CONSTRUCTOR
-StaticStructMember::StaticStructMember ( const StaticStructMember & original )
-    :StructMember( original ) {
-
-    memberAddress = original.memberAddress;
-    is_valid = original.is_valid;
-    typeSpecName = original.typeSpecName;
-
-    if ( original.declDataType != NULL) {
-        declDataType = original.declDataType->clone();
-    } else {
-        declDataType = NULL;
-    }
-
-    if (is_valid) {
-        if (typeSpecName.empty()) {
-            subType = declDataType;
-        } else {
-            subType = original.subType;
-        }
-    }
+//	CONSTRUCTOR
+StaticStructMember::StaticStructMember	(	const	StaticStructMember	&	original	)
+				:StructMember(	original	)	{
+
+				memberAddress	=	original.memberAddress;
+				is_valid	=	original.is_valid;
+				typeSpecName	=	original.typeSpecName;
+
+				if	(	original.declDataType	!=	NULL)	{
+								declDataType	=	original.declDataType->clone();
+				}	else	{
+								declDataType	=	NULL;
+				}
+
+				if	(is_valid)	{
+								if	(typeSpecName.empty())	{
+												subType	=	declDataType;
+								}	else	{
+												subType	=	original.subType;
+								}
+				}
 }
 
-StructMember * StaticStructMember::clone () const {
-    return new StaticStructMember( *this );
+StructMember	*	StaticStructMember::clone	()	const	{
+				return	new	StaticStructMember(	*this	);
 }
 
-StaticStructMember::~StaticStructMember() {
-    if (declDataType != NULL) {
-        delete declDataType;
-    }
+StaticStructMember::~StaticStructMember()	{
+				if	(declDataType	!=	NULL)	{
+								delete	declDataType;
+				}
 }
 
-bool StaticStructMember::validate() {
-
-    if (!is_valid) {
-        if (typeSpecName.empty()) {
-            is_valid = declDataType->validate();
-            if (is_valid) {
-                subType = declDataType;
-            }
-        } else {
-            subType = typeDictionary->getDataType( typeSpecName );
-
-            if (subType != NULL) {
-                is_valid = true;
-            } else {
-                std::cerr << "ERROR: Type \"" << typeSpecName
-                          << "\" not found in the TypeDictionary." << std::endl;
-            }
-        }
-    }
-    return is_valid;
+bool	StaticStructMember::validate()	{
+
+				if	(!is_valid)	{
+								if	(typeSpecName.empty())	{
+												is_valid	=	declDataType->validate();
+												if	(is_valid)	{
+																subType	=	declDataType;
+												}
+								}	else	{
+												subType	=	typeDictionary->getDataType(	typeSpecName	);
+
+												if	(subType	!=	NULL)	{
+																is_valid	=	true;
+												}	else	{
+																std::cerr	<<	"ERROR:	Type	\""	<<	typeSpecName
+																										<<	"\"	not	found	in	the	TypeDictionary."	<<	std::endl;
+												}
+								}
+				}
+				return	is_valid;
 }
 
 
-// MEMBER FUNCTION
-bool StaticStructMember::containsPointers() const {
-    if (is_valid) {
-        return subType->containsPointers();
-    }
-    return false;
+//	MEMBER	FUNCTION
+bool	StaticStructMember::containsPointers()	const	{
+				if	(is_valid)	{
+								return	subType->containsPointers();
+				}
+				return	false;
 }
 
-// MEMBER FUNCTION
-const DataType * StaticStructMember::getDataType() {
-    return subType;
+//	MEMBER	FUNCTION
+const	DataType	*	StaticStructMember::getDataType()	{
+				return	subType;
 }
 
-// MEMBER FUNCTION
-void* StaticStructMember::getAddress() {
-    return memberAddress;
+//	MEMBER	FUNCTION
+void*	StaticStructMember::getAddress()	{
+				return	memberAddress;
 }
 
-// MEMBER FUNCTION
-void StaticStructMember::clearValue(void *struct_address) const {
+//	MEMBER	FUNCTION
+void	StaticStructMember::clearValue(void	*struct_address)	const	{
 
-    if (is_valid) {
-        subType->clearValue( memberAddress);
-    } else {
-        std::cerr << "ERROR: Attempt to clear a value via unvalidated DataType." << std::endl;
-    }
+				if	(is_valid)	{
+								subType->clearValue(	memberAddress);
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	clear	a	value	via	unvalidated	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-void StaticStructMember::assignValue(void *struct_address, Value *v ) const {
+//	MEMBER	FUNCTION
+void	StaticStructMember::assignValue(void	*struct_address,	Value	*v	)	const	{
 
-    if (is_valid) {
-        subType->assignValue( memberAddress, v);
-    } else {
-        std::cerr << "ERROR: Attempt to assign a value via unvalidated DataType." << std::endl;
-    }
+				if	(is_valid)	{
+								subType->assignValue(	memberAddress,	v);
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	assign	a	value	via	unvalidated	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-void StaticStructMember::printValue(std::ostream &s, void *struct_address) const {
+//	MEMBER	FUNCTION
+void	StaticStructMember::printValue(std::ostream	&s,	void	*struct_address)	const	{
 
-    // Note that struct_address is not used. We still need to satisfy the virtual interface.
-    if (is_valid) {
-        subType->printValue(s, memberAddress) ;
-    } else {
-        std::cerr << "ERROR: Attempt to print a value via unvalidated DataType." << std::endl;
-    }
+				//	Note	that	struct_address	is	not	used.	We	still	need	to	satisfy	the	virtual	interface.
+				if	(is_valid)	{
+								subType->printValue(s,	memberAddress)	;
+				}	else	{
+								std::cerr	<<	"ERROR:	Attempt	to	print	a	value	via	unvalidated	DataType."	<<	std::endl;
+				}
 }
 
-// MEMBER FUNCTION
-std::string StaticStructMember:: toString() const {
-    std::ostringstream oss;
-    oss << "static ";
-    if (! typeSpecName.empty()) {
-        oss << typeSpecName << " " << getName();
-    } else {
-        oss << subType->makeDeclaration(getName(), true);
-    }
-    return oss.str();
+//	MEMBER	FUNCTION
+std::string	StaticStructMember::	toString()	const	{
+				std::ostringstream	oss;
+				oss	<<	"static	";
+				if	(!	typeSpecName.empty())	{
+								oss	<<	typeSpecName	<<	"	"	<<	getName();
+				}	else	{
+								oss	<<	subType->makeDeclaration(getName(),	true);
+				}
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/DataTypes/src/StringValue.cpp b/trick_source/sim_services/DataTypes/src/StringValue.cpp
index 27d187d1d..93e791d12 100644
--- a/trick_source/sim_services/DataTypes/src/StringValue.cpp
+++ b/trick_source/sim_services/DataTypes/src/StringValue.cpp
@@ -1,13 +1,13 @@
-#include "StringValue.hh"
+#include	"StringValue.hh"
 
-StringValue::StringValue(const char* value) {
-    this->value = value;
+StringValue::StringValue(const	char*	value)	{
+				this->value	=	value;
 };
 
-void StringValue::print(std::ostream &s) {
-    s << value;
+void	StringValue::print(std::ostream	&s)	{
+				s	<<	value;
 }
 
-std::string StringValue::toString() {
-    return value;
+std::string	StringValue::toString()	{
+				return	value;
 }
diff --git a/trick_source/sim_services/DataTypes/src/StructMember.cpp b/trick_source/sim_services/DataTypes/src/StructMember.cpp
index 512c86fc8..44baa6eea 100644
--- a/trick_source/sim_services/DataTypes/src/StructMember.cpp
+++ b/trick_source/sim_services/DataTypes/src/StructMember.cpp
@@ -1,15 +1,15 @@
-#include "StructMember.hh"
+#include	"StructMember.hh"
 
-StructMember::StructMember(std::string name) {
-    this->name = name;
+StructMember::StructMember(std::string	name)	{
+				this->name	=	name;
 }
 
-// COPY CONSTRUCTOR
-StructMember::StructMember ( const StructMember & original) {
-    this->name = original.name;
+//	COPY	CONSTRUCTOR
+StructMember::StructMember	(	const	StructMember	&	original)	{
+				this->name	=	original.name;
 }
 
-std::string StructMember::getName() const {
-    return name;
+std::string	StructMember::getName()	const	{
+				return	name;
 }
 
diff --git a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
index 6842aabd0..ff54a9fb2 100644
--- a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
+++ b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
@@ -1,97 +1,97 @@
-#include "DataType.hh"
-#include "TypeDictionary.hh"
-#include "PrimitiveDataType.hh"
-#include <sstream>
-#include <iostream>
-
-// MEMBER FUNCTION
-TypeDictionary::TypeDictionary() {
-
-    // Add builtin types.
-    addTypeDefinition("void", new PrimitiveDataType<void>() );
-    addTypeDefinition("char", new PrimitiveDataType<char>() );
-    addTypeDefinition("short", new PrimitiveDataType<short>() );
-    addTypeDefinition("int", new PrimitiveDataType<int>() );
-    addTypeDefinition("long", new PrimitiveDataType<long>() );
-    addTypeDefinition("wchar_t", new PrimitiveDataType<wchar_t>() );
-    addTypeDefinition("long long", new PrimitiveDataType<long long>() );
-    addTypeDefinition("unsigned char", new PrimitiveDataType<unsigned char>() );
-    addTypeDefinition("unsigned short", new PrimitiveDataType<unsigned short>() );
-    addTypeDefinition("unsigned int", new PrimitiveDataType<unsigned int>() );
-    addTypeDefinition("unsigned long", new PrimitiveDataType<unsigned long>() );
-    addTypeDefinition("unsigned long long", new PrimitiveDataType<unsigned long long>() );
-    addTypeDefinition("float", new PrimitiveDataType<float>() );
-    addTypeDefinition("double", new PrimitiveDataType<double>() );
-    // FIXME: add the other goofy types (e.g., uint8 ) that were added via the old lexical analyzer.
+#include	"DataType.hh"
+#include	"TypeDictionary.hh"
+#include	"PrimitiveDataType.hh"
+#include	<sstream>
+#include	<iostream>
+
+//	MEMBER	FUNCTION
+TypeDictionary::TypeDictionary()	{
+
+				//	Add	builtin	types.
+				addTypeDefinition("void",	new	PrimitiveDataType<void>()	);
+				addTypeDefinition("char",	new	PrimitiveDataType<char>()	);
+				addTypeDefinition("short",	new	PrimitiveDataType<short>()	);
+				addTypeDefinition("int",	new	PrimitiveDataType<int>()	);
+				addTypeDefinition("long",	new	PrimitiveDataType<long>()	);
+				addTypeDefinition("wchar_t",	new	PrimitiveDataType<wchar_t>()	);
+				addTypeDefinition("long	long",	new	PrimitiveDataType<long	long>()	);
+				addTypeDefinition("unsigned	char",	new	PrimitiveDataType<unsigned	char>()	);
+				addTypeDefinition("unsigned	short",	new	PrimitiveDataType<unsigned	short>()	);
+				addTypeDefinition("unsigned	int",	new	PrimitiveDataType<unsigned	int>()	);
+				addTypeDefinition("unsigned	long",	new	PrimitiveDataType<unsigned	long>()	);
+				addTypeDefinition("unsigned	long	long",	new	PrimitiveDataType<unsigned	long	long>()	);
+				addTypeDefinition("float",	new	PrimitiveDataType<float>()	);
+				addTypeDefinition("double",	new	PrimitiveDataType<double>()	);
+				//	FIXME:	add	the	other	goofy	types	(e.g.,	uint8	)	that	were	added	via	the	old	lexical	analyzer.
 
 }
 
-// MEMBER FUNCTION
-const DataType* TypeDictionary::getDataType(std::string name ) {
+//	MEMBER	FUNCTION
+const	DataType*	TypeDictionary::getDataType(std::string	name	)	{
 
-    typeDictionaryIterator = typeDictionary.find(name);
-    if (typeDictionaryIterator == typeDictionary.end()) {
-        return NULL;
-    } else {
-        return( typeDictionaryIterator->second );
-    }
+				typeDictionaryIterator	=	typeDictionary.find(name);
+				if	(typeDictionaryIterator	==	typeDictionary.end())	{
+								return	NULL;
+				}	else	{
+								return(	typeDictionaryIterator->second	);
+				}
 }
 
-// MEMBER FUNCTION
-void TypeDictionary::addTypeDefinition(std::string name, DataType * typeSpec)  {
+//	MEMBER	FUNCTION
+void	TypeDictionary::addTypeDefinition(std::string	name,	DataType	*	typeSpec)		{
 
-    const DataType* preExistingDataType = getDataType(name);
+				const	DataType*	preExistingDataType	=	getDataType(name);
 
-    if ( preExistingDataType == NULL ) {
-        typeDictionary[name] = typeSpec;
-    } else {
-        std::stringstream error_stream ;
-        error_stream << "ERROR: Attempt to re-define type \"" << name << "\"" << std::endl;
-        throw std::logic_error( error_stream.str());
-    }
+				if	(	preExistingDataType	==	NULL	)	{
+								typeDictionary[name]	=	typeSpec;
+				}	else	{
+								std::stringstream	error_stream	;
+								error_stream	<<	"ERROR:	Attempt	to	re-define	type	\""	<<	name	<<	"\""	<<	std::endl;
+								throw	std::logic_error(	error_stream.str());
+				}
 }
 
-// MEMBER FUNCTION
-bool TypeDictionary::validate() {
-
-    is_valid = true;
-    for ( typeDictionaryIterator  = typeDictionary.begin();
-          typeDictionaryIterator != typeDictionary.end();
-          typeDictionaryIterator++ ) {
-
-         DataType* dataType = typeDictionaryIterator->second;
-         is_valid = is_valid && dataType->validate();
-    }
-    if (!is_valid) {
-        std::cerr << "TypeDictionary contains invalidate data-types.";
-    }
-    return is_valid;
+//	MEMBER	FUNCTION
+bool	TypeDictionary::validate()	{
+
+				is_valid	=	true;
+				for	(	typeDictionaryIterator		=	typeDictionary.begin();
+										typeDictionaryIterator	!=	typeDictionary.end();
+										typeDictionaryIterator++	)	{
+
+									DataType*	dataType	=	typeDictionaryIterator->second;
+									is_valid	=	is_valid	&&	dataType->validate();
+				}
+				if	(!is_valid)	{
+								std::cerr	<<	"TypeDictionary	contains	invalidate	data-types.";
+				}
+				return	is_valid;
 }
 
-// MEMBER FUNCTION
-std::string TypeDictionary::toString() {
-    std::ostringstream oss;
+//	MEMBER	FUNCTION
+std::string	TypeDictionary::toString()	{
+				std::ostringstream	oss;
 
-    for ( typeDictionaryIterator  = typeDictionary.begin();
-          typeDictionaryIterator != typeDictionary.end();
-          typeDictionaryIterator++ ) {
+				for	(	typeDictionaryIterator		=	typeDictionary.begin();
+										typeDictionaryIterator	!=	typeDictionary.end();
+										typeDictionaryIterator++	)	{
 
-        oss << typeDictionaryIterator->first << " = " << typeDictionaryIterator->second << std::endl;
-    }
+								oss	<<	typeDictionaryIterator->first	<<	"	=	"	<<	typeDictionaryIterator->second	<<	std::endl;
+				}
 
-    return oss.str();
+				return	oss.str();
 }
 
-// MEMBER FUNCTION
-TypeDictionary::~TypeDictionary() {
+//	MEMBER	FUNCTION
+TypeDictionary::~TypeDictionary()	{
 
-    // Delete all DataTypes in the map.
-    for ( typeDictionaryIterator  = typeDictionary.begin();
-          typeDictionaryIterator != typeDictionary.end();
-          typeDictionaryIterator++ ) {
+				//	Delete	all	DataTypes	in	the	map.
+				for	(	typeDictionaryIterator		=	typeDictionary.begin();
+										typeDictionaryIterator	!=	typeDictionary.end();
+										typeDictionaryIterator++	)	{
 
-        delete typeDictionaryIterator->second;
-    }
+								delete	typeDictionaryIterator->second;
+				}
 }
 
 
diff --git a/trick_source/sim_services/DataTypes/testing/AllocInfoTest.cpp b/trick_source/sim_services/DataTypes/testing/AllocInfoTest.cpp
index 145d7775b..70d9a7495 100644
--- a/trick_source/sim_services/DataTypes/testing/AllocInfoTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/AllocInfoTest.cpp
@@ -1,145 +1,145 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-#include "AllocInfo.hh"
-#include "TypeDictionary.hh"
-#include "DataType.hh"
-
-// Framework
-class AllocInfoTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    AllocInfoTest() { typeDictionary = new TypeDictionary; }
-    ~AllocInfoTest() { delete typeDictionary; }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+#include	"AllocInfo.hh"
+#include	"TypeDictionary.hh"
+#include	"DataType.hh"
+
+//	Framework
+class	AllocInfoTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				AllocInfoTest()	{	typeDictionary	=	new	TypeDictionary;	}
+				~AllocInfoTest()	{	delete	typeDictionary;	}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
-TEST_F(AllocInfoTest, instantiation1) {
-
-    bool construction_result = true;
-    try {
-        AllocInfo * allocInfo = new AllocInfo("Apple", "double", 0, NULL, typeDictionary);
-        std::cout << allocInfo->toString();
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    EXPECT_EQ(true, construction_result);
+TEST_F(AllocInfoTest,	instantiation1)	{
+
+				bool	construction_result	=	true;
+				try	{
+								AllocInfo	*	allocInfo	=	new	AllocInfo("Apple",	"double",	0,	NULL,	typeDictionary);
+								std::cout	<<	allocInfo->toString();
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				EXPECT_EQ(true,	construction_result);
 }
 
-TEST_F(AllocInfoTest, instantiation2) {
-
-    bool construction_result = true;
-    try {
-        int dimSize[] = {4};
-        AllocInfo * allocInfo = new AllocInfo("Apple", "double", 1, dimSize, typeDictionary);
-        std::cout << allocInfo->toString();
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    EXPECT_EQ(true, construction_result);
+TEST_F(AllocInfoTest,	instantiation2)	{
+
+				bool	construction_result	=	true;
+				try	{
+								int	dimSize[]	=	{4};
+								AllocInfo	*	allocInfo	=	new	AllocInfo("Apple",	"double",	1,	dimSize,	typeDictionary);
+								std::cout	<<	allocInfo->toString();
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				EXPECT_EQ(true,	construction_result);
 }
 
 
-TEST_F(AllocInfoTest, instantiation3) {
+TEST_F(AllocInfoTest,	instantiation3)	{
 
-    bool construction_result = true;
-    try {
-        int dimSize[] = {7,-1};
-        AllocInfo * allocInfo = new AllocInfo("", "double", 2, dimSize, typeDictionary);
-        std::cout << allocInfo->toString();
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    EXPECT_EQ(true, construction_result);
+				bool	construction_result	=	true;
+				try	{
+								int	dimSize[]	=	{7,-1};
+								AllocInfo	*	allocInfo	=	new	AllocInfo("",	"double",	2,	dimSize,	typeDictionary);
+								std::cout	<<	allocInfo->toString();
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				EXPECT_EQ(true,	construction_result);
 }
 
-TEST_F(AllocInfoTest, getters1) {
-
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-
-    try {
-        int dimSize[] = {7,-1};
-        allocInfo = new AllocInfo("", "double", 2, dimSize, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    EXPECT_EQ("",                  allocInfo->getName());
-    EXPECT_NE((void*)NULL,         allocInfo->getStart());
-    EXPECT_EQ((size_t)7*sizeof(void*),                   (size_t)allocInfo->getSize());
-    EXPECT_EQ("double",            allocInfo->getTypeSpecifierName());
-    EXPECT_EQ(2,                   allocInfo->getDimensionsCount());
-    EXPECT_EQ(7,                   allocInfo->getDimensionSize(0));
-    EXPECT_EQ(-1,                  allocInfo->getDimensionSize(1));
-    EXPECT_EQ(StorageClass::LOCAL, allocInfo->getStorageClass());
+TEST_F(AllocInfoTest,	getters1)	{
+
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+
+				try	{
+								int	dimSize[]	=	{7,-1};
+								allocInfo	=	new	AllocInfo("",	"double",	2,	dimSize,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				EXPECT_EQ("",																		allocInfo->getName());
+				EXPECT_NE((void*)NULL,									allocInfo->getStart());
+				EXPECT_EQ((size_t)7*sizeof(void*),																			(size_t)allocInfo->getSize());
+				EXPECT_EQ("double",												allocInfo->getTypeSpecifierName());
+				EXPECT_EQ(2,																			allocInfo->getDimensionsCount());
+				EXPECT_EQ(7,																			allocInfo->getDimensionSize(0));
+				EXPECT_EQ(-1,																		allocInfo->getDimensionSize(1));
+				EXPECT_EQ(StorageClass::LOCAL,	allocInfo->getStorageClass());
 }
 
-TEST_F(AllocInfoTest, getters2) {
-
-    int A[3][7];
-
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-
-    try {
-        int dimSize[] = {3,7};
-        allocInfo = new AllocInfo("Orange", "int", 2, dimSize, typeDictionary, A);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    EXPECT_EQ("Orange",             allocInfo->getName());
-    EXPECT_EQ((void*)&A,            allocInfo->getStart());
-    EXPECT_EQ(sizeof(A),            (size_t)allocInfo->getSize());
-    EXPECT_EQ("int",                allocInfo->getTypeSpecifierName());
-    EXPECT_EQ(2,                    allocInfo->getDimensionsCount());
-    EXPECT_EQ(3,                    allocInfo->getDimensionSize(0));
-    EXPECT_EQ(7,                    allocInfo->getDimensionSize(1));
-    EXPECT_EQ(StorageClass::EXTERN, allocInfo->getStorageClass());
+TEST_F(AllocInfoTest,	getters2)	{
+
+				int	A[3][7];
+
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+
+				try	{
+								int	dimSize[]	=	{3,7};
+								allocInfo	=	new	AllocInfo("Orange",	"int",	2,	dimSize,	typeDictionary,	A);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				EXPECT_EQ("Orange",													allocInfo->getName());
+				EXPECT_EQ((void*)&A,												allocInfo->getStart());
+				EXPECT_EQ(sizeof(A),												(size_t)allocInfo->getSize());
+				EXPECT_EQ("int",																allocInfo->getTypeSpecifierName());
+				EXPECT_EQ(2,																				allocInfo->getDimensionsCount());
+				EXPECT_EQ(3,																				allocInfo->getDimensionSize(0));
+				EXPECT_EQ(7,																				allocInfo->getDimensionSize(1));
+				EXPECT_EQ(StorageClass::EXTERN,	allocInfo->getStorageClass());
 }
 
-TEST_F(AllocInfoTest, clear) {
-
-    double A[3][2] = { {11.0, 12.0},
-                       {21.0, 22.0},
-                       {31.0, 32.0} };
-
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        allocInfo = new AllocInfo( "double Banana[3][2]", typeDictionary, A);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-
-    ASSERT_EQ(true, construction_result);
-    EXPECT_NEAR(11.0, A[0][0], 0.0000001);
-    EXPECT_NEAR(12.0, A[0][1], 0.0000001);
-    EXPECT_NEAR(21.0, A[1][0], 0.0000001);
-    EXPECT_NEAR(22.0, A[1][1], 0.0000001);
-    EXPECT_NEAR(31.0, A[2][0], 0.0000001);
-    EXPECT_NEAR(32.0, A[2][1], 0.0000001);
-
-    allocInfo->clear();
-
-    EXPECT_NEAR(0.0, A[0][0], 0.0000001);
-    EXPECT_NEAR(0.0, A[0][1], 0.0000001);
-    EXPECT_NEAR(0.0, A[1][0], 0.0000001);
-    EXPECT_NEAR(0.0, A[1][1], 0.0000001);
-    EXPECT_NEAR(0.0, A[2][0], 0.0000001);
-    EXPECT_NEAR(0.0, A[2][1], 0.0000001);
-
-    EXPECT_EQ(true, construction_result);
+TEST_F(AllocInfoTest,	clear)	{
+
+				double	A[3][2]	=	{	{11.0,	12.0},
+																							{21.0,	22.0},
+																							{31.0,	32.0}	};
+
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								allocInfo	=	new	AllocInfo(	"double	Banana[3][2]",	typeDictionary,	A);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+
+				ASSERT_EQ(true,	construction_result);
+				EXPECT_NEAR(11.0,	A[0][0],	0.0000001);
+				EXPECT_NEAR(12.0,	A[0][1],	0.0000001);
+				EXPECT_NEAR(21.0,	A[1][0],	0.0000001);
+				EXPECT_NEAR(22.0,	A[1][1],	0.0000001);
+				EXPECT_NEAR(31.0,	A[2][0],	0.0000001);
+				EXPECT_NEAR(32.0,	A[2][1],	0.0000001);
+
+				allocInfo->clear();
+
+				EXPECT_NEAR(0.0,	A[0][0],	0.0000001);
+				EXPECT_NEAR(0.0,	A[0][1],	0.0000001);
+				EXPECT_NEAR(0.0,	A[1][0],	0.0000001);
+				EXPECT_NEAR(0.0,	A[1][1],	0.0000001);
+				EXPECT_NEAR(0.0,	A[2][0],	0.0000001);
+				EXPECT_NEAR(0.0,	A[2][1],	0.0000001);
+
+				EXPECT_EQ(true,	construction_result);
 }
diff --git a/trick_source/sim_services/DataTypes/testing/ArrayTypeSpecTest.cpp b/trick_source/sim_services/DataTypes/testing/ArrayTypeSpecTest.cpp
index 1b6999600..75ccaa8c5 100644
--- a/trick_source/sim_services/DataTypes/testing/ArrayTypeSpecTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/ArrayTypeSpecTest.cpp
@@ -1,432 +1,432 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-#include "TypeDictionary.hh"
-#include "ArrayDataType.hh"
-#include "CompositeValue.hh"
-#include "FloatingPointValue.hh"
-#include "IntegerValue.hh"
-
-// Framework
-class ArrayDataTypeTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    ArrayDataTypeTest() { typeDictionary = new TypeDictionary; }
-    ~ArrayDataTypeTest() { delete typeDictionary; }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+#include	"TypeDictionary.hh"
+#include	"ArrayDataType.hh"
+#include	"CompositeValue.hh"
+#include	"FloatingPointValue.hh"
+#include	"IntegerValue.hh"
+
+//	Framework
+class	ArrayDataTypeTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				ArrayDataTypeTest()	{	typeDictionary	=	new	TypeDictionary;	}
+				~ArrayDataTypeTest()	{	delete	typeDictionary;	}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
 
-TEST_F( ArrayDataTypeTest , constructor_exception ) {
+TEST_F(	ArrayDataTypeTest	,	constructor_exception	)	{
 
-    std::cout << "===== Expecting exception and corresponding message. =====" << std::endl;
+				std::cout	<<	"=====	Expecting	exception	and	corresponding	message.	====="	<<	std::endl;
 
-    // Attempt to create type an ArrayDataType with 0 dimensions.
-    // This attempt should throw an exception.
+				//	Attempt	to	create	type	an	ArrayDataType	with	0	dimensions.
+				//	This	attempt	should	throw	an	exception.
 
-    ArrayDataType * arrayTypeSpec;
-    bool constructor_result = true;
-    try {
-        arrayTypeSpec = new ArrayDataType(typeDictionary, "double", 0, NULL);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
+				ArrayDataType	*	arrayTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								arrayTypeSpec	=	new	ArrayDataType(typeDictionary,	"double",	0,	NULL);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
 
-    // Verify that an exception was raised.
-    EXPECT_EQ(false, constructor_result);
+				//	Verify	that	an	exception	was	raised.
+				EXPECT_EQ(false,	constructor_result);
 
-    // Clean up.
-    if (constructor_result) {
-        delete arrayTypeSpec;
-    }
+				//	Clean	up.
+				if	(constructor_result)	{
+								delete	arrayTypeSpec;
+				}
 }
 
-TEST_F( ArrayDataTypeTest, copy_constructor ) {
+TEST_F(	ArrayDataTypeTest,	copy_constructor	)	{
 
-    try {
-    // Create a ArrayDataType.
-    int cdims[] = {7,-1,-1};
-    ArrayDataType* orig = new ArrayDataType( typeDictionary, "float", 3, cdims);
+				try	{
+				//	Create	a	ArrayDataType.
+				int	cdims[]	=	{7,-1,-1};
+				ArrayDataType*	orig	=	new	ArrayDataType(	typeDictionary,	"float",	3,	cdims);
 
-    std::cout << orig->toString();
+				std::cout	<<	orig->toString();
 
-    // Duplicate it.
-    ArrayDataType* copy = new ArrayDataType( *(const ArrayDataType*)orig );
+				//	Duplicate	it.
+				ArrayDataType*	copy	=	new	ArrayDataType(	*(const	ArrayDataType*)orig	);
 
-    // Delete the original, so we know the copy is independent.
-    delete orig;
+				//	Delete	the	original,	so	we	know	the	copy	is	independent.
+				delete	orig;
 
-    // Verify that the duplicate ArrayDataType is what we expect.
-    std::stringstream ss;
-    ss << copy->toString();
-    EXPECT_EQ("float**[7]", ss.str());
+				//	Verify	that	the	duplicate	ArrayDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy->toString();
+				EXPECT_EQ("float**[7]",	ss.str());
 
-    // Clean up.
-    delete copy;
+				//	Clean	up.
+				delete	copy;
 
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-    }
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+				}
 
 }
 
-TEST_F( ArrayDataTypeTest , assignment_operator ) {
+TEST_F(	ArrayDataTypeTest	,	assignment_operator	)	{
 
-    // Create an ArrayDataType.
-    int cdims[] = {7,-1,-1};
-    ArrayDataType * orig = new ArrayDataType( typeDictionary, "long", 3, cdims);
+				//	Create	an	ArrayDataType.
+				int	cdims[]	=	{7,-1,-1};
+				ArrayDataType	*	orig	=	new	ArrayDataType(	typeDictionary,	"long",	3,	cdims);
 
-    std::cout << orig->toString();
+				std::cout	<<	orig->toString();
 
-    // Assign it to another ArrayDataType.
-    ArrayDataType copy = *(const ArrayDataType*)orig;
+				//	Assign	it	to	another	ArrayDataType.
+				ArrayDataType	copy	=	*(const	ArrayDataType*)orig;
 
-    // Verify that the assigned ArrayDataType is what we expect.
-    std::stringstream ss;
-    ss << copy.toString();
-    EXPECT_EQ("long**[7]", ss.str());
+				//	Verify	that	the	assigned	ArrayDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy.toString();
+				EXPECT_EQ("long**[7]",	ss.str());
 
-    // Clean up.
-    delete orig;
+				//	Clean	up.
+				delete	orig;
 }
 
-TEST_F( ArrayDataTypeTest , clone ) {
+TEST_F(	ArrayDataTypeTest	,	clone	)	{
 
-    // Create a ArrayDataType.
-    int cdims[] = {3,4,5,-1,-1};
-    ArrayDataType* orig = new ArrayDataType(typeDictionary, "int", 5, cdims);
+				//	Create	a	ArrayDataType.
+				int	cdims[]	=	{3,4,5,-1,-1};
+				ArrayDataType*	orig	=	new	ArrayDataType(typeDictionary,	"int",	5,	cdims);
 
-    // Clone it.
-    DataType * copy = orig->clone();
+				//	Clone	it.
+				DataType	*	copy	=	orig->clone();
 
-    // Delete the original, so we know the copy is independent.
-    delete orig;
+				//	Delete	the	original,	so	we	know	the	copy	is	independent.
+				delete	orig;
 
-    // Verify that the cloned ArrayDataType is what we expect.
-    std::stringstream ss;
-    ss << copy->toString();
-    EXPECT_EQ("int**[3][4][5]", ss.str());
+				//	Verify	that	the	cloned	ArrayDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy->toString();
+				EXPECT_EQ("int**[3][4][5]",	ss.str());
 
-    // Clean up.
-    delete copy;
+				//	Clean	up.
+				delete	copy;
 }
 
-TEST_F( ArrayDataTypeTest , getSize ) {
+TEST_F(	ArrayDataTypeTest	,	getSize	)	{
 
-    // Create a PointerDataType.
-    int cdims[] = {3,4,5,-1,-1};
-    ArrayDataType* ptrTypeSpec = new ArrayDataType( typeDictionary, "long", 5, cdims);
-    ptrTypeSpec->validate();
+				//	Create	a	PointerDataType.
+				int	cdims[]	=	{3,4,5,-1,-1};
+				ArrayDataType*	ptrTypeSpec	=	new	ArrayDataType(	typeDictionary,	"long",	5,	cdims);
+				ptrTypeSpec->validate();
 
-    // Verify that getSize returns the size of the array.
-    EXPECT_EQ( sizeof(long)*60 , ptrTypeSpec->getSize());
+				//	Verify	that	getSize	returns	the	size	of	the	array.
+				EXPECT_EQ(	sizeof(long)*60	,	ptrTypeSpec->getSize());
 }
 
-TEST_F( ArrayDataTypeTest , assignValue ) {
-
-    double A[2][3][4];
-
-    // Create a PointerDataType.
-    int cdims[] = {2,3,4};
-    ArrayDataType * arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 3, cdims);
-
-    arrayTypeSpec->validate(); // TODO: Test behavior when it isnt validated also.
-
-    CompositeValue * value_0_0 = new  CompositeValue();
-    value_0_0->addMember( new FloatingPointValue(1.2));
-    value_0_0->addMember( new FloatingPointValue(2.3));
-    value_0_0->addMember( new FloatingPointValue(3.4));
-    value_0_0->addMember( new FloatingPointValue(4.5));
-
-    CompositeValue * value_0_1 = new  CompositeValue();
-    value_0_1->addMember( new FloatingPointValue(5.6));
-    value_0_1->addMember( new FloatingPointValue(6.7));
-    value_0_1->addMember( new FloatingPointValue(7.8));
-    value_0_1->addMember( new FloatingPointValue(8.9));
-
-    CompositeValue * value_0_2 = new  CompositeValue();
-    value_0_2->addMember( new FloatingPointValue(9.0));
-    value_0_2->addMember( new FloatingPointValue(0.1));
-    value_0_2->addMember( new FloatingPointValue(1.2));
-    value_0_2->addMember( new FloatingPointValue(2.3));
-
-    CompositeValue * value_1_0 = new  CompositeValue();
-    value_1_0->addMember( new FloatingPointValue(3.4));
-    value_1_0->addMember( new FloatingPointValue(4.5));
-    value_1_0->addMember( new FloatingPointValue(5.6));
-    value_1_0->addMember( new FloatingPointValue(6.7));
-
-    CompositeValue * value_1_1 = new  CompositeValue();
-    value_1_1->addMember( new FloatingPointValue(7.8));
-    value_1_1->addMember( new FloatingPointValue(8.9));
-    value_1_1->addMember( new FloatingPointValue(9.0));
-    value_1_1->addMember( new FloatingPointValue(0.1));
-
-    CompositeValue * value_1_2 = new  CompositeValue();
-    value_1_2->addMember( new FloatingPointValue(1.2));
-    value_1_2->addMember( new FloatingPointValue(2.3));
-    value_1_2->addMember( new FloatingPointValue(3.4));
-    value_1_2->addMember( new FloatingPointValue(4.5));
-
-    CompositeValue * value_0 = new  CompositeValue();
-    value_0->addMember( value_0_0 );
-    value_0->addMember( value_0_1 );
-    value_0->addMember( value_0_2 );
-
-    CompositeValue * value_1 = new  CompositeValue();
-    value_1->addMember( value_1_0 );
-    value_1->addMember( value_1_1 );
-    value_1->addMember( value_1_2 );
-
-    CompositeValue * value = new  CompositeValue();
-    value->addMember( value_0 );
-    value->addMember( value_1 );
-
-    arrayTypeSpec->assignValue(A, value);
-
-    EXPECT_EQ(1.2, A[0][0][0]);
-    EXPECT_EQ(2.3, A[0][0][1]);
-    EXPECT_EQ(3.4, A[0][0][2]);
-    EXPECT_EQ(4.5, A[0][0][3]);
-
-    EXPECT_EQ(5.6, A[0][1][0]);
-    EXPECT_EQ(6.7, A[0][1][1]);
-    EXPECT_EQ(7.8, A[0][1][2]);
-    EXPECT_EQ(8.9, A[0][1][3]);
-
-    EXPECT_EQ(9.0, A[0][2][0]);
-    EXPECT_EQ(0.1, A[0][2][1]);
-    EXPECT_EQ(1.2, A[0][2][2]);
-    EXPECT_EQ(2.3, A[0][2][3]);
-
-    EXPECT_EQ(3.4, A[1][0][0]);
-    EXPECT_EQ(4.5, A[1][0][1]);
-    EXPECT_EQ(5.6, A[1][0][2]);
-    EXPECT_EQ(6.7, A[1][0][3]);
-
-    EXPECT_EQ(7.8, A[1][1][0]);
-    EXPECT_EQ(8.9, A[1][1][1]);
-    EXPECT_EQ(9.0, A[1][1][2]);
-    EXPECT_EQ(0.1, A[1][1][3]);
-
-    EXPECT_EQ(1.2, A[1][2][0]);
-    EXPECT_EQ(2.3, A[1][2][1]);
-    EXPECT_EQ(3.4, A[1][2][2]);
-    EXPECT_EQ(4.5, A[1][2][3]);
+TEST_F(	ArrayDataTypeTest	,	assignValue	)	{
+
+				double	A[2][3][4];
+
+				//	Create	a	PointerDataType.
+				int	cdims[]	=	{2,3,4};
+				ArrayDataType	*	arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	3,	cdims);
+
+				arrayTypeSpec->validate();	//	TODO:	Test	behavior	when	it	isnt	validated	also.
+
+				CompositeValue	*	value_0_0	=	new		CompositeValue();
+				value_0_0->addMember(	new	FloatingPointValue(1.2));
+				value_0_0->addMember(	new	FloatingPointValue(2.3));
+				value_0_0->addMember(	new	FloatingPointValue(3.4));
+				value_0_0->addMember(	new	FloatingPointValue(4.5));
+
+				CompositeValue	*	value_0_1	=	new		CompositeValue();
+				value_0_1->addMember(	new	FloatingPointValue(5.6));
+				value_0_1->addMember(	new	FloatingPointValue(6.7));
+				value_0_1->addMember(	new	FloatingPointValue(7.8));
+				value_0_1->addMember(	new	FloatingPointValue(8.9));
+
+				CompositeValue	*	value_0_2	=	new		CompositeValue();
+				value_0_2->addMember(	new	FloatingPointValue(9.0));
+				value_0_2->addMember(	new	FloatingPointValue(0.1));
+				value_0_2->addMember(	new	FloatingPointValue(1.2));
+				value_0_2->addMember(	new	FloatingPointValue(2.3));
+
+				CompositeValue	*	value_1_0	=	new		CompositeValue();
+				value_1_0->addMember(	new	FloatingPointValue(3.4));
+				value_1_0->addMember(	new	FloatingPointValue(4.5));
+				value_1_0->addMember(	new	FloatingPointValue(5.6));
+				value_1_0->addMember(	new	FloatingPointValue(6.7));
+
+				CompositeValue	*	value_1_1	=	new		CompositeValue();
+				value_1_1->addMember(	new	FloatingPointValue(7.8));
+				value_1_1->addMember(	new	FloatingPointValue(8.9));
+				value_1_1->addMember(	new	FloatingPointValue(9.0));
+				value_1_1->addMember(	new	FloatingPointValue(0.1));
+
+				CompositeValue	*	value_1_2	=	new		CompositeValue();
+				value_1_2->addMember(	new	FloatingPointValue(1.2));
+				value_1_2->addMember(	new	FloatingPointValue(2.3));
+				value_1_2->addMember(	new	FloatingPointValue(3.4));
+				value_1_2->addMember(	new	FloatingPointValue(4.5));
+
+				CompositeValue	*	value_0	=	new		CompositeValue();
+				value_0->addMember(	value_0_0	);
+				value_0->addMember(	value_0_1	);
+				value_0->addMember(	value_0_2	);
+
+				CompositeValue	*	value_1	=	new		CompositeValue();
+				value_1->addMember(	value_1_0	);
+				value_1->addMember(	value_1_1	);
+				value_1->addMember(	value_1_2	);
+
+				CompositeValue	*	value	=	new		CompositeValue();
+				value->addMember(	value_0	);
+				value->addMember(	value_1	);
+
+				arrayTypeSpec->assignValue(A,	value);
+
+				EXPECT_EQ(1.2,	A[0][0][0]);
+				EXPECT_EQ(2.3,	A[0][0][1]);
+				EXPECT_EQ(3.4,	A[0][0][2]);
+				EXPECT_EQ(4.5,	A[0][0][3]);
+
+				EXPECT_EQ(5.6,	A[0][1][0]);
+				EXPECT_EQ(6.7,	A[0][1][1]);
+				EXPECT_EQ(7.8,	A[0][1][2]);
+				EXPECT_EQ(8.9,	A[0][1][3]);
+
+				EXPECT_EQ(9.0,	A[0][2][0]);
+				EXPECT_EQ(0.1,	A[0][2][1]);
+				EXPECT_EQ(1.2,	A[0][2][2]);
+				EXPECT_EQ(2.3,	A[0][2][3]);
+
+				EXPECT_EQ(3.4,	A[1][0][0]);
+				EXPECT_EQ(4.5,	A[1][0][1]);
+				EXPECT_EQ(5.6,	A[1][0][2]);
+				EXPECT_EQ(6.7,	A[1][0][3]);
+
+				EXPECT_EQ(7.8,	A[1][1][0]);
+				EXPECT_EQ(8.9,	A[1][1][1]);
+				EXPECT_EQ(9.0,	A[1][1][2]);
+				EXPECT_EQ(0.1,	A[1][1][3]);
+
+				EXPECT_EQ(1.2,	A[1][2][0]);
+				EXPECT_EQ(2.3,	A[1][2][1]);
+				EXPECT_EQ(3.4,	A[1][2][2]);
+				EXPECT_EQ(4.5,	A[1][2][3]);
 }
 
-TEST_F( ArrayDataTypeTest , createInstance_and_assignValue ) {
-
-    // Create a PointerDataType.
-    int cdims[] = {2,3,4};
-    ArrayDataType * arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 3, cdims);
-
-    arrayTypeSpec->validate(); // TODO: Test behavior when it isnt validated also.
-
-    double (*A)[2][3][4] = (double(*)[2][3][4])arrayTypeSpec->createInstance(1);
-
-    CompositeValue * value_0_0 = new  CompositeValue();
-    value_0_0->addMember( new FloatingPointValue(1.2));
-    value_0_0->addMember( new FloatingPointValue(2.3));
-    value_0_0->addMember( new FloatingPointValue(3.4));
-    value_0_0->addMember( new FloatingPointValue(4.5));
-
-    CompositeValue * value_0_1 = new  CompositeValue();
-    value_0_1->addMember( new FloatingPointValue(5.6));
-    value_0_1->addMember( new FloatingPointValue(6.7));
-    value_0_1->addMember( new FloatingPointValue(7.8));
-    value_0_1->addMember( new FloatingPointValue(8.9));
-
-    CompositeValue * value_0_2 = new  CompositeValue();
-    value_0_2->addMember( new FloatingPointValue(9.0));
-    value_0_2->addMember( new FloatingPointValue(0.1));
-    value_0_2->addMember( new FloatingPointValue(1.2));
-    value_0_2->addMember( new FloatingPointValue(2.3));
-
-    CompositeValue * value_1_0 = new  CompositeValue();
-    value_1_0->addMember( new FloatingPointValue(3.4));
-    value_1_0->addMember( new FloatingPointValue(4.5));
-    value_1_0->addMember( new FloatingPointValue(5.6));
-    value_1_0->addMember( new FloatingPointValue(6.7));
-
-    CompositeValue * value_1_1 = new  CompositeValue();
-    value_1_1->addMember( new FloatingPointValue(7.8));
-    value_1_1->addMember( new FloatingPointValue(8.9));
-    value_1_1->addMember( new FloatingPointValue(9.0));
-    value_1_1->addMember( new FloatingPointValue(0.1));
-
-    CompositeValue * value_1_2 = new  CompositeValue();
-    value_1_2->addMember( new FloatingPointValue(1.2));
-    value_1_2->addMember( new FloatingPointValue(2.3));
-    value_1_2->addMember( new FloatingPointValue(3.4));
-    value_1_2->addMember( new FloatingPointValue(4.5));
-
-    CompositeValue * value_0 = new  CompositeValue();
-    value_0->addMember( value_0_0 );
-    value_0->addMember( value_0_1 );
-    value_0->addMember( value_0_2 );
-
-    CompositeValue * value_1 = new  CompositeValue();
-    value_1->addMember( value_1_0 );
-    value_1->addMember( value_1_1 );
-    value_1->addMember( value_1_2 );
-
-    CompositeValue * value = new  CompositeValue();
-    value->addMember( value_0 );
-    value->addMember( value_1 );
-
-    arrayTypeSpec->assignValue(A, value);
-
-    EXPECT_EQ(1.2, (*A)[0][0][0]);
-    EXPECT_EQ(2.3, (*A)[0][0][1]);
-    EXPECT_EQ(3.4, (*A)[0][0][2]);
-    EXPECT_EQ(4.5, (*A)[0][0][3]);
-
-    EXPECT_EQ(5.6, (*A)[0][1][0]);
-    EXPECT_EQ(6.7, (*A)[0][1][1]);
-    EXPECT_EQ(7.8, (*A)[0][1][2]);
-    EXPECT_EQ(8.9, (*A)[0][1][3]);
-
-    EXPECT_EQ(9.0, (*A)[0][2][0]);
-    EXPECT_EQ(0.1, (*A)[0][2][1]);
-    EXPECT_EQ(1.2, (*A)[0][2][2]);
-    EXPECT_EQ(2.3, (*A)[0][2][3]);
-
-    EXPECT_EQ(3.4, (*A)[1][0][0]);
-    EXPECT_EQ(4.5, (*A)[1][0][1]);
-    EXPECT_EQ(5.6, (*A)[1][0][2]);
-    EXPECT_EQ(6.7, (*A)[1][0][3]);
-
-    EXPECT_EQ(7.8, (*A)[1][1][0]);
-    EXPECT_EQ(8.9, (*A)[1][1][1]);
-    EXPECT_EQ(9.0, (*A)[1][1][2]);
-    EXPECT_EQ(0.1, (*A)[1][1][3]);
-
-    EXPECT_EQ(1.2, (*A)[1][2][0]);
-    EXPECT_EQ(2.3, (*A)[1][2][1]);
-    EXPECT_EQ(3.4, (*A)[1][2][2]);
-    EXPECT_EQ(4.5, (*A)[1][2][3]);
+TEST_F(	ArrayDataTypeTest	,	createInstance_and_assignValue	)	{
+
+				//	Create	a	PointerDataType.
+				int	cdims[]	=	{2,3,4};
+				ArrayDataType	*	arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	3,	cdims);
+
+				arrayTypeSpec->validate();	//	TODO:	Test	behavior	when	it	isnt	validated	also.
+
+				double	(*A)[2][3][4]	=	(double(*)[2][3][4])arrayTypeSpec->createInstance(1);
+
+				CompositeValue	*	value_0_0	=	new		CompositeValue();
+				value_0_0->addMember(	new	FloatingPointValue(1.2));
+				value_0_0->addMember(	new	FloatingPointValue(2.3));
+				value_0_0->addMember(	new	FloatingPointValue(3.4));
+				value_0_0->addMember(	new	FloatingPointValue(4.5));
+
+				CompositeValue	*	value_0_1	=	new		CompositeValue();
+				value_0_1->addMember(	new	FloatingPointValue(5.6));
+				value_0_1->addMember(	new	FloatingPointValue(6.7));
+				value_0_1->addMember(	new	FloatingPointValue(7.8));
+				value_0_1->addMember(	new	FloatingPointValue(8.9));
+
+				CompositeValue	*	value_0_2	=	new		CompositeValue();
+				value_0_2->addMember(	new	FloatingPointValue(9.0));
+				value_0_2->addMember(	new	FloatingPointValue(0.1));
+				value_0_2->addMember(	new	FloatingPointValue(1.2));
+				value_0_2->addMember(	new	FloatingPointValue(2.3));
+
+				CompositeValue	*	value_1_0	=	new		CompositeValue();
+				value_1_0->addMember(	new	FloatingPointValue(3.4));
+				value_1_0->addMember(	new	FloatingPointValue(4.5));
+				value_1_0->addMember(	new	FloatingPointValue(5.6));
+				value_1_0->addMember(	new	FloatingPointValue(6.7));
+
+				CompositeValue	*	value_1_1	=	new		CompositeValue();
+				value_1_1->addMember(	new	FloatingPointValue(7.8));
+				value_1_1->addMember(	new	FloatingPointValue(8.9));
+				value_1_1->addMember(	new	FloatingPointValue(9.0));
+				value_1_1->addMember(	new	FloatingPointValue(0.1));
+
+				CompositeValue	*	value_1_2	=	new		CompositeValue();
+				value_1_2->addMember(	new	FloatingPointValue(1.2));
+				value_1_2->addMember(	new	FloatingPointValue(2.3));
+				value_1_2->addMember(	new	FloatingPointValue(3.4));
+				value_1_2->addMember(	new	FloatingPointValue(4.5));
+
+				CompositeValue	*	value_0	=	new		CompositeValue();
+				value_0->addMember(	value_0_0	);
+				value_0->addMember(	value_0_1	);
+				value_0->addMember(	value_0_2	);
+
+				CompositeValue	*	value_1	=	new		CompositeValue();
+				value_1->addMember(	value_1_0	);
+				value_1->addMember(	value_1_1	);
+				value_1->addMember(	value_1_2	);
+
+				CompositeValue	*	value	=	new		CompositeValue();
+				value->addMember(	value_0	);
+				value->addMember(	value_1	);
+
+				arrayTypeSpec->assignValue(A,	value);
+
+				EXPECT_EQ(1.2,	(*A)[0][0][0]);
+				EXPECT_EQ(2.3,	(*A)[0][0][1]);
+				EXPECT_EQ(3.4,	(*A)[0][0][2]);
+				EXPECT_EQ(4.5,	(*A)[0][0][3]);
+
+				EXPECT_EQ(5.6,	(*A)[0][1][0]);
+				EXPECT_EQ(6.7,	(*A)[0][1][1]);
+				EXPECT_EQ(7.8,	(*A)[0][1][2]);
+				EXPECT_EQ(8.9,	(*A)[0][1][3]);
+
+				EXPECT_EQ(9.0,	(*A)[0][2][0]);
+				EXPECT_EQ(0.1,	(*A)[0][2][1]);
+				EXPECT_EQ(1.2,	(*A)[0][2][2]);
+				EXPECT_EQ(2.3,	(*A)[0][2][3]);
+
+				EXPECT_EQ(3.4,	(*A)[1][0][0]);
+				EXPECT_EQ(4.5,	(*A)[1][0][1]);
+				EXPECT_EQ(5.6,	(*A)[1][0][2]);
+				EXPECT_EQ(6.7,	(*A)[1][0][3]);
+
+				EXPECT_EQ(7.8,	(*A)[1][1][0]);
+				EXPECT_EQ(8.9,	(*A)[1][1][1]);
+				EXPECT_EQ(9.0,	(*A)[1][1][2]);
+				EXPECT_EQ(0.1,	(*A)[1][1][3]);
+
+				EXPECT_EQ(1.2,	(*A)[1][2][0]);
+				EXPECT_EQ(2.3,	(*A)[1][2][1]);
+				EXPECT_EQ(3.4,	(*A)[1][2][2]);
+				EXPECT_EQ(4.5,	(*A)[1][2][3]);
 }
 
-TEST_F( ArrayDataTypeTest, printValue ) {
-
-    double A[2][3][4] = {{{1.2, 2.3, 3.4, 4.5},
-                          {5.6, 6.7, 7.8, 8.9},
-                          {9.0, 0.1, 1.2, 2.3}},
-                         {{3.4, 4.5, 5.6, 6.7},
-                          {7.8, 8.9, 9.0, 0.1},
-                          {1.2, 2.3, 3.4, 4.5}}};
-
-    // Create a ArrayDataType.
-    int cdims[] = {2,3,4};
-    ArrayDataType * arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 3, cdims);
-
-    arrayTypeSpec->validate();
-
-    // Verify that printValue prints the value that we expect.
-    std::stringstream ss;
-    arrayTypeSpec->printValue(ss, &A);
-    int result = ss.str().compare(
-        "{{{1.2,2.3,3.4,4.5},"
-        "{5.6,6.7,7.8,8.9},"
-        "{9,0.1,1.2,2.3}},"
-        "{{3.4,4.5,5.6,6.7},"
-        "{7.8,8.9,9,0.1},"
-        "{1.2,2.3,3.4,4.5}}}"
-        );
-
-    EXPECT_EQ(0, result);
+TEST_F(	ArrayDataTypeTest,	printValue	)	{
+
+				double	A[2][3][4]	=	{{{1.2,	2.3,	3.4,	4.5},
+																										{5.6,	6.7,	7.8,	8.9},
+																										{9.0,	0.1,	1.2,	2.3}},
+																									{{3.4,	4.5,	5.6,	6.7},
+																										{7.8,	8.9,	9.0,	0.1},
+																										{1.2,	2.3,	3.4,	4.5}}};
+
+				//	Create	a	ArrayDataType.
+				int	cdims[]	=	{2,3,4};
+				ArrayDataType	*	arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	3,	cdims);
+
+				arrayTypeSpec->validate();
+
+				//	Verify	that	printValue	prints	the	value	that	we	expect.
+				std::stringstream	ss;
+				arrayTypeSpec->printValue(ss,	&A);
+				int	result	=	ss.str().compare(
+								"{{{1.2,2.3,3.4,4.5},"
+								"{5.6,6.7,7.8,8.9},"
+								"{9,0.1,1.2,2.3}},"
+								"{{3.4,4.5,5.6,6.7},"
+								"{7.8,8.9,9,0.1},"
+								"{1.2,2.3,3.4,4.5}}}"
+								);
+
+				EXPECT_EQ(0,	result);
 }
 
-TEST_F( ArrayDataTypeTest, validate_1 ) {
+TEST_F(	ArrayDataTypeTest,	validate_1	)	{
 
-    // Create a ArrayDataType.
-    int cdims[] = {4};
-    ArrayDataType* arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 1, cdims);
+				//	Create	a	ArrayDataType.
+				int	cdims[]	=	{4};
+				ArrayDataType*	arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	1,	cdims);
 
-    // Validate the Type.
-    bool validation_result = arrayTypeSpec->validate();
+				//	Validate	the	Type.
+				bool	validation_result	=	arrayTypeSpec->validate();
 
-    // Verify that validation succeeded.
-    ASSERT_EQ(true, validation_result);
+				//	Verify	that	validation	succeeded.
+				ASSERT_EQ(true,	validation_result);
 
 }
 
-TEST_F( ArrayDataTypeTest , validate_2 ) {
+TEST_F(	ArrayDataTypeTest	,	validate_2	)	{
 
-    std::cout << "===== Expecting error message. =====" << std::endl;
+				std::cout	<<	"=====	Expecting	error	message.	====="	<<	std::endl;
 
-    // Create an ArrayDataType.
-    int cdims[] = {4};
-    ArrayDataType* arrayTypeSpec = new ArrayDataType( typeDictionary, "Undefined_Type", 1, cdims);
+				//	Create	an	ArrayDataType.
+				int	cdims[]	=	{4};
+				ArrayDataType*	arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"Undefined_Type",	1,	cdims);
 
-    // Validate the Type.
-    bool validation_result = arrayTypeSpec->validate();
+				//	Validate	the	Type.
+				bool	validation_result	=	arrayTypeSpec->validate();
 
-    // Verify that validation failed.
-    ASSERT_EQ(false, validation_result);
+				//	Verify	that	validation	failed.
+				ASSERT_EQ(false,	validation_result);
 }
 
-TEST_F( ArrayDataTypeTest , getSubType_1 ) {
-
-    // Create type: double [2][3]
-    ArrayDataType * arrayTypeSpec;
-    bool constructor_result = true;
-    try {
-        int cdims[] = {2,3};
-        arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 2, cdims);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
-    ASSERT_EQ(true, constructor_result);
-
-    // Validate the Type.
-    bool validation_result = arrayTypeSpec->validate();
-    ASSERT_EQ(true, validation_result);
-
-    // Get the subType.
-    const DataType * elementTypeSpec;
-    elementTypeSpec = arrayTypeSpec->getSubType();
-    ASSERT_NE((const DataType *)NULL, elementTypeSpec);
-
-    // Make sure it's: double[3].
-    std::stringstream ss;
-    ss << elementTypeSpec->toString();
-    EXPECT_EQ("double [3]", ss.str());
+TEST_F(	ArrayDataTypeTest	,	getSubType_1	)	{
+
+				//	Create	type:	double	[2][3]
+				ArrayDataType	*	arrayTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								int	cdims[]	=	{2,3};
+								arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	2,	cdims);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
+				ASSERT_EQ(true,	constructor_result);
+
+				//	Validate	the	Type.
+				bool	validation_result	=	arrayTypeSpec->validate();
+				ASSERT_EQ(true,	validation_result);
+
+				//	Get	the	subType.
+				const	DataType	*	elementTypeSpec;
+				elementTypeSpec	=	arrayTypeSpec->getSubType();
+				ASSERT_NE((const	DataType	*)NULL,	elementTypeSpec);
+
+				//	Make	sure	it's:	double[3].
+				std::stringstream	ss;
+				ss	<<	elementTypeSpec->toString();
+				EXPECT_EQ("double	[3]",	ss.str());
 }
 
-TEST_F( ArrayDataTypeTest , getSubType_2 ) {
-
-    // Create type: double[2]
-    ArrayDataType * arrayTypeSpec;
-    bool constructor_result = true;
-    try {
-        int cdims[] = {2};
-        arrayTypeSpec = new ArrayDataType( typeDictionary, "double", 1, cdims);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
-    ASSERT_EQ(true, constructor_result);
-
-    // Validate the Type.
-    bool validation_result = arrayTypeSpec->validate();
-    ASSERT_EQ(true, validation_result);
-
-    // Get the SubType.
-    const DataType * elementTypeSpec;
-    elementTypeSpec = arrayTypeSpec->getSubType();
-    ASSERT_NE((const DataType *)NULL, elementTypeSpec);
-
-    // Make sure it's: double
-    std::stringstream ss;
-    ss << elementTypeSpec->toString();
-    EXPECT_EQ("double", ss.str());
+TEST_F(	ArrayDataTypeTest	,	getSubType_2	)	{
+
+				//	Create	type:	double[2]
+				ArrayDataType	*	arrayTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								int	cdims[]	=	{2};
+								arrayTypeSpec	=	new	ArrayDataType(	typeDictionary,	"double",	1,	cdims);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
+				ASSERT_EQ(true,	constructor_result);
+
+				//	Validate	the	Type.
+				bool	validation_result	=	arrayTypeSpec->validate();
+				ASSERT_EQ(true,	validation_result);
+
+				//	Get	the	SubType.
+				const	DataType	*	elementTypeSpec;
+				elementTypeSpec	=	arrayTypeSpec->getSubType();
+				ASSERT_NE((const	DataType	*)NULL,	elementTypeSpec);
+
+				//	Make	sure	it's:	double
+				std::stringstream	ss;
+				ss	<<	elementTypeSpec->toString();
+				EXPECT_EQ("double",	ss.str());
 }
diff --git a/trick_source/sim_services/DataTypes/testing/ClassicChkPtAgentTest.cpp b/trick_source/sim_services/DataTypes/testing/ClassicChkPtAgentTest.cpp
index ecbcb82e1..06bc2e1c0 100644
--- a/trick_source/sim_services/DataTypes/testing/ClassicChkPtAgentTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/ClassicChkPtAgentTest.cpp
@@ -1,387 +1,387 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-
-#include "MemMgr.hh"
-#include "AllocInfo.hh"
-#include "DataType.hh"
-#include "ClassicChkPtAgent.hh"
-#include "TypeDictionary.hh"
-#include "EnumDictionary.hh"
-#include "CompositeDataType.hh"
-#include "ArrayDataType.hh"
-#include "PointerDataType.hh"
-
-#include "DataTypeTestSupport.hh"
-
-// Framework
-class ClassicChkPtAgentTest : public ::testing::Test {
-    protected:
-    TypeDictionary * typeDictionary;
-    EnumDictionary * enumDictionary;
-    ClassicChkPtAgent* checkPointAgent;
-    MemMgr * memMgr;
-
-    ClassicChkPtAgentTest() {
-        typeDictionary = new TypeDictionary;
-        enumDictionary = new EnumDictionary;
-        memMgr = new MemMgr();
-        checkPointAgent = new ClassicChkPtAgent( std::cout );
-    }
-
-    ~ClassicChkPtAgentTest() {
-        delete memMgr ;
-        delete typeDictionary ;
-        delete enumDictionary ;
-    }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+
+#include	"MemMgr.hh"
+#include	"AllocInfo.hh"
+#include	"DataType.hh"
+#include	"ClassicChkPtAgent.hh"
+#include	"TypeDictionary.hh"
+#include	"EnumDictionary.hh"
+#include	"CompositeDataType.hh"
+#include	"ArrayDataType.hh"
+#include	"PointerDataType.hh"
+
+#include	"DataTypeTestSupport.hh"
+
+//	Framework
+class	ClassicChkPtAgentTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*	typeDictionary;
+				EnumDictionary	*	enumDictionary;
+				ClassicChkPtAgent*	checkPointAgent;
+				MemMgr	*	memMgr;
+
+				ClassicChkPtAgentTest()	{
+								typeDictionary	=	new	TypeDictionary;
+								enumDictionary	=	new	EnumDictionary;
+								memMgr	=	new	MemMgr();
+								checkPointAgent	=	new	ClassicChkPtAgent(	std::cout	);
+				}
+
+				~ClassicChkPtAgentTest()	{
+								delete	memMgr	;
+								delete	typeDictionary	;
+								delete	enumDictionary	;
+				}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
-TEST_F(ClassicChkPtAgentTest, nameStackFunctions) {
+TEST_F(ClassicChkPtAgentTest,	nameStackFunctions)	{
 
-    std::string leftSideName;
+				std::string	leftSideName;
 
-    checkPointAgent->pushName("A");
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A", leftSideName);
+				checkPointAgent->pushName("A");
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A",	leftSideName);
 
-    checkPointAgent->pushIndex(2);
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A[2]", leftSideName);
+				checkPointAgent->pushIndex(2);
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A[2]",	leftSideName);
 
-    checkPointAgent->pushName("B");
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A[2].B", leftSideName);
+				checkPointAgent->pushName("B");
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A[2].B",	leftSideName);
 
-    checkPointAgent->pushIndex(3);
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A[2].B[3]", leftSideName);
+				checkPointAgent->pushIndex(3);
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A[2].B[3]",	leftSideName);
 
-    checkPointAgent->popNameElement();
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A[2].B", leftSideName);
+				checkPointAgent->popNameElement();
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A[2].B",	leftSideName);
 
-    checkPointAgent->popNameElement();
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A[2]", leftSideName);
+				checkPointAgent->popNameElement();
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A[2]",	leftSideName);
 
-    checkPointAgent->popNameElement();
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("A", leftSideName);
+				checkPointAgent->popNameElement();
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("A",	leftSideName);
 
-    checkPointAgent->popNameElement();
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("", leftSideName);
+				checkPointAgent->popNameElement();
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("",	leftSideName);
 
-    std::cout << "NOTE: A Warning is expected here." << std::endl;
-    checkPointAgent->popNameElement();
-    leftSideName = checkPointAgent->getLeftSideName();
-    EXPECT_EQ("", leftSideName);
+				std::cout	<<	"NOTE:	A	Warning	is	expected	here."	<<	std::endl;
+				checkPointAgent->popNameElement();
+				leftSideName	=	checkPointAgent->getLeftSideName();
+				EXPECT_EQ("",	leftSideName);
 
 }
 
-// ================================================================================
-//                               writeDeclaration tests
-// ================================================================================
-
-TEST_F(ClassicChkPtAgentTest, writeDeclaration1) {
-
-    // A is an int.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        allocInfo = new AllocInfo("A", "int", 0, NULL, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int A;\n", output_declaration.str());
+//	================================================================================
+//																															writeDeclaration	tests
+//	================================================================================
+
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration1)	{
+
+				//	A	is	an	int.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								allocInfo	=	new	AllocInfo("A",	"int",	0,	NULL,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	A;\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeDeclaration2) {
-
-    // A is a pointer to int.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        int dimSize[] = {-1};
-        allocInfo = new AllocInfo("A", "int", 1, dimSize, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int *A;\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration2)	{
+
+				//	A	is	a	pointer	to	int.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								int	dimSize[]	=	{-1};
+								allocInfo	=	new	AllocInfo("A",	"int",	1,	dimSize,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	*A;\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeDeclaration3) {
-
-    // A is an array of pointers to int.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        int dimSize[] = {3,-1};
-        allocInfo = new AllocInfo("A", "int", 2, dimSize, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int *A[3];\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration3)	{
+
+				//	A	is	an	array	of	pointers	to	int.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								int	dimSize[]	=	{3,-1};
+								allocInfo	=	new	AllocInfo("A",	"int",	2,	dimSize,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	*A[3];\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeDeclaration4) {
-
-    // A is a pointer to a 3 element array of int.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        int dimSize[] = {-1,3};
-        allocInfo = new AllocInfo("A", "int", 2, dimSize, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int (*A)[3];\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration4)	{
+
+				//	A	is	a	pointer	to	a	3	element	array	of	int.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								int	dimSize[]	=	{-1,3};
+								allocInfo	=	new	AllocInfo("A",	"int",	2,	dimSize,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	(*A)[3];\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeDeclaration5) {
-
-    // A is a 3 element array of 4 element arrays of pointers to 5 element arrays of pointers to double.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        int dimSize[] = {3,4,-1,5,-1};
-        allocInfo = new AllocInfo("A", "int", 5, dimSize, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int *(*A[3][4])[5];\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration5)	{
+
+				//	A	is	a	3	element	array	of	4	element	arrays	of	pointers	to	5	element	arrays	of	pointers	to	double.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								int	dimSize[]	=	{3,4,-1,5,-1};
+								allocInfo	=	new	AllocInfo("A",	"int",	5,	dimSize,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	*(*A[3][4])[5];\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeDeclaration_DayOfWeekEnum) {
-
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    bool result = addDayOfWeekEnumToTypeDictionary( typeDictionary, enumDictionary );
-    EXPECT_EQ(true, result);
-    AllocInfo * allocInfo;
-    try {
-        allocInfo = new AllocInfo("A", "DayOfWeek", 0, NULL, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("DayOfWeek A;\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writeDeclaration_DayOfWeekEnum)	{
+
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				bool	result	=	addDayOfWeekEnumToTypeDictionary(	typeDictionary,	enumDictionary	);
+				EXPECT_EQ(true,	result);
+				AllocInfo	*	allocInfo;
+				try	{
+								allocInfo	=	new	AllocInfo("A",	"DayOfWeek",	0,	NULL,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("DayOfWeek	A;\n",	output_declaration.str());
 }
 
-// ================================================================================
-//                               writeAssignment tests
-// ================================================================================
-
-TEST_F(ClassicChkPtAgentTest, writeAssignment) {
-    std::stringstream AssignmentStatement;
-    checkPointAgent->pushName("X");
-    checkPointAgent->pushName("Y");
-    checkPointAgent->pushIndex(4);
-    checkPointAgent->writeAssignment( AssignmentStatement, "3.14");
-    EXPECT_EQ("X.Y[4] = 3.14;", AssignmentStatement.str());
+//	================================================================================
+//																															writeAssignment	tests
+//	================================================================================
+
+TEST_F(ClassicChkPtAgentTest,	writeAssignment)	{
+				std::stringstream	AssignmentStatement;
+				checkPointAgent->pushName("X");
+				checkPointAgent->pushName("Y");
+				checkPointAgent->pushIndex(4);
+				checkPointAgent->writeAssignment(	AssignmentStatement,	"3.14");
+				EXPECT_EQ("X.Y[4]	=	3.14;",	AssignmentStatement.str());
 }
 
-// ================================================================================
-//                                getSubName tests
-// ================================================================================
+//	================================================================================
+//																																getSubName	tests
+//	================================================================================
 
-TEST_F(ClassicChkPtAgentTest, getSubName1) {
+TEST_F(ClassicChkPtAgentTest,	getSubName1)	{
 
-    bool result = addClassOneToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				bool	result	=	addClassOneToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    const DataType* classOneDataType = typeDictionary->getDataType("ClassOne");
-    const DataType* intDataType = typeDictionary->getDataType("int");
-    const DataType* doubleDataType = typeDictionary->getDataType("double");
+				const	DataType*	classOneDataType	=	typeDictionary->getDataType("ClassOne");
+				const	DataType*	intDataType	=	typeDictionary->getDataType("int");
+				const	DataType*	doubleDataType	=	typeDictionary->getDataType("double");
 
-    ClassOne* classOneVariable = (ClassOne*)classOneDataType->createInstance(1);
+				ClassOne*	classOneVariable	=	(ClassOne*)classOneDataType->createInstance(1);
 
-    std::stringstream nameStream1;
+				std::stringstream	nameStream1;
 
-    checkPointAgent->getSubName( nameStream1, &(classOneVariable->a), intDataType, classOneVariable, classOneDataType);
-    EXPECT_EQ(".a", nameStream1.str());
+				checkPointAgent->getSubName(	nameStream1,	&(classOneVariable->a),	intDataType,	classOneVariable,	classOneDataType);
+				EXPECT_EQ(".a",	nameStream1.str());
 
-    std::stringstream nameStream2;
-    checkPointAgent->getSubName( nameStream2, &(classOneVariable->b), doubleDataType, classOneVariable, classOneDataType);
-    EXPECT_EQ(".b", nameStream2.str());
+				std::stringstream	nameStream2;
+				checkPointAgent->getSubName(	nameStream2,	&(classOneVariable->b),	doubleDataType,	classOneVariable,	classOneDataType);
+				EXPECT_EQ(".b",	nameStream2.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, getSubName2) {
+TEST_F(ClassicChkPtAgentTest,	getSubName2)	{
 
-    bool result = false;
+				bool	result	=	false;
 
-    result = addClassOneToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				result	=	addClassOneToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    result = addClassTwoToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				result	=	addClassTwoToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    const DataType* classOneDataType = typeDictionary->getDataType("ClassOne");
-    const DataType* classTwoDataType = typeDictionary->getDataType("ClassTwo");
-    const DataType* intDataType = typeDictionary->getDataType("int");
-    const DataType* doubleDataType = typeDictionary->getDataType("double");
+				const	DataType*	classOneDataType	=	typeDictionary->getDataType("ClassOne");
+				const	DataType*	classTwoDataType	=	typeDictionary->getDataType("ClassTwo");
+				const	DataType*	intDataType	=	typeDictionary->getDataType("int");
+				const	DataType*	doubleDataType	=	typeDictionary->getDataType("double");
 
-    ClassTwo* classTwoVariable = (ClassTwo*)classTwoDataType->createInstance(1);
+				ClassTwo*	classTwoVariable	=	(ClassTwo*)classTwoDataType->createInstance(1);
 
-    std::stringstream nameStream1;
-    checkPointAgent->getSubName( nameStream1, &(classTwoVariable->x), intDataType, classTwoVariable, classTwoDataType);
-    EXPECT_EQ(".x", nameStream1.str());
+				std::stringstream	nameStream1;
+				checkPointAgent->getSubName(	nameStream1,	&(classTwoVariable->x),	intDataType,	classTwoVariable,	classTwoDataType);
+				EXPECT_EQ(".x",	nameStream1.str());
 
-    std::stringstream nameStream2;
-    checkPointAgent->getSubName( nameStream2, &(classTwoVariable->y), doubleDataType, classTwoVariable, classTwoDataType);
-    EXPECT_EQ(".y", nameStream2.str());
+				std::stringstream	nameStream2;
+				checkPointAgent->getSubName(	nameStream2,	&(classTwoVariable->y),	doubleDataType,	classTwoVariable,	classTwoDataType);
+				EXPECT_EQ(".y",	nameStream2.str());
 
-    std::stringstream nameStream3;
-    checkPointAgent->getSubName( nameStream3, &(classTwoVariable->c1), classOneDataType, classTwoVariable, classTwoDataType);
-    EXPECT_EQ(".c1", nameStream3.str());
+				std::stringstream	nameStream3;
+				checkPointAgent->getSubName(	nameStream3,	&(classTwoVariable->c1),	classOneDataType,	classTwoVariable,	classTwoDataType);
+				EXPECT_EQ(".c1",	nameStream3.str());
 
-    std::stringstream nameStream4;
-    checkPointAgent->getSubName( nameStream4, &(classTwoVariable->c1.a), intDataType, classTwoVariable, classTwoDataType);
-    EXPECT_EQ(".c1.a", nameStream4.str());
+				std::stringstream	nameStream4;
+				checkPointAgent->getSubName(	nameStream4,	&(classTwoVariable->c1.a),	intDataType,	classTwoVariable,	classTwoDataType);
+				EXPECT_EQ(".c1.a",	nameStream4.str());
 
-    std::stringstream nameStream5;
-    checkPointAgent->getSubName( nameStream5, &(classTwoVariable->c1.b), doubleDataType, classTwoVariable, classTwoDataType);
-    EXPECT_EQ(".c1.b", nameStream5.str());
+				std::stringstream	nameStream5;
+				checkPointAgent->getSubName(	nameStream5,	&(classTwoVariable->c1.b),	doubleDataType,	classTwoVariable,	classTwoDataType);
+				EXPECT_EQ(".c1.b",	nameStream5.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, getSubName3) {
+TEST_F(ClassicChkPtAgentTest,	getSubName3)	{
 
-    bool result = addClassThreeToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				bool	result	=	addClassThreeToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    const DataType* classThreeDataType = typeDictionary->getDataType("ClassThree");
-    const DataType* doubleDataType = typeDictionary->getDataType("double");
+				const	DataType*	classThreeDataType	=	typeDictionary->getDataType("ClassThree");
+				const	DataType*	doubleDataType	=	typeDictionary->getDataType("double");
 
-    ClassThree* classThreeVariable = (ClassThree*)classThreeDataType->createInstance(1);
+				ClassThree*	classThreeVariable	=	(ClassThree*)classThreeDataType->createInstance(1);
 
-    std::stringstream nameStream1;
-    checkPointAgent->getSubName( nameStream1, &(classThreeVariable->pos[0]), doubleDataType, classThreeVariable, classThreeDataType);
-    EXPECT_EQ(".pos[0]", nameStream1.str());
+				std::stringstream	nameStream1;
+				checkPointAgent->getSubName(	nameStream1,	&(classThreeVariable->pos[0]),	doubleDataType,	classThreeVariable,	classThreeDataType);
+				EXPECT_EQ(".pos[0]",	nameStream1.str());
 
-    std::stringstream nameStream2;
-    checkPointAgent->getSubName( nameStream2, &(classThreeVariable->pos[1]), doubleDataType, classThreeVariable, classThreeDataType);
-    EXPECT_EQ(".pos[1]", nameStream2.str());
+				std::stringstream	nameStream2;
+				checkPointAgent->getSubName(	nameStream2,	&(classThreeVariable->pos[1]),	doubleDataType,	classThreeVariable,	classThreeDataType);
+				EXPECT_EQ(".pos[1]",	nameStream2.str());
 
-    std::stringstream nameStream3;
-    checkPointAgent->getSubName( nameStream3, &(classThreeVariable->vel[0]), doubleDataType, classThreeVariable, classThreeDataType);
-    EXPECT_EQ(".vel[0]", nameStream3.str());
+				std::stringstream	nameStream3;
+				checkPointAgent->getSubName(	nameStream3,	&(classThreeVariable->vel[0]),	doubleDataType,	classThreeVariable,	classThreeDataType);
+				EXPECT_EQ(".vel[0]",	nameStream3.str());
 
-    std::stringstream nameStream4;
-    checkPointAgent->getSubName( nameStream4, &(classThreeVariable->vel[1]), doubleDataType, classThreeVariable, classThreeDataType);
-    EXPECT_EQ(".vel[1]", nameStream4.str());
+				std::stringstream	nameStream4;
+				checkPointAgent->getSubName(	nameStream4,	&(classThreeVariable->vel[1]),	doubleDataType,	classThreeVariable,	classThreeDataType);
+				EXPECT_EQ(".vel[1]",	nameStream4.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writXXXXXXXation1) {
-
-    // A is an int.
-    std::stringstream output_declaration;
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        allocInfo = new AllocInfo("A", "int", 0, NULL, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
-    checkPointAgent->writeDeclaration( output_declaration, allocInfo->getName(), allocInfo->getDataType());
-    delete allocInfo;
-    EXPECT_EQ("int A;\n", output_declaration.str());
+TEST_F(ClassicChkPtAgentTest,	writXXXXXXXation1)	{
+
+				//	A	is	an	int.
+				std::stringstream	output_declaration;
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								allocInfo	=	new	AllocInfo("A",	"int",	0,	NULL,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
+				checkPointAgent->writeDeclaration(	output_declaration,	allocInfo->getName(),	allocInfo->getDataType());
+				delete	allocInfo;
+				EXPECT_EQ("int	A;\n",	output_declaration.str());
 }
 
-TEST_F(ClassicChkPtAgentTest, writeVariable1) {
+TEST_F(ClassicChkPtAgentTest,	writeVariable1)	{
 
-    bool result = addClassOneToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				bool	result	=	addClassOneToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    bool construction_result = true;
-    AllocInfo * allocInfo;
-    try {
-        allocInfo = new AllocInfo("A", "ClassOne", 0, NULL, typeDictionary);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        construction_result = false;
-    }
-    ASSERT_EQ(true, construction_result);
+				bool	construction_result	=	true;
+				AllocInfo	*	allocInfo;
+				try	{
+								allocInfo	=	new	AllocInfo("A",	"ClassOne",	0,	NULL,	typeDictionary);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								construction_result	=	false;
+				}
+				ASSERT_EQ(true,	construction_result);
 
-    ClassOne* classOneVariable = (ClassOne*)allocInfo->getStart();
-    const DataType* classOneDataType = allocInfo->getDataType();
+				ClassOne*	classOneVariable	=	(ClassOne*)allocInfo->getStart();
+				const	DataType*	classOneDataType	=	allocInfo->getDataType();
 
-    classOneVariable->a = 4;
-    classOneVariable->b = 7.1;
+				classOneVariable->a	=	4;
+				classOneVariable->b	=	7.1;
 
-    checkPointAgent->writeDeclaration( std::cout, allocInfo->getName(), allocInfo->getDataType());
-    checkPointAgent->writeVariable( std::cout, memMgr, classOneVariable, classOneDataType);
+				checkPointAgent->writeDeclaration(	std::cout,	allocInfo->getName(),	allocInfo->getDataType());
+				checkPointAgent->writeVariable(	std::cout,	memMgr,	classOneVariable,	classOneDataType);
 }
 
-TEST_F(ClassicChkPtAgentTest, writeVariable2) {
+TEST_F(ClassicChkPtAgentTest,	writeVariable2)	{
 
-    bool result;
-    result = addClassOneToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				bool	result;
+				result	=	addClassOneToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    result = addClassTwoToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				result	=	addClassTwoToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    const DataType* classTwoDataType = typeDictionary->getDataType("ClassTwo");
+				const	DataType*	classTwoDataType	=	typeDictionary->getDataType("ClassTwo");
 
-    ClassTwo* classTwoVariable = (ClassTwo*)classTwoDataType->createInstance(1);
-    classTwoVariable->x = 2;
-    classTwoVariable->y = 8.7;
-    classTwoVariable->c1.a = 9;
-    classTwoVariable->c1.b = 18.4;
+				ClassTwo*	classTwoVariable	=	(ClassTwo*)classTwoDataType->createInstance(1);
+				classTwoVariable->x	=	2;
+				classTwoVariable->y	=	8.7;
+				classTwoVariable->c1.a	=	9;
+				classTwoVariable->c1.b	=	18.4;
 
-    checkPointAgent->writeVariable( std::cout, memMgr, classTwoVariable, classTwoDataType);
+				checkPointAgent->writeVariable(	std::cout,	memMgr,	classTwoVariable,	classTwoDataType);
 }
 
-TEST_F(ClassicChkPtAgentTest, writeVariable3) {
+TEST_F(ClassicChkPtAgentTest,	writeVariable3)	{
 
-    bool result;
-    result = addClassThreeToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, result);
+				bool	result;
+				result	=	addClassThreeToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	result);
 
-    const DataType* classThreeDataType = typeDictionary->getDataType("ClassThree");
+				const	DataType*	classThreeDataType	=	typeDictionary->getDataType("ClassThree");
 
-    ClassThree* classThreeVariable = (ClassThree*)classThreeDataType->createInstance(1);
-    classThreeVariable->pos[0] = 2.3;
-    classThreeVariable->pos[1] = 3.4;
-    classThreeVariable->vel[0] = 4.5;
-    classThreeVariable->vel[1] = 5.6;
+				ClassThree*	classThreeVariable	=	(ClassThree*)classThreeDataType->createInstance(1);
+				classThreeVariable->pos[0]	=	2.3;
+				classThreeVariable->pos[1]	=	3.4;
+				classThreeVariable->vel[0]	=	4.5;
+				classThreeVariable->vel[1]	=	5.6;
 
-    checkPointAgent->setMakeCompactArrays(true);
-    checkPointAgent->writeVariable( std::cout, memMgr, classThreeVariable, classThreeDataType);
+				checkPointAgent->setMakeCompactArrays(true);
+				checkPointAgent->writeVariable(	std::cout,	memMgr,	classThreeVariable,	classThreeDataType);
 }
diff --git a/trick_source/sim_services/DataTypes/testing/CompTypeSpecTest.cpp b/trick_source/sim_services/DataTypes/testing/CompTypeSpecTest.cpp
index 82a2dfdc6..0f9c81e4f 100644
--- a/trick_source/sim_services/DataTypes/testing/CompTypeSpecTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/CompTypeSpecTest.cpp
@@ -1,326 +1,326 @@
 
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include "TypeDictionary.hh"
-#include "CompositeDataType.hh"
-#include "CompositeValue.hh"
-#include "PrimitiveDataType.hh"
-#include "DataTypeTestSupport.hh"
-
-// Framework
-class CompositeDataTypeTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    CompositeDataTypeTest() { typeDictionary = new TypeDictionary; }
-    ~CompositeDataTypeTest() { delete typeDictionary; }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	"TypeDictionary.hh"
+#include	"CompositeDataType.hh"
+#include	"CompositeValue.hh"
+#include	"PrimitiveDataType.hh"
+#include	"DataTypeTestSupport.hh"
+
+//	Framework
+class	CompositeDataTypeTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				CompositeDataTypeTest()	{	typeDictionary	=	new	TypeDictionary;	}
+				~CompositeDataTypeTest()	{	delete	typeDictionary;	}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-TEST_F(CompositeDataTypeTest, validate ) {
+TEST_F(CompositeDataTypeTest,	validate	)	{
 
-    /* Requirement: CompositeDataType::validate() method shall attempt to resolve
-       all of it's prerequisite type names to actual DataTypes. If it succeeds,
-       it shall return true, otherwise it shall return false. */
+				/*	Requirement:	CompositeDataType::validate()	method	shall	attempt	to	resolve
+							all	of	it's	prerequisite	type	names	to	actual	DataTypes.	If	it	succeeds,
+							it	shall	return	true,	otherwise	it	shall	return	false.	*/
 
-    bool test_result;
+				bool	test_result;
 
-    // Create a CompositeDataType.
-    /* Note that this DataType is dependent on the types "int" and "double". Both
-       both of these named type dependencies must be resolvable, via the TypeDictionary,
-       to their respective DataTypes. */
+				//	Create	a	CompositeDataType.
+				/*	Note	that	this	DataType	is	dependent	on	the	types	"int"	and	"double".	Both
+							both	of	these	named	type	dependencies	must	be	resolvable,	via	the	TypeDictionary,
+							to	their	respective	DataTypes.	*/
 
-    test_result = addClassOneToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, test_result);
+				test_result	=	addClassOneToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	test_result);
 
-    test_result = addClassTwoToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, test_result);
+				test_result	=	addClassTwoToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	test_result);
 
-    test_result = addClassThreeToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, test_result);
+				test_result	=	addClassThreeToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	test_result);
 
-    test_result = addClassFourToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, test_result);
+				test_result	=	addClassFourToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	test_result);
 
-    test_result = addClassFiveToTypeDictionary( typeDictionary );
-    EXPECT_EQ(true, test_result);
+				test_result	=	addClassFiveToTypeDictionary(	typeDictionary	);
+				EXPECT_EQ(true,	test_result);
 
 }
 
-TEST_F(CompositeDataTypeTest, toString_1 ) {
+TEST_F(CompositeDataTypeTest,	toString_1	)	{
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassOne");
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassOne");
 
-    ASSERT_TRUE(dataType != NULL) ;
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    // Print the duplicate CompositeDataType.
-    std::string s;
-    s = dataType->toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::string	s;
+				s	=	dataType->toString();
 
-    // Check the results.
-    EXPECT_EQ("composite {\nint a;\ndouble b;\n}\n", s);
+				//	Check	the	results.
+				EXPECT_EQ("composite	{\nint	a;\ndouble	b;\n}\n",	s);
 }
 
-TEST_F(CompositeDataTypeTest, toString_2 ) {
+TEST_F(CompositeDataTypeTest,	toString_2	)	{
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
-    EXPECT_EQ(true, addClassTwoToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
+				EXPECT_EQ(true,	addClassTwoToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassTwo");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassTwo");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    // Print the duplicate CompositeDataType.
-    std::stringstream ss;
-    ss << dataType->toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::stringstream	ss;
+				ss	<<	dataType->toString();
 
-    // Check the results.
-    EXPECT_EQ("composite {\nint x;\ndouble y;\nClassOne c1;\n}\n", ss.str());
+				//	Check	the	results.
+				EXPECT_EQ("composite	{\nint	x;\ndouble	y;\nClassOne	c1;\n}\n",	ss.str());
 }
 
-TEST_F(CompositeDataTypeTest, toString_3 ) {
+TEST_F(CompositeDataTypeTest,	toString_3	)	{
 
-    EXPECT_EQ(true, addClassThreeToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassThreeToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassThree");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassThree");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    // Print the duplicate CompositeDataType.
-    std::stringstream ss;
-    ss << dataType->toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::stringstream	ss;
+				ss	<<	dataType->toString();
 
-    // Check the results.
-    EXPECT_EQ("composite {\ndouble pos[2];\ndouble vel[2];\n}\n", ss.str());
+				//	Check	the	results.
+				EXPECT_EQ("composite	{\ndouble	pos[2];\ndouble	vel[2];\n}\n",	ss.str());
 }
 
-TEST_F(CompositeDataTypeTest, copy_constructor ) {
+TEST_F(CompositeDataTypeTest,	copy_constructor	)	{
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassOne");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassOne");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    const DataType * copy = new CompositeDataType(*(const CompositeDataType*)dataType);
+				const	DataType	*	copy	=	new	CompositeDataType(*(const	CompositeDataType*)dataType);
 
-    // Print the duplicate CompositeDataType.
-    std::stringstream ss;
-    ss << copy->toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::stringstream	ss;
+				ss	<<	copy->toString();
 
-    // Check the results.
-    EXPECT_EQ("composite {\nint a;\ndouble b;\n}\n", ss.str());
+				//	Check	the	results.
+				EXPECT_EQ("composite	{\nint	a;\ndouble	b;\n}\n",	ss.str());
 
-    delete copy;
+				delete	copy;
 }
 
-TEST_F(CompositeDataTypeTest, operator_equal ) {
+TEST_F(CompositeDataTypeTest,	operator_equal	)	{
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassOne");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassOne");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    CompositeDataType copy = *(const CompositeDataType*)dataType;
+				CompositeDataType	copy	=	*(const	CompositeDataType*)dataType;
 
-    // Print the duplicate CompositeDataType.
-    std::stringstream ss;
-    ss << copy.toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::stringstream	ss;
+				ss	<<	copy.toString();
 
-    // Check the results.
-    EXPECT_EQ("composite {\nint a;\ndouble b;\n}\n", ss.str());
+				//	Check	the	results.
+				EXPECT_EQ("composite	{\nint	a;\ndouble	b;\n}\n",	ss.str());
 }
 
 
-TEST_F(CompositeDataTypeTest, getSize ) {
+TEST_F(CompositeDataTypeTest,	getSize	)	{
 
-    /* Requirement: CompositeDataType::getSize() shall return the size passed in
-       via the constructor. */
+				/*	Requirement:	CompositeDataType::getSize()	shall	return	the	size	passed	in
+							via	the	constructor.	*/
 
-    CompositeDataType * compTypeSpec = new CompositeDataType( typeDictionary,
-                                                              "ClassOne",
-                                                              sizeof(ClassOne),
-                                                              &construct<ClassOne>,
-                                                              &destruct<ClassOne>);
+				CompositeDataType	*	compTypeSpec	=	new	CompositeDataType(	typeDictionary,
+																																																														"ClassOne",
+																																																														sizeof(ClassOne),
+																																																														&construct<ClassOne>,
+																																																														&destruct<ClassOne>);
 
-    compTypeSpec->addRegularMember( "a", offsetof(ClassOne, a), "int", 0, NULL);
-    compTypeSpec->addRegularMember( "b", offsetof(ClassOne, b), "double", 0, NULL);
+				compTypeSpec->addRegularMember(	"a",	offsetof(ClassOne,	a),	"int",	0,	NULL);
+				compTypeSpec->addRegularMember(	"b",	offsetof(ClassOne,	b),	"double",	0,	NULL);
 
-    EXPECT_EQ( sizeof(ClassOne), compTypeSpec->getSize());
+				EXPECT_EQ(	sizeof(ClassOne),	compTypeSpec->getSize());
 
 }
 
-TEST_F(CompositeDataTypeTest, assignValue_1) {
+TEST_F(CompositeDataTypeTest,	assignValue_1)	{
 
-    /* Requirement: */
+				/*	Requirement:	*/
 
-    ClassOne classOne;
-    classOne.a = 0;
-    classOne.b = 0.0;
+				ClassOne	classOne;
+				classOne.a	=	0;
+				classOne.b	=	0.0;
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassOne");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassOne");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    CompositeValue *
-        classOneValue = new  CompositeValue();
-        classOneValue->addMember( new IntegerValue(172));
-        classOneValue->addMember( new FloatingPointValue(3.1415927));
+				CompositeValue	*
+								classOneValue	=	new		CompositeValue();
+								classOneValue->addMember(	new	IntegerValue(172));
+								classOneValue->addMember(	new	FloatingPointValue(3.1415927));
 
-    dataType->assignValue(&classOne, classOneValue);
+				dataType->assignValue(&classOne,	classOneValue);
 
-    EXPECT_EQ( 172, classOne.a);
-    EXPECT_NEAR( 3.1415927, classOne.b, 0.0001);
+				EXPECT_EQ(	172,	classOne.a);
+				EXPECT_NEAR(	3.1415927,	classOne.b,	0.0001);
 }
 
-TEST_F(CompositeDataTypeTest, assignValue_2) {
+TEST_F(CompositeDataTypeTest,	assignValue_2)	{
 
-    /* Requirment:  */
-    ClassTwo classTwo;
-    classTwo.x = 0;
-    classTwo.y = 0.0;
-    classTwo.c1.a = 0;
-    classTwo.c1.b = 0.0;
+				/*	Requirment:		*/
+				ClassTwo	classTwo;
+				classTwo.x	=	0;
+				classTwo.y	=	0.0;
+				classTwo.c1.a	=	0;
+				classTwo.c1.b	=	0.0;
 
-    EXPECT_EQ(true, addClassOneToTypeDictionary( typeDictionary ));
-    EXPECT_EQ(true, addClassTwoToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassOneToTypeDictionary(	typeDictionary	));
+				EXPECT_EQ(true,	addClassTwoToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassTwo");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassTwo");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    CompositeValue * classOneValue = new  CompositeValue();
-        classOneValue->addMember( new IntegerValue(172));
-        classOneValue->addMember( new FloatingPointValue(3.1415927));
+				CompositeValue	*	classOneValue	=	new		CompositeValue();
+								classOneValue->addMember(	new	IntegerValue(172));
+								classOneValue->addMember(	new	FloatingPointValue(3.1415927));
 
-    CompositeValue * classTwoValue = new  CompositeValue();
-        classTwoValue->addMember( new IntegerValue(278));
-        classTwoValue->addMember( new FloatingPointValue(2.7182818));
-        classTwoValue->addMember( classOneValue );
+				CompositeValue	*	classTwoValue	=	new		CompositeValue();
+								classTwoValue->addMember(	new	IntegerValue(278));
+								classTwoValue->addMember(	new	FloatingPointValue(2.7182818));
+								classTwoValue->addMember(	classOneValue	);
 
-    dataType->assignValue(&classTwo, classTwoValue);
+				dataType->assignValue(&classTwo,	classTwoValue);
 
-    delete classTwoValue;
+				delete	classTwoValue;
 
-    EXPECT_EQ( 172, classTwo.c1.a);
-    EXPECT_NEAR( 3.1415927, classTwo.c1.b, 0.0001);
-    EXPECT_EQ( 278, classTwo.x);
-    EXPECT_NEAR( 2.7182818, classTwo.y, 0.0001);
+				EXPECT_EQ(	172,	classTwo.c1.a);
+				EXPECT_NEAR(	3.1415927,	classTwo.c1.b,	0.0001);
+				EXPECT_EQ(	278,	classTwo.x);
+				EXPECT_NEAR(	2.7182818,	classTwo.y,	0.0001);
 }
 
-TEST_F(CompositeDataTypeTest, assignValue_3) {
+TEST_F(CompositeDataTypeTest,	assignValue_3)	{
 
-    /* Requirment:  */
-    ClassThree classThree;
-    classThree.pos[0] = 0.0;
-    classThree.pos[1] = 0.0;
-    classThree.vel[0] = 0.0;
-    classThree.vel[1] = 0.0;
+				/*	Requirment:		*/
+				ClassThree	classThree;
+				classThree.pos[0]	=	0.0;
+				classThree.pos[1]	=	0.0;
+				classThree.vel[0]	=	0.0;
+				classThree.vel[1]	=	0.0;
 
-    EXPECT_EQ(true, addClassThreeToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassThreeToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassThree");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassThree");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    CompositeValue * posValue = new  CompositeValue();
-        posValue->addMember( new FloatingPointValue(2.3));
-        posValue->addMember( new FloatingPointValue(5.7));
-    CompositeValue * velValue = new  CompositeValue();
-        velValue->addMember( new FloatingPointValue(4.3));
-        velValue->addMember( new FloatingPointValue(7.7));
-    CompositeValue * classThreeValue = new  CompositeValue();
-        classThreeValue->addMember( posValue );
-        classThreeValue->addMember( velValue );
+				CompositeValue	*	posValue	=	new		CompositeValue();
+								posValue->addMember(	new	FloatingPointValue(2.3));
+								posValue->addMember(	new	FloatingPointValue(5.7));
+				CompositeValue	*	velValue	=	new		CompositeValue();
+								velValue->addMember(	new	FloatingPointValue(4.3));
+								velValue->addMember(	new	FloatingPointValue(7.7));
+				CompositeValue	*	classThreeValue	=	new		CompositeValue();
+								classThreeValue->addMember(	posValue	);
+								classThreeValue->addMember(	velValue	);
 
-    dataType->assignValue(&classThree, classThreeValue);
+				dataType->assignValue(&classThree,	classThreeValue);
 
-    EXPECT_NEAR( 2.3, classThree.pos[0], 0.0001);
-    EXPECT_NEAR( 5.7, classThree.pos[1], 0.0001);
-    EXPECT_NEAR( 4.3, classThree.vel[0], 0.0001);
-    EXPECT_NEAR( 7.7, classThree.vel[1], 0.0001);
+				EXPECT_NEAR(	2.3,	classThree.pos[0],	0.0001);
+				EXPECT_NEAR(	5.7,	classThree.pos[1],	0.0001);
+				EXPECT_NEAR(	4.3,	classThree.vel[0],	0.0001);
+				EXPECT_NEAR(	7.7,	classThree.vel[1],	0.0001);
 
 }
 
-TEST_F(CompositeDataTypeTest, assignValue_4) {
+TEST_F(CompositeDataTypeTest,	assignValue_4)	{
 
-    /* Requirement:  */
-    ClassFour classFour;
-    classFour.x[0] = 0.0;
-    classFour.x[1] = 0.0;
-    classFour.f1 = 0;
-    classFour.f2 = 0;
-    classFour.f3 = 0;
+				/*	Requirement:		*/
+				ClassFour	classFour;
+				classFour.x[0]	=	0.0;
+				classFour.x[1]	=	0.0;
+				classFour.f1	=	0;
+				classFour.f2	=	0;
+				classFour.f3	=	0;
 
-    EXPECT_EQ(true, addClassFourToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassFourToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassFour");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassFour");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    CompositeValue * xValue = new  CompositeValue();
-        xValue->addMember( new FloatingPointValue(2.3));
-        xValue->addMember( new FloatingPointValue(5.7));
-    IntegerValue * f1Value = new IntegerValue(2);
-    IntegerValue * f2Value = new IntegerValue(13);
-    IntegerValue * f3Value = new IntegerValue(55);
+				CompositeValue	*	xValue	=	new		CompositeValue();
+								xValue->addMember(	new	FloatingPointValue(2.3));
+								xValue->addMember(	new	FloatingPointValue(5.7));
+				IntegerValue	*	f1Value	=	new	IntegerValue(2);
+				IntegerValue	*	f2Value	=	new	IntegerValue(13);
+				IntegerValue	*	f3Value	=	new	IntegerValue(55);
 
-    CompositeValue * classFourValue = new  CompositeValue();
-        classFourValue->addMember( xValue );
-        classFourValue->addMember( f1Value );
-        classFourValue->addMember( f2Value );
-        classFourValue->addMember( f3Value );
+				CompositeValue	*	classFourValue	=	new		CompositeValue();
+								classFourValue->addMember(	xValue	);
+								classFourValue->addMember(	f1Value	);
+								classFourValue->addMember(	f2Value	);
+								classFourValue->addMember(	f3Value	);
 
-    dataType->assignValue(&classFour, classFourValue);
+				dataType->assignValue(&classFour,	classFourValue);
 
-    EXPECT_NEAR( 2.3, classFour.x[0], 0.0001);
-    EXPECT_NEAR( 5.7, classFour.x[1], 0.0001);
-    EXPECT_EQ(  2, classFour.f1);
-    EXPECT_EQ( 13, classFour.f2);
-    EXPECT_EQ( 55, classFour.f3);
+				EXPECT_NEAR(	2.3,	classFour.x[0],	0.0001);
+				EXPECT_NEAR(	5.7,	classFour.x[1],	0.0001);
+				EXPECT_EQ(		2,	classFour.f1);
+				EXPECT_EQ(	13,	classFour.f2);
+				EXPECT_EQ(	55,	classFour.f3);
 
 }
 
-TEST_F(CompositeDataTypeTest, assignValue_5) {
+TEST_F(CompositeDataTypeTest,	assignValue_5)	{
 
-    EXPECT_EQ(true, addClassFiveToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassFiveToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassFive");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassFive");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    ClassFive* classFive = (ClassFive*)dataType->createInstance(1);
+				ClassFive*	classFive	=	(ClassFive*)dataType->createInstance(1);
 
-    CompositeValue * classFiveValue = new  CompositeValue();
-        classFiveValue->addMember( new FloatingPointValue(7.3));
-        classFiveValue->addMember( new IntegerValue(13));
+				CompositeValue	*	classFiveValue	=	new		CompositeValue();
+								classFiveValue->addMember(	new	FloatingPointValue(7.3));
+								classFiveValue->addMember(	new	IntegerValue(13));
 
-    dataType->assignValue(classFive, classFiveValue);
+				dataType->assignValue(classFive,	classFiveValue);
 
-    EXPECT_NEAR( 7.3, classFive->x, 0.0001);
-    EXPECT_EQ( 13, classFive->count);
+				EXPECT_NEAR(	7.3,	classFive->x,	0.0001);
+				EXPECT_EQ(	13,	classFive->count);
 }
 
 
-TEST_F(CompositeDataTypeTest, printValue_4) {
+TEST_F(CompositeDataTypeTest,	printValue_4)	{
 
-    /* Requirment:  */
+				/*	Requirment:		*/
 
-    ClassFour classFour;
-    classFour.x[0] = 0.0;
-    classFour.x[1] = 0.0;
-    classFour.f1 = 1;
-    classFour.f2 = 13;
-    classFour.f3 = 55;
+				ClassFour	classFour;
+				classFour.x[0]	=	0.0;
+				classFour.x[1]	=	0.0;
+				classFour.f1	=	1;
+				classFour.f2	=	13;
+				classFour.f3	=	55;
 
-    EXPECT_EQ(true, addClassFourToTypeDictionary( typeDictionary ));
+				EXPECT_EQ(true,	addClassFourToTypeDictionary(	typeDictionary	));
 
-    const DataType* dataType = typeDictionary->getDataType("ClassFour");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassFour");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    // Print the duplicate CompositeDataType.
-    std::stringstream ss;
-    dataType->printValue(ss, &classFour);
+				//	Print	the	duplicate	CompositeDataType.
+				std::stringstream	ss;
+				dataType->printValue(ss,	&classFour);
 
-    // Check the results.
-    int result = ss.str().compare("{{0,0}, 1, 13, 55}");
-    EXPECT_EQ(0, result);
+				//	Check	the	results.
+				int	result	=	ss.str().compare("{{0,0},	1,	13,	55}");
+				EXPECT_EQ(0,	result);
 
 }
 
diff --git a/trick_source/sim_services/DataTypes/testing/DataTypeTestSupport.cpp b/trick_source/sim_services/DataTypes/testing/DataTypeTestSupport.cpp
index 72307854a..a5ee70e8e 100644
--- a/trick_source/sim_services/DataTypes/testing/DataTypeTestSupport.cpp
+++ b/trick_source/sim_services/DataTypes/testing/DataTypeTestSupport.cpp
@@ -1,139 +1,139 @@
-#include "DataTypeTestSupport.hh"
-#include "CompositeDataType.hh"
-#include "CompositeValue.hh"
-#include "PrimitiveDataType.hh"
-#include "EnumDataType.hh"
+#include	"DataTypeTestSupport.hh"
+#include	"CompositeDataType.hh"
+#include	"CompositeValue.hh"
+#include	"PrimitiveDataType.hh"
+#include	"EnumDataType.hh"
 
-int ClassFive::count = 0;
+int	ClassFive::count	=	0;
 
-static short get_ClassFour__f1(void* addr) { return  ((ClassFour*)addr)->f1; }
-static void set_ClassFour__f1(void* addr, short v) { ((ClassFour*)addr)->f1 = v; }
+static	short	get_ClassFour__f1(void*	addr)	{	return		((ClassFour*)addr)->f1;	}
+static	void	set_ClassFour__f1(void*	addr,	short	v)	{	((ClassFour*)addr)->f1	=	v;	}
 
-static short get_ClassFour__f2(void* addr) { return  ((ClassFour*)addr)->f2; }
-static void set_ClassFour__f2(void* addr, short v) { ((ClassFour*)addr)->f2 = v; }
+static	short	get_ClassFour__f2(void*	addr)	{	return		((ClassFour*)addr)->f2;	}
+static	void	set_ClassFour__f2(void*	addr,	short	v)	{	((ClassFour*)addr)->f2	=	v;	}
 
-static short get_ClassFour__f3(void* addr) { return  ((ClassFour*)addr)->f3; }
-static void set_ClassFour__f3(void* addr, short v) { ((ClassFour*)addr)->f3 = v; }
+static	short	get_ClassFour__f3(void*	addr)	{	return		((ClassFour*)addr)->f3;	}
+static	void	set_ClassFour__f3(void*	addr,	short	v)	{	((ClassFour*)addr)->f3	=	v;	}
 
 
-bool addClassOneToTypeDictionary(TypeDictionary* typeDictionary) {
+bool	addClassOneToTypeDictionary(TypeDictionary*	typeDictionary)	{
 
-    bool result = false;
-    try {
-        CompositeDataType* classOneTypeSpec =
-            new CompositeDataType(typeDictionary, "ClassOne", sizeof(ClassOne), &construct<ClassOne>, &destruct<ClassOne> );
-            classOneTypeSpec->addRegularMember( "a", offsetof(ClassOne, a), "int", 0, NULL);
-            classOneTypeSpec->addRegularMember( "b", offsetof(ClassOne, b), "double", 0, NULL);
+				bool	result	=	false;
+				try	{
+								CompositeDataType*	classOneTypeSpec	=
+												new	CompositeDataType(typeDictionary,	"ClassOne",	sizeof(ClassOne),	&construct<ClassOne>,	&destruct<ClassOne>	);
+												classOneTypeSpec->addRegularMember(	"a",	offsetof(ClassOne,	a),	"int",	0,	NULL);
+												classOneTypeSpec->addRegularMember(	"b",	offsetof(ClassOne,	b),	"double",	0,	NULL);
 
-        typeDictionary->addTypeDefinition("ClassOne", classOneTypeSpec);
-        result = classOneTypeSpec->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+								typeDictionary->addTypeDefinition("ClassOne",	classOneTypeSpec);
+								result	=	classOneTypeSpec->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-bool addClassTwoToTypeDictionary(TypeDictionary* typeDictionary) {
+bool	addClassTwoToTypeDictionary(TypeDictionary*	typeDictionary)	{
 
-    bool result = false;
-    try {
-        CompositeDataType * classTwoTypeSpec =
-            new CompositeDataType(typeDictionary, "ClassTwo", sizeof(ClassTwo), &construct<ClassTwo>, &destruct<ClassTwo>);
-            classTwoTypeSpec->addRegularMember( "x", offsetof(ClassTwo, x), "int", 0, NULL);
-            classTwoTypeSpec->addRegularMember( "y", offsetof(ClassTwo, y), "double", 0, NULL);
-            classTwoTypeSpec->addRegularMember( "c1", offsetof(ClassTwo, c1), "ClassOne", 0, NULL);
+				bool	result	=	false;
+				try	{
+								CompositeDataType	*	classTwoTypeSpec	=
+												new	CompositeDataType(typeDictionary,	"ClassTwo",	sizeof(ClassTwo),	&construct<ClassTwo>,	&destruct<ClassTwo>);
+												classTwoTypeSpec->addRegularMember(	"x",	offsetof(ClassTwo,	x),	"int",	0,	NULL);
+												classTwoTypeSpec->addRegularMember(	"y",	offsetof(ClassTwo,	y),	"double",	0,	NULL);
+												classTwoTypeSpec->addRegularMember(	"c1",	offsetof(ClassTwo,	c1),	"ClassOne",	0,	NULL);
 
-        typeDictionary->addTypeDefinition("ClassTwo", classTwoTypeSpec);
+								typeDictionary->addTypeDefinition("ClassTwo",	classTwoTypeSpec);
 
-        result = classTwoTypeSpec->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+								result	=	classTwoTypeSpec->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-bool addClassThreeToTypeDictionary(TypeDictionary* typeDictionary) {
-
-    bool result = false;
-    try {
-        CompositeDataType * classThreeTypeSpec =
-            new CompositeDataType(typeDictionary, "ClassThree", sizeof(ClassThree), &construct<ClassThree>, &destruct<ClassThree>);
-            int x_dims[] = {2};
-            classThreeTypeSpec->addRegularMember( "pos", offsetof(ClassThree, pos), "double", 1, x_dims);
-            int y_dims[] = {2};
-            classThreeTypeSpec->addRegularMember( "vel", offsetof(ClassThree, vel), "double", 1, y_dims);
-
-        typeDictionary->addTypeDefinition("ClassThree", classThreeTypeSpec);
-
-        result = classThreeTypeSpec->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+bool	addClassThreeToTypeDictionary(TypeDictionary*	typeDictionary)	{
+
+				bool	result	=	false;
+				try	{
+								CompositeDataType	*	classThreeTypeSpec	=
+												new	CompositeDataType(typeDictionary,	"ClassThree",	sizeof(ClassThree),	&construct<ClassThree>,	&destruct<ClassThree>);
+												int	x_dims[]	=	{2};
+												classThreeTypeSpec->addRegularMember(	"pos",	offsetof(ClassThree,	pos),	"double",	1,	x_dims);
+												int	y_dims[]	=	{2};
+												classThreeTypeSpec->addRegularMember(	"vel",	offsetof(ClassThree,	vel),	"double",	1,	y_dims);
+
+								typeDictionary->addTypeDefinition("ClassThree",	classThreeTypeSpec);
+
+								result	=	classThreeTypeSpec->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-bool addClassFourToTypeDictionary(TypeDictionary* typeDictionary) {
-
-    bool result = false;
-    try {
-        CompositeDataType * classFourTypeSpec =
-            new CompositeDataType(typeDictionary, "ClassFour", sizeof(ClassFour), &construct<ClassFour>, &destruct<ClassFour>);
-            int x_dims[] = {2};
-            classFourTypeSpec->addRegularMember( "x", offsetof(ClassFour, x), "double", 1, x_dims);
-            classFourTypeSpec->addBitFieldMember( "f1", get_ClassFour__f1, set_ClassFour__f1);
-            classFourTypeSpec->addBitFieldMember( "f2", get_ClassFour__f2, set_ClassFour__f2);
-            classFourTypeSpec->addBitFieldMember( "f3", get_ClassFour__f3, set_ClassFour__f3);
-
-        typeDictionary->addTypeDefinition("ClassFour", classFourTypeSpec);
-
-        result = classFourTypeSpec->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+bool	addClassFourToTypeDictionary(TypeDictionary*	typeDictionary)	{
+
+				bool	result	=	false;
+				try	{
+								CompositeDataType	*	classFourTypeSpec	=
+												new	CompositeDataType(typeDictionary,	"ClassFour",	sizeof(ClassFour),	&construct<ClassFour>,	&destruct<ClassFour>);
+												int	x_dims[]	=	{2};
+												classFourTypeSpec->addRegularMember(	"x",	offsetof(ClassFour,	x),	"double",	1,	x_dims);
+												classFourTypeSpec->addBitFieldMember(	"f1",	get_ClassFour__f1,	set_ClassFour__f1);
+												classFourTypeSpec->addBitFieldMember(	"f2",	get_ClassFour__f2,	set_ClassFour__f2);
+												classFourTypeSpec->addBitFieldMember(	"f3",	get_ClassFour__f3,	set_ClassFour__f3);
+
+								typeDictionary->addTypeDefinition("ClassFour",	classFourTypeSpec);
+
+								result	=	classFourTypeSpec->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-bool addClassFiveToTypeDictionary(TypeDictionary* typeDictionary) {
+bool	addClassFiveToTypeDictionary(TypeDictionary*	typeDictionary)	{
 
-    bool result = false;
-    try {
-        CompositeDataType * classFiveTypeSpec =
-            new CompositeDataType(typeDictionary, "ClassFive", sizeof(ClassFive), &construct<ClassFive>, &destruct<ClassFive>);
-            classFiveTypeSpec->addRegularMember( "x", offsetof(ClassFive, x), "double", 0, NULL);
-            classFiveTypeSpec->addStaticMember( "count", &ClassFive::count, "int", 0, NULL );
+				bool	result	=	false;
+				try	{
+								CompositeDataType	*	classFiveTypeSpec	=
+												new	CompositeDataType(typeDictionary,	"ClassFive",	sizeof(ClassFive),	&construct<ClassFive>,	&destruct<ClassFive>);
+												classFiveTypeSpec->addRegularMember(	"x",	offsetof(ClassFive,	x),	"double",	0,	NULL);
+												classFiveTypeSpec->addStaticMember(	"count",	&ClassFive::count,	"int",	0,	NULL	);
 
-        typeDictionary->addTypeDefinition("ClassFive", classFiveTypeSpec);
+								typeDictionary->addTypeDefinition("ClassFive",	classFiveTypeSpec);
 
-        result = classFiveTypeSpec->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+								result	=	classFiveTypeSpec->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-bool addDayOfWeekEnumToTypeDictionary(TypeDictionary* typeDictionary,  EnumDictionary* enumDictionary) {
-
-    bool result = false;
-    try {
-            EnumDataType * dataType = new EnumDataType( enumDictionary, "DayOfWeek", sizeof(enum DayOfWeek) );
-            dataType->addEnumerator( "Sunday",   1);
-            dataType->addEnumerator( "Monday",   2);
-            dataType->addEnumerator( "Tuesday",  3);
-            dataType->addEnumerator( "Wednesday",4);
-            dataType->addEnumerator( "Thursday", 5);
-            dataType->addEnumerator( "Friday",   6);
-            dataType->addEnumerator( "Saturday", 7);
-
-            typeDictionary->addTypeDefinition( "DayOfWeek", dataType );
-            result = dataType->validate();
-    } catch( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+bool	addDayOfWeekEnumToTypeDictionary(TypeDictionary*	typeDictionary,		EnumDictionary*	enumDictionary)	{
+
+				bool	result	=	false;
+				try	{
+												EnumDataType	*	dataType	=	new	EnumDataType(	enumDictionary,	"DayOfWeek",	sizeof(enum	DayOfWeek)	);
+												dataType->addEnumerator(	"Sunday",			1);
+												dataType->addEnumerator(	"Monday",			2);
+												dataType->addEnumerator(	"Tuesday",		3);
+												dataType->addEnumerator(	"Wednesday",4);
+												dataType->addEnumerator(	"Thursday",	5);
+												dataType->addEnumerator(	"Friday",			6);
+												dataType->addEnumerator(	"Saturday",	7);
+
+												typeDictionary->addTypeDefinition(	"DayOfWeek",	dataType	);
+												result	=	dataType->validate();
+				}	catch(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
diff --git a/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp b/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
index a1adb00a4..6e8c3d935 100644
--- a/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/EnumDeclarationTest.cpp
@@ -1,186 +1,186 @@
 
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include "EnumDeclaration.hh"
-#include "IntegerValue.hh"
-#include "TypeDictionary.hh"
-
-enum DayOfWeek {
-   Sunday    = 1,
-   Monday    = 2,
-   Tuesday   = 3,
-   Wednesday = 4,
-   Thursday  = 5,
-   Friday    = 6,
-   Saturday  = 7
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	"EnumDeclaration.hh"
+#include	"IntegerValue.hh"
+#include	"TypeDictionary.hh"
+
+enum	DayOfWeek	{
+			Sunday				=	1,
+			Monday				=	2,
+			Tuesday			=	3,
+			Wednesday	=	4,
+			Thursday		=	5,
+			Friday				=	6,
+			Saturday		=	7
 };
 
-TEST(EnumDeclaration, getters_1 ) {
-
-    // Create a EnumDeclaration.
-    EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-        enum_decl->addEnumerator( "Sunday",   1);
-        enum_decl->addEnumerator( "Monday",   2);
-        enum_decl->addEnumerator( "Tuesday",  3);
-        enum_decl->addEnumerator( "Wednesday",4);
-        enum_decl->addEnumerator( "Thursday", 5);
-        enum_decl->addEnumerator( "Friday",   6);
-        enum_decl->addEnumerator( "Saturday", 7);
-
-    EXPECT_EQ(1, enum_decl->getElementCount());
-    EXPECT_EQ(0, enum_decl->getPointerCount());
-    EXPECT_EQ(0, enum_decl->getDimensionCount());
-    EXPECT_EQ( (int)sizeof(enum DayOfWeek), enum_decl->getElementSize());
-    EXPECT_EQ( (int)sizeof(enum DayOfWeek), enum_decl->getSize());
+TEST(EnumDeclaration,	getters_1	)	{
+
+				//	Create	a	EnumDeclaration.
+				EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+								enum_decl->addEnumerator(	"Sunday",			1);
+								enum_decl->addEnumerator(	"Monday",			2);
+								enum_decl->addEnumerator(	"Tuesday",		3);
+								enum_decl->addEnumerator(	"Wednesday",4);
+								enum_decl->addEnumerator(	"Thursday",	5);
+								enum_decl->addEnumerator(	"Friday",			6);
+								enum_decl->addEnumerator(	"Saturday",	7);
+
+				EXPECT_EQ(1,	enum_decl->getElementCount());
+				EXPECT_EQ(0,	enum_decl->getPointerCount());
+				EXPECT_EQ(0,	enum_decl->getDimensionCount());
+				EXPECT_EQ(	(int)sizeof(enum	DayOfWeek),	enum_decl->getElementSize());
+				EXPECT_EQ(	(int)sizeof(enum	DayOfWeek),	enum_decl->getSize());
 }
 
-TEST(EnumDeclaration, toString_1) {
-
-    // Create a EnumDeclaration.
-    EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-        enum_decl->addEnumerator( "Sunday",   1);
-        enum_decl->addEnumerator( "Monday",   2);
-        enum_decl->addEnumerator( "Tuesday",  3);
-        enum_decl->addEnumerator( "Wednesday",4);
-        enum_decl->addEnumerator( "Thursday", 5);
-        enum_decl->addEnumerator( "Friday",   6);
-        enum_decl->addEnumerator( "Saturday", 7);
-
-    // Print the EnumDeclaration.
-    std::stringstream ss;
-    ss << enum_decl->toString();
-
-    // Check the results.
-    int result = ss.str().compare("enum { Sunday = 1, Monday = 2, Tuesday = 3, Wednesday = 4, Thursday = 5, Friday = 6, Saturday = 7}");
-    EXPECT_EQ( 0, result);
+TEST(EnumDeclaration,	toString_1)	{
+
+				//	Create	a	EnumDeclaration.
+				EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+								enum_decl->addEnumerator(	"Sunday",			1);
+								enum_decl->addEnumerator(	"Monday",			2);
+								enum_decl->addEnumerator(	"Tuesday",		3);
+								enum_decl->addEnumerator(	"Wednesday",4);
+								enum_decl->addEnumerator(	"Thursday",	5);
+								enum_decl->addEnumerator(	"Friday",			6);
+								enum_decl->addEnumerator(	"Saturday",	7);
+
+				//	Print	the	EnumDeclaration.
+				std::stringstream	ss;
+				ss	<<	enum_decl->toString();
+
+				//	Check	the	results.
+				int	result	=	ss.str().compare("enum	{	Sunday	=	1,	Monday	=	2,	Tuesday	=	3,	Wednesday	=	4,	Thursday	=	5,	Friday	=	6,	Saturday	=	7}");
+				EXPECT_EQ(	0,	result);
 }
 
-TEST(EnumDeclaration, copy_constructor_1) {
+TEST(EnumDeclaration,	copy_constructor_1)	{
 
-    // Create a EnumDeclaration.
-    EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-        enum_decl->addEnumerator( "Sunday",   1);
-        enum_decl->addEnumerator( "Monday",   2);
-        enum_decl->addEnumerator( "Tuesday",  3);
-        enum_decl->addEnumerator( "Wednesday",4);
-        enum_decl->addEnumerator( "Thursday", 5);
-        enum_decl->addEnumerator( "Friday",   6);
-        enum_decl->addEnumerator( "Saturday", 7);
+				//	Create	a	EnumDeclaration.
+				EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+								enum_decl->addEnumerator(	"Sunday",			1);
+								enum_decl->addEnumerator(	"Monday",			2);
+								enum_decl->addEnumerator(	"Tuesday",		3);
+								enum_decl->addEnumerator(	"Wednesday",4);
+								enum_decl->addEnumerator(	"Thursday",	5);
+								enum_decl->addEnumerator(	"Friday",			6);
+								enum_decl->addEnumerator(	"Saturday",	7);
 
-    // Create a duplicate of the EnumDeclaration.
-    EnumDeclaration *
-        duplicate_decl = new EnumDeclaration( *enum_decl );
+				//	Create	a	duplicate	of	the	EnumDeclaration.
+				EnumDeclaration	*
+								duplicate_decl	=	new	EnumDeclaration(	*enum_decl	);
 
-    // Delete the original.
-    delete enum_decl;
+				//	Delete	the	original.
+				delete	enum_decl;
 
-    // Print the duplicate EnumDeclaration.
-    std::stringstream ss;
-    ss << duplicate_decl->toString();
+				//	Print	the	duplicate	EnumDeclaration.
+				std::stringstream	ss;
+				ss	<<	duplicate_decl->toString();
 
-    // Check the results with what we expected.
-    int result = ss.str().compare("enum { Sunday = 1, Monday = 2, Tuesday = 3, Wednesday = 4, Thursday = 5, Friday = 6, Saturday = 7}");
-    EXPECT_EQ(0, result);
+				//	Check	the	results	with	what	we	expected.
+				int	result	=	ss.str().compare("enum	{	Sunday	=	1,	Monday	=	2,	Tuesday	=	3,	Wednesday	=	4,	Thursday	=	5,	Friday	=	6,	Saturday	=	7}");
+				EXPECT_EQ(0,	result);
 }
 
-#if 0
-TEST(EnumDeclaration, assignment_operator) {
+#if	0
+TEST(EnumDeclaration,	assignment_operator)	{
 
-    EnumDeclaration my_decl;
+				EnumDeclaration	my_decl;
 
-    // Create a EnumDeclaration.
-    unsigned int decl_dims[1] = {5};
-    EnumDeclaration * original_decl = new EnumDeclaration(1, 1, decl_dims, sizeof(ClassThree));
-        unsigned int x_dims[1] = {3};
-        original_decl->addRegularMember( "x", offsetof(ClassThree, x), new PrimitiveDeclaration<double>(0, 1, x_dims));
-        original_decl->addBitFieldMember<short>( "f1", 3);
-        original_decl->addBitFieldMember<short>( "f2", 5);
-        original_decl->addBitFieldMember<short>( "f3", 7);
+				//	Create	a	EnumDeclaration.
+				unsigned	int	decl_dims[1]	=	{5};
+				EnumDeclaration	*	original_decl	=	new	EnumDeclaration(1,	1,	decl_dims,	sizeof(ClassThree));
+								unsigned	int	x_dims[1]	=	{3};
+								original_decl->addRegularMember(	"x",	offsetof(ClassThree,	x),	new	PrimitiveDeclaration<double>(0,	1,	x_dims));
+								original_decl->addBitFieldMember<short>(	"f1",	3);
+								original_decl->addBitFieldMember<short>(	"f2",	5);
+								original_decl->addBitFieldMember<short>(	"f3",	7);
 
-    my_decl = *original_decl;
+				my_decl	=	*original_decl;
 
-    // Delete the original.
-    delete original_decl;
+				//	Delete	the	original.
+				delete	original_decl;
 
-    // Print the duplicate EnumDeclaration.
-    std::stringstream ss;
-    ss << my_decl.toString();
+				//	Print	the	duplicate	EnumDeclaration.
+				std::stringstream	ss;
+				ss	<<	my_decl.toString();
 
-    // Check the results with what we expected.
-    int result = ss.str().compare("{\ndouble[3] x;\nshort f1 : 3;\nshort f2 : 5;\nshort f3 : 7;\n}*[5]");
-    EXPECT_EQ(0, result);
+				//	Check	the	results	with	what	we	expected.
+				int	result	=	ss.str().compare("{\ndouble[3]	x;\nshort	f1	:	3;\nshort	f2	:	5;\nshort	f3	:	7;\n}*[5]");
+				EXPECT_EQ(0,	result);
 }
 #endif
 
-TEST(EnumDeclaration, assign_singleton) {
+TEST(EnumDeclaration,	assign_singleton)	{
 
-    // Create an instance of type.
-    enum DayOfWeek day = Monday;
+				//	Create	an	instance	of	type.
+				enum	DayOfWeek	day	=	Monday;
 
-    // Create our own description of the type.
-    EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-        enum_decl->addEnumerator( "Sunday",   1);
-        enum_decl->addEnumerator( "Monday",   2);
-        enum_decl->addEnumerator( "Tuesday",  3);
-        enum_decl->addEnumerator( "Wednesday",4);
-        enum_decl->addEnumerator( "Thursday", 5);
-        enum_decl->addEnumerator( "Friday",   6);
-        enum_decl->addEnumerator( "Saturday", 7);
+				//	Create	our	own	description	of	the	type.
+				EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+								enum_decl->addEnumerator(	"Sunday",			1);
+								enum_decl->addEnumerator(	"Monday",			2);
+								enum_decl->addEnumerator(	"Tuesday",		3);
+								enum_decl->addEnumerator(	"Wednesday",4);
+								enum_decl->addEnumerator(	"Thursday",	5);
+								enum_decl->addEnumerator(	"Friday",			6);
+								enum_decl->addEnumerator(	"Saturday",	7);
 
-    // Create a CompositeValue to be assigned to the class instance.
-    IntegerValue *intVal = new IntegerValue(4);
+				//	Create	a	CompositeValue	to	be	assigned	to	the	class	instance.
+				IntegerValue	*intVal	=	new	IntegerValue(4);
 
-    // Perform the assignment.
-    enum_decl->assignValue( &day, intVal);
+				//	Perform	the	assignment.
+				enum_decl->assignValue(	&day,	intVal);
 
-    // Check that values were correctly assigned to the class instance.
-    EXPECT_EQ(day , 4);
+				//	Check	that	values	were	correctly	assigned	to	the	class	instance.
+				EXPECT_EQ(day	,	4);
 }
 
-TEST(EnumDeclaration, print_singleton_value) {
+TEST(EnumDeclaration,	print_singleton_value)	{
 
-    // Create an instance of type.
-    enum DayOfWeek day = Monday;
+				//	Create	an	instance	of	type.
+				enum	DayOfWeek	day	=	Monday;
 
-    // Create our own description of the type.
-    EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-        enum_decl->addEnumerator( "Sunday",   1);
-        enum_decl->addEnumerator( "Monday",   2);
-        enum_decl->addEnumerator( "Tuesday",  3);
-        enum_decl->addEnumerator( "Wednesday",4);
-        enum_decl->addEnumerator( "Thursday", 5);
-        enum_decl->addEnumerator( "Friday",   6);
-        enum_decl->addEnumerator( "Saturday", 7);
+				//	Create	our	own	description	of	the	type.
+				EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+								enum_decl->addEnumerator(	"Sunday",			1);
+								enum_decl->addEnumerator(	"Monday",			2);
+								enum_decl->addEnumerator(	"Tuesday",		3);
+								enum_decl->addEnumerator(	"Wednesday",4);
+								enum_decl->addEnumerator(	"Thursday",	5);
+								enum_decl->addEnumerator(	"Friday",			6);
+								enum_decl->addEnumerator(	"Saturday",	7);
 
-    std::stringstream ss;
-    enum_decl->printValue(ss, &day);
+				std::stringstream	ss;
+				enum_decl->printValue(ss,	&day);
 
-    int result = ss.str().compare("Monday");
+				int	result	=	ss.str().compare("Monday");
 
-    EXPECT_EQ(0, result);
+				EXPECT_EQ(0,	result);
 
 
-    class Foo { public : Foo () {
-        TypeDictionary * type_dict = TypeDictionary::getInstance();
+				class	Foo	{	public	:	Foo	()	{
+								TypeDictionary	*	type_dict	=	TypeDictionary::getInstance();
 
-        EnumDeclaration * enum_decl = new EnumDeclaration(0, 0, NULL, sizeof(enum DayOfWeek));
-            enum_decl->addEnumerator( "Sunday",   1);
-            enum_decl->addEnumerator( "Monday",   2);
-            enum_decl->addEnumerator( "Tuesday",  3);
-            enum_decl->addEnumerator( "Wednesday",4);
-            enum_decl->addEnumerator( "Thursday", 5);
-            enum_decl->addEnumerator( "Friday",   6);
-            enum_decl->addEnumerator( "Saturday", 7);
+								EnumDeclaration	*	enum_decl	=	new	EnumDeclaration(0,	0,	NULL,	sizeof(enum	DayOfWeek));
+												enum_decl->addEnumerator(	"Sunday",			1);
+												enum_decl->addEnumerator(	"Monday",			2);
+												enum_decl->addEnumerator(	"Tuesday",		3);
+												enum_decl->addEnumerator(	"Wednesday",4);
+												enum_decl->addEnumerator(	"Thursday",	5);
+												enum_decl->addEnumerator(	"Friday",			6);
+												enum_decl->addEnumerator(	"Saturday",	7);
 
-        type_dict->addTypeDeclaration("Foo", enum_decl);
+								type_dict->addTypeDeclaration("Foo",	enum_decl);
 
-        std::stringstream ss;
-        ss << enum_decl->toString();
-        ss <<  "============================================" << std::endl;
-        ss << type_dict->toString();
-        std::cout << ss.str() << std::endl;
+								std::stringstream	ss;
+								ss	<<	enum_decl->toString();
+								ss	<<		"============================================"	<<	std::endl;
+								ss	<<	type_dict->toString();
+								std::cout	<<	ss.str()	<<	std::endl;
 
 
-    } }; Foo __Foo;
+				}	};	Foo	__Foo;
 
 }
diff --git a/trick_source/sim_services/DataTypes/testing/EnumTypeSpecTest.cpp b/trick_source/sim_services/DataTypes/testing/EnumTypeSpecTest.cpp
index 9a50f6660..ff5825e74 100644
--- a/trick_source/sim_services/DataTypes/testing/EnumTypeSpecTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/EnumTypeSpecTest.cpp
@@ -1,166 +1,166 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-#include "TypeDictionary.hh"
-#include "EnumDataType.hh"
-#include "IntegerValue.hh"
-
-enum DayOfWeek {
-    Sunday    = 1,
-    Monday    = 2,
-    Tuesday   = 3,
-    Wednesday = 4,
-    Thursday  = 5,
-    Friday    = 6,
-    Saturday  = 7
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+#include	"TypeDictionary.hh"
+#include	"EnumDataType.hh"
+#include	"IntegerValue.hh"
+
+enum	DayOfWeek	{
+				Sunday				=	1,
+				Monday				=	2,
+				Tuesday			=	3,
+				Wednesday	=	4,
+				Thursday		=	5,
+				Friday				=	6,
+				Saturday		=	7
 };
 
-enum Fruit {
-    Apple  = 0,
-    Pear   = 1,
-    Lemon  = 2,
-    Orange = 3
+enum	Fruit	{
+				Apple		=	0,
+				Pear			=	1,
+				Lemon		=	2,
+				Orange	=	3
 };
 
-// Framework
-class EnumDataTypeTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    EnumDictionary *enumDictionary;
-    EnumDataTypeTest() {
-        typeDictionary = new TypeDictionary;
-        enumDictionary = new EnumDictionary;
-    }
-    ~EnumDataTypeTest() {
-        delete typeDictionary;
-        delete enumDictionary;
-    }
-    void SetUp() {}
-    void TearDown() {}
+//	Framework
+class	EnumDataTypeTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				EnumDictionary	*enumDictionary;
+				EnumDataTypeTest()	{
+								typeDictionary	=	new	TypeDictionary;
+								enumDictionary	=	new	EnumDictionary;
+				}
+				~EnumDataTypeTest()	{
+								delete	typeDictionary;
+								delete	enumDictionary;
+				}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-bool addDayOfWeekEnumToTypeDictionary(TypeDictionary* typeDictionary, EnumDictionary* enumDictionary) {
-    bool result = false;
-    try {
-        EnumDataType * dataType = new EnumDataType( enumDictionary, "DayOfWeek", sizeof(enum DayOfWeek) );
-        dataType->addEnumerator( "Sunday",   1);
-        dataType->addEnumerator( "Monday",   2);
-        dataType->addEnumerator( "Tuesday",  3);
-        dataType->addEnumerator( "Wednesday",4);
-        dataType->addEnumerator( "Thursday", 5);
-        dataType->addEnumerator( "Friday",   6);
-        dataType->addEnumerator( "Saturday", 7);
-
-        typeDictionary->addTypeDefinition( "DayOfWeek", dataType );
-        result = dataType->validate();
-
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        result = false;
-    }
-    return result;
+bool	addDayOfWeekEnumToTypeDictionary(TypeDictionary*	typeDictionary,	EnumDictionary*	enumDictionary)	{
+				bool	result	=	false;
+				try	{
+								EnumDataType	*	dataType	=	new	EnumDataType(	enumDictionary,	"DayOfWeek",	sizeof(enum	DayOfWeek)	);
+								dataType->addEnumerator(	"Sunday",			1);
+								dataType->addEnumerator(	"Monday",			2);
+								dataType->addEnumerator(	"Tuesday",		3);
+								dataType->addEnumerator(	"Wednesday",4);
+								dataType->addEnumerator(	"Thursday",	5);
+								dataType->addEnumerator(	"Friday",			6);
+								dataType->addEnumerator(	"Saturday",	7);
+
+								typeDictionary->addTypeDefinition(	"DayOfWeek",	dataType	);
+								result	=	dataType->validate();
+
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								result	=	false;
+				}
+				return	result;
 }
 
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
-TEST_F(EnumDataTypeTest, addEnumerator_normal ) {
+TEST_F(EnumDataTypeTest,	addEnumerator_normal	)	{
 
-    bool test_result = false;
-    test_result = addDayOfWeekEnumToTypeDictionary(typeDictionary, enumDictionary);
-    EXPECT_EQ(true, test_result);
+				bool	test_result	=	false;
+				test_result	=	addDayOfWeekEnumToTypeDictionary(typeDictionary,	enumDictionary);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST_F(EnumDataTypeTest, addEnumerator_exception ) {
+TEST_F(EnumDataTypeTest,	addEnumerator_exception	)	{
 
-    std::cout << "===== Expecting an error message about the re-definition of an enumerator type. =====" << std::endl;
+				std::cout	<<	"=====	Expecting	an	error	message	about	the	re-definition	of	an	enumerator	type.	====="	<<	std::endl;
 
-    bool test_result = true;
+				bool	test_result	=	true;
 
-    // Create a EnumDeclaration.
-    EnumDataType * dataType = new EnumDataType( enumDictionary, "Fruit", sizeof(enum Fruit) );
-    try {
-        dataType->addEnumerator( "Apple",  0);
-        dataType->addEnumerator( "Pear",   1);
-        dataType->addEnumerator( "Lemon",  2);
-        dataType->addEnumerator( "Orange", 3);
-        dataType->addEnumerator( "Orange", 3);
+				//	Create	a	EnumDeclaration.
+				EnumDataType	*	dataType	=	new	EnumDataType(	enumDictionary,	"Fruit",	sizeof(enum	Fruit)	);
+				try	{
+								dataType->addEnumerator(	"Apple",		0);
+								dataType->addEnumerator(	"Pear",			1);
+								dataType->addEnumerator(	"Lemon",		2);
+								dataType->addEnumerator(	"Orange",	3);
+								dataType->addEnumerator(	"Orange",	3);
 
-        typeDictionary->addTypeDefinition( "Fruit", dataType );
-        test_result = dataType->validate();
+								typeDictionary->addTypeDefinition(	"Fruit",	dataType	);
+								test_result	=	dataType->validate();
 
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        // We are expecting an exception because "Orange" is added twice.
-        test_result = true;
-    }
-    EXPECT_EQ(true, test_result);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								//	We	are	expecting	an	exception	because	"Orange"	is	added	twice.
+								test_result	=	true;
+				}
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST_F(EnumDataTypeTest, getSize ) {
+TEST_F(EnumDataTypeTest,	getSize	)	{
 
-    EnumDataType * dataType = new EnumDataType( enumDictionary, "DayOfWeek", sizeof(enum DayOfWeek) );
-    EXPECT_EQ( (int)sizeof(enum DayOfWeek), dataType->getSize());
+				EnumDataType	*	dataType	=	new	EnumDataType(	enumDictionary,	"DayOfWeek",	sizeof(enum	DayOfWeek)	);
+				EXPECT_EQ(	(int)sizeof(enum	DayOfWeek),	dataType->getSize());
 }
 
-TEST_F(EnumDataTypeTest, toString ) {
+TEST_F(EnumDataTypeTest,	toString	)	{
 
-    EXPECT_EQ(true, addDayOfWeekEnumToTypeDictionary(typeDictionary, enumDictionary));
+				EXPECT_EQ(true,	addDayOfWeekEnumToTypeDictionary(typeDictionary,	enumDictionary));
 
-    const DataType* dataType = typeDictionary->getDataType("DayOfWeek");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("DayOfWeek");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    // Print the duplicate CompositeDataType.
-    std::string s;
-    s = dataType->toString();
+				//	Print	the	duplicate	CompositeDataType.
+				std::string	s;
+				s	=	dataType->toString();
 
-    // Check the results.
-    EXPECT_EQ("enum {\nSunday = 1,\n"
-                      "Monday = 2,\n"
-                      "Tuesday = 3,\n"
-                      "Wednesday = 4,\n"
-                      "Thursday = 5,\n"
-                      "Friday = 6,\n"
-                      "Saturday = 7}\n",s);
+				//	Check	the	results.
+				EXPECT_EQ("enum	{\nSunday	=	1,\n"
+																						"Monday	=	2,\n"
+																						"Tuesday	=	3,\n"
+																						"Wednesday	=	4,\n"
+																						"Thursday	=	5,\n"
+																						"Friday	=	6,\n"
+																						"Saturday	=	7}\n",s);
 }
 
-TEST_F(EnumDataTypeTest, AssignValue ) {
+TEST_F(EnumDataTypeTest,	AssignValue	)	{
 
-    EXPECT_EQ(true, addDayOfWeekEnumToTypeDictionary( typeDictionary, enumDictionary));
+				EXPECT_EQ(true,	addDayOfWeekEnumToTypeDictionary(	typeDictionary,	enumDictionary));
 
-    const DataType* dataType = typeDictionary->getDataType("DayOfWeek");
-    ASSERT_TRUE(dataType != NULL) ;
+				const	DataType*	dataType	=	typeDictionary->getDataType("DayOfWeek");
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    DayOfWeek dayOfWeek = Sunday;
+				DayOfWeek	dayOfWeek	=	Sunday;
 
-    try {
-        int value = enumDictionary->getValue( "Wednesday" );
-        IntegerValue *integerValue = new IntegerValue( value );
-        dataType->assignValue( &dayOfWeek, integerValue );
-        delete integerValue;
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-    }
+				try	{
+								int	value	=	enumDictionary->getValue(	"Wednesday"	);
+								IntegerValue	*integerValue	=	new	IntegerValue(	value	);
+								dataType->assignValue(	&dayOfWeek,	integerValue	);
+								delete	integerValue;
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+				}
 
-    EXPECT_EQ(Wednesday, dayOfWeek);
+				EXPECT_EQ(Wednesday,	dayOfWeek);
 }
 
-TEST_F(EnumDataTypeTest, printValue ) {
+TEST_F(EnumDataTypeTest,	printValue	)	{
 
-    EXPECT_EQ(true, addDayOfWeekEnumToTypeDictionary( typeDictionary, enumDictionary));
+				EXPECT_EQ(true,	addDayOfWeekEnumToTypeDictionary(	typeDictionary,	enumDictionary));
 
-    const DataType* dataType = typeDictionary->getDataType("DayOfWeek");
+				const	DataType*	dataType	=	typeDictionary->getDataType("DayOfWeek");
 
-    ASSERT_TRUE(dataType != NULL) ;
+				ASSERT_TRUE(dataType	!=	NULL)	;
 
-    DayOfWeek dayOfWeek = Monday;
+				DayOfWeek	dayOfWeek	=	Monday;
 
-    std::stringstream ss;
+				std::stringstream	ss;
 
-    dataType->printValue(ss, &dayOfWeek);
+				dataType->printValue(ss,	&dayOfWeek);
 
-    int result = ss.str().compare("Monday");
+				int	result	=	ss.str().compare("Monday");
 
-    EXPECT_EQ(0, result);
+				EXPECT_EQ(0,	result);
 }
diff --git a/trick_source/sim_services/DataTypes/testing/LexicalAnalyzerTest.cpp b/trick_source/sim_services/DataTypes/testing/LexicalAnalyzerTest.cpp
index f73105877..2f1a5b970 100644
--- a/trick_source/sim_services/DataTypes/testing/LexicalAnalyzerTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/LexicalAnalyzerTest.cpp
@@ -1,58 +1,58 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include "LexicalAnalyzer.hh"
-#include <iostream>
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	"LexicalAnalyzer.hh"
+#include	<iostream>
 
-TEST(LexicalAnalyzer, test1) {
+TEST(LexicalAnalyzer,	test1)	{
 
-    Token::e token;
-    LexicalAnalyzer lexer;
+				Token::e	token;
+				LexicalAnalyzer	lexer;
 
-    lexer.load("float");
-    token = lexer.getToken();
-    EXPECT_EQ(Token::Float, token );
+				lexer.load("float");
+				token	=	lexer.getToken();
+				EXPECT_EQ(Token::Float,	token	);
 
-    token = lexer.nextToken();
-    EXPECT_EQ(Token::EndOfFile, token );
+				token	=	lexer.nextToken();
+				EXPECT_EQ(Token::EndOfFile,	token	);
 }
 
-TEST(LexicalAnalyzer, test2) {
+TEST(LexicalAnalyzer,	test2)	{
 
-    Token::e token;
-    LexicalAnalyzer lexer;
+				Token::e	token;
+				LexicalAnalyzer	lexer;
 
-    lexer.load("double(*)[123]");
+				lexer.load("double(*)[123]");
 
-    token = lexer.getToken();
+				token	=	lexer.getToken();
 
-    EXPECT_EQ(Token::Double, token );
+				EXPECT_EQ(Token::Double,	token	);
 
-    token = lexer.matchToken(Token::Double);
+				token	=	lexer.matchToken(Token::Double);
 
-    EXPECT_EQ(Token::LeftParen, token );
+				EXPECT_EQ(Token::LeftParen,	token	);
 
-    token = lexer.matchToken(Token::LeftParen);
+				token	=	lexer.matchToken(Token::LeftParen);
 
-    EXPECT_EQ(Token::Asterisk, token );
+				EXPECT_EQ(Token::Asterisk,	token	);
 
-    token = lexer.matchToken(Token::Asterisk);
+				token	=	lexer.matchToken(Token::Asterisk);
 
-    EXPECT_EQ(Token::RightParen, token );
+				EXPECT_EQ(Token::RightParen,	token	);
 
-    token = lexer.matchToken(Token::RightParen);
+				token	=	lexer.matchToken(Token::RightParen);
 
-    EXPECT_EQ(Token::LeftBracket, token );
+				EXPECT_EQ(Token::LeftBracket,	token	);
 
-    token = lexer.matchToken(Token::LeftBracket);
+				token	=	lexer.matchToken(Token::LeftBracket);
 
-    EXPECT_EQ(Token::Integer, token );
+				EXPECT_EQ(Token::Integer,	token	);
 
-    token = lexer.matchToken(Token::Integer);
+				token	=	lexer.matchToken(Token::Integer);
 
-    EXPECT_EQ(Token::RightBracket, token );
+				EXPECT_EQ(Token::RightBracket,	token	);
 
-    token = lexer.matchToken(Token::RightBracket);
+				token	=	lexer.matchToken(Token::RightBracket);
 
-    EXPECT_EQ(Token::EndOfFile, token );
+				EXPECT_EQ(Token::EndOfFile,	token	);
 }
 
diff --git a/trick_source/sim_services/DataTypes/testing/ParsedDeclarationTest.cpp b/trick_source/sim_services/DataTypes/testing/ParsedDeclarationTest.cpp
index 185fa31c7..025b9ddbe 100644
--- a/trick_source/sim_services/DataTypes/testing/ParsedDeclarationTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/ParsedDeclarationTest.cpp
@@ -1,119 +1,119 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include "ParsedDeclaration.hh"
-#include <iostream>
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	"ParsedDeclaration.hh"
+#include	<iostream>
 
-TEST(ParsedDeclaration, test1) {
+TEST(ParsedDeclaration,	test1)	{
 
-    std::cout << "TEST1: float*baz[3]" << std::endl;
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration("float*baz[3]");
+				std::cout	<<	"TEST1:	float*baz[3]"	<<	std::endl;
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration("float*baz[3]");
 
-    std::string typeSpecString = parsedDeclaration->getTypeSpecifier();
-    EXPECT_EQ( "float", typeSpecString );
+				std::string	typeSpecString	=	parsedDeclaration->getTypeSpecifier();
+				EXPECT_EQ(	"float",	typeSpecString	);
 
-    std::string varName = parsedDeclaration->getVariableName();
-    EXPECT_EQ( "baz", varName );
+				std::string	varName	=	parsedDeclaration->getVariableName();
+				EXPECT_EQ(	"baz",	varName	);
 
-    unsigned int ndims = parsedDeclaration->getNumberOfDimensions();
-    unsigned int dim_0 = parsedDeclaration->getDimensionSize(0);
-    unsigned int dim_1 = parsedDeclaration->getDimensionSize(1);
+				unsigned	int	ndims	=	parsedDeclaration->getNumberOfDimensions();
+				unsigned	int	dim_0	=	parsedDeclaration->getDimensionSize(0);
+				unsigned	int	dim_1	=	parsedDeclaration->getDimensionSize(1);
 
-    EXPECT_EQ( 2, ndims );
-    EXPECT_EQ( 3, dim_0 );
-    EXPECT_EQ(-1, dim_1 );
+				EXPECT_EQ(	2,	ndims	);
+				EXPECT_EQ(	3,	dim_0	);
+				EXPECT_EQ(-1,	dim_1	);
 }
 
 
-TEST(ParsedDeclaration, test2) {
+TEST(ParsedDeclaration,	test2)	{
 
-    std::cout << "TEST2: float(*)[3]" << std::endl;
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration("float(*)[3]");
+				std::cout	<<	"TEST2:	float(*)[3]"	<<	std::endl;
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration("float(*)[3]");
 
-    std::string typeSpecString = parsedDeclaration->getTypeSpecifier();
-    EXPECT_EQ( "float", typeSpecString );
+				std::string	typeSpecString	=	parsedDeclaration->getTypeSpecifier();
+				EXPECT_EQ(	"float",	typeSpecString	);
 
-    std::string varName = parsedDeclaration->getVariableName();
-    EXPECT_EQ( "", varName );
+				std::string	varName	=	parsedDeclaration->getVariableName();
+				EXPECT_EQ(	"",	varName	);
 
-    unsigned int ndims = parsedDeclaration->getNumberOfDimensions();
-    ASSERT_EQ( 2, ndims );
+				unsigned	int	ndims	=	parsedDeclaration->getNumberOfDimensions();
+				ASSERT_EQ(	2,	ndims	);
 
-    unsigned int dim_0 = parsedDeclaration->getDimensionSize(0);
-    unsigned int dim_1 = parsedDeclaration->getDimensionSize(1);
+				unsigned	int	dim_0	=	parsedDeclaration->getDimensionSize(0);
+				unsigned	int	dim_1	=	parsedDeclaration->getDimensionSize(1);
 
-    EXPECT_EQ(-1, dim_0 );
-    EXPECT_EQ( 3, dim_1 );
+				EXPECT_EQ(-1,	dim_0	);
+				EXPECT_EQ(	3,	dim_1	);
 }
 
 
-TEST(ParsedDeclaration, test3) {
+TEST(ParsedDeclaration,	test3)	{
 
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration("int**[3][4]");
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration("int**[3][4]");
 
-    std::string typeSpecString = parsedDeclaration->getTypeSpecifier();
-    EXPECT_EQ( "int", typeSpecString );
+				std::string	typeSpecString	=	parsedDeclaration->getTypeSpecifier();
+				EXPECT_EQ(	"int",	typeSpecString	);
 
-    std::string varName = parsedDeclaration->getVariableName();
-    EXPECT_EQ( "", varName );
+				std::string	varName	=	parsedDeclaration->getVariableName();
+				EXPECT_EQ(	"",	varName	);
 
-    unsigned int ndims = parsedDeclaration->getNumberOfDimensions();
-    ASSERT_EQ( 4, ndims );
+				unsigned	int	ndims	=	parsedDeclaration->getNumberOfDimensions();
+				ASSERT_EQ(	4,	ndims	);
 
-    unsigned int dim_0 = parsedDeclaration->getDimensionSize(0);
-    unsigned int dim_1 = parsedDeclaration->getDimensionSize(1);
-    unsigned int dim_2 = parsedDeclaration->getDimensionSize(2);
-    unsigned int dim_3 = parsedDeclaration->getDimensionSize(3);
+				unsigned	int	dim_0	=	parsedDeclaration->getDimensionSize(0);
+				unsigned	int	dim_1	=	parsedDeclaration->getDimensionSize(1);
+				unsigned	int	dim_2	=	parsedDeclaration->getDimensionSize(2);
+				unsigned	int	dim_3	=	parsedDeclaration->getDimensionSize(3);
 
-    EXPECT_EQ( 3, dim_0 );
-    EXPECT_EQ( 4, dim_1 );
-    EXPECT_EQ(-1, dim_2 );
-    EXPECT_EQ(-1, dim_3 );
+				EXPECT_EQ(	3,	dim_0	);
+				EXPECT_EQ(	4,	dim_1	);
+				EXPECT_EQ(-1,	dim_2	);
+				EXPECT_EQ(-1,	dim_3	);
 }
 
-TEST(ParsedDeclaration, test4) {
+TEST(ParsedDeclaration,	test4)	{
 
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration("int*(*foo)[3][4]");
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration("int*(*foo)[3][4]");
 
-    std::string typeSpecString = parsedDeclaration->getTypeSpecifier();
-    EXPECT_EQ( "int", typeSpecString );
+				std::string	typeSpecString	=	parsedDeclaration->getTypeSpecifier();
+				EXPECT_EQ(	"int",	typeSpecString	);
 
-    std::string varName = parsedDeclaration->getVariableName();
-    EXPECT_EQ( "foo", varName );
+				std::string	varName	=	parsedDeclaration->getVariableName();
+				EXPECT_EQ(	"foo",	varName	);
 
-    unsigned int ndims = parsedDeclaration->getNumberOfDimensions();
-    ASSERT_EQ( 4, ndims );
+				unsigned	int	ndims	=	parsedDeclaration->getNumberOfDimensions();
+				ASSERT_EQ(	4,	ndims	);
 
-    unsigned int dim_0 = parsedDeclaration->getDimensionSize(0);
-    unsigned int dim_1 = parsedDeclaration->getDimensionSize(1);
-    unsigned int dim_2 = parsedDeclaration->getDimensionSize(2);
-    unsigned int dim_3 = parsedDeclaration->getDimensionSize(3);
+				unsigned	int	dim_0	=	parsedDeclaration->getDimensionSize(0);
+				unsigned	int	dim_1	=	parsedDeclaration->getDimensionSize(1);
+				unsigned	int	dim_2	=	parsedDeclaration->getDimensionSize(2);
+				unsigned	int	dim_3	=	parsedDeclaration->getDimensionSize(3);
 
-    EXPECT_EQ(-1, dim_0 );
-    EXPECT_EQ( 3, dim_1 );
-    EXPECT_EQ( 4, dim_2 );
-    EXPECT_EQ(-1, dim_3 );
+				EXPECT_EQ(-1,	dim_0	);
+				EXPECT_EQ(	3,	dim_1	);
+				EXPECT_EQ(	4,	dim_2	);
+				EXPECT_EQ(-1,	dim_3	);
 }
 
-TEST(ParsedDeclaration, test5) {
+TEST(ParsedDeclaration,	test5)	{
 
-    ParsedDeclaration* parsedDeclaration = new ParsedDeclaration("int*(*)[3][4]");
+				ParsedDeclaration*	parsedDeclaration	=	new	ParsedDeclaration("int*(*)[3][4]");
 
-    std::string typeSpecString = parsedDeclaration->getTypeSpecifier();
-    EXPECT_EQ( "int", typeSpecString );
+				std::string	typeSpecString	=	parsedDeclaration->getTypeSpecifier();
+				EXPECT_EQ(	"int",	typeSpecString	);
 
-    std::string varName = parsedDeclaration->getVariableName();
-    EXPECT_EQ( "", varName );
+				std::string	varName	=	parsedDeclaration->getVariableName();
+				EXPECT_EQ(	"",	varName	);
 
-    unsigned int ndims = parsedDeclaration->getNumberOfDimensions();
-    ASSERT_EQ( 4, ndims );
+				unsigned	int	ndims	=	parsedDeclaration->getNumberOfDimensions();
+				ASSERT_EQ(	4,	ndims	);
 
-    unsigned int dim_0 = parsedDeclaration->getDimensionSize(0);
-    unsigned int dim_1 = parsedDeclaration->getDimensionSize(1);
-    unsigned int dim_2 = parsedDeclaration->getDimensionSize(2);
-    unsigned int dim_3 = parsedDeclaration->getDimensionSize(3);
+				unsigned	int	dim_0	=	parsedDeclaration->getDimensionSize(0);
+				unsigned	int	dim_1	=	parsedDeclaration->getDimensionSize(1);
+				unsigned	int	dim_2	=	parsedDeclaration->getDimensionSize(2);
+				unsigned	int	dim_3	=	parsedDeclaration->getDimensionSize(3);
 
-    EXPECT_EQ(-1, dim_0 );
-    EXPECT_EQ( 3, dim_1 );
-    EXPECT_EQ( 4, dim_2 );
-    EXPECT_EQ(-1, dim_3 );
+				EXPECT_EQ(-1,	dim_0	);
+				EXPECT_EQ(	3,	dim_1	);
+				EXPECT_EQ(	4,	dim_2	);
+				EXPECT_EQ(-1,	dim_3	);
 }
diff --git a/trick_source/sim_services/DataTypes/testing/PointerTypeSpecTest.cpp b/trick_source/sim_services/DataTypes/testing/PointerTypeSpecTest.cpp
index c40f70f68..b695706e3 100644
--- a/trick_source/sim_services/DataTypes/testing/PointerTypeSpecTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/PointerTypeSpecTest.cpp
@@ -1,230 +1,230 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-#include "TypeDictionary.hh"
-#include "PointerDataType.hh"
-#include "PointerValue.hh"
-
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+#include	"TypeDictionary.hh"
+#include	"PointerDataType.hh"
+#include	"PointerValue.hh"
+
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
-TEST( PointerDataType , constructor_exception ) {
+TEST(	PointerDataType	,	constructor_exception	)	{
 
-    // Attempt to create type a PointerDataType with 0 pointers.
-    // This attempt should throw an exception.
+				//	Attempt	to	create	type	a	PointerDataType	with	0	pointers.
+				//	This	attempt	should	throw	an	exception.
 
-    std::cout << "===== Expecting exception and corresponding message. =====" << std::endl;
+				std::cout	<<	"=====	Expecting	exception	and	corresponding	message.	====="	<<	std::endl;
 
-    PointerDataType * ptrTypeSpec;
-    bool constructor_result = true;
-    try {
-        ptrTypeSpec = new PointerDataType("double", 0);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
+				PointerDataType	*	ptrTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								ptrTypeSpec	=	new	PointerDataType("double",	0);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
 
-    // Verify that an exception was raised.
-    EXPECT_EQ(false, constructor_result);
+				//	Verify	that	an	exception	was	raised.
+				EXPECT_EQ(false,	constructor_result);
 
-    // Clean up.
-    if (constructor_result) {
-        delete ptrTypeSpec;
-    }
+				//	Clean	up.
+				if	(constructor_result)	{
+								delete	ptrTypeSpec;
+				}
 }
 
-TEST( PointerDataType, copy_constructor ) {
+TEST(	PointerDataType,	copy_constructor	)	{
 
-    // Create a PointerDataType.
-    PointerDataType* orig = new PointerDataType("float", 3);
+				//	Create	a	PointerDataType.
+				PointerDataType*	orig	=	new	PointerDataType("float",	3);
 
-    // Duplicate it.
-    PointerDataType* copy = new PointerDataType( *(const PointerDataType*)orig );
+				//	Duplicate	it.
+				PointerDataType*	copy	=	new	PointerDataType(	*(const	PointerDataType*)orig	);
 
-    // Verify that the duplicate PointerDataType is what we expect.
-    std::stringstream ss;
-    ss << copy->toString();
-    int result = ss.str().compare("float***");
-    EXPECT_EQ(0, result);
+				//	Verify	that	the	duplicate	PointerDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy->toString();
+				int	result	=	ss.str().compare("float***");
+				EXPECT_EQ(0,	result);
 
-    // Clean up.
-    delete copy;
-    delete orig;
+				//	Clean	up.
+				delete	copy;
+				delete	orig;
 }
 
-TEST( PointerDataType , operator_equal ) {
+TEST(	PointerDataType	,	operator_equal	)	{
 
-    // Create a PointerDataType.
-    PointerDataType* orig = new PointerDataType("long", 2);
+				//	Create	a	PointerDataType.
+				PointerDataType*	orig	=	new	PointerDataType("long",	2);
 
-    // Assign it to another PointerDataType.
-    PointerDataType copy = *(const PointerDataType*)orig;
+				//	Assign	it	to	another	PointerDataType.
+				PointerDataType	copy	=	*(const	PointerDataType*)orig;
 
-    // Verify that the assigned PointerDataType is what we expect.
-    std::stringstream ss;
-    ss << copy.toString();
-    int result = ss.str().compare("long**");
-    EXPECT_EQ(0, result);
+				//	Verify	that	the	assigned	PointerDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy.toString();
+				int	result	=	ss.str().compare("long**");
+				EXPECT_EQ(0,	result);
 
-    // Clean up.
-    delete orig;
+				//	Clean	up.
+				delete	orig;
 }
 
-TEST( PointerDataType , clone ) {
+TEST(	PointerDataType	,	clone	)	{
 
-    // Create a PointerDataType.
-    PointerDataType* orig = new PointerDataType("int", 2);
+				//	Create	a	PointerDataType.
+				PointerDataType*	orig	=	new	PointerDataType("int",	2);
 
-    // Clone it.
-    DataType * copy = orig->clone();
+				//	Clone	it.
+				DataType	*	copy	=	orig->clone();
 
-    // Verify that the cloned PointerDataType is what we expect.
-    std::stringstream ss;
-    ss << copy->toString();
-    int result = ss.str().compare("int**");
-    EXPECT_EQ(0, result);
+				//	Verify	that	the	cloned	PointerDataType	is	what	we	expect.
+				std::stringstream	ss;
+				ss	<<	copy->toString();
+				int	result	=	ss.str().compare("int**");
+				EXPECT_EQ(0,	result);
 
-    // Clean up.
-    delete orig;
-    delete copy;
+				//	Clean	up.
+				delete	orig;
+				delete	copy;
 }
 
-TEST( PointerDataType , getSize ) {
+TEST(	PointerDataType	,	getSize	)	{
 
-    // Create a PointerDataType.
-    PointerDataType* ptrTypeSpec = new PointerDataType("long", 2);
+				//	Create	a	PointerDataType.
+				PointerDataType*	ptrTypeSpec	=	new	PointerDataType("long",	2);
 
-    // Verify that getSize returns the size of a pointer.
-    EXPECT_EQ( sizeof(void*), ptrTypeSpec->getSize());
+				//	Verify	that	getSize	returns	the	size	of	a	pointer.
+				EXPECT_EQ(	sizeof(void*),	ptrTypeSpec->getSize());
 }
 
-TEST( PointerDataType , assignValue ) {
+TEST(	PointerDataType	,	assignValue	)	{
 
-    double d = 1.2345;
-    double * d_ptr;
+				double	d	=	1.2345;
+				double	*	d_ptr;
 
-    // Create a PointerDataType.
-    PointerDataType* ptrTypeSpec = new PointerDataType("double", 1);
+				//	Create	a	PointerDataType.
+				PointerDataType*	ptrTypeSpec	=	new	PointerDataType("double",	1);
 
-    PointerValue * ptrValue = new PointerValue(&d);
-    ptrTypeSpec->assignValue(&d_ptr, ptrValue);
+				PointerValue	*	ptrValue	=	new	PointerValue(&d);
+				ptrTypeSpec->assignValue(&d_ptr,	ptrValue);
 
-    EXPECT_EQ(1.2345, *d_ptr);
+				EXPECT_EQ(1.2345,	*d_ptr);
 }
 
-TEST( PointerDataType , printValue ) {
+TEST(	PointerDataType	,	printValue	)	{
 
-    double * d_ptr = (double*)0x12345678;
+				double	*	d_ptr	=	(double*)0x12345678;
 
-    // Create a PointerDataType.
-    PointerDataType* ptrTypeSpec = new PointerDataType("double", 1);
+				//	Create	a	PointerDataType.
+				PointerDataType*	ptrTypeSpec	=	new	PointerDataType("double",	1);
 
-    // Verify that printValue prints the value that we expect.
-    std::stringstream ss;
-    ptrTypeSpec->printValue(ss, &d_ptr);
-    int result = ss.str().compare("0x12345678");
+				//	Verify	that	printValue	prints	the	value	that	we	expect.
+				std::stringstream	ss;
+				ptrTypeSpec->printValue(ss,	&d_ptr);
+				int	result	=	ss.str().compare("0x12345678");
 
-    EXPECT_EQ(0, result);
+				EXPECT_EQ(0,	result);
 }
 
-TEST( PointerDataType , validate_1 ) {
+TEST(	PointerDataType	,	validate_1	)	{
 
-    // Create a PointerDataType.
-    PointerDataType* ptrTypeSpec = new PointerDataType("double", 1);
+				//	Create	a	PointerDataType.
+				PointerDataType*	ptrTypeSpec	=	new	PointerDataType("double",	1);
 
-    // Validate the Type.
-    bool validation_result = ptrTypeSpec->validate();
+				//	Validate	the	Type.
+				bool	validation_result	=	ptrTypeSpec->validate();
 
-    // Verify that validation succeeded.
-    ASSERT_EQ(true, validation_result);
+				//	Verify	that	validation	succeeded.
+				ASSERT_EQ(true,	validation_result);
 
 }
 
-TEST( PointerDataType , validate_2 ) {
+TEST(	PointerDataType	,	validate_2	)	{
 
-    std::cout << "===== Expecting an error message about an undefined type. =====" << std::endl;
+				std::cout	<<	"=====	Expecting	an	error	message	about	an	undefined	type.	====="	<<	std::endl;
 
-    // Create a PointerDataType.
-    PointerDataType* ptrTypeSpec = new PointerDataType("Undefined_Type", 1);
+				//	Create	a	PointerDataType.
+				PointerDataType*	ptrTypeSpec	=	new	PointerDataType("Undefined_Type",	1);
 
-    // Validate the Type.
-    bool validation_result = ptrTypeSpec->validate();
+				//	Validate	the	Type.
+				bool	validation_result	=	ptrTypeSpec->validate();
 
-    // Verify that validation failed.
-    ASSERT_EQ(false, validation_result);
+				//	Verify	that	validation	failed.
+				ASSERT_EQ(false,	validation_result);
 
 }
 
-TEST( PointerDataType , getDereferencedType_1 ) {
-
-    // Create type: double**
-    PointerDataType * ptrTypeSpec;
-    bool constructor_result = true;
-    try {
-        ptrTypeSpec = new PointerDataType("double", 2);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
-    ASSERT_EQ(true, constructor_result);
-
-    // Validate the Type.
-    bool validation_result = ptrTypeSpec->validate();
-    ASSERT_EQ(true, validation_result);
-
-    // Dereference the type.
-    const DataType * dereferencedPtrTypeSpec;
-    bool  dereference_result = true;
-    try {
-        dereferencedPtrTypeSpec = ptrTypeSpec->getDereferencedType();
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        dereference_result = false;
-    }
-    ASSERT_EQ(true, dereference_result);
-
-    // Result of the dereference should be: double*
-    std::stringstream ss;
-    ss << dereferencedPtrTypeSpec->toString();
-    int comparision_result = ss.str().compare("double*");
-
-    EXPECT_EQ(0, comparision_result);
+TEST(	PointerDataType	,	getDereferencedType_1	)	{
+
+				//	Create	type:	double**
+				PointerDataType	*	ptrTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								ptrTypeSpec	=	new	PointerDataType("double",	2);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
+				ASSERT_EQ(true,	constructor_result);
+
+				//	Validate	the	Type.
+				bool	validation_result	=	ptrTypeSpec->validate();
+				ASSERT_EQ(true,	validation_result);
+
+				//	Dereference	the	type.
+				const	DataType	*	dereferencedPtrTypeSpec;
+				bool		dereference_result	=	true;
+				try	{
+								dereferencedPtrTypeSpec	=	ptrTypeSpec->getDereferencedType();
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								dereference_result	=	false;
+				}
+				ASSERT_EQ(true,	dereference_result);
+
+				//	Result	of	the	dereference	should	be:	double*
+				std::stringstream	ss;
+				ss	<<	dereferencedPtrTypeSpec->toString();
+				int	comparision_result	=	ss.str().compare("double*");
+
+				EXPECT_EQ(0,	comparision_result);
 
 }
 
-TEST( PointerDataType , getDereferencedType_2 ) {
-
-    // Create type: double*
-    PointerDataType * ptrTypeSpec;
-    bool constructor_result = true;
-    try {
-        ptrTypeSpec = new PointerDataType("double", 1);
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        constructor_result = false;
-    }
-    ASSERT_EQ(true, constructor_result);
-
-    // Validate the Type.
-    bool validation_result = ptrTypeSpec->validate();
-    ASSERT_EQ(true, validation_result);
-
-    // Dereference the type.
-    const DataType * dereferencedPtrTypeSpec;
-    bool  dereference_result = true;
-    try {
-        dereferencedPtrTypeSpec = ptrTypeSpec->getDereferencedType();
-    } catch ( std::logic_error e ) {
-        std::cerr << e.what();
-        dereference_result = false;
-    }
-    ASSERT_EQ(true, dereference_result);
-
-    // Result of the dereference should be: double
-    std::stringstream ss;
-    ss << dereferencedPtrTypeSpec->toString();
-    int comparision_result = ss.str().compare("double");
-
-    EXPECT_EQ(0, comparision_result);
+TEST(	PointerDataType	,	getDereferencedType_2	)	{
+
+				//	Create	type:	double*
+				PointerDataType	*	ptrTypeSpec;
+				bool	constructor_result	=	true;
+				try	{
+								ptrTypeSpec	=	new	PointerDataType("double",	1);
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								constructor_result	=	false;
+				}
+				ASSERT_EQ(true,	constructor_result);
+
+				//	Validate	the	Type.
+				bool	validation_result	=	ptrTypeSpec->validate();
+				ASSERT_EQ(true,	validation_result);
+
+				//	Dereference	the	type.
+				const	DataType	*	dereferencedPtrTypeSpec;
+				bool		dereference_result	=	true;
+				try	{
+								dereferencedPtrTypeSpec	=	ptrTypeSpec->getDereferencedType();
+				}	catch	(	std::logic_error	e	)	{
+								std::cerr	<<	e.what();
+								dereference_result	=	false;
+				}
+				ASSERT_EQ(true,	dereference_result);
+
+				//	Result	of	the	dereference	should	be:	double
+				std::stringstream	ss;
+				ss	<<	dereferencedPtrTypeSpec->toString();
+				int	comparision_result	=	ss.str().compare("double");
+
+				EXPECT_EQ(0,	comparision_result);
 }
diff --git a/trick_source/sim_services/DataTypes/testing/PrimTypeSpecTest.cpp b/trick_source/sim_services/DataTypes/testing/PrimTypeSpecTest.cpp
index a14f57eac..b639dbc5d 100644
--- a/trick_source/sim_services/DataTypes/testing/PrimTypeSpecTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/PrimTypeSpecTest.cpp
@@ -1,529 +1,529 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <iostream>
-#include "TypeDictionary.hh"
-#include "PrimitiveDataType.hh"
-
-class PrimitiveDataTypeTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    PrimitiveDataTypeTest() { typeDictionary = new TypeDictionary; }
-    ~PrimitiveDataTypeTest() { delete typeDictionary; }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	<iostream>
+#include	"TypeDictionary.hh"
+#include	"PrimitiveDataType.hh"
+
+class	PrimitiveDataTypeTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				PrimitiveDataTypeTest()	{	typeDictionary	=	new	TypeDictionary;	}
+				~PrimitiveDataTypeTest()	{	delete	typeDictionary;	}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
-template <typename T>
-void validate_getSize(size_t expectedSize) {
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    size_t test_result = primTypeSpec->getSize();
-    delete primTypeSpec;
-    EXPECT_EQ(expectedSize, test_result);
-}
-
-template <typename T>
-void validate_printValue(T& testVar, const char* expectedString) {
-    std::stringstream ss;
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    primTypeSpec->printValue(ss, &testVar);
-    int result = ss.str().compare(expectedString);
-    delete primTypeSpec;
-    EXPECT_EQ(0, result);
-}
-
-template <typename T>
-void validate_toString(const char* expectedString) {
-    std::string s;
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    s = primTypeSpec->toString();
-    int result = s.compare(expectedString);
-    delete primTypeSpec;
-    EXPECT_EQ(0, result);
-}
-
-template <typename T>
-void validate_isFloatingPoint(bool expectedResult) {
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    bool result = primTypeSpec->isFloatingPoint();
-    delete primTypeSpec;
-    EXPECT_EQ(expectedResult, result);
-}
-
-template <typename T>
-void validate_isSigned(bool expectedResult) {
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    bool result = primTypeSpec->isSigned();
-    delete primTypeSpec;
-    EXPECT_EQ(expectedResult, result);
-}
-
-template <typename T>
-void validate_isVoid(bool expectedResult) {
-    PrimitiveDataType<T> * primTypeSpec = new PrimitiveDataType<T>();
-    bool result = primTypeSpec->isVoid();
-    delete primTypeSpec;
-    EXPECT_EQ(expectedResult, result);
-}
-
-/* ================================================================================
-                                         Test Cases
-   ================================================================================
+template	<typename	T>
+void	validate_getSize(size_t	expectedSize)	{
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				size_t	test_result	=	primTypeSpec->getSize();
+				delete	primTypeSpec;
+				EXPECT_EQ(expectedSize,	test_result);
+}
+
+template	<typename	T>
+void	validate_printValue(T&	testVar,	const	char*	expectedString)	{
+				std::stringstream	ss;
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				primTypeSpec->printValue(ss,	&testVar);
+				int	result	=	ss.str().compare(expectedString);
+				delete	primTypeSpec;
+				EXPECT_EQ(0,	result);
+}
+
+template	<typename	T>
+void	validate_toString(const	char*	expectedString)	{
+				std::string	s;
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				s	=	primTypeSpec->toString();
+				int	result	=	s.compare(expectedString);
+				delete	primTypeSpec;
+				EXPECT_EQ(0,	result);
+}
+
+template	<typename	T>
+void	validate_isFloatingPoint(bool	expectedResult)	{
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				bool	result	=	primTypeSpec->isFloatingPoint();
+				delete	primTypeSpec;
+				EXPECT_EQ(expectedResult,	result);
+}
+
+template	<typename	T>
+void	validate_isSigned(bool	expectedResult)	{
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				bool	result	=	primTypeSpec->isSigned();
+				delete	primTypeSpec;
+				EXPECT_EQ(expectedResult,	result);
+}
+
+template	<typename	T>
+void	validate_isVoid(bool	expectedResult)	{
+				PrimitiveDataType<T>	*	primTypeSpec	=	new	PrimitiveDataType<T>();
+				bool	result	=	primTypeSpec->isVoid();
+				delete	primTypeSpec;
+				EXPECT_EQ(expectedResult,	result);
+}
+
+/*	================================================================================
+																																									Test	Cases
+			================================================================================
 */
-TEST_F(PrimitiveDataTypeTest, validate ) {
+TEST_F(PrimitiveDataTypeTest,	validate	)	{
 
-    /* PrimitiveDataType is always valid, because it is a fundemental, builtin type. */
-    PrimitiveDataType<char> * primTypeSpec = new PrimitiveDataType<char>();
+				/*	PrimitiveDataType	is	always	valid,	because	it	is	a	fundemental,	builtin	type.	*/
+				PrimitiveDataType<char>	*	primTypeSpec	=	new	PrimitiveDataType<char>();
 
-    bool test_result;
-    test_result = primTypeSpec->validate();
+				bool	test_result;
+				test_result	=	primTypeSpec->validate();
 
-    EXPECT_EQ(true, test_result);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_void) {
-    validate_getSize<void>(0);
+TEST_F(PrimitiveDataTypeTest,	getSize_void)	{
+				validate_getSize<void>(0);
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_char) {
-    validate_getSize<char>((int)sizeof(char));
+TEST_F(PrimitiveDataTypeTest,	getSize_char)	{
+				validate_getSize<char>((int)sizeof(char));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_short) {
-    validate_getSize<short>((int)sizeof(short));
+TEST_F(PrimitiveDataTypeTest,	getSize_short)	{
+				validate_getSize<short>((int)sizeof(short));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_int) {
-    validate_getSize<int>((int)sizeof(int));
+TEST_F(PrimitiveDataTypeTest,	getSize_int)	{
+				validate_getSize<int>((int)sizeof(int));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_long) {
-    validate_getSize<long>((int)sizeof(long));
+TEST_F(PrimitiveDataTypeTest,	getSize_long)	{
+				validate_getSize<long>((int)sizeof(long));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_long_long) {
-    validate_getSize<long long>((int)sizeof(long long));
+TEST_F(PrimitiveDataTypeTest,	getSize_long_long)	{
+				validate_getSize<long	long>((int)sizeof(long	long));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_unsigned_char) {
-    validate_getSize<unsigned char>((int)sizeof(unsigned char));
+TEST_F(PrimitiveDataTypeTest,	getSize_unsigned_char)	{
+				validate_getSize<unsigned	char>((int)sizeof(unsigned	char));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_unsigned_short) {
-    validate_getSize<unsigned short>((int)sizeof(unsigned short));
+TEST_F(PrimitiveDataTypeTest,	getSize_unsigned_short)	{
+				validate_getSize<unsigned	short>((int)sizeof(unsigned	short));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_unsigned_int) {
-    validate_getSize<unsigned int>((int)sizeof(unsigned int));
+TEST_F(PrimitiveDataTypeTest,	getSize_unsigned_int)	{
+				validate_getSize<unsigned	int>((int)sizeof(unsigned	int));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_unsigned_long) {
-    validate_getSize<unsigned long>((int)sizeof(unsigned long));
+TEST_F(PrimitiveDataTypeTest,	getSize_unsigned_long)	{
+				validate_getSize<unsigned	long>((int)sizeof(unsigned	long));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_unsigned_long_long) {
-    validate_getSize<unsigned long long>((int)sizeof(unsigned long long));
+TEST_F(PrimitiveDataTypeTest,	getSize_unsigned_long_long)	{
+				validate_getSize<unsigned	long	long>((int)sizeof(unsigned	long	long));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_wchar_t) {
-    validate_getSize<wchar_t>((int)sizeof(wchar_t));
+TEST_F(PrimitiveDataTypeTest,	getSize_wchar_t)	{
+				validate_getSize<wchar_t>((int)sizeof(wchar_t));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_float) {
-    validate_getSize<float>((int)sizeof(float));
+TEST_F(PrimitiveDataTypeTest,	getSize_float)	{
+				validate_getSize<float>((int)sizeof(float));
 }
 
-TEST_F(PrimitiveDataTypeTest, getSize_double) {
-    validate_getSize<double>((int)sizeof(double));
+TEST_F(PrimitiveDataTypeTest,	getSize_double)	{
+				validate_getSize<double>((int)sizeof(double));
 }
 
-// -----------------------------------------------------------------------------------------
-//                                    assignValue tests
-// -----------------------------------------------------------------------------------------
+//	-----------------------------------------------------------------------------------------
+//																																				assignValue	tests
+//	-----------------------------------------------------------------------------------------
 
-TEST_F(PrimitiveDataTypeTest, assignValue_char) {
-    char test_var = '\0';
-    PrimitiveDataType<char> * primTypeSpec = new PrimitiveDataType<char>();
-    IntegerValue * value = new IntegerValue((int)'A');
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ('A', test_var);
+TEST_F(PrimitiveDataTypeTest,	assignValue_char)	{
+				char	test_var	=	'\0';
+				PrimitiveDataType<char>	*	primTypeSpec	=	new	PrimitiveDataType<char>();
+				IntegerValue	*	value	=	new	IntegerValue((int)'A');
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ('A',	test_var);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_short) {
-    short test_var = 0;
-    PrimitiveDataType<short> * primTypeSpec = new PrimitiveDataType<short>();
-    IntegerValue * value = new IntegerValue(314);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ(314, test_var);
+TEST_F(PrimitiveDataTypeTest,	assignValue_short)	{
+				short	test_var	=	0;
+				PrimitiveDataType<short>	*	primTypeSpec	=	new	PrimitiveDataType<short>();
+				IntegerValue	*	value	=	new	IntegerValue(314);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ(314,	test_var);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_int) {
-    int test_var = 0;
-    PrimitiveDataType<int> * primTypeSpec = new PrimitiveDataType<int>();
-    IntegerValue * value = new IntegerValue(723);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ(723, test_var);
+TEST_F(PrimitiveDataTypeTest,	assignValue_int)	{
+				int	test_var	=	0;
+				PrimitiveDataType<int>	*	primTypeSpec	=	new	PrimitiveDataType<int>();
+				IntegerValue	*	value	=	new	IntegerValue(723);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ(723,	test_var);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_long) {
-    long test_var = 0;
-    PrimitiveDataType<long> * primTypeSpec = new PrimitiveDataType<long>();
-    IntegerValue * value = new IntegerValue(723);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ(723, test_var);
+TEST_F(PrimitiveDataTypeTest,	assignValue_long)	{
+				long	test_var	=	0;
+				PrimitiveDataType<long>	*	primTypeSpec	=	new	PrimitiveDataType<long>();
+				IntegerValue	*	value	=	new	IntegerValue(723);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ(723,	test_var);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_long_long) {
-    long long test_var = 0;
-    PrimitiveDataType<long long> * primTypeSpec = new PrimitiveDataType<long long>();
-    IntegerValue * value = new IntegerValue(723);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ(723, test_var);
+TEST_F(PrimitiveDataTypeTest,	assignValue_long_long)	{
+				long	long	test_var	=	0;
+				PrimitiveDataType<long	long>	*	primTypeSpec	=	new	PrimitiveDataType<long	long>();
+				IntegerValue	*	value	=	new	IntegerValue(723);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ(723,	test_var);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_float) {
-    float test_var = 0.0;
-    PrimitiveDataType<float> * primTypeSpec = new PrimitiveDataType<float>();
-    FloatingPointValue * value = new FloatingPointValue(2.7182818);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_NEAR(2.7182818, test_var, 0.000001);
+TEST_F(PrimitiveDataTypeTest,	assignValue_float)	{
+				float	test_var	=	0.0;
+				PrimitiveDataType<float>	*	primTypeSpec	=	new	PrimitiveDataType<float>();
+				FloatingPointValue	*	value	=	new	FloatingPointValue(2.7182818);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_NEAR(2.7182818,	test_var,	0.000001);
 }
 
-TEST_F(PrimitiveDataTypeTest, assignValue_double) {
-    double test_var = 0.0;
-    PrimitiveDataType<double> * primTypeSpec = new PrimitiveDataType<double>();
-    FloatingPointValue * value = new FloatingPointValue(3.1415927);
-    primTypeSpec->assignValue(&test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_NEAR(3.1415927, test_var, 0.000001);
+TEST_F(PrimitiveDataTypeTest,	assignValue_double)	{
+				double	test_var	=	0.0;
+				PrimitiveDataType<double>	*	primTypeSpec	=	new	PrimitiveDataType<double>();
+				FloatingPointValue	*	value	=	new	FloatingPointValue(3.1415927);
+				primTypeSpec->assignValue(&test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_NEAR(3.1415927,	test_var,	0.000001);
 }
 
-// -----------------------------------------------------------------------------------------
-//                                    printValue tests
-// -----------------------------------------------------------------------------------------
-TEST_F(PrimitiveDataTypeTest, printValue_char ) {
-    char testVar = 'B';
-    validate_printValue(testVar, "'B'");
+//	-----------------------------------------------------------------------------------------
+//																																				printValue	tests
+//	-----------------------------------------------------------------------------------------
+TEST_F(PrimitiveDataTypeTest,	printValue_char	)	{
+				char	testVar	=	'B';
+				validate_printValue(testVar,	"'B'");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_char_2 ) {
-    /* Unprintable chars. */
-    char testVar = '\01';
-    validate_printValue(testVar, "1");
+TEST_F(PrimitiveDataTypeTest,	printValue_char_2	)	{
+				/*	Unprintable	chars.	*/
+				char	testVar	=	'\01';
+				validate_printValue(testVar,	"1");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_short ) {
-    short testVar = -1234;
-    validate_printValue(testVar, "-1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_short	)	{
+				short	testVar	=	-1234;
+				validate_printValue(testVar,	"-1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_int ) {
-    int testVar = -1234;
-    validate_printValue(testVar, "-1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_int	)	{
+				int	testVar	=	-1234;
+				validate_printValue(testVar,	"-1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_long ) {
-    long testVar = -1234;
-    validate_printValue(testVar, "-1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_long	)	{
+				long	testVar	=	-1234;
+				validate_printValue(testVar,	"-1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_long_long ) {
-    long long testVar = -1234;
-    validate_printValue(testVar, "-1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_long_long	)	{
+				long	long	testVar	=	-1234;
+				validate_printValue(testVar,	"-1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_unsigned_char ) {
-    unsigned char testVar = 'B';
-    validate_printValue(testVar, "'B'");
+TEST_F(PrimitiveDataTypeTest,	printValue_unsigned_char	)	{
+				unsigned	char	testVar	=	'B';
+				validate_printValue(testVar,	"'B'");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_unsigned_short ) {
-    unsigned short testVar = 1234;
-    validate_printValue(testVar, "1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_unsigned_short	)	{
+				unsigned	short	testVar	=	1234;
+				validate_printValue(testVar,	"1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_unsigned_int ) {
-    unsigned int testVar = 1234;
-    validate_printValue(testVar, "1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_unsigned_int	)	{
+				unsigned	int	testVar	=	1234;
+				validate_printValue(testVar,	"1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_unsigned_long ) {
-    unsigned long testVar = 1234;
-    validate_printValue(testVar, "1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_unsigned_long	)	{
+				unsigned	long	testVar	=	1234;
+				validate_printValue(testVar,	"1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_unsigned_long_long ) {
-    unsigned long long testVar = 1234;
-    validate_printValue(testVar, "1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_unsigned_long_long	)	{
+				unsigned	long	long	testVar	=	1234;
+				validate_printValue(testVar,	"1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_wchar_t ) {
-    wchar_t testVar = 1234;
-    validate_printValue(testVar, "1234");
+TEST_F(PrimitiveDataTypeTest,	printValue_wchar_t	)	{
+				wchar_t	testVar	=	1234;
+				validate_printValue(testVar,	"1234");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_float ) {
-    float testVar = 3.14159;
-    validate_printValue(testVar, "3.14159");
+TEST_F(PrimitiveDataTypeTest,	printValue_float	)	{
+				float	testVar	=	3.14159;
+				validate_printValue(testVar,	"3.14159");
 }
 
-TEST_F(PrimitiveDataTypeTest, printValue_double ) {
-    double testVar = 3.14159;
-    validate_printValue(testVar, "3.14159");
+TEST_F(PrimitiveDataTypeTest,	printValue_double	)	{
+				double	testVar	=	3.14159;
+				validate_printValue(testVar,	"3.14159");
 }
 
-// -----------------------------------------------------------------------------------------
-//                                    toString tests
-// -----------------------------------------------------------------------------------------
-TEST_F(PrimitiveDataTypeTest, toString_void ) {
-    validate_toString<void>("void");
+//	-----------------------------------------------------------------------------------------
+//																																				toString	tests
+//	-----------------------------------------------------------------------------------------
+TEST_F(PrimitiveDataTypeTest,	toString_void	)	{
+				validate_toString<void>("void");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_char ) {
-    validate_toString<char>("char");
+TEST_F(PrimitiveDataTypeTest,	toString_char	)	{
+				validate_toString<char>("char");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_short ) {
-    validate_toString<short>("short");
+TEST_F(PrimitiveDataTypeTest,	toString_short	)	{
+				validate_toString<short>("short");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_int ) {
-    validate_toString<int>("int");
+TEST_F(PrimitiveDataTypeTest,	toString_int	)	{
+				validate_toString<int>("int");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_long ) {
-    validate_toString<long>("long");
+TEST_F(PrimitiveDataTypeTest,	toString_long	)	{
+				validate_toString<long>("long");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_long_long ) {
-    validate_toString<long long>("long long");
+TEST_F(PrimitiveDataTypeTest,	toString_long_long	)	{
+				validate_toString<long	long>("long	long");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_unsigned_char ) {
-    validate_toString<unsigned char>("unsigned char");
+TEST_F(PrimitiveDataTypeTest,	toString_unsigned_char	)	{
+				validate_toString<unsigned	char>("unsigned	char");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_unsigned_short ) {
-    validate_toString<unsigned short>("unsigned short");
+TEST_F(PrimitiveDataTypeTest,	toString_unsigned_short	)	{
+				validate_toString<unsigned	short>("unsigned	short");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_unsigned_int ) {
-    validate_toString<unsigned int>("unsigned int");
+TEST_F(PrimitiveDataTypeTest,	toString_unsigned_int	)	{
+				validate_toString<unsigned	int>("unsigned	int");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_unsigned_long ) {
-    validate_toString<unsigned long>("unsigned long");
+TEST_F(PrimitiveDataTypeTest,	toString_unsigned_long	)	{
+				validate_toString<unsigned	long>("unsigned	long");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_unsigned_long_long ) {
-    validate_toString<unsigned long long>("unsigned long long");
+TEST_F(PrimitiveDataTypeTest,	toString_unsigned_long_long	)	{
+				validate_toString<unsigned	long	long>("unsigned	long	long");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_wchar_t ) {
-    validate_toString<wchar_t>("wchar_t");
+TEST_F(PrimitiveDataTypeTest,	toString_wchar_t	)	{
+				validate_toString<wchar_t>("wchar_t");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_float ) {
-    validate_toString<float>("float");
+TEST_F(PrimitiveDataTypeTest,	toString_float	)	{
+				validate_toString<float>("float");
 }
 
-TEST_F(PrimitiveDataTypeTest, toString_double ) {
-    validate_toString<double>("double");
+TEST_F(PrimitiveDataTypeTest,	toString_double	)	{
+				validate_toString<double>("double");
 }
 
-// -----------------------------------------------------------------------------------------
-//                                    isFloatingPoint tests
-// -----------------------------------------------------------------------------------------
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_void ) {
-    validate_isFloatingPoint<void>(false);
+//	-----------------------------------------------------------------------------------------
+//																																				isFloatingPoint	tests
+//	-----------------------------------------------------------------------------------------
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_void	)	{
+				validate_isFloatingPoint<void>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_char ) {
-    validate_isFloatingPoint<char>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_char	)	{
+				validate_isFloatingPoint<char>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_short ) {
-    validate_isFloatingPoint<short>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_short	)	{
+				validate_isFloatingPoint<short>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_int ) {
-    validate_isFloatingPoint<int>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_int	)	{
+				validate_isFloatingPoint<int>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_long ) {
-    validate_isFloatingPoint<long>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_long	)	{
+				validate_isFloatingPoint<long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_long_long ) {
-    validate_isFloatingPoint<long long>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_long_long	)	{
+				validate_isFloatingPoint<long	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_unsigned_char ) {
-    validate_isFloatingPoint<unsigned char>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_unsigned_char	)	{
+				validate_isFloatingPoint<unsigned	char>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_unsigned_short ) {
-    validate_isFloatingPoint<unsigned short>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_unsigned_short	)	{
+				validate_isFloatingPoint<unsigned	short>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_unsigned_int ) {
-    validate_isFloatingPoint<unsigned int>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_unsigned_int	)	{
+				validate_isFloatingPoint<unsigned	int>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_unsigned_long ) {
-    validate_isFloatingPoint<unsigned long>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_unsigned_long	)	{
+				validate_isFloatingPoint<unsigned	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_unsigned_long_long ) {
-    validate_isFloatingPoint<unsigned long long>(false);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_unsigned_long_long	)	{
+				validate_isFloatingPoint<unsigned	long	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_float ) {
-    validate_isFloatingPoint<float>(true);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_float	)	{
+				validate_isFloatingPoint<float>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isFloatingPoint_double ) {
-    validate_isFloatingPoint<double>(true);
+TEST_F(PrimitiveDataTypeTest,	isFloatingPoint_double	)	{
+				validate_isFloatingPoint<double>(true);
 }
 
-// -----------------------------------------------------------------------------------------
-//                                  isSigned tests
-// -----------------------------------------------------------------------------------------
-TEST_F(PrimitiveDataTypeTest, isSigned_void ) {
-    validate_isSigned<void>(false);
+//	-----------------------------------------------------------------------------------------
+//																																		isSigned	tests
+//	-----------------------------------------------------------------------------------------
+TEST_F(PrimitiveDataTypeTest,	isSigned_void	)	{
+				validate_isSigned<void>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_char ) {
-    validate_isSigned<char>(true);
+TEST_F(PrimitiveDataTypeTest,	isSigned_char	)	{
+				validate_isSigned<char>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_short ) {
-    validate_isSigned<short>(true);
+TEST_F(PrimitiveDataTypeTest,	isSigned_short	)	{
+				validate_isSigned<short>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_int ) {
-    validate_isSigned<int>(true);
+TEST_F(PrimitiveDataTypeTest,	isSigned_int	)	{
+				validate_isSigned<int>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_long ) {
-    validate_isSigned<long>(true);
+TEST_F(PrimitiveDataTypeTest,	isSigned_long	)	{
+				validate_isSigned<long>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_long_long ) {
-    validate_isSigned<long long>(true);
+TEST_F(PrimitiveDataTypeTest,	isSigned_long_long	)	{
+				validate_isSigned<long	long>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_unsigned_char ) {
-    validate_isSigned<unsigned char>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_unsigned_char	)	{
+				validate_isSigned<unsigned	char>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_unsigned_short ) {
-    validate_isSigned<unsigned short>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_unsigned_short	)	{
+				validate_isSigned<unsigned	short>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_unsigned_int ) {
-    validate_isSigned<unsigned int>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_unsigned_int	)	{
+				validate_isSigned<unsigned	int>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_unsigned_long ) {
-    validate_isSigned<unsigned long>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_unsigned_long	)	{
+				validate_isSigned<unsigned	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_unsigned_long_long ) {
-    validate_isSigned<unsigned long long>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_unsigned_long_long	)	{
+				validate_isSigned<unsigned	long	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_wchar_t ) {
-    validate_isSigned<wchar_t>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_wchar_t	)	{
+				validate_isSigned<wchar_t>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_float ) {
-    validate_isSigned<float>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_float	)	{
+				validate_isSigned<float>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isSigned_double ) {
-    validate_isSigned<double>(false);
+TEST_F(PrimitiveDataTypeTest,	isSigned_double	)	{
+				validate_isSigned<double>(false);
 }
 
-// -----------------------------------------------------------------------------------------
-//                                  isVoid tests
-// -----------------------------------------------------------------------------------------
-TEST_F(PrimitiveDataTypeTest, isVoid_void ) {
-    validate_isVoid<void>(true);
+//	-----------------------------------------------------------------------------------------
+//																																		isVoid	tests
+//	-----------------------------------------------------------------------------------------
+TEST_F(PrimitiveDataTypeTest,	isVoid_void	)	{
+				validate_isVoid<void>(true);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_char ) {
-    validate_isVoid<char>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_char	)	{
+				validate_isVoid<char>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_short ) {
-    validate_isVoid<short>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_short	)	{
+				validate_isVoid<short>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_int ) {
-    validate_isVoid<int>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_int	)	{
+				validate_isVoid<int>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_long ) {
-    validate_isVoid<long>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_long	)	{
+				validate_isVoid<long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_long_long ) {
-    validate_isVoid<long long>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_long_long	)	{
+				validate_isVoid<long	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_unsigned_char ) {
-    validate_isVoid<unsigned char>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_unsigned_char	)	{
+				validate_isVoid<unsigned	char>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_unsigned_short ) {
-    validate_isVoid<unsigned short>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_unsigned_short	)	{
+				validate_isVoid<unsigned	short>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_unsigned_int ) {
-    validate_isVoid<unsigned int>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_unsigned_int	)	{
+				validate_isVoid<unsigned	int>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_unsigned_long ) {
-    validate_isVoid<unsigned long>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_unsigned_long	)	{
+				validate_isVoid<unsigned	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_unsigned_long_long ) {
-    validate_isVoid<unsigned long long>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_unsigned_long_long	)	{
+				validate_isVoid<unsigned	long	long>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_wchar_t ) {
-    validate_isVoid<wchar_t>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_wchar_t	)	{
+				validate_isVoid<wchar_t>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_float ) {
-    validate_isVoid<float>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_float	)	{
+				validate_isVoid<float>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, isVoid_double ) {
-    validate_isVoid<double>(false);
+TEST_F(PrimitiveDataTypeTest,	isVoid_double	)	{
+				validate_isVoid<double>(false);
 }
 
-TEST_F(PrimitiveDataTypeTest, createInstance_char) {
+TEST_F(PrimitiveDataTypeTest,	createInstance_char)	{
 
-    PrimitiveDataType<char> * primTypeSpec = new PrimitiveDataType<char>();
-    char* test_var = (char*)primTypeSpec->createInstance(1);
-    IntegerValue * value = new IntegerValue((int)'A');
-    primTypeSpec->assignValue(test_var, value);
-    delete value;
-    delete primTypeSpec;
-    EXPECT_EQ('A', *test_var);
+				PrimitiveDataType<char>	*	primTypeSpec	=	new	PrimitiveDataType<char>();
+				char*	test_var	=	(char*)primTypeSpec->createInstance(1);
+				IntegerValue	*	value	=	new	IntegerValue((int)'A');
+				primTypeSpec->assignValue(test_var,	value);
+				delete	value;
+				delete	primTypeSpec;
+				EXPECT_EQ('A',	*test_var);
 }
 
diff --git a/trick_source/sim_services/DataTypes/testing/TypeDictionaryTest.cpp b/trick_source/sim_services/DataTypes/testing/TypeDictionaryTest.cpp
index 4b3a61e6d..80f837377 100644
--- a/trick_source/sim_services/DataTypes/testing/TypeDictionaryTest.cpp
+++ b/trick_source/sim_services/DataTypes/testing/TypeDictionaryTest.cpp
@@ -1,127 +1,127 @@
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include "TypeDictionary.hh"
-#include "CompositeDataType.hh"
-#include "CompositeValue.hh"
-#include "PrimitiveDataType.hh"
-#include "DataTypeTestSupport.hh"
-
-// Framework
-class TypeDictionaryTest : public ::testing::Test {
-    protected:
-    TypeDictionary *typeDictionary;
-    TypeDictionaryTest() { typeDictionary = new TypeDictionary; }
-    ~TypeDictionaryTest() { delete typeDictionary; }
-    void SetUp() {}
-    void TearDown() {}
+#include	<gtest/gtest.h>
+#include	<stddef.h>
+#include	"TypeDictionary.hh"
+#include	"CompositeDataType.hh"
+#include	"CompositeValue.hh"
+#include	"PrimitiveDataType.hh"
+#include	"DataTypeTestSupport.hh"
+
+//	Framework
+class	TypeDictionaryTest	:	public	::testing::Test	{
+				protected:
+				TypeDictionary	*typeDictionary;
+				TypeDictionaryTest()	{	typeDictionary	=	new	TypeDictionary;	}
+				~TypeDictionaryTest()	{	delete	typeDictionary;	}
+				void	SetUp()	{}
+				void	TearDown()	{}
 };
 
 
-TEST_F(TypeDictionaryTest, getDataType_1) {
+TEST_F(TypeDictionaryTest,	getDataType_1)	{
 
-    /* TypeDictionary::getDataType should return NULL if the specified
-       typeName is not defined in the TypeDictionary.*/
+				/*	TypeDictionary::getDataType	should	return	NULL	if	the	specified
+							typeName	is	not	defined	in	the	TypeDictionary.*/
 
-    const DataType* dataType = typeDictionary->getDataType("non-existent-type");
+				const	DataType*	dataType	=	typeDictionary->getDataType("non-existent-type");
 
-    EXPECT_EQ( NULL, dataType);
+				EXPECT_EQ(	NULL,	dataType);
 }
 
-TEST_F(TypeDictionaryTest, getDataType_2) {
+TEST_F(TypeDictionaryTest,	getDataType_2)	{
 
-    /* TypeDictionary should be pre-loaded with all of the builtin types */
+				/*	TypeDictionary	should	be	pre-loaded	with	all	of	the	builtin	types	*/
 
-    const DataType* dataType;
+				const	DataType*	dataType;
 
-    dataType = typeDictionary->getDataType("void");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("void");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("char");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("char");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("short");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("short");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("int");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("int");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("long");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("long");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("wchar_t");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("wchar_t");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("long long");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("long	long");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("unsigned char");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("unsigned	char");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("unsigned short");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("unsigned	short");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("unsigned int");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("unsigned	int");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("unsigned long");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("unsigned	long");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("unsigned long long");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("unsigned	long	long");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("float");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("float");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
-    dataType = typeDictionary->getDataType("double");
-    EXPECT_NE( (void*)NULL, dataType);
+				dataType	=	typeDictionary->getDataType("double");
+				EXPECT_NE(	(void*)NULL,	dataType);
 
 }
 
-TEST_F(TypeDictionaryTest, addTypeDefinition_1) {
+TEST_F(TypeDictionaryTest,	addTypeDefinition_1)	{
 
-    /* Should be able to add a <std:string/DataType> pair (a type definition) to the TypeDictionary. */
-    bool test_passed = true;
+				/*	Should	be	able	to	add	a	<std:string/DataType>	pair	(a	type	definition)	to	the	TypeDictionary.	*/
+				bool	test_passed	=	true;
 
-    CompositeDataType * compTypeSpec;
+				CompositeDataType	*	compTypeSpec;
 
-    try {
-         compTypeSpec = new CompositeDataType(typeDictionary, "ClassOne", sizeof(ClassOne), &construct<ClassOne>, &destruct<ClassOne>);
-         compTypeSpec->addRegularMember( "a", offsetof(ClassOne, a), "int", 0, NULL);
-         compTypeSpec->addRegularMember( "b", offsetof(ClassOne, b), "double", 0, NULL);
+				try	{
+									compTypeSpec	=	new	CompositeDataType(typeDictionary,	"ClassOne",	sizeof(ClassOne),	&construct<ClassOne>,	&destruct<ClassOne>);
+									compTypeSpec->addRegularMember(	"a",	offsetof(ClassOne,	a),	"int",	0,	NULL);
+									compTypeSpec->addRegularMember(	"b",	offsetof(ClassOne,	b),	"double",	0,	NULL);
 
-        typeDictionary->addTypeDefinition("ClassOne", compTypeSpec);
+								typeDictionary->addTypeDefinition("ClassOne",	compTypeSpec);
 
-    } catch (std::logic_error e) {
-        std::cerr << e.what();
-        test_passed = false;
-    }
+				}	catch	(std::logic_error	e)	{
+								std::cerr	<<	e.what();
+								test_passed	=	false;
+				}
 
-    // Verify that addTypeDefinition didn't throw an exception.
-    EXPECT_EQ( true, test_passed);
+				//	Verify	that	addTypeDefinition	didn't	throw	an	exception.
+				EXPECT_EQ(	true,	test_passed);
 
-    // Verify that the types can be validated.
-    test_passed  = typeDictionary->validate();
-    EXPECT_EQ( true, test_passed);
+				//	Verify	that	the	types	can	be	validated.
+				test_passed		=	typeDictionary->validate();
+				EXPECT_EQ(	true,	test_passed);
 
-    // Verify that the correct DataType can be retrieved from the TypeDictionary by name.
-    const DataType* dataType = typeDictionary->getDataType("ClassOne");
-    EXPECT_EQ( (void*)compTypeSpec, (void*)dataType);
+				//	Verify	that	the	correct	DataType	can	be	retrieved	from	the	TypeDictionary	by	name.
+				const	DataType*	dataType	=	typeDictionary->getDataType("ClassOne");
+				EXPECT_EQ(	(void*)compTypeSpec,	(void*)dataType);
 }
 
-TEST_F(TypeDictionaryTest, addTypeDefinition_2) {
+TEST_F(TypeDictionaryTest,	addTypeDefinition_2)	{
 
-    /* An attempt to redefine a type should throw an exception. */
+				/*	An	attempt	to	redefine	a	type	should	throw	an	exception.	*/
 
-    int test_result = 0;
+				int	test_result	=	0;
 
-    try {
-        typeDictionary->addTypeDefinition("char", new PrimitiveDataType<char>() );
-    } catch (std::logic_error e) {
-        std::cerr << "NOTE: Exception is expected as part of the test." << std::endl;
-        std::cerr << e.what() << std::endl;
-        test_result = 1;
-    }
+				try	{
+								typeDictionary->addTypeDefinition("char",	new	PrimitiveDataType<char>()	);
+				}	catch	(std::logic_error	e)	{
+								std::cerr	<<	"NOTE:	Exception	is	expected	as	part	of	the	test."	<<	std::endl;
+								std::cerr	<<	e.what()	<<	std::endl;
+								test_result	=	1;
+				}
 
-    EXPECT_EQ( 1, test_result);
+				EXPECT_EQ(	1,	test_result);
 }
 
diff --git a/trick_source/sim_services/DebugPause/DebugPause.cpp b/trick_source/sim_services/DebugPause/DebugPause.cpp
index b95bcbd20..4da4abf20 100644
--- a/trick_source/sim_services/DebugPause/DebugPause.cpp
+++ b/trick_source/sim_services/DebugPause/DebugPause.cpp
@@ -1,100 +1,100 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include <fcntl.h>
-#include <iomanip>
-#include <errno.h>
-#include <unistd.h>
+#include	<fcntl.h>
+#include	<iomanip>
+#include	<errno.h>
+#include	<unistd.h>
 
-#include "trick/DebugPause.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
+#include	"trick/DebugPause.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
 
 
-Trick::DebugPause * the_debug_pause = NULL ;
+Trick::DebugPause	*	the_debug_pause	=	NULL	;
 
-Trick::DebugPause::DebugPause() {
-    debug_pause_flag = false ;
-    the_debug_pause = this ;
+Trick::DebugPause::DebugPause()	{
+				debug_pause_flag	=	false	;
+				the_debug_pause	=	this	;
 }
 
-int Trick::DebugPause::debug_pause(Trick::JobData * curr_job) {
+int	Trick::DebugPause::debug_pause(Trick::JobData	*	curr_job)	{
 
-    // The target job was copied to sup_class_data in Trick::ScheduledJobQueueInstrument::call()
-    Trick::JobData * target_job = (Trick::JobData *)curr_job->sup_class_data ;
-    int sem_ret ;
+				//	The	target	job	was	copied	to	sup_class_data	in	Trick::ScheduledJobQueueInstrument::call()
+				Trick::JobData	*	target_job	=	(Trick::JobData	*)curr_job->sup_class_data	;
+				int	sem_ret	;
 
-    if ( target_job != NULL ) {
+				if	(	target_job	!=	NULL	)	{
 
-        // Pause for all job classes that are not initialization or for init jobs greater than phase 1.
-        if ( target_job->job_class_name.compare("initialization") or target_job->phase > 1 ) {
+								//	Pause	for	all	job	classes	that	are	not	initialization	or	for	init	jobs	greater	than	phase	1.
+								if	(	target_job->job_class_name.compare("initialization")	or	target_job->phase	>	1	)	{
 
-            message_publish(MSG_NORMAL, "%12.6f pausing before %s\n" , exec_get_sim_time() ,
-             target_job->name.c_str() ) ;
+												message_publish(MSG_NORMAL,	"%12.6f	pausing	before	%s\n"	,	exec_get_sim_time()	,
+													target_job->name.c_str()	)	;
 
-            do {
-                sem_ret = sem_wait(debug_sem);
-            } while ((sem_ret < 0) && (errno == EINTR));
+												do	{
+																sem_ret	=	sem_wait(debug_sem);
+												}	while	((sem_ret	<	0)	&&	(errno	==	EINTR));
 
-            if (sem_ret != 0) {
-                perror("Call to sem_wait");
-                fflush(stderr);
-            }
-        }
-    }
+												if	(sem_ret	!=	0)	{
+																perror("Call	to	sem_wait");
+																fflush(stderr);
+												}
+								}
+				}
 
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::DebugPause::debug_signal() {
+int	Trick::DebugPause::debug_signal()	{
 
-    sem_post(debug_sem);
-    return(0) ;
+				sem_post(debug_sem);
+				return(0)	;
 
 }
 
-int Trick::DebugPause::debug_pause_on() {
+int	Trick::DebugPause::debug_pause_on()	{
 
-    std::stringstream sem_name_stream ;
+				std::stringstream	sem_name_stream	;
 
-    if ( debug_pause_flag == true ) {
-        return(0) ;
-    }
+				if	(	debug_pause_flag	==	true	)	{
+								return(0)	;
+				}
 
-    debug_pause_flag = true ;
+				debug_pause_flag	=	true	;
 
-    sem_name_stream << "itimersepmaphore_" << getpid() ;
-    sem_name = sem_name_stream.str() ;
+				sem_name_stream	<<	"itimersepmaphore_"	<<	getpid()	;
+				sem_name	=	sem_name_stream.str()	;
 
-    debug_sem = sem_open(sem_name.c_str(), O_CREAT, S_IRWXU , 0);
+				debug_sem	=	sem_open(sem_name.c_str(),	O_CREAT,	S_IRWXU	,	0);
 
-    exec_instrument_before("trick_instruments.debug_pause.debug_pause") ;
+				exec_instrument_before("trick_instruments.debug_pause.debug_pause")	;
 
-    //TODO: turn off real-time clock if on.
+				//TODO:	turn	off	real-time	clock	if	on.
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::DebugPause::debug_pause_off() {
+int	Trick::DebugPause::debug_pause_off()	{
 
-    if ( debug_pause_flag == false ) {
-        return(0) ;
-    }
-    debug_pause_flag = false ;
+				if	(	debug_pause_flag	==	false	)	{
+								return(0)	;
+				}
+				debug_pause_flag	=	false	;
 
-    exec_instrument_remove("trick_instruments.debug_pause.debug_pause") ;
+				exec_instrument_remove("trick_instruments.debug_pause.debug_pause")	;
 
-    debug_signal() ;
+				debug_signal()	;
 
-    sem_unlink(sem_name.c_str()) ;
+				sem_unlink(sem_name.c_str())	;
 
-    //TODO: turn back on real-time clock if on before debug_pause started.
-    return(0);
+				//TODO:	turn	back	on	real-time	clock	if	on	before	debug_pause	started.
+				return(0);
 
 }
diff --git a/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp b/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp
index b4b1e252e..afde2d73b 100644
--- a/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp
+++ b/trick_source/sim_services/DebugPause/DebugPause_c_intf.cpp
@@ -1,40 +1,40 @@
-#include <stdio.h>
-#include "trick/DebugPause.hh"
+#include	<stdio.h>
+#include	"trick/DebugPause.hh"
 
-/* Global singleton pointer to the echo jobs class */
-extern Trick::DebugPause * the_debug_pause ;
+/*	Global	singleton	pointer	to	the	echo	jobs	class	*/
+extern	Trick::DebugPause	*	the_debug_pause	;
 
 /*************************************************************************/
-/* These routines are the "C" interface to echo jobs instrumentation     */
+/*	These	routines	are	the	"C"	interface	to	echo	jobs	instrumentation					*/
 /*************************************************************************/
 
 /**
- * @relates Trick::DebugPause
- * @copydoc Trick::DebugPause::debug_pause_on
- * C wrapper for Trick::DebugPause::debug_pause_on
- */
-extern "C" int debug_pause_on(void) {
-    if (the_debug_pause != NULL) {
-        return the_debug_pause->debug_pause_on() ;
-    }
-    return(0) ;
+	*	@relates	Trick::DebugPause
+	*	@copydoc	Trick::DebugPause::debug_pause_on
+	*	C	wrapper	for	Trick::DebugPause::debug_pause_on
+	*/
+extern	"C"	int	debug_pause_on(void)	{
+				if	(the_debug_pause	!=	NULL)	{
+								return	the_debug_pause->debug_pause_on()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::DebugPause
- * @copydoc Trick::DebugPause::debug_pause_off
- * C wrapper for Trick::DebugPause::debug_pause_off
- */
-extern "C" int debug_pause_off(void) {
-    if (the_debug_pause != NULL) {
-        return the_debug_pause->debug_pause_off() ;
-    }
-    return(0) ;
+	*	@relates	Trick::DebugPause
+	*	@copydoc	Trick::DebugPause::debug_pause_off
+	*	C	wrapper	for	Trick::DebugPause::debug_pause_off
+	*/
+extern	"C"	int	debug_pause_off(void)	{
+				if	(the_debug_pause	!=	NULL)	{
+								return	the_debug_pause->debug_pause_off()	;
+				}
+				return(0)	;
 }
 
-extern "C" int debug_signal(void) {
-    if (the_debug_pause != NULL) {
-        return the_debug_pause->debug_signal() ;
-    }
-    return(0) ;
+extern	"C"	int	debug_signal(void)	{
+				if	(the_debug_pause	!=	NULL)	{
+								return	the_debug_pause->debug_signal()	;
+				}
+				return(0)	;
 }
diff --git a/trick_source/sim_services/EchoJobs/EchoJobs.cpp b/trick_source/sim_services/EchoJobs/EchoJobs.cpp
index 307260812..aca641f41 100644
--- a/trick_source/sim_services/EchoJobs/EchoJobs.cpp
+++ b/trick_source/sim_services/EchoJobs/EchoJobs.cpp
@@ -1,60 +1,60 @@
 
-#include <iostream>
-#include <iomanip>
+#include	<iostream>
+#include	<iomanip>
 
-#include "trick/EchoJobs.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/EchoJobs.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-Trick::EchoJobs * the_ej = NULL ;
+Trick::EchoJobs	*	the_ej	=	NULL	;
 
-Trick::EchoJobs::EchoJobs() {
-    echo_job_flag = false ;
+Trick::EchoJobs::EchoJobs()	{
+				echo_job_flag	=	false	;
 
-    the_ej = this ;
+				the_ej	=	this	;
 }
 
-int Trick::EchoJobs::echo_job(Trick::JobData * curr_job ) {
-
-    // The target job was copied to sup_class_data in Trick::ScheduledJobQueueInstrument::call()
-    Trick::JobData * target_job = (Trick::JobData *)curr_job->sup_class_data ;
-
-    if ( target_job != NULL ) {
-        if ( target_job->phase != 60000 ) {
-            message_publish( MSG_NORMAL , "(P%d %s) %s\n", target_job->phase,
-                                                       target_job->job_class_name.c_str(),
-                                                       target_job->name.c_str() ) ;
-        } else {
-            message_publish( MSG_NORMAL , "(%s) %s\n", target_job->job_class_name.c_str(),
-                                                       target_job->name.c_str() ) ;
-        }
-    } else {
-        message_publish( MSG_ERROR , "echo job called but target job pointer is NULL\n" ) ;
-    }
-    return(0) ;
+int	Trick::EchoJobs::echo_job(Trick::JobData	*	curr_job	)	{
+
+				//	The	target	job	was	copied	to	sup_class_data	in	Trick::ScheduledJobQueueInstrument::call()
+				Trick::JobData	*	target_job	=	(Trick::JobData	*)curr_job->sup_class_data	;
+
+				if	(	target_job	!=	NULL	)	{
+								if	(	target_job->phase	!=	60000	)	{
+												message_publish(	MSG_NORMAL	,	"(P%d	%s)	%s\n",	target_job->phase,
+																																																							target_job->job_class_name.c_str(),
+																																																							target_job->name.c_str()	)	;
+								}	else	{
+												message_publish(	MSG_NORMAL	,	"(%s)	%s\n",	target_job->job_class_name.c_str(),
+																																																							target_job->name.c_str()	)	;
+								}
+				}	else	{
+								message_publish(	MSG_ERROR	,	"echo	job	called	but	target	job	pointer	is	NULL\n"	)	;
+				}
+				return(0)	;
 
 }
 
-int Trick::EchoJobs::echojobs_on() {
+int	Trick::EchoJobs::echojobs_on()	{
 
-    if ( echo_job_flag == true ) {
-        return(0) ;
-    }
-    echo_job_flag = true ;
-    exec_instrument_before("trick_instruments.echo_jobs.echo_job") ;
-    return(0) ;
+				if	(	echo_job_flag	==	true	)	{
+								return(0)	;
+				}
+				echo_job_flag	=	true	;
+				exec_instrument_before("trick_instruments.echo_jobs.echo_job")	;
+				return(0)	;
 
 }
 
-int Trick::EchoJobs::echojobs_off() {
+int	Trick::EchoJobs::echojobs_off()	{
 
-    if ( echo_job_flag == false ) {
-        return(0) ;
-    }
-    echo_job_flag = false ;
-    exec_instrument_remove("trick_instruments.echo_jobs.echo_job") ;
-    return(0) ;
+				if	(	echo_job_flag	==	false	)	{
+								return(0)	;
+				}
+				echo_job_flag	=	false	;
+				exec_instrument_remove("trick_instruments.echo_jobs.echo_job")	;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp b/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp
index e0c577a16..44f5d41b9 100644
--- a/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp
+++ b/trick_source/sim_services/EchoJobs/EchoJobs_c_intf.cpp
@@ -1,33 +1,33 @@
-#include <stdio.h>
-#include "trick/EchoJobs.hh"
+#include	<stdio.h>
+#include	"trick/EchoJobs.hh"
 
-/* Global singleton pointer to the echo jobs class */
-extern Trick::EchoJobs * the_ej ;
+/*	Global	singleton	pointer	to	the	echo	jobs	class	*/
+extern	Trick::EchoJobs	*	the_ej	;
 
 /*************************************************************************/
-/* These routines are the "C" interface to echo jobs instrumentation     */
+/*	These	routines	are	the	"C"	interface	to	echo	jobs	instrumentation					*/
 /*************************************************************************/
 
 /**
- * @relates Trick::EchoJobs
- * @copydoc Trick::EchoJobs::echojobs_on
- * C wrapper for Trick::EchoJobs::echojobs_on
- */
-extern "C" int echo_jobs_on(void) {
-    if (the_ej != NULL) {
-        return the_ej->echojobs_on() ;
-    }
-    return(0) ;
+	*	@relates	Trick::EchoJobs
+	*	@copydoc	Trick::EchoJobs::echojobs_on
+	*	C	wrapper	for	Trick::EchoJobs::echojobs_on
+	*/
+extern	"C"	int	echo_jobs_on(void)	{
+				if	(the_ej	!=	NULL)	{
+								return	the_ej->echojobs_on()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::EchoJobs
- * @copydoc Trick::EchoJobs::echojobs_off
- * C wrapper for Trick::EchoJobs::echojobs_off
- */
-extern "C" int echo_jobs_off(void) {
-    if (the_ej != NULL) {
-        return the_ej->echojobs_off() ;
-    }
-    return(0) ;
+	*	@relates	Trick::EchoJobs
+	*	@copydoc	Trick::EchoJobs::echojobs_off
+	*	C	wrapper	for	Trick::EchoJobs::echojobs_off
+	*/
+extern	"C"	int	echo_jobs_off(void)	{
+				if	(the_ej	!=	NULL)	{
+								return	the_ej->echojobs_off()	;
+				}
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Environment/Environment.cpp b/trick_source/sim_services/Environment/Environment.cpp
index 17ebe4fc7..23b5088d9 100644
--- a/trick_source/sim_services/Environment/Environment.cpp
+++ b/trick_source/sim_services/Environment/Environment.cpp
@@ -1,54 +1,54 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
 
-#include "trick/Environment.hh"
+#include	"trick/Environment.hh"
 
-Trick::Environment * the_env ;
+Trick::Environment	*	the_env	;
 
-Trick::Environment::Environment() {
-    the_env = this ;
+Trick::Environment::Environment()	{
+				the_env	=	this	;
 }
 
-int Trick::Environment::add_var( std::string variable_name , std::string value ) {
+int	Trick::Environment::add_var(	std::string	variable_name	,	std::string	value	)	{
 
-    local_env[variable_name] = value ;
+				local_env[variable_name]	=	value	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-const char * Trick::Environment::get_var( std::string variable_name) {
+const	char	*	Trick::Environment::get_var(	std::string	variable_name)	{
 
-    char *ret_env;
-    std::map<std::string, std::string >::iterator it ;
+				char	*ret_env;
+				std::map<std::string,	std::string	>::iterator	it	;
 
-    /* var might be in environment */
-    if ((ret_env = getenv(variable_name.c_str())) != NULL) {
-        return (ret_env);
-    }
+				/*	var	might	be	in	environment	*/
+				if	((ret_env	=	getenv(variable_name.c_str()))	!=	NULL)	{
+								return	(ret_env);
+				}
 
-    /* Check environment compiled into S_source.c */
-    it = local_env.find(variable_name) ;
-    if ( it != local_env.end() ) {
-        return( it->second.c_str() ) ;
-    }
+				/*	Check	environment	compiled	into	S_source.c	*/
+				it	=	local_env.find(variable_name)	;
+				if	(	it	!=	local_env.end()	)	{
+								return(	it->second.c_str()	)	;
+				}
 
-    /* It's not there! */
-    return (NULL);
+				/*	It's	not	there!	*/
+				return	(NULL);
 
 }
 
-int Trick::Environment::print_vars( FILE * fp ) {
+int	Trick::Environment::print_vars(	FILE	*	fp	)	{
 
-    std::map<std::string, std::string >::iterator it ;
+				std::map<std::string,	std::string	>::iterator	it	;
 
-    for ( it = local_env.begin() ; it != local_env.end() ; ++it ) {
-        fprintf(fp, "%s = %s\n", it->first.c_str(), it->second.c_str());
-    }
+				for	(	it	=	local_env.begin()	;	it	!=	local_env.end()	;	++it	)	{
+								fprintf(fp,	"%s	=	%s\n",	it->first.c_str(),	it->second.c_str());
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Environment/Environment_c_intf.cpp b/trick_source/sim_services/Environment/Environment_c_intf.cpp
index a74e95a7f..589ecd604 100644
--- a/trick_source/sim_services/Environment/Environment_c_intf.cpp
+++ b/trick_source/sim_services/Environment/Environment_c_intf.cpp
@@ -1,69 +1,69 @@
 
-#include <iostream>
-#include <stdio.h>
+#include	<iostream>
+#include	<stdio.h>
 
-#include "trick/Environment.hh"
-#include "trick/env_proto.h"
+#include	"trick/Environment.hh"
+#include	"trick/env_proto.h"
 
-extern Trick::Environment * the_env ;
+extern	Trick::Environment	*	the_env	;
 
 /**
- @relates Trick::Environment
- @copydoc Trick::Environment::add_var
- */
-extern "C" int env_add_var( const char * variable_name, const char * value) {
+	@relates	Trick::Environment
+	@copydoc	Trick::Environment::add_var
+	*/
+extern	"C"	int	env_add_var(	const	char	*	variable_name,	const	char	*	value)	{
 
-    std::string var_string ;
-    std::string value_string ;
+				std::string	var_string	;
+				std::string	value_string	;
 
-    // Add handling for NULL string.
-    if ( variable_name == NULL ) {
-        var_string.clear() ;
-    } else {
-        var_string = std::string(variable_name) ;
-    }
+				//	Add	handling	for	NULL	string.
+				if	(	variable_name	==	NULL	)	{
+								var_string.clear()	;
+				}	else	{
+								var_string	=	std::string(variable_name)	;
+				}
 
-    if ( value == NULL ) {
-        value_string.clear() ;
-    } else {
-        value_string = std::string(value) ;
-    }
+				if	(	value	==	NULL	)	{
+								value_string.clear()	;
+				}	else	{
+								value_string	=	std::string(value)	;
+				}
 
-    return ( the_env->add_var(var_string, value_string) );
+				return	(	the_env->add_var(var_string,	value_string)	);
 
 }
 
 /**
- @relates Trick::Environment
- @copydoc Trick::Environment::get_var
- */
-extern "C" const char * get_trick_env( char * variable_name ) {
-    return ( env_get_var(variable_name) ) ;
+	@relates	Trick::Environment
+	@copydoc	Trick::Environment::get_var
+	*/
+extern	"C"	const	char	*	get_trick_env(	char	*	variable_name	)	{
+				return	(	env_get_var(variable_name)	)	;
 }
 
 /**
- @relates Trick::Environment
- @copydoc Trick::Environment::get_var
- */
-extern "C" const char * env_get_var( const char * variable_name ) {
+	@relates	Trick::Environment
+	@copydoc	Trick::Environment::get_var
+	*/
+extern	"C"	const	char	*	env_get_var(	const	char	*	variable_name	)	{
 
-    std::string var_string ;
+				std::string	var_string	;
 
-    // Add handling for NULL string.
-    if ( variable_name == NULL ) {
-        var_string.clear() ;
-    } else {
-        var_string = std::string(variable_name) ;
-    }
+				//	Add	handling	for	NULL	string.
+				if	(	variable_name	==	NULL	)	{
+								var_string.clear()	;
+				}	else	{
+								var_string	=	std::string(variable_name)	;
+				}
 
-    return ( the_env->get_var(var_string) );
+				return	(	the_env->get_var(var_string)	);
 
 }
 
 /**
- @relates Trick::Environment
- @copydoc Trick::Environment::print_vars
- */
-extern "C" int env_print_vars( FILE * fp) {
-    return ( the_env->print_vars(fp) ) ;
+	@relates	Trick::Environment
+	@copydoc	Trick::Environment::print_vars
+	*/
+extern	"C"	int	env_print_vars(	FILE	*	fp)	{
+				return	(	the_env->print_vars(fp)	)	;
 }
diff --git a/trick_source/sim_services/EventManager/EventInstrument.cpp b/trick_source/sim_services/EventManager/EventInstrument.cpp
index cc780869f..74c6d9ccc 100644
--- a/trick_source/sim_services/EventManager/EventInstrument.cpp
+++ b/trick_source/sim_services/EventManager/EventInstrument.cpp
@@ -1,14 +1,14 @@
 
-#include "trick/EventInstrument.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/EventInstrument.hh"
+#include	"trick/exec_proto.hh"
 
-Trick::EventInstrument::EventInstrument(Trick::Event * in_event, Trick::JobData * in_target_job) :
- InstrumentBase(in_target_job),
- event(in_event) {}
+Trick::EventInstrument::EventInstrument(Trick::Event	*	in_event,	Trick::JobData	*	in_target_job)	:
+	InstrumentBase(in_target_job),
+	event(in_event)	{}
 
-// The instrument call processes the event.
-int Trick::EventInstrument::call() {
-    event->process(exec_get_time_tics()) ;
-    return 0 ;
+//	The	instrument	call	processes	the	event.
+int	Trick::EventInstrument::call()	{
+				event->process(exec_get_time_tics())	;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/EventManager/EventManager.cpp b/trick_source/sim_services/EventManager/EventManager.cpp
index a3d18565d..17f345f41 100644
--- a/trick_source/sim_services/EventManager/EventManager.cpp
+++ b/trick_source/sim_services/EventManager/EventManager.cpp
@@ -1,301 +1,301 @@
 /*
-   PURPOSE: ( Python input processor )
-   REFERENCE: ( Trick Simulation Environment )
-   ASSUMPTIONS AND LIMITATIONS: ( None )
-   CLASS: ( N/A )
-   LIBRARY DEPENDENCY: ( None )
-   PROGRAMMERS: ( Alex Lin NASA 2009 )
+			PURPOSE:	(	Python	input	processor	)
+			REFERENCE:	(	Trick	Simulation	Environment	)
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+			CLASS:	(	N/A	)
+			LIBRARY	DEPENDENCY:	(	None	)
+			PROGRAMMERS:	(	Alex	Lin	NASA	2009	)
 */
 
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <string>
-#include <cmath>
-
-#include "trick/EventManager.hh"
-#include "trick/EventInstrument.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-Trick::EventManager * the_em ;
-
-Trick::EventManager::EventManager() :
- active_events(NULL),
- num_active_events(0),
- num_allocated(0)
-{ the_em = this ; }
-
-//Command to get the event object given the event's name
-Trick::Event * Trick::EventManager::get_event(std::string event_name) {
-    unsigned int ii ;
-    Trick::Event* ret = NULL;
-
-    /* Find the event name in the active event list and return the pointer to that event */
-    for ( ii = 0 ; ii < num_active_events ; ii++ ) {
-        if ( ! active_events[ii]->get_name().compare(event_name) ) {
-            ret = active_events[ii];
-            break ;
-        }
-    }
-
-    return(ret) ;
+#include	<iostream>
+#include	<sstream>
+#include	<vector>
+#include	<string>
+#include	<cmath>
+
+#include	"trick/EventManager.hh"
+#include	"trick/EventInstrument.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+Trick::EventManager	*	the_em	;
+
+Trick::EventManager::EventManager()	:
+	active_events(NULL),
+	num_active_events(0),
+	num_allocated(0)
+{	the_em	=	this	;	}
+
+//Command	to	get	the	event	object	given	the	event's	name
+Trick::Event	*	Trick::EventManager::get_event(std::string	event_name)	{
+				unsigned	int	ii	;
+				Trick::Event*	ret	=	NULL;
+
+				/*	Find	the	event	name	in	the	active	event	list	and	return	the	pointer	to	that	event	*/
+				for	(	ii	=	0	;	ii	<	num_active_events	;	ii++	)	{
+								if	(	!	active_events[ii]->get_name().compare(event_name)	)	{
+												ret	=	active_events[ii];
+												break	;
+								}
+				}
+
+				return(ret)	;
 
 }
 
-//Add user's event to the active event list.
-int Trick::EventManager::add_to_active_events(Trick::Event * in_event) {
-
-    for ( unsigned int ii = 0 ; ii < num_active_events ; ii++ ) {
-        if (in_event == active_events[ii]) {
-            return (0) ;
-        }
-    }
-    num_active_events++;
-    if (num_active_events == 1) {
-        active_events = (Trick::Event **)TMM_declare_var_s("Trick::Event* [100]");
-        num_allocated = 100 ;
-    } else if ( num_active_events >= num_allocated ) {
-        num_allocated += 100 ;
-        active_events = (Trick::Event **)TMM_resize_array_1d_a(active_events, num_allocated);
-        for ( unsigned int ii = num_active_events ; ii < num_allocated ; ii++ ) {
-            active_events[ii] = NULL ;
-        }
-    }
-    active_events[num_active_events-1] = in_event ;
-    return (0) ;
+//Add	user's	event	to	the	active	event	list.
+int	Trick::EventManager::add_to_active_events(Trick::Event	*	in_event)	{
+
+				for	(	unsigned	int	ii	=	0	;	ii	<	num_active_events	;	ii++	)	{
+								if	(in_event	==	active_events[ii])	{
+												return	(0)	;
+								}
+				}
+				num_active_events++;
+				if	(num_active_events	==	1)	{
+								active_events	=	(Trick::Event	**)TMM_declare_var_s("Trick::Event*	[100]");
+								num_allocated	=	100	;
+				}	else	if	(	num_active_events	>=	num_allocated	)	{
+								num_allocated	+=	100	;
+								active_events	=	(Trick::Event	**)TMM_resize_array_1d_a(active_events,	num_allocated);
+								for	(	unsigned	int	ii	=	num_active_events	;	ii	<	num_allocated	;	ii++	)	{
+												active_events[ii]	=	NULL	;
+								}
+				}
+				active_events[num_active_events-1]	=	in_event	;
+				return	(0)	;
 }
 
-//Command to insert a user's input file event into the input processor's list of events to process.
-int Trick::EventManager::add_event(Trick::Event * in_event) {
+//Command	to	insert	a	user's	input	file	event	into	the	input	processor's	list	of	events	to	process.
+int	Trick::EventManager::add_event(Trick::Event	*	in_event)	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    add_to_active_events(in_event) ;
+				add_to_active_events(in_event)	;
 
-    if (in_event->get_thread() < event_processors.size() ) {
-        event_processors[in_event->get_thread()]->add_event(in_event) ;
-        in_event->add() ;
-    } else {
-        message_publish(MSG_WARNING, "Event thread number is not in range: thread %d requested, only %d child threads in simulation.\n", in_event->get_thread() , event_processors.size() - 1) ;
-        ret = -1 ;
-    }
+				if	(in_event->get_thread()	<	event_processors.size()	)	{
+								event_processors[in_event->get_thread()]->add_event(in_event)	;
+								in_event->add()	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	thread	number	is	not	in	range:	thread	%d	requested,	only	%d	child	threads	in	simulation.\n",	in_event->get_thread()	,	event_processors.size()	-	1)	;
+								ret	=	-1	;
+				}
 
-    return ret ;
+				return	ret	;
 
 }
 
 /**
 @details
-Command to insert an instrument job (containing in_event) into job queue before target job.
-
--# Find the target job.
--# If the target job exists
- -# Save the target job information to the event.
- -# Create an EventInstrument with the event and target job information
- -# Add the event instrument to the target job
- -# call the event's add routine if it needs to do anything once it is activated.
--# else print a warning that the target job does not exist.
--# Add the event to the list of active events.
+Command	to	insert	an	instrument	job	(containing	in_event)	into	job	queue	before	target	job.
+
+-#	Find	the	target	job.
+-#	If	the	target	job	exists
+	-#	Save	the	target	job	information	to	the	event.
+	-#	Create	an	EventInstrument	with	the	event	and	target	job	information
+	-#	Add	the	event	instrument	to	the	target	job
+	-#	call	the	event's	add	routine	if	it	needs	to	do	anything	once	it	is	activated.
+-#	else	print	a	warning	that	the	target	job	does	not	exist.
+-#	Add	the	event	to	the	list	of	active	events.
 */
-int Trick::EventManager::add_event_before(Trick::Event * in_event, std::string target_name, unsigned int target_inst) {
-
-    Trick::JobData * target_job ;
-
-    target_job = exec_get_job( target_name.c_str() , target_inst ) ;
-    if (target_job != NULL ) {
-        in_event->set_before_after(Trick::EVENT_BEFORETARGET) ;
-        in_event->set_target_name(target_name) ;
-        in_event->set_target_inst(target_inst) ;
-        Trick::EventInstrument * instru_job = new Trick::EventInstrument(in_event , target_job) ;
-        target_job->add_inst_before(instru_job) ;
-        events_instrumented.push_back(instru_job) ;
-        in_event->add() ;
-    } else {
-        message_publish(MSG_WARNING, "Event not added before job: %s does not exist.\n", target_name.c_str()) ;
-        return (0);
-    }
-    /* Add in_event to list of active events. */
-    add_to_active_events(in_event) ;
-    return(0);
+int	Trick::EventManager::add_event_before(Trick::Event	*	in_event,	std::string	target_name,	unsigned	int	target_inst)	{
+
+				Trick::JobData	*	target_job	;
+
+				target_job	=	exec_get_job(	target_name.c_str()	,	target_inst	)	;
+				if	(target_job	!=	NULL	)	{
+								in_event->set_before_after(Trick::EVENT_BEFORETARGET)	;
+								in_event->set_target_name(target_name)	;
+								in_event->set_target_inst(target_inst)	;
+								Trick::EventInstrument	*	instru_job	=	new	Trick::EventInstrument(in_event	,	target_job)	;
+								target_job->add_inst_before(instru_job)	;
+								events_instrumented.push_back(instru_job)	;
+								in_event->add()	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	not	added	before	job:	%s	does	not	exist.\n",	target_name.c_str())	;
+								return	(0);
+				}
+				/*	Add	in_event	to	list	of	active	events.	*/
+				add_to_active_events(in_event)	;
+				return(0);
 
 }
 
 /**
 @details
-Command to insert an instrument job (containing in_event) into job queue after target job.
-
--# Find the target job.
--# If the target job exists
- -# Save the target job information to the event.
- -# Create an EventInstrument with the event and target job information
- -# Add the event instrument to the target job
- -# call the event's add routine if it needs to do anything once it is activated.
--# else print a warning that the target job does not exist.
--# Add the event to the list of active events.
+Command	to	insert	an	instrument	job	(containing	in_event)	into	job	queue	after	target	job.
+
+-#	Find	the	target	job.
+-#	If	the	target	job	exists
+	-#	Save	the	target	job	information	to	the	event.
+	-#	Create	an	EventInstrument	with	the	event	and	target	job	information
+	-#	Add	the	event	instrument	to	the	target	job
+	-#	call	the	event's	add	routine	if	it	needs	to	do	anything	once	it	is	activated.
+-#	else	print	a	warning	that	the	target	job	does	not	exist.
+-#	Add	the	event	to	the	list	of	active	events.
 */
-int Trick::EventManager::add_event_after(Trick::Event * in_event, std::string target_name, unsigned int target_inst) {
-
-    Trick::JobData * target_job ;
-
-    target_job = exec_get_job( target_name.c_str() , target_inst ) ;
-    if (target_job != NULL ) {
-        in_event->set_before_after(Trick::EVENT_AFTERTARGET) ;
-        in_event->set_target_name(target_name) ;
-        in_event->set_target_inst(target_inst) ;
-        Trick::EventInstrument * instru_job = new Trick::EventInstrument(in_event , target_job) ;
-        target_job->add_inst_after(instru_job) ;
-        events_instrumented.push_back(instru_job) ;
-        in_event->add() ;
-    } else {
-        message_publish(MSG_WARNING, "Event not added before job: %s does not exist.\n", target_name.c_str()) ;
-        return (0);
-    }
-    /* Add in_event to list of active events. */
-    add_to_active_events(in_event) ;
-    return(0);
+int	Trick::EventManager::add_event_after(Trick::Event	*	in_event,	std::string	target_name,	unsigned	int	target_inst)	{
+
+				Trick::JobData	*	target_job	;
+
+				target_job	=	exec_get_job(	target_name.c_str()	,	target_inst	)	;
+				if	(target_job	!=	NULL	)	{
+								in_event->set_before_after(Trick::EVENT_AFTERTARGET)	;
+								in_event->set_target_name(target_name)	;
+								in_event->set_target_inst(target_inst)	;
+								Trick::EventInstrument	*	instru_job	=	new	Trick::EventInstrument(in_event	,	target_job)	;
+								target_job->add_inst_after(instru_job)	;
+								events_instrumented.push_back(instru_job)	;
+								in_event->add()	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	not	added	before	job:	%s	does	not	exist.\n",	target_name.c_str())	;
+								return	(0);
+				}
+				/*	Add	in_event	to	list	of	active	events.	*/
+				add_to_active_events(in_event)	;
+				return(0);
 
 }
 
-// Find the event by name and activate it.
-int Trick::EventManager::activate_event(const char * event_name) {
-    Trick::Event* ret = NULL;
+//	Find	the	event	by	name	and	activate	it.
+int	Trick::EventManager::activate_event(const	char	*	event_name)	{
+				Trick::Event*	ret	=	NULL;
 
-    ret = get_event(event_name) ;
-    if (ret != NULL) {
-        ret->activate() ;
-    }
-    return 0 ;
+				ret	=	get_event(event_name)	;
+				if	(ret	!=	NULL)	{
+								ret->activate()	;
+				}
+				return	0	;
 }
 
-// Find the event by name and deactivate it.
-int Trick::EventManager::deactivate_event(const char * event_name) {
-    Trick::Event* ret = NULL;
+//	Find	the	event	by	name	and	deactivate	it.
+int	Trick::EventManager::deactivate_event(const	char	*	event_name)	{
+				Trick::Event*	ret	=	NULL;
 
-    ret = get_event(event_name) ;
-    if (ret != NULL) {
-        ret->deactivate() ;
-    }
-    return 0 ;
+				ret	=	get_event(event_name)	;
+				if	(ret	!=	NULL)	{
+								ret->deactivate()	;
+				}
+				return	0	;
 }
 
-//Command to remove an event from everywhere it was added (it can still be added back again).
-int Trick::EventManager::remove_event(Trick::Event * in_event) {
-
-    unsigned int ii , jj ;
-
-    if ( ! in_event ) {
-        return 0 ;
-    }
-
-    if ( in_event->get_before_after() == Trick::EVENT_NOTARGET ) {
-        /* If the event is cyclic, remove the event from the event processor on the event's thread */
-        event_processors[in_event->get_thread()]->remove_event(in_event) ;
-    } else {
-        std::vector< Trick::EventInstrument * >::iterator ei_it ;
-        for ( ei_it = events_instrumented.begin() ; ei_it != events_instrumented.end() ; ) {
-            if ( (*ei_it)->get_event() == in_event ) {
-                /* If the event is tied to a job, call the target jobs remove instrument routine */
-                Trick::EventInstrument * found_event_instru = *ei_it ;
-                ei_it = events_instrumented.erase(ei_it) ;
-                found_event_instru->get_target_job()->remove_inst(found_event_instru->name) ;
-                delete found_event_instru ;
-            } else {
-                ei_it++ ;
-            }
-        }
-    }
-
-    in_event->remove() ;
-
-    /* Remove it from active event list. */
-    for ( ii = 0 ; ii < num_active_events ; ii++ ) {
-        if (in_event == active_events[ii]) {
-            for ( jj = ii + 1 ; jj < num_active_events ; jj++ ) {
-                active_events[jj - 1] = active_events[jj] ;
-            }
-            num_active_events-- ;
-            if (num_active_events == 0) {
-                TMM_delete_var_a(active_events);
-                active_events = NULL;
-            }
-            else {
-                active_events[num_active_events] = NULL ;
-            }
-
-            break ;
-        }
-    }
-
-    if ( in_event->get_free_on_removal() ) {
-        TMM_delete_var_a(in_event) ;
-    }
-
-    return 0 ;
+//Command	to	remove	an	event	from	everywhere	it	was	added	(it	can	still	be	added	back	again).
+int	Trick::EventManager::remove_event(Trick::Event	*	in_event)	{
+
+				unsigned	int	ii	,	jj	;
+
+				if	(	!	in_event	)	{
+								return	0	;
+				}
+
+				if	(	in_event->get_before_after()	==	Trick::EVENT_NOTARGET	)	{
+								/*	If	the	event	is	cyclic,	remove	the	event	from	the	event	processor	on	the	event's	thread	*/
+								event_processors[in_event->get_thread()]->remove_event(in_event)	;
+				}	else	{
+								std::vector<	Trick::EventInstrument	*	>::iterator	ei_it	;
+								for	(	ei_it	=	events_instrumented.begin()	;	ei_it	!=	events_instrumented.end()	;	)	{
+												if	(	(*ei_it)->get_event()	==	in_event	)	{
+																/*	If	the	event	is	tied	to	a	job,	call	the	target	jobs	remove	instrument	routine	*/
+																Trick::EventInstrument	*	found_event_instru	=	*ei_it	;
+																ei_it	=	events_instrumented.erase(ei_it)	;
+																found_event_instru->get_target_job()->remove_inst(found_event_instru->name)	;
+																delete	found_event_instru	;
+												}	else	{
+																ei_it++	;
+												}
+								}
+				}
+
+				in_event->remove()	;
+
+				/*	Remove	it	from	active	event	list.	*/
+				for	(	ii	=	0	;	ii	<	num_active_events	;	ii++	)	{
+								if	(in_event	==	active_events[ii])	{
+												for	(	jj	=	ii	+	1	;	jj	<	num_active_events	;	jj++	)	{
+																active_events[jj	-	1]	=	active_events[jj]	;
+												}
+												num_active_events--	;
+												if	(num_active_events	==	0)	{
+																TMM_delete_var_a(active_events);
+																active_events	=	NULL;
+												}
+												else	{
+																active_events[num_active_events]	=	NULL	;
+												}
+
+												break	;
+								}
+				}
+
+				if	(	in_event->get_free_on_removal()	)	{
+								TMM_delete_var_a(in_event)	;
+				}
+
+				return	0	;
 }
 
 /**
 @details
-This is called from the S_define file.  There will be one event processor assigned to each thread.
--# Add the incoming input processor to the list of known processors.
+This	is	called	from	the	S_define	file.		There	will	be	one	event	processor	assigned	to	each	thread.
+-#	Add	the	incoming	input	processor	to	the	list	of	known	processors.
 */
-void Trick::EventManager::add_event_processor(Trick::EventProcessor * in_ep) {
-    event_processors.push_back(in_ep) ;
+void	Trick::EventManager::add_event_processor(Trick::EventProcessor	*	in_ep)	{
+				event_processors.push_back(in_ep)	;
 }
 
-//Executive time_tic changed.  Update all event times
-int Trick::EventManager::time_tic_changed() {
+//Executive	time_tic	changed.		Update	all	event	times
+int	Trick::EventManager::time_tic_changed()	{
 
-    int old_tt ;
-    int tt ;
-    unsigned int ii ;
+				int	old_tt	;
+				int	tt	;
+				unsigned	int	ii	;
 
-    old_tt = exec_get_old_time_tic_value() ;
-    tt = exec_get_time_tic_value() ;
+				old_tt	=	exec_get_old_time_tic_value()	;
+				tt	=	exec_get_time_tic_value()	;
 
-    for ( ii = 0 ; ii < num_active_events ; ii++ ) {
-        active_events[ii]->set_next_tics((long long)round((active_events[ii]->get_next_tics() / old_tt) * tt)) ;
-    }
+				for	(	ii	=	0	;	ii	<	num_active_events	;	ii++	)	{
+								active_events[ii]->set_next_tics((long	long)round((active_events[ii]->get_next_tics()	/	old_tt)	*	tt))	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
-// Remove all events attached to jobs before a checkpoint is reloaded.
-int Trick::EventManager::preload_checkpoint() {
-    std::vector< Trick::EventInstrument * >::iterator ei_it ;
-    for ( ei_it = events_instrumented.begin() ; ei_it != events_instrumented.end() ; ) {
-        Trick::EventInstrument * found_event_instru = *ei_it ;
-        ei_it = events_instrumented.erase(ei_it) ;
-        found_event_instru->get_target_job()->remove_inst(found_event_instru->name) ;
-        delete found_event_instru ;
-    }
-    return 0 ;
+//	Remove	all	events	attached	to	jobs	before	a	checkpoint	is	reloaded.
+int	Trick::EventManager::preload_checkpoint()	{
+				std::vector<	Trick::EventInstrument	*	>::iterator	ei_it	;
+				for	(	ei_it	=	events_instrumented.begin()	;	ei_it	!=	events_instrumented.end()	;	)	{
+								Trick::EventInstrument	*	found_event_instru	=	*ei_it	;
+								ei_it	=	events_instrumented.erase(ei_it)	;
+								found_event_instru->get_target_job()->remove_inst(found_event_instru->name)	;
+								delete	found_event_instru	;
+				}
+				return	0	;
 }
 
-//Restart job that reloads event_list from checkpointable structures
-int Trick::EventManager::restart() {
-    unsigned int ii ;
-
-    for ( ii = 0 ; ii < num_active_events ; ii++ ) {
-        // rebuild the event_list of all events that were "added"
-
-        /* call the event restart routine to reset anything the event needs to do. */
-        active_events[ii]->restart() ;
-
-        if ( active_events[ii]->get_before_after() == Trick::EVENT_BEFORETARGET ) {
-            /* Update event list and insert an instrument job (containing in_event) target job's "before" queue. */
-            add_event_before( active_events[ii] , active_events[ii]->get_target_name() , active_events[ii]->get_target_inst() ) ;
-        } else if ( active_events[ii]->get_before_after() == Trick::EVENT_AFTERTARGET ) {
-            /* Update event list and insert an instrument job (containing in_event) target job's "after" queue. */
-            add_event_after( active_events[ii] , active_events[ii]->get_target_name() , active_events[ii]->get_target_inst() ) ;
-        } else {
-            /* Update event list for normal user events and read events. */
-            add_event(active_events[ii]);
-        }
-    }
-    return (0);
+//Restart	job	that	reloads	event_list	from	checkpointable	structures
+int	Trick::EventManager::restart()	{
+				unsigned	int	ii	;
+
+				for	(	ii	=	0	;	ii	<	num_active_events	;	ii++	)	{
+								//	rebuild	the	event_list	of	all	events	that	were	"added"
+
+								/*	call	the	event	restart	routine	to	reset	anything	the	event	needs	to	do.	*/
+								active_events[ii]->restart()	;
+
+								if	(	active_events[ii]->get_before_after()	==	Trick::EVENT_BEFORETARGET	)	{
+												/*	Update	event	list	and	insert	an	instrument	job	(containing	in_event)	target	job's	"before"	queue.	*/
+												add_event_before(	active_events[ii]	,	active_events[ii]->get_target_name()	,	active_events[ii]->get_target_inst()	)	;
+								}	else	if	(	active_events[ii]->get_before_after()	==	Trick::EVENT_AFTERTARGET	)	{
+												/*	Update	event	list	and	insert	an	instrument	job	(containing	in_event)	target	job's	"after"	queue.	*/
+												add_event_after(	active_events[ii]	,	active_events[ii]->get_target_name()	,	active_events[ii]->get_target_inst()	)	;
+								}	else	{
+												/*	Update	event	list	for	normal	user	events	and	read	events.	*/
+												add_event(active_events[ii]);
+								}
+				}
+				return	(0);
 }
 
diff --git a/trick_source/sim_services/EventManager/EventManager_c_intf.cpp b/trick_source/sim_services/EventManager/EventManager_c_intf.cpp
index 67cf9a628..85dbd4b9a 100644
--- a/trick_source/sim_services/EventManager/EventManager_c_intf.cpp
+++ b/trick_source/sim_services/EventManager/EventManager_c_intf.cpp
@@ -1,49 +1,49 @@
 
-#include <string>
+#include	<string>
 
-#include "trick/Event.hh"
-#include "trick/EventManager.hh"
-#include "trick/EventManager_c_intf.hh"
+#include	"trick/Event.hh"
+#include	"trick/EventManager.hh"
+#include	"trick/EventManager_c_intf.hh"
 
-extern Trick::EventManager * the_em ;
+extern	Trick::EventManager	*	the_em	;
 
-/* Get an event by name */
-Trick::Event * event_manager_get_event( std::string in_name ) {
-    if ( the_em != NULL ) {
-        return the_em->get_event(in_name) ;
-    }
-    return NULL ;
+/*	Get	an	event	by	name	*/
+Trick::Event	*	event_manager_get_event(	std::string	in_name	)	{
+				if	(	the_em	!=	NULL	)	{
+								return	the_em->get_event(in_name)	;
+				}
+				return	NULL	;
 }
 
-/* Add an event */
-int event_manager_add_event( Trick::Event * in_event ) {
-    if ( the_em != NULL ) {
-        return the_em->add_event(in_event) ;
-    }
-    return -1 ;
+/*	Add	an	event	*/
+int	event_manager_add_event(	Trick::Event	*	in_event	)	{
+				if	(	the_em	!=	NULL	)	{
+								return	the_em->add_event(in_event)	;
+				}
+				return	-1	;
 }
 
-/* Add an event before a target job */
-int event_manager_add_event_before( Trick::Event * in_event, std::string target_name, unsigned int target_inst ) {
-    if ( the_em != NULL ) {
-        return the_em->add_event_before(in_event, target_name, target_inst) ;
-    }
-    return -1 ;
+/*	Add	an	event	before	a	target	job	*/
+int	event_manager_add_event_before(	Trick::Event	*	in_event,	std::string	target_name,	unsigned	int	target_inst	)	{
+				if	(	the_em	!=	NULL	)	{
+								return	the_em->add_event_before(in_event,	target_name,	target_inst)	;
+				}
+				return	-1	;
 }
 
-/* Add an event after a target job */
-int event_manager_add_event_after( Trick::Event * in_event, std::string target_name, unsigned int target_inst ) {
-    if ( the_em != NULL ) {
-        return the_em->add_event_after(in_event, target_name, target_inst) ;
-    }
-    return -1 ;
+/*	Add	an	event	after	a	target	job	*/
+int	event_manager_add_event_after(	Trick::Event	*	in_event,	std::string	target_name,	unsigned	int	target_inst	)	{
+				if	(	the_em	!=	NULL	)	{
+								return	the_em->add_event_after(in_event,	target_name,	target_inst)	;
+				}
+				return	-1	;
 }
 
-/* Remove an event */
-int event_manager_remove_event( Trick::Event * in_event ) {
-    if ( the_em != NULL ) {
-        return the_em->remove_event(in_event) ;
-    }
-    return -1 ;
+/*	Remove	an	event	*/
+int	event_manager_remove_event(	Trick::Event	*	in_event	)	{
+				if	(	the_em	!=	NULL	)	{
+								return	the_em->remove_event(in_event)	;
+				}
+				return	-1	;
 }
 
diff --git a/trick_source/sim_services/EventManager/EventProcessor.cpp b/trick_source/sim_services/EventManager/EventProcessor.cpp
index 1ee3fa1ec..9a0866459 100644
--- a/trick_source/sim_services/EventManager/EventProcessor.cpp
+++ b/trick_source/sim_services/EventManager/EventProcessor.cpp
@@ -1,114 +1,114 @@
 /*
-   PURPOSE: ( Process an event. )
-   REFERENCE: ( Trick Simulation Environment )
-   ASSUMPTIONS AND LIMITATIONS: ( None )
-   CLASS: ( N/A )
-   LIBRARY DEPENDENCY: ( None )
-   PROGRAMMERS: ( Alex Lin NASA 2014 )
+			PURPOSE:	(	Process	an	event.	)
+			REFERENCE:	(	Trick	Simulation	Environment	)
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+			CLASS:	(	N/A	)
+			LIBRARY	DEPENDENCY:	(	None	)
+			PROGRAMMERS:	(	Alex	Lin	NASA	2014	)
 */
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/EventProcessor.hh"
-#include "trick/TrickConstant.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/EventProcessor.hh"
+#include	"trick/TrickConstant.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# Add the incoming event to the list of events to be added to the processor.
+-#	Add	the	incoming	event	to	the	list	of	events	to	be	added	to	the	processor.
 */
-void Trick::EventProcessor::add_event(Trick::Event * in_event) {
-    pending_events.push_back(in_event) ;
+void	Trick::EventProcessor::add_event(Trick::Event	*	in_event)	{
+				pending_events.push_back(in_event)	;
 }
 
 /**
 @details
--# Remove the incoming event from the set of events being processed
--# If the event set is not empty set the process_event job to the first event's next job call time.
--# Else set the process_event job to maximum time
+-#	Remove	the	incoming	event	from	the	set	of	events	being	processed
+-#	If	the	event	set	is	not	empty	set	the	process_event	job	to	the	first	event's	next	job	call	time.
+-#	Else	set	the	process_event	job	to	maximum	time
 */
-void Trick::EventProcessor::remove_event(Trick::Event * in_event) {
-    std::multiset< Trick::Event *, CompareEventPtrs >::iterator sit = event_set.begin() ;
-    for (sit=event_set.begin(); sit!=event_set.end(); ++sit) {
-        if ((*sit) == in_event) {
-            event_set.erase(sit) ;
-            break;
-        }
-    }
-    if ( !event_set.empty() ) {
-        process_event_job->next_tics = (*(event_set.begin()))->get_next_tics() ;
-    } else {
-        // if there are no events, set the next job call time to max.
-        process_event_job->next_tics = TRICK_MAX_LONG_LONG ;
-    }
+void	Trick::EventProcessor::remove_event(Trick::Event	*	in_event)	{
+				std::multiset<	Trick::Event	*,	CompareEventPtrs	>::iterator	sit	=	event_set.begin()	;
+				for	(sit=event_set.begin();	sit!=event_set.end();	++sit)	{
+								if	((*sit)	==	in_event)	{
+												event_set.erase(sit)	;
+												break;
+								}
+				}
+				if	(	!event_set.empty()	)	{
+								process_event_job->next_tics	=	(*(event_set.begin()))->get_next_tics()	;
+				}	else	{
+								//	if	there	are	no	events,	set	the	next	job	call	time	to	max.
+								process_event_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
 }
 
-//Top of frame job to add new events to processing set.
-void Trick::EventProcessor::add_pending_events( long long curr_tics , bool is_restart ) {
-    std::vector< Trick::Event * >::iterator it ;
-    for ( it = pending_events.begin() ; it != pending_events.end() ; ) {
-        if ( (*it)->get_cycle_tics() != 0 ) {
-            // this is a cyclic event
-            // If we are not calling this routine during a restart
-            if ( ! is_restart ) {
-                // Set the next time to the current time
-                (*it)->set_next_tics( curr_tics ) ;
-            }
-        } else {
-            // this is a one time event, test to see if the event time has past.
-            if ( (*it)->get_next_tics() < curr_tics ) {
-                // if the time has past, print warning and move to the next event.
-                message_publish(MSG_WARNING, "One time event fire time has already past.\n") ;
-                it = pending_events.erase(it) ;
-                continue ;
-            }
-        }
-        event_set.insert(*it) ;
-        process_event_job->next_tics = (*(event_set.begin()))->get_next_tics() ;
-        it = pending_events.erase(it) ;
-    }
+//Top	of	frame	job	to	add	new	events	to	processing	set.
+void	Trick::EventProcessor::add_pending_events(	long	long	curr_tics	,	bool	is_restart	)	{
+				std::vector<	Trick::Event	*	>::iterator	it	;
+				for	(	it	=	pending_events.begin()	;	it	!=	pending_events.end()	;	)	{
+								if	(	(*it)->get_cycle_tics()	!=	0	)	{
+												//	this	is	a	cyclic	event
+												//	If	we	are	not	calling	this	routine	during	a	restart
+												if	(	!	is_restart	)	{
+																//	Set	the	next	time	to	the	current	time
+																(*it)->set_next_tics(	curr_tics	)	;
+												}
+								}	else	{
+												//	this	is	a	one	time	event,	test	to	see	if	the	event	time	has	past.
+												if	(	(*it)->get_next_tics()	<	curr_tics	)	{
+																//	if	the	time	has	past,	print	warning	and	move	to	the	next	event.
+																message_publish(MSG_WARNING,	"One	time	event	fire	time	has	already	past.\n")	;
+																it	=	pending_events.erase(it)	;
+																continue	;
+												}
+								}
+								event_set.insert(*it)	;
+								process_event_job->next_tics	=	(*(event_set.begin()))->get_next_tics()	;
+								it	=	pending_events.erase(it)	;
+				}
 }
 
-//Automatic job to process input file events.
-int Trick::EventProcessor::process_event( long long curr_tics ) {
+//Automatic	job	to	process	input	file	events.
+int	Trick::EventProcessor::process_event(	long	long	curr_tics	)	{
 
-    std::multiset< Trick::Event *, CompareEventPtrs >::iterator sit = event_set.begin() ;
+				std::multiset<	Trick::Event	*,	CompareEventPtrs	>::iterator	sit	=	event_set.begin()	;
 
-    // while we have an event that matches the current time.
-    while ( sit != event_set.end() and (*sit)->get_next_tics() == curr_tics ) {
-        Trick::Event * curr_event = *sit ;
+				//	while	we	have	an	event	that	matches	the	current	time.
+				while	(	sit	!=	event_set.end()	and	(*sit)->get_next_tics()	==	curr_tics	)	{
+								Trick::Event	*	curr_event	=	*sit	;
 
-        // erase the current event out of the set.
-        event_set.erase(sit) ;
+								//	erase	the	current	event	out	of	the	set.
+								event_set.erase(sit)	;
 
-        // if the event is active process it
-        if ( curr_event->is_active() ) {
-            curr_event->process(curr_tics) ;
-        }
+								//	if	the	event	is	active	process	it
+								if	(	curr_event->is_active()	)	{
+												curr_event->process(curr_tics)	;
+								}
 
-        // if the event has a cycle time, update the time and put the item back in the set
-        if ( curr_event->get_cycle_tics() != 0 ) {
-            curr_event->advance_next_tics() ;
-            event_set.insert(curr_event) ;
-        }
+								//	if	the	event	has	a	cycle	time,	update	the	time	and	put	the	item	back	in	the	set
+								if	(	curr_event->get_cycle_tics()	!=	0	)	{
+												curr_event->advance_next_tics()	;
+												event_set.insert(curr_event)	;
+								}
 
-        // get the next top element of the set.
-        sit = event_set.begin() ;
-    }
+								//	get	the	next	top	element	of	the	set.
+								sit	=	event_set.begin()	;
+				}
 
-    if ( !event_set.empty() ) {
-        // set the next call time to the first item of the set.
-        process_event_job->next_tics = (*(event_set.begin()))->get_next_tics() ;
-    } else {
-        // if there are no events, set the next job call time to max.
-        process_event_job->next_tics = TRICK_MAX_LONG_LONG ;
-    }
+				if	(	!event_set.empty()	)	{
+								//	set	the	next	call	time	to	the	first	item	of	the	set.
+								process_event_job->next_tics	=	(*(event_set.begin()))->get_next_tics()	;
+				}	else	{
+								//	if	there	are	no	events,	set	the	next	job	call	time	to	max.
+								process_event_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
 
-    return 0  ;
+				return	0		;
 
 }
 
-void Trick::EventProcessor::preload_checkpoint() {
-    event_set.clear() ;
+void	Trick::EventProcessor::preload_checkpoint()	{
+				event_set.clear()	;
 }
diff --git a/trick_source/sim_services/Executive/Executive.cpp b/trick_source/sim_services/Executive/Executive.cpp
index 5b4759a7e..9df4a5822 100644
--- a/trick_source/sim_services/Executive/Executive.cpp
+++ b/trick_source/sim_services/Executive/Executive.cpp
@@ -1,419 +1,419 @@
 
-#include <iostream>
-#include <math.h>
-#include <sys/stat.h>
-#if __linux
-#include <sys/prctl.h>
+#include	<iostream>
+#include	<math.h>
+#include	<sys/stat.h>
+#if	__linux
+#include	<sys/prctl.h>
 #endif
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/TrickConstant.hh"
-
-Trick::Executive * the_exec ;
-
-Trick::Executive::Executive() {
-
-    /** @par Detailed Design: */
-    the_exec = this ;
-
-    advance_sim_time_job = NULL ;
-    attach_debugger = false ;
-    curr_job = NULL ;
-
-    struct stat st ;
-    if ( stat("/usr/bin/gdb",&st) == 0 ) {
-        debugger_command = std::string("/usr/bin/gdb") ;
-    } else if ( stat("/usr/bin/lldb",&st) == 0 ) {
-        debugger_command = std::string("/usr/bin/lldb") ;
-    }
-
-    enable_freeze = false ;
-    except_return = 0 ;
-    exec_command = NoCmd ;
-    async_freeze_command = false ;
-    freeze_command = false ;
-    freeze_on_frame_boundary = false ;
-    restart_called = false ;
-    initialization_complete = false ;
-    /** @li Assign default freeze_frame to be 1 second. */
-    freeze_frame = 1.0 ;
-    job_call_time_tics = 0 ;
-    mode = Initialization ;
-    num_classes = 0 ;
-    num_sim_objects = 0 ;
-    rt_nap = true ;
-    scheduled_start_index = 1000 ;
-    num_scheduled_job_classes = 0 ;
-    signal_caused_term = false ;
-    sim_start = 0.0 ;
-    /** @li Assign default software frame to be 1 second. */
-    software_frame = 1.0;
-    frame_count = 0 ;
-    stack_trace = true ;
-    /** @li (if on new-enough Linux) allow any process to ptrace this one.
-     *      This allows stack trace / debugger attach when ptrace is
-     *      restricted (e.g. on Ubuntu 16).
-    */
-    #if defined(PR_SET_PTRACER) && defined(PR_SET_PTRACER_ANY)
-    prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY);
-    #endif
-    /** @li Assign default terminate time to MAX_LONG_LONG tics. */
-    terminate_time = TRICK_MAX_LONG_LONG - 1;
-    time_last_pass_tics = 0 ;
-    /** @li Assign default time_tic value to be 1 us. */
-    time_tics = 0 ;
-    freeze_time_tics = 0 ;
-    freeze_frame_count = 0 ;
-    old_time_tic_value = 1000000 ;
-    time_tic_value = 1000000 ;
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/TrickConstant.hh"
+
+Trick::Executive	*	the_exec	;
+
+Trick::Executive::Executive()	{
+
+				/**	@par	Detailed	Design:	*/
+				the_exec	=	this	;
+
+				advance_sim_time_job	=	NULL	;
+				attach_debugger	=	false	;
+				curr_job	=	NULL	;
+
+				struct	stat	st	;
+				if	(	stat("/usr/bin/gdb",&st)	==	0	)	{
+								debugger_command	=	std::string("/usr/bin/gdb")	;
+				}	else	if	(	stat("/usr/bin/lldb",&st)	==	0	)	{
+								debugger_command	=	std::string("/usr/bin/lldb")	;
+				}
+
+				enable_freeze	=	false	;
+				except_return	=	0	;
+				exec_command	=	NoCmd	;
+				async_freeze_command	=	false	;
+				freeze_command	=	false	;
+				freeze_on_frame_boundary	=	false	;
+				restart_called	=	false	;
+				initialization_complete	=	false	;
+				/**	@li	Assign	default	freeze_frame	to	be	1	second.	*/
+				freeze_frame	=	1.0	;
+				job_call_time_tics	=	0	;
+				mode	=	Initialization	;
+				num_classes	=	0	;
+				num_sim_objects	=	0	;
+				rt_nap	=	true	;
+				scheduled_start_index	=	1000	;
+				num_scheduled_job_classes	=	0	;
+				signal_caused_term	=	false	;
+				sim_start	=	0.0	;
+				/**	@li	Assign	default	software	frame	to	be	1	second.	*/
+				software_frame	=	1.0;
+				frame_count	=	0	;
+				stack_trace	=	true	;
+				/**	@li	(if	on	new-enough	Linux)	allow	any	process	to	ptrace	this	one.
+					*						This	allows	stack	trace	/	debugger	attach	when	ptrace	is
+					*						restricted	(e.g.	on	Ubuntu	16).
+				*/
+				#if	defined(PR_SET_PTRACER)	&&	defined(PR_SET_PTRACER_ANY)
+				prctl(PR_SET_PTRACER,	PR_SET_PTRACER_ANY);
+				#endif
+				/**	@li	Assign	default	terminate	time	to	MAX_LONG_LONG	tics.	*/
+				terminate_time	=	TRICK_MAX_LONG_LONG	-	1;
+				time_last_pass_tics	=	0	;
+				/**	@li	Assign	default	time_tic	value	to	be	1	us.	*/
+				time_tics	=	0	;
+				freeze_time_tics	=	0	;
+				freeze_frame_count	=	0	;
+				old_time_tic_value	=	1000000	;
+				time_tic_value	=	1000000	;
 
-    // Set the JobData copy of the time_tic_value to the executive value
-    Trick::JobData::set_time_tic_value(time_tic_value) ;
+				//	Set	the	JobData	copy	of	the	time_tic_value	to	the	executive	value
+				Trick::JobData::set_time_tic_value(time_tic_value)	;
 
-    // These trap flags are set in init_signal_handlers()
-    trap_sigbus = false ;
-    trap_sigfpe = false ;
-    trap_sigsegv = false ;
-    trap_sigabrt = false ;
-    trap_sigchld = false ;
+				//	These	trap	flags	are	set	in	init_signal_handlers()
+				trap_sigbus	=	false	;
+				trap_sigfpe	=	false	;
+				trap_sigsegv	=	false	;
+				trap_sigabrt	=	false	;
+				trap_sigchld	=	false	;
 
-    build_date = std::string("unknown") ;
-    current_version = std::string("unknown") ;
-    version_date_tag = std::string("unknown") ;
+				build_date	=	std::string("unknown")	;
+				current_version	=	std::string("unknown")	;
+				version_date_tag	=	std::string("unknown")	;
 
-    num_all_jobs = 0 ;
-    all_jobs_for_checkpoint = NULL ;
+				num_all_jobs	=	0	;
+				all_jobs_for_checkpoint	=	NULL	;
 
-    software_frame_tics = (long long)(software_frame * time_tic_value) ;
-    next_frame_check_tics = software_frame_tics ;
+				software_frame_tics	=	(long	long)(software_frame	*	time_tic_value)	;
+				next_frame_check_tics	=	software_frame_tics	;
 
-    freeze_frame_tics = (long long)(freeze_frame * time_tic_value) ;
-    next_freeze_frame_check_tics = freeze_frame_tics ;
+				freeze_frame_tics	=	(long	long)(freeze_frame	*	time_tic_value)	;
+				next_freeze_frame_check_tics	=	freeze_frame_tics	;
 
-    freeze_job = NULL ;
-    advance_sim_time_job = NULL ;
-    curr_job = NULL ;
+				freeze_job	=	NULL	;
+				advance_sim_time_job	=	NULL	;
+				curr_job	=	NULL	;
 
-    /** @li Map non-scheduled job class strings to job queues. */
-    class_map["default_data"] = num_classes ;
-    class_to_queue[num_classes++] = &default_data_queue ;
+				/**	@li	Map	non-scheduled	job	class	strings	to	job	queues.	*/
+				class_map["default_data"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&default_data_queue	;
 
-    class_map["input_processor"] = num_classes ;
-    class_to_queue[num_classes++] = &input_processor_queue ;
+				class_map["input_processor"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&input_processor_queue	;
 
-    class_map["initialization"] = num_classes ;
-    class_to_queue[num_classes++] = &initialization_queue ;
+				class_map["initialization"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&initialization_queue	;
 
-    class_map["input_processor_run"] = num_classes ;
-    class_to_queue[num_classes++] = &input_processor_run_queue ;
+				class_map["input_processor_run"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&input_processor_run_queue	;
 
-    class_map["system_thread_sync"] = num_classes ;
-    class_to_queue[num_classes++] = &thread_sync_queue ;
+				class_map["system_thread_sync"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&thread_sync_queue	;
 
-    class_map["top_of_frame"] = num_classes ;
-    class_to_queue[num_classes++] = &top_of_frame_queue ;
+				class_map["top_of_frame"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&top_of_frame_queue	;
 
-    class_map["end_of_frame"] = num_classes ;
-    class_to_queue[num_classes++] = &end_of_frame_queue ;
+				class_map["end_of_frame"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&end_of_frame_queue	;
 
-    class_map["shutdown"] = num_classes ;
-    class_to_queue[num_classes++] = &shutdown_queue ;
+				class_map["shutdown"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&shutdown_queue	;
 
-    class_map["freeze_init"] = num_classes ;
-    class_to_queue[num_classes++] = &freeze_init_queue ;
+				class_map["freeze_init"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&freeze_init_queue	;
 
-    class_map["freeze_scheduled"] = num_classes ;
-    class_to_queue[num_classes++] = &freeze_scheduled_queue ;
+				class_map["freeze_scheduled"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&freeze_scheduled_queue	;
 
-    class_map["freeze_automatic"] = num_classes ;
-    class_to_queue[num_classes++] = &freeze_scheduled_queue ;
+				class_map["freeze_automatic"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&freeze_scheduled_queue	;
 
-    class_map["freeze"] = num_classes ;
-    class_to_queue[num_classes++] = &freeze_queue ;
+				class_map["freeze"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&freeze_queue	;
 
-    class_map["unfreeze"] = num_classes ;
-    class_to_queue[num_classes++] = &unfreeze_queue ;
+				class_map["unfreeze"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&unfreeze_queue	;
 
-    class_map["exec_time_tic_changed"] = num_classes ;
-    class_to_queue[num_classes++] = &time_tic_changed_queue ;
+				class_map["exec_time_tic_changed"]	=	num_classes	;
+				class_to_queue[num_classes++]	=	&time_tic_changed_queue	;
 
 
-    // Initialize all of default signal handlers
-    init_signal_handlers() ;
+				//	Initialize	all	of	default	signal	handlers
+				init_signal_handlers()	;
 }
 
-Trick::Executive::~Executive() {
-    while ( ! threads.empty() ) {
-        delete threads.back() ;
-        threads.pop_back() ;
-    }
+Trick::Executive::~Executive()	{
+				while	(	!	threads.empty()	)	{
+								delete	threads.back()	;
+								threads.pop_back()	;
+				}
 }
 
-int Trick::Executive::get_all_jobs_vector(std::vector<Trick::JobData *> & in_jobs_vector) {
-    in_jobs_vector = all_jobs_vector ;
-    return(0) ;
+int	Trick::Executive::get_all_jobs_vector(std::vector<Trick::JobData	*>	&	in_jobs_vector)	{
+				in_jobs_vector	=	all_jobs_vector	;
+				return(0)	;
 }
 
-bool Trick::Executive::get_attach_debugger() {
-    return(attach_debugger) ;
+bool	Trick::Executive::get_attach_debugger()	{
+				return(attach_debugger)	;
 }
 
-const std::string & Trick::Executive::get_current_version() {
-    return(current_version) ;
+const	std::string	&	Trick::Executive::get_current_version()	{
+				return(current_version)	;
 }
 
-const std::string & Trick::Executive::get_debugger_command() {
-    return(debugger_command) ;
+const	std::string	&	Trick::Executive::get_debugger_command()	{
+				return(debugger_command)	;
 }
 
-SIM_COMMAND Trick::Executive::get_exec_command() {
-    return(exec_command) ;
+SIM_COMMAND	Trick::Executive::get_exec_command()	{
+				return(exec_command)	;
 }
 
-bool Trick::Executive::get_enable_freeze() {
-    return(enable_freeze) ;
+bool	Trick::Executive::get_enable_freeze()	{
+				return(enable_freeze)	;
 }
 
-bool Trick::Executive::get_freeze_command() {
-    return(freeze_command) ;
+bool	Trick::Executive::get_freeze_command()	{
+				return(freeze_command)	;
 }
 
-bool Trick::Executive::get_freeze_on_frame_boundary() {
-    return(freeze_on_frame_boundary) ;
+bool	Trick::Executive::get_freeze_on_frame_boundary()	{
+				return(freeze_on_frame_boundary)	;
 }
 
-double Trick::Executive::get_freeze_frame() {
-    return(freeze_frame) ;
+double	Trick::Executive::get_freeze_frame()	{
+				return(freeze_frame)	;
 }
 
-long long Trick::Executive::get_freeze_frame_tics() {
-    return(freeze_frame_tics) ;
+long	long	Trick::Executive::get_freeze_frame_tics()	{
+				return(freeze_frame_tics)	;
 }
 
-SIM_MODE Trick::Executive::get_mode() {
-    return(mode) ;
+SIM_MODE	Trick::Executive::get_mode()	{
+				return(mode)	;
 }
 
-unsigned int Trick::Executive::get_num_threads() {
-    return(threads.size()) ;
+unsigned	int	Trick::Executive::get_num_threads()	{
+				return(threads.size())	;
 }
 
-int Trick::Executive::get_old_time_tic_value() {
-    return(old_time_tic_value) ;
+int	Trick::Executive::get_old_time_tic_value()	{
+				return(old_time_tic_value)	;
 }
 
-bool Trick::Executive::get_rt_nap() {
-    return(rt_nap) ;
+bool	Trick::Executive::get_rt_nap()	{
+				return(rt_nap)	;
 }
 
-int Trick::Executive::get_scheduled_start_index() {
-    return(scheduled_start_index) ;
+int	Trick::Executive::get_scheduled_start_index()	{
+				return(scheduled_start_index)	;
 }
 
-int Trick::Executive::get_sim_objects(std::vector<Trick::SimObject *> & in_sim_objects) {
-    in_sim_objects = sim_objects ;
-    return(0) ;
+int	Trick::Executive::get_sim_objects(std::vector<Trick::SimObject	*>	&	in_sim_objects)	{
+				in_sim_objects	=	sim_objects	;
+				return(0)	;
 }
 
-Trick::SimObject * Trick::Executive::get_sim_object_by_name(std::string sim_object_name) {
-    for ( int ii = 0 ; ii < sim_objects.size() ; ii++ ) {
-        if ( ! sim_objects[ii]->name.compare(sim_object_name) ) {
-            return sim_objects[ii];
-        }
-    }
+Trick::SimObject	*	Trick::Executive::get_sim_object_by_name(std::string	sim_object_name)	{
+				for	(	int	ii	=	0	;	ii	<	sim_objects.size()	;	ii++	)	{
+								if	(	!	sim_objects[ii]->name.compare(sim_object_name)	)	{
+												return	sim_objects[ii];
+								}
+				}
 
-    return NULL;
+				return	NULL;
 }
 
-double Trick::Executive::get_software_frame() {
-    return(software_frame) ;
+double	Trick::Executive::get_software_frame()	{
+				return(software_frame)	;
 }
 
-long long Trick::Executive::get_software_frame_tics() {
-    return(software_frame_tics) ;
+long	long	Trick::Executive::get_software_frame_tics()	{
+				return(software_frame_tics)	;
 }
 
-long long Trick::Executive::get_frame_count() {
-    return(frame_count) ;
+long	long	Trick::Executive::get_frame_count()	{
+				return(frame_count)	;
 }
 
-long long Trick::Executive::get_freeze_frame_count() {
-    return(freeze_frame_count) ;
+long	long	Trick::Executive::get_freeze_frame_count()	{
+				return(freeze_frame_count)	;
 }
 
-Trick::Threads * Trick::Executive::get_thread(unsigned int thread_id) {
-    if ( thread_id < threads.size() ) {
-        return threads[thread_id] ;
-    }
-    return NULL ;
+Trick::Threads	*	Trick::Executive::get_thread(unsigned	int	thread_id)	{
+				if	(	thread_id	<	threads.size()	)	{
+								return	threads[thread_id]	;
+				}
+				return	NULL	;
 }
 
-pthread_t Trick::Executive::get_pthread_id(unsigned int thread_id) {
-    if ( thread_id < threads.size() ) {
-        return threads[thread_id]->get_pthread_id() ;
-    }
-    return 0 ;
+pthread_t	Trick::Executive::get_pthread_id(unsigned	int	thread_id)	{
+				if	(	thread_id	<	threads.size()	)	{
+								return	threads[thread_id]->get_pthread_id()	;
+				}
+				return	0	;
 }
 
-bool Trick::Executive::get_stack_trace() {
-    return(stack_trace) ;
+bool	Trick::Executive::get_stack_trace()	{
+				return(stack_trace)	;
 }
 
-double Trick::Executive::get_thread_amf_cycle_time(unsigned int thread_id) {
-    if ( thread_id < threads.size() ) {
-        return threads[thread_id]->amf_cycle ;
-    }
-    return -1.0 ;
+double	Trick::Executive::get_thread_amf_cycle_time(unsigned	int	thread_id)	{
+				if	(	thread_id	<	threads.size()	)	{
+								return	threads[thread_id]->amf_cycle	;
+				}
+				return	-1.0	;
 }
 
-double Trick::Executive::get_terminate_time() {
-    return(terminate_time / time_tic_value) ;
+double	Trick::Executive::get_terminate_time()	{
+				return(terminate_time	/	time_tic_value)	;
 }
 
-int Trick::Executive::get_time_tic_value() {
-    return(time_tic_value) ;
+int	Trick::Executive::get_time_tic_value()	{
+				return(time_tic_value)	;
 }
 
-long long Trick::Executive::get_freeze_time_tics() {
-    return(freeze_time_tics) ;
+long	long	Trick::Executive::get_freeze_time_tics()	{
+				return(freeze_time_tics)	;
 }
 
-bool Trick::Executive::get_trap_sigbus() {
-    return(trap_sigbus) ;
+bool	Trick::Executive::get_trap_sigbus()	{
+				return(trap_sigbus)	;
 }
 
-bool Trick::Executive::get_trap_sigfpe() {
-    return(trap_sigfpe) ;
+bool	Trick::Executive::get_trap_sigfpe()	{
+				return(trap_sigfpe)	;
 }
 
-bool Trick::Executive::get_trap_sigsegv() {
-    return(trap_sigsegv) ;
+bool	Trick::Executive::get_trap_sigsegv()	{
+				return(trap_sigsegv)	;
 }
 
-bool Trick::Executive::get_trap_sigabrt() {
-    return(trap_sigabrt) ;
+bool	Trick::Executive::get_trap_sigabrt()	{
+				return(trap_sigabrt)	;
 }
 
-bool Trick::Executive::get_trap_sigchld() {
-    return(trap_sigchld) ;
+bool	Trick::Executive::get_trap_sigchld()	{
+				return(trap_sigchld)	;
 }
 
-void Trick::Executive::reset_job_cycle_times() {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        Trick::JobData * temp_job = all_jobs_vector[ii] ;
-        temp_job->calc_cycle_tics() ;
-    }
-    return ;
+void	Trick::Executive::reset_job_cycle_times()	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								Trick::JobData	*	temp_job	=	all_jobs_vector[ii]	;
+								temp_job->calc_cycle_tics()	;
+				}
+				return	;
 }
 
-void Trick::Executive::reset_job_call_times() {
-    unsigned int ii ;
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        Trick::JobData * temp_job = all_jobs_vector[ii] ;
-        temp_job->start_tics = (long long)round((double)temp_job->start_tics / old_time_tic_value * time_tic_value) + time_tics ;
+void	Trick::Executive::reset_job_call_times()	{
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								Trick::JobData	*	temp_job	=	all_jobs_vector[ii]	;
+								temp_job->start_tics	=	(long	long)round((double)temp_job->start_tics	/	old_time_tic_value	*	time_tic_value)	+	time_tics	;
 
-        if ( temp_job->disabled == false and
-             (!temp_job->system_job_class or !temp_job->job_class_name.compare("system_advance_sim_time")) ) {
-            if ( ! temp_job->job_class_name.compare("integ_loop")) {
-                temp_job->next_tics  = temp_job->cycle_tics + temp_job->start_tics ;
-            } else {
-                temp_job->next_tics  = temp_job->start_tics ;
-            }
-        }
-    }
-    return ;
+								if	(	temp_job->disabled	==	false	and
+													(!temp_job->system_job_class	or	!temp_job->job_class_name.compare("system_advance_sim_time"))	)	{
+												if	(	!	temp_job->job_class_name.compare("integ_loop"))	{
+																temp_job->next_tics		=	temp_job->cycle_tics	+	temp_job->start_tics	;
+												}	else	{
+																temp_job->next_tics		=	temp_job->start_tics	;
+												}
+								}
+				}
+				return	;
 }
 
-int Trick::Executive::set_attach_debugger(bool on_off) {
-    attach_debugger = on_off ;
-    return(0) ;
+int	Trick::Executive::set_attach_debugger(bool	on_off)	{
+				attach_debugger	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_debugger_command(std::string command) {
-    debugger_command = command ;
-    return(0) ;
+int	Trick::Executive::set_debugger_command(std::string	command)	{
+				debugger_command	=	command	;
+				return(0)	;
 }
 
-int Trick::Executive::set_exec_command(SIM_COMMAND in_command) {
-    exec_command = in_command ;
-    return(0) ;
+int	Trick::Executive::set_exec_command(SIM_COMMAND	in_command)	{
+				exec_command	=	in_command	;
+				return(0)	;
 }
 
-int Trick::Executive::set_enable_freeze(bool on_off) {
-    enable_freeze = on_off ;
-    return(0) ;
+int	Trick::Executive::set_enable_freeze(bool	on_off)	{
+				enable_freeze	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_freeze_command(bool on_off) {
-    freeze_command = on_off ;
-    return(0) ;
+int	Trick::Executive::set_freeze_command(bool	on_off)	{
+				freeze_command	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_freeze_on_frame_boundary(bool on_off) {
-    freeze_on_frame_boundary = on_off ;
-    return(0) ;
+int	Trick::Executive::set_freeze_on_frame_boundary(bool	on_off)	{
+				freeze_on_frame_boundary	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_freeze_frame(double in_frame) {
-    freeze_frame = in_frame ;
-    freeze_frame_tics = (long long)(freeze_frame * time_tic_value) ;
-    return(0) ;
+int	Trick::Executive::set_freeze_frame(double	in_frame)	{
+				freeze_frame	=	in_frame	;
+				freeze_frame_tics	=	(long	long)(freeze_frame	*	time_tic_value)	;
+				return(0)	;
 }
 
-int Trick::Executive::set_rt_nap(bool on_off) {
-    rt_nap = on_off ;
-    return(0) ;
+int	Trick::Executive::set_rt_nap(bool	on_off)	{
+				rt_nap	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_software_frame(double in_frame) {
-    software_frame = in_frame ;
-    software_frame_tics = (long long)(software_frame * time_tic_value) ;
-    next_frame_check_tics = (long long)((sim_start * time_tic_value) + software_frame_tics) ;
-    return(0) ;
+int	Trick::Executive::set_software_frame(double	in_frame)	{
+				software_frame	=	in_frame	;
+				software_frame_tics	=	(long	long)(software_frame	*	time_tic_value)	;
+				next_frame_check_tics	=	(long	long)((sim_start	*	time_tic_value)	+	software_frame_tics)	;
+				return(0)	;
 }
 
-int Trick::Executive::set_stack_trace(bool on_off) {
-    stack_trace = on_off ;
-    return(0) ;
+int	Trick::Executive::set_stack_trace(bool	on_off)	{
+				stack_trace	=	on_off	;
+				return(0)	;
 }
 
-int Trick::Executive::set_terminate_time(double in_time) {
-    terminate_time = (long long)(in_time * time_tic_value) ;
-    return(0) ;
+int	Trick::Executive::set_terminate_time(double	in_time)	{
+				terminate_time	=	(long	long)(in_time	*	time_tic_value)	;
+				return(0)	;
 }
 
-int Trick::Executive::set_time(double in_time) {
-    time_tics = (long long)(in_time * time_tic_value) ;
-    for (unsigned int ii = 0 ; ii < threads.size() ; ii++ ) {
-       threads[ii]->curr_time_tics = time_tics ;
-    }
-    reset_job_call_times() ;
-    return(0) ;
+int	Trick::Executive::set_time(double	in_time)	{
+				time_tics	=	(long	long)(in_time	*	time_tic_value)	;
+				for	(unsigned	int	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+							threads[ii]->curr_time_tics	=	time_tics	;
+				}
+				reset_job_call_times()	;
+				return(0)	;
 }
 
-int Trick::Executive::set_time_tics(long long in_tics) {
-    time_tics = in_tics ;
-    reset_job_call_times() ;
-    return(0) ;
+int	Trick::Executive::set_time_tics(long	long	in_tics)	{
+				time_tics	=	in_tics	;
+				reset_job_call_times()	;
+				return(0)	;
 }
 
-int Trick::Executive::set_version_date_tag(std::string tag) {
-    this->version_date_tag = tag ;
-    return(0) ;
+int	Trick::Executive::set_version_date_tag(std::string	tag)	{
+				this->version_date_tag	=	tag	;
+				return(0)	;
 }
 
-int Trick::Executive::set_build_date(std::string date) {
-    this->build_date = date ;
-    return(0) ;
+int	Trick::Executive::set_build_date(std::string	date)	{
+				this->build_date	=	date	;
+				return(0)	;
 }
 
-int Trick::Executive::set_current_version(std::string version) {
-    this->current_version = version ;
-    return(0) ;
+int	Trick::Executive::set_current_version(std::string	version)	{
+				this->current_version	=	version	;
+				return(0)	;
 }
 
-int Trick::Executive::get_except_return() const {
-    return except_return;
+int	Trick::Executive::get_except_return()	const	{
+				return	except_return;
 }
diff --git a/trick_source/sim_services/Executive/ExecutiveException.cpp b/trick_source/sim_services/Executive/ExecutiveException.cpp
index 0db9d6292..4e7afceb3 100644
--- a/trick_source/sim_services/Executive/ExecutiveException.cpp
+++ b/trick_source/sim_services/Executive/ExecutiveException.cpp
@@ -1,24 +1,24 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/ExecutiveException.hh"
+#include	"trick/ExecutiveException.hh"
 
-Trick::ExecutiveException::ExecutiveException(int in_ret , std::string in_file , int line , std::string in_message ) {
+Trick::ExecutiveException::ExecutiveException(int	in_ret	,	std::string	in_file	,	int	line	,	std::string	in_message	)	{
 
-    std::ostringstream o ;
+				std::ostringstream	o	;
 
-    ret_code = in_ret ;
-    o << in_file << ":" << line ;
-    file = o.str() ;
-    message = in_message ;
+				ret_code	=	in_ret	;
+				o	<<	in_file	<<	":"	<<	line	;
+				file	=	o.str()	;
+				message	=	in_message	;
 
 }
 
-Trick::ExecutiveException::~ExecutiveException() throw () {
+Trick::ExecutiveException::~ExecutiveException()	throw	()	{
 }
 
-const char* Trick::ExecutiveException::what() const throw() {
-    return message.c_str() ;
+const	char*	Trick::ExecutiveException::what()	const	throw()	{
+				return	message.c_str()	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
index 38cb167cb..99668fb2c 100644
--- a/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_depends_on_job.cpp
@@ -1,50 +1,50 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# Find target job.  Return error if target job not found.
--# Find depends job.  Return error if depends job not found.
--# Return an error if both jobs are on the same thread.
--# The depend passed all checks, add the depends job to the target job dependency list
+-#	Find	target	job.		Return	error	if	target	job	not	found.
+-#	Find	depends	job.		Return	error	if	depends	job	not	found.
+-#	Return	an	error	if	both	jobs	are	on	the	same	thread.
+-#	The	depend	passed	all	checks,	add	the	depends	job	to	the	target	job	dependency	list
 */
-int Trick::Executive::add_depends_on_job( std::string target_job_string , unsigned int t_instance ,
-                                          std::string depend_job_string , unsigned int d_instance ) {
-
-    Trick::JobData * target_job ;
-    Trick::JobData * depend_job ;
-
-    /* Find target job.  Return error if target job not found. */
-    target_job = get_job(target_job_string, t_instance) ;
-    if ( target_job == NULL ) {
-        message_publish(MSG_ERROR, "add_depends_on_job: Could not find target job %s instance %d\n",
-         target_job_string.c_str(), t_instance) ;
-        return(-1) ;
-    }
-
-    /* Find depends job.  Return error if depends job not found. */
-    depend_job = get_job(depend_job_string, d_instance) ;
-    if ( depend_job == NULL ) {
-        message_publish(MSG_ERROR, "add_depends_on_job: Could not find depend job %s instance %d\n",
-         depend_job_string.c_str(), d_instance) ;
-        return(-2) ;
-    }
-
-    /* Return an error if both jobs are on the same thread */
-    if( target_job->thread == depend_job->thread) {
-        message_publish(MSG_ERROR, "add_depends_on_job: target job %s and depend job %s on the same thread",
-         target_job_string.c_str() , depend_job_string.c_str()) ;  ;
-        return(-3) ;
-    }
-
-    /* Passed all checks, add the depends job to the target job dependency list */
-    target_job->add_depend(depend_job) ;
-
-    return(0) ;
+int	Trick::Executive::add_depends_on_job(	std::string	target_job_string	,	unsigned	int	t_instance	,
+																																										std::string	depend_job_string	,	unsigned	int	d_instance	)	{
+
+				Trick::JobData	*	target_job	;
+				Trick::JobData	*	depend_job	;
+
+				/*	Find	target	job.		Return	error	if	target	job	not	found.	*/
+				target_job	=	get_job(target_job_string,	t_instance)	;
+				if	(	target_job	==	NULL	)	{
+								message_publish(MSG_ERROR,	"add_depends_on_job:	Could	not	find	target	job	%s	instance	%d\n",
+									target_job_string.c_str(),	t_instance)	;
+								return(-1)	;
+				}
+
+				/*	Find	depends	job.		Return	error	if	depends	job	not	found.	*/
+				depend_job	=	get_job(depend_job_string,	d_instance)	;
+				if	(	depend_job	==	NULL	)	{
+								message_publish(MSG_ERROR,	"add_depends_on_job:	Could	not	find	depend	job	%s	instance	%d\n",
+									depend_job_string.c_str(),	d_instance)	;
+								return(-2)	;
+				}
+
+				/*	Return	an	error	if	both	jobs	are	on	the	same	thread	*/
+				if(	target_job->thread	==	depend_job->thread)	{
+								message_publish(MSG_ERROR,	"add_depends_on_job:	target	job	%s	and	depend	job	%s	on	the	same	thread",
+									target_job_string.c_str()	,	depend_job_string.c_str())	;		;
+								return(-3)	;
+				}
+
+				/*	Passed	all	checks,	add	the	depends	job	to	the	target	job	dependency	list	*/
+				target_job->add_depend(depend_job)	;
+
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp b/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp
index eadbb8d9a..43754a915 100644
--- a/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_jobs_to_queue.cpp
@@ -1,198 +1,198 @@
 
-#include <iostream>
-#include <math.h>
+#include	<iostream>
+#include	<math.h>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/TrickConstant.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/TrickConstant.hh"
 
 /**
 @details
--# For each job in the sim_object
-    -# Assign the job's sim_object id to the parent object's id.
-    -# Assign the job's parent object pointer to the parent object.
-    -# Assign the job's name if we are not restarting this sim.
-    -# Assign the job's frame id as (<sim_object>.<job_name>)
-    -# If the job is a system job or automatic job, Mark the job as a system class job.  System class
-       jobs next call times are not recalculated by the scheduler.
-    -# If the job is an instrumentation job, mark the job as handled by the Executive.
-    -# If the job is the advance_sim_time job
-       -# Assign this job to #advance_sim_time_job
-       -# If the sim is not restarting, set the next job call time to the advance_sim_time
-          job to the current time.
-    -# The maximum number of execution threads required by each sim_object is searched for
-       as each sim_object is added to the scheduler.
-        -# If the incoming thread id is greater than the current number of threads in the
-           executive, create a new Trick::Threads object.
-           Requirement [@ref r_exec_thread_4]
-        -# Add the new thread object to the list of threads handled by the executive.
-    -# Call Trick::Executive::add_job_to_queue(JobData *) to add job to the individual job class
-       Trick::ScheduledQueue
-    -# If the sim is not restarting, convert the initial start, stop, and next call times to
-       simulation tics.  The next call time is based on the current simulation time + job offset.
-       Requirement [@ref r_exec_jobs_3]
+-#	For	each	job	in	the	sim_object
+				-#	Assign	the	job's	sim_object	id	to	the	parent	object's	id.
+				-#	Assign	the	job's	parent	object	pointer	to	the	parent	object.
+				-#	Assign	the	job's	name	if	we	are	not	restarting	this	sim.
+				-#	Assign	the	job's	frame	id	as	(<sim_object>.<job_name>)
+				-#	If	the	job	is	a	system	job	or	automatic	job,	Mark	the	job	as	a	system	class	job.		System	class
+							jobs	next	call	times	are	not	recalculated	by	the	scheduler.
+				-#	If	the	job	is	an	instrumentation	job,	mark	the	job	as	handled	by	the	Executive.
+				-#	If	the	job	is	the	advance_sim_time	job
+							-#	Assign	this	job	to	#advance_sim_time_job
+							-#	If	the	sim	is	not	restarting,	set	the	next	job	call	time	to	the	advance_sim_time
+										job	to	the	current	time.
+				-#	The	maximum	number	of	execution	threads	required	by	each	sim_object	is	searched	for
+							as	each	sim_object	is	added	to	the	scheduler.
+								-#	If	the	incoming	thread	id	is	greater	than	the	current	number	of	threads	in	the
+											executive,	create	a	new	Trick::Threads	object.
+											Requirement	[@ref	r_exec_thread_4]
+								-#	Add	the	new	thread	object	to	the	list	of	threads	handled	by	the	executive.
+				-#	Call	Trick::Executive::add_job_to_queue(JobData	*)	to	add	job	to	the	individual	job	class
+							Trick::ScheduledQueue
+				-#	If	the	sim	is	not	restarting,	convert	the	initial	start,	stop,	and	next	call	times	to
+							simulation	tics.		The	next	call	time	is	based	on	the	current	simulation	time	+	job	offset.
+							Requirement	[@ref	r_exec_jobs_3]
 */
-int Trick::Executive::add_jobs_to_queue( Trick::SimObject * in_sim_object , bool restart_flag ) {
-
-    unsigned int jj , kk ;
-    double max_time ;
-    Trick::JobData * temp_job  ;
-    Trick::Threads * curr_thread ;
-    int ret ;
-
-    max_time = TRICK_MAX_LONG_LONG / time_tic_value ;
-
-    for ( jj = 0 ; jj < in_sim_object->jobs.size() ; jj++ ) {
-        temp_job = in_sim_object->jobs[jj] ;
-
-        // TODO: should we make unique names for jobs with same name here?
-        /* assign job sim_object_id for job priority sorting */
-        temp_job->sim_object_id = in_sim_object->id ;
-        temp_job->parent_object = in_sim_object ;
-        if ( restart_flag == false ) {
-            temp_job->name = in_sim_object->name + "." + temp_job->name ;
-        }
-        temp_job->frame_id = temp_job->sim_object_id + ((double)temp_job->id / 100.0);
-
-        /* Find the system and automatic jobs and mark them as system jobs. */
-        if ( ! temp_job->job_class_name.compare(0,7,"system_") ||
-             ! temp_job->job_class_name.compare(0,9,"automatic") ||
-             ! temp_job->job_class_name.compare("input_processor_run") ||
-             ! temp_job->job_class_name.compare("freeze_automatic") ) {
-            temp_job->set_system_job_class(true) ;
-        }
-
-        /* Some jobs are not added to a queue so should be marked handled by default. */
-        /* This avoids getting unnecessary warning messages about jobs not being added to any queue. */
-        if (( ! temp_job->job_class_name.compare("instrumentation")) ||
-            ( ! temp_job->job_class_name.compare("malfunction")) ) {
-            temp_job->set_handled(true) ;
-        }
-
-        /* search for the advance_sim_time job */
-        if ( ! temp_job->job_class_name.compare("system_advance_sim_time")) {
-            advance_sim_time_job = temp_job ;
-            if ( restart_flag == false ) {
-                temp_job->next_tics = time_tics ;
-            }
-        }
-
-        /* Create a new thread structure if the job is specified to be on a higher numbered thread */
-        if ( (temp_job->thread + 1) > threads.size() ) {
-            for ( kk = threads.size() ; kk <= temp_job->thread ; kk++ ) {
-                curr_thread = new Trick::Threads(kk, rt_nap) ;
-                threads.push_back(curr_thread) ;
-            }
-        }
-
-        /* Call add_job_to_queue(JobData *) to add job to proper Trick::ScheduledQueue */
-        ret = add_job_to_queue(temp_job) ;
-
-        /* If add_jobs is called during initialization, restart_flag == false,
-           calcluate the cycle/start/stop times for the job */
-        if ( (restart_flag == false) and (temp_job->job_class >= scheduled_start_index) and (ret == 0 )) {
-
-            temp_job->calc_cycle_tics() ;
-
-            if ( temp_job->start > max_time ) {
-                temp_job->disabled = true ;
-                temp_job->start_tics = TRICK_MAX_LONG_LONG ;
-            } else {
-                temp_job->start_tics = (long long)(temp_job->start * time_tic_value) ;
-            }
-
-            if ( temp_job->stop > max_time ) {
-                temp_job->stop_tics = TRICK_MAX_LONG_LONG ;
-            } else if ( temp_job->stop < temp_job->start ) {
-                temp_job->disabled = true ;
-            } else {
-                temp_job->stop_tics = (long long)(temp_job->stop * time_tic_value) ;
-            }
-
-            if ( temp_job->disabled == false ) {
-                if ( ! temp_job->job_class_name.compare("integ_loop")) {
-                    temp_job->next_tics  = time_tics + temp_job->cycle_tics + temp_job->start_tics ;
-                } else {
-                    temp_job->next_tics  = time_tics + temp_job->start_tics ;
-                }
-            } else {
-                temp_job->next_tics  = TRICK_MAX_LONG_LONG ;
-            }
-        }
-        if ( ! temp_job->job_class_name.compare("freeze_scheduled")) {
-            temp_job->calc_cycle_tics() ;
-            temp_job->stop_tics = TRICK_MAX_LONG_LONG ;
-        }
-    }
-
-    return(0) ;
+int	Trick::Executive::add_jobs_to_queue(	Trick::SimObject	*	in_sim_object	,	bool	restart_flag	)	{
+
+				unsigned	int	jj	,	kk	;
+				double	max_time	;
+				Trick::JobData	*	temp_job		;
+				Trick::Threads	*	curr_thread	;
+				int	ret	;
+
+				max_time	=	TRICK_MAX_LONG_LONG	/	time_tic_value	;
+
+				for	(	jj	=	0	;	jj	<	in_sim_object->jobs.size()	;	jj++	)	{
+								temp_job	=	in_sim_object->jobs[jj]	;
+
+								//	TODO:	should	we	make	unique	names	for	jobs	with	same	name	here?
+								/*	assign	job	sim_object_id	for	job	priority	sorting	*/
+								temp_job->sim_object_id	=	in_sim_object->id	;
+								temp_job->parent_object	=	in_sim_object	;
+								if	(	restart_flag	==	false	)	{
+												temp_job->name	=	in_sim_object->name	+	"."	+	temp_job->name	;
+								}
+								temp_job->frame_id	=	temp_job->sim_object_id	+	((double)temp_job->id	/	100.0);
+
+								/*	Find	the	system	and	automatic	jobs	and	mark	them	as	system	jobs.	*/
+								if	(	!	temp_job->job_class_name.compare(0,7,"system_")	||
+													!	temp_job->job_class_name.compare(0,9,"automatic")	||
+													!	temp_job->job_class_name.compare("input_processor_run")	||
+													!	temp_job->job_class_name.compare("freeze_automatic")	)	{
+												temp_job->set_system_job_class(true)	;
+								}
+
+								/*	Some	jobs	are	not	added	to	a	queue	so	should	be	marked	handled	by	default.	*/
+								/*	This	avoids	getting	unnecessary	warning	messages	about	jobs	not	being	added	to	any	queue.	*/
+								if	((	!	temp_job->job_class_name.compare("instrumentation"))	||
+												(	!	temp_job->job_class_name.compare("malfunction"))	)	{
+												temp_job->set_handled(true)	;
+								}
+
+								/*	search	for	the	advance_sim_time	job	*/
+								if	(	!	temp_job->job_class_name.compare("system_advance_sim_time"))	{
+												advance_sim_time_job	=	temp_job	;
+												if	(	restart_flag	==	false	)	{
+																temp_job->next_tics	=	time_tics	;
+												}
+								}
+
+								/*	Create	a	new	thread	structure	if	the	job	is	specified	to	be	on	a	higher	numbered	thread	*/
+								if	(	(temp_job->thread	+	1)	>	threads.size()	)	{
+												for	(	kk	=	threads.size()	;	kk	<=	temp_job->thread	;	kk++	)	{
+																curr_thread	=	new	Trick::Threads(kk,	rt_nap)	;
+																threads.push_back(curr_thread)	;
+												}
+								}
+
+								/*	Call	add_job_to_queue(JobData	*)	to	add	job	to	proper	Trick::ScheduledQueue	*/
+								ret	=	add_job_to_queue(temp_job)	;
+
+								/*	If	add_jobs	is	called	during	initialization,	restart_flag	==	false,
+											calcluate	the	cycle/start/stop	times	for	the	job	*/
+								if	(	(restart_flag	==	false)	and	(temp_job->job_class	>=	scheduled_start_index)	and	(ret	==	0	))	{
+
+												temp_job->calc_cycle_tics()	;
+
+												if	(	temp_job->start	>	max_time	)	{
+																temp_job->disabled	=	true	;
+																temp_job->start_tics	=	TRICK_MAX_LONG_LONG	;
+												}	else	{
+																temp_job->start_tics	=	(long	long)(temp_job->start	*	time_tic_value)	;
+												}
+
+												if	(	temp_job->stop	>	max_time	)	{
+																temp_job->stop_tics	=	TRICK_MAX_LONG_LONG	;
+												}	else	if	(	temp_job->stop	<	temp_job->start	)	{
+																temp_job->disabled	=	true	;
+												}	else	{
+																temp_job->stop_tics	=	(long	long)(temp_job->stop	*	time_tic_value)	;
+												}
+
+												if	(	temp_job->disabled	==	false	)	{
+																if	(	!	temp_job->job_class_name.compare("integ_loop"))	{
+																				temp_job->next_tics		=	time_tics	+	temp_job->cycle_tics	+	temp_job->start_tics	;
+																}	else	{
+																				temp_job->next_tics		=	time_tics	+	temp_job->start_tics	;
+																}
+												}	else	{
+																temp_job->next_tics		=	TRICK_MAX_LONG_LONG	;
+												}
+								}
+								if	(	!	temp_job->job_class_name.compare("freeze_scheduled"))	{
+												temp_job->calc_cycle_tics()	;
+												temp_job->stop_tics	=	TRICK_MAX_LONG_LONG	;
+								}
+				}
+
+				return(0)	;
 
 }
 
 /**
 @details
--# If the job class matches one of the following job classes: default_data, initialization,
-   all scheduled classes as defined in the S_define file, and shutdown.
--# If the job class is a cyclic scheduled job, add it to the Trick::ScheduledJobQueue corresponding
-   to the thread number specified by the job.
--# Else add the job the the non-cyclic job class Trick::ScheduledJobQueue.
+-#	If	the	job	class	matches	one	of	the	following	job	classes:	default_data,	initialization,
+			all	scheduled	classes	as	defined	in	the	S_define	file,	and	shutdown.
+-#	If	the	job	class	is	a	cyclic	scheduled	job,	add	it	to	the	Trick::ScheduledJobQueue	corresponding
+			to	the	thread	number	specified	by	the	job.
+-#	Else	add	the	job	the	the	non-cyclic	job	class	Trick::ScheduledJobQueue.
 */
-int Trick::Executive::add_job_to_queue( Trick::JobData * job ) {
-
-    std::map<std::string, int>::iterator class_id_it ;
-    std::map<int, Trick::ScheduledJobQueue *>::iterator queue_it ;
-    Trick::ScheduledJobQueue * curr_queue ;
-    Trick::JobData::TagsIterator it ;
-
-    /* Add job to convienience constructs for easy retrival */
-    all_jobs.insert(std::pair<std::string, JobData *>(job->name,job)) ;
-    all_jobs_vector.push_back(job) ;
-    for ( it = job->tags_begin() ; it != job->tags_end() ; ++it ) {
-        all_tagged_jobs.insert(std::pair<std::string, JobData *>(*it,job)) ;
-    }
-
-    /* Get the job class id from the string of the job class if the class name is known to the scheduler */
-    if ( (class_id_it = class_map.find(job->job_class_name)) != class_map.end() ) {
-        job->job_class = class_id_it->second ;
-
-        if ( job->thread != 0 ) {
-            /* Add threaded scheduled jobs to the thread scheduled queue */
-            if ( job->job_class >= scheduled_start_index ) {
-                threads[job->thread]->job_queue.push(job) ;
-                // Add all scheduled jobs to the scheduled_queue for use in the multi-threaded loop
-                scheduled_queue.push(job) ;
-                return 0 ;
-            /* Threaded top_of_frame/end_of_frame jobs go to thread specific queues. */
-            } else if ( ! job->job_class_name.compare("top_of_frame")) {
-                threads[job->thread]->top_of_frame_queue.push(job) ;
-                return 0 ;
-            } else if ( ! job->job_class_name.compare("end_of_frame")) {
-                threads[job->thread]->end_of_frame_queue.push(job) ;
-                return 0 ;
-            /* Other jobs classes are put into the main thread */
-            } else if ( (queue_it = class_to_queue.find(job->job_class)) != class_to_queue.end() ) {
-                /* for non-scheduled jobs, the class_to_queue map holds the correct queue to insert the job */
-                curr_queue = queue_it->second ;
-                curr_queue->push( job ) ;
-                return 0 ;
-            }
-        } else {
-            /* if the job is a "scheduled" type job, insert the job into the proper thread queue */
-            if ( job->job_class >= scheduled_start_index ) {
-                threads[0]->job_queue.push(job) ;
-                // Add all scheduled jobs to the scheduled_queue for use in the multi-threaded loop
-                scheduled_queue.push(job) ;
-                return 0 ;
-            } else if ( (queue_it = class_to_queue.find(job->job_class)) != class_to_queue.end() ) {
-                /* for non-scheduled jobs, the class_to_queue map holds the correct queue to insert the job */
-                curr_queue = queue_it->second ;
-                curr_queue->push( job ) ;
-                return 0 ;
-            }
-        }
-    }
-
-    return -1 ;
+int	Trick::Executive::add_job_to_queue(	Trick::JobData	*	job	)	{
+
+				std::map<std::string,	int>::iterator	class_id_it	;
+				std::map<int,	Trick::ScheduledJobQueue	*>::iterator	queue_it	;
+				Trick::ScheduledJobQueue	*	curr_queue	;
+				Trick::JobData::TagsIterator	it	;
+
+				/*	Add	job	to	convienience	constructs	for	easy	retrival	*/
+				all_jobs.insert(std::pair<std::string,	JobData	*>(job->name,job))	;
+				all_jobs_vector.push_back(job)	;
+				for	(	it	=	job->tags_begin()	;	it	!=	job->tags_end()	;	++it	)	{
+								all_tagged_jobs.insert(std::pair<std::string,	JobData	*>(*it,job))	;
+				}
+
+				/*	Get	the	job	class	id	from	the	string	of	the	job	class	if	the	class	name	is	known	to	the	scheduler	*/
+				if	(	(class_id_it	=	class_map.find(job->job_class_name))	!=	class_map.end()	)	{
+								job->job_class	=	class_id_it->second	;
+
+								if	(	job->thread	!=	0	)	{
+												/*	Add	threaded	scheduled	jobs	to	the	thread	scheduled	queue	*/
+												if	(	job->job_class	>=	scheduled_start_index	)	{
+																threads[job->thread]->job_queue.push(job)	;
+																//	Add	all	scheduled	jobs	to	the	scheduled_queue	for	use	in	the	multi-threaded	loop
+																scheduled_queue.push(job)	;
+																return	0	;
+												/*	Threaded	top_of_frame/end_of_frame	jobs	go	to	thread	specific	queues.	*/
+												}	else	if	(	!	job->job_class_name.compare("top_of_frame"))	{
+																threads[job->thread]->top_of_frame_queue.push(job)	;
+																return	0	;
+												}	else	if	(	!	job->job_class_name.compare("end_of_frame"))	{
+																threads[job->thread]->end_of_frame_queue.push(job)	;
+																return	0	;
+												/*	Other	jobs	classes	are	put	into	the	main	thread	*/
+												}	else	if	(	(queue_it	=	class_to_queue.find(job->job_class))	!=	class_to_queue.end()	)	{
+																/*	for	non-scheduled	jobs,	the	class_to_queue	map	holds	the	correct	queue	to	insert	the	job	*/
+																curr_queue	=	queue_it->second	;
+																curr_queue->push(	job	)	;
+																return	0	;
+												}
+								}	else	{
+												/*	if	the	job	is	a	"scheduled"	type	job,	insert	the	job	into	the	proper	thread	queue	*/
+												if	(	job->job_class	>=	scheduled_start_index	)	{
+																threads[0]->job_queue.push(job)	;
+																//	Add	all	scheduled	jobs	to	the	scheduled_queue	for	use	in	the	multi-threaded	loop
+																scheduled_queue.push(job)	;
+																return	0	;
+												}	else	if	(	(queue_it	=	class_to_queue.find(job->job_class))	!=	class_to_queue.end()	)	{
+																/*	for	non-scheduled	jobs,	the	class_to_queue	map	holds	the	correct	queue	to	insert	the	job	*/
+																curr_queue	=	queue_it->second	;
+																curr_queue->push(	job	)	;
+																return	0	;
+												}
+								}
+				}
+
+				return	-1	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
index 72cd715e7..157511189 100644
--- a/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_scheduled_job_class.cpp
@@ -1,29 +1,29 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @details
--# Gets the size of the class map.
--# Add the incoming job class string as a key to the class_job map. Assign it the value of
-   of ( scheduled_job_class_base + size_of_map )
- */
-int Trick::Executive::add_scheduled_job_class( std::string in_name ) {
+-#	Gets	the	size	of	the	class	map.
+-#	Add	the	incoming	job	class	string	as	a	key	to	the	class_job	map.	Assign	it	the	value	of
+			of	(	scheduled_job_class_base	+	size_of_map	)
+	*/
+int	Trick::Executive::add_scheduled_job_class(	std::string	in_name	)	{
 
-    unsigned int index ;
+				unsigned	int	index	;
 
-    if ( in_name.empty() ) {
-        return(-1) ;
-    }
+				if	(	in_name.empty()	)	{
+								return(-1)	;
+				}
 
-    if ( class_map.find(in_name) == class_map.end() ) {
-        index = scheduled_start_index + num_scheduled_job_classes++ ;
-        class_map[in_name] = index ;
-        class_to_queue[index] = &scheduled_queue ;
-    }
+				if	(	class_map.find(in_name)	==	class_map.end()	)	{
+								index	=	scheduled_start_index	+	num_scheduled_job_classes++	;
+								class_map[in_name]	=	index	;
+								class_to_queue[index]	=	&scheduled_queue	;
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_add_sim_object.cpp b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
index 71526a093..5f85a6a88 100644
--- a/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
+++ b/trick_source/sim_services/Executive/Executive_add_sim_object.cpp
@@ -1,52 +1,52 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @details
--# Assign the name of the sim_object.
--# Call add_sim_object(Trick::SimObject *, const char *) for component objects that
-   are to be processed before the current object.
--# Assign the incoming SimObject a unique id.
--# Push the object onto the list of SimObjects handled by the Executive.
--# Call add_jobs_to_queue(SimObject *, bool) to add the jobs in the
-   sim_object to the scheduler.
--# Call add_sim_object(Trick::SimObject *, const char *) for component objects that
-   are to be processed after the current object.
- */
-int Trick::Executive::add_sim_object( Trick::SimObject * in_object ) {
-    return add_sim_object( in_object, NULL ) ;
+-#	Assign	the	name	of	the	sim_object.
+-#	Call	add_sim_object(Trick::SimObject	*,	const	char	*)	for	component	objects	that
+			are	to	be	processed	before	the	current	object.
+-#	Assign	the	incoming	SimObject	a	unique	id.
+-#	Push	the	object	onto	the	list	of	SimObjects	handled	by	the	Executive.
+-#	Call	add_jobs_to_queue(SimObject	*,	bool)	to	add	the	jobs	in	the
+			sim_object	to	the	scheduler.
+-#	Call	add_sim_object(Trick::SimObject	*,	const	char	*)	for	component	objects	that
+			are	to	be	processed	after	the	current	object.
+	*/
+int	Trick::Executive::add_sim_object(	Trick::SimObject	*	in_object	)	{
+				return	add_sim_object(	in_object,	NULL	)	;
 }
 
-int Trick::Executive::add_sim_object( Trick::SimObject * in_object , const char * in_name ) {
+int	Trick::Executive::add_sim_object(	Trick::SimObject	*	in_object	,	const	char	*	in_name	)	{
 
-    unsigned int ii, jj ;
+				unsigned	int	ii,	jj	;
 
-    if ( in_name != NULL ) {
-        in_object->name = in_name ;
-    }
+				if	(	in_name	!=	NULL	)	{
+								in_object->name	=	in_name	;
+				}
 
-    for ( jj = 0 ; jj < in_object->pre_component_objects.size() ; jj++ ) {
-        in_object->pre_component_objects[jj]->name.insert(0 , in_object->name + std::string(".")) ;
-        add_sim_object(in_object->pre_component_objects[jj]) ;
-    }
+				for	(	jj	=	0	;	jj	<	in_object->pre_component_objects.size()	;	jj++	)	{
+								in_object->pre_component_objects[jj]->name.insert(0	,	in_object->name	+	std::string("."))	;
+								add_sim_object(in_object->pre_component_objects[jj])	;
+				}
 
-    in_object->id = ++num_sim_objects ;
-    //std::cout << "HERE with " << in_object->name << " id = " << in_object->id << std::endl ;
-    sim_objects.push_back(in_object) ;
-    add_jobs_to_queue( in_object ) ;
+				in_object->id	=	++num_sim_objects	;
+				//std::cout	<<	"HERE	with	"	<<	in_object->name	<<	"	id	=	"	<<	in_object->id	<<	std::endl	;
+				sim_objects.push_back(in_object)	;
+				add_jobs_to_queue(	in_object	)	;
 
-    for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-        other_schedulers[ii]->add_sim_object(in_object) ;
-    }
+				for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+								other_schedulers[ii]->add_sim_object(in_object)	;
+				}
 
-    for ( jj = 0 ; jj < in_object->post_component_objects.size() ; jj++ ) {
-        in_object->post_component_objects[jj]->name.insert(0 , in_object->name + std::string(".")) ;
-        add_sim_object(in_object->post_component_objects[jj]) ;
-    }
+				for	(	jj	=	0	;	jj	<	in_object->post_component_objects.size()	;	jj++	)	{
+								in_object->post_component_objects[jj]->name.insert(0	,	in_object->name	+	std::string("."))	;
+								add_sim_object(in_object->post_component_objects[jj])	;
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp b/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp
index 8d3b9574e..28eb007d8 100644
--- a/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp
+++ b/trick_source/sim_services/Executive/Executive_advance_sim_time.cpp
@@ -1,75 +1,75 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @design
--# Save the current #time_tics to #time_last_pass_tics
--# Set the simulation time to the next lowest job call time by
-   calling Trick::ScheduledThread::get_next_job_call_time().
--# Wait for all synchronous threads to finish
-   -# If the thread next_job_call_time is less than the overall time, set the overall time to
-      the thread next_jobs_call_time.
--# Set the next job call time of this job to the simulation time
+-#	Save	the	current	#time_tics	to	#time_last_pass_tics
+-#	Set	the	simulation	time	to	the	next	lowest	job	call	time	by
+			calling	Trick::ScheduledThread::get_next_job_call_time().
+-#	Wait	for	all	synchronous	threads	to	finish
+			-#	If	the	thread	next_job_call_time	is	less	than	the	overall	time,	set	the	overall	time	to
+						the	thread	next_jobs_call_time.
+-#	Set	the	next	job	call	time	of	this	job	to	the	simulation	time
 */
-int Trick::Executive::advance_sim_time() {
-
-    unsigned int ii ;
-
-    // synchronize the scheduled threads before advancing time.
-    scheduled_thread_sync() ;
-
-    /* Save the current time to time_last_pass */
-    time_last_pass_tics = time_tics ;
-
-    /* start with time tics set to the next end of frame */
-    time_tics = next_frame_check_tics ;
-
-    /* Set the simulation time to the next lowest job call time by
-       calling Trick::ScheduledThread::get_next_job_call_time(). */
-    long long next_job_call_time = threads[0]->job_queue.get_next_job_call_time() ;
-    if ( next_job_call_time < time_tics && next_job_call_time > time_last_pass_tics )  {
-        time_tics =  threads[0]->job_queue.get_next_job_call_time() ;
-    }
-
-    /* Check to see if there is an input processor event that happens before the next job */
-    next_job_call_time = input_processor_run_queue.get_next_job_call_time() ;
-    if ( next_job_call_time < time_tics && next_job_call_time > time_last_pass_tics )  {
-        time_tics =  next_job_call_time ;
-    }
-
-    /* Adjust time_tics if one of the threads has a job or async cycle time less than the main thread's next job */
-    for (ii = 1; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        if ( curr_thread->enabled ) {
-            if ( (curr_thread->process_type == PROCESS_TYPE_SCHEDULED) &&
-                 (curr_thread->job_queue.get_next_job_call_time() < time_tics) ) {
-                time_tics = curr_thread->job_queue.get_next_job_call_time() ;
-            }
-            if ( (curr_thread->process_type == PROCESS_TYPE_AMF_CHILD ) &&
-                 (curr_thread->amf_cycle_tics > 0 ) &&
-                 (curr_thread->amf_next_tics < time_tics) ) {
-                time_tics = curr_thread->amf_next_tics ;
-            }
-        }
-    }
-
-    /* Adjust time_tics to the terminate time if terminate is the next event */
-    if ( terminate_time < time_tics ) {
-        time_tics = terminate_time ;
-    }
-
-    // set the default next job call time to the next software frame ;
-    input_processor_run_queue.set_next_job_call_time(time_tics + software_frame_tics) ;
-    threads[0]->job_queue.set_next_job_call_time(time_tics + software_frame_tics) ;
-
-    /* Set the advance_sim_time() next job call time to be the new simulation elapsed time. */
-    advance_sim_time_job->next_tics = time_tics ;
-
-    /* Set the main thread current time to the simulation time tics value, used with Executive::get_sim_time() */
-    threads[0]->curr_time_tics = time_tics ;
-
-    return(0) ;
+int	Trick::Executive::advance_sim_time()	{
+
+				unsigned	int	ii	;
+
+				//	synchronize	the	scheduled	threads	before	advancing	time.
+				scheduled_thread_sync()	;
+
+				/*	Save	the	current	time	to	time_last_pass	*/
+				time_last_pass_tics	=	time_tics	;
+
+				/*	start	with	time	tics	set	to	the	next	end	of	frame	*/
+				time_tics	=	next_frame_check_tics	;
+
+				/*	Set	the	simulation	time	to	the	next	lowest	job	call	time	by
+							calling	Trick::ScheduledThread::get_next_job_call_time().	*/
+				long	long	next_job_call_time	=	threads[0]->job_queue.get_next_job_call_time()	;
+				if	(	next_job_call_time	<	time_tics	&&	next_job_call_time	>	time_last_pass_tics	)		{
+								time_tics	=		threads[0]->job_queue.get_next_job_call_time()	;
+				}
+
+				/*	Check	to	see	if	there	is	an	input	processor	event	that	happens	before	the	next	job	*/
+				next_job_call_time	=	input_processor_run_queue.get_next_job_call_time()	;
+				if	(	next_job_call_time	<	time_tics	&&	next_job_call_time	>	time_last_pass_tics	)		{
+								time_tics	=		next_job_call_time	;
+				}
+
+				/*	Adjust	time_tics	if	one	of	the	threads	has	a	job	or	async	cycle	time	less	than	the	main	thread's	next	job	*/
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								if	(	curr_thread->enabled	)	{
+												if	(	(curr_thread->process_type	==	PROCESS_TYPE_SCHEDULED)	&&
+																	(curr_thread->job_queue.get_next_job_call_time()	<	time_tics)	)	{
+																time_tics	=	curr_thread->job_queue.get_next_job_call_time()	;
+												}
+												if	(	(curr_thread->process_type	==	PROCESS_TYPE_AMF_CHILD	)	&&
+																	(curr_thread->amf_cycle_tics	>	0	)	&&
+																	(curr_thread->amf_next_tics	<	time_tics)	)	{
+																time_tics	=	curr_thread->amf_next_tics	;
+												}
+								}
+				}
+
+				/*	Adjust	time_tics	to	the	terminate	time	if	terminate	is	the	next	event	*/
+				if	(	terminate_time	<	time_tics	)	{
+								time_tics	=	terminate_time	;
+				}
+
+				//	set	the	default	next	job	call	time	to	the	next	software	frame	;
+				input_processor_run_queue.set_next_job_call_time(time_tics	+	software_frame_tics)	;
+				threads[0]->job_queue.set_next_job_call_time(time_tics	+	software_frame_tics)	;
+
+				/*	Set	the	advance_sim_time()	next	job	call	time	to	be	the	new	simulation	elapsed	time.	*/
+				advance_sim_time_job->next_tics	=	time_tics	;
+
+				/*	Set	the	main	thread	current	time	to	the	simulation	time	tics	value,	used	with	Executive::get_sim_time()	*/
+				threads[0]->curr_time_tics	=	time_tics	;
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_c_intf.cpp b/trick_source/sim_services/Executive/Executive_c_intf.cpp
index 8e88f0c05..4a6f103e5 100644
--- a/trick_source/sim_services/Executive/Executive_c_intf.cpp
+++ b/trick_source/sim_services/Executive/Executive_c_intf.cpp
@@ -1,1098 +1,1098 @@
 
-#include <iostream>
-#include <vector>
-#include <string>
+#include	<iostream>
+#include	<vector>
+#include	<string>
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
 
-/* Global singleton pointer to the executive */
-extern Trick::Executive * the_exec ;
+/*	Global	singleton	pointer	to	the	executive	*/
+extern	Trick::Executive	*	the_exec	;
 
 /**
- * @relates Trick::Executive
- * returns a pointer to the simulation executive
- * @return Executive
- */
-Trick::Executive * exec_get_exec_cpp() {
-    return ( the_exec ) ;
+	*	@relates	Trick::Executive
+	*	returns	a	pointer	to	the	simulation	executive
+	*	@return	Executive
+	*/
+Trick::Executive	*	exec_get_exec_cpp()	{
+				return	(	the_exec	)	;
 }
 
 /*********************************************************/
-/* These routines are the "C" interface to the executive */
+/*	These	routines	are	the	"C"	interface	to	the	executive	*/
 /*********************************************************/
 
-// -------------------------- GET ------------------------
+//	--------------------------	GET	------------------------
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_attach_debugger
- * C wrapper for Trick::Executive::get_attach_debugger
- */
-extern "C" int exec_get_attach_debugger() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_attach_debugger() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_attach_debugger
+	*	C	wrapper	for	Trick::Executive::get_attach_debugger
+	*/
+extern	"C"	int	exec_get_attach_debugger()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_attach_debugger()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_debugger_command
- * C wrapper for Trick::Executive::get_debugger_command
- */
-extern "C" const char * exec_get_debugger_command() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_debugger_command().c_str() ;
-    }
-    return NULL ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_debugger_command
+	*	C	wrapper	for	Trick::Executive::get_debugger_command
+	*/
+extern	"C"	const	char	*	exec_get_debugger_command()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_debugger_command().c_str()	;
+				}
+				return	NULL	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_enable_freeze
- * C wrapper for Trick::Executive::get_enable_freeze
- */
-extern "C" int exec_get_enable_freeze() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_enable_freeze() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_enable_freeze
+	*	C	wrapper	for	Trick::Executive::get_enable_freeze
+	*/
+extern	"C"	int	exec_get_enable_freeze()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_enable_freeze()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_exec_command
- * C wrapper for Trick::Executive::get_exec_command
- */
-extern "C" SIM_COMMAND exec_get_exec_command() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_exec_command() ;
-    }
-    return NoCmd ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_exec_command
+	*	C	wrapper	for	Trick::Executive::get_exec_command
+	*/
+extern	"C"	SIM_COMMAND	exec_get_exec_command()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_exec_command()	;
+				}
+				return	NoCmd	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_frame
- * C wrapper for Trick::Executive::get_freeze_frame
- */
-extern "C" double exec_get_freeze_frame() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_freeze_frame() ;
-    }
-    return 0.0 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_frame
+	*	C	wrapper	for	Trick::Executive::get_freeze_frame
+	*/
+extern	"C"	double	exec_get_freeze_frame()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_freeze_frame()	;
+				}
+				return	0.0	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_command
- * C wrapper for Trick::Executive::get_freeze_command
- */
-extern "C" int exec_get_freeze_command() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_freeze_command() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_command
+	*	C	wrapper	for	Trick::Executive::get_freeze_command
+	*/
+extern	"C"	int	exec_get_freeze_command()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_freeze_command()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_on_frame_boundary
- * C wrapper for Trick::Executive::get_freeze_on_frame_boundary
- */
-extern "C" int exec_get_freeze_on_frame_boundary() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_freeze_on_frame_boundary() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_on_frame_boundary
+	*	C	wrapper	for	Trick::Executive::get_freeze_on_frame_boundary
+	*/
+extern	"C"	int	exec_get_freeze_on_frame_boundary()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_freeze_on_frame_boundary()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_frame_tics
- * C wrapper for Trick::Executive::get_freeze_frame_tics
- */
-extern "C" long long exec_get_freeze_frame_tics() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_freeze_frame_tics() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_frame_tics
+	*	C	wrapper	for	Trick::Executive::get_freeze_frame_tics
+	*/
+extern	"C"	long	long	exec_get_freeze_frame_tics()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_freeze_frame_tics()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_frame_count
- * C wrapper for Trick::Executive::get_freeze_frame_count
- */
-extern "C" long long exec_get_freeze_frame_count() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_freeze_frame_count() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_frame_count
+	*	C	wrapper	for	Trick::Executive::get_freeze_frame_count
+	*/
+extern	"C"	long	long	exec_get_freeze_frame_count()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_freeze_frame_count()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_job_cycle
- * C wrapper for Trick::Executive::get_job_cycle
- */
-extern "C" double exec_get_job_cycle(const char * job_name) {
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_job_cycle
+	*	C	wrapper	for	Trick::Executive::get_job_cycle
+	*/
+extern	"C"	double	exec_get_job_cycle(const	char	*	job_name)	{
 
-    if ( the_exec != NULL ) {
+				if	(	the_exec	!=	NULL	)	{
 
-        std::string job_string ;
+								std::string	job_string	;
 
-        // Add handling for NULL string.
-        if ( job_name == NULL ) {
-            job_string.clear() ;
-        } else {
-            job_string = std::string(job_name) ;
-        }
-        return the_exec->get_job_cycle(job_string) ;
-    }
-    return -1.0 ;
+								//	Add	handling	for	NULL	string.
+								if	(	job_name	==	NULL	)	{
+												job_string.clear()	;
+								}	else	{
+												job_string	=	std::string(job_name)	;
+								}
+								return	the_exec->get_job_cycle(job_string)	;
+				}
+				return	-1.0	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_mode
- * C wrapper for Trick::Executive::get_mode
- */
-extern "C" SIM_MODE exec_get_mode() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_mode() ;
-    }
-    return Initialization ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_mode
+	*	C	wrapper	for	Trick::Executive::get_mode
+	*/
+extern	"C"	SIM_MODE	exec_get_mode()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_mode()	;
+				}
+				return	Initialization	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_num_threads
- * C wrapper for Trick::Executive::get_num_threads
- */
-extern "C" unsigned int exec_get_num_threads() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_num_threads() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_num_threads
+	*	C	wrapper	for	Trick::Executive::get_num_threads
+	*/
+extern	"C"	unsigned	int	exec_get_num_threads()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_num_threads()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_time_tic_value
- * C wrapper for Trick::Executive::get_time_tic_value
- */
-extern "C" int exec_get_old_time_tic_value() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_old_time_tic_value() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_time_tic_value
+	*	C	wrapper	for	Trick::Executive::get_time_tic_value
+	*/
+extern	"C"	int	exec_get_old_time_tic_value()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_old_time_tic_value()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_process_id
- * C wrapper for Trick::Executive::get_process_id
- */
-extern "C" unsigned int exec_get_process_id() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_process_id() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_process_id
+	*	C	wrapper	for	Trick::Executive::get_process_id
+	*/
+extern	"C"	unsigned	int	exec_get_process_id()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_process_id()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_rt_nap
- * C wrapper for Trick::Executive::get_rt_nap
- */
-extern "C" int exec_get_rt_nap() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_rt_nap() ;
-    }
-    return -1 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_rt_nap
+	*	C	wrapper	for	Trick::Executive::get_rt_nap
+	*/
+extern	"C"	int	exec_get_rt_nap()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_rt_nap()	;
+				}
+				return	-1	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_scheduled_start_index
- * C wrapper for Trick::Executive::get_scheduled_start_index
- */
-extern "C" int exec_get_scheduled_start_index() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_scheduled_start_index() ;
-    }
-    return -1 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_scheduled_start_index
+	*	C	wrapper	for	Trick::Executive::get_scheduled_start_index
+	*/
+extern	"C"	int	exec_get_scheduled_start_index()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_scheduled_start_index()	;
+				}
+				return	-1	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_sim_time
- * C wrapper for Trick::Executive::get_sim_time
- */
-extern "C" double exec_get_sim_time() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_sim_time() ;
-    }
-    return -1.0 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_sim_time
+	*	C	wrapper	for	Trick::Executive::get_sim_time
+	*/
+extern	"C"	double	exec_get_sim_time()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_sim_time()	;
+				}
+				return	-1.0	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_software_frame
- * C wrapper for Trick::Executive::get_software_frame
- */
-extern "C" double exec_get_software_frame() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_software_frame() ;
-    }
-    return -1.0 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_software_frame
+	*	C	wrapper	for	Trick::Executive::get_software_frame
+	*/
+extern	"C"	double	exec_get_software_frame()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_software_frame()	;
+				}
+				return	-1.0	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_software_frame_tics
- * C wrapper for Trick::Executive::get_software_frame_tics
- */
-extern "C" long long exec_get_software_frame_tics() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_software_frame_tics() ;
-    }
-    return -1 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_software_frame_tics
+	*	C	wrapper	for	Trick::Executive::get_software_frame_tics
+	*/
+extern	"C"	long	long	exec_get_software_frame_tics()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_software_frame_tics()	;
+				}
+				return	-1	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_frame_count
- * C wrapper for Trick::Executive::get_frame_count
- */
-extern "C" long long exec_get_frame_count() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_frame_count() ;
-    }
-    return -1 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_frame_count
+	*	C	wrapper	for	Trick::Executive::get_frame_count
+	*/
+extern	"C"	long	long	exec_get_frame_count()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_frame_count()	;
+				}
+				return	-1	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_stack_trace
- * C wrapper for Trick::Executive::get_stack_trace
- */
-extern "C" int exec_get_stack_trace() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_stack_trace() ;
-    }
-    return -1 ;
-}
-
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_stack_trace
+	*	C	wrapper	for	Trick::Executive::get_stack_trace
+	*/
+extern	"C"	int	exec_get_stack_trace()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_stack_trace()	;
+				}
+				return	-1	;
+}
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_terminate_time
- * C wrapper for Trick::Executive::get_terminate_time
- */
-extern "C" double exec_get_terminate_time() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_terminate_time() ;
-    }
-    return -1.0 ;
-}
-
-extern "C" double exec_get_thread_amf_cycle_time(unsigned int thread_id) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_thread_amf_cycle_time(thread_id) ;
-    }
-    return -1.0 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_terminate_time
+	*	C	wrapper	for	Trick::Executive::get_terminate_time
+	*/
+extern	"C"	double	exec_get_terminate_time()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_terminate_time()	;
+				}
+				return	-1.0	;
+}
+
+extern	"C"	double	exec_get_thread_amf_cycle_time(unsigned	int	thread_id)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_thread_amf_cycle_time(thread_id)	;
+				}
+				return	-1.0	;
 }
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_time_tic_value
- * C wrapper for Trick::Executive::get_time_tic_value
- */
-extern "C" int exec_get_time_tic_value() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_time_tic_value() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_time_tic_value
+	*	C	wrapper	for	Trick::Executive::get_time_tic_value
+	*/
+extern	"C"	int	exec_get_time_tic_value()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_time_tic_value()	;
+				}
+				return	-1	;
 }
-
+
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_time_tics
- * C wrapper for Trick::Executive::get_time_tics
- */
-extern "C" long long exec_get_time_tics() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_time_tics() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_time_tics
+	*	C	wrapper	for	Trick::Executive::get_time_tics
+	*/
+extern	"C"	long	long	exec_get_time_tics()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_time_tics()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_freeze_time_tics
- * C wrapper for Trick::Executive::get_freeze_time_tics
- */
-extern "C" long long exec_get_freeze_time_tics() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_freeze_time_tics() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_freeze_time_tics
+	*	C	wrapper	for	Trick::Executive::get_freeze_time_tics
+	*/
+extern	"C"	long	long	exec_get_freeze_time_tics()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_freeze_time_tics()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_trap_sigbus
- * C wrapper for Trick::Executive::get_trap_sigbus
- */
-extern "C" int exec_get_trap_sigbus() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_trap_sigbus() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_trap_sigbus
+	*	C	wrapper	for	Trick::Executive::get_trap_sigbus
+	*/
+extern	"C"	int	exec_get_trap_sigbus()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_trap_sigbus()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_trap_sigfpe
- * C wrapper for Trick::Executive::get_trap_sigfpe
- */
-extern "C" int exec_get_trap_sigfpe() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_trap_sigfpe() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_trap_sigfpe
+	*	C	wrapper	for	Trick::Executive::get_trap_sigfpe
+	*/
+extern	"C"	int	exec_get_trap_sigfpe()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_trap_sigfpe()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_trap_sigsegv
- * C wrapper for Trick::Executive::get_trap_sigsegv
- */
-extern "C" int exec_get_trap_sigsegv() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_trap_sigsegv() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_trap_sigsegv
+	*	C	wrapper	for	Trick::Executive::get_trap_sigsegv
+	*/
+extern	"C"	int	exec_get_trap_sigsegv()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_trap_sigsegv()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_trap_sigabrt
- * C wrapper for Trick::Executive::get_trap_sigabrt
- */
-extern "C" int exec_get_trap_sigabrt() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_trap_sigabrt() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_trap_sigabrt
+	*	C	wrapper	for	Trick::Executive::get_trap_sigabrt
+	*/
+extern	"C"	int	exec_get_trap_sigabrt()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_trap_sigabrt()	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_trap_sigchld
- * C wrapper for Trick::Executive::get_trap_sigchld
- */
-extern "C" int exec_get_trap_sigchld() {
-    if ( the_exec != NULL ) {
-        return (int)the_exec->get_trap_sigchld() ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_trap_sigchld
+	*	C	wrapper	for	Trick::Executive::get_trap_sigchld
+	*/
+extern	"C"	int	exec_get_trap_sigchld()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(int)the_exec->get_trap_sigchld()	;
+				}
+				return	-1	;
 }
 
-// -------------------------- SET ------------------------
+//	--------------------------	SET	------------------------
 
 /**
-@relates Trick::Executive
-@copybrief Trick::Executive::set_attach_debugger
+@relates	Trick::Executive
+@copybrief	Trick::Executive::set_attach_debugger
 
-@par Python Usage:
-@code trick.exec_set_attach_debugger(<on_off>) @endcode
+@par	Python	Usage:
+@code	trick.exec_set_attach_debugger(<on_off>)	@endcode
 
-C wrapper for Trick::Executive::set_attach_debugger
- */
-extern "C" int exec_set_attach_debugger( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_attach_debugger((bool)on_off) ;
-    }
-    return -1 ;
+C	wrapper	for	Trick::Executive::set_attach_debugger
+	*/
+extern	"C"	int	exec_set_attach_debugger(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_attach_debugger((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
-@relates Trick::Executive
-@copydoc Trick::Executive::set_debugger_command
+@relates	Trick::Executive
+@copydoc	Trick::Executive::set_debugger_command
 
-@par Python Usage:
-@code trick.exec_set_debugger_command("<command>") @endcode
+@par	Python	Usage:
+@code	trick.exec_set_debugger_command("<command>")	@endcode
 
-C wrapper for Trick::Executive::set_debugger_command
+C	wrapper	for	Trick::Executive::set_debugger_command
 */
-extern "C" int exec_set_debugger_command( const char * command ) {
-    if ( the_exec != NULL ) {
-        return ( the_exec->set_debugger_command(std::string(command)) ) ;
-    }
-    return -1 ;
+extern	"C"	int	exec_set_debugger_command(	const	char	*	command	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	(	the_exec->set_debugger_command(std::string(command))	)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_enable_freeze
- * C wrapper for Trick::Executive::set_enable_freeze
- */
-extern "C" int exec_set_enable_freeze( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_enable_freeze((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_enable_freeze
+	*	C	wrapper	for	Trick::Executive::set_enable_freeze
+	*/
+extern	"C"	int	exec_set_enable_freeze(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_enable_freeze((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_exec_command
- * C wrapper for Trick::Executive::set_exec_command
- */
-// TODO:  I don't think we need this function, too dangerous. (Alex 3/2/12)
-extern "C" int exec_set_exec_command(SIM_COMMAND in_command) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_exec_command(in_command) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_exec_command
+	*	C	wrapper	for	Trick::Executive::set_exec_command
+	*/
+//	TODO:		I	don't	think	we	need	this	function,	too	dangerous.	(Alex	3/2/12)
+extern	"C"	int	exec_set_exec_command(SIM_COMMAND	in_command)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_exec_command(in_command)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_freeze_command
- * C wrapper for Trick::Executive::set_freeze_command
- */
-extern "C" int exec_set_freeze_command( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_freeze_command((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_freeze_command
+	*	C	wrapper	for	Trick::Executive::set_freeze_command
+	*/
+extern	"C"	int	exec_set_freeze_command(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_freeze_command((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_freeze_on_frame_boundary
- * C wrapper for Trick::Executive::set_freeze_on_frame_boundary
- */
-extern "C" int exec_set_freeze_on_frame_boundary( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_freeze_on_frame_boundary((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_freeze_on_frame_boundary
+	*	C	wrapper	for	Trick::Executive::set_freeze_on_frame_boundary
+	*/
+extern	"C"	int	exec_set_freeze_on_frame_boundary(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_freeze_on_frame_boundary((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_freeze_frame
- * C wrapper for Trick::Executive::set_freeze_frame
- */
-extern "C" int exec_set_freeze_frame(double in_frame) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_freeze_frame(in_frame) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_freeze_frame
+	*	C	wrapper	for	Trick::Executive::set_freeze_frame
+	*/
+extern	"C"	int	exec_set_freeze_frame(double	in_frame)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_freeze_frame(in_frame)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_rt_nap
- * C wrapper for Trick::Executive::set_rt_nap
- */
-extern "C" int exec_set_rt_nap( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_rt_nap((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_rt_nap
+	*	C	wrapper	for	Trick::Executive::set_rt_nap
+	*/
+extern	"C"	int	exec_set_rt_nap(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_rt_nap((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_software_frame
- * C wrapper for Trick::Executive::set_software_frame
- */
-extern "C" int exec_set_software_frame(double in_frame) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_software_frame(in_frame) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_software_frame
+	*	C	wrapper	for	Trick::Executive::set_software_frame
+	*/
+extern	"C"	int	exec_set_software_frame(double	in_frame)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_software_frame(in_frame)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_stack_trace
- * C wrapper for Trick::Executive::set_stack_trace
- */
-extern "C" int exec_set_stack_trace( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_stack_trace((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_stack_trace
+	*	C	wrapper	for	Trick::Executive::set_stack_trace
+	*/
+extern	"C"	int	exec_set_stack_trace(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_stack_trace((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_terminate_time
- * C wrapper for Trick::Executive::set_terminate_time
- */
-extern "C" int exec_set_terminate_time(double time_value) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_terminate_time(time_value) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_terminate_time
+	*	C	wrapper	for	Trick::Executive::set_terminate_time
+	*/
+extern	"C"	int	exec_set_terminate_time(double	time_value)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_terminate_time(time_value)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_time
- * C wrapper for Trick::Executive::set_time
- */
-extern "C" int exec_set_time( double in_time ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_time(in_time) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_time
+	*	C	wrapper	for	Trick::Executive::set_time
+	*/
+extern	"C"	int	exec_set_time(	double	in_time	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_time(in_time)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_time_tics
- * C wrapper for Trick::Executive::set_time_tics
- */
-extern "C" int exec_set_time_tics( long long in_time_tics ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_time_tics(in_time_tics) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_time_tics
+	*	C	wrapper	for	Trick::Executive::set_time_tics
+	*/
+extern	"C"	int	exec_set_time_tics(	long	long	in_time_tics	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_time_tics(in_time_tics)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_time_tic_value
- * C wrapper for Trick::Executive::set_time_tic_value
- */
-extern "C" int exec_set_time_tic_value( int in_time_tics ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_time_tic_value(in_time_tics) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_time_tic_value
+	*	C	wrapper	for	Trick::Executive::set_time_tic_value
+	*/
+extern	"C"	int	exec_set_time_tic_value(	int	in_time_tics	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_time_tic_value(in_time_tics)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_trap_sigbus
- * C wrapper for Trick::Executive::set_trap_sigbus
- */
-extern "C" int exec_set_trap_sigbus( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_trap_sigbus((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_trap_sigbus
+	*	C	wrapper	for	Trick::Executive::set_trap_sigbus
+	*/
+extern	"C"	int	exec_set_trap_sigbus(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_trap_sigbus((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_trap_sigfpe
- * C wrapper for Trick::Executive::set_trap_sigfpe
- */
-extern "C" int exec_set_trap_sigfpe( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_trap_sigfpe((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_trap_sigfpe
+	*	C	wrapper	for	Trick::Executive::set_trap_sigfpe
+	*/
+extern	"C"	int	exec_set_trap_sigfpe(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_trap_sigfpe((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_trap_sigsegv
- * C wrapper for Trick::Executive::set_trap_sigsegv
- */
-extern "C" int exec_set_trap_sigsegv( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_trap_sigsegv((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_trap_sigsegv
+	*	C	wrapper	for	Trick::Executive::set_trap_sigsegv
+	*/
+extern	"C"	int	exec_set_trap_sigsegv(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_trap_sigsegv((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_trap_sigsegv
- * C wrapper for Trick::Executive::set_trap_sigsegv
- */
-extern "C" int exec_set_trap_sigabrt( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_trap_sigabrt((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_trap_sigsegv
+	*	C	wrapper	for	Trick::Executive::set_trap_sigsegv
+	*/
+extern	"C"	int	exec_set_trap_sigabrt(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_trap_sigabrt((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_trap_sigsegv
- * C wrapper for Trick::Executive::set_trap_sigsegv
- */
-extern "C" int exec_set_trap_sigchld( int on_off ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_trap_sigchld((bool)on_off) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_trap_sigsegv
+	*	C	wrapper	for	Trick::Executive::set_trap_sigsegv
+	*/
+extern	"C"	int	exec_set_trap_sigchld(	int	on_off	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_trap_sigchld((bool)on_off)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_job_onoff
- * C wrapper for Trick::Executive::set_job_onoff
- */
-extern "C" int exec_set_job_onoff(const char * job_name , int instance , int on) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_job_onoff( job_name , instance , on) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_job_onoff
+	*	C	wrapper	for	Trick::Executive::set_job_onoff
+	*/
+extern	"C"	int	exec_set_job_onoff(const	char	*	job_name	,	int	instance	,	int	on)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_job_onoff(	job_name	,	instance	,	on)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_sim_object_onoff
- * C wrapper for Trick::Executive::set_sim_object_onoff
- */
-extern "C" int exec_set_sim_object_onoff(const char * sim_object_name , int on) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_sim_object_onoff( sim_object_name , on) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_sim_object_onoff
+	*	C	wrapper	for	Trick::Executive::set_sim_object_onoff
+	*/
+extern	"C"	int	exec_set_sim_object_onoff(const	char	*	sim_object_name	,	int	on)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_sim_object_onoff(	sim_object_name	,	on)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_sim_object_onoff
- * C wrapper for Trick::Executive::get_sim_object_onoff
- */
-extern "C" int exec_get_sim_object_onoff(const char * sim_object_name ) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_sim_object_onoff( sim_object_name ) ;
-    }
-    return -1 ;
-}
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_sim_object_onoff
+	*	C	wrapper	for	Trick::Executive::get_sim_object_onoff
+	*/
+extern	"C"	int	exec_get_sim_object_onoff(const	char	*	sim_object_name	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_sim_object_onoff(	sim_object_name	)	;
+				}
+				return	-1	;
+}
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_sim_object_jobs_onoff
- * C wrapper for Trick::Executive::set_sim_object_jobs_onoff
- */
-extern "C" int exec_set_sim_object_jobs_onoff(const char * sim_object_name , int on) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_sim_object_jobs_onoff( sim_object_name , on) ;
-    }
-    return -1 ;
-}
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_sim_object_jobs_onoff
+	*	C	wrapper	for	Trick::Executive::set_sim_object_jobs_onoff
+	*/
+extern	"C"	int	exec_set_sim_object_jobs_onoff(const	char	*	sim_object_name	,	int	on)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_sim_object_jobs_onoff(	sim_object_name	,	on)	;
+				}
+				return	-1	;
+}
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_version_date_tag
- * C wrapper for Trick::Executive::set_version_date_tag
- */
-extern "C" int exec_set_version_date_tag(const char * tag) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_version_date_tag(std::string(tag)) ;
-    }
-    return -1 ;
-}
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_version_date_tag
+	*	C	wrapper	for	Trick::Executive::set_version_date_tag
+	*/
+extern	"C"	int	exec_set_version_date_tag(const	char	*	tag)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_version_date_tag(std::string(tag))	;
+				}
+				return	-1	;
+}
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_build_date
- * C wrapper for Trick::Executive::set_build_date
- */
-extern "C" int exec_set_build_date(const char * date) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_build_date(std::string(date)) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_current_version
- * C wrapper for Trick::Executive::set_current_version
- */
-extern "C" int exec_set_current_version(const char * version) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_current_version(std::string(version)) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_current_version
- * C wrapper for Trick::Executive::set_current_version
- */
-extern "C" const char * exec_get_current_version() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_current_version().c_str() ;
-    }
-    return NULL ;
-}
-
-/**
- * @relates Trick::Executive
- * @userdesc Raise a signal on the main thread to terminate the simuation immediately.
- * This is not typically used by users.  Use exec_terminate instead.
- */
-extern "C" void exec_signal_terminate() {
-    // ret_code = 0 for this call.
-    if ( the_exec != NULL ) {
-        pthread_kill( the_exec->get_pthread_id(0) , SIGUSR1 ) ;
-    }
-}
-
-/**
- * @relates Trick::Executive
- * @userdesc C wrapper to transition to Shutdown mode.  Throws Trick::ExecutiveException exception.  This version
- * @ is backwards compatible
- * @param file_name - file name of the caller to exec_terminate
- * @param error - error message to print
- */
-extern "C" int exec_terminate(const char *file_name , const char *error ) {
-    throw Trick::ExecutiveException(0 , file_name , 0 , error) ;
-    // never reached
-    return 0 ;
-}
-
-/**
- * @relates Trick::Executive
- * @userdesc C wrapper to transition to Shutdown mode.  Throws Trick::ExecutiveException exception
- * @param ret_code - return code to pass back to caller of init() or loop() ;
- * @param file_name - file name of the caller to exec_terminate
- * @param line - line number where exception occurred
- * @param error - error message to print
- * @return ret_code (but never reached)
- */
-extern "C" int exec_terminate_with_return(int ret_code , const char *file_name , int line , const char *error ) {
-    throw Trick::ExecutiveException(ret_code , file_name , line , error) ;
-    // never reached
-    return ret_code ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::freeze
- * C wrapper for Trick::Executive::freeze
- */
-extern "C" int exec_freeze() {
-    if ( the_exec != NULL ) {
-        return the_exec->freeze() ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::run
- * C wrapper for Trick::Executive::run
- */
-extern "C" int exec_run() {
-    if ( the_exec != NULL ) {
-        return the_exec->run() ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
-   @userdesc C wrapper to add an instrumentation job before all initialization, integration,
-    scheduled, shutdown, top_of_frame & end_of_frame jobs.
- * Calls Trick::Executive::instrument_job_before(job_name, "", NULL)
- * @param job_name - name of the job to instrument.  Name follows convention in RUN_<dir>/S_job_execution
- * @return number of times the job was inserted
- */
-extern "C" int exec_instrument_before(const char * job_name) {
-    if ( the_exec != NULL ) {
-        return the_exec->instrument_job_before(job_name) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
-   @userdesc C wrapper to add an instrumentation job after all initialization, integration,
-    scheduled, shutdown, top_of_frame & end_of_frame jobs.
- * Calls Trick::Executive::instrument_job_after(job_name, "", NULL)
- * @param job_name - name of the job to instrument.  Name follows convention in RUN_<dir>/S_job_execution
- * @return number of times the job was inserted
- */
-extern "C" int exec_instrument_after(const char * job_name) {
-    if ( the_exec != NULL ) {
-        return the_exec->instrument_job_after(job_name) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
-   @userdesc C wrapper to remove all jobs with name job_name from all job queues.
- * Calls Trick::Executive::instrument_job_remove(job_name, NULL)
- * @param job_name - name of the job to remove.  Name follows convention in RUN_<dir>/S_job_execution
- * @return always 0
- */
-extern "C" int exec_instrument_remove(const char * job_name) {
-    if ( the_exec != NULL ) {
-        return the_exec->instrument_job_remove(job_name) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_enabled
- * C wrapper for Trick::Executive::set_thread_enabled
- */
-extern "C" int exec_set_thread_enabled( unsigned int thread_id , int yes_no ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_enabled(thread_id , yes_no) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_amf_cycle_time
- * C wrapper for Trick::Executive::set_thread_amf_cycle_time
- */
-extern "C" int exec_set_thread_amf_cycle_time( unsigned int thread_id , double cycle_time ) {
-    return exec_set_thread_async_cycle_time(thread_id , cycle_time) ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_async_cycle_time
- * C wrapper for Trick::Executive::set_thread_async_cycle_time
- */
-extern "C" int exec_set_thread_async_cycle_time( unsigned int thread_id , double cycle_time ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_amf_cycle_time(thread_id , cycle_time) ;
-    }
-    return -1 ;
-}
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_async_wait
- * C wrapper for Trick::Executive::set_thread_async_wait
- */
-extern "C" int exec_set_thread_async_wait( unsigned int thread_id , int yes_no ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_async_wait(thread_id , (bool)yes_no) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_build_date
+	*	C	wrapper	for	Trick::Executive::set_build_date
+	*/
+extern	"C"	int	exec_set_build_date(const	char	*	date)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_build_date(std::string(date))	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_current_version
+	*	C	wrapper	for	Trick::Executive::set_current_version
+	*/
+extern	"C"	int	exec_set_current_version(const	char	*	version)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_current_version(std::string(version))	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_current_version
+	*	C	wrapper	for	Trick::Executive::set_current_version
+	*/
+extern	"C"	const	char	*	exec_get_current_version()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_current_version().c_str()	;
+				}
+				return	NULL	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@userdesc	Raise	a	signal	on	the	main	thread	to	terminate	the	simuation	immediately.
+	*	This	is	not	typically	used	by	users.		Use	exec_terminate	instead.
+	*/
+extern	"C"	void	exec_signal_terminate()	{
+				//	ret_code	=	0	for	this	call.
+				if	(	the_exec	!=	NULL	)	{
+								pthread_kill(	the_exec->get_pthread_id(0)	,	SIGUSR1	)	;
+				}
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@userdesc	C	wrapper	to	transition	to	Shutdown	mode.		Throws	Trick::ExecutiveException	exception.		This	version
+	*	@	is	backwards	compatible
+	*	@param	file_name	-	file	name	of	the	caller	to	exec_terminate
+	*	@param	error	-	error	message	to	print
+	*/
+extern	"C"	int	exec_terminate(const	char	*file_name	,	const	char	*error	)	{
+				throw	Trick::ExecutiveException(0	,	file_name	,	0	,	error)	;
+				//	never	reached
+				return	0	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@userdesc	C	wrapper	to	transition	to	Shutdown	mode.		Throws	Trick::ExecutiveException	exception
+	*	@param	ret_code	-	return	code	to	pass	back	to	caller	of	init()	or	loop()	;
+	*	@param	file_name	-	file	name	of	the	caller	to	exec_terminate
+	*	@param	line	-	line	number	where	exception	occurred
+	*	@param	error	-	error	message	to	print
+	*	@return	ret_code	(but	never	reached)
+	*/
+extern	"C"	int	exec_terminate_with_return(int	ret_code	,	const	char	*file_name	,	int	line	,	const	char	*error	)	{
+				throw	Trick::ExecutiveException(ret_code	,	file_name	,	line	,	error)	;
+				//	never	reached
+				return	ret_code	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::freeze
+	*	C	wrapper	for	Trick::Executive::freeze
+	*/
+extern	"C"	int	exec_freeze()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->freeze()	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::run
+	*	C	wrapper	for	Trick::Executive::run
+	*/
+extern	"C"	int	exec_run()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->run()	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+			@userdesc	C	wrapper	to	add	an	instrumentation	job	before	all	initialization,	integration,
+				scheduled,	shutdown,	top_of_frame	&	end_of_frame	jobs.
+	*	Calls	Trick::Executive::instrument_job_before(job_name,	"",	NULL)
+	*	@param	job_name	-	name	of	the	job	to	instrument.		Name	follows	convention	in	RUN_<dir>/S_job_execution
+	*	@return	number	of	times	the	job	was	inserted
+	*/
+extern	"C"	int	exec_instrument_before(const	char	*	job_name)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->instrument_job_before(job_name)	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+			@userdesc	C	wrapper	to	add	an	instrumentation	job	after	all	initialization,	integration,
+				scheduled,	shutdown,	top_of_frame	&	end_of_frame	jobs.
+	*	Calls	Trick::Executive::instrument_job_after(job_name,	"",	NULL)
+	*	@param	job_name	-	name	of	the	job	to	instrument.		Name	follows	convention	in	RUN_<dir>/S_job_execution
+	*	@return	number	of	times	the	job	was	inserted
+	*/
+extern	"C"	int	exec_instrument_after(const	char	*	job_name)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->instrument_job_after(job_name)	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+			@userdesc	C	wrapper	to	remove	all	jobs	with	name	job_name	from	all	job	queues.
+	*	Calls	Trick::Executive::instrument_job_remove(job_name,	NULL)
+	*	@param	job_name	-	name	of	the	job	to	remove.		Name	follows	convention	in	RUN_<dir>/S_job_execution
+	*	@return	always	0
+	*/
+extern	"C"	int	exec_instrument_remove(const	char	*	job_name)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->instrument_job_remove(job_name)	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_enabled
+	*	C	wrapper	for	Trick::Executive::set_thread_enabled
+	*/
+extern	"C"	int	exec_set_thread_enabled(	unsigned	int	thread_id	,	int	yes_no	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_enabled(thread_id	,	yes_no)	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_amf_cycle_time
+	*	C	wrapper	for	Trick::Executive::set_thread_amf_cycle_time
+	*/
+extern	"C"	int	exec_set_thread_amf_cycle_time(	unsigned	int	thread_id	,	double	cycle_time	)	{
+				return	exec_set_thread_async_cycle_time(thread_id	,	cycle_time)	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_async_cycle_time
+	*	C	wrapper	for	Trick::Executive::set_thread_async_cycle_time
+	*/
+extern	"C"	int	exec_set_thread_async_cycle_time(	unsigned	int	thread_id	,	double	cycle_time	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_amf_cycle_time(thread_id	,	cycle_time)	;
+				}
+				return	-1	;
+}
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_async_wait
+	*	C	wrapper	for	Trick::Executive::set_thread_async_wait
+	*/
+extern	"C"	int	exec_set_thread_async_wait(	unsigned	int	thread_id	,	int	yes_no	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_async_wait(thread_id	,	(bool)yes_no)	;
+				}
+				return	-1	;
 }
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_rt_semaphores
- * C wrapper for Trick::Executive::set_thread_rt_semaphores
- */
-extern "C" int exec_set_thread_rt_semaphores( unsigned int thread_id , int yes_no ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_rt_semaphores(thread_id , (bool)yes_no) ;
-    }
-    return -1 ;
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_rt_semaphores
+	*	C	wrapper	for	Trick::Executive::set_thread_rt_semaphores
+	*/
+extern	"C"	int	exec_set_thread_rt_semaphores(	unsigned	int	thread_id	,	int	yes_no	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_rt_semaphores(thread_id	,	(bool)yes_no)	;
+				}
+				return	-1	;
 }
-
-/**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_cpu_affinity
- * C wrapper for Trick::Executive::set_thread_cpu_affinity
- */
-extern "C" int exec_set_thread_cpu_affinity(unsigned int thread_id , int cpu_num) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_cpu_affinity(thread_id, cpu_num) ;
-    }
-    return -1 ;
+
+/**
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_cpu_affinity
+	*	C	wrapper	for	Trick::Executive::set_thread_cpu_affinity
+	*/
+extern	"C"	int	exec_set_thread_cpu_affinity(unsigned	int	thread_id	,	int	cpu_num)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_cpu_affinity(thread_id,	cpu_num)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_priority
- * C wrapper for Trick::Executive::set_thread_priority
- */
-extern "C" int exec_set_thread_priority(unsigned int thread_id , unsigned int req_priority) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_priority(thread_id, req_priority) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_priority
+	*	C	wrapper	for	Trick::Executive::set_thread_priority
+	*/
+extern	"C"	int	exec_set_thread_priority(unsigned	int	thread_id	,	unsigned	int	req_priority)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_priority(thread_id,	req_priority)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_thread_process_type
- * C wrapper for Trick::Executive::set_thread_process_type
- */
-extern "C" int exec_set_thread_process_type( unsigned int thread_id , int process_type ) {
-    if ( the_exec != NULL ) {
-        return the_exec->set_thread_process_type(thread_id , process_type) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_thread_process_type
+	*	C	wrapper	for	Trick::Executive::set_thread_process_type
+	*/
+extern	"C"	int	exec_set_thread_process_type(	unsigned	int	thread_id	,	int	process_type	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->set_thread_process_type(thread_id	,	process_type)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::set_job_cycle
- * C wrapper for Trick::Executive::set_job_cycle
- */
-extern "C" int exec_set_job_cycle(const char * job_name, int instance, double in_cycle) {
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::set_job_cycle
+	*	C	wrapper	for	Trick::Executive::set_job_cycle
+	*/
+extern	"C"	int	exec_set_job_cycle(const	char	*	job_name,	int	instance,	double	in_cycle)	{
 
-    if ( the_exec != NULL ) {
-        std::string job_string ;
+				if	(	the_exec	!=	NULL	)	{
+								std::string	job_string	;
 
-        // Add handling for NULL string.
-        if ( job_name == NULL ) {
-            job_string.clear() ;
-        } else {
-            job_string = std::string(job_name) ;
-        }
-        return the_exec->set_job_cycle(job_string, instance, in_cycle) ;
-    }
-    return -1 ;
+								//	Add	handling	for	NULL	string.
+								if	(	job_name	==	NULL	)	{
+												job_string.clear()	;
+								}	else	{
+												job_string	=	std::string(job_name)	;
+								}
+								return	the_exec->set_job_cycle(job_string,	instance,	in_cycle)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::add_depends_on_job
- * C wrapper for Trick::Executive::add_depends_on_job
- */
-extern "C" int exec_add_scheduled_job_class(const char * in_name) {
-    if ( the_exec != NULL ) {
-        return the_exec->add_scheduled_job_class(std::string(in_name)) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::add_depends_on_job
+	*	C	wrapper	for	Trick::Executive::add_depends_on_job
+	*/
+extern	"C"	int	exec_add_scheduled_job_class(const	char	*	in_name)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->add_scheduled_job_class(std::string(in_name))	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::add_depends_on_job
- * C wrapper for Trick::Executive::add_depends_on_job
- */
-extern "C" int exec_add_depends_on_job(const char * target_job_string , unsigned int t_instance , const char * depend_job_string , unsigned int d_instance ) {
-    if ( the_exec != NULL ) {
-        return the_exec->add_depends_on_job(std::string(target_job_string) , t_instance , std::string(depend_job_string) , d_instance ) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::add_depends_on_job
+	*	C	wrapper	for	Trick::Executive::add_depends_on_job
+	*/
+extern	"C"	int	exec_add_depends_on_job(const	char	*	target_job_string	,	unsigned	int	t_instance	,	const	char	*	depend_job_string	,	unsigned	int	d_instance	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->add_depends_on_job(std::string(target_job_string)	,	t_instance	,	std::string(depend_job_string)	,	d_instance	)	;
+				}
+				return	-1	;
 }
 
 /*********************************************************/
-/* These are executive access functions that stay C++    */
+/*	These	are	executive	access	functions	that	stay	C++				*/
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::add_sim_object
- * C wrapper for Trick::Executive::add_sim_object
- */
-int exec_add_sim_object( Trick::SimObject * in_object , const char * in_name ) {
-    if ( the_exec != NULL ) {
-        return the_exec->add_sim_object(in_object , in_name) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::add_sim_object
+	*	C	wrapper	for	Trick::Executive::add_sim_object
+	*/
+int	exec_add_sim_object(	Trick::SimObject	*	in_object	,	const	char	*	in_name	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->add_sim_object(in_object	,	in_name)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::add_sim_object
- * C wrapper for Trick::Executive::add_sim_object
- */
-int exec_remove_sim_object( Trick::SimObject * in_object ) {
-    if ( the_exec != NULL ) {
-        return the_exec->delete_sim_object(in_object) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::add_sim_object
+	*	C	wrapper	for	Trick::Executive::add_sim_object
+	*/
+int	exec_remove_sim_object(	Trick::SimObject	*	in_object	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->delete_sim_object(in_object)	;
+				}
+				return	-1	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_sim_objects
- * Wrapper for Trick::Executive::get_sim_objects
- */
-int exec_get_sim_objects(std::vector<Trick::SimObject *>& in_sim_objects ) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_sim_objects(in_sim_objects) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_sim_objects
+	*	Wrapper	for	Trick::Executive::get_sim_objects
+	*/
+int	exec_get_sim_objects(std::vector<Trick::SimObject	*>&	in_sim_objects	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_sim_objects(in_sim_objects)	;
+				}
+				return	-1	;
 }
 
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_sim_objects
- * Wrapper for Trick::Executive::get_sim_objects
- */
-Trick::SimObject * exec_get_sim_object_by_name(std::string sim_object_name) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_sim_object_by_name(sim_object_name) ;
-    }
-    return NULL ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_sim_objects
+	*	Wrapper	for	Trick::Executive::get_sim_objects
+	*/
+Trick::SimObject	*	exec_get_sim_object_by_name(std::string	sim_object_name)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_sim_object_by_name(sim_object_name)	;
+				}
+				return	NULL	;
 }
 
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_job
- * Wrapper for Trick::Executive::get_job
- */
-Trick::JobData * exec_get_job(const char * job_name , unsigned int j_instance) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_job(std::string(job_name), j_instance) ;
-    }
-    return NULL ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_job
+	*	Wrapper	for	Trick::Executive::get_job
+	*/
+Trick::JobData	*	exec_get_job(const	char	*	job_name	,	unsigned	int	j_instance)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_job(std::string(job_name),	j_instance)	;
+				}
+				return	NULL	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_curr_job
- * Wrapper for Trick::Executive::get_curr_job
- */
-Trick::JobData * exec_get_curr_job() {
-    if ( the_exec != NULL ) {
-        return the_exec->get_curr_job() ;
-    }
-    return NULL ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_curr_job
+	*	Wrapper	for	Trick::Executive::get_curr_job
+	*/
+Trick::JobData	*	exec_get_curr_job()	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_curr_job()	;
+				}
+				return	NULL	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_thread
- * C wrapper for Trick::Executive::get_thread
- */
-Trick::Threads * exec_get_thread( unsigned int thread_id ) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_thread(thread_id) ;
-    }
-    return NULL ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_thread
+	*	C	wrapper	for	Trick::Executive::get_thread
+	*/
+Trick::Threads	*	exec_get_thread(	unsigned	int	thread_id	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_thread(thread_id)	;
+				}
+				return	NULL	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::get_all_jobs_vector
- * Wrapper for Trick::Executive::get_all_jobs_vector
- */
-int exec_get_all_jobs_vector(std::vector<Trick::JobData *> & in_jobs_vector) {
-    if ( the_exec != NULL ) {
-        return the_exec->get_all_jobs_vector(in_jobs_vector) ;
-    }
-    return 0 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::get_all_jobs_vector
+	*	Wrapper	for	Trick::Executive::get_all_jobs_vector
+	*/
+int	exec_get_all_jobs_vector(std::vector<Trick::JobData	*>	&	in_jobs_vector)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->get_all_jobs_vector(in_jobs_vector)	;
+				}
+				return	0	;
 }
 
 /**
- * @relates Trick::Executive
- * @copydoc Trick::Executive::register_scheduler
- * Wrapper for Trick::Executive::register_scheduler
- */
-int exec_register_scheduler( Trick::Scheduler * scheduler ) {
-    if ( the_exec != NULL ) {
-        return the_exec->register_scheduler(scheduler) ;
-    }
-    return -1 ;
+	*	@relates	Trick::Executive
+	*	@copydoc	Trick::Executive::register_scheduler
+	*	Wrapper	for	Trick::Executive::register_scheduler
+	*/
+int	exec_register_scheduler(	Trick::Scheduler	*	scheduler	)	{
+				if	(	the_exec	!=	NULL	)	{
+								return	the_exec->register_scheduler(scheduler)	;
+				}
+				return	-1	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_call_default_data.cpp b/trick_source/sim_services/Executive/Executive_call_default_data.cpp
index a82a0eb8a..7ba982045 100644
--- a/trick_source/sim_services/Executive/Executive_call_default_data.cpp
+++ b/trick_source/sim_services/Executive/Executive_call_default_data.cpp
@@ -1,42 +1,42 @@
 
-#include <iostream>
-#include <sys/resource.h>
+#include	<iostream>
+#include	<sys/resource.h>
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/clock_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/clock_proto.h"
 
 /**
 @details
--# Call the default data jobs to set the default state of the simulation
-   (pseudo-constructors for simulation structures).
-   Requirement [@ref r_exec_discrete_0].
-   -# The scheduler will immediately return if the default_data job returns a
-      non-zero return code.  The return code of the default_data job will be
-      returned from Trick::Executive::init().
--# If no execption is thrown return 0
+-#	Call	the	default	data	jobs	to	set	the	default	state	of	the	simulation
+			(pseudo-constructors	for	simulation	structures).
+			Requirement	[@ref	r_exec_discrete_0].
+			-#	The	scheduler	will	immediately	return	if	the	default_data	job	returns	a
+						non-zero	return	code.		The	return	code	of	the	default_data	job	will	be
+						returned	from	Trick::Executive::init().
+-#	If	no	execption	is	thrown	return	0
 */
-int Trick::Executive::call_default_data() {
-
-    int ret = 0 ;
-
-    except_file = "in default_data queue" ;
-
-    /* Call the default data jobs. */
-    default_data_queue.reset_curr_index() ;
-    while ( (curr_job = default_data_queue.get_next_job()) != NULL ) {
-        long long start = clock_wall_time();
-        ret = curr_job->call() ;
-        long long end = clock_wall_time();
-        if(init_log_stream.is_open()) {
-          init_log_stream << "default_data," << curr_job->name << ',' << (double)(end-start)/clock_tics_per_sec() << '\n';
-        }
-        if ( ret != 0 ) {
-            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 , "default_data job did not return 0") ;
-        }
-    }
-
-    /* return 0 if there are no errors. */
-    return ret ;
+int	Trick::Executive::call_default_data()	{
+
+				int	ret	=	0	;
+
+				except_file	=	"in	default_data	queue"	;
+
+				/*	Call	the	default	data	jobs.	*/
+				default_data_queue.reset_curr_index()	;
+				while	(	(curr_job	=	default_data_queue.get_next_job())	!=	NULL	)	{
+								long	long	start	=	clock_wall_time();
+								ret	=	curr_job->call()	;
+								long	long	end	=	clock_wall_time();
+								if(init_log_stream.is_open())	{
+										init_log_stream	<<	"default_data,"	<<	curr_job->name	<<	','	<<	(double)(end-start)/clock_tics_per_sec()	<<	'\n';
+								}
+								if	(	ret	!=	0	)	{
+												throw	Trick::ExecutiveException(ret	,	curr_job->name.c_str()	,	0	,	"default_data	job	did	not	return	0")	;
+								}
+				}
+
+				/*	return	0	if	there	are	no	errors.	*/
+				return	ret	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_call_initialization.cpp b/trick_source/sim_services/Executive/Executive_call_initialization.cpp
index 65e1c6a61..b90f6cbf9 100644
--- a/trick_source/sim_services/Executive/Executive_call_initialization.cpp
+++ b/trick_source/sim_services/Executive/Executive_call_initialization.cpp
@@ -1,38 +1,38 @@
 
-#include <iostream>
-#include <sys/resource.h>
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/clock_proto.h"
+#include	<iostream>
+#include	<sys/resource.h>
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/clock_proto.h"
 
 /**
 @details
--# Call the initialization jobs.
-   -# The scheduler will immediately return if the initialization job returns a
-      non-zero return code.  The return code of the initialization job will be
-      returned from Trick::Executive::init().
--# If no execption is thrown return 0
+-#	Call	the	initialization	jobs.
+			-#	The	scheduler	will	immediately	return	if	the	initialization	job	returns	a
+						non-zero	return	code.		The	return	code	of	the	initialization	job	will	be
+						returned	from	Trick::Executive::init().
+-#	If	no	execption	is	thrown	return	0
 */
-int Trick::Executive::call_initialization() {
+int	Trick::Executive::call_initialization()	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    except_file = "in intialization queue" ;
+				except_file	=	"in	intialization	queue"	;
 
-    /* Call the initialization jobs. */
-    initialization_queue.reset_curr_index() ;
-    while ( (curr_job = initialization_queue.get_next_job()) != NULL ) {
-        long long start = clock_wall_time();
-        ret = curr_job->call() ;
-        long long end = clock_wall_time();
-        if(init_log_stream.is_open()) {
-            init_log_stream << "init," << curr_job->name << ',' << (double)(end-start)/clock_tics_per_sec() << '\n';
-        }
-        if ( ret != 0 ) {
-            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 , "initialization job did not return 0") ;
-        }
-    }
+				/*	Call	the	initialization	jobs.	*/
+				initialization_queue.reset_curr_index()	;
+				while	(	(curr_job	=	initialization_queue.get_next_job())	!=	NULL	)	{
+								long	long	start	=	clock_wall_time();
+								ret	=	curr_job->call()	;
+								long	long	end	=	clock_wall_time();
+								if(init_log_stream.is_open())	{
+												init_log_stream	<<	"init,"	<<	curr_job->name	<<	','	<<	(double)(end-start)/clock_tics_per_sec()	<<	'\n';
+								}
+								if	(	ret	!=	0	)	{
+												throw	Trick::ExecutiveException(ret	,	curr_job->name.c_str()	,	0	,	"initialization	job	did	not	return	0")	;
+								}
+				}
 
-    /* return 0 if there are no errors. */
-    return ret ;
+				/*	return	0	if	there	are	no	errors.	*/
+				return	ret	;
 }
diff --git a/trick_source/sim_services/Executive/Executive_call_input_processor.cpp b/trick_source/sim_services/Executive/Executive_call_input_processor.cpp
index 6c6f9c5bc..e4e75235f 100644
--- a/trick_source/sim_services/Executive/Executive_call_input_processor.cpp
+++ b/trick_source/sim_services/Executive/Executive_call_input_processor.cpp
@@ -1,43 +1,43 @@
 
-#include <iostream>
-#include <sys/resource.h>
+#include	<iostream>
+#include	<sys/resource.h>
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/clock_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/clock_proto.h"
 
 /**
 @details
--# Call the input_processor jobs
-   -# The scheduler will immediately return if the default_data job returns a
-      non-zero return code.  The return code of the default_data job will be
-      returned from Trick::Executive::init().
--# If no execption is thrown return 0
+-#	Call	the	input_processor	jobs
+			-#	The	scheduler	will	immediately	return	if	the	default_data	job	returns	a
+						non-zero	return	code.		The	return	code	of	the	default_data	job	will	be
+						returned	from	Trick::Executive::init().
+-#	If	no	execption	is	thrown	return	0
 */
-int Trick::Executive::call_input_processor() {
-
-    int ret = 0 ;
-
-    except_file = "in input_processor queue" ;
-
-    /* Call the input processor jobs. */
-    /* A restart can be called by a call to the input processor.  If that happens the Executive restart job will clear this
-       queue and restart it at the beginning.  We don't want to call the input processor jobs again in this case.
-       So we test for the restart_called flag and break out of the loop if we restart_called is set. */
-    input_processor_queue.reset_curr_index() ;
-    while ( !restart_called and (curr_job = input_processor_queue.get_next_job()) != NULL ) {
-        long long start = clock_wall_time();
-        ret = curr_job->call() ;
-        long long end = clock_wall_time();
-        if(init_log_stream.is_open()) {
-          init_log_stream << "input_processor," << curr_job->name << ',' << (double)(end-start)/clock_tics_per_sec() << '\n';
-        }
-        if ( ret != 0 ) {
-            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 , "input_processor job did not return 0") ;
-        }
-    }
-
-    /* return 0 if there are no errors. */
-    return ret ;
+int	Trick::Executive::call_input_processor()	{
+
+				int	ret	=	0	;
+
+				except_file	=	"in	input_processor	queue"	;
+
+				/*	Call	the	input	processor	jobs.	*/
+				/*	A	restart	can	be	called	by	a	call	to	the	input	processor.		If	that	happens	the	Executive	restart	job	will	clear	this
+							queue	and	restart	it	at	the	beginning.		We	don't	want	to	call	the	input	processor	jobs	again	in	this	case.
+							So	we	test	for	the	restart_called	flag	and	break	out	of	the	loop	if	we	restart_called	is	set.	*/
+				input_processor_queue.reset_curr_index()	;
+				while	(	!restart_called	and	(curr_job	=	input_processor_queue.get_next_job())	!=	NULL	)	{
+								long	long	start	=	clock_wall_time();
+								ret	=	curr_job->call()	;
+								long	long	end	=	clock_wall_time();
+								if(init_log_stream.is_open())	{
+										init_log_stream	<<	"input_processor,"	<<	curr_job->name	<<	','	<<	(double)(end-start)/clock_tics_per_sec()	<<	'\n';
+								}
+								if	(	ret	!=	0	)	{
+												throw	Trick::ExecutiveException(ret	,	curr_job->name.c_str()	,	0	,	"input_processor	job	did	not	return	0")	;
+								}
+				}
+
+				/*	return	0	if	there	are	no	errors.	*/
+				return	ret	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp b/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp
index 9a67410af..7b5224549 100644
--- a/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp
+++ b/trick_source/sim_services/Executive/Executive_check_all_job_cycle_times.cpp
@@ -1,75 +1,75 @@
 
-#include <math.h>
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/TrickConstant.hh"
+#include	<math.h>
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/TrickConstant.hh"
 
 /**
 @details
--# Loop through all jobs checking for jobs that have a cycle time less than the time_tic_value.
--# Test to see if the time_tic_value is only divisible by 2 and 5.
--# Return if the time_tic_value has factors other than 2 and 5. (will be irrational)
--# Loop through all jobs checking to see if the time tic has enough resolution to handle cycle time.
+-#	Loop	through	all	jobs	checking	for	jobs	that	have	a	cycle	time	less	than	the	time_tic_value.
+-#	Test	to	see	if	the	time_tic_value	is	only	divisible	by	2	and	5.
+-#	Return	if	the	time_tic_value	has	factors	other	than	2	and	5.	(will	be	irrational)
+-#	Loop	through	all	jobs	checking	to	see	if	the	time	tic	has	enough	resolution	to	handle	cycle	time.
 */
-int Trick::Executive::check_all_job_cycle_times() {
+int	Trick::Executive::check_all_job_cycle_times()	{
 
-    unsigned int ii ;
-    int ret = 0 ;
-    int temp_time_tic_value ;
+				unsigned	int	ii	;
+				int	ret	=	0	;
+				int	temp_time_tic_value	;
 
-    /* Check if any jobs have cycle times less than the time_tic_value */
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        Trick::JobData * temp_job = all_jobs_vector[ii] ;
-        if ( temp_job->cycle < (1.0 / time_tic_value) ) {
-            message_publish(MSG_WARNING,"Cycle for (%s) is less than time tic value. cycle = %16.12f, time_tic = %16.12f\n",
-             temp_job->name.c_str() , temp_job->cycle, 1.0 / time_tic_value ) ;
-            temp_job->disabled = true ;
-            temp_job->cycle_tics = TRICK_MAX_LONG_LONG ;
-            temp_job->next_tics = TRICK_MAX_LONG_LONG ;
-            ret = -1 ;
-        }
-    }
+				/*	Check	if	any	jobs	have	cycle	times	less	than	the	time_tic_value	*/
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								Trick::JobData	*	temp_job	=	all_jobs_vector[ii]	;
+								if	(	temp_job->cycle	<	(1.0	/	time_tic_value)	)	{
+												message_publish(MSG_WARNING,"Cycle	for	(%s)	is	less	than	time	tic	value.	cycle	=	%16.12f,	time_tic	=	%16.12f\n",
+													temp_job->name.c_str()	,	temp_job->cycle,	1.0	/	time_tic_value	)	;
+												temp_job->disabled	=	true	;
+												temp_job->cycle_tics	=	TRICK_MAX_LONG_LONG	;
+												temp_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+												ret	=	-1	;
+								}
+				}
 
-    /* Check if time_tic_value is only divisible by 2 and 5 */
-    temp_time_tic_value = time_tic_value ;
-    while ( temp_time_tic_value % 2 == 0 ) {
-        temp_time_tic_value /= 2 ;
-    }
-    while ( temp_time_tic_value % 5 == 0 ) {
-        temp_time_tic_value /= 5 ;
-    }
-    if ( temp_time_tic_value != 1 ) {
-        return ret ;
-    }
+				/*	Check	if	time_tic_value	is	only	divisible	by	2	and	5	*/
+				temp_time_tic_value	=	time_tic_value	;
+				while	(	temp_time_tic_value	%	2	==	0	)	{
+								temp_time_tic_value	/=	2	;
+				}
+				while	(	temp_time_tic_value	%	5	==	0	)	{
+								temp_time_tic_value	/=	5	;
+				}
+				if	(	temp_time_tic_value	!=	1	)	{
+								return	ret	;
+				}
 
-    /* Check if any jobs have cycle times that have finer resolution than time_tic_value. */
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        Trick::JobData * temp_job = all_jobs_vector[ii] ;
-        double test_rem ;
+				/*	Check	if	any	jobs	have	cycle	times	that	have	finer	resolution	than	time_tic_value.	*/
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								Trick::JobData	*	temp_job	=	all_jobs_vector[ii]	;
+								double	test_rem	;
 
-        /* Calculate the if the cycle_tics would be a whole number  */
-        test_rem = fmod(temp_job->cycle * (double)time_tic_value , 1.0 ) ;
+								/*	Calculate	the	if	the	cycle_tics	would	be	a	whole	number		*/
+								test_rem	=	fmod(temp_job->cycle	*	(double)time_tic_value	,	1.0	)	;
 
-        if ( test_rem > 0.001 ) {
-            message_publish(MSG_WARNING,"Cycle for (%s) cannot be exactly scheduled with time tic value. "
-             "cycle = %16.12f, cycle_tics = %lld , time_tic = %16.12f\n",
-             temp_job->name.c_str() , temp_job->cycle, temp_job->cycle_tics , 1.0 / time_tic_value ) ;
-            ret = -1 ;
-        }
-    }
+								if	(	test_rem	>	0.001	)	{
+												message_publish(MSG_WARNING,"Cycle	for	(%s)	cannot	be	exactly	scheduled	with	time	tic	value.	"
+													"cycle	=	%16.12f,	cycle_tics	=	%lld	,	time_tic	=	%16.12f\n",
+													temp_job->name.c_str()	,	temp_job->cycle,	temp_job->cycle_tics	,	1.0	/	time_tic_value	)	;
+												ret	=	-1	;
+								}
+				}
 
-    for ( ii = 1 ; ii < threads.size() ; ii++ ) {
-        Trick::Threads * curr_thread = threads[ii] ;
-        if ( curr_thread->process_type == PROCESS_TYPE_AMF_CHILD and
-             curr_thread->amf_cycle_tics == 0 ) {
-            message_publish(MSG_ERROR,"Asynchronous must finish thread %d has no cycle time set\n"
-             "Use trick.exec_set_thread_amf_cycle_time( %d , double <cycle_time> )\n"
-             "You're probably deadlocked here.\n" , ii , ii ) ;
-            ret = -1 ;
-        }
-    }
+				for	(	ii	=	1	;	ii	<	threads.size()	;	ii++	)	{
+								Trick::Threads	*	curr_thread	=	threads[ii]	;
+								if	(	curr_thread->process_type	==	PROCESS_TYPE_AMF_CHILD	and
+													curr_thread->amf_cycle_tics	==	0	)	{
+												message_publish(MSG_ERROR,"Asynchronous	must	finish	thread	%d	has	no	cycle	time	set\n"
+													"Use	trick.exec_set_thread_amf_cycle_time(	%d	,	double	<cycle_time>	)\n"
+													"You're	probably	deadlocked	here.\n"	,	ii	,	ii	)	;
+												ret	=	-1	;
+								}
+				}
 
-    return ret  ;
+				return	ret		;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
index 9c30bc5c0..5239c14af 100644
--- a/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
+++ b/trick_source/sim_services/Executive/Executive_check_all_jobs_handled.cpp
@@ -1,40 +1,40 @@
 
-#include <iostream>
-#include <sstream>
-#include <cstring>
+#include	<iostream>
+#include	<sstream>
+#include	<cstring>
 
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# Loop through all jobs checking the job handled flag
--# Warn the user of all jobs not handled by any scheduler
--# Return the number of unhandled jobs
+-#	Loop	through	all	jobs	checking	the	job	handled	flag
+-#	Warn	the	user	of	all	jobs	not	handled	by	any	scheduler
+-#	Return	the	number	of	unhandled	jobs
 */
-int Trick::Executive::check_all_jobs_handled() {
-
-    unsigned int ii , jj ;
-    int ret = 0 ;
-    Trick::SimObject * curr_obj ;
-    Trick::JobData * current_job ;
-
-    /** @par Detailed Design */
-    /** @li Check all job->handled flags */
-    for ( ii = 0 ; ii < sim_objects.size() ; ii++ ) {
-        curr_obj = sim_objects[ii] ;
-        for ( jj = 0 ; jj < curr_obj->jobs.size() ; jj++ ) {
-            current_job = curr_obj->jobs[jj] ;
-            if ( ! current_job->get_handled() ) {
-                 message_publish(MSG_WARNING, "Warning: Job %s of job class \"%s\"is not handled by any scheduler\n" ,
-                 current_job->name.c_str(), current_job->job_class_name.c_str()) ;
-                 ret++ ;
-            }
-        }
-    }
-
-
-    return(ret) ;
+int	Trick::Executive::check_all_jobs_handled()	{
+
+				unsigned	int	ii	,	jj	;
+				int	ret	=	0	;
+				Trick::SimObject	*	curr_obj	;
+				Trick::JobData	*	current_job	;
+
+				/**	@par	Detailed	Design	*/
+				/**	@li	Check	all	job->handled	flags	*/
+				for	(	ii	=	0	;	ii	<	sim_objects.size()	;	ii++	)	{
+								curr_obj	=	sim_objects[ii]	;
+								for	(	jj	=	0	;	jj	<	curr_obj->jobs.size()	;	jj++	)	{
+												current_job	=	curr_obj->jobs[jj]	;
+												if	(	!	current_job->get_handled()	)	{
+																	message_publish(MSG_WARNING,	"Warning:	Job	%s	of	job	class	\"%s\"is	not	handled	by	any	scheduler\n"	,
+																	current_job->name.c_str(),	current_job->job_class_name.c_str())	;
+																	ret++	;
+												}
+								}
+				}
+
+
+				return(ret)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_checkpoint.cpp b/trick_source/sim_services/Executive/Executive_checkpoint.cpp
index e82d86c3d..7b4fae355 100644
--- a/trick_source/sim_services/Executive/Executive_checkpoint.cpp
+++ b/trick_source/sim_services/Executive/Executive_checkpoint.cpp
@@ -1,35 +1,35 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/memorymanager_c_intf.h"
 
 /**
 @details
--# Save the number of jobs in the scheduler
--# Copy all of the job information in a checkpointable array
+-#	Save	the	number	of	jobs	in	the	scheduler
+-#	Copy	all	of	the	job	information	in	a	checkpointable	array
 */
-int Trick::Executive::checkpoint() {
-
-    unsigned int ii ;
-
-    /*
-       The all_jobs_vector contains memory that is not known to the memory manager.  We need to
-       copy the information into memory that is declared to the memory manager.
-     */
-    /* save the number of jobs in the scheduler */
-    num_all_jobs = all_jobs_vector.size() ;
-
-    /* copy all of the job information in a checkpointable array */
-    if ( num_all_jobs > 0 ) {
-        all_jobs_for_checkpoint = (Trick::JobData *)TMM_declare_var( TRICK_STRUCTURED, "Trick::JobData",
-         0 , "all_jobs" , 1 , (int *)&num_all_jobs) ;
-        for ( ii = 0 ; ii < num_all_jobs ; ii++ ) {
-            all_jobs_for_checkpoint[ii] = *(all_jobs_vector[ii]) ;
-        }
-    }
-
-    return(0) ;
+int	Trick::Executive::checkpoint()	{
+
+				unsigned	int	ii	;
+
+				/*
+							The	all_jobs_vector	contains	memory	that	is	not	known	to	the	memory	manager.		We	need	to
+							copy	the	information	into	memory	that	is	declared	to	the	memory	manager.
+					*/
+				/*	save	the	number	of	jobs	in	the	scheduler	*/
+				num_all_jobs	=	all_jobs_vector.size()	;
+
+				/*	copy	all	of	the	job	information	in	a	checkpointable	array	*/
+				if	(	num_all_jobs	>	0	)	{
+								all_jobs_for_checkpoint	=	(Trick::JobData	*)TMM_declare_var(	TRICK_STRUCTURED,	"Trick::JobData",
+									0	,	"all_jobs"	,	1	,	(int	*)&num_all_jobs)	;
+								for	(	ii	=	0	;	ii	<	num_all_jobs	;	ii++	)	{
+												all_jobs_for_checkpoint[ii]	=	*(all_jobs_vector[ii])	;
+								}
+				}
+
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp b/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp
index fb14cc7ea..8012daf27 100644
--- a/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp
+++ b/trick_source/sim_services/Executive/Executive_clear_scheduled_queues.cpp
@@ -1,34 +1,34 @@
 
-#include <iostream>
-#include <sstream>
-
-#include "trick/Executive.hh"
-
-int Trick::Executive::clear_scheduled_queues() {
-
-    unsigned int ii ;
-
-    /** @par Detailed Design */
-    /** @li Clear all non-scheduled job queues */
-    default_data_queue.clear() ;
-    input_processor_queue.clear() ;
-    initialization_queue.clear() ;
-    input_processor_run_queue.clear() ;
-    scheduled_queue.clear() ;
-    top_of_frame_queue.clear() ;
-    end_of_frame_queue.clear() ;
-    shutdown_queue.clear() ;
-    freeze_init_queue.clear() ;
-    freeze_scheduled_queue.clear() ;
-    freeze_queue.clear() ;
-    unfreeze_queue.clear() ;
-    time_tic_changed_queue.clear() ;
-
-    /** @li Clear all thread job queues */
-    for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-        threads[ii]->clear_scheduled_queues() ;
-    }
-
-    return(0) ;
+#include	<iostream>
+#include	<sstream>
+
+#include	"trick/Executive.hh"
+
+int	Trick::Executive::clear_scheduled_queues()	{
+
+				unsigned	int	ii	;
+
+				/**	@par	Detailed	Design	*/
+				/**	@li	Clear	all	non-scheduled	job	queues	*/
+				default_data_queue.clear()	;
+				input_processor_queue.clear()	;
+				initialization_queue.clear()	;
+				input_processor_run_queue.clear()	;
+				scheduled_queue.clear()	;
+				top_of_frame_queue.clear()	;
+				end_of_frame_queue.clear()	;
+				shutdown_queue.clear()	;
+				freeze_init_queue.clear()	;
+				freeze_scheduled_queue.clear()	;
+				freeze_queue.clear()	;
+				unfreeze_queue.clear()	;
+				time_tic_changed_queue.clear()	;
+
+				/**	@li	Clear	all	thread	job	queues	*/
+				for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+								threads[ii]->clear_scheduled_queues()	;
+				}
+
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_create_threads.cpp b/trick_source/sim_services/Executive/Executive_create_threads.cpp
index bf776cd5e..c1f8e6713 100644
--- a/trick_source/sim_services/Executive/Executive_create_threads.cpp
+++ b/trick_source/sim_services/Executive/Executive_create_threads.cpp
@@ -1,32 +1,32 @@
 
-#include <iostream>
-#include <sstream>
-#include <sys/syscall.h>
+#include	<iostream>
+#include	<sstream>
+#include	<sys/syscall.h>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::create_threads() {
+int	Trick::Executive::create_threads()	{
 
-    unsigned int kk ;
+				unsigned	int	kk	;
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li Start up enough threads to handle the jobs specified in the S_define */
-    for ( kk = 1 ; kk < threads.size() ; kk++ ) {
-        // if this is a restart, thread may have already been created
-        if (threads[kk]->get_pthread_id() == 0) {
-            threads[kk]->create_thread() ;
-        }
-        // set the initial time of each thread to the main thread time.
-        threads[kk]->curr_time_tics = time_tics ;
-    }
+				/**	@li	Start	up	enough	threads	to	handle	the	jobs	specified	in	the	S_define	*/
+				for	(	kk	=	1	;	kk	<	threads.size()	;	kk++	)	{
+								//	if	this	is	a	restart,	thread	may	have	already	been	created
+								if	(threads[kk]->get_pthread_id()	==	0)	{
+												threads[kk]->create_thread()	;
+								}
+								//	set	the	initial	time	of	each	thread	to	the	main	thread	time.
+								threads[kk]->curr_time_tics	=	time_tics	;
+				}
 
-    /** @li Set the priority and CPU affinity for the main thread. */
-    threads[0]->set_pthread_id(pthread_self());
-    threads[0]->set_pid();
-    threads[0]->execute_priority() ;
-    threads[0]->execute_cpu_affinity() ;
+				/**	@li	Set	the	priority	and	CPU	affinity	for	the	main	thread.	*/
+				threads[0]->set_pthread_id(pthread_self());
+				threads[0]->set_pid();
+				threads[0]->execute_priority()	;
+				threads[0]->execute_cpu_affinity()	;
 
-    return(0) ;
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_fpe_handler.cpp b/trick_source/sim_services/Executive/Executive_fpe_handler.cpp
index 8b5a2b48a..6e30d25e8 100644
--- a/trick_source/sim_services/Executive/Executive_fpe_handler.cpp
+++ b/trick_source/sim_services/Executive/Executive_fpe_handler.cpp
@@ -1,91 +1,91 @@
 /*
-   PURPOSE: (Floating point exception handler)
+			PURPOSE:	(Floating	point	exception	handler)
 
-   PROGRAMMERS: (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime)))
- */
+			PROGRAMMERS:	(((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime)))
+	*/
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include	<stdio.h>
+#include	<string.h>
+#include	<stdlib.h>
+#include	<unistd.h>
 
-#ifdef __APPLE__
-#include <mach-o/dyld.h>
+#ifdef	__APPLE__
+#include	<mach-o/dyld.h>
 #endif
 
 /*
- * FPE specific headers
- */
-#ifdef __linux
-#include <fenv.h>
+	*	FPE	specific	headers
+	*/
+#ifdef	__linux
+#include	<fenv.h>
 #endif
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
 
 /**
 @design
--# This signal handler processes SIGFPE
--# Write a message to stderr that a signal has been caught.
--# In Linux print out the type of floating point error that occured.
--# If attach_debugger == true, attempt to attach a debugger to the current process.
--# Else if stack_trace == true, attempt to attach a debugger to print a stack trace.
--# Exit the process with a -2 return.
+-#	This	signal	handler	processes	SIGFPE
+-#	Write	a	message	to	stderr	that	a	signal	has	been	caught.
+-#	In	Linux	print	out	the	type	of	floating	point	error	that	occured.
+-#	If	attach_debugger	==	true,	attempt	to	attach	a	debugger	to	the	current	process.
+-#	Else	if	stack_trace	==	true,	attempt	to	attach	a	debugger	to	print	a	stack	trace.
+-#	Exit	the	process	with	a	-2	return.
 */
 
-void Trick::Executive::fpe_handler(siginfo_t * sip __attribute__((unused)) ) {
+void	Trick::Executive::fpe_handler(siginfo_t	*	sip	__attribute__((unused))	)	{
 
-    write( 2 , "\033[31mProcess terminated by signal FPE" , 36 ) ;
-#if __linux
-    /* Determine what floating point error occurred */
-    if (sip != (siginfo_t *) NULL) {
-        switch (sip->si_code) {
-            case FPE_FLTRES:          /* inexact */
-                write( 2, " (inexact)", 10 );
-                return ;
-            case FPE_FLTUND:          /* underflow */
-                write( 2, " (floating point underflow)", 27 );
-                break;
-            case FPE_FLTINV:          /* invalid operand */
-                write( 2, " (invalid operand)", 18 );
-                break;
-            case FPE_FLTDIV:          /* division-by-zero */
-                write( 2, " (floating point division-by-zero)", 34);
-                break;
-            case FPE_FLTOVF:          /* overflow */
-                write( 2, " (floating point overflow)", 26);
-                break;
-            case FPE_INTOVF:          /* integer overflow */
-                write( 2, " (integer overflow)", 19);
-                break;
-            case FPE_INTDIV:          /* integer division-by-zero */
-                write( 2, " (integer division-by-zero)", 27);
-                break;
-            default:
-                break;
-        }
-    }
+				write(	2	,	"\033[31mProcess	terminated	by	signal	FPE"	,	36	)	;
+#if	__linux
+				/*	Determine	what	floating	point	error	occurred	*/
+				if	(sip	!=	(siginfo_t	*)	NULL)	{
+								switch	(sip->si_code)	{
+												case	FPE_FLTRES:										/*	inexact	*/
+																write(	2,	"	(inexact)",	10	);
+																return	;
+												case	FPE_FLTUND:										/*	underflow	*/
+																write(	2,	"	(floating	point	underflow)",	27	);
+																break;
+												case	FPE_FLTINV:										/*	invalid	operand	*/
+																write(	2,	"	(invalid	operand)",	18	);
+																break;
+												case	FPE_FLTDIV:										/*	division-by-zero	*/
+																write(	2,	"	(floating	point	division-by-zero)",	34);
+																break;
+												case	FPE_FLTOVF:										/*	overflow	*/
+																write(	2,	"	(floating	point	overflow)",	26);
+																break;
+												case	FPE_INTOVF:										/*	integer	overflow	*/
+																write(	2,	"	(integer	overflow)",	19);
+																break;
+												case	FPE_INTDIV:										/*	integer	division-by-zero	*/
+																write(	2,	"	(integer	division-by-zero)",	27);
+																break;
+												default:
+																break;
+								}
+				}
 #endif
-    write( 2 , "\033[0m\n" , 5 ) ;
+				write(	2	,	"\033[0m\n"	,	5	)	;
 
-    /*
-     Attempt to attach with debugger or print stack trace.  Not a requirement.
-     snprintf and system are not async signal safe, but we don't have anything to lose.
-     */
-#if __linux
-    char command[1024];
-    if (attach_debugger == true) {
-        snprintf(command, sizeof(command), "%s -silent /proc/%d/exe %d", debugger_command.c_str(), getpid(), getpid());
-        system(command);
-    } else if (stack_trace == true ) {
-            snprintf(command, sizeof(command), "%s -silent -batch -x ${TRICK_HOME}/share/trick/gdb_commands "
-                    "/proc/%d/exe %d", debugger_command.c_str(), getpid(), getpid());
-            system(command);
-    }
+				/*
+					Attempt	to	attach	with	debugger	or	print	stack	trace.		Not	a	requirement.
+					snprintf	and	system	are	not	async	signal	safe,	but	we	don't	have	anything	to	lose.
+					*/
+#if	__linux
+				char	command[1024];
+				if	(attach_debugger	==	true)	{
+								snprintf(command,	sizeof(command),	"%s	-silent	/proc/%d/exe	%d",	debugger_command.c_str(),	getpid(),	getpid());
+								system(command);
+				}	else	if	(stack_trace	==	true	)	{
+												snprintf(command,	sizeof(command),	"%s	-silent	-batch	-x	${TRICK_HOME}/share/trick/gdb_commands	"
+																				"/proc/%d/exe	%d",	debugger_command.c_str(),	getpid(),	getpid());
+												system(command);
+				}
 #endif
 
-    // The user has chosen for Trick to intervene on their behalf.  Exit if handler called.
-    _exit(-2) ;
+				//	The	user	has	chosen	for	Trick	to	intervene	on	their	behalf.		Exit	if	handler	called.
+				_exit(-2)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_freeze.cpp b/trick_source/sim_services/Executive/Executive_freeze.cpp
index 736b543f9..d3fbbb509 100644
--- a/trick_source/sim_services/Executive/Executive_freeze.cpp
+++ b/trick_source/sim_services/Executive/Executive_freeze.cpp
@@ -1,89 +1,89 @@
 
-#include <iostream>
-#include <sstream>
-
-#include "trick/TrickConstant.hh"
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-int Trick::Executive::get_freeze_job(std::string sim_object_name) {
-    freeze_job = get_job(sim_object_name + ".sched_freeze_to_exec_command") ;
-    if ( freeze_job == NULL ) {
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , "Executive could not find freeze job" ) ;
-    } else {
-        freeze_job->next_tics = TRICK_MAX_LONG_LONG ;
-    }
-
-    return 0 ;
+#include	<iostream>
+#include	<sstream>
+
+#include	"trick/TrickConstant.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+int	Trick::Executive::get_freeze_job(std::string	sim_object_name)	{
+				freeze_job	=	get_job(sim_object_name	+	".sched_freeze_to_exec_command")	;
+				if	(	freeze_job	==	NULL	)	{
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	"Executive	could	not	find	freeze	job"	)	;
+				}	else	{
+								freeze_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
+
+				return	0	;
 }
 
 /**
 @details
--# Set async_freeze_command to true  Requirement [@ref r_exec_mode_4]
+-#	Set	async_freeze_command	to	true		Requirement	[@ref	r_exec_mode_4]
 */
-int Trick::Executive::freeze() {
+int	Trick::Executive::freeze()	{
 
-    async_freeze_command = true ;
+				async_freeze_command	=	true	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::Executive::freeze(double in_time) {
+int	Trick::Executive::freeze(double	in_time)	{
 
-    long long new_time ;
-    new_time = (long long)(in_time * time_tic_value) ;
+				long	long	new_time	;
+				new_time	=	(long	long)(in_time	*	time_tic_value)	;
 
-    if (new_time > time_tics ) {
-        freeze_times.push(new_time) ;
-        if ( new_time < freeze_job->next_tics ) {
-            freeze_job->next_tics = new_time ;
-        }
-        //std::cout << "\033[33mSET FREEZE TIME " << in_time << " " << new_time << "\033[0m" << std::endl ;
-    } else {
-        message_publish(MSG_ERROR, "Freeze time specified in the past. specified %f, current_time %f\n",
-         in_time , get_sim_time()) ;
-    }
+				if	(new_time	>	time_tics	)	{
+								freeze_times.push(new_time)	;
+								if	(	new_time	<	freeze_job->next_tics	)	{
+												freeze_job->next_tics	=	new_time	;
+								}
+								//std::cout	<<	"\033[33mSET	FREEZE	TIME	"	<<	in_time	<<	"	"	<<	new_time	<<	"\033[0m"	<<	std::endl	;
+				}	else	{
+								message_publish(MSG_ERROR,	"Freeze	time	specified	in	the	past.	specified	%f,	current_time	%f\n",
+									in_time	,	get_sim_time())	;
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
 @details
--# Sets exec_command to FreezeCmd at the end of the software frame
+-#	Sets	exec_command	to	FreezeCmd	at	the	end	of	the	software	frame
 */
-int Trick::Executive::async_freeze_to_exec_command() {
+int	Trick::Executive::async_freeze_to_exec_command()	{
 
-    if ( async_freeze_command ) {
-        exec_command = FreezeCmd ;
-        async_freeze_command = false ;
-    }
+				if	(	async_freeze_command	)	{
+								exec_command	=	FreezeCmd	;
+								async_freeze_command	=	false	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::Executive::sched_freeze_to_exec_command(bool end_of_frame) {
-
-    if ( end_of_frame or !freeze_on_frame_boundary ) {
-        // remove all times at the top of the queue that match the current time.
-        while ( !freeze_times.empty() and (freeze_times.top() <= time_tics) ) {
-            exec_command = FreezeCmd ;
-            freeze_times.pop() ;
-        }
-
-        if ( freeze_job != NULL ) {
-            if ( !freeze_times.empty() ) {
-                freeze_job->next_tics = freeze_times.top() ;
-            } else {
-                freeze_job->next_tics = TRICK_MAX_LONG_LONG ;
-            }
-        }
-    }
-
-    return(0) ;
+int	Trick::Executive::sched_freeze_to_exec_command(bool	end_of_frame)	{
+
+				if	(	end_of_frame	or	!freeze_on_frame_boundary	)	{
+								//	remove	all	times	at	the	top	of	the	queue	that	match	the	current	time.
+								while	(	!freeze_times.empty()	and	(freeze_times.top()	<=	time_tics)	)	{
+												exec_command	=	FreezeCmd	;
+												freeze_times.pop()	;
+								}
+
+								if	(	freeze_job	!=	NULL	)	{
+												if	(	!freeze_times.empty()	)	{
+																freeze_job->next_tics	=	freeze_times.top()	;
+												}	else	{
+																freeze_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+												}
+								}
+				}
+
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_freeze_loop.cpp b/trick_source/sim_services/Executive/Executive_freeze_loop.cpp
index 19d5ef4bd..672067ff7 100644
--- a/trick_source/sim_services/Executive/Executive_freeze_loop.cpp
+++ b/trick_source/sim_services/Executive/Executive_freeze_loop.cpp
@@ -1,102 +1,102 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# Set the mode to Freeze.  Requirement  [@ref r_exec_mode_2]
--# Call freeze_init jobs.  Requirement [@ref r_exec_discrete_2].
--# While mode is Freeze
-    -# Call the freeze jobs Requirement [@ref r_exec_periodic_1].
-    -# If the exec_command is set to RunCmd, set the mode to Run.
-    -# If the exec_command is set to ExitCmd, call exec_terminate_with_return
--# Call unfreeze jobs.  Requirement [@ref r_exec_discrete_3].
+-#	Set	the	mode	to	Freeze.		Requirement		[@ref	r_exec_mode_2]
+-#	Call	freeze_init	jobs.		Requirement	[@ref	r_exec_discrete_2].
+-#	While	mode	is	Freeze
+				-#	Call	the	freeze	jobs	Requirement	[@ref	r_exec_periodic_1].
+				-#	If	the	exec_command	is	set	to	RunCmd,	set	the	mode	to	Run.
+				-#	If	the	exec_command	is	set	to	ExitCmd,	call	exec_terminate_with_return
+-#	Call	unfreeze	jobs.		Requirement	[@ref	r_exec_discrete_3].
 */
-int Trick::Executive::freeze_loop() {
-
-    int ret ;
-
-    /* Set the mode to Freeze */
-    mode = Freeze;
-
-    /* Execute the Freeze Init Jobs. */
-    freeze_init_queue.reset_curr_index() ;
-    while ( (curr_job = freeze_init_queue.get_next_job()) != NULL ) {
-        curr_job->call() ;
-    }
-
-    message_publish(MSG_INFO, "Freeze ON. Simulation time holding at %f seconds.\n" , get_sim_time()) ;
-
-    while (mode == Freeze) {
-
-        /* Run the Freeze Scheduled Jobs. */
-        while ( freeze_time_tics < next_freeze_frame_check_tics ) {
-            /* Call all freeze loop jobs that are scheduled to run at the current freeze loop time step. */
-            freeze_scheduled_queue.reset_curr_index() ;
-            while ( (curr_job = freeze_scheduled_queue.find_next_job( freeze_time_tics )) != NULL ) {
-                ret = curr_job->call() ;
-                if ( ret != 0 ) {
-                    exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "job did not return 0") ;
-                }
-                if ( curr_job->system_job_class ) {
-                    freeze_scheduled_queue.test_next_job_call_time(curr_job , freeze_time_tics) ;
-                }
-            }
-            // Get the next job call time.  Set the freeze clock to this time
-            freeze_time_tics = freeze_scheduled_queue.get_next_job_call_time() ;
-
-            // If the next freeze frame time is smaller than then current freeze time, set it to the frame time
-            if ( next_freeze_frame_check_tics < freeze_time_tics ) {
-                freeze_time_tics = next_freeze_frame_check_tics ;
-            }
-            // Start the next job call time for the next loop to be 1 software frame from the current time.
-            freeze_scheduled_queue.set_next_job_call_time(freeze_time_tics + freeze_frame_tics) ;
-        }
-        freeze_frame_count++ ;
-        next_freeze_frame_check_tics += freeze_frame_tics ;
-
-        /* Enter loop that continually executes the Freeze Jobs. */
-        freeze_queue.reset_curr_index() ;
-        while ( (curr_job = freeze_queue.get_next_job()) != NULL ) {
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "job did not return 0") ;
-            }
-        }
-
-        /* Exit loop executing freeze jobs if commanded from run() */
-        if (exec_command == RunCmd) {
-            mode = Run ;
-            exec_command = NoCmd ;
-        } else if ( exec_command == FreezeCmd ) {
-            /* redundant freeze command.  Clear it. */
-            exec_command = NoCmd ;
-        }
-
-        /* Call Executive::exec_terminate_with_return(int , const char * , int , const char *)
-           if exec_command equals ExitCmd. */
-        if (exec_command == ExitCmd) {
-            exec_terminate_with_return( 0 , __FILE__ , __LINE__ , "Sim control Shutdown" ) ;
-        }
-
-
-    }
-
-    message_publish(MSG_INFO,"Freeze OFF.\n") ;
-
-    /* Execute the Unfreeze Jobs. */
-    unfreeze_queue.reset_curr_index() ;
-    while ( (curr_job = unfreeze_queue.get_next_job()) != NULL ) {
-        curr_job->call() ;
-    }
-
-
-    return(0) ;
+int	Trick::Executive::freeze_loop()	{
+
+				int	ret	;
+
+				/*	Set	the	mode	to	Freeze	*/
+				mode	=	Freeze;
+
+				/*	Execute	the	Freeze	Init	Jobs.	*/
+				freeze_init_queue.reset_curr_index()	;
+				while	(	(curr_job	=	freeze_init_queue.get_next_job())	!=	NULL	)	{
+								curr_job->call()	;
+				}
+
+				message_publish(MSG_INFO,	"Freeze	ON.	Simulation	time	holding	at	%f	seconds.\n"	,	get_sim_time())	;
+
+				while	(mode	==	Freeze)	{
+
+								/*	Run	the	Freeze	Scheduled	Jobs.	*/
+								while	(	freeze_time_tics	<	next_freeze_frame_check_tics	)	{
+												/*	Call	all	freeze	loop	jobs	that	are	scheduled	to	run	at	the	current	freeze	loop	time	step.	*/
+												freeze_scheduled_queue.reset_curr_index()	;
+												while	(	(curr_job	=	freeze_scheduled_queue.find_next_job(	freeze_time_tics	))	!=	NULL	)	{
+																ret	=	curr_job->call()	;
+																if	(	ret	!=	0	)	{
+																				exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"job	did	not	return	0")	;
+																}
+																if	(	curr_job->system_job_class	)	{
+																				freeze_scheduled_queue.test_next_job_call_time(curr_job	,	freeze_time_tics)	;
+																}
+												}
+												//	Get	the	next	job	call	time.		Set	the	freeze	clock	to	this	time
+												freeze_time_tics	=	freeze_scheduled_queue.get_next_job_call_time()	;
+
+												//	If	the	next	freeze	frame	time	is	smaller	than	then	current	freeze	time,	set	it	to	the	frame	time
+												if	(	next_freeze_frame_check_tics	<	freeze_time_tics	)	{
+																freeze_time_tics	=	next_freeze_frame_check_tics	;
+												}
+												//	Start	the	next	job	call	time	for	the	next	loop	to	be	1	software	frame	from	the	current	time.
+												freeze_scheduled_queue.set_next_job_call_time(freeze_time_tics	+	freeze_frame_tics)	;
+								}
+								freeze_frame_count++	;
+								next_freeze_frame_check_tics	+=	freeze_frame_tics	;
+
+								/*	Enter	loop	that	continually	executes	the	Freeze	Jobs.	*/
+								freeze_queue.reset_curr_index()	;
+								while	(	(curr_job	=	freeze_queue.get_next_job())	!=	NULL	)	{
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"job	did	not	return	0")	;
+												}
+								}
+
+								/*	Exit	loop	executing	freeze	jobs	if	commanded	from	run()	*/
+								if	(exec_command	==	RunCmd)	{
+												mode	=	Run	;
+												exec_command	=	NoCmd	;
+								}	else	if	(	exec_command	==	FreezeCmd	)	{
+												/*	redundant	freeze	command.		Clear	it.	*/
+												exec_command	=	NoCmd	;
+								}
+
+								/*	Call	Executive::exec_terminate_with_return(int	,	const	char	*	,	int	,	const	char	*)
+											if	exec_command	equals	ExitCmd.	*/
+								if	(exec_command	==	ExitCmd)	{
+												exec_terminate_with_return(	0	,	__FILE__	,	__LINE__	,	"Sim	control	Shutdown"	)	;
+								}
+
+
+				}
+
+				message_publish(MSG_INFO,"Freeze	OFF.\n")	;
+
+				/*	Execute	the	Unfreeze	Jobs.	*/
+				unfreeze_queue.reset_curr_index()	;
+				while	(	(curr_job	=	unfreeze_queue.get_next_job())	!=	NULL	)	{
+								curr_job->call()	;
+				}
+
+
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_get_curr_job.cpp b/trick_source/sim_services/Executive/Executive_get_curr_job.cpp
index ec7882c56..266b8a7db 100644
--- a/trick_source/sim_services/Executive/Executive_get_curr_job.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_curr_job.cpp
@@ -1,17 +1,17 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-Trick::JobData * Trick::Executive::get_curr_job() {
+Trick::JobData	*	Trick::Executive::get_curr_job()	{
 
-    unsigned int proc_id = get_process_id() ;
+				unsigned	int	proc_id	=	get_process_id()	;
 
-    if (proc_id == 0) {
-        return( curr_job ) ;
-    } else {
-        return( threads.at(proc_id)->curr_job ) ;
-    }
+				if	(proc_id	==	0)	{
+								return(	curr_job	)	;
+				}	else	{
+								return(	threads.at(proc_id)->curr_job	)	;
+				}
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_get_job.cpp b/trick_source/sim_services/Executive/Executive_get_job.cpp
index 1289ef4f4..f97ca8863 100644
--- a/trick_source/sim_services/Executive/Executive_get_job.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_job.cpp
@@ -1,29 +1,29 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-Trick::JobData * Trick::Executive::get_job(std::string job_name, unsigned int j_instance) {
+Trick::JobData	*	Trick::Executive::get_job(std::string	job_name,	unsigned	int	j_instance)	{
 
-    unsigned int ii ;
-    std::multimap<std::string , Trick::JobData *>::iterator it ;
-    std::pair<std::multimap<std::string , Trick::JobData *>::iterator , std::multimap<std::string , Trick::JobData *>::iterator> range ;
+				unsigned	int	ii	;
+				std::multimap<std::string	,	Trick::JobData	*>::iterator	it	;
+				std::pair<std::multimap<std::string	,	Trick::JobData	*>::iterator	,	std::multimap<std::string	,	Trick::JobData	*>::iterator>	range	;
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li Find all jobs that have the target name and hold them in a list */
-    range = all_jobs.equal_range(job_name) ;
+				/**	@li	Find	all	jobs	that	have	the	target	name	and	hold	them	in	a	list	*/
+				range	=	all_jobs.equal_range(job_name)	;
 
-    /** @li Move to the j_instance-th item in the list */
-    for ( it = range.first , ii = 1 ; (it != range.second) && (ii < j_instance) ; ++it , ii++ ) ;
+				/**	@li	Move	to	the	j_instance-th	item	in	the	list	*/
+				for	(	it	=	range.first	,	ii	=	1	;	(it	!=	range.second)	&&	(ii	<	j_instance)	;	++it	,	ii++	)	;
 
-    /** @li If the j_instance-th item doesn't exist return NULL */
-    if ( it == range.second ) {
-        return(NULL) ;
-    }
+				/**	@li	If	the	j_instance-th	item	doesn't	exist	return	NULL	*/
+				if	(	it	==	range.second	)	{
+								return(NULL)	;
+				}
 
-    /** @li return the j_instance-th item */
-    return((*it).second) ;
+				/**	@li	return	the	j_instance-th	item	*/
+				return((*it).second)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp b/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp
index 8421b2927..6b2ac0ef1 100644
--- a/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_job_cycle.cpp
@@ -1,21 +1,21 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-double Trick::Executive::get_job_cycle(std::string job_name) {
+double	Trick::Executive::get_job_cycle(std::string	job_name)	{
 
-    Trick::JobData * job = NULL ;
+				Trick::JobData	*	job	=	NULL	;
 
-    if ( job_name.empty() ) {
-        return(get_curr_job()->cycle) ;
-    } else {
-        if ( (job = get_job(job_name)) != NULL ) {
-            return(job->cycle) ;
-        }
-    }
+				if	(	job_name.empty()	)	{
+								return(get_curr_job()->cycle)	;
+				}	else	{
+								if	(	(job	=	get_job(job_name))	!=	NULL	)	{
+												return(job->cycle)	;
+								}
+				}
 
-    return(0.0) ;
+				return(0.0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_get_process_id.cpp b/trick_source/sim_services/Executive/Executive_get_process_id.cpp
index fd174ae4b..19b55e8c2 100644
--- a/trick_source/sim_services/Executive/Executive_get_process_id.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_process_id.cpp
@@ -1,23 +1,23 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-unsigned int Trick::Executive::get_process_id() {
+unsigned	int	Trick::Executive::get_process_id()	{
 
-    unsigned int ii ;
-    pthread_t curr_pthread_id ;
+				unsigned	int	ii	;
+				pthread_t	curr_pthread_id	;
 
-    if ( get_num_threads() > 1 ) {
-        curr_pthread_id = pthread_self() ;
-        for (ii = 0 ; ii < threads.size() ; ii++ ) {
-            if ( pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id()) ) {
-                return(ii) ;
-            }
-        }
-    }
+				if	(	get_num_threads()	>	1	)	{
+								curr_pthread_id	=	pthread_self()	;
+								for	(ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+												if	(	pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id())	)	{
+																return(ii)	;
+												}
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_get_sim_time.cpp b/trick_source/sim_services/Executive/Executive_get_sim_time.cpp
index 93e79256d..78a13125d 100644
--- a/trick_source/sim_services/Executive/Executive_get_sim_time.cpp
+++ b/trick_source/sim_services/Executive/Executive_get_sim_time.cpp
@@ -1,50 +1,50 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-double Trick::Executive::get_sim_time() {
+double	Trick::Executive::get_sim_time()	{
 
-    unsigned int ii ;
-    unsigned int num_threads ;
-    pthread_t curr_pthread_id ;
+				unsigned	int	ii	;
+				unsigned	int	num_threads	;
+				pthread_t	curr_pthread_id	;
 
-    num_threads = get_num_threads() ;
+				num_threads	=	get_num_threads()	;
 
-    if ( num_threads == 1 ) {
-        return((double)threads[0]->curr_time_tics / time_tic_value) ;
-    } else if ( num_threads > 1 ) {
-        curr_pthread_id = pthread_self() ;
-        for (ii = 0 ; ii < threads.size() ; ii++ ) {
-            if ( pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id()) ) {
-                return((double)threads[ii]->curr_time_tics / time_tic_value) ;
-            }
-        }
-    }
+				if	(	num_threads	==	1	)	{
+								return((double)threads[0]->curr_time_tics	/	time_tic_value)	;
+				}	else	if	(	num_threads	>	1	)	{
+								curr_pthread_id	=	pthread_self()	;
+								for	(ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+												if	(	pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id())	)	{
+																return((double)threads[ii]->curr_time_tics	/	time_tic_value)	;
+												}
+								}
+				}
 
-    return ((double)time_tics / time_tic_value) ;
+				return	((double)time_tics	/	time_tic_value)	;
 
 }
 
-long long Trick::Executive::get_time_tics() {
+long	long	Trick::Executive::get_time_tics()	{
 
-    unsigned int ii ;
-    unsigned int num_threads ;
-    pthread_t curr_pthread_id ;
+				unsigned	int	ii	;
+				unsigned	int	num_threads	;
+				pthread_t	curr_pthread_id	;
 
-    num_threads = get_num_threads() ;
+				num_threads	=	get_num_threads()	;
 
-    if ( num_threads == 1 ) {
-        return(threads[0]->curr_time_tics) ;
-    } else if ( num_threads > 1 ) {
-        curr_pthread_id = pthread_self() ;
-        for (ii = 0 ; ii < threads.size() ; ii++ ) {
-            if ( pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id()) ) {
-                return(threads[ii]->curr_time_tics) ;
-            }
-        }
-    }
+				if	(	num_threads	==	1	)	{
+								return(threads[0]->curr_time_tics)	;
+				}	else	if	(	num_threads	>	1	)	{
+								curr_pthread_id	=	pthread_self()	;
+								for	(ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+												if	(	pthread_equal(curr_pthread_id,threads[ii]->get_pthread_id())	)	{
+																return(threads[ii]->curr_time_tics)	;
+												}
+								}
+				}
 
-    return (time_tics) ;
+				return	(time_tics)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_init.cpp b/trick_source/sim_services/Executive/Executive_init.cpp
index 66ecd46ab..f906d980e 100644
--- a/trick_source/sim_services/Executive/Executive_init.cpp
+++ b/trick_source/sim_services/Executive/Executive_init.cpp
@@ -1,81 +1,81 @@
 
-#include <iostream>
-#include <stdlib.h>
-#include <sys/resource.h>
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
+#include	<iostream>
+#include	<stdlib.h>
+#include	<sys/resource.h>
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
 
 /**
 @details
--# Set the mode to Initialization
-   Requirement [@ref r_exec_mode_0].
--# Start the cpu usage meter
--# Call the default_data jobs
--# Call the initialization jobs.
--# Record the cpu usage during initialization
--# The scheduler initializes simulation timers.
-   Requirement [@ref r_exec_time_1].
--# If an exception is caught, print as much error information available based
-   on execption type caught and exit.
--# If no execption is caught return 0
+-#	Set	the	mode	to	Initialization
+			Requirement	[@ref	r_exec_mode_0].
+-#	Start	the	cpu	usage	meter
+-#	Call	the	default_data	jobs
+-#	Call	the	initialization	jobs.
+-#	Record	the	cpu	usage	during	initialization
+-#	The	scheduler	initializes	simulation	timers.
+			Requirement	[@ref	r_exec_time_1].
+-#	If	an	exception	is	caught,	print	as	much	error	information	available	based
+			on	execption	type	caught	and	exit.
+-#	If	no	execption	is	caught	return	0
 */
-int Trick::Executive::init() {
+int	Trick::Executive::init()	{
 
-    double cpu_time ;
+				double	cpu_time	;
 
 
-    try {
+				try	{
 
-        mode = Initialization ;
+								mode	=	Initialization	;
 
-        /* Start the cpu usage meter */
-        struct rusage cpu_usage_buf ;
-        getrusage(RUSAGE_SELF, &cpu_usage_buf);
-        user_cpu_start =   ((double) cpu_usage_buf.ru_utime.tv_sec) + ((double) cpu_usage_buf.ru_utime.tv_usec / 1000000.0);
-        
-        /* command line args */
-        process_sim_args();
+								/*	Start	the	cpu	usage	meter	*/
+								struct	rusage	cpu_usage_buf	;
+								getrusage(RUSAGE_SELF,	&cpu_usage_buf);
+								user_cpu_start	=			((double)	cpu_usage_buf.ru_utime.tv_sec)	+	((double)	cpu_usage_buf.ru_utime.tv_usec	/	1000000.0);
+								
+								/*	command	line	args	*/
+								process_sim_args();
 
-        call_default_data() ;
-        call_input_processor() ;
+								call_default_data()	;
+								call_input_processor()	;
 
-        // If we are starting from a checkpoint, restart_called will be true.  Skip init routines in this case.
-        if ( ! restart_called ) {
-            call_initialization() ;
-        }
+								//	If	we	are	starting	from	a	checkpoint,	restart_called	will	be	true.		Skip	init	routines	in	this	case.
+								if	(	!	restart_called	)	{
+												call_initialization()	;
+								}
 
-        init_log_stream.close();
+								init_log_stream.close();
 
-        /* Set the initial values for the scheduler times. */
-        next_frame_check_tics = software_frame_tics + time_tics ;
-        job_call_time_tics = next_frame_check_tics ;
-        sim_start = get_sim_time();
+								/*	Set	the	initial	values	for	the	scheduler	times.	*/
+								next_frame_check_tics	=	software_frame_tics	+	time_tics	;
+								job_call_time_tics	=	next_frame_check_tics	;
+								sim_start	=	get_sim_time();
 
-        /* Record the cpu usage for initialization */
-        getrusage(RUSAGE_SELF, &cpu_usage_buf);
-        cpu_time = ((double) cpu_usage_buf.ru_utime.tv_sec) + ((double) cpu_usage_buf.ru_utime.tv_usec / 1000000.0);
-        user_cpu_init = cpu_time - user_cpu_start;
+								/*	Record	the	cpu	usage	for	initialization	*/
+								getrusage(RUSAGE_SELF,	&cpu_usage_buf);
+								cpu_time	=	((double)	cpu_usage_buf.ru_utime.tv_sec)	+	((double)	cpu_usage_buf.ru_utime.tv_usec	/	1000000.0);
+								user_cpu_init	=	cpu_time	-	user_cpu_start;
 
-        cpu_time = ((double) cpu_usage_buf.ru_stime.tv_sec) + ((double) cpu_usage_buf.ru_stime.tv_usec / 1000000.0);
-        kernal_cpu_init = cpu_time - kernal_cpu_start;
+								cpu_time	=	((double)	cpu_usage_buf.ru_stime.tv_sec)	+	((double)	cpu_usage_buf.ru_stime.tv_usec	/	1000000.0);
+								kernal_cpu_init	=	cpu_time	-	kernal_cpu_start;
 
-        /* Record both voluntary and involuntary context switches usage for initialization */
-        v_context_switch_init = cpu_usage_buf.ru_nvcsw;
-        iv_context_switch_init = cpu_usage_buf.ru_nivcsw;
-        
-        initialization_complete = true ;
+								/*	Record	both	voluntary	and	involuntary	context	switches	usage	for	initialization	*/
+								v_context_switch_init	=	cpu_usage_buf.ru_nvcsw;
+								iv_context_switch_init	=	cpu_usage_buf.ru_nivcsw;
+								
+								initialization_complete	=	true	;
 
-    /* Print as much error information avaiable for all exception and exit. */
-    } catch (Trick::ExecutiveException & ex ) {
-        /* Set the exit return code, file name, and error message. Return -1 so we go to shutdown */
-        except_return = ex.ret_code ;
-        except_file = ex.file ;
-        except_message = ex.message ;
-        return(-1) ;
-    }
+				/*	Print	as	much	error	information	avaiable	for	all	exception	and	exit.	*/
+				}	catch	(Trick::ExecutiveException	&	ex	)	{
+								/*	Set	the	exit	return	code,	file	name,	and	error	message.	Return	-1	so	we	go	to	shutdown	*/
+								except_return	=	ex.ret_code	;
+								except_file	=	ex.file	;
+								except_message	=	ex.message	;
+								return(-1)	;
+				}
 
-    /* return 0 if there are no errors. */
-    return(0) ;
+				/*	return	0	if	there	are	no	errors.	*/
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp b/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp
index 9a9b9b1f2..7496c0a46 100644
--- a/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp
+++ b/trick_source/sim_services/Executive/Executive_init_freeze_scheduled.cpp
@@ -1,19 +1,19 @@
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::init_freeze_scheduled() {
+int	Trick::Executive::init_freeze_scheduled()	{
 
-    freeze_time_tics = 0 ;
-    freeze_frame_count = 0 ;
-    next_freeze_frame_check_tics = freeze_frame_tics ;
-    freeze_scheduled_queue.set_next_job_call_time(freeze_time_tics) ;
+				freeze_time_tics	=	0	;
+				freeze_frame_count	=	0	;
+				next_freeze_frame_check_tics	=	freeze_frame_tics	;
+				freeze_scheduled_queue.set_next_job_call_time(freeze_time_tics)	;
 
-    Trick::JobData * jd ;
-    freeze_scheduled_queue.reset_curr_index() ;
-    while ( (jd = freeze_scheduled_queue.get_next_job()) != NULL ) {
-        jd->next_tics = 0 ;
-    }
+				Trick::JobData	*	jd	;
+				freeze_scheduled_queue.reset_curr_index()	;
+				while	(	(jd	=	freeze_scheduled_queue.get_next_job())	!=	NULL	)	{
+								jd->next_tics	=	0	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp b/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp
index a7ae12981..918bb212a 100644
--- a/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp
+++ b/trick_source/sim_services/Executive/Executive_init_signal_handlers.cpp
@@ -1,205 +1,205 @@
 
-#include <signal.h>
-#include <errno.h>
+#include	<signal.h>
+#include	<errno.h>
 
-/* Headers for floating point exceptions */
-#ifdef __linux
-#include <fenv.h>
+/*	Headers	for	floating	point	exceptions	*/
+#ifdef	__linux
+#include	<fenv.h>
 #endif
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-void sig_hand(int sig) ;
-void ctrl_c_hand(int sig) ;
-void term_hand(int sig) ;
-void usr1_hand(int sig) ;
-void child_handler(int sig) ;
+void	sig_hand(int	sig)	;
+void	ctrl_c_hand(int	sig)	;
+void	term_hand(int	sig)	;
+void	usr1_hand(int	sig)	;
+void	child_handler(int	sig)	;
 
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-void fpe_sig_handler(int sig) ;
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+void	fpe_sig_handler(int	sig)	;
 #else
-void fpe_sig_handler(int sig, siginfo_t * sip, void *uap) ;
+void	fpe_sig_handler(int	sig,	siginfo_t	*	sip,	void	*uap)	;
 #endif
 
 /**
 @details
--# If incoming on_off flag is true assign sig_hand() as the signal handler for SIGINT.
--# Else revert to the default signal handler SIG_DFL.
--# set trap_sigbus to the current on_off status
-   Requirement [@ref r_exec_signal_0].
+-#	If	incoming	on_off	flag	is	true	assign	sig_hand()	as	the	signal	handler	for	SIGINT.
+-#	Else	revert	to	the	default	signal	handler	SIG_DFL.
+-#	set	trap_sigbus	to	the	current	on_off	status
+			Requirement	[@ref	r_exec_signal_0].
 */
-int Trick::Executive::set_trap_sigbus(bool on_off) {
-    static struct sigaction sigact;
-
-    if ( on_off ) {
-        /* Assign sig_hand() as the signal handler for SIGBUS. */
-        sigact.sa_handler = (void (*)(int)) sig_hand;
-    } else {
-        sigact.sa_handler = SIG_DFL;
-    }
-
-    if (sigaction(SIGBUS, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGBUS");
-    } else {
-        trap_sigbus = on_off ;
-    }
-
-    return(0) ;
+int	Trick::Executive::set_trap_sigbus(bool	on_off)	{
+				static	struct	sigaction	sigact;
+
+				if	(	on_off	)	{
+								/*	Assign	sig_hand()	as	the	signal	handler	for	SIGBUS.	*/
+								sigact.sa_handler	=	(void	(*)(int))	sig_hand;
+				}	else	{
+								sigact.sa_handler	=	SIG_DFL;
+				}
+
+				if	(sigaction(SIGBUS,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGBUS");
+				}	else	{
+								trap_sigbus	=	on_off	;
+				}
+
+				return(0)	;
 }
 
 /**
 @details
--# If incoming on_off flag is true assign fpe_sig_handler() as the signal handler for SIGFPE.
--# Else revert to the default signal handler SIG_DFL.
--# set trap_sigfpe to the current on_off status
-   Requirement [@ref r_exec_signal_0].
-   Requirement [@ref r_exec_signal_0].
+-#	If	incoming	on_off	flag	is	true	assign	fpe_sig_handler()	as	the	signal	handler	for	SIGFPE.
+-#	Else	revert	to	the	default	signal	handler	SIG_DFL.
+-#	set	trap_sigfpe	to	the	current	on_off	status
+			Requirement	[@ref	r_exec_signal_0].
+			Requirement	[@ref	r_exec_signal_0].
 */
-int Trick::Executive::set_trap_sigfpe(bool on_off) {
-    static struct sigaction sigact;
+int	Trick::Executive::set_trap_sigfpe(bool	on_off)	{
+				static	struct	sigaction	sigact;
 
-    if ( on_off ) {
-        /* Assign fpe_sig_handler() as the signal handler for SIGFPE. */
-#ifdef __linux
-        feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW);
+				if	(	on_off	)	{
+								/*	Assign	fpe_sig_handler()	as	the	signal	handler	for	SIGFPE.	*/
+#ifdef	__linux
+								feenableexcept(FE_DIVBYZERO	|	FE_INVALID	|	FE_OVERFLOW	|	FE_UNDERFLOW);
 #endif
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-        sigact.sa_handler = (void (*)(int)) fpe_sig_handler;
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+								sigact.sa_handler	=	(void	(*)(int))	fpe_sig_handler;
 #else
-        sigact.sa_flags = SA_SIGINFO;
-        sigact.sa_sigaction = (void (*)(int, siginfo_t *, void *)) fpe_sig_handler;
+								sigact.sa_flags	=	SA_SIGINFO;
+								sigact.sa_sigaction	=	(void	(*)(int,	siginfo_t	*,	void	*))	fpe_sig_handler;
 #endif
-    } else {
-#ifdef __linux
-        fedisableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW);
+				}	else	{
+#ifdef	__linux
+								fedisableexcept(FE_DIVBYZERO	|	FE_INVALID	|	FE_OVERFLOW	|	FE_UNDERFLOW);
 #endif
-        sigact.sa_handler = SIG_DFL;
-    }
+								sigact.sa_handler	=	SIG_DFL;
+				}
 
-    if (sigaction(SIGFPE, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGFPE");
-    } else {
-        trap_sigfpe = on_off ;
-    }
+				if	(sigaction(SIGFPE,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGFPE");
+				}	else	{
+								trap_sigfpe	=	on_off	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
 @details
--# If incoming on_off flag is true assign sig_hand() as the signal handler for SIGSEGV
--# Else revert to the default signal handler SIG_DFL.
--# set trap_sigsegv to the current on_off status
-   Requirement [@ref r_exec_signal_0].
+-#	If	incoming	on_off	flag	is	true	assign	sig_hand()	as	the	signal	handler	for	SIGSEGV
+-#	Else	revert	to	the	default	signal	handler	SIG_DFL.
+-#	set	trap_sigsegv	to	the	current	on_off	status
+			Requirement	[@ref	r_exec_signal_0].
 */
-int Trick::Executive::set_trap_sigsegv(bool on_off) {
-    static struct sigaction sigact;
-
-    if ( on_off ) {
-        /* Assign sig_hand() as the signal handler for SIGSEGV. */
-        sigact.sa_handler = (void (*)(int)) sig_hand;
-    } else {
-        sigact.sa_handler = SIG_DFL;
-    }
-
-    if (sigaction(SIGSEGV, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGSEGV");
-    } else {
-        trap_sigsegv = on_off ;
-    }
-    return(0) ;
+int	Trick::Executive::set_trap_sigsegv(bool	on_off)	{
+				static	struct	sigaction	sigact;
+
+				if	(	on_off	)	{
+								/*	Assign	sig_hand()	as	the	signal	handler	for	SIGSEGV.	*/
+								sigact.sa_handler	=	(void	(*)(int))	sig_hand;
+				}	else	{
+								sigact.sa_handler	=	SIG_DFL;
+				}
+
+				if	(sigaction(SIGSEGV,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGSEGV");
+				}	else	{
+								trap_sigsegv	=	on_off	;
+				}
+				return(0)	;
 }
 
 /**
 @details
--# If incoming on_off flag is true assign sig_hand() as the signal handler for SIGSEGV
--# Else revert to the default signal handler SIG_DFL.
--# set trap_sigabrt to the current on_off status
-   Requirement [@ref r_exec_signal_0].
+-#	If	incoming	on_off	flag	is	true	assign	sig_hand()	as	the	signal	handler	for	SIGSEGV
+-#	Else	revert	to	the	default	signal	handler	SIG_DFL.
+-#	set	trap_sigabrt	to	the	current	on_off	status
+			Requirement	[@ref	r_exec_signal_0].
 */
-int Trick::Executive::set_trap_sigabrt(bool on_off) {
-    static struct sigaction sigact;
-
-    if ( on_off ) {
-        /* Assign sig_hand() as the signal handler for SIGABRT */
-        sigact.sa_handler = (void (*)(int)) sig_hand;
-    } else {
-        sigact.sa_handler = SIG_DFL;
-    }
-
-    if (sigaction(SIGABRT, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGSEGV");
-    } else {
-        trap_sigabrt = on_off ;
-    }
-    return(0) ;
+int	Trick::Executive::set_trap_sigabrt(bool	on_off)	{
+				static	struct	sigaction	sigact;
+
+				if	(	on_off	)	{
+								/*	Assign	sig_hand()	as	the	signal	handler	for	SIGABRT	*/
+								sigact.sa_handler	=	(void	(*)(int))	sig_hand;
+				}	else	{
+								sigact.sa_handler	=	SIG_DFL;
+				}
+
+				if	(sigaction(SIGABRT,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGSEGV");
+				}	else	{
+								trap_sigabrt	=	on_off	;
+				}
+				return(0)	;
 }
 
 /**
 @details
--# If incoming on_off flag is true assign sig_hand() as the signal handler for SIGCHLD
--# Else revert to the default signal handler SIG_DFL.
--# set trap_sigabrt to the current on_off status
-   Requirement [@ref r_exec_signal_0].
+-#	If	incoming	on_off	flag	is	true	assign	sig_hand()	as	the	signal	handler	for	SIGCHLD
+-#	Else	revert	to	the	default	signal	handler	SIG_DFL.
+-#	set	trap_sigabrt	to	the	current	on_off	status
+			Requirement	[@ref	r_exec_signal_0].
 */
 
-int Trick::Executive::set_trap_sigchld(bool on_off) {
-    static struct sigaction sigact;
-
-    if ( on_off ) {
-        /* Assign sig_hand() as the signal handler for SIGABRT */
-        sigact.sa_handler = (void (*)(int)) child_handler;
-    } else {
-        sigact.sa_handler = SIG_DFL;
-    }
-
-    if (sigaction(SIGCHLD, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGCHLD");
-    } else {
-        trap_sigchld = on_off ;
-    }
-    return(0) ;
+int	Trick::Executive::set_trap_sigchld(bool	on_off)	{
+				static	struct	sigaction	sigact;
+
+				if	(	on_off	)	{
+								/*	Assign	sig_hand()	as	the	signal	handler	for	SIGABRT	*/
+								sigact.sa_handler	=	(void	(*)(int))	child_handler;
+				}	else	{
+								sigact.sa_handler	=	SIG_DFL;
+				}
+
+				if	(sigaction(SIGCHLD,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGCHLD");
+				}	else	{
+								trap_sigchld	=	on_off	;
+				}
+				return(0)	;
 }
 
 /**
 @details
--# Catch SIGBUS, SIGSEGV, and SIGABRT errors. Don't catch SIGFPE
--# Assign ctrl_c_hand() as the signal handler for SIGINT.
-   Requirement [@ref r_exec_signal_0].
--# Assign sig_hand() as the signal handler for SIGTERM.
-   Requirement [@ref r_exec_signal_0].
--# Assign child_handler() as the signal handler for SIGCHLD.
-   Requirement [@ref r_exec_signal_1].
+-#	Catch	SIGBUS,	SIGSEGV,	and	SIGABRT	errors.	Don't	catch	SIGFPE
+-#	Assign	ctrl_c_hand()	as	the	signal	handler	for	SIGINT.
+			Requirement	[@ref	r_exec_signal_0].
+-#	Assign	sig_hand()	as	the	signal	handler	for	SIGTERM.
+			Requirement	[@ref	r_exec_signal_0].
+-#	Assign	child_handler()	as	the	signal	handler	for	SIGCHLD.
+			Requirement	[@ref	r_exec_signal_1].
 */
-int Trick::Executive::init_signal_handlers() {
-
-    static struct sigaction sigact;
-
-    /* By default catch SIGBUS, SIGSEGV, SIGABRT.  Don't catch SIGFPE, SIGCHLD */
-    set_trap_sigbus(true) ;
-    set_trap_sigfpe(false) ;
-    set_trap_sigsegv(true) ;
-    set_trap_sigabrt(true) ;
-    set_trap_sigchld(false) ;
-
-    /* Assign ctrl_c_hand() as the default signal handler for SIGINT (<CTRL-C> keypress). */
-    sigact.sa_handler = (void (*)(int)) ctrl_c_hand;
-    if (sigaction(SIGINT, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGINT");
-    }
-
-    /* Assign sig_hand() as the default signal handler for SIGTERM (default kill signal). */
-    sigact.sa_handler = (void (*)(int)) term_hand;
-    if (sigaction(SIGTERM, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGTERM");
-    }
-
-    /* Assign sig_hand() as the default signal handler for SIGTERM (default kill signal). */
-    sigact.sa_handler = (void (*)(int)) usr1_hand;
-    if (sigaction(SIGUSR1, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGUSR1");
-    }
-
-    return(0) ;
+int	Trick::Executive::init_signal_handlers()	{
+
+				static	struct	sigaction	sigact;
+
+				/*	By	default	catch	SIGBUS,	SIGSEGV,	SIGABRT.		Don't	catch	SIGFPE,	SIGCHLD	*/
+				set_trap_sigbus(true)	;
+				set_trap_sigfpe(false)	;
+				set_trap_sigsegv(true)	;
+				set_trap_sigabrt(true)	;
+				set_trap_sigchld(false)	;
+
+				/*	Assign	ctrl_c_hand()	as	the	default	signal	handler	for	SIGINT	(<CTRL-C>	keypress).	*/
+				sigact.sa_handler	=	(void	(*)(int))	ctrl_c_hand;
+				if	(sigaction(SIGINT,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGINT");
+				}
+
+				/*	Assign	sig_hand()	as	the	default	signal	handler	for	SIGTERM	(default	kill	signal).	*/
+				sigact.sa_handler	=	(void	(*)(int))	term_hand;
+				if	(sigaction(SIGTERM,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGTERM");
+				}
+
+				/*	Assign	sig_hand()	as	the	default	signal	handler	for	SIGTERM	(default	kill	signal).	*/
+				sigact.sa_handler	=	(void	(*)(int))	usr1_hand;
+				if	(sigaction(SIGUSR1,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGUSR1");
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_instrument_job.cpp b/trick_source/sim_services/Executive/Executive_instrument_job.cpp
index aa7ef9e19..07d9d0181 100644
--- a/trick_source/sim_services/Executive/Executive_instrument_job.cpp
+++ b/trick_source/sim_services/Executive/Executive_instrument_job.cpp
@@ -1,131 +1,131 @@
 
-#include <iostream>
-#include <iomanip>
+#include	<iostream>
+#include	<iomanip>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::instrument_job_before( std::string in_job , unsigned int instance ) {
+int	Trick::Executive::instrument_job_before(	std::string	in_job	,	unsigned	int	instance	)	{
 
-    Trick::JobData * instrument_job ;
+				Trick::JobData	*	instrument_job	;
 
-    instrument_job = get_job(in_job , instance) ;
-    return instrument_job_before( instrument_job ) ;
+				instrument_job	=	get_job(in_job	,	instance)	;
+				return	instrument_job_before(	instrument_job	)	;
 }
 
-int Trick::Executive::instrument_job_before( Trick::JobData * instrument_job ) {
+int	Trick::Executive::instrument_job_before(	Trick::JobData	*	instrument_job	)	{
 
-    unsigned int ii, count ;
+				unsigned	int	ii,	count	;
 
-    count = 0 ;
-    if ( instrument_job != NULL ) {
-        // instrument scheduled jobs
-        for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-            count += threads[ii]->job_queue.instrument_before(instrument_job) ;
-            count += threads[ii]->top_of_frame_queue.instrument_before(instrument_job) ;
-            count += threads[ii]->end_of_frame_queue.instrument_before(instrument_job) ;
-        }
+				count	=	0	;
+				if	(	instrument_job	!=	NULL	)	{
+								//	instrument	scheduled	jobs
+								for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+												count	+=	threads[ii]->job_queue.instrument_before(instrument_job)	;
+												count	+=	threads[ii]->top_of_frame_queue.instrument_before(instrument_job)	;
+												count	+=	threads[ii]->end_of_frame_queue.instrument_before(instrument_job)	;
+								}
 
-        // instrument other queued jobs
-        // cannot instrument default_data because they come before input processor
-        count += default_data_queue.instrument_before(instrument_job) ;
-        count += initialization_queue.instrument_before(instrument_job) ;
-        count += top_of_frame_queue.instrument_before(instrument_job) ;
-        count += end_of_frame_queue.instrument_before(instrument_job) ;
-        count += shutdown_queue.instrument_before(instrument_job) ;
+								//	instrument	other	queued	jobs
+								//	cannot	instrument	default_data	because	they	come	before	input	processor
+								count	+=	default_data_queue.instrument_before(instrument_job)	;
+								count	+=	initialization_queue.instrument_before(instrument_job)	;
+								count	+=	top_of_frame_queue.instrument_before(instrument_job)	;
+								count	+=	end_of_frame_queue.instrument_before(instrument_job)	;
+								count	+=	shutdown_queue.instrument_before(instrument_job)	;
 
-        count += freeze_init_queue.instrument_before(instrument_job) ;
-        count += freeze_scheduled_queue.instrument_before(instrument_job) ;
-        count += freeze_queue.instrument_before(instrument_job) ;
-        count += unfreeze_queue.instrument_before(instrument_job) ;
-        count += time_tic_changed_queue.instrument_before(instrument_job) ;
-        count += thread_sync_queue.instrument_before(instrument_job) ;
+								count	+=	freeze_init_queue.instrument_before(instrument_job)	;
+								count	+=	freeze_scheduled_queue.instrument_before(instrument_job)	;
+								count	+=	freeze_queue.instrument_before(instrument_job)	;
+								count	+=	unfreeze_queue.instrument_before(instrument_job)	;
+								count	+=	time_tic_changed_queue.instrument_before(instrument_job)	;
+								count	+=	thread_sync_queue.instrument_before(instrument_job)	;
 
-        for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-            count += other_schedulers[ii]->instrument_job_before( instrument_job ) ;
-        }
+								for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+												count	+=	other_schedulers[ii]->instrument_job_before(	instrument_job	)	;
+								}
 
-    }
+				}
 
-    return(count) ;
+				return(count)	;
 
 }
 
-int Trick::Executive::instrument_job_after( std::string in_job , unsigned int instance ) {
+int	Trick::Executive::instrument_job_after(	std::string	in_job	,	unsigned	int	instance	)	{
 
-    Trick::JobData * instrument_job ;
+				Trick::JobData	*	instrument_job	;
 
-    instrument_job = get_job(in_job , instance) ;
-    return instrument_job_after( instrument_job ) ;
+				instrument_job	=	get_job(in_job	,	instance)	;
+				return	instrument_job_after(	instrument_job	)	;
 
 }
 
-int Trick::Executive::instrument_job_after( Trick::JobData * instrument_job) {
-
-    unsigned int ii, count ;
-
-    count = 0 ;
-    if ( instrument_job != NULL ) {
-        // instrument scheduled jobs
-        for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-            count += threads[ii]->job_queue.instrument_after(instrument_job) ;
-            count += threads[ii]->top_of_frame_queue.instrument_after(instrument_job) ;
-            count += threads[ii]->end_of_frame_queue.instrument_after(instrument_job) ;
-        }
-
-        // instrument other queued jobs
-        // cannot instrument default_data because they come after input processor
-        count += default_data_queue.instrument_after(instrument_job) ;
-        count += initialization_queue.instrument_after(instrument_job) ;
-        count += top_of_frame_queue.instrument_after(instrument_job) ;
-        count += end_of_frame_queue.instrument_after(instrument_job) ;
-        count += shutdown_queue.instrument_after(instrument_job) ;
-
-        count += freeze_init_queue.instrument_after(instrument_job) ;
-        count += freeze_scheduled_queue.instrument_after(instrument_job) ;
-        count += freeze_queue.instrument_after(instrument_job) ;
-        count += unfreeze_queue.instrument_after(instrument_job) ;
-        count += time_tic_changed_queue.instrument_after(instrument_job) ;
-        count += thread_sync_queue.instrument_after(instrument_job) ;
-
-        for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-            count += other_schedulers[ii]->instrument_job_after( instrument_job ) ;
-        }
-    }
-
-    return(count) ;
+int	Trick::Executive::instrument_job_after(	Trick::JobData	*	instrument_job)	{
+
+				unsigned	int	ii,	count	;
+
+				count	=	0	;
+				if	(	instrument_job	!=	NULL	)	{
+								//	instrument	scheduled	jobs
+								for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+												count	+=	threads[ii]->job_queue.instrument_after(instrument_job)	;
+												count	+=	threads[ii]->top_of_frame_queue.instrument_after(instrument_job)	;
+												count	+=	threads[ii]->end_of_frame_queue.instrument_after(instrument_job)	;
+								}
+
+								//	instrument	other	queued	jobs
+								//	cannot	instrument	default_data	because	they	come	after	input	processor
+								count	+=	default_data_queue.instrument_after(instrument_job)	;
+								count	+=	initialization_queue.instrument_after(instrument_job)	;
+								count	+=	top_of_frame_queue.instrument_after(instrument_job)	;
+								count	+=	end_of_frame_queue.instrument_after(instrument_job)	;
+								count	+=	shutdown_queue.instrument_after(instrument_job)	;
+
+								count	+=	freeze_init_queue.instrument_after(instrument_job)	;
+								count	+=	freeze_scheduled_queue.instrument_after(instrument_job)	;
+								count	+=	freeze_queue.instrument_after(instrument_job)	;
+								count	+=	unfreeze_queue.instrument_after(instrument_job)	;
+								count	+=	time_tic_changed_queue.instrument_after(instrument_job)	;
+								count	+=	thread_sync_queue.instrument_after(instrument_job)	;
+
+								for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+												count	+=	other_schedulers[ii]->instrument_job_after(	instrument_job	)	;
+								}
+				}
+
+				return(count)	;
 
 }
 
-int Trick::Executive::instrument_job_remove(std::string in_job) {
-
-    unsigned int ii ;
-
-    /** @par Detailed Design */
-    /** @li Remove instrumentation job from initialization, scheduled,
-        integration, end of frame, & shutdown  queues by calling ScheduledJobQueue::instrument_remove(string). */
-    default_data_queue.instrument_remove(in_job) ;
-    initialization_queue.instrument_remove(in_job) ;
-    top_of_frame_queue.instrument_remove(in_job) ;
-    end_of_frame_queue.instrument_remove(in_job) ;
-    shutdown_queue.instrument_remove(in_job) ;
-
-    freeze_init_queue.instrument_remove(in_job) ;
-    freeze_scheduled_queue.instrument_remove(in_job) ;
-    freeze_queue.instrument_remove(in_job) ;
-    unfreeze_queue.instrument_remove(in_job) ;
-    time_tic_changed_queue.instrument_remove(in_job) ;
-    thread_sync_queue.instrument_remove(in_job) ;
-
-    for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-        threads[ii]->job_queue.instrument_remove(in_job) ;
-        threads[ii]->top_of_frame_queue.instrument_remove(in_job) ;
-        threads[ii]->end_of_frame_queue.instrument_remove(in_job) ;
-    }
-
-    for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-        other_schedulers[ii]->instrument_job_remove(in_job) ;
-    }
-
-    return(0) ;
+int	Trick::Executive::instrument_job_remove(std::string	in_job)	{
+
+				unsigned	int	ii	;
+
+				/**	@par	Detailed	Design	*/
+				/**	@li	Remove	instrumentation	job	from	initialization,	scheduled,
+								integration,	end	of	frame,	&	shutdown		queues	by	calling	ScheduledJobQueue::instrument_remove(string).	*/
+				default_data_queue.instrument_remove(in_job)	;
+				initialization_queue.instrument_remove(in_job)	;
+				top_of_frame_queue.instrument_remove(in_job)	;
+				end_of_frame_queue.instrument_remove(in_job)	;
+				shutdown_queue.instrument_remove(in_job)	;
+
+				freeze_init_queue.instrument_remove(in_job)	;
+				freeze_scheduled_queue.instrument_remove(in_job)	;
+				freeze_queue.instrument_remove(in_job)	;
+				unfreeze_queue.instrument_remove(in_job)	;
+				time_tic_changed_queue.instrument_remove(in_job)	;
+				thread_sync_queue.instrument_remove(in_job)	;
+
+				for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+								threads[ii]->job_queue.instrument_remove(in_job)	;
+								threads[ii]->top_of_frame_queue.instrument_remove(in_job)	;
+								threads[ii]->end_of_frame_queue.instrument_remove(in_job)	;
+				}
+
+				for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+								other_schedulers[ii]->instrument_job_remove(in_job)	;
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_isThreadReadyToRun.cpp b/trick_source/sim_services/Executive/Executive_isThreadReadyToRun.cpp
index 043fbafae..a6c6226a9 100644
--- a/trick_source/sim_services/Executive/Executive_isThreadReadyToRun.cpp
+++ b/trick_source/sim_services/Executive/Executive_isThreadReadyToRun.cpp
@@ -1,38 +1,38 @@
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /*
--# Switch on the type of thread
-   -# Scheduled threads are always ready to run
-   -# AMF thredas are ready to run if their previous frame just finished
-   -# ASYNC threads are ready to run if their complete flag is set and either they have
-      no cycle time or their previous frame just finished.
+-#	Switch	on	the	type	of	thread
+			-#	Scheduled	threads	are	always	ready	to	run
+			-#	AMF	thredas	are	ready	to	run	if	their	previous	frame	just	finished
+			-#	ASYNC	threads	are	ready	to	run	if	their	complete	flag	is	set	and	either	they	have
+						no	cycle	time	or	their	previous	frame	just	finished.
 */
-bool Trick::Executive::isThreadReadyToRun( Trick::Threads * curr_thread , long long time_ticks) {
-    bool ret = false ;
-    if ( curr_thread->enabled ) {
-        switch ( curr_thread->process_type ) {
-            case Trick::PROCESS_TYPE_SCHEDULED:
-                ret = true ;
-                break ;
-            case Trick::PROCESS_TYPE_AMF_CHILD:
-                if ( curr_thread->amf_next_tics == time_ticks ) {
-                    ret = true ;
-                }
-                break ;
-            case Trick::PROCESS_TYPE_ASYNC_CHILD:
-                if ( curr_thread->child_complete == true ) {
-                    if (curr_thread->amf_cycle_tics == 0 ) {
-                        ret = true ;
-                    } else {
-                        if ( curr_thread->amf_next_tics == time_ticks ) {
-                            ret = true ;
-                        }
-                    }
-                }
-                break ;
-        }
-    }
-    return ret ;
+bool	Trick::Executive::isThreadReadyToRun(	Trick::Threads	*	curr_thread	,	long	long	time_ticks)	{
+				bool	ret	=	false	;
+				if	(	curr_thread->enabled	)	{
+								switch	(	curr_thread->process_type	)	{
+												case	Trick::PROCESS_TYPE_SCHEDULED:
+																ret	=	true	;
+																break	;
+												case	Trick::PROCESS_TYPE_AMF_CHILD:
+																if	(	curr_thread->amf_next_tics	==	time_ticks	)	{
+																				ret	=	true	;
+																}
+																break	;
+												case	Trick::PROCESS_TYPE_ASYNC_CHILD:
+																if	(	curr_thread->child_complete	==	true	)	{
+																				if	(curr_thread->amf_cycle_tics	==	0	)	{
+																								ret	=	true	;
+																				}	else	{
+																								if	(	curr_thread->amf_next_tics	==	time_ticks	)	{
+																												ret	=	true	;
+																								}
+																				}
+																}
+																break	;
+								}
+				}
+				return	ret	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_loop.cpp b/trick_source/sim_services/Executive/Executive_loop.cpp
index 9879d13d7..b16709a2f 100644
--- a/trick_source/sim_services/Executive/Executive_loop.cpp
+++ b/trick_source/sim_services/Executive/Executive_loop.cpp
@@ -1,61 +1,61 @@
 
-#include <stdlib.h>
+#include	<stdlib.h>
 
-#include <exception>
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
+#include	<exception>
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
 
 /**
 @details
--# If the #freeze_command flag is true, set the simulation mode to Freeze.
--# The scheduler sets the mode to Run.
-   Requirement  [@ref r_exec_mode_1]
--# The scheduler calls Executive::loop_single_thread if only one thread of execution is present.
-   Requirement  [@ref r_exec_mode_0]
--# The scheduler calls Executive::loop_multi_thread() if more than one thread of
-   execution is present.
-   Requirement  [@ref r_exec_mode_1]
--# If an exception is caught, the return code, file where the exception occured, and the
-   reason for the exception is saved.  The exception return code is returned.
--# If an unknown exception is caught, set the exception return code to -1, the file to unknown, and the
-   reason for the exception as unknown.  The exception return code is returned.
--# If no execption is caught return 0
+-#	If	the	#freeze_command	flag	is	true,	set	the	simulation	mode	to	Freeze.
+-#	The	scheduler	sets	the	mode	to	Run.
+			Requirement		[@ref	r_exec_mode_1]
+-#	The	scheduler	calls	Executive::loop_single_thread	if	only	one	thread	of	execution	is	present.
+			Requirement		[@ref	r_exec_mode_0]
+-#	The	scheduler	calls	Executive::loop_multi_thread()	if	more	than	one	thread	of
+			execution	is	present.
+			Requirement		[@ref	r_exec_mode_1]
+-#	If	an	exception	is	caught,	the	return	code,	file	where	the	exception	occured,	and	the
+			reason	for	the	exception	is	saved.		The	exception	return	code	is	returned.
+-#	If	an	unknown	exception	is	caught,	set	the	exception	return	code	to	-1,	the	file	to	unknown,	and	the
+			reason	for	the	exception	as	unknown.		The	exception	return	code	is	returned.
+-#	If	no	execption	is	caught	return	0
 */
-int Trick::Executive::loop() {
-
-    try {
-
-        /* If no threads are present, the simulation did not initialize correctly, return */
-        if ( threads.size() == 0 ) {
-            return(0) ;
-        }
-
-        /* If the #freeze_command flag is true, set the simulation mode to Freeze. */
-        if ( freeze_command ) {
-            exec_command = FreezeCmd ;
-        }
-
-        /* Set the simulation mode to Run. */
-        mode = Run ;
-
-        if ( threads.size() == 1 ) {
-            /* Call loop_single_thread() if there is a single thread. */
-            loop_single_thread() ;
-        } else {
-            /* Call loop_multi_thread() if there is more than one thread. */
-            loop_multi_thread() ;
-        }
-    }
-    catch (Trick::ExecutiveException & ex ) {
-        /* Handle exception type Trick::ExecutiveException.  Set the file name and error message.
-           Return the exception return code. */
-        except_return = ex.ret_code ;
-        except_file = ex.file ;
-        except_message = ex.message ;
-        return(ex.ret_code) ;
-    }
-
-    /* return 0 if there are no errors. */
-    return(0) ;
+int	Trick::Executive::loop()	{
+
+				try	{
+
+								/*	If	no	threads	are	present,	the	simulation	did	not	initialize	correctly,	return	*/
+								if	(	threads.size()	==	0	)	{
+												return(0)	;
+								}
+
+								/*	If	the	#freeze_command	flag	is	true,	set	the	simulation	mode	to	Freeze.	*/
+								if	(	freeze_command	)	{
+												exec_command	=	FreezeCmd	;
+								}
+
+								/*	Set	the	simulation	mode	to	Run.	*/
+								mode	=	Run	;
+
+								if	(	threads.size()	==	1	)	{
+												/*	Call	loop_single_thread()	if	there	is	a	single	thread.	*/
+												loop_single_thread()	;
+								}	else	{
+												/*	Call	loop_multi_thread()	if	there	is	more	than	one	thread.	*/
+												loop_multi_thread()	;
+								}
+				}
+				catch	(Trick::ExecutiveException	&	ex	)	{
+								/*	Handle	exception	type	Trick::ExecutiveException.		Set	the	file	name	and	error	message.
+											Return	the	exception	return	code.	*/
+								except_return	=	ex.ret_code	;
+								except_file	=	ex.file	;
+								except_message	=	ex.message	;
+								return(ex.ret_code)	;
+				}
+
+				/*	return	0	if	there	are	no	errors.	*/
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
index 34e348c1d..fe65f50dd 100644
--- a/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
+++ b/trick_source/sim_services/Executive/Executive_loop_multi_thread.cpp
@@ -1,217 +1,217 @@
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
+#include	<iostream>
+#include	<fstream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/release.h"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/release.h"
 
 /**
 @details
--# Wait for all synchronous threads to finish initializing before entering infinite loop
--# Enter an infinite loop.  A call to exec_terminate(const char *) or
-   exec_terminate_with_return(int, const char *, int , const char * ) will exit the loop.
-    -# For all asynchronous must finish threads that are to finish at this time, wait for their completion
-    -# If the exec_command equals freeze mode, call Trick::Executive::freeze_loop().  Transition from
-       freeze back to run will continue execution at this point.
-       Requirement  [@ref r_exec_mode_1]
-    -# Set the job complete flags for all jobs to false.
-    -# Check to see if all child threads are alive.  If a thread has exited, call
-       Trick::Executive::exec_terminate_with_return(int, char *, int, char *)
-       Requirement  [@ref r_exec_thread_7]
-    -# Signal threads to start the next time step of processing.
-    -# For each scheduled jobs whose next call time is equal to the current simulation time [@ref ScheduledJobQueue]
-        -# Wait for all job dependencies to complete.  Requirement  [@ref r_exec_thread_6]
-        -# Call the job.  Requirement  [@ref r_exec_periodic_0]
-        -# If the job is a system job, check to see if the next job call time is the lowest next time by
-           calling Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData *, long long)
-    -# If the exec_command equals ExitCmd
-       -# Call Trick::Executive::exec_terminate_with_return(int, char *, int, char *)
-    -# If the elapsed time has reached the termination time
-       -# Call Trick::Executive::exec_terminate_with_return(int, char *, int, char *)
-    -# If the elapsed time equals the next software frame time
-       -# Call the end_of_frame jobs. Requirement  [@ref r_exec_periodic_2]
-       -# Set the end of frame execution time to the current time + software_frame
+-#	Wait	for	all	synchronous	threads	to	finish	initializing	before	entering	infinite	loop
+-#	Enter	an	infinite	loop.		A	call	to	exec_terminate(const	char	*)	or
+			exec_terminate_with_return(int,	const	char	*,	int	,	const	char	*	)	will	exit	the	loop.
+				-#	For	all	asynchronous	must	finish	threads	that	are	to	finish	at	this	time,	wait	for	their	completion
+				-#	If	the	exec_command	equals	freeze	mode,	call	Trick::Executive::freeze_loop().		Transition	from
+							freeze	back	to	run	will	continue	execution	at	this	point.
+							Requirement		[@ref	r_exec_mode_1]
+				-#	Set	the	job	complete	flags	for	all	jobs	to	false.
+				-#	Check	to	see	if	all	child	threads	are	alive.		If	a	thread	has	exited,	call
+							Trick::Executive::exec_terminate_with_return(int,	char	*,	int,	char	*)
+							Requirement		[@ref	r_exec_thread_7]
+				-#	Signal	threads	to	start	the	next	time	step	of	processing.
+				-#	For	each	scheduled	jobs	whose	next	call	time	is	equal	to	the	current	simulation	time	[@ref	ScheduledJobQueue]
+								-#	Wait	for	all	job	dependencies	to	complete.		Requirement		[@ref	r_exec_thread_6]
+								-#	Call	the	job.		Requirement		[@ref	r_exec_periodic_0]
+								-#	If	the	job	is	a	system	job,	check	to	see	if	the	next	job	call	time	is	the	lowest	next	time	by
+											calling	Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData	*,	long	long)
+				-#	If	the	exec_command	equals	ExitCmd
+							-#	Call	Trick::Executive::exec_terminate_with_return(int,	char	*,	int,	char	*)
+				-#	If	the	elapsed	time	has	reached	the	termination	time
+							-#	Call	Trick::Executive::exec_terminate_with_return(int,	char	*,	int,	char	*)
+				-#	If	the	elapsed	time	equals	the	next	software	frame	time
+							-#	Call	the	end_of_frame	jobs.	Requirement		[@ref	r_exec_periodic_2]
+							-#	Set	the	end	of	frame	execution	time	to	the	current	time	+	software_frame
 */
-int Trick::Executive::loop_multi_thread() {
-
-    JobData * depend_job ;
-    unsigned int ii ;
-    Trick::ScheduledJobQueue * main_sched_queue ;
-    int ret = 0 ;
-
-    /* Wait for all threads to finish initializing and set the child_complete flag. */
-    for (ii = 1; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        while (curr_thread->child_complete == false ) {
-            if (rt_nap == true) {
-                RELEASE();
-            }
-        }
-    }
-
-    /* The main scheduler queue is the queue in thread 0 */
-    main_sched_queue = &(threads[0]->job_queue) ;
-
-    while (1) {
-
-        /* Call freeze_loop() if commanded by freeze() or a <CTRL-C> signal was caught. */
-        if (exec_command == FreezeCmd) {
-            exec_command = NoCmd;
-            freeze_loop();
-        }
-
-        /* Call all top of frame jobs if the simulation time equals to the time software frame boundary. */
-        if (time_tics == next_frame_check_tics - software_frame_tics ) {
-            top_of_frame_queue.reset_curr_index() ;
-            while ( (curr_job = top_of_frame_queue.get_next_job()) != NULL ) {
-                ret = curr_job->call() ;
-                if ( ret != 0 ) {
-                    exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "top_of_frame job did not return 0") ;
-                }
-            }
-
-            for (ii = 1; ii < threads.size() ; ii++) {
-
-                Trick::Threads * curr_thread = threads[ii];
-
-                if (curr_thread->process_type == Trick::PROCESS_TYPE_SCHEDULED) {            
-                    curr_thread->top_of_frame_queue.reset_curr_index() ;
-                    while ( (curr_job = curr_thread->top_of_frame_queue.get_next_job()) != NULL ) {
-                        ret = curr_job->call() ;
-                        if ( ret != 0 ) {
-                            exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "top_of_frame job did not return 0") ;
-                        }
-                    }
-                }
-            }
-            
-            frame_count++ ;
-        }
-
-    /* Loop through child threads calling their top of frame jobs */
-
-
-        /* Call thread sync jobs (wait for threads that are scheduled to finish by current time) */
-        thread_sync_queue.reset_curr_index() ;
-        while ( (curr_job = thread_sync_queue.get_next_job()) != NULL ) {
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "thread_sync job did not return 0") ;
-            }
-        }
-
-        /* Call the input_processor_run queue jobs. Run between threads ending and restarting */
-        input_processor_run_queue.reset_curr_index() ;
-        while ( (curr_job = input_processor_run_queue.find_next_job( time_tics )) != NULL ) {
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "input_processor_run job did not return 0") ;
-            }
-            // input processor jobs set their own next job call time.  The test_next_job_call_time
-            // will adjust the next call time for this queue
-            input_processor_run_queue.test_next_job_call_time(curr_job , time_tics) ;
-
-            /* System jobs next call time are not set until after they run.
-               Test their next job call time after they have been called */
-            if ( curr_job->system_job_class ) {
-                main_sched_queue->test_next_job_call_time(curr_job , time_tics) ;
-            }
-        }
-
-        /* Start threads that are ready to run */
-        for (ii = 1; ii < threads.size() ; ii++) {
-
-            Trick::Threads * curr_thread = threads[ii] ;
-
-            /* For all threads that are waiting to start the next cycle (child_complete == true)
-               signal them to start through either the thread mutex or frame trigger. */
-            if ( isThreadReadyToRun(curr_thread, time_tics) ) {
-
-                curr_thread->curr_time_tics = time_tics ;
-                curr_thread->child_complete = false ;
-                curr_thread->amf_next_tics += curr_thread->amf_cycle_tics ;
-                curr_thread->trigger_container.getThreadTrigger()->fire() ;
-
-            }
-        }
-
-        /* Get next job scheduled to run at the current simulation time step. */
-        main_sched_queue->reset_curr_index() ;
-        while ( (curr_job = main_sched_queue->find_next_job( time_tics )) != NULL ) {
-
-            /* Wait for all jobs that the current job depends on to complete. */
-            for ( ii = 0 ; ii < curr_job->depends.size() ; ii++ ) {
-                depend_job = curr_job->depends[ii] ;
-                while (! depend_job->complete) {
-                    if (rt_nap == true) {
-                        RELEASE();
-                    }
-                }
-            }
-
-            /* Call the current job scheduled to run at the current simulation time step. */
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "scheduled job did not return 0") ;
-            }
-            /* System jobs next call time are not set until after they run.
-               Test their next job call time after they have been called */
-            if ( curr_job->system_job_class ) {
-                main_sched_queue->test_next_job_call_time(curr_job , time_tics) ;
-            }
-            curr_job->complete = true ;
-        }
-
-        /* Call Executive::exec_terminate_with_return(int , const char * , int , const char *)
-           if exec_command equals ExitCmd. */
-        if (exec_command == ExitCmd) {
-            exec_terminate_with_return( 0 , __FILE__ , __LINE__ , "Sim control Shutdown" ) ;
-        }
-
-        /* We are already in run... clear any redundant exec_commands to go to run */
-        if ( exec_command == RunCmd ) {
-            exec_command = NoCmd ;
-        }
-
-        /* Call Executive::exec_terminate_with_return( int , const char * , int , const char *)
-           if simulation elapsed time has reached the termination time. */
-        if (terminate_time <= time_last_pass_tics ) {
-            time_tics = time_last_pass_tics ;
-            exec_terminate_with_return( 0 , __FILE__ , __LINE__ , "Reached termination time" ) ;
-        }
-
-        /* Call all end of frame jobs if the simulation time equals to the time software frame boundary. */
-        if (time_tics == next_frame_check_tics ) {
-            end_of_frame_queue.reset_curr_index() ;
-            while ( (curr_job = end_of_frame_queue.get_next_job()) != NULL ) {
-                ret = curr_job->call() ;
-                if ( ret != 0 ) {
-                    exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "end_of_frame job did not return 0") ;
-                }
-            }
-                         /* Loop through child threads calling their end of frame jobs */
-            for (ii = 1; ii < threads.size() ; ii++) {
-
-                Trick::Threads * curr_thread = threads[ii];
-
-                if (curr_thread->process_type == Trick::PROCESS_TYPE_SCHEDULED) {
-                    curr_thread->end_of_frame_queue.reset_curr_index();            
-                    while ( (curr_job =  curr_thread->end_of_frame_queue.get_next_job()) != NULL ) {
-                        ret = curr_job->call();
-                        if ( ret != 0 ) {
-                            exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "end_of_frame job did not return 0");
-                        }
-                    }
-                }
-            }
-
-            next_frame_check_tics += software_frame_tics ;
-        }
-
-    }
-
-    return(0) ;
+int	Trick::Executive::loop_multi_thread()	{
+
+				JobData	*	depend_job	;
+				unsigned	int	ii	;
+				Trick::ScheduledJobQueue	*	main_sched_queue	;
+				int	ret	=	0	;
+
+				/*	Wait	for	all	threads	to	finish	initializing	and	set	the	child_complete	flag.	*/
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								while	(curr_thread->child_complete	==	false	)	{
+												if	(rt_nap	==	true)	{
+																RELEASE();
+												}
+								}
+				}
+
+				/*	The	main	scheduler	queue	is	the	queue	in	thread	0	*/
+				main_sched_queue	=	&(threads[0]->job_queue)	;
+
+				while	(1)	{
+
+								/*	Call	freeze_loop()	if	commanded	by	freeze()	or	a	<CTRL-C>	signal	was	caught.	*/
+								if	(exec_command	==	FreezeCmd)	{
+												exec_command	=	NoCmd;
+												freeze_loop();
+								}
+
+								/*	Call	all	top	of	frame	jobs	if	the	simulation	time	equals	to	the	time	software	frame	boundary.	*/
+								if	(time_tics	==	next_frame_check_tics	-	software_frame_tics	)	{
+												top_of_frame_queue.reset_curr_index()	;
+												while	(	(curr_job	=	top_of_frame_queue.get_next_job())	!=	NULL	)	{
+																ret	=	curr_job->call()	;
+																if	(	ret	!=	0	)	{
+																				exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"top_of_frame	job	did	not	return	0")	;
+																}
+												}
+
+												for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+
+																Trick::Threads	*	curr_thread	=	threads[ii];
+
+																if	(curr_thread->process_type	==	Trick::PROCESS_TYPE_SCHEDULED)	{												
+																				curr_thread->top_of_frame_queue.reset_curr_index()	;
+																				while	(	(curr_job	=	curr_thread->top_of_frame_queue.get_next_job())	!=	NULL	)	{
+																								ret	=	curr_job->call()	;
+																								if	(	ret	!=	0	)	{
+																												exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"top_of_frame	job	did	not	return	0")	;
+																								}
+																				}
+																}
+												}
+												
+												frame_count++	;
+								}
+
+				/*	Loop	through	child	threads	calling	their	top	of	frame	jobs	*/
+
+
+								/*	Call	thread	sync	jobs	(wait	for	threads	that	are	scheduled	to	finish	by	current	time)	*/
+								thread_sync_queue.reset_curr_index()	;
+								while	(	(curr_job	=	thread_sync_queue.get_next_job())	!=	NULL	)	{
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"thread_sync	job	did	not	return	0")	;
+												}
+								}
+
+								/*	Call	the	input_processor_run	queue	jobs.	Run	between	threads	ending	and	restarting	*/
+								input_processor_run_queue.reset_curr_index()	;
+								while	(	(curr_job	=	input_processor_run_queue.find_next_job(	time_tics	))	!=	NULL	)	{
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"input_processor_run	job	did	not	return	0")	;
+												}
+												//	input	processor	jobs	set	their	own	next	job	call	time.		The	test_next_job_call_time
+												//	will	adjust	the	next	call	time	for	this	queue
+												input_processor_run_queue.test_next_job_call_time(curr_job	,	time_tics)	;
+
+												/*	System	jobs	next	call	time	are	not	set	until	after	they	run.
+															Test	their	next	job	call	time	after	they	have	been	called	*/
+												if	(	curr_job->system_job_class	)	{
+																main_sched_queue->test_next_job_call_time(curr_job	,	time_tics)	;
+												}
+								}
+
+								/*	Start	threads	that	are	ready	to	run	*/
+								for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+
+												Trick::Threads	*	curr_thread	=	threads[ii]	;
+
+												/*	For	all	threads	that	are	waiting	to	start	the	next	cycle	(child_complete	==	true)
+															signal	them	to	start	through	either	the	thread	mutex	or	frame	trigger.	*/
+												if	(	isThreadReadyToRun(curr_thread,	time_tics)	)	{
+
+																curr_thread->curr_time_tics	=	time_tics	;
+																curr_thread->child_complete	=	false	;
+																curr_thread->amf_next_tics	+=	curr_thread->amf_cycle_tics	;
+																curr_thread->trigger_container.getThreadTrigger()->fire()	;
+
+												}
+								}
+
+								/*	Get	next	job	scheduled	to	run	at	the	current	simulation	time	step.	*/
+								main_sched_queue->reset_curr_index()	;
+								while	(	(curr_job	=	main_sched_queue->find_next_job(	time_tics	))	!=	NULL	)	{
+
+												/*	Wait	for	all	jobs	that	the	current	job	depends	on	to	complete.	*/
+												for	(	ii	=	0	;	ii	<	curr_job->depends.size()	;	ii++	)	{
+																depend_job	=	curr_job->depends[ii]	;
+																while	(!	depend_job->complete)	{
+																				if	(rt_nap	==	true)	{
+																								RELEASE();
+																				}
+																}
+												}
+
+												/*	Call	the	current	job	scheduled	to	run	at	the	current	simulation	time	step.	*/
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"scheduled	job	did	not	return	0")	;
+												}
+												/*	System	jobs	next	call	time	are	not	set	until	after	they	run.
+															Test	their	next	job	call	time	after	they	have	been	called	*/
+												if	(	curr_job->system_job_class	)	{
+																main_sched_queue->test_next_job_call_time(curr_job	,	time_tics)	;
+												}
+												curr_job->complete	=	true	;
+								}
+
+								/*	Call	Executive::exec_terminate_with_return(int	,	const	char	*	,	int	,	const	char	*)
+											if	exec_command	equals	ExitCmd.	*/
+								if	(exec_command	==	ExitCmd)	{
+												exec_terminate_with_return(	0	,	__FILE__	,	__LINE__	,	"Sim	control	Shutdown"	)	;
+								}
+
+								/*	We	are	already	in	run...	clear	any	redundant	exec_commands	to	go	to	run	*/
+								if	(	exec_command	==	RunCmd	)	{
+												exec_command	=	NoCmd	;
+								}
+
+								/*	Call	Executive::exec_terminate_with_return(	int	,	const	char	*	,	int	,	const	char	*)
+											if	simulation	elapsed	time	has	reached	the	termination	time.	*/
+								if	(terminate_time	<=	time_last_pass_tics	)	{
+												time_tics	=	time_last_pass_tics	;
+												exec_terminate_with_return(	0	,	__FILE__	,	__LINE__	,	"Reached	termination	time"	)	;
+								}
+
+								/*	Call	all	end	of	frame	jobs	if	the	simulation	time	equals	to	the	time	software	frame	boundary.	*/
+								if	(time_tics	==	next_frame_check_tics	)	{
+												end_of_frame_queue.reset_curr_index()	;
+												while	(	(curr_job	=	end_of_frame_queue.get_next_job())	!=	NULL	)	{
+																ret	=	curr_job->call()	;
+																if	(	ret	!=	0	)	{
+																				exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"end_of_frame	job	did	not	return	0")	;
+																}
+												}
+																									/*	Loop	through	child	threads	calling	their	end	of	frame	jobs	*/
+												for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+
+																Trick::Threads	*	curr_thread	=	threads[ii];
+
+																if	(curr_thread->process_type	==	Trick::PROCESS_TYPE_SCHEDULED)	{
+																				curr_thread->end_of_frame_queue.reset_curr_index();												
+																				while	(	(curr_job	=		curr_thread->end_of_frame_queue.get_next_job())	!=	NULL	)	{
+																								ret	=	curr_job->call();
+																								if	(	ret	!=	0	)	{
+																												exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"end_of_frame	job	did	not	return	0");
+																								}
+																				}
+																}
+												}
+
+												next_frame_check_tics	+=	software_frame_tics	;
+								}
+
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
index fc5ff874d..d665472c7 100644
--- a/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
+++ b/trick_source/sim_services/Executive/Executive_loop_single_thread.cpp
@@ -1,118 +1,118 @@
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
+#include	<iostream>
+#include	<fstream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
 
 /**
 @details
--# Enter an infinite loop.  A call to exec_terminate(const char *) or
-   exec_terminate_with_return(int, const char *, int , const char * ) will exit the loop.
-    -# If the exec_command equals freeze mode, call Trick::Executive::freeze_loop().  Transition from
-       freeze back to run will continue execution at this point.
-       Requirement  [@ref r_exec_mode_1]
-    -# Set the main thread current time to the simulation time tics value
-    -# For each scheduled jobs whose next call time is equal to the current simulation time [@ref ScheduledJobQueue]
-        -# Call the job.  Requirement  [@ref r_exec_periodic_0]
-        -# If the job is a system job, check to see if the next job call time is the lowest next time by
-           calling Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData *, long long)
-    -# If the exec_command equals ExitCmd
-       -# Call Trick::Executive::exec_terminate_with_return(int, char *, int, char *)
-    -# If the elapsed time has reached the termination time
-       -# Call Trick::Executive::exec_terminate_with_return(int, char *, int, char *)
-    -# If the elapsed time equals the next software frame time
-       -# Call the end_of_frame jobs. Requirement  [@ref r_exec_periodic_2]
-       -# Set the end of frame execution time to the current time + software_frame
+-#	Enter	an	infinite	loop.		A	call	to	exec_terminate(const	char	*)	or
+			exec_terminate_with_return(int,	const	char	*,	int	,	const	char	*	)	will	exit	the	loop.
+				-#	If	the	exec_command	equals	freeze	mode,	call	Trick::Executive::freeze_loop().		Transition	from
+							freeze	back	to	run	will	continue	execution	at	this	point.
+							Requirement		[@ref	r_exec_mode_1]
+				-#	Set	the	main	thread	current	time	to	the	simulation	time	tics	value
+				-#	For	each	scheduled	jobs	whose	next	call	time	is	equal	to	the	current	simulation	time	[@ref	ScheduledJobQueue]
+								-#	Call	the	job.		Requirement		[@ref	r_exec_periodic_0]
+								-#	If	the	job	is	a	system	job,	check	to	see	if	the	next	job	call	time	is	the	lowest	next	time	by
+											calling	Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData	*,	long	long)
+				-#	If	the	exec_command	equals	ExitCmd
+							-#	Call	Trick::Executive::exec_terminate_with_return(int,	char	*,	int,	char	*)
+				-#	If	the	elapsed	time	has	reached	the	termination	time
+							-#	Call	Trick::Executive::exec_terminate_with_return(int,	char	*,	int,	char	*)
+				-#	If	the	elapsed	time	equals	the	next	software	frame	time
+							-#	Call	the	end_of_frame	jobs.	Requirement		[@ref	r_exec_periodic_2]
+							-#	Set	the	end	of	frame	execution	time	to	the	current	time	+	software_frame
 */
-int Trick::Executive::loop_single_thread() {
-
-    Trick::ScheduledJobQueue * main_sched_queue ;
-    int ret ;
-
-    /* The main scheduler queue is the queue in thread 0 */
-    main_sched_queue = &(threads[0]->job_queue) ;
-
-    while (1) {
-
-        /* Call freeze_loop() if commanded by freeze() */
-        if (exec_command == FreezeCmd) {
-            exec_command = NoCmd;
-            freeze_loop();
-        }
-
-        /* Call all top of frame jobs if the simulation time equals to the time software frame boundary. */
-        if (time_tics == (next_frame_check_tics - software_frame_tics)) {
-            top_of_frame_queue.reset_curr_index() ;
-            while ( (curr_job = top_of_frame_queue.get_next_job()) != NULL ) {
-                ret = curr_job->call() ;
-                if ( ret != 0 ) {
-                    exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "top_of_frame job did not return 0") ;
-                }
-            }
-            frame_count++ ;
-        }
-
-        /* Call the input_processor_run queue jobs. */
-        input_processor_run_queue.reset_curr_index() ;
-        while ( (curr_job = input_processor_run_queue.find_next_job( time_tics )) != NULL ) {
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "input_processor_run job did not return 0") ;
-            }
-            input_processor_run_queue.test_next_job_call_time(curr_job , time_tics) ;
-        }
-
-        /* Call all scheduled jobs that are scheduled to run at the current simulation time step. */
-        main_sched_queue->reset_curr_index() ;
-        while ( (curr_job = main_sched_queue->find_next_job( time_tics )) != NULL ) {
-            //std::cout << "time = " << time_tics << " " << curr_job->name << " job next = " << curr_job->next_tics << "" << std::endl ;
-            ret = curr_job->call() ;
-            if ( ret != 0 ) {
-                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "scheduled job did not return 0") ;
-            }
-            /* System jobs next call time are not set until after they run.
-               Test their next job call time after they have been called */
-            if ( curr_job->system_job_class ) {
-                main_sched_queue->test_next_job_call_time(curr_job , time_tics) ;
-            }
-        }
-
-        /* Call Executive::exec_terminate_with_return(int , const char * , int , const char *)
-           if exec_command equals ExitCmd. */
-        if (exec_command == ExitCmd) {
-            exec_terminate_with_return( 0 , __FILE__ , __LINE__ , "Sim control Shutdown" ) ;
-        }
-
-        /* We are already in run... clear any redundant exec_commands to go to run */
-        if ( exec_command == RunCmd ) {
-            exec_command = NoCmd ;
-        }
-
-        /* Call Executive::exec_terminate_with_return( int , const char * , int , const char *)
-           if simulation elapsed time has reached the termination time. */
-        if (terminate_time <= time_last_pass_tics ) {
-            time_tics = time_last_pass_tics ;
-            exec_command = ExitCmd ;
-            exec_terminate_with_return( 0 , __FILE__ , __LINE__ , "Reached termination time" ) ;
-        }
-
-        /* Call all end of frame jobs if the simulation time equals to the time software frame boundary. */
-        if (time_tics == next_frame_check_tics ) {
-            end_of_frame_queue.reset_curr_index() ;
-            while ( (curr_job = end_of_frame_queue.get_next_job()) != NULL ) {
-                ret = curr_job->call() ;
-                if ( ret != 0 ) {
-                    exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "end_of_frame job did not return 0") ;
-                }
-            }
-
-            next_frame_check_tics += software_frame_tics ;
-        }
-
-    }
-
-    return(0) ;
+int	Trick::Executive::loop_single_thread()	{
+
+				Trick::ScheduledJobQueue	*	main_sched_queue	;
+				int	ret	;
+
+				/*	The	main	scheduler	queue	is	the	queue	in	thread	0	*/
+				main_sched_queue	=	&(threads[0]->job_queue)	;
+
+				while	(1)	{
+
+								/*	Call	freeze_loop()	if	commanded	by	freeze()	*/
+								if	(exec_command	==	FreezeCmd)	{
+												exec_command	=	NoCmd;
+												freeze_loop();
+								}
+
+								/*	Call	all	top	of	frame	jobs	if	the	simulation	time	equals	to	the	time	software	frame	boundary.	*/
+								if	(time_tics	==	(next_frame_check_tics	-	software_frame_tics))	{
+												top_of_frame_queue.reset_curr_index()	;
+												while	(	(curr_job	=	top_of_frame_queue.get_next_job())	!=	NULL	)	{
+																ret	=	curr_job->call()	;
+																if	(	ret	!=	0	)	{
+																				exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"top_of_frame	job	did	not	return	0")	;
+																}
+												}
+												frame_count++	;
+								}
+
+								/*	Call	the	input_processor_run	queue	jobs.	*/
+								input_processor_run_queue.reset_curr_index()	;
+								while	(	(curr_job	=	input_processor_run_queue.find_next_job(	time_tics	))	!=	NULL	)	{
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"input_processor_run	job	did	not	return	0")	;
+												}
+												input_processor_run_queue.test_next_job_call_time(curr_job	,	time_tics)	;
+								}
+
+								/*	Call	all	scheduled	jobs	that	are	scheduled	to	run	at	the	current	simulation	time	step.	*/
+								main_sched_queue->reset_curr_index()	;
+								while	(	(curr_job	=	main_sched_queue->find_next_job(	time_tics	))	!=	NULL	)	{
+												//std::cout	<<	"time	=	"	<<	time_tics	<<	"	"	<<	curr_job->name	<<	"	job	next	=	"	<<	curr_job->next_tics	<<	""	<<	std::endl	;
+												ret	=	curr_job->call()	;
+												if	(	ret	!=	0	)	{
+																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"scheduled	job	did	not	return	0")	;
+												}
+												/*	System	jobs	next	call	time	are	not	set	until	after	they	run.
+															Test	their	next	job	call	time	after	they	have	been	called	*/
+												if	(	curr_job->system_job_class	)	{
+																main_sched_queue->test_next_job_call_time(curr_job	,	time_tics)	;
+												}
+								}
+
+								/*	Call	Executive::exec_terminate_with_return(int	,	const	char	*	,	int	,	const	char	*)
+											if	exec_command	equals	ExitCmd.	*/
+								if	(exec_command	==	ExitCmd)	{
+												exec_terminate_with_return(	0	,	__FILE__	,	__LINE__	,	"Sim	control	Shutdown"	)	;
+								}
+
+								/*	We	are	already	in	run...	clear	any	redundant	exec_commands	to	go	to	run	*/
+								if	(	exec_command	==	RunCmd	)	{
+												exec_command	=	NoCmd	;
+								}
+
+								/*	Call	Executive::exec_terminate_with_return(	int	,	const	char	*	,	int	,	const	char	*)
+											if	simulation	elapsed	time	has	reached	the	termination	time.	*/
+								if	(terminate_time	<=	time_last_pass_tics	)	{
+												time_tics	=	time_last_pass_tics	;
+												exec_command	=	ExitCmd	;
+												exec_terminate_with_return(	0	,	__FILE__	,	__LINE__	,	"Reached	termination	time"	)	;
+								}
+
+								/*	Call	all	end	of	frame	jobs	if	the	simulation	time	equals	to	the	time	software	frame	boundary.	*/
+								if	(time_tics	==	next_frame_check_tics	)	{
+												end_of_frame_queue.reset_curr_index()	;
+												while	(	(curr_job	=	end_of_frame_queue.get_next_job())	!=	NULL	)	{
+																ret	=	curr_job->call()	;
+																if	(	ret	!=	0	)	{
+																				exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"end_of_frame	job	did	not	return	0")	;
+																}
+												}
+
+												next_frame_check_tics	+=	software_frame_tics	;
+								}
+
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp b/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp
index 91fcb1ba4..a334bd8fa 100644
--- a/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp
+++ b/trick_source/sim_services/Executive/Executive_post_checkpoint.cpp
@@ -1,14 +1,14 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/memorymanager_c_intf.h"
 
-int Trick::Executive::post_checkpoint() {
+int	Trick::Executive::post_checkpoint()	{
 
-    TMM_delete_var_a(all_jobs_for_checkpoint) ;
-    all_jobs_for_checkpoint = NULL ;
-    return(0) ;
+				TMM_delete_var_a(all_jobs_for_checkpoint)	;
+				all_jobs_for_checkpoint	=	NULL	;
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_process_sim_args.cpp b/trick_source/sim_services/Executive/Executive_process_sim_args.cpp
index 10c61d00a..593557779 100644
--- a/trick_source/sim_services/Executive/Executive_process_sim_args.cpp
+++ b/trick_source/sim_services/Executive/Executive_process_sim_args.cpp
@@ -1,82 +1,82 @@
 /*
-   PURPOSE: ( Handle the simulation command line args )
+			PURPOSE:	(	Handle	the	simulation	command	line	args	)
 
-   REFERENCE: ( Trick Simulation Environment )
+			REFERENCE:	(	Trick	Simulation	Environment	)
 
-   ASSUMPTIONS AND LIMITATIONS: ( None )
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
 
-   CLASS: ( N/A )
+			CLASS:	(	N/A	)
 
-   LIBRARY DEPENDENCY: ( None )
+			LIBRARY	DEPENDENCY:	(	None	)
 
-   PROGRAMMERS: ( Keith Vetter LinCom 6/2003 ) */
+			PROGRAMMERS:	(	Keith	Vetter	LinCom	6/2003	)	*/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
 
-#include "trick/Executive.hh"
-#include "trick/command_line_protos.h"
+#include	"trick/Executive.hh"
+#include	"trick/command_line_protos.h"
 
 /**
 @details
--# If there are command line arguments
-   -# If the argument is "trick_version" print out the verion of Trick used to build the
-      simulation and exit.
-   -# If the argument is "help" print out a help message about the possible command line
-      arguments and exit.
-   -# If the argument is "sie" then disable init_log which records data on some job queues.
+-#	If	there	are	command	line	arguments
+			-#	If	the	argument	is	"trick_version"	print	out	the	verion	of	Trick	used	to	build	the
+						simulation	and	exit.
+			-#	If	the	argument	is	"help"	print	out	a	help	message	about	the	possible	command	line
+						arguments	and	exit.
+			-#	If	the	argument	is	"sie"	then	disable	init_log	which	records	data	on	some	job	queues.
 */
-int Trick::Executive::process_sim_args() {
+int	Trick::Executive::process_sim_args()	{
 
-    char buf[4096] ;
-    int argc ;
-    char ** argv ;
+				char	buf[4096]	;
+				int	argc	;
+				char	**	argv	;
 
-    argc = command_line_args_get_argc() ;
-    argv = command_line_args_get_argv() ;
+				argc	=	command_line_args_get_argc()	;
+				argv	=	command_line_args_get_argv()	;
 
-    /* Save off a usage statement for messages */
-    snprintf(buf, sizeof(buf), "%s", "\n\n"
-            "USAGE:  S_main_<host_cpu>.exe  [option...]\n\n"
-            "     RUN_<name>/<input_file>\n"
-            "                         Every Trick simulation needs an input file.\n"
-            "                         By convention, the input file is placed in\n"
-            "                         a RUN_* directory.\n\n"
-            "     RUN_<name>/<input_file>  -d\n"
-            "                         Print input flags/parameters to the screen\n\n"
-            "     RUN_<name>/<input_file>  [-O|-OO]  <output_file_path>\n"
-            "                         Redirect all \"O\"utput files (log files) to the\n"
-            "                         given directory.  If this option is not used, then\n"
-            "                         all output files are placed by default in the\n"
-            "                         RUN_<name> directory.\n\n"
-            "     sie                 Generate the S_sie.resource file\n\n"
-            "     trick_version       Print which version of Trick is being used\n"
-            "                         to the screen.\n" ) ;
+				/*	Save	off	a	usage	statement	for	messages	*/
+				snprintf(buf,	sizeof(buf),	"%s",	"\n\n"
+												"USAGE:		S_main_<host_cpu>.exe		[option...]\n\n"
+												"					RUN_<name>/<input_file>\n"
+												"																									Every	Trick	simulation	needs	an	input	file.\n"
+												"																									By	convention,	the	input	file	is	placed	in\n"
+												"																									a	RUN_*	directory.\n\n"
+												"					RUN_<name>/<input_file>		-d\n"
+												"																									Print	input	flags/parameters	to	the	screen\n\n"
+												"					RUN_<name>/<input_file>		[-O|-OO]		<output_file_path>\n"
+												"																									Redirect	all	\"O\"utput	files	(log	files)	to	the\n"
+												"																									given	directory.		If	this	option	is	not	used,	then\n"
+												"																									all	output	files	are	placed	by	default	in	the\n"
+												"																									RUN_<name>	directory.\n\n"
+												"					sie																	Generate	the	S_sie.resource	file\n\n"
+												"					trick_version							Print	which	version	of	Trick	is	being	used\n"
+												"																									to	the	screen.\n"	)	;
 
-    bool open_stream = true;
-    if (argc > 1) {
+				bool	open_stream	=	true;
+				if	(argc	>	1)	{
 
-        if (!strcmp(argv[1], "trick_version")) {
-            /* Print the trick version to the screen */
-            fprintf(stdout, "%s\n", current_version.c_str());
-            exit(0);
-        } else if (!strcmp(argv[1], "-help")  || !strcmp(argv[1], "--help") ||
-                   !strcmp(argv[1], "-h")     || !strcmp(argv[1], "help") ) {
-            /* Try and help the user */
-          printf("%s", buf);
-            exit(0);
-        } else if (!strcmp(argv[1], "sie")) {
-            /* do not create init_log.csv if we are generating sie */
-            open_stream = false;
-        }
-    }
+								if	(!strcmp(argv[1],	"trick_version"))	{
+												/*	Print	the	trick	version	to	the	screen	*/
+												fprintf(stdout,	"%s\n",	current_version.c_str());
+												exit(0);
+								}	else	if	(!strcmp(argv[1],	"-help")		||	!strcmp(argv[1],	"--help")	||
+																			!strcmp(argv[1],	"-h")					||	!strcmp(argv[1],	"help")	)	{
+												/*	Try	and	help	the	user	*/
+										printf("%s",	buf);
+												exit(0);
+								}	else	if	(!strcmp(argv[1],	"sie"))	{
+												/*	do	not	create	init_log.csv	if	we	are	generating	sie	*/
+												open_stream	=	false;
+								}
+				}
 
-    /* create a log if we are not generating an sie file (usually during trick-CP) */
-    if(open_stream) {
-        init_log_stream.open((std::string(command_line_args_get_output_dir()) + std::string("/_init_log.csv")).c_str(), std::ofstream::out);
-        init_log_stream << "class,job,duration (s)\n";
-    }
+				/*	create	a	log	if	we	are	not	generating	an	sie	file	(usually	during	trick-CP)	*/
+				if(open_stream)	{
+								init_log_stream.open((std::string(command_line_args_get_output_dir())	+	std::string("/_init_log.csv")).c_str(),	std::ofstream::out);
+								init_log_stream	<<	"class,job,duration	(s)\n";
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Executive/Executive_register_scheduler.cpp b/trick_source/sim_services/Executive/Executive_register_scheduler.cpp
index 776b02d70..725fa4bb2 100644
--- a/trick_source/sim_services/Executive/Executive_register_scheduler.cpp
+++ b/trick_source/sim_services/Executive/Executive_register_scheduler.cpp
@@ -1,11 +1,11 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::register_scheduler( Trick::Scheduler * scheduler ) {
-    other_schedulers.push_back(scheduler) ;
-    return(0) ;
+int	Trick::Executive::register_scheduler(	Trick::Scheduler	*	scheduler	)	{
+				other_schedulers.push_back(scheduler)	;
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_remove_jobs.cpp b/trick_source/sim_services/Executive/Executive_remove_jobs.cpp
index 00799dc0d..7873f0bd2 100644
--- a/trick_source/sim_services/Executive/Executive_remove_jobs.cpp
+++ b/trick_source/sim_services/Executive/Executive_remove_jobs.cpp
@@ -1,82 +1,82 @@
 
-#include <iostream>
-#include <math.h>
+#include	<iostream>
+#include	<math.h>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/TrickConstant.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/TrickConstant.hh"
 
 /**
 @details
 */
-int Trick::Executive::remove_jobs( Trick::SimObject * in_sim_object ) {
+int	Trick::Executive::remove_jobs(	Trick::SimObject	*	in_sim_object	)	{
 
-    /* erase jobs from the all_jobs map whose parent_object is this sim_object */
-    for ( std::multimap <std::string, Trick::JobData *>::iterator mit = all_jobs.begin() ; mit != all_jobs.end() ; ) {
-        if ( (*mit).second->parent_object == in_sim_object ) {
-            all_jobs.erase(mit++) ;
-        } else {
-            mit++ ;
-        }
-    }
+				/*	erase	jobs	from	the	all_jobs	map	whose	parent_object	is	this	sim_object	*/
+				for	(	std::multimap	<std::string,	Trick::JobData	*>::iterator	mit	=	all_jobs.begin()	;	mit	!=	all_jobs.end()	;	)	{
+								if	(	(*mit).second->parent_object	==	in_sim_object	)	{
+												all_jobs.erase(mit++)	;
+								}	else	{
+												mit++	;
+								}
+				}
 
-    /* erase all jobs from the all_jobs_vector whose parent_object is this sim_object */
-    for ( std::vector <Trick::JobData *>::iterator jit = all_jobs_vector.begin() ; jit != all_jobs_vector.end() ; ) {
-        if ( (*jit)->parent_object == in_sim_object ) {
-            jit = all_jobs_vector.erase(jit) ;
-        } else {
-            jit++ ;
-        }
-    }
+				/*	erase	all	jobs	from	the	all_jobs_vector	whose	parent_object	is	this	sim_object	*/
+				for	(	std::vector	<Trick::JobData	*>::iterator	jit	=	all_jobs_vector.begin()	;	jit	!=	all_jobs_vector.end()	;	)	{
+								if	(	(*jit)->parent_object	==	in_sim_object	)	{
+												jit	=	all_jobs_vector.erase(jit)	;
+								}	else	{
+												jit++	;
+								}
+				}
 
-    /* erase all jobs from the all_tagged_jobs map whose parent_object is this sim_object */
-    for ( std::multimap< std::string, Trick::JobData * >::iterator mit = all_tagged_jobs.begin() ; mit != all_tagged_jobs.end() ; ) {
-        if ( (*mit).second->parent_object == in_sim_object ) {
-            all_tagged_jobs.erase(mit++) ;
-        } else {
-           mit++ ;
-        }
-    }
+				/*	erase	all	jobs	from	the	all_tagged_jobs	map	whose	parent_object	is	this	sim_object	*/
+				for	(	std::multimap<	std::string,	Trick::JobData	*	>::iterator	mit	=	all_tagged_jobs.begin()	;	mit	!=	all_tagged_jobs.end()	;	)	{
+								if	(	(*mit).second->parent_object	==	in_sim_object	)	{
+												all_tagged_jobs.erase(mit++)	;
+								}	else	{
+											mit++	;
+								}
+				}
 
-    /* search the executive queues for the job and remove it if found */
-    for ( std::vector <Trick::JobData *>::iterator jit = in_sim_object->jobs.begin() ; jit != in_sim_object->jobs.end() ; ++jit ) {
-        std::map<std::string, int>::iterator class_id_it ;
-        std::map<int, Trick::ScheduledJobQueue *>::iterator queue_it ;
-        Trick::ScheduledJobQueue * curr_queue ;
-        if ( (class_id_it = class_map.find((*jit)->job_class_name)) != class_map.end() ) {
-            if ( (*jit)->thread != 0 ) {
-                /* Add threaded scheduled jobs to the thread scheduled queue */
-                if ( (*jit)->job_class >= scheduled_start_index ) {
-                    threads[(*jit)->thread]->job_queue.remove((*jit)) ;
-                    // Add all scheduled jobs to the scheduled_queue for use in the multi-threaded loop
-                    scheduled_queue.remove((*jit)) ;
-                /* Threaded top_of_frame/end_of_frame jobs go to thread specific queues. */
-                } else if ( ! (*jit)->job_class_name.compare("top_of_frame")) {
-                    threads[(*jit)->thread]->top_of_frame_queue.remove((*jit)) ;
-                } else if ( ! (*jit)->job_class_name.compare("end_of_frame")) {
-                    threads[(*jit)->thread]->end_of_frame_queue.remove((*jit)) ;
-                /* Other jobs classes are put into the main thread */
-                } else if ( (queue_it = class_to_queue.find((*jit)->job_class)) != class_to_queue.end() ) {
-                    /* for non-scheduled jobs, the class_to_queue map holds the correct queue to insert the job */
-                    curr_queue = queue_it->second ;
-                    curr_queue->remove( (*jit) ) ;
-                }
-            } else {
-                /* if the job is a "scheduled" type job, insert the job into the proper thread queue */
-                if ( (*jit)->job_class >= scheduled_start_index ) {
-                    threads[0]->job_queue.remove((*jit)) ;
-                    // Add all scheduled jobs to the scheduled_queue for use in the multi-threaded loop
-                    scheduled_queue.remove((*jit)) ;
-                } else if ( (queue_it = class_to_queue.find((*jit)->job_class)) != class_to_queue.end() ) {
-                    /* for non-scheduled jobs, the class_to_queue map holds the correct queue to insert the job */
-                    curr_queue = queue_it->second ;
-                    curr_queue->remove( (*jit) ) ;
-                }
-            }
-        }
-    }
+				/*	search	the	executive	queues	for	the	job	and	remove	it	if	found	*/
+				for	(	std::vector	<Trick::JobData	*>::iterator	jit	=	in_sim_object->jobs.begin()	;	jit	!=	in_sim_object->jobs.end()	;	++jit	)	{
+								std::map<std::string,	int>::iterator	class_id_it	;
+								std::map<int,	Trick::ScheduledJobQueue	*>::iterator	queue_it	;
+								Trick::ScheduledJobQueue	*	curr_queue	;
+								if	(	(class_id_it	=	class_map.find((*jit)->job_class_name))	!=	class_map.end()	)	{
+												if	(	(*jit)->thread	!=	0	)	{
+																/*	Add	threaded	scheduled	jobs	to	the	thread	scheduled	queue	*/
+																if	(	(*jit)->job_class	>=	scheduled_start_index	)	{
+																				threads[(*jit)->thread]->job_queue.remove((*jit))	;
+																				//	Add	all	scheduled	jobs	to	the	scheduled_queue	for	use	in	the	multi-threaded	loop
+																				scheduled_queue.remove((*jit))	;
+																/*	Threaded	top_of_frame/end_of_frame	jobs	go	to	thread	specific	queues.	*/
+																}	else	if	(	!	(*jit)->job_class_name.compare("top_of_frame"))	{
+																				threads[(*jit)->thread]->top_of_frame_queue.remove((*jit))	;
+																}	else	if	(	!	(*jit)->job_class_name.compare("end_of_frame"))	{
+																				threads[(*jit)->thread]->end_of_frame_queue.remove((*jit))	;
+																/*	Other	jobs	classes	are	put	into	the	main	thread	*/
+																}	else	if	(	(queue_it	=	class_to_queue.find((*jit)->job_class))	!=	class_to_queue.end()	)	{
+																				/*	for	non-scheduled	jobs,	the	class_to_queue	map	holds	the	correct	queue	to	insert	the	job	*/
+																				curr_queue	=	queue_it->second	;
+																				curr_queue->remove(	(*jit)	)	;
+																}
+												}	else	{
+																/*	if	the	job	is	a	"scheduled"	type	job,	insert	the	job	into	the	proper	thread	queue	*/
+																if	(	(*jit)->job_class	>=	scheduled_start_index	)	{
+																				threads[0]->job_queue.remove((*jit))	;
+																				//	Add	all	scheduled	jobs	to	the	scheduled_queue	for	use	in	the	multi-threaded	loop
+																				scheduled_queue.remove((*jit))	;
+																}	else	if	(	(queue_it	=	class_to_queue.find((*jit)->job_class))	!=	class_to_queue.end()	)	{
+																				/*	for	non-scheduled	jobs,	the	class_to_queue	map	holds	the	correct	queue	to	insert	the	job	*/
+																				curr_queue	=	queue_it->second	;
+																				curr_queue->remove(	(*jit)	)	;
+																}
+												}
+								}
+				}
 
-    return 0 ;
+				return	0	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp b/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp
index 8682ea3e1..e9c73c586 100644
--- a/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp
+++ b/trick_source/sim_services/Executive/Executive_remove_sim_object.cpp
@@ -1,45 +1,45 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @details
--# Call delete_sim_object(Trick::SimObject *) for component objects that
-   are to be processed before the current object.
--# Remove the object from the sim_object vector
--# Call remove_jobs_to_queue(SimObject *) to remove the jobs in the sim_object from the scheduler.
--# Call delete_sim_object(Trick::SimObject *) for component objects that
-   are to be processed after the current object.
- */
-int Trick::Executive::delete_sim_object( Trick::SimObject * in_object ) {
-
-    std::vector <Trick::SimObject *>::iterator so_it ;
-    std::vector <Trick::Scheduler *>::iterator sched_it ;
-
-    for ( so_it = in_object->pre_component_objects.begin() ; so_it != in_object->pre_component_objects.end() ; ++so_it ) {
-        delete_sim_object((*so_it)) ;
-    }
-
-    for ( so_it = sim_objects.begin() ; so_it != sim_objects.end() ; ) {
-        if ( (*so_it) == in_object ) {
-            so_it = sim_objects.erase(so_it) ;
-        } else {
-           so_it++ ;
-        }
-    }
-
-    remove_jobs( in_object ) ;
-
-    for ( sched_it = other_schedulers.begin() ; sched_it != other_schedulers.end() ; ++sched_it ) {
-        (*sched_it)->delete_sim_object(in_object) ;
-    }
-
-    for ( so_it = in_object->post_component_objects.begin() ; so_it != in_object->post_component_objects.end() ; ++so_it ) {
-        delete_sim_object((*so_it)) ;
-    }
-
-    return(0) ;
+-#	Call	delete_sim_object(Trick::SimObject	*)	for	component	objects	that
+			are	to	be	processed	before	the	current	object.
+-#	Remove	the	object	from	the	sim_object	vector
+-#	Call	remove_jobs_to_queue(SimObject	*)	to	remove	the	jobs	in	the	sim_object	from	the	scheduler.
+-#	Call	delete_sim_object(Trick::SimObject	*)	for	component	objects	that
+			are	to	be	processed	after	the	current	object.
+	*/
+int	Trick::Executive::delete_sim_object(	Trick::SimObject	*	in_object	)	{
+
+				std::vector	<Trick::SimObject	*>::iterator	so_it	;
+				std::vector	<Trick::Scheduler	*>::iterator	sched_it	;
+
+				for	(	so_it	=	in_object->pre_component_objects.begin()	;	so_it	!=	in_object->pre_component_objects.end()	;	++so_it	)	{
+								delete_sim_object((*so_it))	;
+				}
+
+				for	(	so_it	=	sim_objects.begin()	;	so_it	!=	sim_objects.end()	;	)	{
+								if	(	(*so_it)	==	in_object	)	{
+												so_it	=	sim_objects.erase(so_it)	;
+								}	else	{
+											so_it++	;
+								}
+				}
+
+				remove_jobs(	in_object	)	;
+
+				for	(	sched_it	=	other_schedulers.begin()	;	sched_it	!=	other_schedulers.end()	;	++sched_it	)	{
+								(*sched_it)->delete_sim_object(in_object)	;
+				}
+
+				for	(	so_it	=	in_object->post_component_objects.begin()	;	so_it	!=	in_object->post_component_objects.end()	;	++so_it	)	{
+								delete_sim_object((*so_it))	;
+				}
+
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_restart.cpp b/trick_source/sim_services/Executive/Executive_restart.cpp
index 9837e7d86..193a9702d 100644
--- a/trick_source/sim_services/Executive/Executive_restart.cpp
+++ b/trick_source/sim_services/Executive/Executive_restart.cpp
@@ -1,129 +1,129 @@
 
-#include <iostream>
-#include <string.h>
+#include	<iostream>
+#include	<string.h>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/ScheduledJobQueue.hh"
-#include "trick/Threads.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/ScheduledJobQueue.hh"
+#include	"trick/Threads.hh"
 
 /**
 @details
--# verify that all jobs in the checkpoint are present in the current simulation
--# Clear all current job information in scheduler
--# Clear all current sim_object information in scheduler
--# Add the sim_objects in checkpoint to the scheduler
--# Call post_checkpoint to delete memory for checkpoint
+-#	verify	that	all	jobs	in	the	checkpoint	are	present	in	the	current	simulation
+-#	Clear	all	current	job	information	in	scheduler
+-#	Clear	all	current	sim_object	information	in	scheduler
+-#	Add	the	sim_objects	in	checkpoint	to	the	scheduler
+-#	Call	post_checkpoint	to	delete	memory	for	checkpoint
 */
-int Trick::Executive::restart() {
-
-    unsigned int ii ;
-    std::multimap<std::string, Trick::JobData *>::iterator it ;
-    std::pair<std::multimap<std::string, Trick::JobData *>::iterator, std::multimap<std::string, Trick::JobData *>::iterator> ret ;
-    std::vector <Trick::SimObject *>::iterator sit ;
-    std::vector <Trick::JobData *>::iterator jit ;
-    std::multimap<std::string, Trick::JobData *> all_jobs_from_checkpointed_objects ;
-
-    /*
-       Save the current job index position of the input processor queue. This queue position is special
-       because of the possibility of restarting from a checkpoint read in from the input file.  When
-       we restart from a checkpoint we reset the queues.  If we reset the input_processor queue we'll
-       call the input_processor again... and we can end up in recursive hell.  Save the current position
-       and replace the queue position after the queues have been rebuilt.  This ensures that we don't
-       call the input file twice, or more!
-     */
-    unsigned int current_ip_index = input_processor_queue.get_curr_index() ;
-
-    /* clear all current job information in scheduler.  These will be repopulated when we call add_job_to_queue */
-    clear_scheduled_queues() ;
-    all_jobs.clear() ;
-    all_jobs_vector.clear() ;
-    all_tagged_jobs.clear() ;
-
-    /* Create a temporary all_jobs map to use to restore job data from all_jobs_for_checkpoint */
-    for ( sit = sim_objects.begin() ; sit != sim_objects.end() ; ++sit ) {
-        for ( jit = (*sit)->jobs.begin() ; jit != (*sit)->jobs.end() ; ++jit ) {
-            /* Dynamically created sim_objects, like data_recording objects, require that
-               some of the job class data be repopulated before we start
-               copying job data back into the sim. */
-            (*jit)->sim_object_id = (*sit)->id ;
-            (*jit)->parent_object = (*sit) ;
-            (*jit)->frame_id = (*jit)->sim_object_id + ((double)(*jit)->id / 100.0);
-            std::string so_name_and_period = (*sit)->name + "." ;
-            if ( strncmp( (*jit)->name.c_str() , so_name_and_period.c_str(), so_name_and_period.length())) {
-                (*jit)->name = (*sit)->name + "." + (*jit)->name ;
-            }
-            all_jobs_from_checkpointed_objects.insert(std::pair<std::string, JobData *>((*jit)->name,(*jit))) ;
-        }
-    }
-
-    /* verify that all jobs in the checkpoint are present in the current simulation */
-    for ( ii = 0 ; ii < num_all_jobs ; ii++ ) {
-        ret = all_jobs_from_checkpointed_objects.equal_range(all_jobs_for_checkpoint[ii].name) ;
-        if ( ret.first == all_jobs_from_checkpointed_objects.end() ) {
-            message_publish(MSG_ERROR, "Could not find job %s\n", all_jobs_for_checkpoint[ii].name.c_str()) ;
-            exec_terminate_with_return( -1 , __FILE__ , __LINE__ , "Job in checkpoint file does not exist in current sim." ) ;
-        } else {
-            for ( it = ret.first ; it != ret.second ; ++it ) {
-                // The JobData::id and JobData::sim_object_id together uniquely identify a job.
-                if (( it->second->id            == all_jobs_for_checkpoint[ii].id ) &&
-                    ( it->second->sim_object_id == all_jobs_for_checkpoint[ii].sim_object_id )) {
-                    // copy the job information from the checkpoint back to the job.
-                    it->second->copy_from_checkpoint(&all_jobs_for_checkpoint[ii]) ;
-                }
-            }
-        }
-    }
-
-    /* restore the executive sim_objects vector from the checkpoint and add back all of
-       the jobs to the schedulers */
-    for ( sit = sim_objects.begin() ; sit != sim_objects.end() ; ++sit ) {
-        add_jobs_to_queue(*sit, true) ;
-        for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-            other_schedulers[ii]->add_sim_object(*sit) ;
-        }
-    }
-    num_sim_objects = sim_objects.size() ;
-
-    // The queues have been rebuilt, restore the current position of the input processor queue.
-    input_processor_queue.set_curr_index(current_ip_index) ;
-
-    // set the restart_called flag to true.  This flag is checked during Executive::init.  If
-    // we have restarted from a checkpoint, we will be skipping initialization jobs.
-    restart_called = true ;
-
-    /* Delete temporary memory used to restore jobs */
-    TMM_delete_var_a(all_jobs_for_checkpoint) ;
-    all_jobs_for_checkpoint = NULL ;
-
-    /* Set the main thread current time to the simulation time tics value, used with Executive::get_sim_time() */
-
-    threads[0]->curr_time_tics = time_tics ;
-
-    // if we restarted from scratch without calling init jobs, need to create child threads
-    create_threads() ;
-
-    // make sure asynchronous must finish jobs restart at correct time
-    for (ii = 1; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        if ( (curr_thread->process_type == PROCESS_TYPE_AMF_CHILD) ||
-             (curr_thread->process_type == PROCESS_TYPE_ASYNC_CHILD) ) {
-            if ( curr_thread->amf_cycle_tics > 0 and time_tics % curr_thread->amf_cycle_tics ) {
-                curr_thread->amf_next_tics = time_tics + curr_thread->amf_cycle_tics - (time_tics % curr_thread->amf_cycle_tics) ;
-            } else {
-                curr_thread->amf_next_tics = time_tics ;
-            }
-        }
-    }
-
-    // If we are in freeze, reset the freeze_scheduled queue, we'll restart freeze time at 0
-    if ( mode == Freeze ) {
-        init_freeze_scheduled() ;
-    }
-
-
-    return(0) ;
+int	Trick::Executive::restart()	{
+
+				unsigned	int	ii	;
+				std::multimap<std::string,	Trick::JobData	*>::iterator	it	;
+				std::pair<std::multimap<std::string,	Trick::JobData	*>::iterator,	std::multimap<std::string,	Trick::JobData	*>::iterator>	ret	;
+				std::vector	<Trick::SimObject	*>::iterator	sit	;
+				std::vector	<Trick::JobData	*>::iterator	jit	;
+				std::multimap<std::string,	Trick::JobData	*>	all_jobs_from_checkpointed_objects	;
+
+				/*
+							Save	the	current	job	index	position	of	the	input	processor	queue.	This	queue	position	is	special
+							because	of	the	possibility	of	restarting	from	a	checkpoint	read	in	from	the	input	file.		When
+							we	restart	from	a	checkpoint	we	reset	the	queues.		If	we	reset	the	input_processor	queue	we'll
+							call	the	input_processor	again...	and	we	can	end	up	in	recursive	hell.		Save	the	current	position
+							and	replace	the	queue	position	after	the	queues	have	been	rebuilt.		This	ensures	that	we	don't
+							call	the	input	file	twice,	or	more!
+					*/
+				unsigned	int	current_ip_index	=	input_processor_queue.get_curr_index()	;
+
+				/*	clear	all	current	job	information	in	scheduler.		These	will	be	repopulated	when	we	call	add_job_to_queue	*/
+				clear_scheduled_queues()	;
+				all_jobs.clear()	;
+				all_jobs_vector.clear()	;
+				all_tagged_jobs.clear()	;
+
+				/*	Create	a	temporary	all_jobs	map	to	use	to	restore	job	data	from	all_jobs_for_checkpoint	*/
+				for	(	sit	=	sim_objects.begin()	;	sit	!=	sim_objects.end()	;	++sit	)	{
+								for	(	jit	=	(*sit)->jobs.begin()	;	jit	!=	(*sit)->jobs.end()	;	++jit	)	{
+												/*	Dynamically	created	sim_objects,	like	data_recording	objects,	require	that
+															some	of	the	job	class	data	be	repopulated	before	we	start
+															copying	job	data	back	into	the	sim.	*/
+												(*jit)->sim_object_id	=	(*sit)->id	;
+												(*jit)->parent_object	=	(*sit)	;
+												(*jit)->frame_id	=	(*jit)->sim_object_id	+	((double)(*jit)->id	/	100.0);
+												std::string	so_name_and_period	=	(*sit)->name	+	"."	;
+												if	(	strncmp(	(*jit)->name.c_str()	,	so_name_and_period.c_str(),	so_name_and_period.length()))	{
+																(*jit)->name	=	(*sit)->name	+	"."	+	(*jit)->name	;
+												}
+												all_jobs_from_checkpointed_objects.insert(std::pair<std::string,	JobData	*>((*jit)->name,(*jit)))	;
+								}
+				}
+
+				/*	verify	that	all	jobs	in	the	checkpoint	are	present	in	the	current	simulation	*/
+				for	(	ii	=	0	;	ii	<	num_all_jobs	;	ii++	)	{
+								ret	=	all_jobs_from_checkpointed_objects.equal_range(all_jobs_for_checkpoint[ii].name)	;
+								if	(	ret.first	==	all_jobs_from_checkpointed_objects.end()	)	{
+												message_publish(MSG_ERROR,	"Could	not	find	job	%s\n",	all_jobs_for_checkpoint[ii].name.c_str())	;
+												exec_terminate_with_return(	-1	,	__FILE__	,	__LINE__	,	"Job	in	checkpoint	file	does	not	exist	in	current	sim."	)	;
+								}	else	{
+												for	(	it	=	ret.first	;	it	!=	ret.second	;	++it	)	{
+																//	The	JobData::id	and	JobData::sim_object_id	together	uniquely	identify	a	job.
+																if	((	it->second->id												==	all_jobs_for_checkpoint[ii].id	)	&&
+																				(	it->second->sim_object_id	==	all_jobs_for_checkpoint[ii].sim_object_id	))	{
+																				//	copy	the	job	information	from	the	checkpoint	back	to	the	job.
+																				it->second->copy_from_checkpoint(&all_jobs_for_checkpoint[ii])	;
+																}
+												}
+								}
+				}
+
+				/*	restore	the	executive	sim_objects	vector	from	the	checkpoint	and	add	back	all	of
+							the	jobs	to	the	schedulers	*/
+				for	(	sit	=	sim_objects.begin()	;	sit	!=	sim_objects.end()	;	++sit	)	{
+								add_jobs_to_queue(*sit,	true)	;
+								for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+												other_schedulers[ii]->add_sim_object(*sit)	;
+								}
+				}
+				num_sim_objects	=	sim_objects.size()	;
+
+				//	The	queues	have	been	rebuilt,	restore	the	current	position	of	the	input	processor	queue.
+				input_processor_queue.set_curr_index(current_ip_index)	;
+
+				//	set	the	restart_called	flag	to	true.		This	flag	is	checked	during	Executive::init.		If
+				//	we	have	restarted	from	a	checkpoint,	we	will	be	skipping	initialization	jobs.
+				restart_called	=	true	;
+
+				/*	Delete	temporary	memory	used	to	restore	jobs	*/
+				TMM_delete_var_a(all_jobs_for_checkpoint)	;
+				all_jobs_for_checkpoint	=	NULL	;
+
+				/*	Set	the	main	thread	current	time	to	the	simulation	time	tics	value,	used	with	Executive::get_sim_time()	*/
+
+				threads[0]->curr_time_tics	=	time_tics	;
+
+				//	if	we	restarted	from	scratch	without	calling	init	jobs,	need	to	create	child	threads
+				create_threads()	;
+
+				//	make	sure	asynchronous	must	finish	jobs	restart	at	correct	time
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								if	(	(curr_thread->process_type	==	PROCESS_TYPE_AMF_CHILD)	||
+													(curr_thread->process_type	==	PROCESS_TYPE_ASYNC_CHILD)	)	{
+												if	(	curr_thread->amf_cycle_tics	>	0	and	time_tics	%	curr_thread->amf_cycle_tics	)	{
+																curr_thread->amf_next_tics	=	time_tics	+	curr_thread->amf_cycle_tics	-	(time_tics	%	curr_thread->amf_cycle_tics)	;
+												}	else	{
+																curr_thread->amf_next_tics	=	time_tics	;
+												}
+								}
+				}
+
+				//	If	we	are	in	freeze,	reset	the	freeze_scheduled	queue,	we'll	restart	freeze	time	at	0
+				if	(	mode	==	Freeze	)	{
+								init_freeze_scheduled()	;
+				}
+
+
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Executive/Executive_run.cpp b/trick_source/sim_services/Executive/Executive_run.cpp
index 7896c0f86..de4090ea0 100644
--- a/trick_source/sim_services/Executive/Executive_run.cpp
+++ b/trick_source/sim_services/Executive/Executive_run.cpp
@@ -1,15 +1,15 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/Message_proto.hh"
+#include	"trick/Executive.hh"
+#include	"trick/Message_proto.hh"
 
-int Trick::Executive::run() {
+int	Trick::Executive::run()	{
 
-    /** @par Detailed Design */
-    /** @li Set exec_command to RunCmd.  Requirement [@ref r_exec_mode_5] */
-    exec_command = RunCmd ;
-    return(0) ;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Set	exec_command	to	RunCmd.		Requirement	[@ref	r_exec_mode_5]	*/
+				exec_command	=	RunCmd	;
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_scheduled_thread_sync.cpp b/trick_source/sim_services/Executive/Executive_scheduled_thread_sync.cpp
index 59f631e27..355ee699e 100644
--- a/trick_source/sim_services/Executive/Executive_scheduled_thread_sync.cpp
+++ b/trick_source/sim_services/Executive/Executive_scheduled_thread_sync.cpp
@@ -1,30 +1,30 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
-#include "trick/release.h"
+#include	"trick/Executive.hh"
+#include	"trick/release.h"
 
 /**
 @design
--# Loop through all threads.
-   -# Wait for thread to finish if the thread is PROCESS_TYPE_SCHEDULED
+-#	Loop	through	all	threads.
+			-#	Wait	for	thread	to	finish	if	the	thread	is	PROCESS_TYPE_SCHEDULED
 */
-int Trick::Executive::scheduled_thread_sync() {
+int	Trick::Executive::scheduled_thread_sync()	{
 
-    unsigned int ii ;
+				unsigned	int	ii	;
 
-    /* Wait for synchronous threads to finish before testing for adjusting time_tics */
-    for (ii = 1; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        if ( curr_thread->enabled and curr_thread->process_type == PROCESS_TYPE_SCHEDULED) {
-            while (curr_thread->child_complete == false ) {
-                if (rt_nap == true) {
-                    RELEASE();
-                }
-            }
-        }
-    }
+				/*	Wait	for	synchronous	threads	to	finish	before	testing	for	adjusting	time_tics	*/
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								if	(	curr_thread->enabled	and	curr_thread->process_type	==	PROCESS_TYPE_SCHEDULED)	{
+												while	(curr_thread->child_complete	==	false	)	{
+																if	(rt_nap	==	true)	{
+																				RELEASE();
+																}
+												}
+								}
+				}
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp b/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp
index 425faaf2d..08def3b84 100644
--- a/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_job_cycle.cpp
@@ -1,43 +1,43 @@
 
-#include <iostream>
-
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-int Trick::Executive::set_job_cycle(std::string job_name, int instance_num, double in_cycle) {
-
-    Trick::JobData * job ;
-    std::multimap<std::string , Trick::JobData *>::iterator it ;
-    std::pair<std::multimap<std::string , Trick::JobData *>::iterator , std::multimap<std::string , Trick::JobData *>::iterator> range ;
-
-    if ( in_cycle < 0.0 ) {
-        message_publish(MSG_WARNING, "Warning: Invalid cycle %g specified in Executive::set_job_cycle for %s\n" , in_cycle, job_name.c_str()) ;
-        return -1 ;
-    }
-
-    job = get_job(job_name, instance_num) ;
-
-    if ( job != NULL ) {
-        // set cycle for one job (the given job_name)
-        job->set_cycle(in_cycle) ;
-        job->set_next_call_time(time_tics) ;
-    } else {
-        // job_name may be a tag name: find all jobs that have the given tag name and hold them in a list
-        range = all_tagged_jobs.equal_range(job_name) ;
-        if (range.first != range.second) {
-            // set cycle for all jobs with this tag
-            for ( it = range.first; it != range.second ; ++it ) {
-                (*it).second->set_cycle(in_cycle) ;
-                (*it).second->set_next_call_time(time_tics) ;
-            }
-        } else {
-            message_publish(MSG_WARNING, "Warning: Job %s not found in Executive::set_job_cycle\n" , job_name.c_str()) ;
-            return -2 ;
-        }
-    }
-
-    return(0) ;
+#include	<iostream>
+
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+int	Trick::Executive::set_job_cycle(std::string	job_name,	int	instance_num,	double	in_cycle)	{
+
+				Trick::JobData	*	job	;
+				std::multimap<std::string	,	Trick::JobData	*>::iterator	it	;
+				std::pair<std::multimap<std::string	,	Trick::JobData	*>::iterator	,	std::multimap<std::string	,	Trick::JobData	*>::iterator>	range	;
+
+				if	(	in_cycle	<	0.0	)	{
+								message_publish(MSG_WARNING,	"Warning:	Invalid	cycle	%g	specified	in	Executive::set_job_cycle	for	%s\n"	,	in_cycle,	job_name.c_str())	;
+								return	-1	;
+				}
+
+				job	=	get_job(job_name,	instance_num)	;
+
+				if	(	job	!=	NULL	)	{
+								//	set	cycle	for	one	job	(the	given	job_name)
+								job->set_cycle(in_cycle)	;
+								job->set_next_call_time(time_tics)	;
+				}	else	{
+								//	job_name	may	be	a	tag	name:	find	all	jobs	that	have	the	given	tag	name	and	hold	them	in	a	list
+								range	=	all_tagged_jobs.equal_range(job_name)	;
+								if	(range.first	!=	range.second)	{
+												//	set	cycle	for	all	jobs	with	this	tag
+												for	(	it	=	range.first;	it	!=	range.second	;	++it	)	{
+																(*it).second->set_cycle(in_cycle)	;
+																(*it).second->set_next_call_time(time_tics)	;
+												}
+								}	else	{
+												message_publish(MSG_WARNING,	"Warning:	Job	%s	not	found	in	Executive::set_job_cycle\n"	,	job_name.c_str())	;
+												return	-2	;
+								}
+				}
+
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp b/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp
index 07aa5e7db..46b7d9ad8 100644
--- a/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_job_onoff.cpp
@@ -1,37 +1,37 @@
 
-#include <iostream>
-
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-int Trick::Executive::set_job_onoff(std::string job_name, int instance_num , int on) {
-
-    Trick::JobData * job ;
-    std::multimap<std::string , Trick::JobData *>::iterator it ;
-    std::pair<std::multimap<std::string , Trick::JobData *>::iterator , std::multimap<std::string , Trick::JobData *>::iterator> range ;
-
-    job = get_job(job_name, instance_num) ;
-
-    if ( job != NULL ) {
-        // set disabled flag accordingly for one job (the given job_name)
-        job->disabled = !on ;
-    } else {
-        // job_name may be a tag name: find all jobs that have the given tag name and hold them in a list
-        range = all_tagged_jobs.equal_range(job_name) ;
-        if (range.first != range.second) {
-            // set disabled flag accordingly for all jobs with this tag
-            for ( it = range.first; it != range.second ; ++it ) {
-                it->second->disabled = !on ;
-            }
-        } else {
-            message_publish(MSG_WARNING, "Warning: Job %s not found in Executive::set_job_onoff\n" , job_name.c_str()) ;
-            return -1 ;
-        }
-    }
-
-
-    return(0) ;
+#include	<iostream>
+
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+int	Trick::Executive::set_job_onoff(std::string	job_name,	int	instance_num	,	int	on)	{
+
+				Trick::JobData	*	job	;
+				std::multimap<std::string	,	Trick::JobData	*>::iterator	it	;
+				std::pair<std::multimap<std::string	,	Trick::JobData	*>::iterator	,	std::multimap<std::string	,	Trick::JobData	*>::iterator>	range	;
+
+				job	=	get_job(job_name,	instance_num)	;
+
+				if	(	job	!=	NULL	)	{
+								//	set	disabled	flag	accordingly	for	one	job	(the	given	job_name)
+								job->disabled	=	!on	;
+				}	else	{
+								//	job_name	may	be	a	tag	name:	find	all	jobs	that	have	the	given	tag	name	and	hold	them	in	a	list
+								range	=	all_tagged_jobs.equal_range(job_name)	;
+								if	(range.first	!=	range.second)	{
+												//	set	disabled	flag	accordingly	for	all	jobs	with	this	tag
+												for	(	it	=	range.first;	it	!=	range.second	;	++it	)	{
+																it->second->disabled	=	!on	;
+												}
+								}	else	{
+												message_publish(MSG_WARNING,	"Warning:	Job	%s	not	found	in	Executive::set_job_onoff\n"	,	job_name.c_str())	;
+												return	-1	;
+								}
+				}
+
+
+				return(0)	;
 
 
 
diff --git a/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
index 60dd5c155..2d83713b0 100644
--- a/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_simobject_onoff.cpp
@@ -1,62 +1,62 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_sim_object_jobs_onoff(std::string sim_object_name, int on) {
+int	Trick::Executive::set_sim_object_jobs_onoff(std::string	sim_object_name,	int	on)	{
 
-    SimObject * sim_object = get_sim_object_by_name(sim_object_name);
-    if (sim_object == NULL) {
-        return -1;
-    }
+				SimObject	*	sim_object	=	get_sim_object_by_name(sim_object_name);
+				if	(sim_object	==	NULL)	{
+								return	-1;
+				}
 
-    if (on) {
-        sim_object->enable_all_jobs();
-    } else {
-        sim_object->disable_all_jobs();
-    }
+				if	(on)	{
+								sim_object->enable_all_jobs();
+				}	else	{
+								sim_object->disable_all_jobs();
+				}
 
-    return 0;
+				return	0;
 }
 
 
-int Trick::Executive::set_sim_object_onoff(std::string sim_object_name, int on) {
-    
-    SimObject * sim_object = get_sim_object_by_name(sim_object_name);
-    if (sim_object == NULL) {
-        return -1;
-    }
-
-    sim_object->object_disabled = !on;
-    if (on) {
-        // Apply saved state
-        for ( int i = 0 ; i < sim_object->jobs.size() ; i++ ) {
-            std::map<Trick::JobData *, bool>::iterator saved_state_it = sim_object->saved_job_states.find(sim_object->jobs[i]);
-            if (saved_state_it != sim_object->saved_job_states.end()) {
-                sim_object->jobs[i]->disabled = saved_state_it->second;
-            } else {
-                // If job is not in map, turn it on
-                sim_object->jobs[i]->disabled = false;
-            }
-        }
-        sim_object->saved_job_states.clear();
-    } else {
-        for ( int i = 0 ; i < sim_object->jobs.size() ; i++ ) {
-            // Save state, turn off
-            sim_object->saved_job_states[sim_object->jobs[i]] = sim_object->jobs[i]->disabled;
-            sim_object->jobs[i]->disabled = true ;
-        }
-    }
-    return(0) ;
+int	Trick::Executive::set_sim_object_onoff(std::string	sim_object_name,	int	on)	{
+				
+				SimObject	*	sim_object	=	get_sim_object_by_name(sim_object_name);
+				if	(sim_object	==	NULL)	{
+								return	-1;
+				}
+
+				sim_object->object_disabled	=	!on;
+				if	(on)	{
+								//	Apply	saved	state
+								for	(	int	i	=	0	;	i	<	sim_object->jobs.size()	;	i++	)	{
+												std::map<Trick::JobData	*,	bool>::iterator	saved_state_it	=	sim_object->saved_job_states.find(sim_object->jobs[i]);
+												if	(saved_state_it	!=	sim_object->saved_job_states.end())	{
+																sim_object->jobs[i]->disabled	=	saved_state_it->second;
+												}	else	{
+																//	If	job	is	not	in	map,	turn	it	on
+																sim_object->jobs[i]->disabled	=	false;
+												}
+								}
+								sim_object->saved_job_states.clear();
+				}	else	{
+								for	(	int	i	=	0	;	i	<	sim_object->jobs.size()	;	i++	)	{
+												//	Save	state,	turn	off
+												sim_object->saved_job_states[sim_object->jobs[i]]	=	sim_object->jobs[i]->disabled;
+												sim_object->jobs[i]->disabled	=	true	;
+								}
+				}
+				return(0)	;
 }
 
-int Trick::Executive::get_sim_object_onoff (std::string sim_object_name) {
+int	Trick::Executive::get_sim_object_onoff	(std::string	sim_object_name)	{
 
-     SimObject * sim_object = get_sim_object_by_name(sim_object_name);
-    if (sim_object == NULL) {
-        return -1;
-    }
+					SimObject	*	sim_object	=	get_sim_object_by_name(sim_object_name);
+				if	(sim_object	==	NULL)	{
+								return	-1;
+				}
 
-    return !(sim_object->object_disabled) ;
+				return	!(sim_object->object_disabled)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp b/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp
index d98b8f6a5..7dae60b78 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_amf_cycle_time.cpp
@@ -1,25 +1,25 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_thread_amf_cycle_time(unsigned int thread_id , double cycle_time) {
+int	Trick::Executive::set_thread_amf_cycle_time(unsigned	int	thread_id	,	double	cycle_time)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    if ( thread_id == 0 ) {
-        /** @li If the thread_id matches the main thread, that is an error */
-        ret = -2 ;
-    } else if ( (thread_id +1) > threads.size() ) {
-        /** @li If the thread_id does not exist, return an error */
-        ret = -2 ;
-    } else {
-        /** @li Call Trick::Thread::set_thread_process_type with the proces_type if the thread exists  */
-        ret = threads[thread_id]->set_amf_cycle( cycle_time , time_tic_value ) ;
-    }
+				/**	@par	Detailed	Design	*/
+				if	(	thread_id	==	0	)	{
+								/**	@li	If	the	thread_id	matches	the	main	thread,	that	is	an	error	*/
+								ret	=	-2	;
+				}	else	if	(	(thread_id	+1)	>	threads.size()	)	{
+								/**	@li	If	the	thread_id	does	not	exist,	return	an	error	*/
+								ret	=	-2	;
+				}	else	{
+								/**	@li	Call	Trick::Thread::set_thread_process_type	with	the	proces_type	if	the	thread	exists		*/
+								ret	=	threads[thread_id]->set_amf_cycle(	cycle_time	,	time_tic_value	)	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp b/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp
index 5e0e42d20..13bd2d416 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_async_wait.cpp
@@ -1,25 +1,25 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_thread_async_wait(unsigned int thread_id , bool yes_no) {
+int	Trick::Executive::set_thread_async_wait(unsigned	int	thread_id	,	bool	yes_no)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    if ( thread_id == 0 ) {
-        /** @li If the thread_id matches the main thread, that is an error */
-        ret = -2 ;
-    } else if ( (thread_id +1) > threads.size() ) {
-        /** @li If the thread_id does not exist, return an error */
-        ret = -2 ;
-    } else {
-        /** @li Call Trick::Thread::set_thread_process_type with the proces_type if the thread exists  */
-        ret = threads[thread_id]->set_async_wait(yes_no) ;
-    }
+				/**	@par	Detailed	Design	*/
+				if	(	thread_id	==	0	)	{
+								/**	@li	If	the	thread_id	matches	the	main	thread,	that	is	an	error	*/
+								ret	=	-2	;
+				}	else	if	(	(thread_id	+1)	>	threads.size()	)	{
+								/**	@li	If	the	thread_id	does	not	exist,	return	an	error	*/
+								ret	=	-2	;
+				}	else	{
+								/**	@li	Call	Trick::Thread::set_thread_process_type	with	the	proces_type	if	the	thread	exists		*/
+								ret	=	threads[thread_id]->set_async_wait(yes_no)	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp b/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp
index 03533ea7f..6c363599b 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_cpu_affinity.cpp
@@ -1,19 +1,19 @@
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_thread_cpu_affinity(unsigned int thread_id , int cpu_num) {
+int	Trick::Executive::set_thread_cpu_affinity(unsigned	int	thread_id	,	int	cpu_num)	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    /** @par Detailed Design */
-    if ( (thread_id +1) > threads.size() ) {
-        /** @li If the thread_id does not exist, return an error */
-        ret = -2 ;
-    } else {
-        threads[thread_id]->cpu_set(cpu_num) ;
-    }
+				/**	@par	Detailed	Design	*/
+				if	(	(thread_id	+1)	>	threads.size()	)	{
+								/**	@li	If	the	thread_id	does	not	exist,	return	an	error	*/
+								ret	=	-2	;
+				}	else	{
+								threads[thread_id]->cpu_set(cpu_num)	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp b/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp
index 28eac9531..3f4509ac7 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_enabled.cpp
@@ -1,24 +1,24 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @design
--# If the thread_id matches the main thread, that is an error
--# If the thread_id does not exist, return an error
--# Call Trick::Thread::set_enabled(bool) with the enabled flag
+-#	If	the	thread_id	matches	the	main	thread,	that	is	an	error
+-#	If	the	thread_id	does	not	exist,	return	an	error
+-#	Call	Trick::Thread::set_enabled(bool)	with	the	enabled	flag
 */
-int Trick::Executive::set_thread_enabled(unsigned int thread_id , bool in_enabled) {
+int	Trick::Executive::set_thread_enabled(unsigned	int	thread_id	,	bool	in_enabled)	{
 
-    if ( thread_id == 0 ) {
-        return -2 ;
-    } else if ( (thread_id +1) > threads.size() ) {
-        return -2 ;
-    }
+				if	(	thread_id	==	0	)	{
+								return	-2	;
+				}	else	if	(	(thread_id	+1)	>	threads.size()	)	{
+								return	-2	;
+				}
 
-    threads[thread_id]->set_enabled( in_enabled ) ;
-    return 0 ;
+				threads[thread_id]->set_enabled(	in_enabled	)	;
+				return	0	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp b/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp
index f5a0583fc..cec6967bb 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_priority.cpp
@@ -1,20 +1,20 @@
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_thread_priority(unsigned int thread_id , unsigned int req_priority) {
+int	Trick::Executive::set_thread_priority(unsigned	int	thread_id	,	unsigned	int	req_priority)	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    /** @par Detailed Design */
-    if ( (thread_id + 1) > threads.size() ) {
-        /** @li If the thread_id does not exist, return an error */
-        ret = -2 ;
-    } else {
-        /** @li Call Trick::Thread::set_thread_process_type with the proces_type if the thread exists  */
-        threads[thread_id]->set_priority(req_priority) ;
-    }
+				/**	@par	Detailed	Design	*/
+				if	(	(thread_id	+	1)	>	threads.size()	)	{
+								/**	@li	If	the	thread_id	does	not	exist,	return	an	error	*/
+								ret	=	-2	;
+				}	else	{
+								/**	@li	Call	Trick::Thread::set_thread_process_type	with	the	proces_type	if	the	thread	exists		*/
+								threads[thread_id]->set_priority(req_priority)	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp b/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp
index 7271ff03d..b8e14b324 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_process_type.cpp
@@ -1,25 +1,25 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::set_thread_process_type(unsigned int thread_id , int process_type) {
+int	Trick::Executive::set_thread_process_type(unsigned	int	thread_id	,	int	process_type)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    if ( thread_id == 0 ) {
-        /** @li If the thread_id matches the main thread, that is an error */
-        ret = -2 ;
-    } else if ( (thread_id +1) > threads.size() ) {
-        /** @li If the thread_id does not exist, return an error */
-        ret = -2 ;
-    } else {
-        /** @li Call Trick::Thread::set_thread_process_type with the proces_type if the thread exists  */
-        ret = threads[thread_id]->set_process_type(process_type) ;
-    }
+				/**	@par	Detailed	Design	*/
+				if	(	thread_id	==	0	)	{
+								/**	@li	If	the	thread_id	matches	the	main	thread,	that	is	an	error	*/
+								ret	=	-2	;
+				}	else	if	(	(thread_id	+1)	>	threads.size()	)	{
+								/**	@li	If	the	thread_id	does	not	exist,	return	an	error	*/
+								ret	=	-2	;
+				}	else	{
+								/**	@li	Call	Trick::Thread::set_thread_process_type	with	the	proces_type	if	the	thread	exists		*/
+								ret	=	threads[thread_id]->set_process_type(process_type)	;
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp b/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp
index bbc03fda3..d8347cb4e 100644
--- a/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_thread_rt_semaphore.cpp
@@ -1,12 +1,12 @@
 
-#include "trick/Executive.hh"
-#include "trick/message_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/message_proto.h"
 
-int Trick::Executive::set_thread_rt_semaphores(unsigned int thread_id , bool yes_no) {
-    (void)thread_id ;
-    (void)yes_no ;
-    message_publish(MSG_WARNING, "set_thread_rt_semaphores has been deprecated\n"
-     "Use exec_get_thread(thread_id).set_trigger_type(Trick::ThreadTriggerType tt_type)") ;
-    return -1 ;
+int	Trick::Executive::set_thread_rt_semaphores(unsigned	int	thread_id	,	bool	yes_no)	{
+				(void)thread_id	;
+				(void)yes_no	;
+				message_publish(MSG_WARNING,	"set_thread_rt_semaphores	has	been	deprecated\n"
+					"Use	exec_get_thread(thread_id).set_trigger_type(Trick::ThreadTriggerType	tt_type)")	;
+				return	-1	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp b/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp
index 0806c78da..0e08e86c9 100644
--- a/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp
+++ b/trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp
@@ -1,71 +1,71 @@
 
-#include <iostream>
-#include <math.h>
-
-#include "trick/Executive.hh"
-#include "trick/TrickConstant.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-int Trick::Executive::set_time_tic_value(int in_tics) {
-
-    int ret ;
-    std::priority_queue< long long, std::vector< long long >, std::greater< long long > > new_freeze_times ;
-
-    old_time_tic_value = time_tic_value ;
-
-    time_tic_value = in_tics ;
-
-    // set the JobData copy of the new tic value
-    Trick::JobData::set_time_tic_value(in_tics) ;
-
-    /* reset time tics */
-    time_tics = (long long)round((double)time_tics / old_time_tic_value * time_tic_value) ;
-
-    /* reset software frames */
-    software_frame_tics = (long long)(software_frame * time_tic_value) ;
-    freeze_frame_tics = (long long)(freeze_frame * time_tic_value) ;
-
-    /* reset job times */
-    reset_job_cycle_times() ;
-    reset_job_call_times() ;
-
-    /* reset freeze times */
-    while ( ! freeze_times.empty() ) {
-        new_freeze_times.push( (long long)round((freeze_times.top() / old_time_tic_value ) * time_tic_value) ) ;
-        freeze_times.pop() ;
-    }
-    freeze_times = new_freeze_times ;
-
-    if ( freeze_job != NULL ) {
-        if ( freeze_job->next_tics != TRICK_MAX_LONG_LONG ) {
-            freeze_job->next_tics =  (long long)round((freeze_job->next_tics / old_time_tic_value) * time_tic_value) ;
-        }
-    }
-
-    /* reset stop time */
-    if ( terminate_time != TRICK_MAX_LONG_LONG-1 ) {
-        terminate_time = (long long)round((terminate_time / old_time_tic_value) * time_tic_value) ;
-    }
-
-    /* call jobs for other objects that need to know the time_tic changed. */
-    time_tic_changed_queue.reset_curr_index() ;
-    /* job pointer for each job in time_tic_changed_queue */
-    JobData* next_job;
-    while ( (next_job = time_tic_changed_queue.get_next_job()) != NULL ) {
-        ret = next_job->call() ;
-        if ( ret != 0 ) {
-            message_publish(MSG_ERROR, "ERROR: time_tic_changed job: %s FAILED.\n", curr_job->name.c_str()) ;
-            return(ret) ;
-        }
-    }
-
-    // reset the thread cycle times
-    unsigned int ii ;
-    for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-        threads[ii]->time_tic_changed(old_time_tic_value , time_tic_value) ;
-    }
-
-    return(0) ;
+#include	<iostream>
+#include	<math.h>
+
+#include	"trick/Executive.hh"
+#include	"trick/TrickConstant.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+int	Trick::Executive::set_time_tic_value(int	in_tics)	{
+
+				int	ret	;
+				std::priority_queue<	long	long,	std::vector<	long	long	>,	std::greater<	long	long	>	>	new_freeze_times	;
+
+				old_time_tic_value	=	time_tic_value	;
+
+				time_tic_value	=	in_tics	;
+
+				//	set	the	JobData	copy	of	the	new	tic	value
+				Trick::JobData::set_time_tic_value(in_tics)	;
+
+				/*	reset	time	tics	*/
+				time_tics	=	(long	long)round((double)time_tics	/	old_time_tic_value	*	time_tic_value)	;
+
+				/*	reset	software	frames	*/
+				software_frame_tics	=	(long	long)(software_frame	*	time_tic_value)	;
+				freeze_frame_tics	=	(long	long)(freeze_frame	*	time_tic_value)	;
+
+				/*	reset	job	times	*/
+				reset_job_cycle_times()	;
+				reset_job_call_times()	;
+
+				/*	reset	freeze	times	*/
+				while	(	!	freeze_times.empty()	)	{
+								new_freeze_times.push(	(long	long)round((freeze_times.top()	/	old_time_tic_value	)	*	time_tic_value)	)	;
+								freeze_times.pop()	;
+				}
+				freeze_times	=	new_freeze_times	;
+
+				if	(	freeze_job	!=	NULL	)	{
+								if	(	freeze_job->next_tics	!=	TRICK_MAX_LONG_LONG	)	{
+												freeze_job->next_tics	=		(long	long)round((freeze_job->next_tics	/	old_time_tic_value)	*	time_tic_value)	;
+								}
+				}
+
+				/*	reset	stop	time	*/
+				if	(	terminate_time	!=	TRICK_MAX_LONG_LONG-1	)	{
+								terminate_time	=	(long	long)round((terminate_time	/	old_time_tic_value)	*	time_tic_value)	;
+				}
+
+				/*	call	jobs	for	other	objects	that	need	to	know	the	time_tic	changed.	*/
+				time_tic_changed_queue.reset_curr_index()	;
+				/*	job	pointer	for	each	job	in	time_tic_changed_queue	*/
+				JobData*	next_job;
+				while	(	(next_job	=	time_tic_changed_queue.get_next_job())	!=	NULL	)	{
+								ret	=	next_job->call()	;
+								if	(	ret	!=	0	)	{
+												message_publish(MSG_ERROR,	"ERROR:	time_tic_changed	job:	%s	FAILED.\n",	curr_job->name.c_str())	;
+												return(ret)	;
+								}
+				}
+
+				//	reset	the	thread	cycle	times
+				unsigned	int	ii	;
+				for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+								threads[ii]->time_tic_changed(old_time_tic_value	,	time_tic_value)	;
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_shutdown.cpp b/trick_source/sim_services/Executive/Executive_shutdown.cpp
index 94fcdbf6f..41ff914a4 100644
--- a/trick_source/sim_services/Executive/Executive_shutdown.cpp
+++ b/trick_source/sim_services/Executive/Executive_shutdown.cpp
@@ -1,158 +1,158 @@
 /*
-   PURPOSE: (Graceful Simulation termination with timing data output.)
-
-   PROGRAMMERS:
-     (((Robert W. Bailey) (LinCom) (Feb 1991) (v1.0) (Initial Release.))
-      ((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime clock))
-      ((Scott Killingsworth) (LinCom) (September 1997) (--) (Issue #1016)))
- */
-
-#include <stdlib.h>
-#include <fcntl.h>
-#include <iomanip>
-#include <iostream>
-#include <sys/resource.h>
-
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/release.h"
-#include "trick/SysThread.hh"
-#include "trick/VariableServer.hh"
-extern Trick::VariableServer * the_vs ;
+			PURPOSE:	(Graceful	Simulation	termination	with	timing	data	output.)
+
+			PROGRAMMERS:
+					(((Robert	W.	Bailey)	(LinCom)	(Feb	1991)	(v1.0)	(Initial	Release.))
+						((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime	clock))
+						((Scott	Killingsworth)	(LinCom)	(September	1997)	(--)	(Issue	#1016)))
+	*/
+
+#include	<stdlib.h>
+#include	<fcntl.h>
+#include	<iomanip>
+#include	<iostream>
+#include	<sys/resource.h>
+
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/release.h"
+#include	"trick/SysThread.hh"
+#include	"trick/VariableServer.hh"
+extern	Trick::VariableServer	*	the_vs	;
 
 /**
 @design
--# Set the mode to Exit.
-   Requirement  [@ref r_exec_mode_3]
--# Wait for asynchronous or AMF threads to complete if the user has specified to do so
--# The scheduler calls shutdown jobs
-   Requirement  [@ref r_exec_discrete_4]
--# If an exception is caught during calling the shutdown jobs the exception is ignored as we are already terminating.
--# The scheduler prints a simulation shutdown message
--# The scheduler kills all child threads
--# Return the exception_return value.  (Set to 0 if no exception thrown.)
+-#	Set	the	mode	to	Exit.
+			Requirement		[@ref	r_exec_mode_3]
+-#	Wait	for	asynchronous	or	AMF	threads	to	complete	if	the	user	has	specified	to	do	so
+-#	The	scheduler	calls	shutdown	jobs
+			Requirement		[@ref	r_exec_discrete_4]
+-#	If	an	exception	is	caught	during	calling	the	shutdown	jobs	the	exception	is	ignored	as	we	are	already	terminating.
+-#	The	scheduler	prints	a	simulation	shutdown	message
+-#	The	scheduler	kills	all	child	threads
+-#	Return	the	exception_return	value.		(Set	to	0	if	no	exception	thrown.)
 */
-int Trick::Executive::shutdown() {
-
-    double sim_elapsed_time;
-    double cpu_time;
-    double user_cpu_time, kernal_cpu_time;
-    double sim_to_cpu;
-    unsigned int ii;
-    int process_id = 0 ;
-    struct rusage cpu_usage_buf ;
-    double sim_mem;
-    long v_context_switch_run, iv_context_switch_run;
-
-    SIM_MODE prev_mode = mode ;
-
-    /* Set mode to ExitMode. */
-    mode = ExitMode;
-
-    /*  If we made it past initialization */
-    if ( prev_mode != Initialization ) {
-        /* Wait for asynchronous threads to complete if the user has specified to wait. */
-        for (ii = 1; ii < threads.size() ; ii++) {
-        	if ( (threads[ii]->process_type == Trick::PROCESS_TYPE_ASYNC_CHILD || threads[ii]->process_type == Trick::PROCESS_TYPE_AMF_CHILD) && threads[ii]->shutdown_wait_async ) {
-                message_publish(MSG_INFO, "Waiting for asynchronous or AMF thread %d to finish\n", ii ) ;
-                while (threads[ii]->child_complete == false) {
-                    RELEASE_1();
-                }
-            }
-        }
-    }
-
-    /* Stop new connections to the Variable Server. */
-    the_vs->shutdownConnections();
-
-    try {
-
-        /* Call the shutdown jobs. */
-        if (initialization_complete == true) {
-            shutdown_queue.reset_curr_index() ;
-            while ( (curr_job = shutdown_queue.get_next_job()) != NULL ) {
-                curr_job->call() ;
-            }
-        }
-    } catch (Trick::ExecutiveException & ex ) {
-        /* Handle exception type Trick::ExecutiveException.  Set the file name and error message.
-           Return the exception return code. */
-        except_return = ex.ret_code ;
-        except_file += std::string(" then exception caught in ") + ex.file ;
-        except_message += std::string(" then exception Message: ") + ex.message ;
-    }
-
-    Trick::SysThread::ensureAllShutdown();
-
-    getrusage(RUSAGE_SELF, &cpu_usage_buf);
-    cpu_time = ((double) cpu_usage_buf.ru_utime.tv_sec) + ((double) cpu_usage_buf.ru_utime.tv_usec / 1000000.0);
-    
-    /* Get memory usage in MB for the calling process. Note that ru_maxrss returns long value in bytes on Mac and kilobytes on Linux. */
-    #if __APPLE__ 
-        sim_mem = (double)cpu_usage_buf.ru_maxrss / (1024 * 1024);
-    #else 
-        sim_mem = (double)cpu_usage_buf.ru_maxrss / 1024;
-    #endif
-
-    /* Calculate simulation elapsed sim time and actual cpu time */
-    sim_elapsed_time = get_sim_time() - sim_start;
-    user_cpu_time = cpu_time - user_cpu_start;
-
-    /* */
-    cpu_time = ((double) cpu_usage_buf.ru_stime.tv_sec) + ((double) cpu_usage_buf.ru_stime.tv_usec / 1000000.0);
-    kernal_cpu_time = cpu_time - kernal_cpu_start;
-
-    if ((user_cpu_time + kernal_cpu_time) <= 1e-6) {
-        sim_to_cpu = 1e8;
-    } else {
-        sim_to_cpu = sim_elapsed_time / (user_cpu_time + kernal_cpu_time);
-    }
-
-    /* Calculate voluntary and involuntary context switch usage during run */
-    v_context_switch_run = cpu_usage_buf.ru_nvcsw - v_context_switch_init ;
-    iv_context_switch_run = cpu_usage_buf.ru_nivcsw - iv_context_switch_init ;
-
-    /* Print a shutdown message. */
-    message_publish(MSG_NORMAL , "\n"
-            "SIMULATION TERMINATED IN\n"
-            "  PROCESS: %d\n"
-            "  ROUTINE: %s\n"
-            "  DIAGNOSTIC: %s\n\n"
-            "              SIMULATION START TIME: %12.3f\n"
-            "               SIMULATION STOP TIME: %12.3f\n"
-            "            SIMULATION ELAPSED TIME: %12.3f\n"
-            "                 USER CPU TIME USED: %12.3f\n"
-            "               SYSTEM CPU TIME USED: %12.3f\n"
-            "              SIMULATION / CPU TIME: %12.3f\n"
-            "       INITIALIZATION USER CPU TIME: %12.3f\n"
-            "     INITIALIZATION SYSTEM CPU TIME: %12.3f\n"
-            "               SIMULATION RAM USAGE: %12.3fMB\n"
-            "      (External program RAM usage not included!)\n"
-            "  VOLUNTARY CONTEXT SWITCHES (INIT): %12ld\n"
-            "INVOLUNTARY CONTEXT SWITCHES (INIT): %12ld\n"
-            "   VOLUNTARY CONTEXT SWITCHES (RUN): %12ld\n"
-            " INVOLUNTARY CONTEXT SWITCHES (RUN): %12ld\n\n",
-            process_id, except_file.c_str(), except_message.c_str(),
-            sim_start, get_sim_time(), sim_elapsed_time, 
-            user_cpu_time, kernal_cpu_time, sim_to_cpu, 
-            user_cpu_init, kernal_cpu_init, sim_mem,
-            v_context_switch_init, iv_context_switch_init,
-            v_context_switch_run, iv_context_switch_run) ;
-
-    /* Kill all threads. */
-    for (ii = 1; ii < threads.size() ; ii++) {
-        if ( threads[ii]->running ) {
-            pthread_cancel(threads[ii]->get_pthread_id()) ;
-        }
-#if ! ( __APPLE__ || __CYGWIN__ || __Lynx__ )
-        // Even Linux is hanging on this call right now... hmmm.
-        //pthread_join(threads[ii]->thread_id, (void **) NULL);
+int	Trick::Executive::shutdown()	{
+
+				double	sim_elapsed_time;
+				double	cpu_time;
+				double	user_cpu_time,	kernal_cpu_time;
+				double	sim_to_cpu;
+				unsigned	int	ii;
+				int	process_id	=	0	;
+				struct	rusage	cpu_usage_buf	;
+				double	sim_mem;
+				long	v_context_switch_run,	iv_context_switch_run;
+
+				SIM_MODE	prev_mode	=	mode	;
+
+				/*	Set	mode	to	ExitMode.	*/
+				mode	=	ExitMode;
+
+				/*		If	we	made	it	past	initialization	*/
+				if	(	prev_mode	!=	Initialization	)	{
+								/*	Wait	for	asynchronous	threads	to	complete	if	the	user	has	specified	to	wait.	*/
+								for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+									if	(	(threads[ii]->process_type	==	Trick::PROCESS_TYPE_ASYNC_CHILD	||	threads[ii]->process_type	==	Trick::PROCESS_TYPE_AMF_CHILD)	&&	threads[ii]->shutdown_wait_async	)	{
+																message_publish(MSG_INFO,	"Waiting	for	asynchronous	or	AMF	thread	%d	to	finish\n",	ii	)	;
+																while	(threads[ii]->child_complete	==	false)	{
+																				RELEASE_1();
+																}
+												}
+								}
+				}
+
+				/*	Stop	new	connections	to	the	Variable	Server.	*/
+				the_vs->shutdownConnections();
+
+				try	{
+
+								/*	Call	the	shutdown	jobs.	*/
+								if	(initialization_complete	==	true)	{
+												shutdown_queue.reset_curr_index()	;
+												while	(	(curr_job	=	shutdown_queue.get_next_job())	!=	NULL	)	{
+																curr_job->call()	;
+												}
+								}
+				}	catch	(Trick::ExecutiveException	&	ex	)	{
+								/*	Handle	exception	type	Trick::ExecutiveException.		Set	the	file	name	and	error	message.
+											Return	the	exception	return	code.	*/
+								except_return	=	ex.ret_code	;
+								except_file	+=	std::string("	then	exception	caught	in	")	+	ex.file	;
+								except_message	+=	std::string("	then	exception	Message:	")	+	ex.message	;
+				}
+
+				Trick::SysThread::ensureAllShutdown();
+
+				getrusage(RUSAGE_SELF,	&cpu_usage_buf);
+				cpu_time	=	((double)	cpu_usage_buf.ru_utime.tv_sec)	+	((double)	cpu_usage_buf.ru_utime.tv_usec	/	1000000.0);
+				
+				/*	Get	memory	usage	in	MB	for	the	calling	process.	Note	that	ru_maxrss	returns	long	value	in	bytes	on	Mac	and	kilobytes	on	Linux.	*/
+				#if	__APPLE__	
+								sim_mem	=	(double)cpu_usage_buf.ru_maxrss	/	(1024	*	1024);
+				#else	
+								sim_mem	=	(double)cpu_usage_buf.ru_maxrss	/	1024;
+				#endif
+
+				/*	Calculate	simulation	elapsed	sim	time	and	actual	cpu	time	*/
+				sim_elapsed_time	=	get_sim_time()	-	sim_start;
+				user_cpu_time	=	cpu_time	-	user_cpu_start;
+
+				/*	*/
+				cpu_time	=	((double)	cpu_usage_buf.ru_stime.tv_sec)	+	((double)	cpu_usage_buf.ru_stime.tv_usec	/	1000000.0);
+				kernal_cpu_time	=	cpu_time	-	kernal_cpu_start;
+
+				if	((user_cpu_time	+	kernal_cpu_time)	<=	1e-6)	{
+								sim_to_cpu	=	1e8;
+				}	else	{
+								sim_to_cpu	=	sim_elapsed_time	/	(user_cpu_time	+	kernal_cpu_time);
+				}
+
+				/*	Calculate	voluntary	and	involuntary	context	switch	usage	during	run	*/
+				v_context_switch_run	=	cpu_usage_buf.ru_nvcsw	-	v_context_switch_init	;
+				iv_context_switch_run	=	cpu_usage_buf.ru_nivcsw	-	iv_context_switch_init	;
+
+				/*	Print	a	shutdown	message.	*/
+				message_publish(MSG_NORMAL	,	"\n"
+												"SIMULATION	TERMINATED	IN\n"
+												"		PROCESS:	%d\n"
+												"		ROUTINE:	%s\n"
+												"		DIAGNOSTIC:	%s\n\n"
+												"														SIMULATION	START	TIME:	%12.3f\n"
+												"															SIMULATION	STOP	TIME:	%12.3f\n"
+												"												SIMULATION	ELAPSED	TIME:	%12.3f\n"
+												"																	USER	CPU	TIME	USED:	%12.3f\n"
+												"															SYSTEM	CPU	TIME	USED:	%12.3f\n"
+												"														SIMULATION	/	CPU	TIME:	%12.3f\n"
+												"							INITIALIZATION	USER	CPU	TIME:	%12.3f\n"
+												"					INITIALIZATION	SYSTEM	CPU	TIME:	%12.3f\n"
+												"															SIMULATION	RAM	USAGE:	%12.3fMB\n"
+												"						(External	program	RAM	usage	not	included!)\n"
+												"		VOLUNTARY	CONTEXT	SWITCHES	(INIT):	%12ld\n"
+												"INVOLUNTARY	CONTEXT	SWITCHES	(INIT):	%12ld\n"
+												"			VOLUNTARY	CONTEXT	SWITCHES	(RUN):	%12ld\n"
+												"	INVOLUNTARY	CONTEXT	SWITCHES	(RUN):	%12ld\n\n",
+												process_id,	except_file.c_str(),	except_message.c_str(),
+												sim_start,	get_sim_time(),	sim_elapsed_time,	
+												user_cpu_time,	kernal_cpu_time,	sim_to_cpu,	
+												user_cpu_init,	kernal_cpu_init,	sim_mem,
+												v_context_switch_init,	iv_context_switch_init,
+												v_context_switch_run,	iv_context_switch_run)	;
+
+				/*	Kill	all	threads.	*/
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								if	(	threads[ii]->running	)	{
+												pthread_cancel(threads[ii]->get_pthread_id())	;
+								}
+#if	!	(	__APPLE__	||	__CYGWIN__	||	__Lynx__	)
+								//	Even	Linux	is	hanging	on	this	call	right	now...	hmmm.
+								//pthread_join(threads[ii]->thread_id,	(void	**)	NULL);
 #endif
-    }
+				}
 
-    /* Return the exception_return value.  This defaults to 0 if no exceptions were thrown. */
-    return(except_return) ;
+				/*	Return	the	exception_return	value.		This	defaults	to	0	if	no	exceptions	were	thrown.	*/
+				return(except_return)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_signal_handler.cpp b/trick_source/sim_services/Executive/Executive_signal_handler.cpp
index 0ad3d5278..3783549cd 100644
--- a/trick_source/sim_services/Executive/Executive_signal_handler.cpp
+++ b/trick_source/sim_services/Executive/Executive_signal_handler.cpp
@@ -1,156 +1,156 @@
 /*
-   PURPOSE: (This function switches on signal type to act on specific signal. This function performs the signal
-   handling for both master and child processes.)
+			PURPOSE:	(This	function	switches	on	signal	type	to	act	on	specific	signal.	This	function	performs	the	signal
+			handling	for	both	master	and	child	processes.)
 
-   REFERENCE: (((Bailey, R.W, and Paddock, E.J.) (Trick Simulation Environment) (NASA:JSC #37943) (JSC / Engineering
-   Directorate / Automation and Robotics Division) (June 1994) (--)))
+			REFERENCE:	(((Bailey,	R.W,	and	Paddock,	E.J.)	(Trick	Simulation	Environment)	(NASA:JSC	#37943)	(JSC	/	Engineering
+			Directorate	/	Automation	and	Robotics	Division)	(June	1994)	(--)))
 
-   ASSUMPTIONS AND LIMITATIONS: ((None))
+			ASSUMPTIONS	AND	LIMITATIONS:	((None))
 
-   CLASS: (N/A)
+			CLASS:	(N/A)
 
-   LIBRARY DEPENDENCY: ((none))
+			LIBRARY	DEPENDENCY:	((none))
 
-   PROGRAMMERS: (((Eddie J. Paddock) (MDSSC) (April 1992) (--) (Realtime)) ((Scott Killingsworth) (LinCom) (September
-   1997) (--) (Issue #1016))) */
+			PROGRAMMERS:	(((Eddie	J.	Paddock)	(MDSSC)	(April	1992)	(--)	(Realtime))	((Scott	Killingsworth)	(LinCom)	(September
+			1997)	(--)	(Issue	#1016)))	*/
 
-#include <stdlib.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <unistd.h>
+#include	<stdlib.h>
+#include	<signal.h>
+#include	<setjmp.h>
+#include	<unistd.h>
 
-#ifdef __APPLE__
-#include <mach-o/dyld.h>
-#include <execinfo.h>
+#ifdef	__APPLE__
+#include	<mach-o/dyld.h>
+#include	<execinfo.h>
 #endif
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
 /**
 @design
--# This signal handler processes SIGBUS and SIGSEGV
--# Write a message to stderr that a signal has been caught.
--# If attach_debugger == true, attempt to attach a debugger to the current process.
--# Else if stack_trace == true, attempt to attach a debugger to print a stack trace.
--# Exit the process with a -2 return.
+-#	This	signal	handler	processes	SIGBUS	and	SIGSEGV
+-#	Write	a	message	to	stderr	that	a	signal	has	been	caught.
+-#	If	attach_debugger	==	true,	attempt	to	attach	a	debugger	to	the	current	process.
+-#	Else	if	stack_trace	==	true,	attempt	to	attach	a	debugger	to	print	a	stack	trace.
+-#	Exit	the	process	with	a	-2	return.
 */
 
-void Trick::Executive::signal_handler(int sig) {
-
-    // print a message to stderr. Use the write function because it is async signal safe.
-    write( 2 , "\033[31mProcess terminated by signal " , 34 ) ;
-    switch (sig) {
-        case SIGBUS:                  /* Bus error */
-            write( 2 , "SIGBUS" , 6 ) ;
-            break;
-        case SIGSEGV:                 /* Segmentation fault */
-            write( 2 , "SIGSEGV" , 7 ) ;
-            break;
-        case SIGABRT:                 /* Abort */
-            write( 2 , "SIGABRT" , 7 ) ;
-            break;
-        default:                      /* Unrecognized signal */
-            write( 2 , "unknown" , 7 ) ;
-            break;
-    }
-    write( 2 , "\033[0m\n" , 5 ) ;
-
-    /**********************************************************************
-     * Attempt to attach with debugger or print stack trace.  Not a requirement.
-     * sprintf and system are not async signal safe, but we don't have anything to lose.
-     */
-    if ( ! debugger_command.empty() ) {
-#if __linux
-        char command[1024];
-        if (attach_debugger == true) {
-            snprintf(command, sizeof(command), "%s -silent /proc/%d/exe %d", debugger_command.c_str(), getpid(), getpid());
-            system(command);
-        } else if (stack_trace == true ) {
-            snprintf(command, sizeof(command), "%s -silent -batch -x ${TRICK_HOME}/share/trick/gdb_commands "
-                    "/proc/%d/exe %d", debugger_command.c_str(), getpid(), getpid());
-            system(command);
-        }
+void	Trick::Executive::signal_handler(int	sig)	{
+
+				//	print	a	message	to	stderr.	Use	the	write	function	because	it	is	async	signal	safe.
+				write(	2	,	"\033[31mProcess	terminated	by	signal	"	,	34	)	;
+				switch	(sig)	{
+								case	SIGBUS:																		/*	Bus	error	*/
+												write(	2	,	"SIGBUS"	,	6	)	;
+												break;
+								case	SIGSEGV:																	/*	Segmentation	fault	*/
+												write(	2	,	"SIGSEGV"	,	7	)	;
+												break;
+								case	SIGABRT:																	/*	Abort	*/
+												write(	2	,	"SIGABRT"	,	7	)	;
+												break;
+								default:																						/*	Unrecognized	signal	*/
+												write(	2	,	"unknown"	,	7	)	;
+												break;
+				}
+				write(	2	,	"\033[0m\n"	,	5	)	;
+
+				/**********************************************************************
+					*	Attempt	to	attach	with	debugger	or	print	stack	trace.		Not	a	requirement.
+					*	sprintf	and	system	are	not	async	signal	safe,	but	we	don't	have	anything	to	lose.
+					*/
+				if	(	!	debugger_command.empty()	)	{
+#if	__linux
+								char	command[1024];
+								if	(attach_debugger	==	true)	{
+												snprintf(command,	sizeof(command),	"%s	-silent	/proc/%d/exe	%d",	debugger_command.c_str(),	getpid(),	getpid());
+												system(command);
+								}	else	if	(stack_trace	==	true	)	{
+												snprintf(command,	sizeof(command),	"%s	-silent	-batch	-x	${TRICK_HOME}/share/trick/gdb_commands	"
+																				"/proc/%d/exe	%d",	debugger_command.c_str(),	getpid(),	getpid());
+												system(command);
+								}
 //=========================================================================================`
-#elif __APPLE__
-        char command[2048];
-        char path[1024] ;
-        uint32_t size = sizeof(path) ;
-        if (_NSGetExecutablePath(path, &size) == 0 ) {
-            if (attach_debugger == true) {
-                snprintf(command, sizeof(command),
-                "NOTICE!! An instance of LLDB is started and keeping your simulation\n"
-                "executable suspended. LLDB has not, and cannot attach to your simulation\n"
-                "(i.e., its parent process) without it and your sim being killed\n"
-                "by Apple's `System Integrity Protection` (SIP) (presumably for security\n"
-                "reasons). You may be able to attach LLDB to your suspended simulation\n"
-                "from a different terminal (an independent process) with: $ lldb -p %d \n\n", getpid());
-                write( 2, command, strlen(command));
-                snprintf(command, sizeof(command),
-                "Note that this may also require the apppropriate `elevated privileges` or that\n"
-                "your sim executable is code signed (using Apple's codesign utility.)\n");
-                write( 2, command, strlen(command));
-                snprintf(command, sizeof(command), "%s", debugger_command.c_str());
-                system(command);
-            } else if (stack_trace == true ) {
-                write( 2 , "=============\n" , 14 ) ;
-                write( 2 , " STACK TRACE \n" , 14 ) ;
-                write( 2 , "=============\n" , 14 ) ;
-                void* callstack[128];
-                int frames = backtrace(callstack, 128);
-                backtrace_symbols_fd(callstack, frames, 2); // 1 = stdout 2 = stderr
-            }
-        }
+#elif	__APPLE__
+								char	command[2048];
+								char	path[1024]	;
+								uint32_t	size	=	sizeof(path)	;
+								if	(_NSGetExecutablePath(path,	&size)	==	0	)	{
+												if	(attach_debugger	==	true)	{
+																snprintf(command,	sizeof(command),
+																"NOTICE!!	An	instance	of	LLDB	is	started	and	keeping	your	simulation\n"
+																"executable	suspended.	LLDB	has	not,	and	cannot	attach	to	your	simulation\n"
+																"(i.e.,	its	parent	process)	without	it	and	your	sim	being	killed\n"
+																"by	Apple's	`System	Integrity	Protection`	(SIP)	(presumably	for	security\n"
+																"reasons).	You	may	be	able	to	attach	LLDB	to	your	suspended	simulation\n"
+																"from	a	different	terminal	(an	independent	process)	with:	$	lldb	-p	%d	\n\n",	getpid());
+																write(	2,	command,	strlen(command));
+																snprintf(command,	sizeof(command),
+																"Note	that	this	may	also	require	the	apppropriate	`elevated	privileges`	or	that\n"
+																"your	sim	executable	is	code	signed	(using	Apple's	codesign	utility.)\n");
+																write(	2,	command,	strlen(command));
+																snprintf(command,	sizeof(command),	"%s",	debugger_command.c_str());
+																system(command);
+												}	else	if	(stack_trace	==	true	)	{
+																write(	2	,	"=============\n"	,	14	)	;
+																write(	2	,	"	STACK	TRACE	\n"	,	14	)	;
+																write(	2	,	"=============\n"	,	14	)	;
+																void*	callstack[128];
+																int	frames	=	backtrace(callstack,	128);
+																backtrace_symbols_fd(callstack,	frames,	2);	//	1	=	stdout	2	=	stderr
+												}
+								}
 //=========================================================================================
 #endif
-    }
+				}
 
-    // Sim state is unknown, don't return from handler.
-    _exit(sig) ;
+				//	Sim	state	is	unknown,	don't	return	from	handler.
+				_exit(sig)	;
 }
 
 /**
 @design
--# If enable_freeze == true toggle the mode between run/freeze. Design [@ref d_exec_signal_0]
--# Else if this the first time a <CTRL-C> is handled set the exec_command to ExitCmd.
--# If a graceful shutdown has been tried then write an exit message and exit.
+-#	If	enable_freeze	==	true	toggle	the	mode	between	run/freeze.	Design	[@ref	d_exec_signal_0]
+-#	Else	if	this	the	first	time	a	<CTRL-C>	is	handled	set	the	exec_command	to	ExitCmd.
+-#	If	a	graceful	shutdown	has	been	tried	then	write	an	exit	message	and	exit.
 */
-void Trick::Executive::ctrl_c_handler() {
-    static bool graceful_shutdown_tried = false ;
-
-    /* if enable_freeze == true toggle the mode between run/freeze. */
-    if (enable_freeze == true) {
-        if ( mode == Run) {
-            exec_command = FreezeCmd ;
-        } else {
-            exec_command = RunCmd ;
-        }
-    } else if ( graceful_shutdown_tried == false ) {
-        write( 2 , "\033[31mSetting exec_command = ExitCmd to shutdown simulation.\nIf process still unresponsive, type <CTRL-C> again for immediate exit.\033[0m\n" , 135 ) ;
-        exec_command = ExitCmd ;
-        graceful_shutdown_tried = true ;
-    } else {
-        write( 2 , "\033[31mProcess terminated by signal SIGINT <CTRL-C>\033[0m\n" , 54 ) ;
-        _exit(SIGINT) ;
-    }
+void	Trick::Executive::ctrl_c_handler()	{
+				static	bool	graceful_shutdown_tried	=	false	;
+
+				/*	if	enable_freeze	==	true	toggle	the	mode	between	run/freeze.	*/
+				if	(enable_freeze	==	true)	{
+								if	(	mode	==	Run)	{
+												exec_command	=	FreezeCmd	;
+								}	else	{
+												exec_command	=	RunCmd	;
+								}
+				}	else	if	(	graceful_shutdown_tried	==	false	)	{
+								write(	2	,	"\033[31mSetting	exec_command	=	ExitCmd	to	shutdown	simulation.\nIf	process	still	unresponsive,	type	<CTRL-C>	again	for	immediate	exit.\033[0m\n"	,	135	)	;
+								exec_command	=	ExitCmd	;
+								graceful_shutdown_tried	=	true	;
+				}	else	{
+								write(	2	,	"\033[31mProcess	terminated	by	signal	SIGINT	<CTRL-C>\033[0m\n"	,	54	)	;
+								_exit(SIGINT)	;
+				}
 }
 
 /**
 @design
--# Write an exit message
--# Exit the simulation immediately
+-#	Write	an	exit	message
+-#	Exit	the	simulation	immediately
 */
-void Trick::Executive::term_handler() {
-    write( 2 , "\033[31mProcess terminated by signal SIGTERM\033[0m\n" , 46 ) ;
-    _exit(SIGTERM) ;
+void	Trick::Executive::term_handler()	{
+				write(	2	,	"\033[31mProcess	terminated	by	signal	SIGTERM\033[0m\n"	,	46	)	;
+				_exit(SIGTERM)	;
 }
 
 /**
 @design
--# Write an exit message
--# Exit the simulation immediately
+-#	Write	an	exit	message
+-#	Exit	the	simulation	immediately
 */
-void Trick::Executive::usr1_handler() {
-    write( 2 , "\033[31mProcess terminated by call to exec_signal_terminate()\033[0m\n" , 63 ) ;
-    _exit(SIGUSR1) ;
+void	Trick::Executive::usr1_handler()	{
+				write(	2	,	"\033[31mProcess	terminated	by	call	to	exec_signal_terminate()\033[0m\n"	,	63	)	;
+				_exit(SIGUSR1)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_stop.cpp b/trick_source/sim_services/Executive/Executive_stop.cpp
index faa4dadaa..a74f7fcfd 100644
--- a/trick_source/sim_services/Executive/Executive_stop.cpp
+++ b/trick_source/sim_services/Executive/Executive_stop.cpp
@@ -1,25 +1,25 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
+#include	"trick/Executive.hh"
 
-int Trick::Executive::stop() {
+int	Trick::Executive::stop()	{
 
-    /** @par Detailed Design */
-    /** @li Set exec_command to ExitCmd.  Requirement [@ref r_exec_mode_4] */
-    exec_command = ExitCmd ;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Set	exec_command	to	ExitCmd.		Requirement	[@ref	r_exec_mode_4]	*/
+				exec_command	=	ExitCmd	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::Executive::stop(double in_time) {
+int	Trick::Executive::stop(double	in_time)	{
 
-    /** @par Detailed Design */
-    /** @li Set exec_command to ExitCmd.  Requirement [@ref r_exec_mode_4] */
-    set_terminate_time(in_time) ;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Set	exec_command	to	ExitCmd.		Requirement	[@ref	r_exec_mode_4]	*/
+				set_terminate_time(in_time)	;
 
-    return(0) ;
+				return(0)	;
 
 }
diff --git a/trick_source/sim_services/Executive/Executive_terminate.cpp b/trick_source/sim_services/Executive/Executive_terminate.cpp
index 9fcf44a38..8d2f6ece7 100644
--- a/trick_source/sim_services/Executive/Executive_terminate.cpp
+++ b/trick_source/sim_services/Executive/Executive_terminate.cpp
@@ -1,13 +1,13 @@
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/Executive.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
+#include	"trick/Executive.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
 
-int Trick::Executive::exec_terminate(const char *file_name, const char *error) {
-    exec_command = ExitCmd ;
-    throw Trick::ExecutiveException(-1 , file_name , 0 , error) ;
-    return -1 ;
+int	Trick::Executive::exec_terminate(const	char	*file_name,	const	char	*error)	{
+				exec_command	=	ExitCmd	;
+				throw	Trick::ExecutiveException(-1	,	file_name	,	0	,	error)	;
+				return	-1	;
 }
diff --git a/trick_source/sim_services/Executive/Executive_thread_sync.cpp b/trick_source/sim_services/Executive/Executive_thread_sync.cpp
index 79022d6c6..fb8c31120 100644
--- a/trick_source/sim_services/Executive/Executive_thread_sync.cpp
+++ b/trick_source/sim_services/Executive/Executive_thread_sync.cpp
@@ -1,64 +1,64 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/Executive.hh"
-#include "trick/release.h"
+#include	"trick/Executive.hh"
+#include	"trick/release.h"
 
 /**
 @design
--# Loop through all child threads
-   -# If the thread is asynchronous must finish and the next sync time matches the sim time
-      -# Wait for the thread to finish
-      -# Reset the thread queue of jobs
-      -# clear all job complete flags
-   -# If the thread is asynchronous and the thread is finished
-      -#  If the thread has a cycle time advance the next sync time beyond the current time
-          by multiples of the cycle time.
-      -# Reset the thread queue of jobs
-      -# clear all job complete flags
--# Set the job complete flag for all jobs on thread 0.
+-#	Loop	through	all	child	threads
+			-#	If	the	thread	is	asynchronous	must	finish	and	the	next	sync	time	matches	the	sim	time
+						-#	Wait	for	the	thread	to	finish
+						-#	Reset	the	thread	queue	of	jobs
+						-#	clear	all	job	complete	flags
+			-#	If	the	thread	is	asynchronous	and	the	thread	is	finished
+						-#		If	the	thread	has	a	cycle	time	advance	the	next	sync	time	beyond	the	current	time
+										by	multiples	of	the	cycle	time.
+						-#	Reset	the	thread	queue	of	jobs
+						-#	clear	all	job	complete	flags
+-#	Set	the	job	complete	flag	for	all	jobs	on	thread	0.
 */
 
-int Trick::Executive::thread_sync() {
+int	Trick::Executive::thread_sync()	{
 
-    unsigned int ii ;
+				unsigned	int	ii	;
 
-    /* Wait for async_must finish to complete at the current time_tics */
-    for (ii = 1; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        if ( (curr_thread->process_type == PROCESS_TYPE_AMF_CHILD) &&
-              (curr_thread->amf_next_tics == time_tics )) {
-            while (curr_thread->child_complete == false ) {
-                if (rt_nap == true) {
-                    RELEASE();
-                }
-            }
-        }
-        else if ( curr_thread->process_type == PROCESS_TYPE_ASYNC_CHILD ) {
-            if ( curr_thread->child_complete == true ) {
-                if (curr_thread->amf_cycle_tics != 0 ) {
-                    // catch up async next_tic time to a time greater than the time last pass
-                    while ( curr_thread->amf_next_tics < time_tics ) {
-                        curr_thread->amf_next_tics += curr_thread->amf_cycle_tics ;
-                    }
-                }
-            }
-        }
-    }
+				/*	Wait	for	async_must	finish	to	complete	at	the	current	time_tics	*/
+				for	(ii	=	1;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								if	(	(curr_thread->process_type	==	PROCESS_TYPE_AMF_CHILD)	&&
+														(curr_thread->amf_next_tics	==	time_tics	))	{
+												while	(curr_thread->child_complete	==	false	)	{
+																if	(rt_nap	==	true)	{
+																				RELEASE();
+																}
+												}
+								}
+								else	if	(	curr_thread->process_type	==	PROCESS_TYPE_ASYNC_CHILD	)	{
+												if	(	curr_thread->child_complete	==	true	)	{
+																if	(curr_thread->amf_cycle_tics	!=	0	)	{
+																				//	catch	up	async	next_tic	time	to	a	time	greater	than	the	time	last	pass
+																				while	(	curr_thread->amf_next_tics	<	time_tics	)	{
+																								curr_thread->amf_next_tics	+=	curr_thread->amf_cycle_tics	;
+																				}
+																}
+												}
+								}
+				}
 
-    /* Go through all of the job queues and mark all jobs that are to run this time step to not complete. */
-    for (ii = 0; ii < threads.size() ; ii++) {
-        Threads * curr_thread = threads[ii] ;
-        /* For all threads that are waiting to start the next cycle (child_complete == true)
-           reset job completion flags */
-        if ( isThreadReadyToRun(curr_thread, time_tics) ) {
-            curr_thread->job_queue.reset_curr_index();
-            while ( (curr_job = curr_thread->job_queue.find_job(time_tics)) != NULL ) {
-                curr_job->complete = false;
-            }
-        }
-    }
+				/*	Go	through	all	of	the	job	queues	and	mark	all	jobs	that	are	to	run	this	time	step	to	not	complete.	*/
+				for	(ii	=	0;	ii	<	threads.size()	;	ii++)	{
+								Threads	*	curr_thread	=	threads[ii]	;
+								/*	For	all	threads	that	are	waiting	to	start	the	next	cycle	(child_complete	==	true)
+											reset	job	completion	flags	*/
+								if	(	isThreadReadyToRun(curr_thread,	time_tics)	)	{
+												curr_thread->job_queue.reset_curr_index();
+												while	(	(curr_job	=	curr_thread->job_queue.find_job(time_tics))	!=	NULL	)	{
+																curr_job->complete	=	false;
+												}
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
index 14fa2f975..3811905e8 100644
--- a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
+++ b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp
@@ -1,135 +1,135 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sstream>
-
-#include "trick/Executive.hh"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<unistd.h>
+#include	<sys/stat.h>
+#include	<sstream>
+
+#include	"trick/Executive.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# If the incoming file pointer is NULL
-   -# Get the output directory
-   -# Get path to S_job_execution file as %<output directory%>/S_job_execution
-   -# Open the output file for writing
-   -# Return if the file could not be opened for writing
--# Write out the s_job_execution header open the S_job_execution file
--# Write default_data and initialization job entries to S_job_execution
--# Write scheduled job entries to S_job_execution
--# Write top_of_frame job entries to S_job_execution
--# Write end_of_frame job entries to S_job_execution
--# Write freeze_init, freeze, and unfreeze job entries to S_job_execution
--# Write shutdown job entries to S_job_execution
--# Call the write_s_job_execution job of any other schedulers registered with the executive.
+-#	If	the	incoming	file	pointer	is	NULL
+			-#	Get	the	output	directory
+			-#	Get	path	to	S_job_execution	file	as	%<output	directory%>/S_job_execution
+			-#	Open	the	output	file	for	writing
+			-#	Return	if	the	file	could	not	be	opened	for	writing
+-#	Write	out	the	s_job_execution	header	open	the	S_job_execution	file
+-#	Write	default_data	and	initialization	job	entries	to	S_job_execution
+-#	Write	scheduled	job	entries	to	S_job_execution
+-#	Write	top_of_frame	job	entries	to	S_job_execution
+-#	Write	end_of_frame	job	entries	to	S_job_execution
+-#	Write	freeze_init,	freeze,	and	unfreeze	job	entries	to	S_job_execution
+-#	Write	shutdown	job	entries	to	S_job_execution
+-#	Call	the	write_s_job_execution	job	of	any	other	schedulers	registered	with	the	executive.
 */
-int Trick::Executive::write_s_job_execution(FILE *fp) {
-
-    char buf[1024];
-    unsigned int ii ;
-    std::string output_dir ;
-
-    if ( fp == NULL ) {
-
-        /* Get full path to S_job_execution */
-        output_dir = command_line_args_get_output_dir() ;
-        snprintf(buf, sizeof(buf), "%s/S_job_execution", output_dir.c_str());
-
-        /* Create the output directory if it does not exist */
-        if (access(output_dir.c_str(), F_OK) != 0) {
-            if (mkdir(output_dir.c_str(), 0775) != 0) {
-                message_publish(MSG_ERROR, "Error while trying to create directory %s.\n", output_dir.c_str()) ;
-            return -1;
-            }
-        }
-
-        /* Open the S_job_execution file.  If it fails, it's not a fatal error, return 0. */
-        if ((fp = fopen(buf, "w")) == NULL) {
-            message_publish(MSG_ERROR, "Could not open %s/S_job_execution for writing\n", output_dir.c_str());
-            return (0) ;
-        }
-    }
-
-    fprintf(fp, "Executive time tic value (tics/second) information\n");
-    fprintf(fp, "    time tic value = %d\n\n", time_tic_value);
-
-    fprintf(fp, "Thread information\n");
-    for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-        std::stringstream oss ;
-        threads[ii]->dump(oss) ;
-        fprintf(fp,"%s", oss.str().c_str()) ;
-    }
-    fprintf(fp, "\n") ;
-
-    /* Write out the s_job_execution header open the S_job_execution file. */
-    fprintf(fp, "Job information\n");
-    fprintf(fp, "Enabled | PID |Class                    | Phase |  Start   |  Cycle   |   Stop   | ID  | Job Name\n");
-    fprintf(fp, "=================================================================================================\n") ;
-    fprintf(fp, "Initialization:\n") ;
-
-    /* Write default_data and initialization job entries to S_job_execution. */
-    default_data_queue.write_non_sched_queue(fp) ;
-    initialization_queue.write_non_sched_queue(fp) ;
-
-    /* Write scheduled job entries to S_job_execution. */
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "Scheduled Loop:\n\n") ;
-    for ( ii = 0 ; ii < threads.size() ; ii++ ) {
-        fprintf(fp, "Thread %u:\n", ii) ;
-        threads[ii]->job_queue.write_sched_queue(fp) ;
-        fprintf(fp, "\n") ;
-    }
-
-    /* Write top_of_frame job entries to S_job_execution. */
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "Top of Frame:\n\n") ;
-    fprintf(fp, "Thread 0:\n");
-    top_of_frame_queue.write_sched_queue(fp) ;
-    for ( ii = 1 ; ii < threads.size() ; ii++ ) {
-        fprintf(fp, "Thread %u:\n", ii) ;
-        threads[ii]->top_of_frame_queue.write_sched_queue(fp) ;
-        fprintf(fp, "\n") ;
-    }
-
-    /* Write end_of_frame job entries to S_job_execution. */
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "End of Frame:\n\n") ;
-    fprintf(fp, "Thread 0:\n");
-    end_of_frame_queue.write_sched_queue(fp) ;
-    for ( ii = 1 ; ii < threads.size() ; ii++ ) {
-        fprintf(fp, "Thread %u:\n", ii) ;
-        threads[ii]->end_of_frame_queue.write_sched_queue(fp) ;
-        fprintf(fp, "\n") ;
-    }
-
-    /* Write freeze_init, freeze, and unfreeze job entries to S_job_execution. */
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "Freeze Loop:\n") ;
-    freeze_init_queue.write_non_sched_queue(fp) ;
-    freeze_scheduled_queue.write_sched_queue(fp) ;
-    freeze_queue.write_non_sched_queue(fp) ;
-    unfreeze_queue.write_non_sched_queue(fp) ;
-
-    /* Write shutdown job entries to S_job_execution. */
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "Shutdown:\n") ;
-    shutdown_queue.write_non_sched_queue(fp) ;
-
-
-    /* Write entries from other schedulers  */
-    for ( ii = 0 ; ii < other_schedulers.size() ; ii++ ) {
-        other_schedulers[ii]->write_s_job_execution(fp) ;
-    }
-
-    fprintf(fp, "\n===================================================================================================\n") ;
-
-    fclose(fp);
-
-    return(0) ;
+int	Trick::Executive::write_s_job_execution(FILE	*fp)	{
+
+				char	buf[1024];
+				unsigned	int	ii	;
+				std::string	output_dir	;
+
+				if	(	fp	==	NULL	)	{
+
+								/*	Get	full	path	to	S_job_execution	*/
+								output_dir	=	command_line_args_get_output_dir()	;
+								snprintf(buf,	sizeof(buf),	"%s/S_job_execution",	output_dir.c_str());
+
+								/*	Create	the	output	directory	if	it	does	not	exist	*/
+								if	(access(output_dir.c_str(),	F_OK)	!=	0)	{
+												if	(mkdir(output_dir.c_str(),	0775)	!=	0)	{
+																message_publish(MSG_ERROR,	"Error	while	trying	to	create	directory	%s.\n",	output_dir.c_str())	;
+												return	-1;
+												}
+								}
+
+								/*	Open	the	S_job_execution	file.		If	it	fails,	it's	not	a	fatal	error,	return	0.	*/
+								if	((fp	=	fopen(buf,	"w"))	==	NULL)	{
+												message_publish(MSG_ERROR,	"Could	not	open	%s/S_job_execution	for	writing\n",	output_dir.c_str());
+												return	(0)	;
+								}
+				}
+
+				fprintf(fp,	"Executive	time	tic	value	(tics/second)	information\n");
+				fprintf(fp,	"				time	tic	value	=	%d\n\n",	time_tic_value);
+
+				fprintf(fp,	"Thread	information\n");
+				for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+								std::stringstream	oss	;
+								threads[ii]->dump(oss)	;
+								fprintf(fp,"%s",	oss.str().c_str())	;
+				}
+				fprintf(fp,	"\n")	;
+
+				/*	Write	out	the	s_job_execution	header	open	the	S_job_execution	file.	*/
+				fprintf(fp,	"Job	information\n");
+				fprintf(fp,	"Enabled	|	PID	|Class																				|	Phase	|		Start			|		Cycle			|			Stop			|	ID		|	Job	Name\n");
+				fprintf(fp,	"=================================================================================================\n")	;
+				fprintf(fp,	"Initialization:\n")	;
+
+				/*	Write	default_data	and	initialization	job	entries	to	S_job_execution.	*/
+				default_data_queue.write_non_sched_queue(fp)	;
+				initialization_queue.write_non_sched_queue(fp)	;
+
+				/*	Write	scheduled	job	entries	to	S_job_execution.	*/
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"Scheduled	Loop:\n\n")	;
+				for	(	ii	=	0	;	ii	<	threads.size()	;	ii++	)	{
+								fprintf(fp,	"Thread	%u:\n",	ii)	;
+								threads[ii]->job_queue.write_sched_queue(fp)	;
+								fprintf(fp,	"\n")	;
+				}
+
+				/*	Write	top_of_frame	job	entries	to	S_job_execution.	*/
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"Top	of	Frame:\n\n")	;
+				fprintf(fp,	"Thread	0:\n");
+				top_of_frame_queue.write_sched_queue(fp)	;
+				for	(	ii	=	1	;	ii	<	threads.size()	;	ii++	)	{
+								fprintf(fp,	"Thread	%u:\n",	ii)	;
+								threads[ii]->top_of_frame_queue.write_sched_queue(fp)	;
+								fprintf(fp,	"\n")	;
+				}
+
+				/*	Write	end_of_frame	job	entries	to	S_job_execution.	*/
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"End	of	Frame:\n\n")	;
+				fprintf(fp,	"Thread	0:\n");
+				end_of_frame_queue.write_sched_queue(fp)	;
+				for	(	ii	=	1	;	ii	<	threads.size()	;	ii++	)	{
+								fprintf(fp,	"Thread	%u:\n",	ii)	;
+								threads[ii]->end_of_frame_queue.write_sched_queue(fp)	;
+								fprintf(fp,	"\n")	;
+				}
+
+				/*	Write	freeze_init,	freeze,	and	unfreeze	job	entries	to	S_job_execution.	*/
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"Freeze	Loop:\n")	;
+				freeze_init_queue.write_non_sched_queue(fp)	;
+				freeze_scheduled_queue.write_sched_queue(fp)	;
+				freeze_queue.write_non_sched_queue(fp)	;
+				unfreeze_queue.write_non_sched_queue(fp)	;
+
+				/*	Write	shutdown	job	entries	to	S_job_execution.	*/
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"Shutdown:\n")	;
+				shutdown_queue.write_non_sched_queue(fp)	;
+
+
+				/*	Write	entries	from	other	schedulers		*/
+				for	(	ii	=	0	;	ii	<	other_schedulers.size()	;	ii++	)	{
+								other_schedulers[ii]->write_s_job_execution(fp)	;
+				}
+
+				fprintf(fp,	"\n===================================================================================================\n")	;
+
+				fclose(fp);
+
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp b/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp
index e5a9bb999..4069b3487 100644
--- a/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp
+++ b/trick_source/sim_services/Executive/Executive_write_s_run_summary.cpp
@@ -1,65 +1,65 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<unistd.h>
 
-#include "trick/Executive.hh"
-#include "trick/command_line_protos.h"
-#include "trick/env_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/Executive.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/env_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
 @details
--# If the incoming file pointer is NULL
-   -# Get the output directory
-   -# Get path to S_run_summary file as %<output directory%>/S_run_summary
-   -# Open the output file for writing
-   -# Return if the file could not be opened for writing
--# The scheduler writes out the S_run_summary header
--# The scheduler writes out the build time Trick enviromenment variables
+-#	If	the	incoming	file	pointer	is	NULL
+			-#	Get	the	output	directory
+			-#	Get	path	to	S_run_summary	file	as	%<output	directory%>/S_run_summary
+			-#	Open	the	output	file	for	writing
+			-#	Return	if	the	file	could	not	be	opened	for	writing
+-#	The	scheduler	writes	out	the	S_run_summary	header
+-#	The	scheduler	writes	out	the	build	time	Trick	enviromenment	variables
 */
-int Trick::Executive::write_s_run_summary(FILE *fp) {
+int	Trick::Executive::write_s_run_summary(FILE	*fp)	{
 
-    char buf[1024];
-    std::string output_dir ;
+				char	buf[1024];
+				std::string	output_dir	;
 
-    if (fp == NULL) {
+				if	(fp	==	NULL)	{
 
-        /* Get full path to S_run_summary */
-        output_dir = command_line_args_get_output_dir() ;
-        snprintf(buf, sizeof(buf), "%s/S_run_summary", output_dir.c_str());
+								/*	Get	full	path	to	S_run_summary	*/
+								output_dir	=	command_line_args_get_output_dir()	;
+								snprintf(buf,	sizeof(buf),	"%s/S_run_summary",	output_dir.c_str());
 
-        /* Open the S_run_summary file.  If it fails, it's not a fatal error, return 0. */
-        if ((fp = fopen(buf, "w")) == NULL) {
-            message_publish(MSG_ERROR, "Could not open %s/S_run_summary for writing", output_dir.c_str());
-            return(0);
-        }
-    }
+								/*	Open	the	S_run_summary	file.		If	it	fails,	it's	not	a	fatal	error,	return	0.	*/
+								if	((fp	=	fopen(buf,	"w"))	==	NULL)	{
+												message_publish(MSG_ERROR,	"Could	not	open	%s/S_run_summary	for	writing",	output_dir.c_str());
+												return(0);
+								}
+				}
 
-    /* Write out the s_run_summary header */
-    fprintf(fp, "\n===============================================================================\n");
-    fprintf(fp, "General:\n\n");
+				/*	Write	out	the	s_run_summary	header	*/
+				fprintf(fp,	"\n===============================================================================\n");
+				fprintf(fp,	"General:\n\n");
 
-    fprintf(fp, "Executable called = %s/%s\n", command_line_args_get_default_dir(), command_line_args_get_cmdline_name());
-    fprintf(fp, "Input file = %s\n", command_line_args_get_input_file());
+				fprintf(fp,	"Executable	called	=	%s/%s\n",	command_line_args_get_default_dir(),	command_line_args_get_cmdline_name());
+				fprintf(fp,	"Input	file	=	%s\n",	command_line_args_get_input_file());
 
-    fprintf(fp, "S_main build time = %s\n", build_date.c_str());
-    fprintf(fp, "Trick version = %s\n", current_version.c_str());
+				fprintf(fp,	"S_main	build	time	=	%s\n",	build_date.c_str());
+				fprintf(fp,	"Trick	version	=	%s\n",	current_version.c_str());
 
-    /* Write out the build time Trick enviromenment variables. */
-    fprintf(fp, "\n===============================================================================\n");
-    fprintf(fp, "Build time Environment:\n\n");
+				/*	Write	out	the	build	time	Trick	enviromenment	variables.	*/
+				fprintf(fp,	"\n===============================================================================\n");
+				fprintf(fp,	"Build	time	Environment:\n\n");
 
-    env_print_vars(fp) ;
+				env_print_vars(fp)	;
 
-    fprintf(fp, "\n");
-    fclose(fp);
+				fprintf(fp,	"\n");
+				fclose(fp);
 
-    return(0) ;
+				return(0)	;
 
 }
 
diff --git a/trick_source/sim_services/Executive/ThreadTrigger.cpp b/trick_source/sim_services/Executive/ThreadTrigger.cpp
index 0ca7fcd33..0bb4096b4 100644
--- a/trick_source/sim_services/Executive/ThreadTrigger.cpp
+++ b/trick_source/sim_services/Executive/ThreadTrigger.cpp
@@ -1,148 +1,148 @@
 
-#include "trick/ThreadTrigger.hh"
-#include "trick/message_proto.h"
+#include	"trick/ThreadTrigger.hh"
+#include	"trick/message_proto.h"
 
-/* ThreadTriggerBase empty routines */
-Trick::ThreadTriggerBase::ThreadTriggerBase(ThreadTriggerType in_tt_type) : tt_type(in_tt_type) {}
-Trick::ThreadTriggerBase::~ThreadTriggerBase() {}
-void Trick::ThreadTriggerBase::init() {}
+/*	ThreadTriggerBase	empty	routines	*/
+Trick::ThreadTriggerBase::ThreadTriggerBase(ThreadTriggerType	in_tt_type)	:	tt_type(in_tt_type)	{}
+Trick::ThreadTriggerBase::~ThreadTriggerBase()	{}
+void	Trick::ThreadTriggerBase::init()	{}
 
-/* ThreadTriggerMutex */
-Trick::ThreadTriggerMutex::ThreadTriggerMutex() : ThreadTriggerBase(TT_MUTEX) {
-    pthread_cond_init(&go_cv, NULL);
-    pthread_mutex_init(&go_mutex, NULL);
+/*	ThreadTriggerMutex	*/
+Trick::ThreadTriggerMutex::ThreadTriggerMutex()	:	ThreadTriggerBase(TT_MUTEX)	{
+				pthread_cond_init(&go_cv,	NULL);
+				pthread_mutex_init(&go_mutex,	NULL);
 }
 
-void Trick::ThreadTriggerMutex::init() {
-    pthread_mutex_lock(&go_mutex);
+void	Trick::ThreadTriggerMutex::init()	{
+				pthread_mutex_lock(&go_mutex);
 }
 
-void Trick::ThreadTriggerMutex::fire() {
-    pthread_mutex_lock(&go_mutex);
-    pthread_cond_signal(&go_cv);
-    pthread_mutex_unlock(&go_mutex);
+void	Trick::ThreadTriggerMutex::fire()	{
+				pthread_mutex_lock(&go_mutex);
+				pthread_cond_signal(&go_cv);
+				pthread_mutex_unlock(&go_mutex);
 }
 
-void Trick::ThreadTriggerMutex::wait() {
-    pthread_cond_wait(&go_cv, &go_mutex);
+void	Trick::ThreadTriggerMutex::wait()	{
+				pthread_cond_wait(&go_cv,	&go_mutex);
 }
 
-void Trick::ThreadTriggerMutex::dump(std::ostream & oss) {
-    oss << "    trigger type = mutex" << std::endl ;
+void	Trick::ThreadTriggerMutex::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	mutex"	<<	std::endl	;
 }
 
-/* ThreadTriggerFlag */
-Trick::ThreadTriggerFlag::ThreadTriggerFlag() : ThreadTriggerBase(TT_FLAG) , frame_trigger(false) {}
+/*	ThreadTriggerFlag	*/
+Trick::ThreadTriggerFlag::ThreadTriggerFlag()	:	ThreadTriggerBase(TT_FLAG)	,	frame_trigger(false)	{}
 
-void Trick::ThreadTriggerFlag::fire() {
-    frame_trigger = true ;
+void	Trick::ThreadTriggerFlag::fire()	{
+				frame_trigger	=	true	;
 }
 
-void Trick::ThreadTriggerFlag::wait() {
-    while (frame_trigger == false) ;
-    frame_trigger = false ;
+void	Trick::ThreadTriggerFlag::wait()	{
+				while	(frame_trigger	==	false)	;
+				frame_trigger	=	false	;
 }
 
-void Trick::ThreadTriggerFlag::dump(std::ostream & oss) {
-    oss << "    trigger type = flag" << std::endl ;
+void	Trick::ThreadTriggerFlag::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	flag"	<<	std::endl	;
 }
 
-#if __linux
-#include <sys/eventfd.h>
-#include <sys/types.h>
-#include <unistd.h>
+#if	__linux
+#include	<sys/eventfd.h>
+#include	<sys/types.h>
+#include	<unistd.h>
 
-/* ThreadTriggerEventFD */
-Trick::ThreadTriggerEventFD::ThreadTriggerEventFD() : ThreadTriggerBase(TT_EVENTFD) {
-    efd = eventfd(0,0);
+/*	ThreadTriggerEventFD	*/
+Trick::ThreadTriggerEventFD::ThreadTriggerEventFD()	:	ThreadTriggerBase(TT_EVENTFD)	{
+				efd	=	eventfd(0,0);
 }
 
-void Trick::ThreadTriggerEventFD::fire() {
-    uint64_t value = 1;
-    write(efd, &value, sizeof(uint64_t));
+void	Trick::ThreadTriggerEventFD::fire()	{
+				uint64_t	value	=	1;
+				write(efd,	&value,	sizeof(uint64_t));
 }
 
-void Trick::ThreadTriggerEventFD::wait() {
-    uint64_t value ;
-    read(efd, &value, sizeof(uint64_t));
+void	Trick::ThreadTriggerEventFD::wait()	{
+				uint64_t	value	;
+				read(efd,	&value,	sizeof(uint64_t));
 }
 
-void Trick::ThreadTriggerEventFD::dump(std::ostream & oss) {
-    oss << "    trigger type = eventfd" << std::endl ;
+void	Trick::ThreadTriggerEventFD::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	eventfd"	<<	std::endl	;
 }
 
-#include <linux/futex.h>
-#include <syscall.h>
+#include	<linux/futex.h>
+#include	<syscall.h>
 
-/* ThreadTriggerFutex */
-Trick::ThreadTriggerFutex::ThreadTriggerFutex() : ThreadTriggerBase(TT_FUTEX), futex_addr(0) {}
+/*	ThreadTriggerFutex	*/
+Trick::ThreadTriggerFutex::ThreadTriggerFutex()	:	ThreadTriggerBase(TT_FUTEX),	futex_addr(0)	{}
 
-void Trick::ThreadTriggerFutex::fire() {
-    syscall(SYS_futex, &futex_addr, FUTEX_WAKE, 1, NULL, NULL, 0);
+void	Trick::ThreadTriggerFutex::fire()	{
+				syscall(SYS_futex,	&futex_addr,	FUTEX_WAKE,	1,	NULL,	NULL,	0);
 }
 
-void Trick::ThreadTriggerFutex::wait() {
-    futex_addr = 0;
-    syscall(SYS_futex, &futex_addr, FUTEX_WAIT, 0, NULL, NULL, 0);
+void	Trick::ThreadTriggerFutex::wait()	{
+				futex_addr	=	0;
+				syscall(SYS_futex,	&futex_addr,	FUTEX_WAIT,	0,	NULL,	NULL,	0);
 }
 
-void Trick::ThreadTriggerFutex::dump(std::ostream & oss) {
-    oss << "    trigger type = futex" << std::endl ;
+void	Trick::ThreadTriggerFutex::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	futex"	<<	std::endl	;
 }
 #else
 
-/* Empty implementations for OSes other than Linux */
+/*	Empty	implementations	for	OSes	other	than	Linux	*/
 
-Trick::ThreadTriggerEventFD::ThreadTriggerEventFD() : ThreadTriggerBase(TT_EVENTFD) , efd(0) {}
-void Trick::ThreadTriggerEventFD::fire() {}
-void Trick::ThreadTriggerEventFD::wait() {}
-void Trick::ThreadTriggerEventFD::dump(std::ostream & oss) {
-    oss << "    trigger type = eventfd (non-functional). How did you get here?" << std::endl ;
+Trick::ThreadTriggerEventFD::ThreadTriggerEventFD()	:	ThreadTriggerBase(TT_EVENTFD)	,	efd(0)	{}
+void	Trick::ThreadTriggerEventFD::fire()	{}
+void	Trick::ThreadTriggerEventFD::wait()	{}
+void	Trick::ThreadTriggerEventFD::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	eventfd	(non-functional).	How	did	you	get	here?"	<<	std::endl	;
 }
 
-Trick::ThreadTriggerFutex::ThreadTriggerFutex() : ThreadTriggerBase(TT_FUTEX) , futex_addr(0) {}
-void Trick::ThreadTriggerFutex::fire() {}
-void Trick::ThreadTriggerFutex::wait() {}
-void Trick::ThreadTriggerFutex::dump(std::ostream & oss) {
-    oss << "    trigger type = futex (non-functional). How did you get here?" << std::endl ;
+Trick::ThreadTriggerFutex::ThreadTriggerFutex()	:	ThreadTriggerBase(TT_FUTEX)	,	futex_addr(0)	{}
+void	Trick::ThreadTriggerFutex::fire()	{}
+void	Trick::ThreadTriggerFutex::wait()	{}
+void	Trick::ThreadTriggerFutex::dump(std::ostream	&	oss)	{
+				oss	<<	"				trigger	type	=	futex	(non-functional).	How	did	you	get	here?"	<<	std::endl	;
 }
 
 #endif
 
-/* ThreadTriggerContainer */
-Trick::ThreadTriggerContainer::ThreadTriggerContainer() : ttBase(&ttMutex) {}
-
-Trick::ThreadTriggerBase * Trick::ThreadTriggerContainer::getThreadTrigger() {
-    return ttBase ;
-}
-
-/* Routine to change trigger type */
-void Trick::ThreadTriggerContainer::setThreadTrigger( ThreadTriggerType in_trigger_type ) {
-    trigger_type = in_trigger_type ;
-    switch ( trigger_type ) {
-        case TT_MUTEX :
-        default:
-            ttBase = &ttMutex ;
-            break ;
-        case TT_FLAG :
-            ttBase = &ttFlag ;
-            break ;
-        case TT_EVENTFD :
-#if __linux
-            ttBase = &ttEventFD ;
+/*	ThreadTriggerContainer	*/
+Trick::ThreadTriggerContainer::ThreadTriggerContainer()	:	ttBase(&ttMutex)	{}
+
+Trick::ThreadTriggerBase	*	Trick::ThreadTriggerContainer::getThreadTrigger()	{
+				return	ttBase	;
+}
+
+/*	Routine	to	change	trigger	type	*/
+void	Trick::ThreadTriggerContainer::setThreadTrigger(	ThreadTriggerType	in_trigger_type	)	{
+				trigger_type	=	in_trigger_type	;
+				switch	(	trigger_type	)	{
+								case	TT_MUTEX	:
+								default:
+												ttBase	=	&ttMutex	;
+												break	;
+								case	TT_FLAG	:
+												ttBase	=	&ttFlag	;
+												break	;
+								case	TT_EVENTFD	:
+#if	__linux
+												ttBase	=	&ttEventFD	;
 #else
-            message_publish(MSG_ERROR, "EventFD thread trigger type not available, using mutex\n") ;
-            ttBase = &ttMutex ;
+												message_publish(MSG_ERROR,	"EventFD	thread	trigger	type	not	available,	using	mutex\n")	;
+												ttBase	=	&ttMutex	;
 #endif
-            break ;
-        case TT_FUTEX :
-#if __linux
-            ttBase = &ttFutex ;
+												break	;
+								case	TT_FUTEX	:
+#if	__linux
+												ttBase	=	&ttFutex	;
 #else
-            message_publish(MSG_ERROR, "Futex thread trigger type not available, using mutex\n") ;
-            ttBase = &ttMutex ;
+												message_publish(MSG_ERROR,	"Futex	thread	trigger	type	not	available,	using	mutex\n")	;
+												ttBase	=	&ttMutex	;
 #endif
-            break ;
-    }
+												break	;
+				}
 }
 
diff --git a/trick_source/sim_services/Executive/Threads.cpp b/trick_source/sim_services/Executive/Threads.cpp
index e269a5abe..d8c103557 100644
--- a/trick_source/sim_services/Executive/Threads.cpp
+++ b/trick_source/sim_services/Executive/Threads.cpp
@@ -1,53 +1,53 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdio.h>
 
-#include "trick/Threads.hh"
+#include	"trick/Threads.hh"
 
-Trick::Threads::Threads(int in_id , bool in_rt_nap) :
- enabled(true) ,
- thread_id(in_id) ,
- curr_time_tics(0) ,
- amf_cycle(0.0) ,
- amf_cycle_tics(0) ,
- amf_next_tics(0) ,
- curr_job(NULL) ,
- rt_nap(in_rt_nap) ,
- process_type(PROCESS_TYPE_SCHEDULED) ,
- child_complete(false) ,
- running(false) ,
- shutdown_wait_async(false) {
-    std::stringstream oss ;
-    oss << "Child_" << in_id ;
-    name = oss.str() ;
+Trick::Threads::Threads(int	in_id	,	bool	in_rt_nap)	:
+	enabled(true)	,
+	thread_id(in_id)	,
+	curr_time_tics(0)	,
+	amf_cycle(0.0)	,
+	amf_cycle_tics(0)	,
+	amf_next_tics(0)	,
+	curr_job(NULL)	,
+	rt_nap(in_rt_nap)	,
+	process_type(PROCESS_TYPE_SCHEDULED)	,
+	child_complete(false)	,
+	running(false)	,
+	shutdown_wait_async(false)	{
+				std::stringstream	oss	;
+				oss	<<	"Child_"	<<	in_id	;
+				name	=	oss.str()	;
 }
 
-void Trick::Threads::set_pthread_id(pthread_t in_pthread_id) {
-    pthread_id = in_pthread_id ;
+void	Trick::Threads::set_pthread_id(pthread_t	in_pthread_id)	{
+				pthread_id	=	in_pthread_id	;
 }
 
-void Trick::Threads::set_enabled( bool in_enabled ) {
-    enabled = in_enabled ;
+void	Trick::Threads::set_enabled(	bool	in_enabled	)	{
+				enabled	=	in_enabled	;
 }
 
-void Trick::Threads::clear_scheduled_queues() {
-    job_queue.clear() ;
-    top_of_frame_queue.clear() ;
-    end_of_frame_queue.clear() ;
+void	Trick::Threads::clear_scheduled_queues()	{
+				job_queue.clear()	;
+				top_of_frame_queue.clear()	;
+				end_of_frame_queue.clear()	;
 }
 
-void Trick::Threads::dump( std::ostream & oss ) {
-    oss << "Trick::Threads (" << name << ")" << std::endl ;
-    oss << "    process_type = " ;
-    // Regardless of type, amf_cycle is used to store the cycle time set.
-    // If thread_id is 0 which means main thread, amf_cycle can't be set so the init value 0 will be dumped.
-    switch ( process_type ) {
-        case PROCESS_TYPE_SCHEDULED: oss << "scheduled = " << amf_cycle << std::endl ; break ;
-        case PROCESS_TYPE_ASYNC_CHILD: oss << "asynchronous = " << amf_cycle << std::endl ; break ;
-        case PROCESS_TYPE_AMF_CHILD: oss << "asynchronous must finish with amf_cycle = " << amf_cycle << std::endl ; break ;
-    }
-    trigger_container.getThreadTrigger()->dump(oss) ;
-    oss << "    number of scheduled jobs = " << job_queue.size() << std::endl ;
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::Threads::dump(	std::ostream	&	oss	)	{
+				oss	<<	"Trick::Threads	("	<<	name	<<	")"	<<	std::endl	;
+				oss	<<	"				process_type	=	"	;
+				//	Regardless	of	type,	amf_cycle	is	used	to	store	the	cycle	time	set.
+				//	If	thread_id	is	0	which	means	main	thread,	amf_cycle	can't	be	set	so	the	init	value	0	will	be	dumped.
+				switch	(	process_type	)	{
+								case	PROCESS_TYPE_SCHEDULED:	oss	<<	"scheduled	=	"	<<	amf_cycle	<<	std::endl	;	break	;
+								case	PROCESS_TYPE_ASYNC_CHILD:	oss	<<	"asynchronous	=	"	<<	amf_cycle	<<	std::endl	;	break	;
+								case	PROCESS_TYPE_AMF_CHILD:	oss	<<	"asynchronous	must	finish	with	amf_cycle	=	"	<<	amf_cycle	<<	std::endl	;	break	;
+				}
+				trigger_container.getThreadTrigger()->dump(oss)	;
+				oss	<<	"				number	of	scheduled	jobs	=	"	<<	job_queue.size()	<<	std::endl	;
+				Trick::ThreadBase::dump(oss)	;
 }
diff --git a/trick_source/sim_services/Executive/Threads_child.cpp b/trick_source/sim_services/Executive/Threads_child.cpp
index 3a9ac40b9..e99260e33 100644
--- a/trick_source/sim_services/Executive/Threads_child.cpp
+++ b/trick_source/sim_services/Executive/Threads_child.cpp
@@ -1,231 +1,231 @@
 /*
-   PURPOSE: (The Trick simulation child executive processing.)
+			PURPOSE:	(The	Trick	simulation	child	executive	processing.)
 
-   REFERENCE: ((None))
+			REFERENCE:	((None))
 
-   ASSUMPTIONS AND LIMITATIONS: ((this is executive only from the child process forked by the executive))
+			ASSUMPTIONS	AND	LIMITATIONS:	((this	is	executive	only	from	the	child	process	forked	by	the	executive))
 
-   PROGRAMMERS:
-      (((Robert W. Bailey) (LinCom) (October 1993) (--) (Realtime))
-       ((Eddie J. Paddock) (MDSSC) (April 1992) (--) (Realtime)))
- */
+			PROGRAMMERS:
+						(((Robert	W.	Bailey)	(LinCom)	(October	1993)	(--)	(Realtime))
+							((Eddie	J.	Paddock)	(MDSSC)	(April	1992)	(--)	(Realtime)))
+	*/
 
-#include <iostream>
-#include <stdlib.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/syscall.h>
+#include	<iostream>
+#include	<stdlib.h>
+#include	<errno.h>
+#include	<signal.h>
+#include	<sys/syscall.h>
 
-#ifdef __linux
-#include <cxxabi.h>
+#ifdef	__linux
+#include	<cxxabi.h>
 #endif
 
-#include "trick/Threads.hh"
-#include "trick/release.h"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
-#include "trick/TrickConstant.hh"
-#include "trick/message_proto.h"
+#include	"trick/Threads.hh"
+#include	"trick/release.h"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/TrickConstant.hh"
+#include	"trick/message_proto.h"
 
 
 /**
 @details
--# Wait for all job dependencies to complete.  Requirement  [@ref r_exec_thread_6]
--# Call the job.  Requirement  [@ref r_exec_periodic_0]
--# If the job is a system job, check to see if the next job call time is the lowest next time by
-   calling Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData *, long long)
--# Set the job complete flag
+-#	Wait	for	all	job	dependencies	to	complete.		Requirement		[@ref	r_exec_thread_6]
+-#	Call	the	job.		Requirement		[@ref	r_exec_periodic_0]
+-#	If	the	job	is	a	system	job,	check	to	see	if	the	next	job	call	time	is	the	lowest	next	time	by
+			calling	Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData	*,	long	long)
+-#	Set	the	job	complete	flag
 */
-static int call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics) {
+static	int	call_next_job(Trick::JobData	*	curr_job,	Trick::ScheduledJobQueue	&	job_queue,	bool	rt_nap,	long	long	curr_time_tics)	{
 
-    Trick::JobData * depend_job ;
-    unsigned int ii ;
-    int ret = 0 ;
+				Trick::JobData	*	depend_job	;
+				unsigned	int	ii	;
+				int	ret	=	0	;
 
-    //cout << "time = " << curr_time_tics << " " << curr_job->name << " job next = "
-    //  << curr_job->next_tics << " id = " << curr_job->id << endl ;
+				//cout	<<	"time	=	"	<<	curr_time_tics	<<	"	"	<<	curr_job->name	<<	"	job	next	=	"
+				//		<<	curr_job->next_tics	<<	"	id	=	"	<<	curr_job->id	<<	endl	;
 
-    /* Wait for all jobs that the current job depends on to complete. */
-    for ( ii = 0 ; ii < curr_job->depends.size() ; ii++ ) {
-        depend_job = curr_job->depends[ii] ;
-        while (! depend_job->complete) {
-            if (rt_nap == true) {
-                RELEASE();
-            }
-        }
-    }
+				/*	Wait	for	all	jobs	that	the	current	job	depends	on	to	complete.	*/
+				for	(	ii	=	0	;	ii	<	curr_job->depends.size()	;	ii++	)	{
+								depend_job	=	curr_job->depends[ii]	;
+								while	(!	depend_job->complete)	{
+												if	(rt_nap	==	true)	{
+																RELEASE();
+												}
+								}
+				}
 
-    /* Call the current scheduled job. */
-    ret = curr_job->call() ;
+				/*	Call	the	current	scheduled	job.	*/
+				ret	=	curr_job->call()	;
 
-    if ( ret != 0 ) {
-        exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , "scheduled job did not return 0") ;
-    }
+				if	(	ret	!=	0	)	{
+								exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"scheduled	job	did	not	return	0")	;
+				}
 
-    /* System jobs next call time are not set until after they run. We test their next job call time here. */
-    if ( curr_job->system_job_class ) {
-        job_queue.test_next_job_call_time(curr_job , curr_time_tics) ;
-    }
+				/*	System	jobs	next	call	time	are	not	set	until	after	they	run.	We	test	their	next	job	call	time	here.	*/
+				if	(	curr_job->system_job_class	)	{
+								job_queue.test_next_job_call_time(curr_job	,	curr_time_tics)	;
+				}
 
-    curr_job->complete = true ;
+				curr_job->complete	=	true	;
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# Block all signals to the child.
--# Set the thread cancel type to asynchronous to allow master to this child at any time.
--# Lock the go mutex so the master has to wait until this child is ready before staring execution.
--# Set thread priority and CPU affinity
--# The child enters an infinite loop
-    -# Blocks on mutex or frame trigger until master signals to start processing
-    -# Switch if the child is a synchronous thread
-        -# For each scheduled jobs whose next call time is equal to the current simulation time [@ref ScheduledJobQueue]
-            -# Call call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics)
-    -# Switch if the child is a asynchronous must finish thread
-        -# Do while the job queue time is less than the time of the next AMF sync time.
-            -# For each scheduled jobs whose next call time is equal to the current queue time
-                -# Call call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics)
-    -# Switch if the child is a asynchronous thread
-        -# For each scheduled jobs
-            -# Call call_next_job(Trick::JobData * curr_job, Trick::ScheduledJobQueue & job_queue, bool rt_nap, long long curr_time_tics)
-    -# Set the child complete flag
+-#	Block	all	signals	to	the	child.
+-#	Set	the	thread	cancel	type	to	asynchronous	to	allow	master	to	this	child	at	any	time.
+-#	Lock	the	go	mutex	so	the	master	has	to	wait	until	this	child	is	ready	before	staring	execution.
+-#	Set	thread	priority	and	CPU	affinity
+-#	The	child	enters	an	infinite	loop
+				-#	Blocks	on	mutex	or	frame	trigger	until	master	signals	to	start	processing
+				-#	Switch	if	the	child	is	a	synchronous	thread
+								-#	For	each	scheduled	jobs	whose	next	call	time	is	equal	to	the	current	simulation	time	[@ref	ScheduledJobQueue]
+												-#	Call	call_next_job(Trick::JobData	*	curr_job,	Trick::ScheduledJobQueue	&	job_queue,	bool	rt_nap,	long	long	curr_time_tics)
+				-#	Switch	if	the	child	is	a	asynchronous	must	finish	thread
+								-#	Do	while	the	job	queue	time	is	less	than	the	time	of	the	next	AMF	sync	time.
+												-#	For	each	scheduled	jobs	whose	next	call	time	is	equal	to	the	current	queue	time
+																-#	Call	call_next_job(Trick::JobData	*	curr_job,	Trick::ScheduledJobQueue	&	job_queue,	bool	rt_nap,	long	long	curr_time_tics)
+				-#	Switch	if	the	child	is	a	asynchronous	thread
+								-#	For	each	scheduled	jobs
+												-#	Call	call_next_job(Trick::JobData	*	curr_job,	Trick::ScheduledJobQueue	&	job_queue,	bool	rt_nap,	long	long	curr_time_tics)
+				-#	Set	the	child	complete	flag
 */
-void * Trick::Threads::thread_body() {
-
-    /* Lock the go mutex so the master has to wait until this child is ready before staring execution. */
-    trigger_container.getThreadTrigger()->init() ;
-
-    /* signal the master that the child is ready and running */
-    child_complete = true;
-    running = true ;
-
-    try {
-        do {
-
-            /* Block child on trigger until master signals. */
-            trigger_container.getThreadTrigger()->wait() ;
-
-            if ( enabled ) {
-
-                switch ( process_type ) {
-                    case PROCESS_TYPE_SCHEDULED:
-                    /* Loop through all jobs currently scheduled to run at this simulation time step. */
-                    job_queue.reset_curr_index() ;
-                    job_queue.set_next_job_call_time(TRICK_MAX_LONG_LONG) ;
-                    while ( (curr_job = job_queue.find_next_job( curr_time_tics )) != NULL ) {
-                        call_next_job(curr_job, job_queue, rt_nap, curr_time_tics) ;
-                    }
-                    break ;
-
-                    case PROCESS_TYPE_AMF_CHILD:
-                    /* call the AMF top of frame jobs */
-                    top_of_frame_queue.reset_curr_index() ;
-                    while ( (curr_job = top_of_frame_queue.get_next_job()) != NULL ) {
-                        int ret ;
-                        ret = curr_job->call() ;
-                        if ( ret != 0 ) {
-                            exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , " top_of_frame job did not return 0") ;
-                        }
-                    }
-
-                    /* Loop through all jobs currently up to the point of the next AMF frame sync */
-                    do {
-                        job_queue.reset_curr_index() ;
-                        job_queue.set_next_job_call_time(amf_next_tics) ;
-                        while ( (curr_job = job_queue.find_next_job( curr_time_tics )) != NULL ) {
-                            call_next_job(curr_job, job_queue, rt_nap, curr_time_tics) ;
-                        }
-                        curr_time_tics = job_queue.get_next_job_call_time() ;
-                    } while ( curr_time_tics < amf_next_tics ) ;
-
-                    /* call the AMF end of frame jobs */
-                    end_of_frame_queue.reset_curr_index() ;
-                    while ( (curr_job = end_of_frame_queue.get_next_job()) != NULL ) {
-                        int ret ;
-                        ret = curr_job->call() ;
-                        if ( ret != 0 ) {
-                            exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , " end_of_frame job did not return 0") ;
-                        }
-                    }
-                    break ;
-
-                    case PROCESS_TYPE_ASYNC_CHILD:
-                    /* Loop through all jobs once */
-                    if ( amf_cycle_tics == 0 ) {
-                        // Old behavior, run all jobs once and return.
-                        job_queue.reset_curr_index() ;
-                        job_queue.set_next_job_call_time(TRICK_MAX_LONG_LONG) ;
-                        while ( (curr_job = job_queue.get_next_job()) != NULL ) {
-                            call_next_job(curr_job, job_queue, rt_nap, curr_time_tics) ;
-                        }
-                    } else {
-
-                        // catch up job next times to current frame.
-                        job_queue.reset_curr_index() ;
-                        while ( (curr_job = job_queue.get_next_job()) != NULL ) {
-                            long long start_frame = amf_next_tics - amf_cycle_tics ;
-                            while ( curr_job->next_tics < start_frame ) {
-                                curr_job->next_tics += curr_job->cycle_tics ;
-                            }
-                        }
-
-                        // New behavior, run a mini scheduler.
-                        /* call the AMF top of frame jobs */
-                        top_of_frame_queue.reset_curr_index() ;
-                        while ( (curr_job = top_of_frame_queue.get_next_job()) != NULL ) {
-                            int ret ;
-                            ret = curr_job->call() ;
-                            if ( ret != 0 ) {
-                                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , " top_of_frame job did not return 0") ;
-                            }
-                        }
-
-                        /* Loop through all jobs currently up to the point of the next AMF frame sync */
-                        do {
-                            job_queue.reset_curr_index() ;
-                            job_queue.set_next_job_call_time(amf_next_tics) ;
-                            while ( (curr_job = job_queue.find_next_job( curr_time_tics )) != NULL ) {
-                                call_next_job(curr_job, job_queue, rt_nap, curr_time_tics) ;
-                            }
-                            curr_time_tics = job_queue.get_next_job_call_time() ;
-                        } while ( curr_time_tics < amf_next_tics ) ;
-
-                        /* call the AMF end of frame jobs */
-                        end_of_frame_queue.reset_curr_index() ;
-                        while ( (curr_job = end_of_frame_queue.get_next_job()) != NULL ) {
-                            int ret ;
-                            ret = curr_job->call() ;
-                            if ( ret != 0 ) {
-                                exec_terminate_with_return(ret , curr_job->name.c_str() , 0 , " end_of_frame job did not return 0") ;
-                            }
-                        }
-                    }
-                    break ;
-
-                    default:
-                    break ;
-                }
-            }
-
-            /* After all jobs have completed, set the child_complete flag to true. */
-            child_complete = true;
-
-        } while (1);
-    } catch (Trick::ExecutiveException & ex ) {
-        fprintf(stderr, "\nCHILD THREAD %d TERMINATED with exec_terminate\n  ROUTINE: %s\n  DIAGNOSTIC: %s\n"
-         "  THREAD STOP TIME: %f\n" ,
-         thread_id, ex.file.c_str(), ex.message.c_str(), exec_get_sim_time()) ;
-        exit(ex.ret_code) ;
-#ifdef __linux
-    // for post gcc 4.1.2
-    } catch (abi::__forced_unwind&) {
-        //pthread_exit and pthread_cancel will cause an abi::__forced_unwind to be thrown. Rethrow it.
-        throw;
+void	*	Trick::Threads::thread_body()	{
+
+				/*	Lock	the	go	mutex	so	the	master	has	to	wait	until	this	child	is	ready	before	staring	execution.	*/
+				trigger_container.getThreadTrigger()->init()	;
+
+				/*	signal	the	master	that	the	child	is	ready	and	running	*/
+				child_complete	=	true;
+				running	=	true	;
+
+				try	{
+								do	{
+
+												/*	Block	child	on	trigger	until	master	signals.	*/
+												trigger_container.getThreadTrigger()->wait()	;
+
+												if	(	enabled	)	{
+
+																switch	(	process_type	)	{
+																				case	PROCESS_TYPE_SCHEDULED:
+																				/*	Loop	through	all	jobs	currently	scheduled	to	run	at	this	simulation	time	step.	*/
+																				job_queue.reset_curr_index()	;
+																				job_queue.set_next_job_call_time(TRICK_MAX_LONG_LONG)	;
+																				while	(	(curr_job	=	job_queue.find_next_job(	curr_time_tics	))	!=	NULL	)	{
+																								call_next_job(curr_job,	job_queue,	rt_nap,	curr_time_tics)	;
+																				}
+																				break	;
+
+																				case	PROCESS_TYPE_AMF_CHILD:
+																				/*	call	the	AMF	top	of	frame	jobs	*/
+																				top_of_frame_queue.reset_curr_index()	;
+																				while	(	(curr_job	=	top_of_frame_queue.get_next_job())	!=	NULL	)	{
+																								int	ret	;
+																								ret	=	curr_job->call()	;
+																								if	(	ret	!=	0	)	{
+																												exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"	top_of_frame	job	did	not	return	0")	;
+																								}
+																				}
+
+																				/*	Loop	through	all	jobs	currently	up	to	the	point	of	the	next	AMF	frame	sync	*/
+																				do	{
+																								job_queue.reset_curr_index()	;
+																								job_queue.set_next_job_call_time(amf_next_tics)	;
+																								while	(	(curr_job	=	job_queue.find_next_job(	curr_time_tics	))	!=	NULL	)	{
+																												call_next_job(curr_job,	job_queue,	rt_nap,	curr_time_tics)	;
+																								}
+																								curr_time_tics	=	job_queue.get_next_job_call_time()	;
+																				}	while	(	curr_time_tics	<	amf_next_tics	)	;
+
+																				/*	call	the	AMF	end	of	frame	jobs	*/
+																				end_of_frame_queue.reset_curr_index()	;
+																				while	(	(curr_job	=	end_of_frame_queue.get_next_job())	!=	NULL	)	{
+																								int	ret	;
+																								ret	=	curr_job->call()	;
+																								if	(	ret	!=	0	)	{
+																												exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"	end_of_frame	job	did	not	return	0")	;
+																								}
+																				}
+																				break	;
+
+																				case	PROCESS_TYPE_ASYNC_CHILD:
+																				/*	Loop	through	all	jobs	once	*/
+																				if	(	amf_cycle_tics	==	0	)	{
+																								//	Old	behavior,	run	all	jobs	once	and	return.
+																								job_queue.reset_curr_index()	;
+																								job_queue.set_next_job_call_time(TRICK_MAX_LONG_LONG)	;
+																								while	(	(curr_job	=	job_queue.get_next_job())	!=	NULL	)	{
+																												call_next_job(curr_job,	job_queue,	rt_nap,	curr_time_tics)	;
+																								}
+																				}	else	{
+
+																								//	catch	up	job	next	times	to	current	frame.
+																								job_queue.reset_curr_index()	;
+																								while	(	(curr_job	=	job_queue.get_next_job())	!=	NULL	)	{
+																												long	long	start_frame	=	amf_next_tics	-	amf_cycle_tics	;
+																												while	(	curr_job->next_tics	<	start_frame	)	{
+																																curr_job->next_tics	+=	curr_job->cycle_tics	;
+																												}
+																								}
+
+																								//	New	behavior,	run	a	mini	scheduler.
+																								/*	call	the	AMF	top	of	frame	jobs	*/
+																								top_of_frame_queue.reset_curr_index()	;
+																								while	(	(curr_job	=	top_of_frame_queue.get_next_job())	!=	NULL	)	{
+																												int	ret	;
+																												ret	=	curr_job->call()	;
+																												if	(	ret	!=	0	)	{
+																																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"	top_of_frame	job	did	not	return	0")	;
+																												}
+																								}
+
+																								/*	Loop	through	all	jobs	currently	up	to	the	point	of	the	next	AMF	frame	sync	*/
+																								do	{
+																												job_queue.reset_curr_index()	;
+																												job_queue.set_next_job_call_time(amf_next_tics)	;
+																												while	(	(curr_job	=	job_queue.find_next_job(	curr_time_tics	))	!=	NULL	)	{
+																																call_next_job(curr_job,	job_queue,	rt_nap,	curr_time_tics)	;
+																												}
+																												curr_time_tics	=	job_queue.get_next_job_call_time()	;
+																								}	while	(	curr_time_tics	<	amf_next_tics	)	;
+
+																								/*	call	the	AMF	end	of	frame	jobs	*/
+																								end_of_frame_queue.reset_curr_index()	;
+																								while	(	(curr_job	=	end_of_frame_queue.get_next_job())	!=	NULL	)	{
+																												int	ret	;
+																												ret	=	curr_job->call()	;
+																												if	(	ret	!=	0	)	{
+																																exec_terminate_with_return(ret	,	curr_job->name.c_str()	,	0	,	"	end_of_frame	job	did	not	return	0")	;
+																												}
+																								}
+																				}
+																				break	;
+
+																				default:
+																				break	;
+																}
+												}
+
+												/*	After	all	jobs	have	completed,	set	the	child_complete	flag	to	true.	*/
+												child_complete	=	true;
+
+								}	while	(1);
+				}	catch	(Trick::ExecutiveException	&	ex	)	{
+								fprintf(stderr,	"\nCHILD	THREAD	%d	TERMINATED	with	exec_terminate\n		ROUTINE:	%s\n		DIAGNOSTIC:	%s\n"
+									"		THREAD	STOP	TIME:	%f\n"	,
+									thread_id,	ex.file.c_str(),	ex.message.c_str(),	exec_get_sim_time())	;
+								exit(ex.ret_code)	;
+#ifdef	__linux
+				//	for	post	gcc	4.1.2
+				}	catch	(abi::__forced_unwind&)	{
+								//pthread_exit	and	pthread_cancel	will	cause	an	abi::__forced_unwind	to	be	thrown.	Rethrow	it.
+								throw;
 #endif
-    }
+				}
 
-    pthread_exit(NULL) ;
-    return 0 ;
+				pthread_exit(NULL)	;
+				return	0	;
 }
diff --git a/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp b/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp
index cfa292204..f07f062f0 100644
--- a/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp
+++ b/trick_source/sim_services/Executive/Threads_set_amf_cycle_tics.cpp
@@ -1,28 +1,28 @@
 
-#include <math.h>
-#include "trick/Threads.hh"
+#include	<math.h>
+#include	"trick/Threads.hh"
 
 /*
 @design
--# Set amf_cycle to incoming cycle time
--# calculate amf_cycle_tics = in_cycle * time_tic_value
--# return successful 0
+-#	Set	amf_cycle	to	incoming	cycle	time
+-#	calculate	amf_cycle_tics	=	in_cycle	*	time_tic_value
+-#	return	successful	0
 */
-int Trick::Threads::set_amf_cycle(double in_cycle , long long time_tic_value) {
-    amf_cycle = in_cycle ;
-    amf_cycle_tics = (long long)(in_cycle * time_tic_value) ;
-    return(0) ;
+int	Trick::Threads::set_amf_cycle(double	in_cycle	,	long	long	time_tic_value)	{
+				amf_cycle	=	in_cycle	;
+				amf_cycle_tics	=	(long	long)(in_cycle	*	time_tic_value)	;
+				return(0)	;
 }
 
 
 /*
 @design
--# recalculate amf_cycle_tics using new time_tic_value
--# recalculate amf_next_tics = (amf_next_tics / old_time_tic_value) * time_tic_value
--# return successful 0
+-#	recalculate	amf_cycle_tics	using	new	time_tic_value
+-#	recalculate	amf_next_tics	=	(amf_next_tics	/	old_time_tic_value)	*	time_tic_value
+-#	return	successful	0
 */
-int Trick::Threads::time_tic_changed(long long old_time_tic_value , long long time_tic_value) {
-    amf_cycle_tics = (long long)(amf_cycle * time_tic_value) ;
-    amf_next_tics = (long long)round((amf_next_tics / old_time_tic_value) * time_tic_value) ;
-    return(0) ;
+int	Trick::Threads::time_tic_changed(long	long	old_time_tic_value	,	long	long	time_tic_value)	{
+				amf_cycle_tics	=	(long	long)(amf_cycle	*	time_tic_value)	;
+				amf_next_tics	=	(long	long)round((amf_next_tics	/	old_time_tic_value)	*	time_tic_value)	;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Executive/Threads_set_async_wait.cpp b/trick_source/sim_services/Executive/Threads_set_async_wait.cpp
index e60eef9ee..3503e99a0 100644
--- a/trick_source/sim_services/Executive/Threads_set_async_wait.cpp
+++ b/trick_source/sim_services/Executive/Threads_set_async_wait.cpp
@@ -1,8 +1,8 @@
 
-#include "trick/Threads.hh"
+#include	"trick/Threads.hh"
 
-int Trick::Threads::set_async_wait(int yes_no) {
+int	Trick::Threads::set_async_wait(int	yes_no)	{
 
-    shutdown_wait_async = (bool)yes_no ;
-    return(0) ;
+				shutdown_wait_async	=	(bool)yes_no	;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Executive/Threads_set_process_type.cpp b/trick_source/sim_services/Executive/Threads_set_process_type.cpp
index 1589ae889..f17aa7666 100644
--- a/trick_source/sim_services/Executive/Threads_set_process_type.cpp
+++ b/trick_source/sim_services/Executive/Threads_set_process_type.cpp
@@ -1,15 +1,15 @@
 
-#include "trick/Threads.hh"
+#include	"trick/Threads.hh"
 
-int Trick::Threads::set_process_type(int in_process_type) {
+int	Trick::Threads::set_process_type(int	in_process_type)	{
 
-    /** @par Detailed Design: */
-    /** @li After all jobs have completed, set the child_complete flag to true. Design [@ref d_exec_child_3] */
-    if ( in_process_type > PROCESS_TYPE_AMF_CHILD || in_process_type < PROCESS_TYPE_SCHEDULED ) {
-        return(-1) ;
-    } else {
-        process_type = (Trick::ProcessType)in_process_type ;
-    }
+				/**	@par	Detailed	Design:	*/
+				/**	@li	After	all	jobs	have	completed,	set	the	child_complete	flag	to	true.	Design	[@ref	d_exec_child_3]	*/
+				if	(	in_process_type	>	PROCESS_TYPE_AMF_CHILD	||	in_process_type	<	PROCESS_TYPE_SCHEDULED	)	{
+								return(-1)	;
+				}	else	{
+								process_type	=	(Trick::ProcessType)in_process_type	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Executive/child_handler.cpp b/trick_source/sim_services/Executive/child_handler.cpp
index 7aa0915ae..682b564ca 100644
--- a/trick_source/sim_services/Executive/child_handler.cpp
+++ b/trick_source/sim_services/Executive/child_handler.cpp
@@ -1,30 +1,30 @@
 /*
-   PURPOSE: ( Child signal handler )
-   PROGRAMMERS: (((Alex Lin) (NASA) (Feb 2008) (--) (Realtime)))
- */
+			PURPOSE:	(	Child	signal	handler	)
+			PROGRAMMERS:	(((Alex	Lin)	(NASA)	(Feb	2008)	(--)	(Realtime)))
+	*/
 
-#include <sys/types.h>
-#include <sys/wait.h>
+#include	<sys/types.h>
+#include	<sys/wait.h>
 
 /**
- * @relates Trick::Executive
- * C binded function to handle the SIGCHLD signal.  The handler removes child processes
- * from the process table when a child process exits.
- * @return void
- */
-void child_handler(int sig) {
+	*	@relates	Trick::Executive
+	*	C	binded	function	to	handle	the	SIGCHLD	signal.		The	handler	removes	child	processes
+	*	from	the	process	table	when	a	child	process	exits.
+	*	@return	void
+	*/
+void	child_handler(int	sig)	{
 
-    int status;
+				int	status;
 
-    switch (sig) {
-        case SIGCHLD:
-#if !( __ghs )
-            wait(&status);
+				switch	(sig)	{
+								case	SIGCHLD:
+#if	!(	__ghs	)
+												wait(&status);
 #endif
-            break;
-        default:
-            break;
-    }
+												break;
+								default:
+												break;
+				}
 
-    return;
+				return;
 }
diff --git a/trick_source/sim_services/Executive/fpe_handler.cpp b/trick_source/sim_services/Executive/fpe_handler.cpp
index 96311c29b..65b21a83a 100644
--- a/trick_source/sim_services/Executive/fpe_handler.cpp
+++ b/trick_source/sim_services/Executive/fpe_handler.cpp
@@ -1,42 +1,42 @@
 /*
-   PURPOSE: (Floating point exception handler)
+			PURPOSE:	(Floating	point	exception	handler)
 
-   PROGRAMMERS: (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime)))
- */
+			PROGRAMMERS:	(((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime)))
+	*/
 
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
+#include	<string.h>
+#include	<stdio.h>
+#include	<signal.h>
 
 /*
- * FPE specific headers
- */
-#ifdef __linux
-#include <fenv.h>
+	*	FPE	specific	headers
+	*/
+#ifdef	__linux
+#include	<fenv.h>
 #endif
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.hh"
 
 /**
- * @relates Trick::Executive
- * C binded function to handle the SIGFPE signal.  The handler prints which type of
- * floating point error has occured and calls exec_terminate()
- * @return void
- */
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-void fpe_sig_handler(int sig __attribute__ ((unused)) )
+	*	@relates	Trick::Executive
+	*	C	binded	function	to	handle	the	SIGFPE	signal.		The	handler	prints	which	type	of
+	*	floating	point	error	has	occured	and	calls	exec_terminate()
+	*	@return	void
+	*/
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+void	fpe_sig_handler(int	sig	__attribute__	((unused))	)
 #else
-void fpe_sig_handler(int sig __attribute__ ((unused)), siginfo_t * sip __attribute__ ((unused)), void *uap __attribute__ ((unused)))
+void	fpe_sig_handler(int	sig	__attribute__	((unused)),	siginfo_t	*	sip	__attribute__	((unused)),	void	*uap	__attribute__	((unused)))
 #endif
 {
 
-    Trick::Executive * E = exec_get_exec_cpp();
+				Trick::Executive	*	E	=	exec_get_exec_cpp();
 
-#if __APPLE__
-    siginfo_t * sip = NULL ;
+#if	__APPLE__
+				siginfo_t	*	sip	=	NULL	;
 #endif
 
-    E->fpe_handler(sip) ;
+				E->fpe_handler(sip)	;
 
 }
diff --git a/trick_source/sim_services/Executive/sig_hand.cpp b/trick_source/sim_services/Executive/sig_hand.cpp
index 496cd024b..77a65e11d 100644
--- a/trick_source/sim_services/Executive/sig_hand.cpp
+++ b/trick_source/sim_services/Executive/sig_hand.cpp
@@ -1,54 +1,54 @@
 /*
-   PURPOSE: (This function switches on signal type to act on specific signal. This function performs the signal
-   handling for both master and child processes.)
+			PURPOSE:	(This	function	switches	on	signal	type	to	act	on	specific	signal.	This	function	performs	the	signal
+			handling	for	both	master	and	child	processes.)
 
-   REFERENCE: (((Bailey, R.W, and Paddock, E.J.) (Trick Simulation Environment) (NASA:JSC #37943) (JSC / Engineering
-   Directorate / Automation and Robotics Division) (June 1994) (--)))
+			REFERENCE:	(((Bailey,	R.W,	and	Paddock,	E.J.)	(Trick	Simulation	Environment)	(NASA:JSC	#37943)	(JSC	/	Engineering
+			Directorate	/	Automation	and	Robotics	Division)	(June	1994)	(--)))
 
-   ASSUMPTIONS AND LIMITATIONS: ((None))
+			ASSUMPTIONS	AND	LIMITATIONS:	((None))
 
-   CLASS: (N/A)
+			CLASS:	(N/A)
 
-   LIBRARY DEPENDENCY: ((none))
+			LIBRARY	DEPENDENCY:	((none))
 
-   PROGRAMMERS: (((Eddie J. Paddock) (MDSSC) (April 1992) (--) (Realtime)) ((Scott Killingsworth) (LinCom) (September
-   1997) (--) (Issue #1016))) */
+			PROGRAMMERS:	(((Eddie	J.	Paddock)	(MDSSC)	(April	1992)	(--)	(Realtime))	((Scott	Killingsworth)	(LinCom)	(September
+			1997)	(--)	(Issue	#1016)))	*/
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<signal.h>
 
-#include "trick/Executive.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.hh"
 
 /**
- * @relates Trick::Executive
- * C binded function to handle UNIX signals for the simulation.
- * @return void
- */
-void sig_hand(int sig) {
-    Trick::Executive * E = exec_get_exec_cpp();
-    E->signal_handler(sig) ;
-    return;
+	*	@relates	Trick::Executive
+	*	C	binded	function	to	handle	UNIX	signals	for	the	simulation.
+	*	@return	void
+	*/
+void	sig_hand(int	sig)	{
+				Trick::Executive	*	E	=	exec_get_exec_cpp();
+				E->signal_handler(sig)	;
+				return;
 }
 
-void ctrl_c_hand(int sig __attribute__ ((unused))) {
-    Trick::Executive * E = exec_get_exec_cpp();
-    E->ctrl_c_handler() ;
-    return;
+void	ctrl_c_hand(int	sig	__attribute__	((unused)))	{
+				Trick::Executive	*	E	=	exec_get_exec_cpp();
+				E->ctrl_c_handler()	;
+				return;
 }
 
-void term_hand(int sig __attribute__ ((unused))) {
-    Trick::Executive * E = exec_get_exec_cpp();
-    E->term_handler() ;
-    return;
+void	term_hand(int	sig	__attribute__	((unused)))	{
+				Trick::Executive	*	E	=	exec_get_exec_cpp();
+				E->term_handler()	;
+				return;
 }
 
-void usr1_hand(int sig __attribute__ ((unused))) {
-    Trick::Executive * E = exec_get_exec_cpp();
-    E->usr1_handler() ;
-    return;
+void	usr1_hand(int	sig	__attribute__	((unused)))	{
+				Trick::Executive	*	E	=	exec_get_exec_cpp();
+				E->usr1_handler()	;
+				return;
 }
diff --git a/trick_source/sim_services/Executive/test/Executive_test.cpp b/trick_source/sim_services/Executive/test/Executive_test.cpp
index 92783f4e0..67e10c787 100644
--- a/trick_source/sim_services/Executive/test/Executive_test.cpp
+++ b/trick_source/sim_services/Executive/test/Executive_test.cpp
@@ -1,937 +1,937 @@
 
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
-#include "gtest/gtest.h"
-
-#define protected public
-#include "trick/ExecutiveException.hh"
-#include "trick/Executive.hh"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
-#include "trick/MessagePublisher.hh"
-#include "trick/MessageCout.hh"
-#include "trick/SimObject.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/CommandLineArguments.hh"
-#include "trick/GetTimeOfDayClock.hh"
-
-void sig_hand(int sig) ;
-void ctrl_c_hand(int sig) ;
-void term_hand(int sig) ;
-void child_handler(int sig) ;
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-void fpe_sig_handler(int sig) ;
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
+#include	"gtest/gtest.h"
+
+#define	protected	public
+#include	"trick/ExecutiveException.hh"
+#include	"trick/Executive.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/MessagePublisher.hh"
+#include	"trick/MessageCout.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/CommandLineArguments.hh"
+#include	"trick/GetTimeOfDayClock.hh"
+
+void	sig_hand(int	sig)	;
+void	ctrl_c_hand(int	sig)	;
+void	term_hand(int	sig)	;
+void	child_handler(int	sig)	;
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+void	fpe_sig_handler(int	sig)	;
 #else
-void fpe_sig_handler(int sig, siginfo_t * sip, void *uap) ;
+void	fpe_sig_handler(int	sig,	siginfo_t	*	sip,	void	*uap)	;
 #endif
 
-namespace Trick {
-
-class emptySimObject : public Trick::SimObject {
-    public:
-        emptySimObject() {
-            add_job(0, 0, "sensor", NULL, 0.00000001, "scheduled_1", "TRK") ;
-            add_job(0, 1, "system_advance_sim_time", NULL, 1, "advance_sim_time", "TRK") ;
-        }
-
-        virtual int call_function( Trick::JobData * ) { return 0 ; } ;
-        virtual double call_function_double( Trick::JobData * curr_job ) { (void)curr_job ; return 0.0 ; } ;
-} ;
-
-class testSimObject : public Trick::SimObject {
-    public:
-
-        unsigned int default_data_ran ;
-        unsigned int input_processor_ran ;
-        unsigned int initialization_ran ;
-        unsigned int top_of_frame_ran ;
-        unsigned int scheduled_ran ;
-        unsigned int end_of_frame_ran ;
-        unsigned int shutdown_ran ;
-        unsigned int freeze_init_ran ;
-        unsigned int freeze_ran ;
-        unsigned int freeze_scheduled_ran ;
-        unsigned int unfreeze_ran ;
-        unsigned int time_tic_changed_ran ;
-
-        int default_data_1() {
-            default_data_ran++ ;
-            return 0 ;
-        }
-
-        int input_processor_1() {
-            input_processor_ran++ ;
-            return 0 ;
-        }
-
-        int initialization_1() {
-            initialization_ran++ ;
-            return 0 ;
-        }
-
-        int top_of_frame_1() {
-            top_of_frame_ran++ ;
-            return 0 ;
-        }
-
-        int scheduled_1() {
-            scheduled_ran++ ;
-            return 0 ;
-        }
-
-        int end_of_frame_1() {
-            end_of_frame_ran++ ;
-            return 0 ;
-        }
-
-        int shutdown_1() {
-            shutdown_ran++ ;
-            return 0 ;
-        }
-
-        int freeze_init_1() {
-            freeze_init_ran++ ;
-            return 0 ;
-        }
-
-        int freeze_1() {
-            freeze_ran++ ;
-            return 0 ;
-        }
-
-        int freeze_scheduled_1() {
-            freeze_scheduled_ran++ ;
-            return 0 ;
-        }
-
-        int unfreeze_1() {
-            unfreeze_ran++ ;
-            return 0 ;
-        }
-
-        int time_tic_changed_1() {
-            time_tic_changed_ran++ ;
-            return 0 ;
-        }
-
-        int return_error() {
-            return -1 ;
-        }
-
-        int throw_exception() {
-            return exec_terminate_with_return(-1, "throw_exception", 1 , "exec_terminate called") ;
-        }
-
-        testSimObject() :
-         default_data_ran(0) ,
-         input_processor_ran(0) ,
-         initialization_ran(0) ,
-         top_of_frame_ran(0) ,
-         scheduled_ran(0) ,
-         end_of_frame_ran(0) ,
-         shutdown_ran(0) ,
-         freeze_init_ran(0) ,
-         freeze_ran(0) ,
-         freeze_scheduled_ran(0) ,
-         unfreeze_ran(0) ,
-         time_tic_changed_ran(0)
-        {
-            int ii = 0 ;
-            add_job(0, ii++, "default_data", NULL, 1, "default_data_1", "TRK") ;
-            add_job(0, ii++, "input_processor", NULL, 1, "input_processor_1", "TRK") ;
-            add_job(0, ii++, "initialization", NULL, 1, "initialization_1", "TRK") ;
-            add_job(0, ii++, "top_of_frame", NULL, 1, "top_of_frame_1", "TRK") ;
-            add_job(0, ii++, "automatic", NULL, 1, "automatic_1", "TRK") ;
-            add_job(0, ii++, "effector", NULL, 3, "scheduled_3", "TRK") ;
-            add_job(0, ii++, "scheduled", NULL, 2, "scheduled_2", "TRK") ;
-            add_job(0, ii++, "sensor", NULL, 1, "scheduled_1", "TRK") ;
-            add_job(0, ii++, "system_advance_sim_time", NULL, 1, "advance_sim_time", "TRK") ;
-            add_job(0, ii++, "end_of_frame", NULL, 1, "end_of_frame_1", "TRK") ;
-            add_job(0, ii++, "shutdown", NULL, 1, "shutdown_1", "TRK") ;
-            add_job(0, ii++, "freeze_init", NULL, 1, "freeze_init_1", "TRK") ;
-            add_job(0, ii++, "freeze", NULL, 1, "freeze_1", "TRK") ;
-            add_job(0, ii++, "freeze_scheduled", NULL, 1, "freeze_scheduled_1", "TRK") ;
-            add_job(0, ii++, "unfreeze", NULL, 1, "unfreeze_1", "TRK") ;
-            add_job(0, ii++, "exec_time_tic_changed", NULL, 1, "time_tic_changed_1", "TRK") ;
-        }
-
-        virtual int call_function( Trick::JobData * curr_job ) ;
-        virtual double call_function_double( Trick::JobData * curr_job ) { (void)curr_job ; return 0.0 ; } ;
-} ;
-
-int testSimObject::call_function( Trick::JobData * curr_job ) {
-    int trick_ret = 0 ;
-    switch (curr_job->id) {
-        case 0:
-            trick_ret = default_data_1() ;
-            break ;
-        case 1:
-            trick_ret = input_processor_1() ;
-            break ;
-        case 2:
-            trick_ret = initialization_1() ;
-            break ;
-        case 3:
-            trick_ret = top_of_frame_1() ;
-            break ;
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-            trick_ret = scheduled_1() ;
-            break ;
-        case 9:
-            trick_ret = end_of_frame_1() ;
-            break ;
-        case 10:
-            trick_ret = shutdown_1() ;
-            break ;
-        case 11:
-            trick_ret = freeze_init_1() ;
-            break ;
-        case 12:
-            trick_ret = freeze_1() ;
-            break ;
-        case 13:
-            trick_ret = freeze_scheduled_1() ;
-            break ;
-        case 14:
-            trick_ret = unfreeze_1() ;
-            break ;
-        case 15:
-            trick_ret = time_tic_changed_1() ;
-            break ;
-        case 101:
-            trick_ret = return_error() ;
-            break ;
-        case 102:
-            trick_ret = throw_exception() ;
-            break ;
-        default:
-            trick_ret = -1 ;
-            break ;
-    }
-    return trick_ret ;
-} ;
-
-
-class ExecutiveTest : public ::testing::Test {
-
-    protected:
-        Trick::Executive exec;
-        testSimObject so1 ;
-        emptySimObject empty_so ;
-        Trick::MessagePublisher mpublisher ;
-        Trick::MessageCout mcout ;
-        Trick::MemoryManager mm ;
-        Trick::CommandLineArguments cla ;
-        Trick::GetTimeOfDayClock gtodc ;
-        //Trick::RequirementScribe req;
-
-
-        ExecutiveTest() {gtodc.set_global_clock();}
-        ~ExecutiveTest() {}
-        virtual void SetUp() ;
-        virtual void TearDown() {}
-
-        int get_class_map_value(std::string job_class) { return exec.class_map[job_class] ; }
-        Trick::ScheduledJobQueue * get_default_data_queue() { return &exec.default_data_queue ; }
-        Trick::ScheduledJobQueue * get_input_processor_queue() { return &exec.input_processor_queue ; }
-        Trick::ScheduledJobQueue * get_initialization_queue() { return &exec.initialization_queue ; }
-        Trick::ScheduledJobQueue * get_scheduled_queue() { return &exec.scheduled_queue ; }
-        Trick::ScheduledJobQueue * get_end_of_frame_queue() { return &exec.end_of_frame_queue ; }
-        Trick::ScheduledJobQueue * get_shutdown_queue() { return &exec.shutdown_queue ; }
-        Trick::ScheduledJobQueue * get_freeze_init_queue() { return &exec.freeze_init_queue ; }
-        Trick::ScheduledJobQueue * get_freeze_queue() { return &exec.freeze_queue ; }
-        Trick::ScheduledJobQueue * get_unfreeze_queue() { return &exec.unfreeze_queue ; }
-        Trick::JobData * get_all_jobs() { return exec.all_jobs_for_checkpoint ; }
-        Trick::JobData * get_job_from_all_jobs(unsigned int ii ) { return &(exec.all_jobs_for_checkpoint[ii]) ; }
-        Trick::SimObject * get_sim_object(unsigned int ii) { return exec.sim_objects[ii] ; }
-        Trick::Threads * get_thread(unsigned int ii) { return exec.threads[ii] ; }
-} ;
-
-
-void ExecutiveTest::SetUp() {
-
-    exec_add_scheduled_job_class("automatic") ;
-    exec_add_scheduled_job_class("sensor") ;
-    exec_add_scheduled_job_class("scheduled") ;
-    exec_add_scheduled_job_class("effector") ;
-    exec_add_scheduled_job_class("system_advance_sim_time") ;
-
-    mpublisher.init() ;
+namespace	Trick	{
+
+class	emptySimObject	:	public	Trick::SimObject	{
+				public:
+								emptySimObject()	{
+												add_job(0,	0,	"sensor",	NULL,	0.00000001,	"scheduled_1",	"TRK")	;
+												add_job(0,	1,	"system_advance_sim_time",	NULL,	1,	"advance_sim_time",	"TRK")	;
+								}
+
+								virtual	int	call_function(	Trick::JobData	*	)	{	return	0	;	}	;
+								virtual	double	call_function_double(	Trick::JobData	*	curr_job	)	{	(void)curr_job	;	return	0.0	;	}	;
+}	;
+
+class	testSimObject	:	public	Trick::SimObject	{
+				public:
+
+								unsigned	int	default_data_ran	;
+								unsigned	int	input_processor_ran	;
+								unsigned	int	initialization_ran	;
+								unsigned	int	top_of_frame_ran	;
+								unsigned	int	scheduled_ran	;
+								unsigned	int	end_of_frame_ran	;
+								unsigned	int	shutdown_ran	;
+								unsigned	int	freeze_init_ran	;
+								unsigned	int	freeze_ran	;
+								unsigned	int	freeze_scheduled_ran	;
+								unsigned	int	unfreeze_ran	;
+								unsigned	int	time_tic_changed_ran	;
+
+								int	default_data_1()	{
+												default_data_ran++	;
+												return	0	;
+								}
+
+								int	input_processor_1()	{
+												input_processor_ran++	;
+												return	0	;
+								}
+
+								int	initialization_1()	{
+												initialization_ran++	;
+												return	0	;
+								}
+
+								int	top_of_frame_1()	{
+												top_of_frame_ran++	;
+												return	0	;
+								}
+
+								int	scheduled_1()	{
+												scheduled_ran++	;
+												return	0	;
+								}
+
+								int	end_of_frame_1()	{
+												end_of_frame_ran++	;
+												return	0	;
+								}
+
+								int	shutdown_1()	{
+												shutdown_ran++	;
+												return	0	;
+								}
+
+								int	freeze_init_1()	{
+												freeze_init_ran++	;
+												return	0	;
+								}
+
+								int	freeze_1()	{
+												freeze_ran++	;
+												return	0	;
+								}
+
+								int	freeze_scheduled_1()	{
+												freeze_scheduled_ran++	;
+												return	0	;
+								}
+
+								int	unfreeze_1()	{
+												unfreeze_ran++	;
+												return	0	;
+								}
+
+								int	time_tic_changed_1()	{
+												time_tic_changed_ran++	;
+												return	0	;
+								}
+
+								int	return_error()	{
+												return	-1	;
+								}
+
+								int	throw_exception()	{
+												return	exec_terminate_with_return(-1,	"throw_exception",	1	,	"exec_terminate	called")	;
+								}
+
+								testSimObject()	:
+									default_data_ran(0)	,
+									input_processor_ran(0)	,
+									initialization_ran(0)	,
+									top_of_frame_ran(0)	,
+									scheduled_ran(0)	,
+									end_of_frame_ran(0)	,
+									shutdown_ran(0)	,
+									freeze_init_ran(0)	,
+									freeze_ran(0)	,
+									freeze_scheduled_ran(0)	,
+									unfreeze_ran(0)	,
+									time_tic_changed_ran(0)
+								{
+												int	ii	=	0	;
+												add_job(0,	ii++,	"default_data",	NULL,	1,	"default_data_1",	"TRK")	;
+												add_job(0,	ii++,	"input_processor",	NULL,	1,	"input_processor_1",	"TRK")	;
+												add_job(0,	ii++,	"initialization",	NULL,	1,	"initialization_1",	"TRK")	;
+												add_job(0,	ii++,	"top_of_frame",	NULL,	1,	"top_of_frame_1",	"TRK")	;
+												add_job(0,	ii++,	"automatic",	NULL,	1,	"automatic_1",	"TRK")	;
+												add_job(0,	ii++,	"effector",	NULL,	3,	"scheduled_3",	"TRK")	;
+												add_job(0,	ii++,	"scheduled",	NULL,	2,	"scheduled_2",	"TRK")	;
+												add_job(0,	ii++,	"sensor",	NULL,	1,	"scheduled_1",	"TRK")	;
+												add_job(0,	ii++,	"system_advance_sim_time",	NULL,	1,	"advance_sim_time",	"TRK")	;
+												add_job(0,	ii++,	"end_of_frame",	NULL,	1,	"end_of_frame_1",	"TRK")	;
+												add_job(0,	ii++,	"shutdown",	NULL,	1,	"shutdown_1",	"TRK")	;
+												add_job(0,	ii++,	"freeze_init",	NULL,	1,	"freeze_init_1",	"TRK")	;
+												add_job(0,	ii++,	"freeze",	NULL,	1,	"freeze_1",	"TRK")	;
+												add_job(0,	ii++,	"freeze_scheduled",	NULL,	1,	"freeze_scheduled_1",	"TRK")	;
+												add_job(0,	ii++,	"unfreeze",	NULL,	1,	"unfreeze_1",	"TRK")	;
+												add_job(0,	ii++,	"exec_time_tic_changed",	NULL,	1,	"time_tic_changed_1",	"TRK")	;
+								}
+
+								virtual	int	call_function(	Trick::JobData	*	curr_job	)	;
+								virtual	double	call_function_double(	Trick::JobData	*	curr_job	)	{	(void)curr_job	;	return	0.0	;	}	;
+}	;
+
+int	testSimObject::call_function(	Trick::JobData	*	curr_job	)	{
+				int	trick_ret	=	0	;
+				switch	(curr_job->id)	{
+								case	0:
+												trick_ret	=	default_data_1()	;
+												break	;
+								case	1:
+												trick_ret	=	input_processor_1()	;
+												break	;
+								case	2:
+												trick_ret	=	initialization_1()	;
+												break	;
+								case	3:
+												trick_ret	=	top_of_frame_1()	;
+												break	;
+								case	4:
+								case	5:
+								case	6:
+								case	7:
+								case	8:
+												trick_ret	=	scheduled_1()	;
+												break	;
+								case	9:
+												trick_ret	=	end_of_frame_1()	;
+												break	;
+								case	10:
+												trick_ret	=	shutdown_1()	;
+												break	;
+								case	11:
+												trick_ret	=	freeze_init_1()	;
+												break	;
+								case	12:
+												trick_ret	=	freeze_1()	;
+												break	;
+								case	13:
+												trick_ret	=	freeze_scheduled_1()	;
+												break	;
+								case	14:
+												trick_ret	=	unfreeze_1()	;
+												break	;
+								case	15:
+												trick_ret	=	time_tic_changed_1()	;
+												break	;
+								case	101:
+												trick_ret	=	return_error()	;
+												break	;
+								case	102:
+												trick_ret	=	throw_exception()	;
+												break	;
+								default:
+												trick_ret	=	-1	;
+												break	;
+				}
+				return	trick_ret	;
+}	;
+
+
+class	ExecutiveTest	:	public	::testing::Test	{
+
+				protected:
+								Trick::Executive	exec;
+								testSimObject	so1	;
+								emptySimObject	empty_so	;
+								Trick::MessagePublisher	mpublisher	;
+								Trick::MessageCout	mcout	;
+								Trick::MemoryManager	mm	;
+								Trick::CommandLineArguments	cla	;
+								Trick::GetTimeOfDayClock	gtodc	;
+								//Trick::RequirementScribe	req;
+
+
+								ExecutiveTest()	{gtodc.set_global_clock();}
+								~ExecutiveTest()	{}
+								virtual	void	SetUp()	;
+								virtual	void	TearDown()	{}
+
+								int	get_class_map_value(std::string	job_class)	{	return	exec.class_map[job_class]	;	}
+								Trick::ScheduledJobQueue	*	get_default_data_queue()	{	return	&exec.default_data_queue	;	}
+								Trick::ScheduledJobQueue	*	get_input_processor_queue()	{	return	&exec.input_processor_queue	;	}
+								Trick::ScheduledJobQueue	*	get_initialization_queue()	{	return	&exec.initialization_queue	;	}
+								Trick::ScheduledJobQueue	*	get_scheduled_queue()	{	return	&exec.scheduled_queue	;	}
+								Trick::ScheduledJobQueue	*	get_end_of_frame_queue()	{	return	&exec.end_of_frame_queue	;	}
+								Trick::ScheduledJobQueue	*	get_shutdown_queue()	{	return	&exec.shutdown_queue	;	}
+								Trick::ScheduledJobQueue	*	get_freeze_init_queue()	{	return	&exec.freeze_init_queue	;	}
+								Trick::ScheduledJobQueue	*	get_freeze_queue()	{	return	&exec.freeze_queue	;	}
+								Trick::ScheduledJobQueue	*	get_unfreeze_queue()	{	return	&exec.unfreeze_queue	;	}
+								Trick::JobData	*	get_all_jobs()	{	return	exec.all_jobs_for_checkpoint	;	}
+								Trick::JobData	*	get_job_from_all_jobs(unsigned	int	ii	)	{	return	&(exec.all_jobs_for_checkpoint[ii])	;	}
+								Trick::SimObject	*	get_sim_object(unsigned	int	ii)	{	return	exec.sim_objects[ii]	;	}
+								Trick::Threads	*	get_thread(unsigned	int	ii)	{	return	exec.threads[ii]	;	}
+}	;
+
+
+void	ExecutiveTest::SetUp()	{
+
+				exec_add_scheduled_job_class("automatic")	;
+				exec_add_scheduled_job_class("sensor")	;
+				exec_add_scheduled_job_class("scheduled")	;
+				exec_add_scheduled_job_class("effector")	;
+				exec_add_scheduled_job_class("system_advance_sim_time")	;
+
+				mpublisher.init()	;
 }
 
 /*
-  Executive functions not tested here:
-    Process simulation arguments
-    Registering other schedulers
-    Creating threads
-    Get Process ID
-    Run Loop
-    Freeze Loop
-    Restart
-    Shutdown
-    Instrumenting Jobs
-    Write S_job_execution and S_run_summary
-    Signal handling
+		Executive	functions	not	tested	here:
+				Process	simulation	arguments
+				Registering	other	schedulers
+				Creating	threads
+				Get	Process	ID
+				Run	Loop
+				Freeze	Loop
+				Restart
+				Shutdown
+				Instrumenting	Jobs
+				Write	S_job_execution	and	S_run_summary
+				Signal	handling
 */
 
-/* JOB TESTS */
+/*	JOB	TESTS	*/
 
-TEST_F(ExecutiveTest , AddSimObject) {
-    //req.add_requirement( "r_exec_jobs");
-	//"The Executive Scheduler shall provide a method for adding simulation objects to the scheduler"
-    exec_add_sim_object(&so1 , "so1") ;
+TEST_F(ExecutiveTest	,	AddSimObject)	{
+				//req.add_requirement(	"r_exec_jobs");
+	//"The	Executive	Scheduler	shall	provide	a	method	for	adding	simulation	objects	to	the	scheduler"
+				exec_add_sim_object(&so1	,	"so1")	;
 }
 
-TEST_F(ExecutiveTest , AddJobsToQueue) {
-    //req.add_requirement( "r_exec_jobs");
-	//"The Executive Scheduler shall sort jobs with executive job classes in ScheduledJobQueues"
-    exec_add_sim_object(&so1 , "so1") ;
+TEST_F(ExecutiveTest	,	AddJobsToQueue)	{
+				//req.add_requirement(	"r_exec_jobs");
+	//"The	Executive	Scheduler	shall	sort	jobs	with	executive	job	classes	in	ScheduledJobQueues"
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    Trick::JobData * curr_job ;
-    curr_job = get_default_data_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.default_data_1") ;
+				Trick::JobData	*	curr_job	;
+				curr_job	=	get_default_data_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.default_data_1")	;
 
-    curr_job = get_input_processor_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.input_processor_1") ;
+				curr_job	=	get_input_processor_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.input_processor_1")	;
 
-    curr_job = get_initialization_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.initialization_1") ;
+				curr_job	=	get_initialization_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.initialization_1")	;
 
-    curr_job = get_scheduled_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.automatic_1") ;
+				curr_job	=	get_scheduled_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.automatic_1")	;
 
-    curr_job = get_scheduled_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_1") ;
+				curr_job	=	get_scheduled_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_1")	;
 
-    curr_job = get_scheduled_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_2") ;
+				curr_job	=	get_scheduled_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_2")	;
 
-    curr_job = get_scheduled_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_3") ;
+				curr_job	=	get_scheduled_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_3")	;
 }
 
-TEST_F(ExecutiveTest , JobQueueNonScheduledIDs) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall assign job class id of the following classes < 1000, default_data , input_processor , initialization , top_of_frame , end_of_frame , shutdown , freeze_init , freeze_scheduled , freeze_automatic, freeze , unfreeze, and exec_time_tic_changed"
-    EXPECT_LT( get_class_map_value("default_data") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("input_processor") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("initialization") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("top_of_frame") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("end_of_frame") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("shutdown") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("freeze_init") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("freeze_scheduled") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("freeze_automatic") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("freeze") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("unfreeze") , 1000 ) ;
-    EXPECT_LT( get_class_map_value("exec_time_tic_changed") , 1000 ) ;
+TEST_F(ExecutiveTest	,	JobQueueNonScheduledIDs)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	assign	job	class	id	of	the	following	classes	<	1000,	default_data	,	input_processor	,	initialization	,	top_of_frame	,	end_of_frame	,	shutdown	,	freeze_init	,	freeze_scheduled	,	freeze_automatic,	freeze	,	unfreeze,	and	exec_time_tic_changed"
+				EXPECT_LT(	get_class_map_value("default_data")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("input_processor")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("initialization")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("top_of_frame")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("end_of_frame")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("shutdown")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("freeze_init")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("freeze_scheduled")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("freeze_automatic")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("freeze")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("unfreeze")	,	1000	)	;
+				EXPECT_LT(	get_class_map_value("exec_time_tic_changed")	,	1000	)	;
 }
 
-TEST_F(ExecutiveTest , AddScheduledJobClass) {
-    //req.add_requirement("1630595230");
-	//"The Executive Scheduler shall provide a method for adding scheduled job class names"
-    // some names were added in the SetUp method
-    EXPECT_EQ( get_class_map_value("automatic") , 1000 ) ;
+TEST_F(ExecutiveTest	,	AddScheduledJobClass)	{
+				//req.add_requirement("1630595230");
+	//"The	Executive	Scheduler	shall	provide	a	method	for	adding	scheduled	job	class	names"
+				//	some	names	were	added	in	the	SetUp	method
+				EXPECT_EQ(	get_class_map_value("automatic")	,	1000	)	;
 }
 
-TEST_F(ExecutiveTest , JobQueueStartIndex) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall assign the first scheduled job class id = 1000"
-    EXPECT_EQ( get_class_map_value("automatic") , 1000 ) ;
+TEST_F(ExecutiveTest	,	JobQueueStartIndex)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	assign	the	first	scheduled	job	class	id	=	1000"
+				EXPECT_EQ(	get_class_map_value("automatic")	,	1000	)	;
 }
 
-TEST_F(ExecutiveTest , JobQueueNameOrder) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall increment the job class id for each additional scheduled job class"
+TEST_F(ExecutiveTest	,	JobQueueNameOrder)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	increment	the	job	class	id	for	each	additional	scheduled	job	class"
 
-    EXPECT_EQ( get_class_map_value("automatic") , 1000 ) ;
-    EXPECT_EQ( get_class_map_value("sensor") , 1001 ) ;
-    EXPECT_EQ( get_class_map_value("scheduled") , 1002 ) ;
-    EXPECT_EQ( get_class_map_value("effector") , 1003 ) ;
-    EXPECT_EQ( get_class_map_value("system_advance_sim_time") , 1004 ) ;
+				EXPECT_EQ(	get_class_map_value("automatic")	,	1000	)	;
+				EXPECT_EQ(	get_class_map_value("sensor")	,	1001	)	;
+				EXPECT_EQ(	get_class_map_value("scheduled")	,	1002	)	;
+				EXPECT_EQ(	get_class_map_value("effector")	,	1003	)	;
+				EXPECT_EQ(	get_class_map_value("system_advance_sim_time")	,	1004	)	;
 }
 
-// Job class ordering is tested in ScheduledJobQueue.
+//	Job	class	ordering	is	tested	in	ScheduledJobQueue.
 
-TEST_F(ExecutiveTest , AddDepends) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall provide the capability to add dependency jobs to scheduled jobs"
+TEST_F(ExecutiveTest	,	AddDepends)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	provide	the	capability	to	add	dependency	jobs	to	scheduled	jobs"
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    so1.add_job(1, 100, "scheduled", NULL, 1, "child_job_1", "TRK") ;
-    so1.add_job(2, 100, "scheduled", NULL, 1, "child_job_2a", "TRK") ;
-    so1.add_job(2, 100, "scheduled", NULL, 1, "child_job_2b", "TRK") ;
+				so1.add_job(1,	100,	"scheduled",	NULL,	1,	"child_job_1",	"TRK")	;
+				so1.add_job(2,	100,	"scheduled",	NULL,	1,	"child_job_2a",	"TRK")	;
+				so1.add_job(2,	100,	"scheduled",	NULL,	1,	"child_job_2b",	"TRK")	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    EXPECT_EQ(exec.add_depends_on_job("so1.child_job_3" , 1 , "so1.scheduled_1" , 1), -1) ;
-    EXPECT_EQ(exec.add_depends_on_job("so1.child_job_1" , 1 , "so1.scheduled_4" , 1), -2) ;
-    EXPECT_EQ(exec.add_depends_on_job("so1.child_job_2a" , 1 , "so1.child_job_2b" , 1), -3) ;
-    EXPECT_EQ(exec.add_depends_on_job("so1.scheduled_1" , 1 , "so1.scheduled_1" , 1), -3) ;
+				EXPECT_EQ(exec.add_depends_on_job("so1.child_job_3"	,	1	,	"so1.scheduled_1"	,	1),	-1)	;
+				EXPECT_EQ(exec.add_depends_on_job("so1.child_job_1"	,	1	,	"so1.scheduled_4"	,	1),	-2)	;
+				EXPECT_EQ(exec.add_depends_on_job("so1.child_job_2a"	,	1	,	"so1.child_job_2b"	,	1),	-3)	;
+				EXPECT_EQ(exec.add_depends_on_job("so1.scheduled_1"	,	1	,	"so1.scheduled_1"	,	1),	-3)	;
 
-    curr_job = exec.get_job("so1.child_job_1") ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_EQ(curr_job->depends.size(), (unsigned int)0) ;
-    EXPECT_EQ(exec.add_depends_on_job("so1.child_job_1" , 1 , "so1.scheduled_1" , 1), 0) ;
-    EXPECT_EQ(curr_job->depends.size(), (unsigned int)1) ;
-    EXPECT_STREQ(curr_job->depends[0]->name.c_str(), "so1.scheduled_1") ;
+				curr_job	=	exec.get_job("so1.child_job_1")	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_EQ(curr_job->depends.size(),	(unsigned	int)0)	;
+				EXPECT_EQ(exec.add_depends_on_job("so1.child_job_1"	,	1	,	"so1.scheduled_1"	,	1),	0)	;
+				EXPECT_EQ(curr_job->depends.size(),	(unsigned	int)1)	;
+				EXPECT_STREQ(curr_job->depends[0]->name.c_str(),	"so1.scheduled_1")	;
 
 }
 
-TEST_F(ExecutiveTest , UnhandledJobs) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall provide the capability to list jobs not handled by any scheduler."
+TEST_F(ExecutiveTest	,	UnhandledJobs)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	provide	the	capability	to	list	jobs	not	handled	by	any	scheduler."
 
-    so1.add_job(0, 100, "unhandled", NULL, 1, "unhandled_job", "") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.check_all_jobs_handled() , 1 ) ;
+				so1.add_job(0,	100,	"unhandled",	NULL,	1,	"unhandled_job",	"")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.check_all_jobs_handled()	,	1	)	;
 }
 
-TEST_F(ExecutiveTest , JobCycleNotDivisibleByTimeTic) {
-    //req.add_requirement("r_exec_jobs");
-	//"The Executive Scheduler shall provide the capability to list jobs not handled by any scheduler."
+TEST_F(ExecutiveTest	,	JobCycleNotDivisibleByTimeTic)	{
+				//req.add_requirement("r_exec_jobs");
+	//"The	Executive	Scheduler	shall	provide	the	capability	to	list	jobs	not	handled	by	any	scheduler."
 
-    EXPECT_EQ(exec_get_time_tic_value(), 1000000) ;
-    exec_add_sim_object(&empty_so , "empty_so") ;
-    EXPECT_EQ(exec.check_all_job_cycle_times() , -1 ) ;
-}
-
-/* INITIALIZATION */
-
-TEST_F(ExecutiveTest , GoodInitialization) {
-    //req.add_requirement("2605574440") ;
-
-    exec_add_sim_object(&so1 , "so1") ;
-
-    EXPECT_EQ(exec.init() , 0 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 1 ) ;
-    EXPECT_EQ(so1.initialization_ran , 1 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-
-}
-
-TEST_F(ExecutiveTest , ErrorDefaultData) {
-    //req.add_requirement("773089468") ;
-
-    so1.add_job(0, 101, "default_data", NULL, 1, "return_error", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 0 ) ;
-    EXPECT_EQ(so1.initialization_ran , 0 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-TEST_F(ExecutiveTest , ErrorInputProcessor) {
-    //req.add_requirement("773089468") ;
-
-    so1.add_job(0, 101, "input_processor", NULL, 1, "return_error", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 1 ) ;
-    EXPECT_EQ(so1.initialization_ran , 0 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-TEST_F(ExecutiveTest , ErrorInitialization) {
-    //req.add_requirement("773089468") ;
-
-    so1.add_job(0, 101, "initialization", NULL, 1, "return_error", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 1 ) ;
-    EXPECT_EQ(so1.initialization_ran , 1 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-TEST_F(ExecutiveTest , ExeceptionDefaultData) {
-    //req.add_requirement("773089468") ;
-    so1.add_job(0, 102, "default_data", NULL, 1, "throw_exception", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 0 ) ;
-    EXPECT_EQ(so1.initialization_ran , 0 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-TEST_F(ExecutiveTest , ExeceptionInputProcessor) {
-    //req.add_requirement("773089468") ;
-    so1.add_job(0, 102, "input_processor", NULL, 1, "throw_exception", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 1 ) ;
-    EXPECT_EQ(so1.initialization_ran , 0 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-TEST_F(ExecutiveTest , ExeceptionInitialization) {
-    //req.add_requirement("2605574440") ;
-    so1.add_job(0, 102, "initialization", NULL, 1, "throw_exception", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.init() , -1 ) ;
-
-    EXPECT_EQ(so1.default_data_ran , 1 ) ;
-    EXPECT_EQ(so1.input_processor_ran , 1 ) ;
-    EXPECT_EQ(so1.initialization_ran , 1 ) ;
-    EXPECT_EQ(so1.top_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.end_of_frame_ran , 0 ) ;
-    EXPECT_EQ(so1.shutdown_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_init_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_ran , 0 ) ;
-    EXPECT_EQ(so1.freeze_scheduled_ran , 0 ) ;
-    EXPECT_EQ(so1.unfreeze_ran , 0 ) ;
-    EXPECT_EQ(so1.time_tic_changed_ran , 0 ) ;
-}
-
-/* TIME TESTS */
-
-TEST_F(ExecutiveTest , IntegerTime) {
-    //req.add_requirement("2618149062");
-	//"The Executive Scheduler shall track simulation elapsed time by an integer count of tics/second") ;
-    EXPECT_EQ(exec_get_time_tics(), 0) ;
-}
-
-TEST_F(ExecutiveTest , DefaultTimeTicValue) {
-    //req.add_requirement("2436759852");
-	// "The Executive Scheduler shall default to 1,000,000 tics/second") ;
-    EXPECT_EQ(exec_get_time_tic_value(), 1000000) ;
-}
-
-TEST_F(ExecutiveTest , AdvanceSimTimeToNextJob) {
-
-    //req.add_requirement("2449626778");
-	//"The Executive Scheduler shall advance simulation time to the time of the next lowest job call time if the next lowest job call time is less than the next software frame boundary ") ;
-    Trick::Threads * curr_thread ;
-    Trick::JobData * curr_job ;
-
-    exec_add_sim_object(&empty_so , "empty_so") ;
-
-    curr_thread = get_thread(0) ;
-
-    // Test where next job call time is less than the frame boundary
-    exec.set_time_tics(0) ;
-    do {
-       curr_job = curr_thread->job_queue.get_next_job() ;
-    } while ( curr_job != NULL ) ;
-    curr_thread->job_queue.set_next_job_call_time(20000) ;
-    exec.set_software_frame(0.05) ;
-    EXPECT_EQ( exec.get_time_tics() , 0 ) ;
-    exec.advance_sim_time() ;
-    EXPECT_EQ( exec.get_time_tics() , 20000 ) ;
-}
-
-TEST_F(ExecutiveTest , AdvanceSimTimeToBoundary) {
+				EXPECT_EQ(exec_get_time_tic_value(),	1000000)	;
+				exec_add_sim_object(&empty_so	,	"empty_so")	;
+				EXPECT_EQ(exec.check_all_job_cycle_times()	,	-1	)	;
+}
+
+/*	INITIALIZATION	*/
+
+TEST_F(ExecutiveTest	,	GoodInitialization)	{
+				//req.add_requirement("2605574440")	;
+
+				exec_add_sim_object(&so1	,	"so1")	;
+
+				EXPECT_EQ(exec.init()	,	0	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	1	)	;
+				EXPECT_EQ(so1.initialization_ran	,	1	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+
+}
+
+TEST_F(ExecutiveTest	,	ErrorDefaultData)	{
+				//req.add_requirement("773089468")	;
+
+				so1.add_job(0,	101,	"default_data",	NULL,	1,	"return_error",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	0	)	;
+				EXPECT_EQ(so1.initialization_ran	,	0	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+TEST_F(ExecutiveTest	,	ErrorInputProcessor)	{
+				//req.add_requirement("773089468")	;
+
+				so1.add_job(0,	101,	"input_processor",	NULL,	1,	"return_error",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	1	)	;
+				EXPECT_EQ(so1.initialization_ran	,	0	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+TEST_F(ExecutiveTest	,	ErrorInitialization)	{
+				//req.add_requirement("773089468")	;
+
+				so1.add_job(0,	101,	"initialization",	NULL,	1,	"return_error",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	1	)	;
+				EXPECT_EQ(so1.initialization_ran	,	1	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+TEST_F(ExecutiveTest	,	ExeceptionDefaultData)	{
+				//req.add_requirement("773089468")	;
+				so1.add_job(0,	102,	"default_data",	NULL,	1,	"throw_exception",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	0	)	;
+				EXPECT_EQ(so1.initialization_ran	,	0	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+TEST_F(ExecutiveTest	,	ExeceptionInputProcessor)	{
+				//req.add_requirement("773089468")	;
+				so1.add_job(0,	102,	"input_processor",	NULL,	1,	"throw_exception",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	1	)	;
+				EXPECT_EQ(so1.initialization_ran	,	0	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+TEST_F(ExecutiveTest	,	ExeceptionInitialization)	{
+				//req.add_requirement("2605574440")	;
+				so1.add_job(0,	102,	"initialization",	NULL,	1,	"throw_exception",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.init()	,	-1	)	;
+
+				EXPECT_EQ(so1.default_data_ran	,	1	)	;
+				EXPECT_EQ(so1.input_processor_ran	,	1	)	;
+				EXPECT_EQ(so1.initialization_ran	,	1	)	;
+				EXPECT_EQ(so1.top_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.end_of_frame_ran	,	0	)	;
+				EXPECT_EQ(so1.shutdown_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_init_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_ran	,	0	)	;
+				EXPECT_EQ(so1.freeze_scheduled_ran	,	0	)	;
+				EXPECT_EQ(so1.unfreeze_ran	,	0	)	;
+				EXPECT_EQ(so1.time_tic_changed_ran	,	0	)	;
+}
+
+/*	TIME	TESTS	*/
+
+TEST_F(ExecutiveTest	,	IntegerTime)	{
+				//req.add_requirement("2618149062");
+	//"The	Executive	Scheduler	shall	track	simulation	elapsed	time	by	an	integer	count	of	tics/second")	;
+				EXPECT_EQ(exec_get_time_tics(),	0)	;
+}
+
+TEST_F(ExecutiveTest	,	DefaultTimeTicValue)	{
+				//req.add_requirement("2436759852");
+	//	"The	Executive	Scheduler	shall	default	to	1,000,000	tics/second")	;
+				EXPECT_EQ(exec_get_time_tic_value(),	1000000)	;
+}
+
+TEST_F(ExecutiveTest	,	AdvanceSimTimeToNextJob)	{
+
+				//req.add_requirement("2449626778");
+	//"The	Executive	Scheduler	shall	advance	simulation	time	to	the	time	of	the	next	lowest	job	call	time	if	the	next	lowest	job	call	time	is	less	than	the	next	software	frame	boundary	")	;
+				Trick::Threads	*	curr_thread	;
+				Trick::JobData	*	curr_job	;
+
+				exec_add_sim_object(&empty_so	,	"empty_so")	;
+
+				curr_thread	=	get_thread(0)	;
+
+				//	Test	where	next	job	call	time	is	less	than	the	frame	boundary
+				exec.set_time_tics(0)	;
+				do	{
+							curr_job	=	curr_thread->job_queue.get_next_job()	;
+				}	while	(	curr_job	!=	NULL	)	;
+				curr_thread->job_queue.set_next_job_call_time(20000)	;
+				exec.set_software_frame(0.05)	;
+				EXPECT_EQ(	exec.get_time_tics()	,	0	)	;
+				exec.advance_sim_time()	;
+				EXPECT_EQ(	exec.get_time_tics()	,	20000	)	;
+}
+
+TEST_F(ExecutiveTest	,	AdvanceSimTimeToBoundary)	{
 
-    //req.add_requirement("4140012270");
-	// "The Executive Scheduler shall advance simulation time to the time of the next software boundary if the next lowest job call time is greater than or equal to the next software frame boundary ") ;
-    Trick::Threads * curr_thread ;
+				//req.add_requirement("4140012270");
+	//	"The	Executive	Scheduler	shall	advance	simulation	time	to	the	time	of	the	next	software	boundary	if	the	next	lowest	job	call	time	is	greater	than	or	equal	to	the	next	software	frame	boundary	")	;
+				Trick::Threads	*	curr_thread	;
 
-    exec_add_sim_object(&empty_so , "empty_so") ;
+				exec_add_sim_object(&empty_so	,	"empty_so")	;
 
-    curr_thread = get_thread(0) ;
+				curr_thread	=	get_thread(0)	;
 
-    // Test where next job call time is less than the frame boundary
-    exec.set_software_frame(0.05) ;
-    exec.init() ;
-    curr_thread->job_queue.set_next_job_call_time(200000) ;
-    EXPECT_EQ( exec.get_time_tics() , 0 ) ;
-    exec.advance_sim_time() ;
-    EXPECT_EQ( exec.get_time_tics() , 50000 ) ;
+				//	Test	where	next	job	call	time	is	less	than	the	frame	boundary
+				exec.set_software_frame(0.05)	;
+				exec.init()	;
+				curr_thread->job_queue.set_next_job_call_time(200000)	;
+				EXPECT_EQ(	exec.get_time_tics()	,	0	)	;
+				exec.advance_sim_time()	;
+				EXPECT_EQ(	exec.get_time_tics()	,	50000	)	;
 
 }
 
-TEST_F(ExecutiveTest , Checkpoint) {
+TEST_F(ExecutiveTest	,	Checkpoint)	{
 
-    //req.add_requirement("2678139818 1653083281");
-	//"The Executive Scheduler shall copy all job information to a checkpointable array before a checkpoint is executed") ;
+				//req.add_requirement("2678139818	1653083281");
+	//"The	Executive	Scheduler	shall	copy	all	job	information	to	a	checkpointable	array	before	a	checkpoint	is	executed")	;
 
-    unsigned int ii = 0 ;
-    Trick::JobData * curr_job ;
-    Trick::SimObject * curr_obj ;
+				unsigned	int	ii	=	0	;
+				Trick::JobData	*	curr_job	;
+				Trick::SimObject	*	curr_obj	;
 
-    exec_add_sim_object(&so1 , "so1") ;
-    exec.checkpoint() ;
+				exec_add_sim_object(&so1	,	"so1")	;
+				exec.checkpoint()	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.default_data_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.default_data_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.input_processor_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.input_processor_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.initialization_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.initialization_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.top_of_frame_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.top_of_frame_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.automatic_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.automatic_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_3") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_3")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_2") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_2")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.scheduled_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.scheduled_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.advance_sim_time") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.advance_sim_time")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.end_of_frame_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.end_of_frame_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.shutdown_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.shutdown_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.freeze_init_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.freeze_init_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.freeze_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.freeze_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.freeze_scheduled_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.freeze_scheduled_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.unfreeze_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.unfreeze_1")	;
 
-    curr_job = get_job_from_all_jobs(ii++) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.time_tic_changed_1") ;
+				curr_job	=	get_job_from_all_jobs(ii++)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.time_tic_changed_1")	;
 
-    ii = 0 ;
-    curr_obj = get_sim_object(ii++) ;
-    ASSERT_FALSE( curr_obj == NULL ) ;
-    EXPECT_STREQ( curr_obj->name.c_str() , "so1") ;
+				ii	=	0	;
+				curr_obj	=	get_sim_object(ii++)	;
+				ASSERT_FALSE(	curr_obj	==	NULL	)	;
+				EXPECT_STREQ(	curr_obj->name.c_str()	,	"so1")	;
 }
 
-TEST_F(ExecutiveTest , ClearScheduledQueues) {
+TEST_F(ExecutiveTest	,	ClearScheduledQueues)	{
 	//req.add_requirement("");
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    EXPECT_FALSE(get_default_data_queue()->empty()) ;
-    EXPECT_FALSE(get_initialization_queue()->empty()) ;
-    EXPECT_FALSE(get_scheduled_queue()->empty()) ;
-    EXPECT_FALSE(get_end_of_frame_queue()->empty()) ;
-    EXPECT_FALSE(get_shutdown_queue()->empty()) ;
-    EXPECT_FALSE(get_freeze_init_queue()->empty()) ;
-    EXPECT_FALSE(get_freeze_queue()->empty()) ;
-    EXPECT_FALSE(get_unfreeze_queue()->empty()) ;
+				EXPECT_FALSE(get_default_data_queue()->empty())	;
+				EXPECT_FALSE(get_initialization_queue()->empty())	;
+				EXPECT_FALSE(get_scheduled_queue()->empty())	;
+				EXPECT_FALSE(get_end_of_frame_queue()->empty())	;
+				EXPECT_FALSE(get_shutdown_queue()->empty())	;
+				EXPECT_FALSE(get_freeze_init_queue()->empty())	;
+				EXPECT_FALSE(get_freeze_queue()->empty())	;
+				EXPECT_FALSE(get_unfreeze_queue()->empty())	;
 
-    exec.clear_scheduled_queues() ;
+				exec.clear_scheduled_queues()	;
 
-    EXPECT_TRUE(get_default_data_queue()->empty()) ;
-    EXPECT_TRUE(get_initialization_queue()->empty()) ;
-    EXPECT_TRUE(get_scheduled_queue()->empty()) ;
-    EXPECT_TRUE(get_end_of_frame_queue()->empty()) ;
-    EXPECT_TRUE(get_shutdown_queue()->empty()) ;
-    EXPECT_TRUE(get_freeze_init_queue()->empty()) ;
-    EXPECT_TRUE(get_freeze_queue()->empty()) ;
-    EXPECT_TRUE(get_unfreeze_queue()->empty()) ;
+				EXPECT_TRUE(get_default_data_queue()->empty())	;
+				EXPECT_TRUE(get_initialization_queue()->empty())	;
+				EXPECT_TRUE(get_scheduled_queue()->empty())	;
+				EXPECT_TRUE(get_end_of_frame_queue()->empty())	;
+				EXPECT_TRUE(get_shutdown_queue()->empty())	;
+				EXPECT_TRUE(get_freeze_init_queue()->empty())	;
+				EXPECT_TRUE(get_freeze_queue()->empty())	;
+				EXPECT_TRUE(get_unfreeze_queue()->empty())	;
 
 }
 
-TEST_F(ExecutiveTest , Moding) {
-	//req.add_requirement("411993330 2253353824 2874482372");
+TEST_F(ExecutiveTest	,	Moding)	{
+	//req.add_requirement("411993330	2253353824	2874482372");
 
-    exec.freeze() ;
-    exec.async_freeze_to_exec_command() ;
-    EXPECT_EQ(exec_get_exec_command() , FreezeCmd) ;
-    exec.run() ;
-    EXPECT_EQ(exec_get_exec_command() , RunCmd) ;
-    exec.stop() ;
-    EXPECT_EQ(exec_get_exec_command() , ExitCmd) ;
-    exec.stop(123.0) ;
-    EXPECT_NEAR(exec_get_terminate_time() , 123.0 , 0.000001) ;
+				exec.freeze()	;
+				exec.async_freeze_to_exec_command()	;
+				EXPECT_EQ(exec_get_exec_command()	,	FreezeCmd)	;
+				exec.run()	;
+				EXPECT_EQ(exec_get_exec_command()	,	RunCmd)	;
+				exec.stop()	;
+				EXPECT_EQ(exec_get_exec_command()	,	ExitCmd)	;
+				exec.stop(123.0)	;
+				EXPECT_NEAR(exec_get_terminate_time()	,	123.0	,	0.000001)	;
 }
 
-TEST_F(ExecutiveTest , GetJob) {
+TEST_F(ExecutiveTest	,	GetJob)	{
 	//req.add_requirement("");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    /* Add a second job of the same name of an existing job */
-    curr_job = so1.add_job(0, 100, "sensor", NULL, 1, "shutdown_1", "TRK") ;
+				/*	Add	a	second	job	of	the	same	name	of	an	existing	job	*/
+				curr_job	=	so1.add_job(0,	100,	"sensor",	NULL,	1,	"shutdown_1",	"TRK")	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = exec.get_job( std::string("so1.shutdown_1")) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->job_class_name.c_str() , "shutdown") ;
+				curr_job	=	exec.get_job(	std::string("so1.shutdown_1"))	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->job_class_name.c_str()	,	"shutdown")	;
 
-    curr_job = exec.get_job( std::string("so1.shutdown_1"), 2) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->job_class_name.c_str() , "sensor") ;
+				curr_job	=	exec.get_job(	std::string("so1.shutdown_1"),	2)	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->job_class_name.c_str()	,	"sensor")	;
 
-    curr_job = exec.get_job( std::string("so1.shutdown_1"), 3) ;
-    ASSERT_TRUE( curr_job == NULL ) ;
+				curr_job	=	exec.get_job(	std::string("so1.shutdown_1"),	3)	;
+				ASSERT_TRUE(	curr_job	==	NULL	)	;
 
-    curr_job = exec.get_job( std::string("so1.does_not_exist")) ;
-    ASSERT_TRUE( curr_job == NULL ) ;
+				curr_job	=	exec.get_job(	std::string("so1.does_not_exist"))	;
+				ASSERT_TRUE(	curr_job	==	NULL	)	;
 
 }
 
-TEST_F(ExecutiveTest , JobCycle) {
+TEST_F(ExecutiveTest	,	JobCycle)	{
 	//req.add_requirement("");
 
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_NEAR( exec.get_job_cycle(std::string("so1.scheduled_3")) , 3.0 , 0.000001) ;
-    EXPECT_NEAR( exec.get_job_cycle(std::string("so1.scheduled_2")) , 2.0 , 0.000001) ;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_NEAR(	exec.get_job_cycle(std::string("so1.scheduled_3"))	,	3.0	,	0.000001)	;
+				EXPECT_NEAR(	exec.get_job_cycle(std::string("so1.scheduled_2"))	,	2.0	,	0.000001)	;
 
-    EXPECT_EQ(exec.set_job_cycle("so1.scheduled_2", 1, 22.2), 0) ;
-    EXPECT_NEAR( exec.get_job_cycle(std::string("so1.scheduled_2")) , 22.2 , 0.000001) ;
+				EXPECT_EQ(exec.set_job_cycle("so1.scheduled_2",	1,	22.2),	0)	;
+				EXPECT_NEAR(	exec.get_job_cycle(std::string("so1.scheduled_2"))	,	22.2	,	0.000001)	;
 
-    EXPECT_EQ(exec.set_job_cycle("so1.scheduled_2", 1, -3.3), -1) ;
+				EXPECT_EQ(exec.set_job_cycle("so1.scheduled_2",	1,	-3.3),	-1)	;
 
-    EXPECT_EQ(exec.set_job_cycle("so1.scheduled_4", 1, 22.2), -2) ;
+				EXPECT_EQ(exec.set_job_cycle("so1.scheduled_4",	1,	22.2),	-2)	;
 
-    // All other job classes are defaulted to cycle time of 1.0 seconds even though they are not used.
-    EXPECT_NEAR( exec.get_job_cycle(std::string("so1.shutdown_1")) , 1.0 , 0.000001) ;
+				//	All	other	job	classes	are	defaulted	to	cycle	time	of	1.0	seconds	even	though	they	are	not	used.
+				EXPECT_NEAR(	exec.get_job_cycle(std::string("so1.shutdown_1"))	,	1.0	,	0.000001)	;
 }
 
 
-TEST_F(ExecutiveTest , SetSignalHandlers) {
+TEST_F(ExecutiveTest	,	SetSignalHandlers)	{
 	//req.add_requirement("");
 
-    static struct sigaction sigact;
-
-    exec.init_signal_handlers() ;
-    sigaction(SIGINT, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == ctrl_c_hand ) ;
-    sigaction(SIGTERM, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == term_hand ) ;
-    sigaction(SIGBUS, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == sig_hand ) ;
-    sigaction(SIGSEGV, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == sig_hand ) ;
-    sigaction(SIGFPE, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == SIG_DFL ) ;
-
-    exec.set_trap_sigbus(1) ;
-    exec.set_trap_sigsegv(1) ;
-    exec.set_trap_sigfpe(1) ;
-    exec.set_trap_sigchld(1) ;
-    sigaction(SIGBUS, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == sig_hand ) ;
-    sigaction(SIGSEGV, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == sig_hand ) ;
-    sigaction(SIGCHLD, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == child_handler ) ;
-    sigaction(SIGFPE, NULL , &sigact) ;
-#if __APPLE__
-    EXPECT_TRUE( sigact.sa_handler == fpe_sig_handler ) ;
+				static	struct	sigaction	sigact;
+
+				exec.init_signal_handlers()	;
+				sigaction(SIGINT,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	ctrl_c_hand	)	;
+				sigaction(SIGTERM,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	term_hand	)	;
+				sigaction(SIGBUS,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	sig_hand	)	;
+				sigaction(SIGSEGV,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	sig_hand	)	;
+				sigaction(SIGFPE,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	SIG_DFL	)	;
+
+				exec.set_trap_sigbus(1)	;
+				exec.set_trap_sigsegv(1)	;
+				exec.set_trap_sigfpe(1)	;
+				exec.set_trap_sigchld(1)	;
+				sigaction(SIGBUS,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	sig_hand	)	;
+				sigaction(SIGSEGV,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	sig_hand	)	;
+				sigaction(SIGCHLD,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	child_handler	)	;
+				sigaction(SIGFPE,	NULL	,	&sigact)	;
+#if	__APPLE__
+				EXPECT_TRUE(	sigact.sa_handler	==	fpe_sig_handler	)	;
 #else
-    EXPECT_TRUE( sigact.sa_sigaction == fpe_sig_handler ) ;
+				EXPECT_TRUE(	sigact.sa_sigaction	==	fpe_sig_handler	)	;
 #endif
 
-    exec.set_trap_sigbus(0) ;
-    exec.set_trap_sigsegv(0) ;
-    exec.set_trap_sigfpe(0) ;
-    sigaction(SIGBUS, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == SIG_DFL ) ;
-    sigaction(SIGSEGV, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == SIG_DFL ) ;
-    sigaction(SIGFPE, NULL , &sigact) ;
-    EXPECT_TRUE( sigact.sa_handler == SIG_DFL ) ;
+				exec.set_trap_sigbus(0)	;
+				exec.set_trap_sigsegv(0)	;
+				exec.set_trap_sigfpe(0)	;
+				sigaction(SIGBUS,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	SIG_DFL	)	;
+				sigaction(SIGSEGV,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	SIG_DFL	)	;
+				sigaction(SIGFPE,	NULL	,	&sigact)	;
+				EXPECT_TRUE(	sigact.sa_handler	==	SIG_DFL	)	;
 }
 
-TEST_F(ExecutiveTest , JobOnOff) {
+TEST_F(ExecutiveTest	,	JobOnOff)	{
 	//req.add_requirement("2445198072");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    EXPECT_EQ(exec.set_job_onoff("so1.scheduled_1" , 1 , 1), 0) ;
-    curr_job = exec.get_job( std::string("so1.scheduled_1")) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_EQ( curr_job->disabled , false) ;
+				EXPECT_EQ(exec.set_job_onoff("so1.scheduled_1"	,	1	,	1),	0)	;
+				curr_job	=	exec.get_job(	std::string("so1.scheduled_1"))	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_EQ(	curr_job->disabled	,	false)	;
 
-    EXPECT_EQ(exec.set_job_onoff("so1.scheduled_1" , 1 , 0), 0) ;
-    EXPECT_EQ( curr_job->disabled , true) ;
+				EXPECT_EQ(exec.set_job_onoff("so1.scheduled_1"	,	1	,	0),	0)	;
+				EXPECT_EQ(	curr_job->disabled	,	true)	;
 
-    EXPECT_EQ(exec.set_job_onoff("so1.scheduled_4" , 1 , 0), -1) ;
+				EXPECT_EQ(exec.set_job_onoff("so1.scheduled_4"	,	1	,	0),	-1)	;
 }
 
-TEST_F(ExecutiveTest , SimObjectJobsOnOff) {
-    Trick::JobData * curr_job ;
+TEST_F(ExecutiveTest	,	SimObjectJobsOnOff)	{
+				Trick::JobData	*	curr_job	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    EXPECT_EQ(exec.set_sim_object_jobs_onoff("so1" , 0), 0) ;
-    curr_job = exec.get_job( std::string("so1.scheduled_1")) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_EQ( curr_job->disabled , true) ;
-    EXPECT_EQ( exec.get_sim_object_onoff("so1"), 1);
+				EXPECT_EQ(exec.set_sim_object_jobs_onoff("so1"	,	0),	0)	;
+				curr_job	=	exec.get_job(	std::string("so1.scheduled_1"))	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_EQ(	curr_job->disabled	,	true)	;
+				EXPECT_EQ(	exec.get_sim_object_onoff("so1"),	1);
 
-    EXPECT_EQ(exec.set_sim_object_jobs_onoff("so1" , 1), 0) ;
-    EXPECT_EQ( curr_job->disabled , false) ;
+				EXPECT_EQ(exec.set_sim_object_jobs_onoff("so1"	,	1),	0)	;
+				EXPECT_EQ(	curr_job->disabled	,	false)	;
 
-    EXPECT_EQ(exec.set_sim_object_jobs_onoff("so2" , 1), -1) ;
+				EXPECT_EQ(exec.set_sim_object_jobs_onoff("so2"	,	1),	-1)	;
 
 }
 
-TEST_F(ExecutiveTest , SimObjectOnOff) {
+TEST_F(ExecutiveTest	,	SimObjectOnOff)	{
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    // Test that after disabling and enabling sim object, top_of_frame is still disabled
-    Trick::JobData * curr_job = exec.get_job( std::string("so1.top_of_frame_1")) ;
-    ASSERT_FALSE( curr_job == NULL ) ;
+				//	Test	that	after	disabling	and	enabling	sim	object,	top_of_frame	is	still	disabled
+				Trick::JobData	*	curr_job	=	exec.get_job(	std::string("so1.top_of_frame_1"))	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
 
-    curr_job->disable();
+				curr_job->disable();
 
-    EXPECT_EQ(exec.set_sim_object_onoff("so1" , 0), 0) ;
-    EXPECT_EQ(exec.get_sim_object_onoff("so1"), 0);
-    EXPECT_EQ(curr_job->disabled , true) ;
+				EXPECT_EQ(exec.set_sim_object_onoff("so1"	,	0),	0)	;
+				EXPECT_EQ(exec.get_sim_object_onoff("so1"),	0);
+				EXPECT_EQ(curr_job->disabled	,	true)	;
 
-    // Add an extra job
-    so1.add_job(1, 100, "scheduled", NULL, 1, "child_job_1", "TRK") ;
-    exec.add_jobs_to_queue(&so1, false);
+				//	Add	an	extra	job
+				so1.add_job(1,	100,	"scheduled",	NULL,	1,	"child_job_1",	"TRK")	;
+				exec.add_jobs_to_queue(&so1,	false);
 
-    Trick::JobData * new_job = exec.get_job( std::string ("so1.child_job_1"));
-    ASSERT_FALSE( new_job == NULL ) ;
+				Trick::JobData	*	new_job	=	exec.get_job(	std::string	("so1.child_job_1"));
+				ASSERT_FALSE(	new_job	==	NULL	)	;
 
-    EXPECT_EQ(exec.set_sim_object_onoff("so1" , 1), 0) ;
-    EXPECT_EQ( exec.get_sim_object_onoff("so1"), 1);
-    EXPECT_EQ( curr_job->disabled , true) ;
-    EXPECT_EQ( new_job->disabled , false) ;
+				EXPECT_EQ(exec.set_sim_object_onoff("so1"	,	1),	0)	;
+				EXPECT_EQ(	exec.get_sim_object_onoff("so1"),	1);
+				EXPECT_EQ(	curr_job->disabled	,	true)	;
+				EXPECT_EQ(	new_job->disabled	,	false)	;
 
-    EXPECT_EQ(exec.set_sim_object_onoff("so2" , 1), -1) ;
-    EXPECT_EQ(exec.get_sim_object_onoff("so2"), -1) ;
+				EXPECT_EQ(exec.set_sim_object_onoff("so2"	,	1),	-1)	;
+				EXPECT_EQ(exec.get_sim_object_onoff("so2"),	-1)	;
 }
 
-TEST_F(ExecutiveTest , LockMemory) {
+TEST_F(ExecutiveTest	,	LockMemory)	{
 	//req.add_requirement("715042410");
-    // Requires root to run. Will pass if run as root.
-    //EXPECT_EQ(exec.set_lock_memory(true), 0) ;
+				//	Requires	root	to	run.	Will	pass	if	run	as	root.
+				//EXPECT_EQ(exec.set_lock_memory(true),	0)	;
 
 }
 
-TEST_F(ExecutiveTest , SetThreadParameters) {
+TEST_F(ExecutiveTest	,	SetThreadParameters)	{
 	//req.add_requirement("3839914374");
 
-    so1.add_job(1, 100, "scheduled", NULL, 1, "child_job_1", "TRK") ;
-    exec_add_sim_object(&so1 , "so1") ;
+				so1.add_job(1,	100,	"scheduled",	NULL,	1,	"child_job_1",	"TRK")	;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    EXPECT_EQ( exec.set_thread_process_type(0 , PROCESS_TYPE_SCHEDULED) , -2 ) ;
-    EXPECT_EQ( exec.set_thread_process_type(2 , PROCESS_TYPE_SCHEDULED) , -2 ) ;
+				EXPECT_EQ(	exec.set_thread_process_type(0	,	PROCESS_TYPE_SCHEDULED)	,	-2	)	;
+				EXPECT_EQ(	exec.set_thread_process_type(2	,	PROCESS_TYPE_SCHEDULED)	,	-2	)	;
 
-    EXPECT_EQ( exec.set_thread_amf_cycle_time(0 , 1.0) , -2 ) ;
-    EXPECT_EQ( exec.set_thread_amf_cycle_time(2 , 1.0) , -2 ) ;
+				EXPECT_EQ(	exec.set_thread_amf_cycle_time(0	,	1.0)	,	-2	)	;
+				EXPECT_EQ(	exec.set_thread_amf_cycle_time(2	,	1.0)	,	-2	)	;
 
-    EXPECT_EQ( exec.set_thread_process_type(1 , PROCESS_TYPE_SCHEDULED) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_amf_cycle_time(1 , 1.0) , 0 ) ;
+				EXPECT_EQ(	exec.set_thread_process_type(1	,	PROCESS_TYPE_SCHEDULED)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_amf_cycle_time(1	,	1.0)	,	0	)	;
 
-    EXPECT_EQ( exec.set_thread_process_type(1 , PROCESS_TYPE_ASYNC_CHILD) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_amf_cycle_time(1 , 1.0) , 0 ) ;
+				EXPECT_EQ(	exec.set_thread_process_type(1	,	PROCESS_TYPE_ASYNC_CHILD)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_amf_cycle_time(1	,	1.0)	,	0	)	;
 
-    EXPECT_EQ( exec.set_thread_process_type(1 , PROCESS_TYPE_AMF_CHILD) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_amf_cycle_time(1 , 1.0) , 0 ) ;
+				EXPECT_EQ(	exec.set_thread_process_type(1	,	PROCESS_TYPE_AMF_CHILD)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_amf_cycle_time(1	,	1.0)	,	0	)	;
 
-    EXPECT_EQ( exec.set_thread_async_wait(0 , 1) , -2 ) ;
-    EXPECT_EQ( exec.set_thread_async_wait(2 , 1) , -2 ) ;
-    EXPECT_EQ( exec.set_thread_async_wait(1 , 1) , 0 ) ;
+				EXPECT_EQ(	exec.set_thread_async_wait(0	,	1)	,	-2	)	;
+				EXPECT_EQ(	exec.set_thread_async_wait(2	,	1)	,	-2	)	;
+				EXPECT_EQ(	exec.set_thread_async_wait(1	,	1)	,	0	)	;
 
-    EXPECT_EQ( exec.set_thread_cpu_affinity(0 , 1) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_cpu_affinity(1 , 2) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_cpu_affinity(2 , 1) , -2 ) ;
+				EXPECT_EQ(	exec.set_thread_cpu_affinity(0	,	1)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_cpu_affinity(1	,	2)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_cpu_affinity(2	,	1)	,	-2	)	;
 
-    EXPECT_EQ( exec.set_thread_priority(0 , 1) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_priority(1 , 2) , 0 ) ;
-    EXPECT_EQ( exec.set_thread_priority(2 , 1) , -2 ) ;
+				EXPECT_EQ(	exec.set_thread_priority(0	,	1)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_priority(1	,	2)	,	0	)	;
+				EXPECT_EQ(	exec.set_thread_priority(2	,	1)	,	-2	)	;
 }
 
 }
diff --git a/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp
index ac377799f..34c853e67 100644
--- a/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp
+++ b/trick_source/sim_services/ExternalApplications/ExternalApplication.cpp
@@ -1,245 +1,245 @@
 
-#include <sstream>
-#include <iostream>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <vector>
-#include <cstring>
+#include	<sstream>
+#include	<iostream>
+#include	<stdlib.h>
+#include	<dlfcn.h>
+#include	<vector>
+#include	<cstring>
 
-#include "trick/ExternalApplication.hh"
-#include "trick/ExternalApplicationManager.hh"
-#include "trick/variable_server_proto.h"
-#include "trick/env_proto.h"
-#include "trick/command_line_protos.h"
-#include "trick/MemoryManager.hh"
-extern Trick::MemoryManager* trick_MM;
+#include	"trick/ExternalApplication.hh"
+#include	"trick/ExternalApplicationManager.hh"
+#include	"trick/variable_server_proto.h"
+#include	"trick/env_proto.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/MemoryManager.hh"
+extern	Trick::MemoryManager*	trick_MM;
 
-Trick::ExternalApplication::ExternalApplication() :
-    command(std::string(env_get_var("TRICK_HOME") + std::string("/bin/"))) {
-    host_source = port_source = AUTO;
-    cycle_period_set = minimum_cycle_period_set = disconnect_behavior_set = height_set =
-      width_set = x_set = y_set = auto_reconnect_set = false;
-      
-      // c_intf uses char *, we manage the memory here in external application
-      command_c_str = (char*)trick_MM->declare_var("char", (command.size() + 1) );
-      strcpy(command_c_str, command.c_str());
-      allocations.push_back(command_c_str);
+Trick::ExternalApplication::ExternalApplication()	:
+				command(std::string(env_get_var("TRICK_HOME")	+	std::string("/bin/")))	{
+				host_source	=	port_source	=	AUTO;
+				cycle_period_set	=	minimum_cycle_period_set	=	disconnect_behavior_set	=	height_set	=
+						width_set	=	x_set	=	y_set	=	auto_reconnect_set	=	false;
+						
+						//	c_intf	uses	char	*,	we	manage	the	memory	here	in	external	application
+						command_c_str	=	(char*)trick_MM->declare_var("char",	(command.size()	+	1)	);
+						strcpy(command_c_str,	command.c_str());
+						allocations.push_back(command_c_str);
 }
 
-Trick::ExternalApplication::~ExternalApplication() {
-    for(std::vector<char*>::iterator it = allocations.begin(); it != allocations.end(); ++it) {
-        trick_MM->delete_var( (void*)*it );
-    }
-    allocations.clear();
+Trick::ExternalApplication::~ExternalApplication()	{
+				for(std::vector<char*>::iterator	it	=	allocations.begin();	it	!=	allocations.end();	++it)	{
+								trick_MM->delete_var(	(void*)*it	);
+				}
+				allocations.clear();
 }
 
-void Trick::ExternalApplication::set_startup_command(std::string in_command) {
-    command = in_command;
-    command_c_str = (char*)trick_MM->declare_var("char", (command.size() + 1) );
-    strcpy(command_c_str, command.c_str());
-    allocations.push_back((command_c_str));
+void	Trick::ExternalApplication::set_startup_command(std::string	in_command)	{
+				command	=	in_command;
+				command_c_str	=	(char*)trick_MM->declare_var("char",	(command.size()	+	1)	);
+				strcpy(command_c_str,	command.c_str());
+				allocations.push_back((command_c_str));
 }
 
-std::string Trick::ExternalApplication::get_startup_command() {
-    return command;
+std::string	Trick::ExternalApplication::get_startup_command()	{
+				return	command;
 }
 
-const char * Trick::ExternalApplication::get_startup_command_c_str() {
-    return command_c_str;
+const	char	*	Trick::ExternalApplication::get_startup_command_c_str()	{
+				return	command_c_str;
 }
 
-void Trick::ExternalApplication::add_arguments(std::string args) {
-    arguments << " " << args;
+void	Trick::ExternalApplication::add_arguments(std::string	args)	{
+				arguments	<<	"	"	<<	args;
 }
 
-void Trick::ExternalApplication::set_arguments(std::string args) {
-    arguments.str(args);
-    host_source = port_source = NONE;
-    cycle_period_set = disconnect_behavior_set = height_set = width_set = x_set = y_set = false;
+void	Trick::ExternalApplication::set_arguments(std::string	args)	{
+				arguments.str(args);
+				host_source	=	port_source	=	NONE;
+				cycle_period_set	=	disconnect_behavior_set	=	height_set	=	width_set	=	x_set	=	y_set	=	false;
 }
 
-std::string Trick::ExternalApplication::get_arguments() {
-    return arguments.str() + create_arguments_string();
+std::string	Trick::ExternalApplication::get_arguments()	{
+				return	arguments.str()	+	create_arguments_string();
 }
 
-void Trick::ExternalApplication::set_host(std::string in_host) {
-    host = in_host;
-    host_source = USER;
+void	Trick::ExternalApplication::set_host(std::string	in_host)	{
+				host	=	in_host;
+				host_source	=	USER;
 }
 
-std::string Trick::ExternalApplication::get_host() {
-    return host;
+std::string	Trick::ExternalApplication::get_host()	{
+				return	host;
 }
 
-void Trick::ExternalApplication::set_port(unsigned short in_port) {
-    port = in_port;
-    port_source = USER;
+void	Trick::ExternalApplication::set_port(unsigned	short	in_port)	{
+				port	=	in_port;
+				port_source	=	USER;
 }
 
-unsigned short Trick::ExternalApplication::get_port() {
-    return port;
+unsigned	short	Trick::ExternalApplication::get_port()	{
+				return	port;
 }
 
-void Trick::ExternalApplication::set_auto_reconnect(bool in_auto_reconnect) {
-    auto_reconnect = in_auto_reconnect;
-    auto_reconnect_set = true;
+void	Trick::ExternalApplication::set_auto_reconnect(bool	in_auto_reconnect)	{
+				auto_reconnect	=	in_auto_reconnect;
+				auto_reconnect_set	=	true;
 }
 
-bool Trick::ExternalApplication::get_auto_reconnect() {
-    return auto_reconnect;
+bool	Trick::ExternalApplication::get_auto_reconnect()	{
+				return	auto_reconnect;
 }
 
-void Trick::ExternalApplication::set_cycle_period(double in_cycle_period) {
-    cycle_period = in_cycle_period;
-    cycle_period_set = true;
+void	Trick::ExternalApplication::set_cycle_period(double	in_cycle_period)	{
+				cycle_period	=	in_cycle_period;
+				cycle_period_set	=	true;
 }
 
-double Trick::ExternalApplication::get_cycle_period() {
-    return cycle_period;
+double	Trick::ExternalApplication::get_cycle_period()	{
+				return	cycle_period;
 }
 
-void Trick::ExternalApplication::set_minimum_cycle_period(double in_minimum_cycle_period) {
-    minimum_cycle_period = in_minimum_cycle_period;
-    minimum_cycle_period_set = true;
+void	Trick::ExternalApplication::set_minimum_cycle_period(double	in_minimum_cycle_period)	{
+				minimum_cycle_period	=	in_minimum_cycle_period;
+				minimum_cycle_period_set	=	true;
 }
 
-double Trick::ExternalApplication::get_minimum_cycle_period() {
-    return minimum_cycle_period;
+double	Trick::ExternalApplication::get_minimum_cycle_period()	{
+				return	minimum_cycle_period;
 }
 
-void Trick::ExternalApplication::set_disconnect_behavior(DisconnectBehavior in_disconnect_behavior) {
-    disconnect_behavior = in_disconnect_behavior;
-    disconnect_behavior_set = true;
+void	Trick::ExternalApplication::set_disconnect_behavior(DisconnectBehavior	in_disconnect_behavior)	{
+				disconnect_behavior	=	in_disconnect_behavior;
+				disconnect_behavior_set	=	true;
 }
 
-Trick::ExternalApplication::DisconnectBehavior Trick::ExternalApplication::get_disconnect_behavior() {
-    return disconnect_behavior;
+Trick::ExternalApplication::DisconnectBehavior	Trick::ExternalApplication::get_disconnect_behavior()	{
+				return	disconnect_behavior;
 }
 
-void Trick::ExternalApplication::set_height(int in_height) {
-    height = in_height;
-    height_set = true;
+void	Trick::ExternalApplication::set_height(int	in_height)	{
+				height	=	in_height;
+				height_set	=	true;
 }
 
-int Trick::ExternalApplication::get_height() {
-    return height;
+int	Trick::ExternalApplication::get_height()	{
+				return	height;
 }
 
-void Trick::ExternalApplication::set_width(int in_width) {
-    width = in_width;
-    width_set = true;
+void	Trick::ExternalApplication::set_width(int	in_width)	{
+				width	=	in_width;
+				width_set	=	true;
 }
 
-int Trick::ExternalApplication::get_width() {
-    return width;
+int	Trick::ExternalApplication::get_width()	{
+				return	width;
 }
 
-void Trick::ExternalApplication::set_x(int in_x) {
-    x = in_x;
-    x_set = true;
+void	Trick::ExternalApplication::set_x(int	in_x)	{
+				x	=	in_x;
+				x_set	=	true;
 }
 
-int Trick::ExternalApplication::get_x() {
-    return x;
+int	Trick::ExternalApplication::get_x()	{
+				return	x;
 }
 
-void Trick::ExternalApplication::set_y(int in_y) {
-    y = in_y;
-    y_set = true;
+void	Trick::ExternalApplication::set_y(int	in_y)	{
+				y	=	in_y;
+				y_set	=	true;
 }
 
-int Trick::ExternalApplication::get_y() {
-    return y;
+int	Trick::ExternalApplication::get_y()	{
+				return	y;
 }
 
-/** @par Detailed Design */
-void Trick::ExternalApplication::launch() {
-    /** <ul><li> If the application is enabled: */
-    if (var_server_get_enabled()) {
-        /** <ul><li> Execute the command and pass it any arguments. */
-        std::ostringstream oss;
+/**	@par	Detailed	Design	*/
+void	Trick::ExternalApplication::launch()	{
+				/**	<ul><li>	If	the	application	is	enabled:	*/
+				if	(var_server_get_enabled())	{
+								/**	<ul><li>	Execute	the	command	and	pass	it	any	arguments.	*/
+								std::ostringstream	oss;
 
-        int argc;
-        char **argv;
+								int	argc;
+								char	**argv;
 
-        argc = command_line_args_get_argc() ;
-        argv = command_line_args_get_argv() ;
+								argc	=	command_line_args_get_argc()	;
+								argv	=	command_line_args_get_argv()	;
 
-        oss << command << " " << arguments.str() << " " << create_arguments_string() ;
-        oss << " &";
+								oss	<<	command	<<	"	"	<<	arguments.str()	<<	"	"	<<	create_arguments_string()	;
+								oss	<<	"	&";
 
-        std::cout << oss.str() << std::endl;
-        system(oss.str().c_str());
-    }
+								std::cout	<<	oss.str()	<<	std::endl;
+								system(oss.str().c_str());
+				}
 }
 
-std::string Trick::ExternalApplication::create_arguments_string() {
-    std::ostringstream oss;
+std::string	Trick::ExternalApplication::create_arguments_string()	{
+				std::ostringstream	oss;
 
-    switch (host_source) {
-        case AUTO:
-            host = var_server_get_hostname();
-        case USER:
-            oss << " --host " << host;
-        case NONE:
-            break;
-    }
+				switch	(host_source)	{
+								case	AUTO:
+												host	=	var_server_get_hostname();
+								case	USER:
+												oss	<<	"	--host	"	<<	host;
+								case	NONE:
+												break;
+				}
 
-    switch (port_source) {
-        case AUTO:
-            port = var_server_get_port();
-        case USER:
-            oss << " --port " << port;
-        case NONE:
-            break;
-    }
+				switch	(port_source)	{
+								case	AUTO:
+												port	=	var_server_get_port();
+								case	USER:
+												oss	<<	"	--port	"	<<	port;
+								case	NONE:
+												break;
+				}
 
-    if (minimum_cycle_period_set) {
-        oss << " --minCycle " << minimum_cycle_period;
-    }
+				if	(minimum_cycle_period_set)	{
+								oss	<<	"	--minCycle	"	<<	minimum_cycle_period;
+				}
 
-    if (cycle_period_set) {
-        oss << " --cycle " << cycle_period;
-    }
+				if	(cycle_period_set)	{
+								oss	<<	"	--cycle	"	<<	cycle_period;
+				}
 
-    if (disconnect_behavior_set) {
-        switch(disconnect_behavior) {
-            case CLOSE:
-                oss << " --disconnectBehavior Close";
-                break;
-            case NOTIFY:
-                oss << " --disconnectBehavior Notify";
-                break;
-            case NOTHING:
-                oss << " --disconnectBehavior Nothing";
-                break;
-            default:
-                std::cout << __FILE__ << ":" << __LINE__ << ": warning: "
-                          << "Ignoring invalid value (" << disconnect_behavior
-                          << ") for disconnect_behavior." << std::endl;
-                break;
-        }
-    }
+				if	(disconnect_behavior_set)	{
+								switch(disconnect_behavior)	{
+												case	CLOSE:
+																oss	<<	"	--disconnectBehavior	Close";
+																break;
+												case	NOTIFY:
+																oss	<<	"	--disconnectBehavior	Notify";
+																break;
+												case	NOTHING:
+																oss	<<	"	--disconnectBehavior	Nothing";
+																break;
+												default:
+																std::cout	<<	__FILE__	<<	":"	<<	__LINE__	<<	":	warning:	"
+																										<<	"Ignoring	invalid	value	("	<<	disconnect_behavior
+																										<<	")	for	disconnect_behavior."	<<	std::endl;
+																break;
+								}
+				}
 
-    if (height_set) {
-        oss << " --height " << height;
-    }
+				if	(height_set)	{
+								oss	<<	"	--height	"	<<	height;
+				}
 
-    if (width_set) {
-        oss << " --width " << width;
-    }
+				if	(width_set)	{
+								oss	<<	"	--width	"	<<	width;
+				}
 
-    if (x_set) {
-        oss << " --x " << x;
-    }
+				if	(x_set)	{
+								oss	<<	"	--x	"	<<	x;
+				}
 
-    if (y_set) {
-        oss << " --y " << y;
-    }
-
-    if (auto_reconnect_set) {
-        oss << " --autoReconnect " << (auto_reconnect ? "true" : "false");
-    }
-
-    return oss.str();
+				if	(y_set)	{
+								oss	<<	"	--y	"	<<	y;
+				}
+
+				if	(auto_reconnect_set)	{
+								oss	<<	"	--autoReconnect	"	<<	(auto_reconnect	?	"true"	:	"false");
+				}
+
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp
index e636ca684..b579e169f 100644
--- a/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp
+++ b/trick_source/sim_services/ExternalApplications/ExternalApplicationManager.cpp
@@ -1,47 +1,47 @@
-#include "trick/ExternalApplicationManager.hh"
-#include "trick/ExternalApplication.hh"
-
-#include <vector>
-
-namespace Trick {
-
-    namespace {
-        std::vector<ExternalApplication *> externalApplications;
-    }
-
-    std::vector<ExternalApplication *> &get_external_applications() {
-        return externalApplications;
-    }
-
-    void add_external_application(ExternalApplication &externalApplication) {
-        for (std::vector<ExternalApplication *>::iterator i = externalApplications.begin();
-          i < externalApplications.end(); ++i) {
-            if (*i == &externalApplication) {
-                return;
-            }
-        }
-        externalApplications.push_back(&externalApplication);
-    }
-
-    void remove_external_application(ExternalApplication &externalApplication) {
-        for (std::vector<ExternalApplication *>::iterator i = externalApplications.begin();
-          i < externalApplications.end(); ++i) {
-            if (*i == &externalApplication) {
-                externalApplications.erase(i);
-                break;
-            }
-        }
-    }
-
-    void remove_all_external_applications() {
-        externalApplications.clear();
-    }
-
-    void launch_all_external_applications() {
-        for (std::vector<ExternalApplication *>::iterator i = externalApplications.begin();
-          i < externalApplications.end(); ++i) {
-            (*i)->launch();
-        }
-    }
+#include	"trick/ExternalApplicationManager.hh"
+#include	"trick/ExternalApplication.hh"
+
+#include	<vector>
+
+namespace	Trick	{
+
+				namespace	{
+								std::vector<ExternalApplication	*>	externalApplications;
+				}
+
+				std::vector<ExternalApplication	*>	&get_external_applications()	{
+								return	externalApplications;
+				}
+
+				void	add_external_application(ExternalApplication	&externalApplication)	{
+								for	(std::vector<ExternalApplication	*>::iterator	i	=	externalApplications.begin();
+										i	<	externalApplications.end();	++i)	{
+												if	(*i	==	&externalApplication)	{
+																return;
+												}
+								}
+								externalApplications.push_back(&externalApplication);
+				}
+
+				void	remove_external_application(ExternalApplication	&externalApplication)	{
+								for	(std::vector<ExternalApplication	*>::iterator	i	=	externalApplications.begin();
+										i	<	externalApplications.end();	++i)	{
+												if	(*i	==	&externalApplication)	{
+																externalApplications.erase(i);
+																break;
+												}
+								}
+				}
+
+				void	remove_all_external_applications()	{
+								externalApplications.clear();
+				}
+
+				void	launch_all_external_applications()	{
+								for	(std::vector<ExternalApplication	*>::iterator	i	=	externalApplications.begin();
+										i	<	externalApplications.end();	++i)	{
+												(*i)->launch();
+								}
+				}
 
 }
diff --git a/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp b/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp
index 7277846d2..560df091c 100644
--- a/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp
+++ b/trick_source/sim_services/ExternalApplications/ExternalApplication_c_intf.cpp
@@ -1,338 +1,338 @@
 
-#include <iostream>
-#include <string>
-#include <typeinfo>
-
-#include "trick/ExternalApplicationManager.hh"
-#include "trick/SimControlPanel.hh"
-#include "trick/TrickView.hh"
-#include "trick/MalfunctionsTrickView.hh"
-#include "trick/MonteMonitor.hh"
-#include "trick/StripChart.hh"
-
-static void *getFirstInstanceOfType(const std::type_info &type) {
-    std::vector<Trick::ExternalApplication *> &externalApplications =
-      Trick::get_external_applications();
-    for (std::vector<Trick::ExternalApplication *>::iterator i = externalApplications.begin();
-      i < externalApplications.end(); ++i) {
-        if (typeid(**i) == type) {
-            return (void *)*i;
-        }
-    }
-    return NULL;
+#include	<iostream>
+#include	<string>
+#include	<typeinfo>
+
+#include	"trick/ExternalApplicationManager.hh"
+#include	"trick/SimControlPanel.hh"
+#include	"trick/TrickView.hh"
+#include	"trick/MalfunctionsTrickView.hh"
+#include	"trick/MonteMonitor.hh"
+#include	"trick/StripChart.hh"
+
+static	void	*getFirstInstanceOfType(const	std::type_info	&type)	{
+				std::vector<Trick::ExternalApplication	*>	&externalApplications	=
+						Trick::get_external_applications();
+				for	(std::vector<Trick::ExternalApplication	*>::iterator	i	=	externalApplications.begin();
+						i	<	externalApplications.end();	++i)	{
+								if	(typeid(**i)	==	type)	{
+												return	(void	*)*i;
+								}
+				}
+				return	NULL;
 }
 
-/*static void printDeprecationMessage(const char *file, int line, const char *function) {
-    std::cout << file << ":" << line << ": warning: " << function << " is deprecated. "
-              << "See section \"5.2 Runtime GUIs\" of the Trick User's Guide." << std::endl;
+/*static	void	printDeprecationMessage(const	char	*file,	int	line,	const	char	*function)	{
+				std::cout	<<	file	<<	":"	<<	line	<<	":	warning:	"	<<	function	<<	"	is	deprecated.	"
+														<<	"See	section	\"5.2	Runtime	GUIs\"	of	the	Trick	User's	Guide."	<<	std::endl;
 }*/
 
-extern "C" void sim_control_panel_set_enabled(int enabled) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	sim_control_panel_set_enabled(int	enabled)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::ExternalApplication *externalApplication =
-      (Trick::ExternalApplication *)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
+				Trick::ExternalApplication	*externalApplication	=
+						(Trick::ExternalApplication	*)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
 
-    if (enabled && !externalApplication) {
-        Trick::add_external_application(*new Trick::SimControlPanel());
-    }
-    else if (!enabled && externalApplication) {
-        Trick::remove_external_application(*externalApplication);
-    }
+				if	(enabled	&&	!externalApplication)	{
+								Trick::add_external_application(*new	Trick::SimControlPanel());
+				}
+				else	if	(!enabled	&&	externalApplication)	{
+								Trick::remove_external_application(*externalApplication);
+				}
 }
 
-extern "C" void sim_control_panel_auto_exit_set_enabled(int enabled) {
-	 Trick::SimControlPanel *simControlApplication =
-	      (Trick::SimControlPanel *)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
+extern	"C"	void	sim_control_panel_auto_exit_set_enabled(int	enabled)	{
+		Trick::SimControlPanel	*simControlApplication	=
+							(Trick::SimControlPanel	*)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
 
-	 if (simControlApplication) {
-		 simControlApplication->auto_exit = enabled;
-	 }
+		if	(simControlApplication)	{
+			simControlApplication->auto_exit	=	enabled;
+		}
 }
 
-extern "C" void trick_view_set_enabled(int enabled) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	trick_view_set_enabled(int	enabled)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::ExternalApplication *externalApplication =
-      (Trick::ExternalApplication *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::ExternalApplication	*externalApplication	=
+						(Trick::ExternalApplication	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (enabled && !externalApplication) {
-        Trick::add_external_application(*new Trick::TrickView());
-    }
-    else if (!enabled && externalApplication) {
-        Trick::remove_external_application(*externalApplication);
-    }
+				if	(enabled	&&	!externalApplication)	{
+								Trick::add_external_application(*new	Trick::TrickView());
+				}
+				else	if	(!enabled	&&	externalApplication)	{
+								Trick::remove_external_application(*externalApplication);
+				}
 }
 
-extern "C" void malfunctions_trick_view_set_enabled(int enabled) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	malfunctions_trick_view_set_enabled(int	enabled)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::ExternalApplication *externalApplication =
-      (Trick::ExternalApplication *)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
+				Trick::ExternalApplication	*externalApplication	=
+						(Trick::ExternalApplication	*)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
 
-    if (enabled && !externalApplication) {
-        Trick::add_external_application(*new Trick::MalfunctionsTrickView());
-    }
-    else if (!enabled && externalApplication) {
-        Trick::remove_external_application(*externalApplication);
-    }
+				if	(enabled	&&	!externalApplication)	{
+								Trick::add_external_application(*new	Trick::MalfunctionsTrickView());
+				}
+				else	if	(!enabled	&&	externalApplication)	{
+								Trick::remove_external_application(*externalApplication);
+				}
 }
 
-extern "C" void monte_monitor_set_enabled(int enabled) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	monte_monitor_set_enabled(int	enabled)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::ExternalApplication *externalApplication =
-      (Trick::ExternalApplication *)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
+				Trick::ExternalApplication	*externalApplication	=
+						(Trick::ExternalApplication	*)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
 
-    if (enabled && !externalApplication) {
-        Trick::add_external_application(*new Trick::MonteMonitor());
-    }
-    else if (!enabled && externalApplication) {
-        Trick::remove_external_application(*externalApplication);
-    }
+				if	(enabled	&&	!externalApplication)	{
+								Trick::add_external_application(*new	Trick::MonteMonitor());
+				}
+				else	if	(!enabled	&&	externalApplication)	{
+								Trick::remove_external_application(*externalApplication);
+				}
 }
 
-extern "C" void stripchart_set_enabled(int enabled) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	stripchart_set_enabled(int	enabled)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::ExternalApplication *externalApplication =
-      (Trick::ExternalApplication *)getFirstInstanceOfType(typeid(Trick::StripChart));
+				Trick::ExternalApplication	*externalApplication	=
+						(Trick::ExternalApplication	*)getFirstInstanceOfType(typeid(Trick::StripChart));
 
-    if (enabled && !externalApplication) {
-        Trick::add_external_application(*new Trick::StripChart());
-    }
-    else if (!enabled && externalApplication) {
-        Trick::remove_external_application(*externalApplication);
-    }
+				if	(enabled	&&	!externalApplication)	{
+								Trick::add_external_application(*new	Trick::StripChart());
+				}
+				else	if	(!enabled	&&	externalApplication)	{
+								Trick::remove_external_application(*externalApplication);
+				}
 }
 
-extern "C" int sim_control_panel_get_enabled(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
-    return getFirstInstanceOfType(typeid(Trick::SimControlPanel)) != NULL;
+extern	"C"	int	sim_control_panel_get_enabled(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
+				return	getFirstInstanceOfType(typeid(Trick::SimControlPanel))	!=	NULL;
 }
 
-extern "C" int trick_view_get_enabled(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
-    return getFirstInstanceOfType(typeid(Trick::TrickView)) != NULL;
+extern	"C"	int	trick_view_get_enabled(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
+				return	getFirstInstanceOfType(typeid(Trick::TrickView))	!=	NULL;
 }
 
-extern "C" int malfunctions_trick_view_get_enabled(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
-    return getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView)) != NULL;
+extern	"C"	int	malfunctions_trick_view_get_enabled(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
+				return	getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView))	!=	NULL;
 }
 
-extern "C" int monte_monitor_get_enabled(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
-    return getFirstInstanceOfType(typeid(Trick::MonteMonitor)) != NULL;
+extern	"C"	int	monte_monitor_get_enabled(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
+				return	getFirstInstanceOfType(typeid(Trick::MonteMonitor))	!=	NULL;
 }
 
-extern "C" int stripchart_get_enabled(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
-    return getFirstInstanceOfType(typeid(Trick::StripChart)) != NULL;
+extern	"C"	int	stripchart_get_enabled(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
+				return	getFirstInstanceOfType(typeid(Trick::StripChart))	!=	NULL;
 }
 
-extern "C" void sim_control_panel_set_startup_command(const char *startup_command) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	sim_control_panel_set_startup_command(const	char	*startup_command)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::SimControlPanel *externalApplication = (Trick::SimControlPanel *)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
+				Trick::SimControlPanel	*externalApplication	=	(Trick::SimControlPanel	*)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::SimControlPanel();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::SimControlPanel();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_startup_command(startup_command ? std::string(startup_command) : "");
+				externalApplication->set_startup_command(startup_command	?	std::string(startup_command)	:	"");
 }
 
-extern "C" void trick_view_set_startup_command(const char *startup_command) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	trick_view_set_startup_command(const	char	*startup_command)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::TrickView *externalApplication = (Trick::TrickView *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::TrickView	*externalApplication	=	(Trick::TrickView	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::TrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::TrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_startup_command(startup_command ? std::string(startup_command) : "");
+				externalApplication->set_startup_command(startup_command	?	std::string(startup_command)	:	"");
 }
 
-extern "C" void malfunctions_trick_view_set_startup_command(const char *startup_command) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	malfunctions_trick_view_set_startup_command(const	char	*startup_command)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MalfunctionsTrickView *externalApplication = (Trick::MalfunctionsTrickView *)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
+				Trick::MalfunctionsTrickView	*externalApplication	=	(Trick::MalfunctionsTrickView	*)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::MalfunctionsTrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::MalfunctionsTrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_startup_command(startup_command ? std::string(startup_command) : "");
+				externalApplication->set_startup_command(startup_command	?	std::string(startup_command)	:	"");
 }
 
-extern "C" void monte_monitor_set_startup_command(const char *startup_command) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	monte_monitor_set_startup_command(const	char	*startup_command)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MonteMonitor *externalApplication = (Trick::MonteMonitor *)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
+				Trick::MonteMonitor	*externalApplication	=	(Trick::MonteMonitor	*)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::MonteMonitor();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::MonteMonitor();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_startup_command(startup_command ? std::string(startup_command) : "");
+				externalApplication->set_startup_command(startup_command	?	std::string(startup_command)	:	"");
 }
 
-extern "C" void stripchart_set_startup_command(const char *startup_command) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	stripchart_set_startup_command(const	char	*startup_command)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::StripChart *externalApplication = (Trick::StripChart *)getFirstInstanceOfType(typeid(Trick::StripChart));
+				Trick::StripChart	*externalApplication	=	(Trick::StripChart	*)getFirstInstanceOfType(typeid(Trick::StripChart));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::StripChart();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::StripChart();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_startup_command(startup_command ? std::string(startup_command) : "");
+				externalApplication->set_startup_command(startup_command	?	std::string(startup_command)	:	"");
 }
 
-extern "C" const char *sim_control_panel_get_startup_command(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	const	char	*sim_control_panel_get_startup_command(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::SimControlPanel *externalApplication = (Trick::SimControlPanel *)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
+				Trick::SimControlPanel	*externalApplication	=	(Trick::SimControlPanel	*)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::SimControlPanel();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::SimControlPanel();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    return externalApplication->get_startup_command_c_str();
+				return	externalApplication->get_startup_command_c_str();
 }
 
-extern "C" const char *trick_view_get_startup_command(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	const	char	*trick_view_get_startup_command(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::TrickView *externalApplication = (Trick::TrickView *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::TrickView	*externalApplication	=	(Trick::TrickView	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::TrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::TrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    return externalApplication->get_startup_command_c_str();
+				return	externalApplication->get_startup_command_c_str();
 }
 
-extern "C" const char *malfunctions_trick_view_get_startup_command(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	const	char	*malfunctions_trick_view_get_startup_command(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MalfunctionsTrickView *externalApplication = (Trick::MalfunctionsTrickView *)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
+				Trick::MalfunctionsTrickView	*externalApplication	=	(Trick::MalfunctionsTrickView	*)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::MalfunctionsTrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::MalfunctionsTrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    return externalApplication->get_startup_command_c_str();
+				return	externalApplication->get_startup_command_c_str();
 }
 
-extern "C" const char *monte_monitor_get_startup_command(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	const	char	*monte_monitor_get_startup_command(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MonteMonitor *externalApplication = (Trick::MonteMonitor *)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
+				Trick::MonteMonitor	*externalApplication	=	(Trick::MonteMonitor	*)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::MonteMonitor();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::MonteMonitor();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    return externalApplication->get_startup_command_c_str();
+				return	externalApplication->get_startup_command_c_str();
 }
 
-extern "C" const char *stripchart_get_startup_command(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	const	char	*stripchart_get_startup_command(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::StripChart *externalApplication = (Trick::StripChart *)getFirstInstanceOfType(typeid(Trick::StripChart));
+				Trick::StripChart	*externalApplication	=	(Trick::StripChart	*)getFirstInstanceOfType(typeid(Trick::StripChart));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::StripChart();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::StripChart();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    return externalApplication->get_startup_command_c_str();
+				return	externalApplication->get_startup_command_c_str();
 }
 
-extern "C" void sim_control_panel_launch(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	sim_control_panel_launch(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::SimControlPanel *externalApplication = (Trick::SimControlPanel *)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
+				Trick::SimControlPanel	*externalApplication	=	(Trick::SimControlPanel	*)getFirstInstanceOfType(typeid(Trick::SimControlPanel));
 
-    if (externalApplication) {
-        externalApplication->launch();
-    }
+				if	(externalApplication)	{
+								externalApplication->launch();
+				}
 }
 
-extern "C" void trick_view_launch(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	trick_view_launch(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::TrickView *externalApplication = (Trick::TrickView *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::TrickView	*externalApplication	=	(Trick::TrickView	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (externalApplication) {
-        externalApplication->launch();
-    }
+				if	(externalApplication)	{
+								externalApplication->launch();
+				}
 }
 
-extern "C" void malfunctions_trick_view_launch(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	malfunctions_trick_view_launch(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MalfunctionsTrickView *externalApplication = (Trick::MalfunctionsTrickView *)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
+				Trick::MalfunctionsTrickView	*externalApplication	=	(Trick::MalfunctionsTrickView	*)getFirstInstanceOfType(typeid(Trick::MalfunctionsTrickView));
 
-    if (externalApplication) {
-        externalApplication->launch();
-    }
+				if	(externalApplication)	{
+								externalApplication->launch();
+				}
 }
 
-extern "C" void monte_monitor_launch(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	monte_monitor_launch(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::MonteMonitor *externalApplication = (Trick::MonteMonitor *)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
+				Trick::MonteMonitor	*externalApplication	=	(Trick::MonteMonitor	*)getFirstInstanceOfType(typeid(Trick::MonteMonitor));
 
-    if (externalApplication) {
-        externalApplication->launch();
-    }
+				if	(externalApplication)	{
+								externalApplication->launch();
+				}
 }
 
-extern "C" void stripchart_launch(void) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	stripchart_launch(void)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::StripChart *externalApplication = (Trick::StripChart *)getFirstInstanceOfType(typeid(Trick::StripChart));
+				Trick::StripChart	*externalApplication	=	(Trick::StripChart	*)getFirstInstanceOfType(typeid(Trick::StripChart));
 
-    if (externalApplication) {
-        externalApplication->launch();
-    }
+				if	(externalApplication)	{
+								externalApplication->launch();
+				}
 }
 
-extern "C" void trick_view_set_cycle_period(double period) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	trick_view_set_cycle_period(double	period)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::TrickView *externalApplication = (Trick::TrickView *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::TrickView	*externalApplication	=	(Trick::TrickView	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::TrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::TrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_cycle_period(period);
+				externalApplication->set_cycle_period(period);
 }
 
-extern "C" void trick_view_add_auto_load_file(const char *file) {
-    //printDeprecationMessage(__FILE__, __LINE__, __FUNCTION__);
+extern	"C"	void	trick_view_add_auto_load_file(const	char	*file)	{
+				//printDeprecationMessage(__FILE__,	__LINE__,	__FUNCTION__);
 
-    Trick::TrickView *externalApplication = (Trick::TrickView *)getFirstInstanceOfType(typeid(Trick::TrickView));
+				Trick::TrickView	*externalApplication	=	(Trick::TrickView	*)getFirstInstanceOfType(typeid(Trick::TrickView));
 
-    if (!externalApplication) {
-        externalApplication = new Trick::TrickView();
-        Trick::add_external_application(*externalApplication);
-    }
+				if	(!externalApplication)	{
+								externalApplication	=	new	Trick::TrickView();
+								Trick::add_external_application(*externalApplication);
+				}
 
-    externalApplication->set_auto_open_file(file ? std::string(file) : "");
+				externalApplication->set_auto_open_file(file	?	std::string(file)	:	"");
 }
diff --git a/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp b/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp
index 2b4799c4b..cddea4ed3 100644
--- a/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp
+++ b/trick_source/sim_services/ExternalApplications/MalfunctionsTrickView.cpp
@@ -1,24 +1,24 @@
 
-#include <string>
+#include	<string>
 
-#include "trick/MalfunctionsTrickView.hh"
+#include	"trick/MalfunctionsTrickView.hh"
 
-Trick::MalfunctionsTrickView::MalfunctionsTrickView() {
-    command += std::string("trick-mtv");
+Trick::MalfunctionsTrickView::MalfunctionsTrickView()	{
+				command	+=	std::string("trick-mtv");
 }
 
-std::string Trick::MalfunctionsTrickView::create_arguments_string() {
-    ExternalApplication::create_arguments_string();
+std::string	Trick::MalfunctionsTrickView::create_arguments_string()	{
+				ExternalApplication::create_arguments_string();
 
-    std::ostringstream oss;
+				std::ostringstream	oss;
 
-    if (host_source != NONE) {
-        oss << " " << host;
-    }
+				if	(host_source	!=	NONE)	{
+								oss	<<	"	"	<<	host;
+				}
 
-    if (port_source != NONE) {
-        oss << " " << port;
-    }
+				if	(port_source	!=	NONE)	{
+								oss	<<	"	"	<<	port;
+				}
 
-    return oss.str();
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp b/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp
index a83f791a0..0cbb15004 100644
--- a/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp
+++ b/trick_source/sim_services/ExternalApplications/MonteMonitor.cpp
@@ -1,8 +1,8 @@
 
-#include <string>
+#include	<string>
 
-#include "trick/MonteMonitor.hh"
+#include	"trick/MonteMonitor.hh"
 
-Trick::MonteMonitor::MonteMonitor() {
-    command += std::string("trick-mm");
+Trick::MonteMonitor::MonteMonitor()	{
+				command	+=	std::string("trick-mm");
 }
diff --git a/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp b/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp
index 3327396b0..7dcf4e159 100644
--- a/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp
+++ b/trick_source/sim_services/ExternalApplications/SimControlPanel.cpp
@@ -1,29 +1,29 @@
 
-#include <string>
+#include	<string>
 
-#include "trick/SimControlPanel.hh"
+#include	"trick/SimControlPanel.hh"
 
-Trick::SimControlPanel::SimControlPanel() {
-    command += std::string("trick-simcontrol");
-    auto_exit = false;
+Trick::SimControlPanel::SimControlPanel()	{
+				command	+=	std::string("trick-simcontrol");
+				auto_exit	=	false;
 }
 
-std::string Trick::SimControlPanel::create_arguments_string() {
-    ExternalApplication::create_arguments_string();
+std::string	Trick::SimControlPanel::create_arguments_string()	{
+				ExternalApplication::create_arguments_string();
 
-    std::ostringstream oss;
+				std::ostringstream	oss;
 
-    if (host_source != NONE) {
-        oss << " " << host;
-    }
+				if	(host_source	!=	NONE)	{
+								oss	<<	"	"	<<	host;
+				}
 
-    if (port_source != NONE) {
-        oss << " " << port;
-    }
+				if	(port_source	!=	NONE)	{
+								oss	<<	"	"	<<	port;
+				}
 
-    if (auto_exit) {
-    	oss << " -auto_exit";
-    }
+				if	(auto_exit)	{
+					oss	<<	"	-auto_exit";
+				}
 
-    return oss.str();
+				return	oss.str();
 }
diff --git a/trick_source/sim_services/ExternalApplications/StripChart.cpp b/trick_source/sim_services/ExternalApplications/StripChart.cpp
index 5a101f9c3..ebb5fee4c 100644
--- a/trick_source/sim_services/ExternalApplications/StripChart.cpp
+++ b/trick_source/sim_services/ExternalApplications/StripChart.cpp
@@ -1,52 +1,52 @@
 
-#include <string>
+#include	<string>
 
-#include "trick/StripChart.hh"
-#include "trick/ExternalApplicationManager.hh"
+#include	"trick/StripChart.hh"
+#include	"trick/ExternalApplicationManager.hh"
 
-Trick::StripChart::StripChart() {
-    command += std::string("trick-stripchart");
-    file_set = false;
+Trick::StripChart::StripChart()	{
+				command	+=	std::string("trick-stripchart");
+				file_set	=	false;
 }
 
-void Trick::StripChart::set_arguments(std::string args) {
-    ExternalApplication::set_arguments(args);
-    file_set = false;
+void	Trick::StripChart::set_arguments(std::string	args)	{
+				ExternalApplication::set_arguments(args);
+				file_set	=	false;
 }
 
-std::string Trick::StripChart::create_arguments_string() {
-    ExternalApplication::create_arguments_string();
+std::string	Trick::StripChart::create_arguments_string()	{
+				ExternalApplication::create_arguments_string();
 
-    std::ostringstream oss;
+				std::ostringstream	oss;
 
-    if (host_source != NONE) {
-        oss << " " << host;
-    }
+				if	(host_source	!=	NONE)	{
+								oss	<<	"	"	<<	host;
+				}
 
-    if (port_source != NONE) {
-        oss << " " << port;
-    }
+				if	(port_source	!=	NONE)	{
+								oss	<<	"	"	<<	port;
+				}
 
-    if (file_set) {
-        oss << " -input " << input_file;
-    }
+				if	(file_set)	{
+								oss	<<	"	-input	"	<<	input_file;
+				}
 
-    return oss.str();
+				return	oss.str();
 }
 
-void Trick::StripChart::set_input_file(std::string filename) {
-    if (!filename.empty()) {
-        file_set = true;
-        input_file = filename;
-
-        //! Ensure this application is on the queue.
-        Trick::add_external_application(*this);
-    }
-    else {
-        file_set = false;
-    }
+void	Trick::StripChart::set_input_file(std::string	filename)	{
+				if	(!filename.empty())	{
+								file_set	=	true;
+								input_file	=	filename;
+
+								//!	Ensure	this	application	is	on	the	queue.
+								Trick::add_external_application(*this);
+				}
+				else	{
+								file_set	=	false;
+				}
 }
 
-std::string Trick::StripChart::get_input_file() {
-    return input_file;
+std::string	Trick::StripChart::get_input_file()	{
+				return	input_file;
 }
diff --git a/trick_source/sim_services/ExternalApplications/TrickView.cpp b/trick_source/sim_services/ExternalApplications/TrickView.cpp
index 94dbe3477..db53378ca 100644
--- a/trick_source/sim_services/ExternalApplications/TrickView.cpp
+++ b/trick_source/sim_services/ExternalApplications/TrickView.cpp
@@ -1,75 +1,75 @@
 
-#include <string>
-#include <iostream>
+#include	<string>
+#include	<iostream>
 
-#include "trick/TrickView.hh"
-#include "trick/variable_server_proto.h"
+#include	"trick/TrickView.hh"
+#include	"trick/variable_server_proto.h"
 
-Trick::TrickView::TrickView() {
-    command += std::string("trick-tv");
-    strip_charts_only_set = open_file_set = open_set_file_set = set_file_set = false;
+Trick::TrickView::TrickView()	{
+				command	+=	std::string("trick-tv");
+				strip_charts_only_set	=	open_file_set	=	open_set_file_set	=	set_file_set	=	false;
 }
 
-void Trick::TrickView::set_arguments(std::string args) {
-    ExternalApplication::set_arguments(args);
-    strip_charts_only_set = open_file_set = open_set_file_set = set_file_set = false;
+void	Trick::TrickView::set_arguments(std::string	args)	{
+				ExternalApplication::set_arguments(args);
+				strip_charts_only_set	=	open_file_set	=	open_set_file_set	=	set_file_set	=	false;
 }
 
-std::string Trick::TrickView::create_arguments_string() {
-    std::ostringstream oss;
-    oss << ExternalApplication::create_arguments_string();
+std::string	Trick::TrickView::create_arguments_string()	{
+				std::ostringstream	oss;
+				oss	<<	ExternalApplication::create_arguments_string();
 
-    if (strip_charts_only_set && strip_charts_only) {
-        oss << " --stripChartsOnly" ;
-    }
+				if	(strip_charts_only_set	&&	strip_charts_only)	{
+								oss	<<	"	--stripChartsOnly"	;
+				}
 
-    if (open_file_set) {
-        oss << " --open " << open_file;
-    }
+				if	(open_file_set)	{
+								oss	<<	"	--open	"	<<	open_file;
+				}
 
-    if (open_set_file_set) {
-        oss << " --openSet " << open_set_file;
-    }
+				if	(open_set_file_set)	{
+								oss	<<	"	--openSet	"	<<	open_set_file;
+				}
 
-    if (set_file_set) {
-        oss << " --set " << set_file;
-    }
+				if	(set_file_set)	{
+								oss	<<	"	--set	"	<<	set_file;
+				}
 
-    return oss.str();
+				return	oss.str();
 }
 
-void Trick::TrickView::set_strip_charts_only(bool in_strip_charts_only) {
-    strip_charts_only = in_strip_charts_only;
-    strip_charts_only_set = true;
+void	Trick::TrickView::set_strip_charts_only(bool	in_strip_charts_only)	{
+				strip_charts_only	=	in_strip_charts_only;
+				strip_charts_only_set	=	true;
 }
 
-bool Trick::TrickView::get_strip_charts_only() {
-    return strip_charts_only;
+bool	Trick::TrickView::get_strip_charts_only()	{
+				return	strip_charts_only;
 }
 
-void Trick::TrickView::set_auto_open_file(std::string file) {
-    open_file = file;
-    open_file_set = true;
+void	Trick::TrickView::set_auto_open_file(std::string	file)	{
+				open_file	=	file;
+				open_file_set	=	true;
 }
 
-std::string Trick::TrickView::get_auto_open_file() {
-    return open_file;
+std::string	Trick::TrickView::get_auto_open_file()	{
+				return	open_file;
 }
 
-void Trick::TrickView::set_auto_open_and_set_file(std::string file) {
-    open_set_file = file;
-    open_set_file_set = true;
+void	Trick::TrickView::set_auto_open_and_set_file(std::string	file)	{
+				open_set_file	=	file;
+				open_set_file_set	=	true;
 }
 
-std::string Trick::TrickView::get_auto_open_and_set_file() {
-    return open_set_file;
+std::string	Trick::TrickView::get_auto_open_and_set_file()	{
+				return	open_set_file;
 }
 
-void Trick::TrickView::set_auto_set_file(std::string file) {
-    set_file = file;
-    set_file_set = true;
+void	Trick::TrickView::set_auto_set_file(std::string	file)	{
+				set_file	=	file;
+				set_file_set	=	true;
 }
 
-std::string Trick::TrickView::get_auto_set_file() {
-    return set_file;
+std::string	Trick::TrickView::get_auto_set_file()	{
+				return	set_file;
 }
diff --git a/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp b/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp
index c0da71b28..e0c64dae5 100644
--- a/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp
+++ b/trick_source/sim_services/FrameLog/FrameDataRecordGroup.cpp
@@ -1,118 +1,118 @@
 
-#include <iostream>
-#include "trick/FrameDataRecordGroup.hh"
-#include "trick/clock_proto.h"
-#include "trick/exec_proto.h"
+#include	<iostream>
+#include	"trick/FrameDataRecordGroup.hh"
+#include	"trick/clock_proto.h"
+#include	"trick/exec_proto.h"
 
 /**
--# Creates frame timing jobs if this is not the main thread.
--# All instances get the end_of_frame frame_log_clear job.
+-#	Creates	frame	timing	jobs	if	this	is	not	the	main	thread.
+-#	All	instances	get	the	end_of_frame	frame_log_clear	job.
 */
-Trick::FrameDataRecordGroup::FrameDataRecordGroup( int in_thread_id , std::string in_name )
- : Trick::DRBinary(in_name, false) , thread_id(in_thread_id ) {
-    if ( thread_id > 0 ) {
-        add_job(thread_id, 1000, (char *)"top_of_frame", NULL, 1.0, (char *)"start_timer", (char *)"TRK", 1) ;
-        // Frame logging uses phase 65533 in FrameLog.ccp. Stop the timer just before that.
-        add_job(thread_id, 1001, (char *)"end_of_frame", NULL, 1.0, (char *)"stop_timer", (char *)"TRK", 65532) ;
-    }
-    add_job(thread_id, 1003, (char *)"end_of_frame", NULL, 1.0, (char *)"adjust_time", (char *)"TRK", 65532) ;
-    add_job(thread_id, 1002, (char *)"end_of_frame", NULL, 1.0, (char *)"frame_log_clear", (char *)"TRK", 65535) ;
+Trick::FrameDataRecordGroup::FrameDataRecordGroup(	int	in_thread_id	,	std::string	in_name	)
+	:	Trick::DRBinary(in_name,	false)	,	thread_id(in_thread_id	)	{
+				if	(	thread_id	>	0	)	{
+								add_job(thread_id,	1000,	(char	*)"top_of_frame",	NULL,	1.0,	(char	*)"start_timer",	(char	*)"TRK",	1)	;
+								//	Frame	logging	uses	phase	65533	in	FrameLog.ccp.	Stop	the	timer	just	before	that.
+								add_job(thread_id,	1001,	(char	*)"end_of_frame",	NULL,	1.0,	(char	*)"stop_timer",	(char	*)"TRK",	65532)	;
+				}
+				add_job(thread_id,	1003,	(char	*)"end_of_frame",	NULL,	1.0,	(char	*)"adjust_time",	(char	*)"TRK",	65532)	;
+				add_job(thread_id,	1002,	(char	*)"end_of_frame",	NULL,	1.0,	(char	*)"frame_log_clear",	(char	*)"TRK",	65535)	;
 
-    // The DataRecordGroup class establishes a sim_time variable.  All of the frame logging data recording groups
-    // record at end_of_frame.  At this point the sim_time has already advanced.  We need to back up time when
-    // recording the data. the thread_record_time variable stores the time of the previous frame and can be
-    // used in place of the current sim time when recording frame data.
-    rec_buffer[0]->ref->address = &thread_record_time ;
+				//	The	DataRecordGroup	class	establishes	a	sim_time	variable.		All	of	the	frame	logging	data	recording	groups
+				//	record	at	end_of_frame.		At	this	point	the	sim_time	has	already	advanced.		We	need	to	back	up	time	when
+				//	recording	the	data.	the	thread_record_time	variable	stores	the	time	of	the	previous	frame	and	can	be
+				//	used	in	place	of	the	current	sim	time	when	recording	frame	data.
+				rec_buffer[0]->ref->address	=	&thread_record_time	;
 }
 
 /**
--# Clears the frame log times for jobs recorded by this group
+-#	Clears	the	frame	log	times	for	jobs	recorded	by	this	group
 */
-int Trick::FrameDataRecordGroup::frame_log_clear() {
-    if ( record == false ) {
-        return 0 ;
-    }
-    std::vector< Trick::JobData *>::iterator it ;
-    for ( it = rec_jobs.begin() ; it != rec_jobs.end() ; ++it ) {
-        (*it)->frame_time = 0 ;
-        (*it)->frame_time_seconds = 0.0;
-    }
+int	Trick::FrameDataRecordGroup::frame_log_clear()	{
+				if	(	record	==	false	)	{
+								return	0	;
+				}
+				std::vector<	Trick::JobData	*>::iterator	it	;
+				for	(	it	=	rec_jobs.begin()	;	it	!=	rec_jobs.end()	;	++it	)	{
+								(*it)->frame_time	=	0	;
+								(*it)->frame_time_seconds	=	0.0;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
--# Turns on recording
--# Clears the frame log times
+-#	Turns	on	recording
+-#	Clears	the	frame	log	times
 */
-int Trick::FrameDataRecordGroup::enable() {
-    record = true ;
-    frame_log_clear() ;
-    return 0 ;
+int	Trick::FrameDataRecordGroup::enable()	{
+				record	=	true	;
+				frame_log_clear()	;
+				return	0	;
 }
 
 /**
--# Adds a recording job to the list we are recording
+-#	Adds	a	recording	job	to	the	list	we	are	recording
 */
-void Trick::FrameDataRecordGroup::add_rec_job( Trick::JobData * new_job ) {
-    rec_jobs.push_back(new_job) ;
+void	Trick::FrameDataRecordGroup::add_rec_job(	Trick::JobData	*	new_job	)	{
+				rec_jobs.push_back(new_job)	;
 }
 
 /**
--# Calls the FrameDataRecordGroup specific jobs or dispatches the job call to the DataRecordGroup
+-#	Calls	the	FrameDataRecordGroup	specific	jobs	or	dispatches	the	job	call	to	the	DataRecordGroup
 */
-int Trick::FrameDataRecordGroup::call_function( Trick::JobData * curr_job ) {
+int	Trick::FrameDataRecordGroup::call_function(	Trick::JobData	*	curr_job	)	{
 
-    switch (curr_job->id ) {
-        case 1000:
-            start_timer() ;
-            break ;
-        case 1001:
-            stop_timer() ;
-            break ;
-        case 1002:
-            return frame_log_clear() ;
-        case 1003:
-            adjust_time() ;
-            break ;
-        default:
-            return DataRecordGroup::call_function(curr_job) ;
-    }
+				switch	(curr_job->id	)	{
+								case	1000:
+												start_timer()	;
+												break	;
+								case	1001:
+												stop_timer()	;
+												break	;
+								case	1002:
+												return	frame_log_clear()	;
+								case	1003:
+												adjust_time()	;
+												break	;
+								default:
+												return	DataRecordGroup::call_function(curr_job)	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
--# Starts the AMF thread frame time
+-#	Starts	the	AMF	thread	frame	time
 */
-void Trick::FrameDataRecordGroup::start_timer() {
-    start_time = clock_time() ;
+void	Trick::FrameDataRecordGroup::start_timer()	{
+				start_time	=	clock_time()	;
 }
 
 /**
--# Records the AMF thread frame time in frame_sched_time.
+-#	Records	the	AMF	thread	frame	time	in	frame_sched_time.
 */
-void Trick::FrameDataRecordGroup::stop_timer() {
-    frame_sched_time = clock_time() - start_time ;
-    frame_time = frame_sched_time * (1.0/exec_get_time_tic_value());
+void	Trick::FrameDataRecordGroup::stop_timer()	{
+				frame_sched_time	=	clock_time()	-	start_time	;
+				frame_time	=	frame_sched_time	*	(1.0/exec_get_time_tic_value());
 }
 
-void Trick::FrameDataRecordGroup::adjust_time() {
-    if ( thread_id == 0 ) {
-        thread_record_time =  exec_get_sim_time() - exec_get_software_frame() ;
-    } else {
-        thread_record_time =  exec_get_sim_time() - exec_get_thread_amf_cycle_time(thread_id) ;
-    }
+void	Trick::FrameDataRecordGroup::adjust_time()	{
+				if	(	thread_id	==	0	)	{
+								thread_record_time	=		exec_get_sim_time()	-	exec_get_software_frame()	;
+				}	else	{
+								thread_record_time	=		exec_get_sim_time()	-	exec_get_thread_amf_cycle_time(thread_id)	;
+				}
 }
 
 /**
--# Restart the frame log record group after checkpoint load
+-#	Restart	the	frame	log	record	group	after	checkpoint	load
 */
-int Trick::FrameDataRecordGroup::restart() {
-    // clear the list of target jobs for this frame recording group
-    rec_jobs.clear() ;
-    // Add back the time variable
-    add_time_variable() ;
+int	Trick::FrameDataRecordGroup::restart()	{
+				//	clear	the	list	of	target	jobs	for	this	frame	recording	group
+				rec_jobs.clear()	;
+				//	Add	back	the	time	variable
+				add_time_variable()	;
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/FrameLog/FrameLog.cpp b/trick_source/sim_services/FrameLog/FrameLog.cpp
index 2eb4516e3..06dfd11fd 100644
--- a/trick_source/sim_services/FrameLog/FrameLog.cpp
+++ b/trick_source/sim_services/FrameLog/FrameLog.cpp
@@ -1,1048 +1,1048 @@
 
-#include <iostream>
-#include <algorithm>
-#include <sstream>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include "trick/FrameLog.hh"
-#include "trick/FrameDataRecordGroup.hh"
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
-#include "trick/data_record_proto.h"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-Trick::FrameLog * the_fl = NULL ;
+#include	<iostream>
+#include	<algorithm>
+#include	<sstream>
+#include	<string.h>
+#include	<sys/stat.h>
+#include	<sys/types.h>
+#include	<errno.h>
+
+#include	"trick/FrameLog.hh"
+#include	"trick/FrameDataRecordGroup.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/data_record_proto.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+Trick::FrameLog	*	the_fl	=	NULL	;
 
 //Constructor.
-Trick::FrameLog::FrameLog(Trick::Clock & in_clock) : 
- frame_log_flag(false),
- drg_trick(NULL),
- drg_frame(NULL),
- plots_per_page(6),
- timeline(NULL),
- timeline_other(NULL),
- num_threads(1),
- tl_max_samples(100000),
- tl_count(NULL),
- tl_other_count(NULL),
- log_init_start(false),
- log_init_end(false),
- fp_time_main(NULL),
- fp_time_other(NULL),
- clock(in_clock) {
-
-    time_value_attr.type = TRICK_DOUBLE;
-    time_value_attr.size = sizeof(double);
-    time_value_attr.units = strdup("s") ;
-
-    the_fl = this ;
+Trick::FrameLog::FrameLog(Trick::Clock	&	in_clock)	:	
+	frame_log_flag(false),
+	drg_trick(NULL),
+	drg_frame(NULL),
+	plots_per_page(6),
+	timeline(NULL),
+	timeline_other(NULL),
+	num_threads(1),
+	tl_max_samples(100000),
+	tl_count(NULL),
+	tl_other_count(NULL),
+	log_init_start(false),
+	log_init_end(false),
+	fp_time_main(NULL),
+	fp_time_other(NULL),
+	clock(in_clock)	{
+
+				time_value_attr.type	=	TRICK_DOUBLE;
+				time_value_attr.size	=	sizeof(double);
+				time_value_attr.units	=	strdup("s")	;
+
+				the_fl	=	this	;
 
 }
 
-Trick::FrameLog::~FrameLog() {
-    free((char *)time_value_attr.units) ;
-    // leaking all of the FrameDataRecordGroups
-    // leaking timeline memory.
+Trick::FrameLog::~FrameLog()	{
+				free((char	*)time_value_attr.units)	;
+				//	leaking	all	of	the	FrameDataRecordGroups
+				//	leaking	timeline	memory.
 }
 
 /**
 @details
 
-This routine is called during the "default_data" phase of initialization.  At that time
-the number of threads in the sim will be known and this ensure that everything is
-allocated before the input_processor is initially run.
-
--# Allocate a FrameDataRecordGroup to hold user job information on the main thread
--# Push the FrameDataRecordGroup to drg_users.
--# For each child thread in the sim
- -# Allocate a FrameDataRecordGroup to hold user job information on the child thread
- -# Push the FrameDataRecordGroup to drg_users.
--# Allocate a FrameDataRecordGroup to hold trick job information
--# Allocate a FrameDataRecordGroup to hold frame information
--# Allocate space for timeline for each thread.
+This	routine	is	called	during	the	"default_data"	phase	of	initialization.		At	that	time
+the	number	of	threads	in	the	sim	will	be	known	and	this	ensure	that	everything	is
+allocated	before	the	input_processor	is	initially	run.
+
+-#	Allocate	a	FrameDataRecordGroup	to	hold	user	job	information	on	the	main	thread
+-#	Push	the	FrameDataRecordGroup	to	drg_users.
+-#	For	each	child	thread	in	the	sim
+	-#	Allocate	a	FrameDataRecordGroup	to	hold	user	job	information	on	the	child	thread
+	-#	Push	the	FrameDataRecordGroup	to	drg_users.
+-#	Allocate	a	FrameDataRecordGroup	to	hold	trick	job	information
+-#	Allocate	a	FrameDataRecordGroup	to	hold	frame	information
+-#	Allocate	space	for	timeline	for	each	thread.
 */
-void Trick::FrameLog::allocate_recording_groups() {
-
-    Trick::FrameDataRecordGroup * fdrg ;
-    int ii ;
-
-    /* Create log_user_jobs group and log_trick_jobs group to record job frame_times. */
-    fdrg = new ("trick_frame_userjobs_main") Trick::FrameDataRecordGroup(0, "frame_userjobs_main") ;
-    drg_users.push_back(fdrg) ;
-    num_threads = exec_get_num_threads();
-    for ( ii = 1 ; ii < num_threads ; ii++ ) {
-        std::ostringstream group_name ;
-        group_name << "trick_frame_userjobs_C" << ii ;
-        fdrg = new (group_name.str().c_str()) Trick::FrameDataRecordGroup(ii, group_name.str()) ;
-        drg_users.push_back(fdrg) ;
-    }
-    drg_trick = new ("trick_frame_trick_jobs") FrameDataRecordGroup(0, "frame_trickjobs") ;
-    drg_frame = new ("trick_frame") FrameDataRecordGroup(0, "frame") ;
-
-    /* Allocate space for timeline for each thread according to user settable tl_max_samples variable. */
-    timeline = (Trick::timeline_t **)calloc( num_threads, sizeof(Trick::timeline_t*));
-    timeline_other = (Trick::timeline_t **)calloc( num_threads, sizeof(Trick::timeline_t*));
-    for (ii=0; ii<num_threads; ii++) {
-        timeline[ii] = (Trick::timeline_t *)calloc( tl_max_samples, sizeof(Trick::timeline_t));
-        timeline_other[ii] = (Trick::timeline_t *)calloc( tl_max_samples, sizeof(Trick::timeline_t));
-    }
-    tl_count = (int *)calloc( num_threads, sizeof(int));
-    tl_other_count = (int *)calloc( num_threads, sizeof(int));
+void	Trick::FrameLog::allocate_recording_groups()	{
+
+				Trick::FrameDataRecordGroup	*	fdrg	;
+				int	ii	;
+
+				/*	Create	log_user_jobs	group	and	log_trick_jobs	group	to	record	job	frame_times.	*/
+				fdrg	=	new	("trick_frame_userjobs_main")	Trick::FrameDataRecordGroup(0,	"frame_userjobs_main")	;
+				drg_users.push_back(fdrg)	;
+				num_threads	=	exec_get_num_threads();
+				for	(	ii	=	1	;	ii	<	num_threads	;	ii++	)	{
+								std::ostringstream	group_name	;
+								group_name	<<	"trick_frame_userjobs_C"	<<	ii	;
+								fdrg	=	new	(group_name.str().c_str())	Trick::FrameDataRecordGroup(ii,	group_name.str())	;
+								drg_users.push_back(fdrg)	;
+				}
+				drg_trick	=	new	("trick_frame_trick_jobs")	FrameDataRecordGroup(0,	"frame_trickjobs")	;
+				drg_frame	=	new	("trick_frame")	FrameDataRecordGroup(0,	"frame")	;
+
+				/*	Allocate	space	for	timeline	for	each	thread	according	to	user	settable	tl_max_samples	variable.	*/
+				timeline	=	(Trick::timeline_t	**)calloc(	num_threads,	sizeof(Trick::timeline_t*));
+				timeline_other	=	(Trick::timeline_t	**)calloc(	num_threads,	sizeof(Trick::timeline_t*));
+				for	(ii=0;	ii<num_threads;	ii++)	{
+								timeline[ii]	=	(Trick::timeline_t	*)calloc(	tl_max_samples,	sizeof(Trick::timeline_t));
+								timeline_other[ii]	=	(Trick::timeline_t	*)calloc(	tl_max_samples,	sizeof(Trick::timeline_t));
+				}
+				tl_count	=	(int	*)calloc(	num_threads,	sizeof(int));
+				tl_other_count	=	(int	*)calloc(	num_threads,	sizeof(int));
 }
 
-void Trick::FrameLog::add_recording_vars_for_jobs() {
-
-    unsigned int ii , dot ;
-    REF2 * new_ref ;
-    char * job_name = NULL ;
-    std::vector<Trick::JobData *> all_jobs_vector ;
-
-    exec_get_all_jobs_vector(all_jobs_vector) ;
-
-    for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
-        /** @li only makes sense to record frame time for scheduled, integ, and end_of_frame jobs */
-        /** @li exclude system jobs because they are excluded in instrument_before/after */
-        /** @li exclude frame_log jobs */
-        if ( (all_jobs_vector[ii]->job_class >= exec_get_scheduled_start_index() ||
-             (! all_jobs_vector[ii]->job_class_name.compare("integration")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("derivative")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("dynamic_event")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("post_integration")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("system_thread_sync")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("top_of_frame")) ||
-             (! all_jobs_vector[ii]->job_class_name.compare("end_of_frame")))
-           ) {
-            dot = all_jobs_vector[ii]->name.find_first_of(".");
-            if (!all_jobs_vector[ii]->name.compare(dot,11,".frame_log.")) {
-                continue;
-            }
-
-            new_ref = (REF2 *)calloc(1 , sizeof(REF2)) ;
-            /** @li add job frame id, job class and cycle time to displayed job name, and prepend "JOB_" so it stands out in quickplot */
-            if ( all_jobs_vector[ii]->job_class >= exec_get_scheduled_start_index() ) {
-                if ( all_jobs_vector[ii]->thread == 0 ) {
-                    asprintf(&job_name, "JOB_%s.%2.2f(%s_%2.3f)", all_jobs_vector[ii]->name.c_str(),
-                        all_jobs_vector[ii]->frame_id, all_jobs_vector[ii]->job_class_name.c_str(), all_jobs_vector[ii]->cycle);
-                } else { // add child thread # to name
-                    asprintf(&job_name, "JOB_%s_C%d.%2.2f(%s_%2.3f)",  all_jobs_vector[ii]->name.c_str(), all_jobs_vector[ii]->thread,
-                        all_jobs_vector[ii]->frame_id, all_jobs_vector[ii]->job_class_name.c_str(), all_jobs_vector[ii]->cycle);
-                }
-            } else { // non-scheduled class
-                asprintf(&job_name, "JOB_%s.%2.2f(%s)", all_jobs_vector[ii]->name.c_str(),
-                    all_jobs_vector[ii]->frame_id, all_jobs_vector[ii]->job_class_name.c_str());
-            }
-            // replace any colons in (C++) job name with underscores
-            char *colon = strchr(job_name, ':') ;
-            while (colon) {
-                colon[0] = '#';
-                colon = strchr(job_name, ':') ;
-            }
-
-            new_ref->reference = job_name;
-            new_ref->address = &(all_jobs_vector[ii]->frame_time_seconds) ;
-            new_ref->attr = &time_value_attr ;
-            /** @li use TRK tag in S_define to identify trick jobs */
-            // trick jobs
-            if ( all_jobs_vector[ii]->tags.count("TRK") ) {
-                trick_jobs.push_back(std::string(job_name));
-                drg_trick->add_variable(new_ref) ;
-                drg_trick->add_rec_job(all_jobs_vector[ii]) ;
-                // save names of trick sim objects (ones that user can change) so we can color code jobs in DP file
-                if (!all_jobs_vector[ii]->name.compare(dot,5,".drd.")) {
-                    dr_sim_object_name = all_jobs_vector[ii]->parent_object->name;
-                }
-                if (!all_jobs_vector[ii]->name.compare(dot,8,".master.")) {
-                    ms_sim_object_name = all_jobs_vector[ii]->parent_object->name;
-                }
-                if (!all_jobs_vector[ii]->name.compare(dot,9,".rt_sync.")) {
-                    rt_sim_object_name = all_jobs_vector[ii]->parent_object->name;
-                }
-                //TODO: no message jobs yet - fill this in when messaging has a job to look at here
-                // if () {
-                    msg_sim_object_name = std::string("message");
-                //}
-            // user jobs
-            } else {
-                user_jobs.push_back(std::string(job_name));
-                drg_users[all_jobs_vector[ii]->thread]->add_variable(new_ref) ;
-                drg_users[all_jobs_vector[ii]->thread]->add_rec_job(all_jobs_vector[ii]) ;
-            }
-        }
-    }
-
-    /* set the recoring job be and end of frame job.  Set each recording group to it's proper thread. */
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() , ii = 0 ; fdrg_it != drg_users.end() ; ++fdrg_it , ii++ ) {
-        (*fdrg_it)->set_job_class("end_of_frame") ;
-        (*fdrg_it)->set_phase(65533);
-        (*fdrg_it)->set_thread(ii);
-        if ( ii > 0 ) {
-            std::ostringstream group_name ;
-            group_name << "trick_frame_userjobs_C" << ii ;
-            (*fdrg_it)->add_variable( group_name.str() + ".frame_time") ;
-        }
-    }
-    drg_trick->set_job_class("end_of_frame") ;
-    drg_trick->set_phase(65535);
+void	Trick::FrameLog::add_recording_vars_for_jobs()	{
+
+				unsigned	int	ii	,	dot	;
+				REF2	*	new_ref	;
+				char	*	job_name	=	NULL	;
+				std::vector<Trick::JobData	*>	all_jobs_vector	;
+
+				exec_get_all_jobs_vector(all_jobs_vector)	;
+
+				for	(	ii	=	0	;	ii	<	all_jobs_vector.size()	;	ii++	)	{
+								/**	@li	only	makes	sense	to	record	frame	time	for	scheduled,	integ,	and	end_of_frame	jobs	*/
+								/**	@li	exclude	system	jobs	because	they	are	excluded	in	instrument_before/after	*/
+								/**	@li	exclude	frame_log	jobs	*/
+								if	(	(all_jobs_vector[ii]->job_class	>=	exec_get_scheduled_start_index()	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("integration"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("derivative"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("dynamic_event"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("post_integration"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("system_thread_sync"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("top_of_frame"))	||
+													(!	all_jobs_vector[ii]->job_class_name.compare("end_of_frame")))
+											)	{
+												dot	=	all_jobs_vector[ii]->name.find_first_of(".");
+												if	(!all_jobs_vector[ii]->name.compare(dot,11,".frame_log."))	{
+																continue;
+												}
+
+												new_ref	=	(REF2	*)calloc(1	,	sizeof(REF2))	;
+												/**	@li	add	job	frame	id,	job	class	and	cycle	time	to	displayed	job	name,	and	prepend	"JOB_"	so	it	stands	out	in	quickplot	*/
+												if	(	all_jobs_vector[ii]->job_class	>=	exec_get_scheduled_start_index()	)	{
+																if	(	all_jobs_vector[ii]->thread	==	0	)	{
+																				asprintf(&job_name,	"JOB_%s.%2.2f(%s_%2.3f)",	all_jobs_vector[ii]->name.c_str(),
+																								all_jobs_vector[ii]->frame_id,	all_jobs_vector[ii]->job_class_name.c_str(),	all_jobs_vector[ii]->cycle);
+																}	else	{	//	add	child	thread	#	to	name
+																				asprintf(&job_name,	"JOB_%s_C%d.%2.2f(%s_%2.3f)",		all_jobs_vector[ii]->name.c_str(),	all_jobs_vector[ii]->thread,
+																								all_jobs_vector[ii]->frame_id,	all_jobs_vector[ii]->job_class_name.c_str(),	all_jobs_vector[ii]->cycle);
+																}
+												}	else	{	//	non-scheduled	class
+																asprintf(&job_name,	"JOB_%s.%2.2f(%s)",	all_jobs_vector[ii]->name.c_str(),
+																				all_jobs_vector[ii]->frame_id,	all_jobs_vector[ii]->job_class_name.c_str());
+												}
+												//	replace	any	colons	in	(C++)	job	name	with	underscores
+												char	*colon	=	strchr(job_name,	':')	;
+												while	(colon)	{
+																colon[0]	=	'#';
+																colon	=	strchr(job_name,	':')	;
+												}
+
+												new_ref->reference	=	job_name;
+												new_ref->address	=	&(all_jobs_vector[ii]->frame_time_seconds)	;
+												new_ref->attr	=	&time_value_attr	;
+												/**	@li	use	TRK	tag	in	S_define	to	identify	trick	jobs	*/
+												//	trick	jobs
+												if	(	all_jobs_vector[ii]->tags.count("TRK")	)	{
+																trick_jobs.push_back(std::string(job_name));
+																drg_trick->add_variable(new_ref)	;
+																drg_trick->add_rec_job(all_jobs_vector[ii])	;
+																//	save	names	of	trick	sim	objects	(ones	that	user	can	change)	so	we	can	color	code	jobs	in	DP	file
+																if	(!all_jobs_vector[ii]->name.compare(dot,5,".drd."))	{
+																				dr_sim_object_name	=	all_jobs_vector[ii]->parent_object->name;
+																}
+																if	(!all_jobs_vector[ii]->name.compare(dot,8,".master."))	{
+																				ms_sim_object_name	=	all_jobs_vector[ii]->parent_object->name;
+																}
+																if	(!all_jobs_vector[ii]->name.compare(dot,9,".rt_sync."))	{
+																				rt_sim_object_name	=	all_jobs_vector[ii]->parent_object->name;
+																}
+																//TODO:	no	message	jobs	yet	-	fill	this	in	when	messaging	has	a	job	to	look	at	here
+																//	if	()	{
+																				msg_sim_object_name	=	std::string("message");
+																//}
+												//	user	jobs
+												}	else	{
+																user_jobs.push_back(std::string(job_name));
+																drg_users[all_jobs_vector[ii]->thread]->add_variable(new_ref)	;
+																drg_users[all_jobs_vector[ii]->thread]->add_rec_job(all_jobs_vector[ii])	;
+												}
+								}
+				}
+
+				/*	set	the	recoring	job	be	and	end	of	frame	job.		Set	each	recording	group	to	it's	proper	thread.	*/
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	,	ii	=	0	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	,	ii++	)	{
+								(*fdrg_it)->set_job_class("end_of_frame")	;
+								(*fdrg_it)->set_phase(65533);
+								(*fdrg_it)->set_thread(ii);
+								if	(	ii	>	0	)	{
+												std::ostringstream	group_name	;
+												group_name	<<	"trick_frame_userjobs_C"	<<	ii	;
+												(*fdrg_it)->add_variable(	group_name.str()	+	".frame_time")	;
+								}
+				}
+				drg_trick->set_job_class("end_of_frame")	;
+				drg_trick->set_phase(65535);
 
 }
 
 /**
 @details
--# Add the log_userjob frame time we created above to the log_frame group
--# Add the log_trickjob frame time we created above to the log_frame group
--# Set the recording job data_record_group.frame to end of frame -
-   phase it last (after rt_monitor) because time set in rt_monitor
+-#	Add	the	log_userjob	frame	time	we	created	above	to	the	log_frame	group
+-#	Add	the	log_trickjob	frame	time	we	created	above	to	the	log_frame	group
+-#	Set	the	recording	job	data_record_group.frame	to	end	of	frame	-
+			phase	it	last	(after	rt_monitor)	because	time	set	in	rt_monitor
 */
-void Trick::FrameLog::add_recording_vars_for_frame() {
-
-    REF2 * new_ref ;
-    char * job_name = NULL ;
-    int ii ;
-
-    drg_frame->add_variable(rt_sim_object_name + std::string(".rt_sync.frame_time")) ;
-    drg_frame->add_variable(rt_sim_object_name + std::string(".rt_sync.frame_overrun")) ;
-
-    /* add the log_userjob frame time we created above to the log_frame group */
-    for ( ii = 0 ; ii < num_threads ; ii++ ) {
-        new_ref = (REF2 *)calloc(1 , sizeof(REF2)) ;
-        if (ii > 0) {
-            asprintf(&job_name, "JOB_data_record_group_frame_userjobs_C%d.data_record.%2.2f(end_of_frame)",
-             ii,drg_users[ii]->write_job->frame_id);
-        } else {
-            asprintf(&job_name, "JOB_data_record_group_frame_userjobs.data_record.%2.2f(end_of_frame)",
-             drg_users[ii]->write_job->frame_id);
-        }
-        trick_jobs.push_back(std::string(job_name));
-        new_ref->reference = job_name;
-        new_ref->address = &(drg_users[ii]->write_job->frame_time_seconds);
-        new_ref->attr = &time_value_attr ;
-        drg_frame->add_variable(new_ref) ;
-        drg_frame->add_rec_job(drg_users[ii]->write_job) ;
-    }
-
-    /* add the log_trickjob frame time we created above to the log_frame group */
-    new_ref = (REF2 *)calloc(1 , sizeof(REF2)) ;
-    asprintf(&job_name, "JOB_data_record_group.trickjobs.%2.2f(end_of_frame)",drg_trick->jobs[0]->frame_id);
-    trick_jobs.push_back(std::string(job_name));
-    new_ref->reference = job_name;
-    new_ref->address = &(drg_trick->write_job->frame_time_seconds);
-    new_ref->attr = &time_value_attr ;
-    drg_frame->add_variable(new_ref) ;
-    drg_frame->add_rec_job(drg_trick->write_job) ;
-
-    /* set the recording job data_record_group.frame to end of frame -
-       phase it last (after rt_monitor) because time set in rt_monitor */
-    drg_frame->set_job_class("end_of_frame") ;
-    drg_frame->set_phase(65535);
+void	Trick::FrameLog::add_recording_vars_for_frame()	{
+
+				REF2	*	new_ref	;
+				char	*	job_name	=	NULL	;
+				int	ii	;
+
+				drg_frame->add_variable(rt_sim_object_name	+	std::string(".rt_sync.frame_time"))	;
+				drg_frame->add_variable(rt_sim_object_name	+	std::string(".rt_sync.frame_overrun"))	;
+
+				/*	add	the	log_userjob	frame	time	we	created	above	to	the	log_frame	group	*/
+				for	(	ii	=	0	;	ii	<	num_threads	;	ii++	)	{
+								new_ref	=	(REF2	*)calloc(1	,	sizeof(REF2))	;
+								if	(ii	>	0)	{
+												asprintf(&job_name,	"JOB_data_record_group_frame_userjobs_C%d.data_record.%2.2f(end_of_frame)",
+													ii,drg_users[ii]->write_job->frame_id);
+								}	else	{
+												asprintf(&job_name,	"JOB_data_record_group_frame_userjobs.data_record.%2.2f(end_of_frame)",
+													drg_users[ii]->write_job->frame_id);
+								}
+								trick_jobs.push_back(std::string(job_name));
+								new_ref->reference	=	job_name;
+								new_ref->address	=	&(drg_users[ii]->write_job->frame_time_seconds);
+								new_ref->attr	=	&time_value_attr	;
+								drg_frame->add_variable(new_ref)	;
+								drg_frame->add_rec_job(drg_users[ii]->write_job)	;
+				}
+
+				/*	add	the	log_trickjob	frame	time	we	created	above	to	the	log_frame	group	*/
+				new_ref	=	(REF2	*)calloc(1	,	sizeof(REF2))	;
+				asprintf(&job_name,	"JOB_data_record_group.trickjobs.%2.2f(end_of_frame)",drg_trick->jobs[0]->frame_id);
+				trick_jobs.push_back(std::string(job_name));
+				new_ref->reference	=	job_name;
+				new_ref->address	=	&(drg_trick->write_job->frame_time_seconds);
+				new_ref->attr	=	&time_value_attr	;
+				drg_frame->add_variable(new_ref)	;
+				drg_frame->add_rec_job(drg_trick->write_job)	;
+
+				/*	set	the	recording	job	data_record_group.frame	to	end	of	frame	-
+							phase	it	last	(after	rt_monitor)	because	time	set	in	rt_monitor	*/
+				drg_frame->set_job_class("end_of_frame")	;
+				drg_frame->set_phase(65535);
 }
 
 /**
 @details
--# For each FrameDataRecordGroup in drg_users
- -# Call add_data_record_group
--# Call add_data_record_group for drg_trick
--# Call add_data_record_group for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	add_data_record_group
+-#	Call	add_data_record_group	for	drg_trick
+-#	Call	add_data_record_group	for	drg_frame
 */
-void Trick::FrameLog::add_recording_groups_to_sim() {
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() ; fdrg_it != drg_users.end() ; ++fdrg_it ) {
-        add_data_record_group( *fdrg_it , Trick::DR_Ring_Buffer) ;
-    }
-    add_data_record_group(drg_trick, Trick::DR_Ring_Buffer) ;
-    add_data_record_group(drg_frame, Trick::DR_Ring_Buffer) ;
+void	Trick::FrameLog::add_recording_groups_to_sim()	{
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	)	{
+								add_data_record_group(	*fdrg_it	,	Trick::DR_Ring_Buffer)	;
+				}
+				add_data_record_group(drg_trick,	Trick::DR_Ring_Buffer)	;
+				add_data_record_group(drg_frame,	Trick::DR_Ring_Buffer)	;
 }
 
 /**
 @details
--# For each FrameDataRecordGroup in drg_users
- -# Call remove_data_record_group
--# Call remove_data_record_group for drg_trick
--# Call remove_data_record_group for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	remove_data_record_group
+-#	Call	remove_data_record_group	for	drg_trick
+-#	Call	remove_data_record_group	for	drg_frame
 */
-void Trick::FrameLog::remove_recording_groups_from_sim() {
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() ; fdrg_it != drg_users.end() ; ++fdrg_it ) {
-        remove_data_record_group( *fdrg_it) ;
-    }
-    remove_data_record_group(drg_trick) ;
-    remove_data_record_group(drg_frame) ;
+void	Trick::FrameLog::remove_recording_groups_from_sim()	{
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	)	{
+								remove_data_record_group(	*fdrg_it)	;
+				}
+				remove_data_record_group(drg_trick)	;
+				remove_data_record_group(drg_frame)	;
 }
 
 /**
 @details
--# For each FrameDataRecordGroup in drg_users
- -# Call enable
--# Call enable for drg_trick
--# Call enable for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	enable
+-#	Call	enable	for	drg_trick
+-#	Call	enable	for	drg_frame
 */
-void Trick::FrameLog::enable_recording_groups() {
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() ; fdrg_it != drg_users.end() ; ++fdrg_it ) {
-        (*fdrg_it)->enable() ;
-    }
-    drg_trick->enable() ;
-    drg_frame->enable() ;
+void	Trick::FrameLog::enable_recording_groups()	{
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	)	{
+								(*fdrg_it)->enable()	;
+				}
+				drg_trick->enable()	;
+				drg_frame->enable()	;
 }
 
 /**
 @details
--# For each FrameDataRecordGroup in drg_users
- -# Call disable
--# Call disable for drg_trick
--# Call disable for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	disable
+-#	Call	disable	for	drg_trick
+-#	Call	disable	for	drg_frame
 */
-void Trick::FrameLog::disable_recording_groups() {
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() ; fdrg_it != drg_users.end() ; ++fdrg_it ) {
-        (*fdrg_it)->disable() ;
-    }
-    drg_trick->disable() ;
-    drg_frame->disable() ;
+void	Trick::FrameLog::disable_recording_groups()	{
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	)	{
+								(*fdrg_it)->disable()	;
+				}
+				drg_trick->disable()	;
+				drg_frame->disable()	;
 }
 
 /**
 @details
--# For each FrameDataRecordGroup in drg_users
- -# Call init
--# Call init for drg_trick
--# Call init for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	init
+-#	Call	init	for	drg_trick
+-#	Call	init	for	drg_frame
 */
-void Trick::FrameLog::init_recording_groups() {
-    std::vector< Trick::FrameDataRecordGroup *>::iterator fdrg_it ;
-    for ( fdrg_it = drg_users.begin() ; fdrg_it != drg_users.end() ; ++fdrg_it ) {
-        (*fdrg_it)->init() ;
-    }
-    drg_trick->init() ;
-    drg_frame->init() ;
+void	Trick::FrameLog::init_recording_groups()	{
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	fdrg_it	;
+				for	(	fdrg_it	=	drg_users.begin()	;	fdrg_it	!=	drg_users.end()	;	++fdrg_it	)	{
+								(*fdrg_it)->init()	;
+				}
+				drg_trick->init()	;
+				drg_frame->init()	;
 }
 
 /**
 @details
--# Insert frame log clock jobs in queue before and after all jobs we want to log the time of.
+-#	Insert	frame	log	clock	jobs	in	queue	before	and	after	all	jobs	we	want	to	log	the	time	of.
 */
-void Trick::FrameLog::add_instrument_jobs() {
-    exec_instrument_before("trick_frame_log.frame_log.frame_clock_start") ;
-    exec_instrument_after("trick_frame_log.frame_log.frame_clock_stop") ;
+void	Trick::FrameLog::add_instrument_jobs()	{
+				exec_instrument_before("trick_frame_log.frame_log.frame_clock_start")	;
+				exec_instrument_after("trick_frame_log.frame_log.frame_clock_stop")	;
 }
 
 /**
 @details
--# Removes frame log clock jobs in queue before and after all jobs.
+-#	Removes	frame	log	clock	jobs	in	queue	before	and	after	all	jobs.
 */
-void Trick::FrameLog::remove_instrument_jobs() {
-    exec_instrument_remove("trick_frame_log.frame_log.frame_clock_start") ;
-    exec_instrument_remove("trick_frame_log.frame_log.frame_clock_stop") ;
+void	Trick::FrameLog::remove_instrument_jobs()	{
+				exec_instrument_remove("trick_frame_log.frame_log.frame_clock_start")	;
+				exec_instrument_remove("trick_frame_log.frame_log.frame_clock_stop")	;
 }
 
-//Instrumentation job to save job timeline start time.
-int Trick::FrameLog::frame_clock_start(Trick::JobData * curr_job ) {
+//Instrumentation	job	to	save	job	timeline	start	time.
+int	Trick::FrameLog::frame_clock_start(Trick::JobData	*	curr_job	)	{
 
-    Trick::JobData * target_job = (Trick::JobData *)curr_job->sup_class_data ;
+				Trick::JobData	*	target_job	=	(Trick::JobData	*)curr_job->sup_class_data	;
 
-    /** @par Detailed Design: */
-    if ( target_job != NULL ) {
-        /** @li Set target job's start time. */
-        target_job->rt_start_time = clock.clock_time() ;
-    }
+				/**	@par	Detailed	Design:	*/
+				if	(	target_job	!=	NULL	)	{
+								/**	@li	Set	target	job's	start	time.	*/
+								target_job->rt_start_time	=	clock.clock_time()	;
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
-//Instrumentation job to save job timeline stop time and frame time.
-int Trick::FrameLog::frame_clock_stop(Trick::JobData * curr_job) {
-
-    Trick::JobData * target_job = (Trick::JobData *)curr_job->sup_class_data ;
-    int thread, mode;
-    double time_scale;
-    
-    /** @par Detailed Design: */
-    if ( target_job != NULL ) {
-        if ( target_job->rt_start_time >= 0 ) {
-            /** @li Set current job's stop time and frame time. */
-            target_job->rt_stop_time = clock.clock_time() ;
-            time_scale = 1.0 / target_job->time_tic_value;
-            target_job->frame_time += (target_job->rt_stop_time - target_job->rt_start_time);
-            target_job->frame_time_seconds = target_job->frame_time * time_scale;
-            thread = target_job->thread;
-
-            mode = exec_get_mode();
-            /** @li Whatever inits run after & including start_realtime, make them be timelined as cyclic. */
-            if (mode == Initialization) {
-                if (! target_job->name.compare(rt_sim_object_name + std::string(".rt_sync.start_realtime")) ) {
-                    log_init_end = true;
-                    // fixup: set start_realtime function's start time to 0 because it will have reset the clock
-                    target_job->rt_start_time = 0;
-                }
-                if (log_init_end) {
-                    mode = Run;
-                }
-            }
-            /** @li Save all cyclic job start & stop times for this frame into timeline structure. */
-            if ((mode==Run) || (mode==Step)) {                            // cyclic job
-                if (tl_count[thread] < tl_max_samples) {
-                    timeline[thread][tl_count[thread]].id    = target_job->frame_id;
-                    timeline[thread][tl_count[thread]].start = target_job->rt_start_time;
-                    timeline[thread][tl_count[thread]].stop  = target_job->rt_stop_time;
-                    timeline[thread][tl_count[thread]].trick_job = target_job->tags.count("TRK");
-                    tl_count[thread]++;
-                }
-            /** @li Save all non-cyclic job start & stop times for this frame into timeline_other structure. */
-            } else {                                                      // non-cyclic job
-                if (tl_other_count[thread] < tl_max_samples) {
-                    timeline_other[thread][tl_other_count[thread]].id    = target_job->frame_id;
-                    timeline_other[thread][tl_other_count[thread]].start = target_job->rt_start_time;
-                    timeline_other[thread][tl_other_count[thread]].stop  = target_job->rt_stop_time;
-                    timeline_other[thread][tl_other_count[thread]].trick_job = target_job->tags.count("TRK");
-                    tl_other_count[thread]++;
-                }
-            }
-            // start timeline over
-            target_job->rt_start_time = 0;
-            target_job->rt_stop_time = 0;
-        } else {
-            target_job->frame_time = 0 ;
-            target_job->frame_time_seconds = 0.0;
-        }
-    }
-
-    return(0) ;
+//Instrumentation	job	to	save	job	timeline	stop	time	and	frame	time.
+int	Trick::FrameLog::frame_clock_stop(Trick::JobData	*	curr_job)	{
+
+				Trick::JobData	*	target_job	=	(Trick::JobData	*)curr_job->sup_class_data	;
+				int	thread,	mode;
+				double	time_scale;
+				
+				/**	@par	Detailed	Design:	*/
+				if	(	target_job	!=	NULL	)	{
+								if	(	target_job->rt_start_time	>=	0	)	{
+												/**	@li	Set	current	job's	stop	time	and	frame	time.	*/
+												target_job->rt_stop_time	=	clock.clock_time()	;
+												time_scale	=	1.0	/	target_job->time_tic_value;
+												target_job->frame_time	+=	(target_job->rt_stop_time	-	target_job->rt_start_time);
+												target_job->frame_time_seconds	=	target_job->frame_time	*	time_scale;
+												thread	=	target_job->thread;
+
+												mode	=	exec_get_mode();
+												/**	@li	Whatever	inits	run	after	&	including	start_realtime,	make	them	be	timelined	as	cyclic.	*/
+												if	(mode	==	Initialization)	{
+																if	(!	target_job->name.compare(rt_sim_object_name	+	std::string(".rt_sync.start_realtime"))	)	{
+																				log_init_end	=	true;
+																				//	fixup:	set	start_realtime	function's	start	time	to	0	because	it	will	have	reset	the	clock
+																				target_job->rt_start_time	=	0;
+																}
+																if	(log_init_end)	{
+																				mode	=	Run;
+																}
+												}
+												/**	@li	Save	all	cyclic	job	start	&	stop	times	for	this	frame	into	timeline	structure.	*/
+												if	((mode==Run)	||	(mode==Step))	{																												//	cyclic	job
+																if	(tl_count[thread]	<	tl_max_samples)	{
+																				timeline[thread][tl_count[thread]].id				=	target_job->frame_id;
+																				timeline[thread][tl_count[thread]].start	=	target_job->rt_start_time;
+																				timeline[thread][tl_count[thread]].stop		=	target_job->rt_stop_time;
+																				timeline[thread][tl_count[thread]].trick_job	=	target_job->tags.count("TRK");
+																				tl_count[thread]++;
+																}
+												/**	@li	Save	all	non-cyclic	job	start	&	stop	times	for	this	frame	into	timeline_other	structure.	*/
+												}	else	{																																																						//	non-cyclic	job
+																if	(tl_other_count[thread]	<	tl_max_samples)	{
+																				timeline_other[thread][tl_other_count[thread]].id				=	target_job->frame_id;
+																				timeline_other[thread][tl_other_count[thread]].start	=	target_job->rt_start_time;
+																				timeline_other[thread][tl_other_count[thread]].stop		=	target_job->rt_stop_time;
+																				timeline_other[thread][tl_other_count[thread]].trick_job	=	target_job->tags.count("TRK");
+																				tl_other_count[thread]++;
+																}
+												}
+												//	start	timeline	over
+												target_job->rt_start_time	=	0;
+												target_job->rt_stop_time	=	0;
+								}	else	{
+												target_job->frame_time	=	0	;
+												target_job->frame_time_seconds	=	0.0;
+								}
+				}
+
+				return(0)	;
 
 }
 
 /**
 @details
--# If we are enabled already, return
--# If the frame log data recording groups are not in the sim
- -# Add the frame log data recording groups to the sim
- -# Initialize the frame log data recording groups.
--# Add instrument jobs
--# Enable the recording groups
--# Set the frame log flag to true
+-#	If	we	are	enabled	already,	return
+-#	If	the	frame	log	data	recording	groups	are	not	in	the	sim
+	-#	Add	the	frame	log	data	recording	groups	to	the	sim
+	-#	Initialize	the	frame	log	data	recording	groups.
+-#	Add	instrument	jobs
+-#	Enable	the	recording	groups
+-#	Set	the	frame	log	flag	to	true
 */
-int Trick::FrameLog::framelog_on() {
-
-    if ( frame_log_flag == true ) {
-        return(0) ;
-    }
-    // test if we have added the frame logging objects to the sim or not.
-    // If we haven't add them now and initialize the data recording groups.
-    // We do this in framelog_on so we don't add unnecessary jobs and create
-    // log_rt files until we have to.
-    if ( get_data_record_group(drg_trick->get_group_name()) == NULL ) {
-        add_recording_groups_to_sim() ;
-        init_recording_groups() ;
-    }
-    add_instrument_jobs() ;
-    enable_recording_groups() ;
-    frame_log_flag = true ;
-    return(0) ;
+int	Trick::FrameLog::framelog_on()	{
+
+				if	(	frame_log_flag	==	true	)	{
+								return(0)	;
+				}
+				//	test	if	we	have	added	the	frame	logging	objects	to	the	sim	or	not.
+				//	If	we	haven't	add	them	now	and	initialize	the	data	recording	groups.
+				//	We	do	this	in	framelog_on	so	we	don't	add	unnecessary	jobs	and	create
+				//	log_rt	files	until	we	have	to.
+				if	(	get_data_record_group(drg_trick->get_group_name())	==	NULL	)	{
+								add_recording_groups_to_sim()	;
+								init_recording_groups()	;
+				}
+				add_instrument_jobs()	;
+				enable_recording_groups()	;
+				frame_log_flag	=	true	;
+				return(0)	;
 }
 
 /**
 @details
--# If we are disabled already, return
--# Remove instrument jobs
--# Disable the recording groups
--# Set the frame log flag to false.
+-#	If	we	are	disabled	already,	return
+-#	Remove	instrument	jobs
+-#	Disable	the	recording	groups
+-#	Set	the	frame	log	flag	to	false.
 */
-int Trick::FrameLog::framelog_off() {
-
-    if ( frame_log_flag == false ) {
-        return(0) ;
-    }
-    remove_instrument_jobs() ;
-    disable_recording_groups() ;
-    frame_log_flag = false ;
-    return(0) ;
+int	Trick::FrameLog::framelog_off()	{
+
+				if	(	frame_log_flag	==	false	)	{
+								return(0)	;
+				}
+				remove_instrument_jobs()	;
+				disable_recording_groups()	;
+				frame_log_flag	=	false	;
+				return(0)	;
 }
 
 /**
 @details
-Command to set the maximum number of job timeline samples to be taken (default = 100000).
--# If num > 0
- -# Set new maximum to num.
- -# For each thread
-  -# Reallocate the timeline data array
-  -# Reallocate the timeline_other data array
+Command	to	set	the	maximum	number	of	job	timeline	samples	to	be	taken	(default	=	100000).
+-#	If	num	>	0
+	-#	Set	new	maximum	to	num.
+	-#	For	each	thread
+		-#	Reallocate	the	timeline	data	array
+		-#	Reallocate	the	timeline_other	data	array
 */
-int Trick::FrameLog::set_max_samples(int num) {
-    int ii ;
-    if (num > 0) {
-        tl_max_samples = num ;
-        for (ii=0; ii<num_threads; ii++) {
-            timeline[ii] = (Trick::timeline_t *)realloc( timeline[ii], tl_max_samples*sizeof(Trick::timeline_t));
-            timeline_other[ii] = (Trick::timeline_t *)realloc( timeline_other[ii], tl_max_samples*sizeof(Trick::timeline_t));
-        }
-        std::vector< Trick::FrameDataRecordGroup *>::iterator it ;
-        for ( it = drg_users.begin() ; it != drg_users.end() ; ++it ) {
-            (*it)->set_max_buffer_size(num) ;
-        }
-        drg_trick->set_max_buffer_size(num) ;
-        drg_frame->set_max_buffer_size(num) ;
-    }
-    return(0) ;
+int	Trick::FrameLog::set_max_samples(int	num)	{
+				int	ii	;
+				if	(num	>	0)	{
+								tl_max_samples	=	num	;
+								for	(ii=0;	ii<num_threads;	ii++)	{
+												timeline[ii]	=	(Trick::timeline_t	*)realloc(	timeline[ii],	tl_max_samples*sizeof(Trick::timeline_t));
+												timeline_other[ii]	=	(Trick::timeline_t	*)realloc(	timeline_other[ii],	tl_max_samples*sizeof(Trick::timeline_t));
+								}
+								std::vector<	Trick::FrameDataRecordGroup	*>::iterator	it	;
+								for	(	it	=	drg_users.begin()	;	it	!=	drg_users.end()	;	++it	)	{
+												(*it)->set_max_buffer_size(num)	;
+								}
+								drg_trick->set_max_buffer_size(num)	;
+								drg_frame->set_max_buffer_size(num)	;
+				}
+				return(0)	;
 }
 
 /**
 @details
--# Allocate memory for all of the frame log recording groups.
--# Add variables for both frame and individual job recording groups.
--# Create DP files.
+-#	Allocate	memory	for	all	of	the	frame	log	recording	groups.
+-#	Add	variables	for	both	frame	and	individual	job	recording	groups.
+-#	Create	DP	files.
 */
-void Trick::FrameLog::default_data() {
-    allocate_recording_groups() ;
-    add_recording_vars_for_jobs() ;
-    add_recording_vars_for_frame() ;
-    // reset clock before frame logging
-    clock.clock_reset(0);
+void	Trick::FrameLog::default_data()	{
+				allocate_recording_groups()	;
+				add_recording_vars_for_jobs()	;
+				add_recording_vars_for_frame()	;
+				//	reset	clock	before	frame	logging
+				clock.clock_reset(0);
 }
 
 /**
 @details
 
-Clears any data_record information related to frame logging from the checkpoint reload.
-This job must run before DataRecordGroup::restart.
+Clears	any	data_record	information	related	to	frame	logging	from	the	checkpoint	reload.
+This	job	must	run	before	DataRecordGroup::restart.
 
-DataRecordGroups save the list of variables it was recording when a checkpoint is taken.
-This list is used by DataRecordGroups to restart data recording.
-This list doesn't work with frame log groups because frame logging creates the
-data record list of varaibles differently than normal recording groups.  So, we need
-to erase the checkpointed list of frame log variables.  The correct variables will
-be inserted during FrameLog::restart which is run after DataRecordGroup::restart.
+DataRecordGroups	save	the	list	of	variables	it	was	recording	when	a	checkpoint	is	taken.
+This	list	is	used	by	DataRecordGroups	to	restart	data	recording.
+This	list	doesn't	work	with	frame	log	groups	because	frame	logging	creates	the
+data	record	list	of	varaibles	differently	than	normal	recording	groups.		So,	we	need
+to	erase	the	checkpointed	list	of	frame	log	variables.		The	correct	variables	will
+be	inserted	during	FrameLog::restart	which	is	run	after	DataRecordGroup::restart.
 
--# For each FrameDataRecordGroup in drg_users
- -# Call clear_checkpoint_vars
--# Call clear_checkpoint_vars for drg_trick
--# Call clear_checkpoint_vars for drg_frame
+-#	For	each	FrameDataRecordGroup	in	drg_users
+	-#	Call	clear_checkpoint_vars
+-#	Call	clear_checkpoint_vars	for	drg_trick
+-#	Call	clear_checkpoint_vars	for	drg_frame
 */
-int Trick::FrameLog::clear_data_record_info() {
+int	Trick::FrameLog::clear_data_record_info()	{
 
-    remove_recording_groups_from_sim() ;
+				remove_recording_groups_from_sim()	;
 
-    std::vector< Trick::FrameDataRecordGroup *>::iterator it ;
-    for ( it = drg_users.begin() ; it != drg_users.end() ; ++it ) {
-        (*it)->clear_checkpoint_vars() ;
-    }
-    drg_trick->clear_checkpoint_vars() ;
-    drg_frame->clear_checkpoint_vars() ;
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	it	;
+				for	(	it	=	drg_users.begin()	;	it	!=	drg_users.end()	;	++it	)	{
+								(*it)->clear_checkpoint_vars()	;
+				}
+				drg_trick->clear_checkpoint_vars()	;
+				drg_frame->clear_checkpoint_vars()	;
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
 
-Restart job that restores framelogging on checkpoint restart.  This is run after
+Restart	job	that	restores	framelogging	on	checkpoint	restart.		This	is	run	after
 clear_data_record_info.
 
--# Call data record group restart jobs
--# Add data recording variables for the jobs and frame
--# If frame log is on in checkpoint, turn frame log on.
+-#	Call	data	record	group	restart	jobs
+-#	Add	data	recording	variables	for	the	jobs	and	frame
+-#	If	frame	log	is	on	in	checkpoint,	turn	frame	log	on.
 */
-int Trick::FrameLog::restart() {
-// removing the data record groups removed the restart jobs too.  call them here.
-    std::vector< Trick::FrameDataRecordGroup *>::iterator it ;
-    for ( it = drg_users.begin() ; it != drg_users.end() ; ++it ) {
-        (*it)->restart() ;
-    }
-    drg_trick->restart() ;
-    drg_frame->restart() ;
-
-    add_recording_vars_for_jobs() ;
-    add_recording_vars_for_frame() ;
-    create_DP_files();
-
-    // if frame log is on in the checkpoint, turn it back on now
-    if ( frame_log_flag == true ) {
-        frame_log_flag = false ;
-        remove_instrument_jobs() ; // these will be added back when frame log turned on
-        framelog_on() ;
-    }
-    return 0 ;
+int	Trick::FrameLog::restart()	{
+//	removing	the	data	record	groups	removed	the	restart	jobs	too.		call	them	here.
+				std::vector<	Trick::FrameDataRecordGroup	*>::iterator	it	;
+				for	(	it	=	drg_users.begin()	;	it	!=	drg_users.end()	;	++it	)	{
+								(*it)->restart()	;
+				}
+				drg_trick->restart()	;
+				drg_frame->restart()	;
+
+				add_recording_vars_for_jobs()	;
+				add_recording_vars_for_frame()	;
+				create_DP_files();
+
+				//	if	frame	log	is	on	in	the	checkpoint,	turn	it	back	on	now
+				if	(	frame_log_flag	==	true	)	{
+								frame_log_flag	=	false	;
+								remove_instrument_jobs()	;	//	these	will	be	added	back	when	frame	log	turned	on
+								framelog_on()	;
+				}
+				return	0	;
 }
 
-//Shutdown job that writes the job timeline data to disk and closes log files.
-int Trick::FrameLog::shutdown() {
-
-    /** @par Detailed Design: */
-
-    int thread, ii, jj;
-    char log_buff[128];
-    Trick::timeline_t *tl;
-    double start, stop, time_scale;
-
-    if ( frame_log_flag == false ) {
-        return(0) ;
-    }
-
-    /** @li Manually create the log_timeline and log_timeline_init files from saved timeline data. */
-    if (fp_time_main == NULL) {
-        snprintf(log_buff, sizeof(log_buff), "%s/log_timeline.csv", command_line_args_get_output_dir());
-        if ((fp_time_main = fopen(log_buff, "w")) == NULL) {
-            message_publish(MSG_ERROR, "Could not open log_timeline.csv file for Job Timeline Logging\n") ;
-            exit(0);
-        }
-        fprintf(fp_time_main, "trick_frame_log.frame_log.job_time {s},");
-        fprintf(fp_time_main, "trick_frame_log.frame_log.job_trick_id {--},frame_log.frame_log.job_user_id {--}");
-        for (jj=1; jj<num_threads; jj++) {
-            fprintf(fp_time_main, ",trick_frame_log.frame_log.job_userC%d_id {--}",jj);
-        }
-        fprintf(fp_time_main, "\n");
-
-        snprintf(log_buff, sizeof(log_buff), "%s/log_timeline_init.csv", command_line_args_get_output_dir());
-        if ((fp_time_other = fopen(log_buff, "w")) == NULL) {
-            message_publish(MSG_ERROR, "Could not open log_timeline_init.csv file for Job Timeline Logging\n") ;
-            exit(0);
-        }
-        fprintf(fp_time_other, "trick_frame_log.frame_log.job_init_time {s},");
-        fprintf(fp_time_other, "trick_frame_log.frame_log.job_trickinit_id {--},trick_frame_log.frame_log.job_userinit_id {--}\n");
-    }
-
-    time_scale = 1.0 / exec_get_time_tic_value();
-            // print to log like this:
-            // (only one of the job ids will be filled in depending on what type of job this is)
-            //               start job time, 0, 0
-            //               start job time, trick job id, user job id
-            //               stop  job time, trick job id, user job id
-            //               stop  job time, 0, 0
-    /** @li print a 0 id before each start time & after each stop time for a stairstep effect in plot. */
-    // cyclic jobs
-    for ( thread = 0 ; thread < num_threads ; thread++ ) {
-        tl = timeline[thread];
-        for ( ii = 0 ; ii < tl_count[thread] ; ii++ ) {
-            // start & stop time are in tics, so convert to seconds
-            start = tl[ii].start * time_scale;
-            stop =  tl[ii].stop  * time_scale;
-            fprintf(fp_time_main,      "%f,0", start);        // start stairstep
-            for (jj=0; jj<num_threads; jj++) {
-                fprintf(fp_time_main,  ",0");
-            }
-            fprintf(fp_time_main,      "\n");
-            if (tl[ii].trick_job) {
-                fprintf(fp_time_main, "%f,%f", start, tl[ii].id);    // trick job start
-                for (jj=0; jj<num_threads; jj++) {
-                    fprintf(fp_time_main, ",0");
-                }
-            } else { // user job
-                fprintf(fp_time_main, "%f,0", start);         // user job start
-                for (jj=0; jj<num_threads; jj++) {
-                    if (jj==thread) {
-                        fprintf(fp_time_main, ",%f", tl[ii].id);     // user thread id (0=main)
-                    } else {
-                        fprintf(fp_time_main, ",0");
-                    }
-                }
-            }
-            fprintf(fp_time_main,      "\n");
-            if (tl[ii].trick_job) {
-                fprintf(fp_time_main, "%f,%f", stop, tl[ii].id);    // trick job end
-                for (jj=0; jj<num_threads; jj++) {
-                    fprintf(fp_time_main, ",0");
-                }
-            } else { // user job
-                fprintf(fp_time_main, "%f,0", stop);         // user job end
-                for (jj=0; jj<num_threads; jj++) {
-                    if (jj==thread) {
-                        fprintf(fp_time_main, ",%f", tl[ii].id);    // user thread id (0=main)
-                    } else {
-                        fprintf(fp_time_main, ",0");
-                    }
-                }
-            }
-            fprintf(fp_time_main,      "\n");
-            fprintf(fp_time_main,      "%f,0", stop);        // end stairstep
-            for (jj=0; jj<num_threads; jj++) {
-                fprintf(fp_time_main,  ",0");
-            }
-            fprintf(fp_time_main,      "\n");
-        } // end for thread
-    } // end for ii
-
-    // non-cyclic jobs
-    for ( thread = 0 ; thread < num_threads ; thread++ ) {
-        tl = timeline_other[thread];
-        for ( ii = 0 ; ii < tl_other_count[thread] ; ii++ ) {
-            // start & stop time are in tics, so convert to seconds
-            start = tl[ii].start * time_scale;
-            stop =  tl[ii].stop  * time_scale;
-            fprintf(fp_time_other, "%f,0,0\n", start);          // start stairstep
-            if (tl[ii].trick_job) {
-                fprintf(fp_time_other, "%f,%f,0\n", start, tl[ii].id); // trick job start
-                fprintf(fp_time_other, "%f,%f,0\n", stop, tl[ii].id);  // trick job end
-            } else { // user job
-                fprintf(fp_time_other, "%f,0,%f\n", start, tl[ii].id); // user job start
-                fprintf(fp_time_other, "%f,0,%f\n", stop, tl[ii].id);  // user job end
-            }
-            fprintf(fp_time_other, "%f,0,0\n", stop);           // end stairstep
-        } // end for thread
-    } // end for ii
-
-    fclose(fp_time_main);
-    fclose(fp_time_other);
-
-    return(0) ;
+//Shutdown	job	that	writes	the	job	timeline	data	to	disk	and	closes	log	files.
+int	Trick::FrameLog::shutdown()	{
+
+				/**	@par	Detailed	Design:	*/
+
+				int	thread,	ii,	jj;
+				char	log_buff[128];
+				Trick::timeline_t	*tl;
+				double	start,	stop,	time_scale;
+
+				if	(	frame_log_flag	==	false	)	{
+								return(0)	;
+				}
+
+				/**	@li	Manually	create	the	log_timeline	and	log_timeline_init	files	from	saved	timeline	data.	*/
+				if	(fp_time_main	==	NULL)	{
+								snprintf(log_buff,	sizeof(log_buff),	"%s/log_timeline.csv",	command_line_args_get_output_dir());
+								if	((fp_time_main	=	fopen(log_buff,	"w"))	==	NULL)	{
+												message_publish(MSG_ERROR,	"Could	not	open	log_timeline.csv	file	for	Job	Timeline	Logging\n")	;
+												exit(0);
+								}
+								fprintf(fp_time_main,	"trick_frame_log.frame_log.job_time	{s},");
+								fprintf(fp_time_main,	"trick_frame_log.frame_log.job_trick_id	{--},frame_log.frame_log.job_user_id	{--}");
+								for	(jj=1;	jj<num_threads;	jj++)	{
+												fprintf(fp_time_main,	",trick_frame_log.frame_log.job_userC%d_id	{--}",jj);
+								}
+								fprintf(fp_time_main,	"\n");
+
+								snprintf(log_buff,	sizeof(log_buff),	"%s/log_timeline_init.csv",	command_line_args_get_output_dir());
+								if	((fp_time_other	=	fopen(log_buff,	"w"))	==	NULL)	{
+												message_publish(MSG_ERROR,	"Could	not	open	log_timeline_init.csv	file	for	Job	Timeline	Logging\n")	;
+												exit(0);
+								}
+								fprintf(fp_time_other,	"trick_frame_log.frame_log.job_init_time	{s},");
+								fprintf(fp_time_other,	"trick_frame_log.frame_log.job_trickinit_id	{--},trick_frame_log.frame_log.job_userinit_id	{--}\n");
+				}
+
+				time_scale	=	1.0	/	exec_get_time_tic_value();
+												//	print	to	log	like	this:
+												//	(only	one	of	the	job	ids	will	be	filled	in	depending	on	what	type	of	job	this	is)
+												//															start	job	time,	0,	0
+												//															start	job	time,	trick	job	id,	user	job	id
+												//															stop		job	time,	trick	job	id,	user	job	id
+												//															stop		job	time,	0,	0
+				/**	@li	print	a	0	id	before	each	start	time	&	after	each	stop	time	for	a	stairstep	effect	in	plot.	*/
+				//	cyclic	jobs
+				for	(	thread	=	0	;	thread	<	num_threads	;	thread++	)	{
+								tl	=	timeline[thread];
+								for	(	ii	=	0	;	ii	<	tl_count[thread]	;	ii++	)	{
+												//	start	&	stop	time	are	in	tics,	so	convert	to	seconds
+												start	=	tl[ii].start	*	time_scale;
+												stop	=		tl[ii].stop		*	time_scale;
+												fprintf(fp_time_main,						"%f,0",	start);								//	start	stairstep
+												for	(jj=0;	jj<num_threads;	jj++)	{
+																fprintf(fp_time_main,		",0");
+												}
+												fprintf(fp_time_main,						"\n");
+												if	(tl[ii].trick_job)	{
+																fprintf(fp_time_main,	"%f,%f",	start,	tl[ii].id);				//	trick	job	start
+																for	(jj=0;	jj<num_threads;	jj++)	{
+																				fprintf(fp_time_main,	",0");
+																}
+												}	else	{	//	user	job
+																fprintf(fp_time_main,	"%f,0",	start);									//	user	job	start
+																for	(jj=0;	jj<num_threads;	jj++)	{
+																				if	(jj==thread)	{
+																								fprintf(fp_time_main,	",%f",	tl[ii].id);					//	user	thread	id	(0=main)
+																				}	else	{
+																								fprintf(fp_time_main,	",0");
+																				}
+																}
+												}
+												fprintf(fp_time_main,						"\n");
+												if	(tl[ii].trick_job)	{
+																fprintf(fp_time_main,	"%f,%f",	stop,	tl[ii].id);				//	trick	job	end
+																for	(jj=0;	jj<num_threads;	jj++)	{
+																				fprintf(fp_time_main,	",0");
+																}
+												}	else	{	//	user	job
+																fprintf(fp_time_main,	"%f,0",	stop);									//	user	job	end
+																for	(jj=0;	jj<num_threads;	jj++)	{
+																				if	(jj==thread)	{
+																								fprintf(fp_time_main,	",%f",	tl[ii].id);				//	user	thread	id	(0=main)
+																				}	else	{
+																								fprintf(fp_time_main,	",0");
+																				}
+																}
+												}
+												fprintf(fp_time_main,						"\n");
+												fprintf(fp_time_main,						"%f,0",	stop);								//	end	stairstep
+												for	(jj=0;	jj<num_threads;	jj++)	{
+																fprintf(fp_time_main,		",0");
+												}
+												fprintf(fp_time_main,						"\n");
+								}	//	end	for	thread
+				}	//	end	for	ii
+
+				//	non-cyclic	jobs
+				for	(	thread	=	0	;	thread	<	num_threads	;	thread++	)	{
+								tl	=	timeline_other[thread];
+								for	(	ii	=	0	;	ii	<	tl_other_count[thread]	;	ii++	)	{
+												//	start	&	stop	time	are	in	tics,	so	convert	to	seconds
+												start	=	tl[ii].start	*	time_scale;
+												stop	=		tl[ii].stop		*	time_scale;
+												fprintf(fp_time_other,	"%f,0,0\n",	start);										//	start	stairstep
+												if	(tl[ii].trick_job)	{
+																fprintf(fp_time_other,	"%f,%f,0\n",	start,	tl[ii].id);	//	trick	job	start
+																fprintf(fp_time_other,	"%f,%f,0\n",	stop,	tl[ii].id);		//	trick	job	end
+												}	else	{	//	user	job
+																fprintf(fp_time_other,	"%f,0,%f\n",	start,	tl[ii].id);	//	user	job	start
+																fprintf(fp_time_other,	"%f,0,%f\n",	stop,	tl[ii].id);		//	user	job	end
+												}
+												fprintf(fp_time_other,	"%f,0,0\n",	stop);											//	end	stairstep
+								}	//	end	for	thread
+				}	//	end	for	ii
+
+				fclose(fp_time_main);
+				fclose(fp_time_other);
+
+				return(0)	;
 
 }
 
-void Trick::FrameLog::set_clock(Trick::Clock & in_clock) {
-    clock = in_clock ;
+void	Trick::FrameLog::set_clock(Trick::Clock	&	in_clock)	{
+				clock	=	in_clock	;
 }
 
-//Call all the Create routines for the DP directory and all DP files.
-int Trick::FrameLog::create_DP_files() {
-    int ret=0;
+//Call	all	the	Create	routines	for	the	DP	directory	and	all	DP	files.
+int	Trick::FrameLog::create_DP_files()	{
+				int	ret=0;
 
-    ret = create_DP_Product_dir();
-    if (ret==0) {
-        // Only create DP files if we successfully created the directory
-        create_DP_job_files();
-        create_DP_timeline_files();
-    }
+				ret	=	create_DP_Product_dir();
+				if	(ret==0)	{
+								//	Only	create	DP	files	if	we	successfully	created	the	directory
+								create_DP_job_files();
+								create_DP_timeline_files();
+				}
 
-    return ret ;
+				return	ret	;
 }
 
-//Create the DP_Product directory where the DP files will be stored.
-int Trick::FrameLog::create_DP_Product_dir() {
-    int ret=0;
-    DP_dir = "DP_Product";
-    if (std::string(command_line_args_get_user_output_dir()) != std::string(command_line_args_get_output_dir())) {
-        if (!std::string(command_line_args_get_user_output_dir()).empty()) {
-            DP_dir = std::string(command_line_args_get_user_output_dir()) + "/DP_Product";
-        }
-    } 
-    ret = mkdir(DP_dir.c_str(), 0777);
-    if (ret == -1) {
-        if (errno == EEXIST) {
-            // it's ok if the directory is already there
-            ret = 0;
-        } else {
-            // if you can't create the DP_Product dir in the current directory, try in the output dir (-O)
-            DP_dir = std::string(command_line_args_get_output_dir()) + "/DP_Product";
-            ret = mkdir(DP_dir.c_str(), 0777);
-            if (ret == -1) {
-                if (errno == EEXIST) {
-                    // it's ok if the directory is already there
-                    ret = 0;
-                }
-            }
-        }
-    }
-
-    if (ret == -1) {
-        message_publish(MSG_WARNING, "Could not create DP_Product directory for Frame Logging. DP files not created.\n") ;
-        perror("mkdir");
-    }
-    return ret;
+//Create	the	DP_Product	directory	where	the	DP	files	will	be	stored.
+int	Trick::FrameLog::create_DP_Product_dir()	{
+				int	ret=0;
+				DP_dir	=	"DP_Product";
+				if	(std::string(command_line_args_get_user_output_dir())	!=	std::string(command_line_args_get_output_dir()))	{
+								if	(!std::string(command_line_args_get_user_output_dir()).empty())	{
+												DP_dir	=	std::string(command_line_args_get_user_output_dir())	+	"/DP_Product";
+								}
+				}	
+				ret	=	mkdir(DP_dir.c_str(),	0777);
+				if	(ret	==	-1)	{
+								if	(errno	==	EEXIST)	{
+												//	it's	ok	if	the	directory	is	already	there
+												ret	=	0;
+								}	else	{
+												//	if	you	can't	create	the	DP_Product	dir	in	the	current	directory,	try	in	the	output	dir	(-O)
+												DP_dir	=	std::string(command_line_args_get_output_dir())	+	"/DP_Product";
+												ret	=	mkdir(DP_dir.c_str(),	0777);
+												if	(ret	==	-1)	{
+																if	(errno	==	EEXIST)	{
+																				//	it's	ok	if	the	directory	is	already	there
+																				ret	=	0;
+																}
+												}
+								}
+				}
+
+				if	(ret	==	-1)	{
+								message_publish(MSG_WARNING,	"Could	not	create	DP_Product	directory	for	Frame	Logging.	DP	files	not	created.\n")	;
+								perror("mkdir");
+				}
+				return	ret;
 }
 
-//Create the DP files to display trick and user job execution times.
-int Trick::FrameLog::create_DP_job_files() {
-
-    std::vector<std::string>::iterator job_iterator;
-    FILE *fpx;
-    unsigned int pages, plots, total_plots, vcells, dot;
-    char *bg_color;
-    std::string DP_buff;
-    const char *headerx = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" \
-                    "<!DOCTYPE product PUBLIC \"-//Tricklab//DTD Product V1.0//EN\" \"Product.dtd\">\n\n" \
-                    "<!-- Description: Plot of Y(t) vs. t, with attributes, titles, labels, units -->\n\n" \
-                    "<product version=\"1.0\">\n";
-
-    DP_buff = DP_dir + "/DP_rt_frame.xml";
-    if ((fpx = fopen(DP_buff.c_str(), "w")) == NULL) {
-        message_publish(MSG_WARNING, "Could not open DP_rt_frame.xml file for Frame Logging\n") ;
-        return(0);
-    }
-    fprintf(fpx, "%s", headerx);
-    fprintf(fpx, "    <title>Real-Time Frame Overrun/Underrun History</title>\n    <page>\n        <title>Real-Time Scheduling Frame</title>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>Frame Overrun/Underrun</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Frame Overrun/Underrun</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"darkgreen\" label=\"Overrun/Underrun\">%s.rt_sync.frame_overrun</var>\n", rt_sim_object_name.c_str());
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>Frame Scheduled Jobs Time</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Frame Scheduled Jobs Time</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"red\" label=\"Frame Sched Time\">%s.rt_sync.frame_time</var>\n", rt_sim_object_name.c_str());
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "    </page>\n");
-
-    //unsigned int total_pages = (unsigned int)(drg_users.size() / plots_per_page) + 1 ;
-    unsigned int total_pages ;
-    if ( drg_users.size() <= 1 ) {
-        total_pages = 1 ;
-    } else {
-        total_pages = (unsigned int)((drg_users.size() - 2)/ plots_per_page) + 1 ;
-    }
-    unsigned int page_count ;
-    for ( page_count = 0 ; page_count < total_pages ; page_count++ ) {
-        unsigned int ii = 0 ;
-        // this check is to avoid empty page creation
-        if ((page_count * plots_per_page + ii + 1) >= drg_users.size()) {
-        	continue;
-        }
-        fprintf(fpx, "    <page>\n");
-        for ( ii = 0 ; ii < plots_per_page and (page_count * plots_per_page + ii + 1) < drg_users.size() ; ii++ ) {
-            fprintf(fpx, "        <plot grid=\"yes\">\n");
-            fprintf(fpx, "            <title>Child thread %u Frame Scheduled Jobs</title>\n", (page_count * plots_per_page + ii + 1));
-            fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-            fprintf(fpx, "            <yaxis> <label>Frame Scheduled Jobs Time</label> </yaxis>\n");
-            fprintf(fpx, "            <curve>\n");
-            fprintf(fpx, "                <var>sys.exec.out.time</var>\n");
-            std::ostringstream group_name ;
-            group_name << "trick_frame_userjobs_C" << (page_count * plots_per_page + ii + 1) ;
-            fprintf(fpx, "                <var line_color=\"red\" label=\"Frame Sched Time\">%s.frame_time</var>\n", group_name.str().c_str());
-            fprintf(fpx, "            </curve>\n");
-            fprintf(fpx, "        </plot>\n");
-        }
-        fprintf(fpx, "    </page>\n");
-    }
-
-    fprintf(fpx, "    <table>\n        <title>Real-Time Frame Overrun/Underrun History</title>\n");
-    fprintf(fpx, "        <column format=\"%%13.6f\">\n");
-    fprintf(fpx, "            <label>Sim Time</label>\n            <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "        </column>\n");
-    fprintf(fpx, "        <column format=\"%%13.6f\">\n");
-    fprintf(fpx, "            <label>Overrun/Underrun</label>\n            <var>%s.rt_sync.frame_overrun</var>\n", rt_sim_object_name.c_str());
-    fprintf(fpx, "        </column>\n");
-    fprintf(fpx, "        <column format=\"%%13.6f\">\n");
-    fprintf(fpx, "            <label>Frame Sched Time</label>\n            <var>%s.rt_sync.frame_time</var>\n", rt_sim_object_name.c_str());
-    fprintf(fpx, "        </column>\n");
-    fprintf(fpx, "    </table>\n</product>");
-    fclose(fpx);
-
-    // sort the saved job names
-    sort(user_jobs.begin(), user_jobs.end());
-    sort(trick_jobs.begin(), trick_jobs.end());
-
-    // DP_rt_userjobs --------------------------------------------------------------
-    int ii ;
-    char numstr[21];
-    for ( ii = 0 ; ii < num_threads ; ii++ ) {
-        if ( ii == 0 ) {
-             DP_buff = DP_dir + "/DP_rt_userjobs.xml";
-        } else {
-             snprintf(numstr, sizeof(numstr), "%d", ii);
-             DP_buff = DP_dir + "/DP_rt_userjobs_C" + numstr + ".xml";
-        }
-
-        if ((fpx = fopen(DP_buff.c_str(), "w")) == NULL) {
-            message_publish(MSG_WARNING, "Could not open DP_rt_userjobs.xml file for Frame Logging\n") ;
-            return(0);
-        }
-
-        fprintf(fpx, "%s", headerx);
-        fprintf(fpx, "    <title>User Job Execution History</title>\n");
-        pages = 0; plots = 0;
-        total_plots = drg_users[ii]->rec_buffer.size();
-        std::vector <Trick::DataRecordBuffer *>::iterator drb_it ;
-        bg_color = (char *)"cornsilk2";
-        for ( drb_it = drg_users[ii]->rec_buffer.begin() + 1 ; drb_it != drg_users[ii]->rec_buffer.end() ; ++drb_it ) {
-            if ( ! (*drb_it)->name.compare(0, 5, "frame") ) continue ;
-            // plots_per_page job plots per page
-            if ((plots == 0) || (plots > plots_per_page)) {
-                pages++;
-                vcells = (total_plots/pages > plots_per_page) * 4;
-                if (pages > 1) {
-                    fprintf(fpx, "    </page>\n");
-                }
-                fprintf(fpx, "    <page vcells=\"%d\">\n        <title>User Job Execution Times</title>\n", vcells);
-                plots = 1;
-            }
-            fprintf(fpx, "        <plot grid=\"yes\" background_color=\"%s\">\n            <title>%s</title>\n", bg_color, (*drb_it)->name.c_str());
-            fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-            fprintf(fpx, "            <yaxis> <label>Execution Time</label> </yaxis>\n");
-            fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-            fprintf(fpx, "                <var line_color=\"red\">%s</var>\n", (*drb_it)->name.c_str());
-            fprintf(fpx, "            </curve>\n");
-            fprintf(fpx, "        </plot>\n");
-            plots++;
-
-        }
-        fprintf(fpx, "    </page>\n</product>");
-        fclose(fpx);
-    }
-
-    // DP_rt_trickjobs -------------------------------------------------------------
-    DP_buff = DP_dir +  "/DP_rt_trickjobs.xml";
-    if ((fpx = fopen(DP_buff.c_str(), "w")) == NULL) {
-        message_publish(MSG_WARNING, "Could not open DP_rt_trickjobs.xml file for Frame Logging\n") ;
-        return(0);
-    }
-    fprintf(fpx, "%s", headerx);
-    fprintf(fpx, "    <title>Trick Job Execution History</title>\n");
-    pages = 0; plots = 0;
-    total_plots = trick_jobs.size();
-    job_iterator = trick_jobs.begin();
-    while (job_iterator != trick_jobs.end()) {
-        dot = (*job_iterator).find_first_of(".");
-        // default background color, for trick_whatever jobs and anything else we don't list here
-        bg_color = (char *)"cornsilk3";
-        // give the different types of trick jobs a different background color
-        if (!(*job_iterator).compare(0,dot,std::string("JOB_") + msg_sim_object_name)) {
-            bg_color = (char *)"lavenderblush3";
-        }
-        if (!(*job_iterator).compare(0,dot,std::string("JOB_") + dr_sim_object_name) ||
-            !(*job_iterator).compare(0,21,std::string("JOB_data_record_group")) ) {
-            bg_color = (char *)"slategray2";
-        }
-        if (!(*job_iterator).compare(0,dot,std::string("JOB_") + rt_sim_object_name)) {
-            bg_color = (char *)"honeydew3";
-        }
-        if (!(*job_iterator).compare(0,dot,std::string("JOB_") + ms_sim_object_name)) {
-            bg_color = (char *)"bisque2";
-        }
-        if (strncmp((*job_iterator).c_str(),"JOB_sys_integ",13)==0) {
-            bg_color = (char *)"burlywood";
-        }
-        //other good colors in case you need more:
-            //bg_color = "khaki3";
-        // plots_per_page job plots per page
-        if ((plots == 0) || (plots > plots_per_page)) {
-            pages++;
-            vcells = (total_plots/pages > plots_per_page) * 4;
-            if (pages > 1) {
-                fprintf(fpx, "    </page>\n");
-            }
-            fprintf(fpx, "    <page vcells=\"%d\">\n        <title>Trick Job Execution Times</title>\n", vcells);
-            plots = 1;
-        }
-        fprintf(fpx, "        <plot grid=\"yes\" background_color=\"%s\">\n            <title>%s</title>\n", bg_color, (*job_iterator).c_str());
-        fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-        fprintf(fpx, "            <yaxis> <label>Execution Time</label> </yaxis>\n");
-        fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-        fprintf(fpx, "                <var line_color=\"darkgreen\">%s</var>\n", (*job_iterator).c_str());
-        fprintf(fpx, "            </curve>\n");
-        fprintf(fpx, "        </plot>\n");
-        job_iterator++;
-        plots++;
-    }
-    fprintf(fpx, "    </page>\n</product>");
-    fclose(fpx);
-
-    return(0) ;
+//Create	the	DP	files	to	display	trick	and	user	job	execution	times.
+int	Trick::FrameLog::create_DP_job_files()	{
+
+				std::vector<std::string>::iterator	job_iterator;
+				FILE	*fpx;
+				unsigned	int	pages,	plots,	total_plots,	vcells,	dot;
+				char	*bg_color;
+				std::string	DP_buff;
+				const	char	*headerx	=	"<?xml	version=\"1.0\"	encoding=\"ISO-8859-1\"?>\n"	\
+																				"<!DOCTYPE	product	PUBLIC	\"-//Tricklab//DTD	Product	V1.0//EN\"	\"Product.dtd\">\n\n"	\
+																				"<!--	Description:	Plot	of	Y(t)	vs.	t,	with	attributes,	titles,	labels,	units	-->\n\n"	\
+																				"<product	version=\"1.0\">\n";
+
+				DP_buff	=	DP_dir	+	"/DP_rt_frame.xml";
+				if	((fpx	=	fopen(DP_buff.c_str(),	"w"))	==	NULL)	{
+								message_publish(MSG_WARNING,	"Could	not	open	DP_rt_frame.xml	file	for	Frame	Logging\n")	;
+								return(0);
+				}
+				fprintf(fpx,	"%s",	headerx);
+				fprintf(fpx,	"				<title>Real-Time	Frame	Overrun/Underrun	History</title>\n				<page>\n								<title>Real-Time	Scheduling	Frame</title>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>Frame	Overrun/Underrun</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Frame	Overrun/Underrun</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"darkgreen\"	label=\"Overrun/Underrun\">%s.rt_sync.frame_overrun</var>\n",	rt_sim_object_name.c_str());
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>Frame	Scheduled	Jobs	Time</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Frame	Scheduled	Jobs	Time</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"red\"	label=\"Frame	Sched	Time\">%s.rt_sync.frame_time</var>\n",	rt_sim_object_name.c_str());
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"				</page>\n");
+
+				//unsigned	int	total_pages	=	(unsigned	int)(drg_users.size()	/	plots_per_page)	+	1	;
+				unsigned	int	total_pages	;
+				if	(	drg_users.size()	<=	1	)	{
+								total_pages	=	1	;
+				}	else	{
+								total_pages	=	(unsigned	int)((drg_users.size()	-	2)/	plots_per_page)	+	1	;
+				}
+				unsigned	int	page_count	;
+				for	(	page_count	=	0	;	page_count	<	total_pages	;	page_count++	)	{
+								unsigned	int	ii	=	0	;
+								//	this	check	is	to	avoid	empty	page	creation
+								if	((page_count	*	plots_per_page	+	ii	+	1)	>=	drg_users.size())	{
+									continue;
+								}
+								fprintf(fpx,	"				<page>\n");
+								for	(	ii	=	0	;	ii	<	plots_per_page	and	(page_count	*	plots_per_page	+	ii	+	1)	<	drg_users.size()	;	ii++	)	{
+												fprintf(fpx,	"								<plot	grid=\"yes\">\n");
+												fprintf(fpx,	"												<title>Child	thread	%u	Frame	Scheduled	Jobs</title>\n",	(page_count	*	plots_per_page	+	ii	+	1));
+												fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+												fprintf(fpx,	"												<yaxis>	<label>Frame	Scheduled	Jobs	Time</label>	</yaxis>\n");
+												fprintf(fpx,	"												<curve>\n");
+												fprintf(fpx,	"																<var>sys.exec.out.time</var>\n");
+												std::ostringstream	group_name	;
+												group_name	<<	"trick_frame_userjobs_C"	<<	(page_count	*	plots_per_page	+	ii	+	1)	;
+												fprintf(fpx,	"																<var	line_color=\"red\"	label=\"Frame	Sched	Time\">%s.frame_time</var>\n",	group_name.str().c_str());
+												fprintf(fpx,	"												</curve>\n");
+												fprintf(fpx,	"								</plot>\n");
+								}
+								fprintf(fpx,	"				</page>\n");
+				}
+
+				fprintf(fpx,	"				<table>\n								<title>Real-Time	Frame	Overrun/Underrun	History</title>\n");
+				fprintf(fpx,	"								<column	format=\"%%13.6f\">\n");
+				fprintf(fpx,	"												<label>Sim	Time</label>\n												<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"								</column>\n");
+				fprintf(fpx,	"								<column	format=\"%%13.6f\">\n");
+				fprintf(fpx,	"												<label>Overrun/Underrun</label>\n												<var>%s.rt_sync.frame_overrun</var>\n",	rt_sim_object_name.c_str());
+				fprintf(fpx,	"								</column>\n");
+				fprintf(fpx,	"								<column	format=\"%%13.6f\">\n");
+				fprintf(fpx,	"												<label>Frame	Sched	Time</label>\n												<var>%s.rt_sync.frame_time</var>\n",	rt_sim_object_name.c_str());
+				fprintf(fpx,	"								</column>\n");
+				fprintf(fpx,	"				</table>\n</product>");
+				fclose(fpx);
+
+				//	sort	the	saved	job	names
+				sort(user_jobs.begin(),	user_jobs.end());
+				sort(trick_jobs.begin(),	trick_jobs.end());
+
+				//	DP_rt_userjobs	--------------------------------------------------------------
+				int	ii	;
+				char	numstr[21];
+				for	(	ii	=	0	;	ii	<	num_threads	;	ii++	)	{
+								if	(	ii	==	0	)	{
+													DP_buff	=	DP_dir	+	"/DP_rt_userjobs.xml";
+								}	else	{
+													snprintf(numstr,	sizeof(numstr),	"%d",	ii);
+													DP_buff	=	DP_dir	+	"/DP_rt_userjobs_C"	+	numstr	+	".xml";
+								}
+
+								if	((fpx	=	fopen(DP_buff.c_str(),	"w"))	==	NULL)	{
+												message_publish(MSG_WARNING,	"Could	not	open	DP_rt_userjobs.xml	file	for	Frame	Logging\n")	;
+												return(0);
+								}
+
+								fprintf(fpx,	"%s",	headerx);
+								fprintf(fpx,	"				<title>User	Job	Execution	History</title>\n");
+								pages	=	0;	plots	=	0;
+								total_plots	=	drg_users[ii]->rec_buffer.size();
+								std::vector	<Trick::DataRecordBuffer	*>::iterator	drb_it	;
+								bg_color	=	(char	*)"cornsilk2";
+								for	(	drb_it	=	drg_users[ii]->rec_buffer.begin()	+	1	;	drb_it	!=	drg_users[ii]->rec_buffer.end()	;	++drb_it	)	{
+												if	(	!	(*drb_it)->name.compare(0,	5,	"frame")	)	continue	;
+												//	plots_per_page	job	plots	per	page
+												if	((plots	==	0)	||	(plots	>	plots_per_page))	{
+																pages++;
+																vcells	=	(total_plots/pages	>	plots_per_page)	*	4;
+																if	(pages	>	1)	{
+																				fprintf(fpx,	"				</page>\n");
+																}
+																fprintf(fpx,	"				<page	vcells=\"%d\">\n								<title>User	Job	Execution	Times</title>\n",	vcells);
+																plots	=	1;
+												}
+												fprintf(fpx,	"								<plot	grid=\"yes\"	background_color=\"%s\">\n												<title>%s</title>\n",	bg_color,	(*drb_it)->name.c_str());
+												fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+												fprintf(fpx,	"												<yaxis>	<label>Execution	Time</label>	</yaxis>\n");
+												fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+												fprintf(fpx,	"																<var	line_color=\"red\">%s</var>\n",	(*drb_it)->name.c_str());
+												fprintf(fpx,	"												</curve>\n");
+												fprintf(fpx,	"								</plot>\n");
+												plots++;
+
+								}
+								fprintf(fpx,	"				</page>\n</product>");
+								fclose(fpx);
+				}
+
+				//	DP_rt_trickjobs	-------------------------------------------------------------
+				DP_buff	=	DP_dir	+		"/DP_rt_trickjobs.xml";
+				if	((fpx	=	fopen(DP_buff.c_str(),	"w"))	==	NULL)	{
+								message_publish(MSG_WARNING,	"Could	not	open	DP_rt_trickjobs.xml	file	for	Frame	Logging\n")	;
+								return(0);
+				}
+				fprintf(fpx,	"%s",	headerx);
+				fprintf(fpx,	"				<title>Trick	Job	Execution	History</title>\n");
+				pages	=	0;	plots	=	0;
+				total_plots	=	trick_jobs.size();
+				job_iterator	=	trick_jobs.begin();
+				while	(job_iterator	!=	trick_jobs.end())	{
+								dot	=	(*job_iterator).find_first_of(".");
+								//	default	background	color,	for	trick_whatever	jobs	and	anything	else	we	don't	list	here
+								bg_color	=	(char	*)"cornsilk3";
+								//	give	the	different	types	of	trick	jobs	a	different	background	color
+								if	(!(*job_iterator).compare(0,dot,std::string("JOB_")	+	msg_sim_object_name))	{
+												bg_color	=	(char	*)"lavenderblush3";
+								}
+								if	(!(*job_iterator).compare(0,dot,std::string("JOB_")	+	dr_sim_object_name)	||
+												!(*job_iterator).compare(0,21,std::string("JOB_data_record_group"))	)	{
+												bg_color	=	(char	*)"slategray2";
+								}
+								if	(!(*job_iterator).compare(0,dot,std::string("JOB_")	+	rt_sim_object_name))	{
+												bg_color	=	(char	*)"honeydew3";
+								}
+								if	(!(*job_iterator).compare(0,dot,std::string("JOB_")	+	ms_sim_object_name))	{
+												bg_color	=	(char	*)"bisque2";
+								}
+								if	(strncmp((*job_iterator).c_str(),"JOB_sys_integ",13)==0)	{
+												bg_color	=	(char	*)"burlywood";
+								}
+								//other	good	colors	in	case	you	need	more:
+												//bg_color	=	"khaki3";
+								//	plots_per_page	job	plots	per	page
+								if	((plots	==	0)	||	(plots	>	plots_per_page))	{
+												pages++;
+												vcells	=	(total_plots/pages	>	plots_per_page)	*	4;
+												if	(pages	>	1)	{
+																fprintf(fpx,	"				</page>\n");
+												}
+												fprintf(fpx,	"				<page	vcells=\"%d\">\n								<title>Trick	Job	Execution	Times</title>\n",	vcells);
+												plots	=	1;
+								}
+								fprintf(fpx,	"								<plot	grid=\"yes\"	background_color=\"%s\">\n												<title>%s</title>\n",	bg_color,	(*job_iterator).c_str());
+								fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+								fprintf(fpx,	"												<yaxis>	<label>Execution	Time</label>	</yaxis>\n");
+								fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+								fprintf(fpx,	"																<var	line_color=\"darkgreen\">%s</var>\n",	(*job_iterator).c_str());
+								fprintf(fpx,	"												</curve>\n");
+								fprintf(fpx,	"								</plot>\n");
+								job_iterator++;
+								plots++;
+				}
+				fprintf(fpx,	"				</page>\n</product>");
+				fclose(fpx);
+
+				return(0)	;
 }
 
-//Create the DP files to display job timelines.
-int Trick::FrameLog::create_DP_timeline_files() {
-
-    FILE *fpx;
-    int jj;
-    std::string DP_buff;
-    const char *headerx = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" \
-                    "<!DOCTYPE product PUBLIC \"-//Tricklab//DTD Product V1.0//EN\" \"Product.dtd\">\n\n" \
-                    "<!-- Description: Plot of Y(t) vs. t, with attributes, titles, labels, units -->\n\n" \
-                    "<product version=\"1.0\">\n";
-
-    // DP_rt_timeline --------------------------------------------------------------
-    DP_buff = DP_dir + "/DP_rt_timeline.xml";
-    if ((fpx = fopen(DP_buff.c_str(), "w")) == NULL) {
-        message_publish(MSG_WARNING, "Could not open DP_rt_timeline.xml file for Frame Logging\n") ;
-        return(0);
-    }
-
-    fprintf(fpx, "%s", headerx);
-    fprintf(fpx, "    <title>Job Timeline</title>\n    <page vcells=\"3\">\n        <title>Job Timeline</title>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>User Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"red\" label=\"User Job Id\">trick_frame_log.frame_log.job_user_id</var>\n") ;
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>Trick Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"darkgreen\" label=\"Trick Job Id\">trick_frame_log.frame_log.job_trick_id</var>\n") ;
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    // don't generate the plot without a curve
-    if (num_threads > 1) {
-        fprintf(fpx, "        <plot grid=\"yes\">\n            <title>Child Job Timeline</title>\n");
-        fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-        fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-        for (jj=1; jj<num_threads; jj++) {
-            fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-            fprintf(fpx, "                <var line_color=\"blue\" label=\"Child%d Job Id\">trick_frame_log.frame_log.job_userC%d_id</var>\n",
-             jj,jj);
-            fprintf(fpx, "            </curve>\n");
-        }
-        fprintf(fpx, "        </plot>\n");
-    }
-    fprintf(fpx, "    </page>\n");
-
-    fprintf(fpx, "    <page>\n        <title>Job Timeline (combined)</title>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>User and Trick Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"darkgreen\" label=\"Trick Job Id\">trick_frame_log.frame_log.job_trick_id</var>\n") ;
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"red\" label=\"User Job Id\">trick_frame_log.frame_log.job_user_id</var>\n");
-    fprintf(fpx, "            </curve>\n");
-    for (jj=1; jj<num_threads; jj++) {
-        fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-        fprintf(fpx, "                <var line_color=\"blue\" label=\"Child%d Job Id\">trick_frame_log.frame_log.job_userC%d_id</var>\n",
-                     jj,jj);
-        fprintf(fpx, "            </curve>\n");
-    }
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "    </page>\n</product>");
-    fclose(fpx);
-
-    // DP_rt_timeline_init ---------------------------------------------------------
-    DP_buff = DP_dir + "/DP_rt_timeline_init.xml";
-    if ((fpx = fopen(DP_buff.c_str(), "w")) == NULL) {
-        message_publish(MSG_WARNING, "Could not open DP_rt_timeline_init.xml file for Frame Logging\n") ;
-        return(0);
-    }
-
-    fprintf(fpx, "%s", headerx);
-    fprintf(fpx, "    <title>Non-cyclic Job Timeline</title>\n    <page>\n        <title>Non-cyclic Job Timeline</title>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>User Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"red\" label=\"User Job Id\">trick_frame_log.frame_log.job_userinit_id</var>\n") ;
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>Trick Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"darkgreen\" label=\"Trick Job Id\">trick_frame_log.frame_log.job_trickinit_id</var>\n") ;
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "    </page>\n");
-
-    fprintf(fpx, "    <page>\n        <title>Non-cyclic Job Timeline (combined)</title>\n");
-    fprintf(fpx, "        <plot grid=\"yes\">\n            <title>User and Trick Job Timeline</title>\n");
-    fprintf(fpx, "            <xaxis> <label>Time</label> <units>s</units> </xaxis>\n");
-    fprintf(fpx, "            <yaxis> <label>Job Id</label> </yaxis>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"darkgreen\" label=\"Trick Job Id\">trick_frame_log.frame_log.job_trickinit_id</var>\n");
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "            <curve>\n                <var>sys.exec.out.time</var>\n");
-    fprintf(fpx, "                <var line_color=\"red\" label=\"Trick Job Id\">trick_frame_log.frame_log.job_userinit_id</var>\n");
-    fprintf(fpx, "            </curve>\n");
-    fprintf(fpx, "        </plot>\n");
-    fprintf(fpx, "    </page>\n</product>");
-    fclose(fpx);
-
-    return(0);
+//Create	the	DP	files	to	display	job	timelines.
+int	Trick::FrameLog::create_DP_timeline_files()	{
+
+				FILE	*fpx;
+				int	jj;
+				std::string	DP_buff;
+				const	char	*headerx	=	"<?xml	version=\"1.0\"	encoding=\"ISO-8859-1\"?>\n"	\
+																				"<!DOCTYPE	product	PUBLIC	\"-//Tricklab//DTD	Product	V1.0//EN\"	\"Product.dtd\">\n\n"	\
+																				"<!--	Description:	Plot	of	Y(t)	vs.	t,	with	attributes,	titles,	labels,	units	-->\n\n"	\
+																				"<product	version=\"1.0\">\n";
+
+				//	DP_rt_timeline	--------------------------------------------------------------
+				DP_buff	=	DP_dir	+	"/DP_rt_timeline.xml";
+				if	((fpx	=	fopen(DP_buff.c_str(),	"w"))	==	NULL)	{
+								message_publish(MSG_WARNING,	"Could	not	open	DP_rt_timeline.xml	file	for	Frame	Logging\n")	;
+								return(0);
+				}
+
+				fprintf(fpx,	"%s",	headerx);
+				fprintf(fpx,	"				<title>Job	Timeline</title>\n				<page	vcells=\"3\">\n								<title>Job	Timeline</title>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>User	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"red\"	label=\"User	Job	Id\">trick_frame_log.frame_log.job_user_id</var>\n")	;
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>Trick	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"darkgreen\"	label=\"Trick	Job	Id\">trick_frame_log.frame_log.job_trick_id</var>\n")	;
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				//	don't	generate	the	plot	without	a	curve
+				if	(num_threads	>	1)	{
+								fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>Child	Job	Timeline</title>\n");
+								fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+								fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+								for	(jj=1;	jj<num_threads;	jj++)	{
+												fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+												fprintf(fpx,	"																<var	line_color=\"blue\"	label=\"Child%d	Job	Id\">trick_frame_log.frame_log.job_userC%d_id</var>\n",
+													jj,jj);
+												fprintf(fpx,	"												</curve>\n");
+								}
+								fprintf(fpx,	"								</plot>\n");
+				}
+				fprintf(fpx,	"				</page>\n");
+
+				fprintf(fpx,	"				<page>\n								<title>Job	Timeline	(combined)</title>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>User	and	Trick	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"darkgreen\"	label=\"Trick	Job	Id\">trick_frame_log.frame_log.job_trick_id</var>\n")	;
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"red\"	label=\"User	Job	Id\">trick_frame_log.frame_log.job_user_id</var>\n");
+				fprintf(fpx,	"												</curve>\n");
+				for	(jj=1;	jj<num_threads;	jj++)	{
+								fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+								fprintf(fpx,	"																<var	line_color=\"blue\"	label=\"Child%d	Job	Id\">trick_frame_log.frame_log.job_userC%d_id</var>\n",
+																					jj,jj);
+								fprintf(fpx,	"												</curve>\n");
+				}
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"				</page>\n</product>");
+				fclose(fpx);
+
+				//	DP_rt_timeline_init	---------------------------------------------------------
+				DP_buff	=	DP_dir	+	"/DP_rt_timeline_init.xml";
+				if	((fpx	=	fopen(DP_buff.c_str(),	"w"))	==	NULL)	{
+								message_publish(MSG_WARNING,	"Could	not	open	DP_rt_timeline_init.xml	file	for	Frame	Logging\n")	;
+								return(0);
+				}
+
+				fprintf(fpx,	"%s",	headerx);
+				fprintf(fpx,	"				<title>Non-cyclic	Job	Timeline</title>\n				<page>\n								<title>Non-cyclic	Job	Timeline</title>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>User	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"red\"	label=\"User	Job	Id\">trick_frame_log.frame_log.job_userinit_id</var>\n")	;
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>Trick	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"darkgreen\"	label=\"Trick	Job	Id\">trick_frame_log.frame_log.job_trickinit_id</var>\n")	;
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"				</page>\n");
+
+				fprintf(fpx,	"				<page>\n								<title>Non-cyclic	Job	Timeline	(combined)</title>\n");
+				fprintf(fpx,	"								<plot	grid=\"yes\">\n												<title>User	and	Trick	Job	Timeline</title>\n");
+				fprintf(fpx,	"												<xaxis>	<label>Time</label>	<units>s</units>	</xaxis>\n");
+				fprintf(fpx,	"												<yaxis>	<label>Job	Id</label>	</yaxis>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"darkgreen\"	label=\"Trick	Job	Id\">trick_frame_log.frame_log.job_trickinit_id</var>\n");
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"												<curve>\n																<var>sys.exec.out.time</var>\n");
+				fprintf(fpx,	"																<var	line_color=\"red\"	label=\"Trick	Job	Id\">trick_frame_log.frame_log.job_userinit_id</var>\n");
+				fprintf(fpx,	"												</curve>\n");
+				fprintf(fpx,	"								</plot>\n");
+				fprintf(fpx,	"				</page>\n</product>");
+				fclose(fpx);
+
+				return(0);
 
 }
diff --git a/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp b/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp
index f2b18c7b5..dbd2e77ce 100644
--- a/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp
+++ b/trick_source/sim_services/FrameLog/FrameLog_c_intf.cpp
@@ -1,45 +1,45 @@
-#include <stdio.h>
-#include "trick/FrameLog.hh"
+#include	<stdio.h>
+#include	"trick/FrameLog.hh"
 
-/* Global singleton pointer to the framelog class */
-extern Trick::FrameLog * the_fl ;
+/*	Global	singleton	pointer	to	the	framelog	class	*/
+extern	Trick::FrameLog	*	the_fl	;
 
 /*************************************************************************/
-/* These routines are the "C" interface to framelog instrumentation     */
+/*	These	routines	are	the	"C"	interface	to	framelog	instrumentation					*/
 /*************************************************************************/
 
 /**
- * @relates Trick::FrameLog
- * @copydoc Trick::FrameLog::framelog_on
- * C wrapper for Trick::FrameLog::framelog_on
- */
-extern "C" int frame_log_on(void) {
-    if (the_fl != NULL) {
-        return the_fl->framelog_on() ;
-    }
-    return(0) ;
+	*	@relates	Trick::FrameLog
+	*	@copydoc	Trick::FrameLog::framelog_on
+	*	C	wrapper	for	Trick::FrameLog::framelog_on
+	*/
+extern	"C"	int	frame_log_on(void)	{
+				if	(the_fl	!=	NULL)	{
+								return	the_fl->framelog_on()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::FrameLog
- * @copydoc Trick::FrameLog::framelog_off
- * C wrapper for Trick::FrameLog::framelog_off
- */
-extern "C" int frame_log_off(void) {
-    if (the_fl != NULL) {
-        return the_fl->framelog_off() ;
-    }
-    return(0) ;
+	*	@relates	Trick::FrameLog
+	*	@copydoc	Trick::FrameLog::framelog_off
+	*	C	wrapper	for	Trick::FrameLog::framelog_off
+	*/
+extern	"C"	int	frame_log_off(void)	{
+				if	(the_fl	!=	NULL)	{
+								return	the_fl->framelog_off()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::FrameLog
- * @copydoc Trick::FrameLog::set_max_samples
- * C wrapper for Trick::FrameLog::set_max_samples
- */
-extern "C" int frame_log_set_max_samples(int num) {
-    if (the_fl != NULL) {
-        return the_fl->set_max_samples(num) ;
-    }
-    return(0) ;
+	*	@relates	Trick::FrameLog
+	*	@copydoc	Trick::FrameLog::set_max_samples
+	*	C	wrapper	for	Trick::FrameLog::set_max_samples
+	*/
+extern	"C"	int	frame_log_set_max_samples(int	num)	{
+				if	(the_fl	!=	NULL)	{
+								return	the_fl->set_max_samples(num)	;
+				}
+				return(0)	;
 }
diff --git a/trick_source/sim_services/InputProcessor/IPPython.cpp b/trick_source/sim_services/InputProcessor/IPPython.cpp
index e259ff7ae..0de7267b7 100644
--- a/trick_source/sim_services/InputProcessor/IPPython.cpp
+++ b/trick_source/sim_services/InputProcessor/IPPython.cpp
@@ -1,231 +1,231 @@
 /*
-   PURPOSE: ( Python input processor )
-   REFERENCE: ( Trick Simulation Environment )
-   ASSUMPTIONS AND LIMITATIONS: ( None )
-   CLASS: ( N/A )
-   LIBRARY DEPENDENCY: ( None )
-   PROGRAMMERS: ( Alex Lin NASA 2009 )
+			PURPOSE:	(	Python	input	processor	)
+			REFERENCE:	(	Trick	Simulation	Environment	)
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+			CLASS:	(	N/A	)
+			LIBRARY	DEPENDENCY:	(	None	)
+			PROGRAMMERS:	(	Alex	Lin	NASA	2009	)
 */
 
-#include <Python.h>
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <string>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
+#include	<Python.h>
+#include	<iostream>
+#include	<sstream>
+#include	<vector>
+#include	<string>
+#include	<stdlib.h>
+#include	<unistd.h>
+#include	<string.h>
+#include	<stdio.h>
 
-#include "trick/IPPython.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
+#include	"trick/IPPython.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
 
-Trick::IPPython * the_pip ;
+Trick::IPPython	*	the_pip	;
 
 //Constructor
-Trick::IPPython::IPPython() : Trick::InputProcessor::InputProcessor() , units_conversion_msgs(true) {
-    the_pip = this ;
-    return ;
+Trick::IPPython::IPPython()	:	Trick::InputProcessor::InputProcessor()	,	units_conversion_msgs(true)	{
+				the_pip	=	this	;
+				return	;
 }
 
 
-// Need to save the state of the main thread to allow child threads to run PyRun variants.
-static PyThreadState *_save = NULL;
+//	Need	to	save	the	state	of	the	main	thread	to	allow	child	threads	to	run	PyRun	variants.
+static	PyThreadState	*_save	=	NULL;
 
 /**
 @details
--# Loops through all of the memorymanager allocations testing if a name handle was given.
- -# If a name and a user type_name were given to the allocation
-  -# If the user_type_name is not a Trick core class, prefixed with "Trick::"
-  -# Create a python statement to assign the python name to an address: <name> = trick.castAsTYPE(int(<address>))
-  -# Run the statement in the python interpreter
+-#	Loops	through	all	of	the	memorymanager	allocations	testing	if	a	name	handle	was	given.
+	-#	If	a	name	and	a	user	type_name	were	given	to	the	allocation
+		-#	If	the	user_type_name	is	not	a	Trick	core	class,	prefixed	with	"Trick::"
+		-#	Create	a	python	statement	to	assign	the	python	name	to	an	address:	<name>	=	trick.castAsTYPE(int(<address>))
+		-#	Run	the	statement	in	the	python	interpreter
 */
-void Trick::IPPython::get_TMM_named_variables() {
-    //std::cout << "top level names at initialization" << std::endl ;
-    Trick::ALLOC_INFO_MAP_ITER aim_it ;
-    for ( aim_it = trick_MM->alloc_info_map_begin() ; aim_it != trick_MM->alloc_info_map_end() ; ++aim_it ) {
-        ALLOC_INFO * alloc_info = (*aim_it).second ;
-        if ( alloc_info->name != NULL and alloc_info->user_type_name != NULL ) {
-            std::stringstream ss ;
-            std::string user_type_name = alloc_info->user_type_name ;
-            size_t start_colon ;
-            while ( ( start_colon = user_type_name.find("::") ) != std::string::npos ) {
-                user_type_name.replace( start_colon , 2 , "__" ) ;
-            }
-            // The castAs method may not exist if the class was hidden from SWIG (#ifndef SWIG).
-            // Use a try/except block to test if the method exists or not.  If it doesn't exist
-            // don't worry about it.  Also only assign python variable if it is pointing to
-            // something python doesn't owns.  Otherwise we could free the object we're trying to assign.
-            ss << "try:" << std::endl ;
-            ss << "    if '" << alloc_info->name << "' not in globals() or " ;
-            ss << alloc_info->name << ".thisown == False:" <<  std::endl ;
-            ss << "        " << alloc_info->name << " = " ;
-            ss << "trick.castAs" << user_type_name << "(int(" << alloc_info->start << "))" << std::endl ;
-            ss << "except AttributeError:" << std::endl ;
-            ss << "    pass" << std::endl ;
-            PyGILState_STATE gstate = PyGILState_Ensure();
-            PyRun_SimpleString(ss.str().c_str()) ;
-            PyGILState_Release(gstate);
-        }
-    }
+void	Trick::IPPython::get_TMM_named_variables()	{
+				//std::cout	<<	"top	level	names	at	initialization"	<<	std::endl	;
+				Trick::ALLOC_INFO_MAP_ITER	aim_it	;
+				for	(	aim_it	=	trick_MM->alloc_info_map_begin()	;	aim_it	!=	trick_MM->alloc_info_map_end()	;	++aim_it	)	{
+								ALLOC_INFO	*	alloc_info	=	(*aim_it).second	;
+								if	(	alloc_info->name	!=	NULL	and	alloc_info->user_type_name	!=	NULL	)	{
+												std::stringstream	ss	;
+												std::string	user_type_name	=	alloc_info->user_type_name	;
+												size_t	start_colon	;
+												while	(	(	start_colon	=	user_type_name.find("::")	)	!=	std::string::npos	)	{
+																user_type_name.replace(	start_colon	,	2	,	"__"	)	;
+												}
+												//	The	castAs	method	may	not	exist	if	the	class	was	hidden	from	SWIG	(#ifndef	SWIG).
+												//	Use	a	try/except	block	to	test	if	the	method	exists	or	not.		If	it	doesn't	exist
+												//	don't	worry	about	it.		Also	only	assign	python	variable	if	it	is	pointing	to
+												//	something	python	doesn't	owns.		Otherwise	we	could	free	the	object	we're	trying	to	assign.
+												ss	<<	"try:"	<<	std::endl	;
+												ss	<<	"				if	'"	<<	alloc_info->name	<<	"'	not	in	globals()	or	"	;
+												ss	<<	alloc_info->name	<<	".thisown	==	False:"	<<		std::endl	;
+												ss	<<	"								"	<<	alloc_info->name	<<	"	=	"	;
+												ss	<<	"trick.castAs"	<<	user_type_name	<<	"(int("	<<	alloc_info->start	<<	"))"	<<	std::endl	;
+												ss	<<	"except	AttributeError:"	<<	std::endl	;
+												ss	<<	"				pass"	<<	std::endl	;
+												PyGILState_STATE	gstate	=	PyGILState_Ensure();
+												PyRun_SimpleString(ss.str().c_str())	;
+												PyGILState_Release(gstate);
+								}
+				}
 }
 
-bool Trick::IPPython::get_units_conversion_msgs() {
-    return units_conversion_msgs ;
+bool	Trick::IPPython::get_units_conversion_msgs()	{
+				return	units_conversion_msgs	;
 }
 
-void Trick::IPPython::shoot_the_units_conversion_messenger(bool onoff) {
-    if ( onoff ) {
-        message_publish(MSG_WARNING, "Units conversion messages can no longer be suppressed.\n") ;
-    }
+void	Trick::IPPython::shoot_the_units_conversion_messenger(bool	onoff)	{
+				if	(	onoff	)	{
+								message_publish(MSG_WARNING,	"Units	conversion	messages	can	no	longer	be	suppressed.\n")	;
+				}
 }
 
-//Initialize and run the Python input processor on the user input file.
-int Trick::IPPython::init() {
-    /** @par Detailed Design: */
+//Initialize	and	run	the	Python	input	processor	on	the	user	input	file.
+int	Trick::IPPython::init()	{
+				/**	@par	Detailed	Design:	*/
 
-    FILE *input_fp ;
-    int ret ;
-    std::string error_message ;
+				FILE	*input_fp	;
+				int	ret	;
+				std::string	error_message	;
 
-    // Run Py_Initialze first for python 2.x
-#if PY_VERSION_HEX < 0x03000000
-    Py_Initialize();
+				//	Run	Py_Initialze	first	for	python	2.x
+#if	PY_VERSION_HEX	<	0x03000000
+				Py_Initialize();
 #endif
 
-    /* Run the Swig generated routine in S_source_wrap.cpp. */
-    init_swig_modules() ;
+				/*	Run	the	Swig	generated	routine	in	S_source_wrap.cpp.	*/
+				init_swig_modules()	;
 
-    // Run Py_Initialze after init_swig_modules for python 3.x
-#if PY_VERSION_HEX >= 0x03000000
-    Py_Initialize();
+				//	Run	Py_Initialze	after	init_swig_modules	for	python	3.x
+#if	PY_VERSION_HEX	>=	0x03000000
+				Py_Initialize();
 #endif
 
-    // The following PyRun_ calls do not require the PyGILState guards because no threads are launched 
-    /* Import simulation specific routines into interpreter. */
-    PyRun_SimpleString(
-     "import sys\n"
-     "import os\n"
-     "import struct\n"
-     "import binascii\n"
-     "sys.path.append(os.getcwd() + '/trick.zip')\n"
-     "sys.path.append(os.path.join(os.environ['TRICK_HOME'], 'share/trick/pymods'))\n"
-     "sys.path += map(str.strip, os.environ['TRICK_PYTHON_PATH'].split(':'))\n"
-     "import trick\n"
-     "sys.path.append(os.getcwd() + \"/Modified_data\")\n"
-    ) ;
-
-    /* Make shortcut names for all known sim_objects. */
-    get_TMM_named_variables() ;
-
-    /* An input file is not required, if the name is empty just return. */
-    if ( input_file.empty() ) {
-        return(0) ;
-    }
-
-    if ((input_fp = fopen(input_file.c_str(), "r")) == NULL) {
-        error_message = "No input file found named " + input_file ;
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str() ) ;
-    }
-
-    /* Read and parse the input file. */
-    if ( verify_input ) {
-        PyRun_SimpleString("sys.settrace(trick.traceit)") ;
-    }
-
-    if ( (ret = PyRun_SimpleFile(input_fp, input_file.c_str())) !=  0 ) {
-        exec_terminate_with_return(ret , __FILE__ , __LINE__ , "Input Processor error\n" ) ;
-    }
-
-    if ( verify_input ) {
-       std::stringstream ss ;
-       ss << "import hashlib" << std::endl ;
-       ss << "input_file = " << "'" << input_file.c_str() << "'" << std::endl;
-       ss << "print('{0} SHA1: {1}'.format(input_file,hashlib.sha1(open(input_file, 'rb').read()).hexdigest()))" << std::endl ;
-       PyRun_SimpleString(ss.str().c_str()) ;
-       exec_terminate_with_return(ret , __FILE__ , __LINE__ , "Input file verification complete\n" ) ;
-    }
-
-    fclose(input_fp) ;
-
-    // Release the GIL from the main thread.
-    Py_UNBLOCK_THREADS
-
-    return(0) ;
+				//	The	following	PyRun_	calls	do	not	require	the	PyGILState	guards	because	no	threads	are	launched	
+				/*	Import	simulation	specific	routines	into	interpreter.	*/
+				PyRun_SimpleString(
+					"import	sys\n"
+					"import	os\n"
+					"import	struct\n"
+					"import	binascii\n"
+					"sys.path.append(os.getcwd()	+	'/trick.zip')\n"
+					"sys.path.append(os.path.join(os.environ['TRICK_HOME'],	'share/trick/pymods'))\n"
+					"sys.path	+=	map(str.strip,	os.environ['TRICK_PYTHON_PATH'].split(':'))\n"
+					"import	trick\n"
+					"sys.path.append(os.getcwd()	+	\"/Modified_data\")\n"
+				)	;
+
+				/*	Make	shortcut	names	for	all	known	sim_objects.	*/
+				get_TMM_named_variables()	;
+
+				/*	An	input	file	is	not	required,	if	the	name	is	empty	just	return.	*/
+				if	(	input_file.empty()	)	{
+								return(0)	;
+				}
+
+				if	((input_fp	=	fopen(input_file.c_str(),	"r"))	==	NULL)	{
+								error_message	=	"No	input	file	found	named	"	+	input_file	;
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str()	)	;
+				}
+
+				/*	Read	and	parse	the	input	file.	*/
+				if	(	verify_input	)	{
+								PyRun_SimpleString("sys.settrace(trick.traceit)")	;
+				}
+
+				if	(	(ret	=	PyRun_SimpleFile(input_fp,	input_file.c_str()))	!=		0	)	{
+								exec_terminate_with_return(ret	,	__FILE__	,	__LINE__	,	"Input	Processor	error\n"	)	;
+				}
+
+				if	(	verify_input	)	{
+							std::stringstream	ss	;
+							ss	<<	"import	hashlib"	<<	std::endl	;
+							ss	<<	"input_file	=	"	<<	"'"	<<	input_file.c_str()	<<	"'"	<<	std::endl;
+							ss	<<	"print('{0}	SHA1:	{1}'.format(input_file,hashlib.sha1(open(input_file,	'rb').read()).hexdigest()))"	<<	std::endl	;
+							PyRun_SimpleString(ss.str().c_str())	;
+							exec_terminate_with_return(ret	,	__FILE__	,	__LINE__	,	"Input	file	verification	complete\n"	)	;
+				}
+
+				fclose(input_fp)	;
+
+				//	Release	the	GIL	from	the	main	thread.
+				Py_UNBLOCK_THREADS
+
+				return(0)	;
 }
 
-//Command to parse the given string.
-int Trick::IPPython::parse(std::string in_string) {
+//Command	to	parse	the	given	string.
+int	Trick::IPPython::parse(std::string	in_string)	{
 
-    int ret ;
-    in_string += "\n" ;
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    ret = PyRun_SimpleString(in_string.c_str()) ;
-    PyGILState_Release(gstate);
+				int	ret	;
+				in_string	+=	"\n"	;
+				PyGILState_STATE	gstate	=	PyGILState_Ensure();
+				ret	=	PyRun_SimpleString(in_string.c_str())	;
+				PyGILState_Release(gstate);
 
-    return ret ;
+				return	ret	;
 
 }
 
 /**
- @details
- The incoming statement is assumed to be a conditional fragment, i.e. "a > b".  We need
- to get the return value of this fragment by setting the return value of it to a known
- variable name in the input processor.  We can then assign that return value to the
- incoming return_value reference.
-
--# Lock the input processor mutex
--# Create a complete statement that assigns the conditional fragment to our return value
--# parse the condition
--# copy the return value to the incoming cond_return_value
--# Unlock the input processor mutex
+	@details
+	The	incoming	statement	is	assumed	to	be	a	conditional	fragment,	i.e.	"a	>	b".		We	need
+	to	get	the	return	value	of	this	fragment	by	setting	the	return	value	of	it	to	a	known
+	variable	name	in	the	input	processor.		We	can	then	assign	that	return	value	to	the
+	incoming	return_value	reference.
+
+-#	Lock	the	input	processor	mutex
+-#	Create	a	complete	statement	that	assigns	the	conditional	fragment	to	our	return	value
+-#	parse	the	condition
+-#	copy	the	return	value	to	the	incoming	cond_return_value
+-#	Unlock	the	input	processor	mutex
 */
-int Trick::IPPython::parse_condition(std::string in_string, int & cond_return_val ) {
+int	Trick::IPPython::parse_condition(std::string	in_string,	int	&	cond_return_val	)	{
 
-    in_string =  std::string("trick_ip.ip.return_val = ") + in_string + "\n" ;
-    // Running the simple string will set return_val.
-    PyGILState_STATE gstate = PyGILState_Ensure();
-    int py_ret = PyRun_SimpleString(in_string.c_str()) ;
-    PyGILState_Release(gstate);
-    cond_return_val = return_val ;
+				in_string	=		std::string("trick_ip.ip.return_val	=	")	+	in_string	+	"\n"	;
+				//	Running	the	simple	string	will	set	return_val.
+				PyGILState_STATE	gstate	=	PyGILState_Ensure();
+				int	py_ret	=	PyRun_SimpleString(in_string.c_str())	;
+				PyGILState_Release(gstate);
+				cond_return_val	=	return_val	;
 
-    return py_ret ;
+				return	py_ret	;
 
 }
 
-//Restart job that reloads event_list from checkpointable structures
-int Trick::IPPython::restart() {
-    /* Make shortcut names for all known sim_objects. */
-    get_TMM_named_variables() ;
-    return 0 ;
+//Restart	job	that	reloads	event_list	from	checkpointable	structures
+int	Trick::IPPython::restart()	{
+				/*	Make	shortcut	names	for	all	known	sim_objects.	*/
+				get_TMM_named_variables()	;
+				return	0	;
 }
 
-int Trick::IPPython::shutdown() {
+int	Trick::IPPython::shutdown()	{
 
-    if ( Py_IsInitialized() ) {
-        // Obtain the GIL so that we can shut down properly
-        Py_BLOCK_THREADS
-        Py_Finalize();
-    }
-    return(0) ;
+				if	(	Py_IsInitialized()	)	{
+								//	Obtain	the	GIL	so	that	we	can	shut	down	properly
+								Py_BLOCK_THREADS
+								Py_Finalize();
+				}
+				return(0)	;
 }
 
-//TODO: remove units conversion messenger routines in 2021
-void shoot_the_units_conversion_messenger() {
-    message_publish(MSG_WARNING, "shoot_the_units_conversion_messenger() is deprecated\n") ;
-    the_pip->shoot_the_units_conversion_messenger(true) ;
+//TODO:	remove	units	conversion	messenger	routines	in	2021
+void	shoot_the_units_conversion_messenger()	{
+				message_publish(MSG_WARNING,	"shoot_the_units_conversion_messenger()	is	deprecated\n")	;
+				the_pip->shoot_the_units_conversion_messenger(true)	;
 }
 
-void revive_the_units_conversion_messenger() {
-    message_publish(MSG_WARNING, "revive_the_units_conversion_messenger() is deprecated\n") ;
-    the_pip->shoot_the_units_conversion_messenger(false) ;
+void	revive_the_units_conversion_messenger()	{
+				message_publish(MSG_WARNING,	"revive_the_units_conversion_messenger()	is	deprecated\n")	;
+				the_pip->shoot_the_units_conversion_messenger(false)	;
 }
 
-int check_units_conversion_messenger_for_signs_of_life() {
-    message_publish(MSG_WARNING, "check_units_conversion_messenger_for_signs_of_life() is deprecated\n") ;
-    return the_pip->get_units_conversion_msgs() ;
+int	check_units_conversion_messenger_for_signs_of_life()	{
+				message_publish(MSG_WARNING,	"check_units_conversion_messenger_for_signs_of_life()	is	deprecated\n")	;
+				return	the_pip->get_units_conversion_msgs()	;
 }
-//END TODO:
+//END	TODO:
diff --git a/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
index c822ddf98..ce42519cf 100644
--- a/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
+++ b/trick_source/sim_services/InputProcessor/IPPythonEvent.cpp
@@ -1,678 +1,678 @@
 /*
-   PURPOSE: ( Python input processor event capability )
-   REFERENCE: ( Trick Simulation Environment )
-   ASSUMPTIONS AND LIMITATIONS: ( None )
-   CLASS: ( N/A )
-   LIBRARY DEPENDENCY: ( None )
-   PROGRAMMERS: ( Alex Lin NASA 2009 )
+			PURPOSE:	(	Python	input	processor	event	capability	)
+			REFERENCE:	(	Trick	Simulation	Environment	)
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
+			CLASS:	(	N/A	)
+			LIBRARY	DEPENDENCY:	(	None	)
+			PROGRAMMERS:	(	Alex	Lin	NASA	2009	)
 */
 
-#include <iostream>
-#include <string>
-#include <stdlib.h>
-#include <string.h>
-
-#include "trick/IPPythonEvent.hh"
-#include "trick/IPPython.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.hh"
-
-/* Global singleton pointer to the memory manager */
-//TODO Use external MM interface
-extern Trick::MemoryManager * trick_MM ;
-
-/* static variables in the IPPythonEvent class */
-Trick::IPPython * Trick::IPPythonEvent::ip ;
-Trick::MTV * Trick::IPPythonEvent::mtv ;
-bool Trick::IPPythonEvent::info_msg = false ;
-bool Trick::IPPythonEvent::terminate_sim_on_event_python_error = false;
-
-Trick::condition_t::condition_t() {
-    enabled = 0 ;
-    hold = 0 ;
-    fired = 0 ;
-    fired_count = 0 ;
-    fired_time = -1.0 ;
-    ref = NULL ;
-    job = NULL ;
-}
-
-Trick::action_t::action_t() {
-    enabled = 0 ;
-    ran = 0 ;
-    ran_count = 0 ;
-    ran_time = -1.0 ;
-    job = NULL ;
-    act_type = 0 ;
+#include	<iostream>
+#include	<string>
+#include	<stdlib.h>
+#include	<string.h>
+
+#include	"trick/IPPythonEvent.hh"
+#include	"trick/IPPython.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.hh"
+
+/*	Global	singleton	pointer	to	the	memory	manager	*/
+//TODO	Use	external	MM	interface
+extern	Trick::MemoryManager	*	trick_MM	;
+
+/*	static	variables	in	the	IPPythonEvent	class	*/
+Trick::IPPython	*	Trick::IPPythonEvent::ip	;
+Trick::MTV	*	Trick::IPPythonEvent::mtv	;
+bool	Trick::IPPythonEvent::info_msg	=	false	;
+bool	Trick::IPPythonEvent::terminate_sim_on_event_python_error	=	false;
+
+Trick::condition_t::condition_t()	{
+				enabled	=	0	;
+				hold	=	0	;
+				fired	=	0	;
+				fired_count	=	0	;
+				fired_time	=	-1.0	;
+				ref	=	NULL	;
+				job	=	NULL	;
+}
+
+Trick::action_t::action_t()	{
+				enabled	=	0	;
+				ran	=	0	;
+				ran_count	=	0	;
+				ran_time	=	-1.0	;
+				job	=	NULL	;
+				act_type	=	0	;
 }
 
 //Constructor
-Trick::IPPythonEvent::IPPythonEvent() {
-
-
-    is_user_event = true ;
-    manual = false ;
-    manual_fired = false ;
-    condition_count = 0 ;
-    cond_all = false ;
-    action_count = 0 ;
-    fired_count = 0 ;
-    fired_time = -1.0 ;
-    ran_count = 0 ;
-    ran_time = -1.0 ;
-    fired = false ;
-    hold = false ;
-    ran = false ;
-    action_list = NULL;
-    condition_list = NULL;
+Trick::IPPythonEvent::IPPythonEvent()	{
+
+
+				is_user_event	=	true	;
+				manual	=	false	;
+				manual_fired	=	false	;
+				condition_count	=	0	;
+				cond_all	=	false	;
+				action_count	=	0	;
+				fired_count	=	0	;
+				fired_time	=	-1.0	;
+				ran_count	=	0	;
+				ran_time	=	-1.0	;
+				fired	=	false	;
+				hold	=	false	;
+				ran	=	false	;
+				action_list	=	NULL;
+				condition_list	=	NULL;
 }
 
-Trick::IPPythonEvent::~IPPythonEvent() {
+Trick::IPPythonEvent::~IPPythonEvent()	{
 
-    if (TMM_is_alloced((char *)condition_list))
-    {
-       for (int ii=0; ii<condition_count; ii++) {
-           if (TMM_is_alloced((char *)condition_list[ii]))
-           {
-              TMM_delete_var_a(condition_list[ii]);
-           }
-           condition_list[ii] = 0x0;
-       }
-       TMM_delete_var_a(condition_list);
-    }
-    condition_list = 0x0;
+				if	(TMM_is_alloced((char	*)condition_list))
+				{
+							for	(int	ii=0;	ii<condition_count;	ii++)	{
+											if	(TMM_is_alloced((char	*)condition_list[ii]))
+											{
+														TMM_delete_var_a(condition_list[ii]);
+											}
+											condition_list[ii]	=	0x0;
+							}
+							TMM_delete_var_a(condition_list);
+				}
+				condition_list	=	0x0;
 
-    if (TMM_is_alloced((char *)action_list))
-    {
-       for (int ii=0; ii<action_count; ii++) {
-           if (TMM_is_alloced((char *)action_list[ii]))
-           {
-              TMM_delete_var_a(action_list[ii]);
-           }
-           action_list[ii] = 0x0;
-       }
-       TMM_delete_var_a(action_list);
-    }
-    action_list = 0x0;
+				if	(TMM_is_alloced((char	*)action_list))
+				{
+							for	(int	ii=0;	ii<action_count;	ii++)	{
+											if	(TMM_is_alloced((char	*)action_list[ii]))
+											{
+														TMM_delete_var_a(action_list[ii]);
+											}
+											action_list[ii]	=	0x0;
+							}
+							TMM_delete_var_a(action_list);
+				}
+				action_list	=	0x0;
 }
 
-void Trick::IPPythonEvent::set_python_processor(Trick::IPPython * in_ip) {
-    ip = in_ip ;
+void	Trick::IPPythonEvent::set_python_processor(Trick::IPPython	*	in_ip)	{
+				ip	=	in_ip	;
 }
 
-void Trick::IPPythonEvent::set_mtv(Trick::MTV * in_mtv) {
-    mtv = in_mtv ;
+void	Trick::IPPythonEvent::set_mtv(Trick::MTV	*	in_mtv)	{
+				mtv	=	in_mtv	;
 }
 
-//Command to make event evaluation require that ALL of event's conditions be true to make action(s) run.
-int Trick::IPPythonEvent::condition_all() {
-    cond_all = true ;
-    return(0);
+//Command	to	make	event	evaluation	require	that	ALL	of	event's	conditions	be	true	to	make	action(s)	run.
+int	Trick::IPPythonEvent::condition_all()	{
+				cond_all	=	true	;
+				return(0);
 }
 
-//Command to make event evaluation require that ANY of event's conditions be true to make action(s) run (default).
-int Trick::IPPythonEvent::condition_any() {
-    cond_all = false ;
-    return(0);
-}
-
-//Command to manually fire the event next cycle and hold it fired (enter manual mode, bypasses normal condition processing).
-void Trick::IPPythonEvent::manual_on() {
-    manual = true ;
-    manual_fired = true ;
-    hold = true ;
-    fired = false ;
-}
-
-//Command to manually fire the event once NOW (enter manual mode, bypasses normal condition processing).
-void Trick::IPPythonEvent::manual_fire() {
-    manual = true ;
-    manual_fired = true ;
-    hold = false ;
-    fired = false ;
-    process_user_event(exec_get_time_tics()) ;
-}
-
-//Command to manually set the event as not fired (enter manual mode, bypasses normal condition processing).
-void Trick::IPPythonEvent::manual_off() {
-    manual = true ;
-    manual_fired = false ;
-    hold = false ;
-    fired = false ;
-}
-
-//Command to return to normal event processing (needed to end manual mode after any manual commands).
-void Trick::IPPythonEvent::manual_done() {
-    manual = false ;
-    manual_fired = false ;
-    hold = false ;
-}
-
-void Trick::IPPythonEvent::add() {
-    added = true ;
-}
-
-void Trick::IPPythonEvent::remove() {
-    added = false ;
-}
-
-// Command to turn on info messages
-void Trick::IPPythonEvent::set_event_info_msg_on() {
-    info_msg = true;
-}
-
-// Command to turn off info messages
-void Trick::IPPythonEvent::set_event_info_msg_off() {
-    info_msg = false;
-}
-
-void Trick::IPPythonEvent::terminate_on_event_parse_error(bool on_off) {
-    terminate_sim_on_event_python_error = on_off;
-}
-
-void Trick::IPPythonEvent::restart() {
-    int jj ;
-
-    for (jj=0; jj<condition_count; jj++) {
-        if (condition_list[jj]->cond_type==1) { // condition variable
-            condition_list[jj]->ref = ref_attributes(condition_list[jj]->str.c_str());
-        }
-        if (condition_list[jj]->cond_type==2) { // condition job
-            condition_list[jj]->job = exec_get_job(condition_list[jj]->str.c_str(),1);
-        }
-    }
-    for (jj=0; jj<action_count; jj++) {
-        if (action_list[jj]->act_type!=0) { // action job
-            action_list[jj]->job = exec_get_job(action_list[jj]->str.c_str(),1);
-        }
-    }
-
-}
-
-//Command to create a new condition using a model variable (or reset an existing condition variable), num is index starting at 0.
-int Trick::IPPythonEvent::condition_var(int num, std::string varname, std::string comment) {
-    /** @par Detailed Design: */
-    /** @li Find the variable reference for the varname string and pass it to condition() */
-    REF2* ref = ref_attributes(varname.c_str());
-    /** @li Emit an error if specified varname does not exist. */
-    if (ref==NULL) {
-        message_publish(MSG_WARNING, "Event condition variable %s not found. Setting condition to False.\n", varname.c_str()) ;
-        condition(num, "False", comment, NULL, NULL );
-    } else {
-        condition(num, varname, comment, ref, NULL );
-    }
-    return(0);
-}
-
-//Command to create a new condition using a model job (or reset an existing condition job), num is index starting at 0.
-int Trick::IPPythonEvent::condition_job(int num, std::string jobname, std::string comment) {
-    /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to condition() */
-    JobData *job = exec_get_job(jobname.c_str(),1);
-    /** @li Emit an error if specified jobname does not exist. */
-    if (job==NULL) {
-        message_publish(MSG_WARNING, "Event condition job %s not found. Setting condition to False.\n", jobname.c_str()) ;
-        condition(num, "False", comment, NULL, NULL );
-    } else {
-        if (! job->job_class_name.compare("malfunction")) {
-            // enable it if it's a malf job because they are not in any queue
-            job->disabled = false;
-        }
-        condition(num, jobname, comment, NULL, job );
-    }
-    return(0);
-}
-
-//Command to create a new condition and set its input string (or reset an existing condition string), num is index starting at 0.
-int Trick::IPPythonEvent::condition(int num, std::string str, std::string comment, REF2* ref, JobData* job) {
-    /** @par Detailed Design: */
-
-    if (num == condition_count) {
-        /** @li Add a new condition when num is sequential, i.e. it is equal to condition_count */
-        condition_count++;
-        if (condition_count == 1) {
-            condition_list =
-                (Trick::condition_t **)TMM_declare_var_s("Trick::condition_t*[1]");
-        } else {
-            condition_list =
-                (Trick::condition_t **)TMM_resize_array_1d_a(condition_list, condition_count);
-        }
-        condition_list[num] =
-            (Trick::condition_t *)TMM_declare_var_s("Trick::condition_t");
-         
-        condition_list[num]->fired_count = 0;
-        condition_list[num]->fired_time = -1.0;
-    }
-    if ((num >=0) && (num < condition_count)) {
-        /** @li This is either a new condition or user is changing the condition. */
-        /** @li Initialize condition variables - default as enabled. */
-        condition_list[num]->ref = ref ;
-        condition_list[num]->job = job ;
-        condition_list[num]->enabled = true;
-        condition_list[num]->hold = false;
-        condition_list[num]->fired = false;
-        if (ref != NULL) {
-            condition_list[num]->cond_type = 1;
-        } else if (job != NULL) {
-            condition_list[num]->cond_type = 2;
-        } else condition_list[num]->cond_type = 0;
-        condition_list[num]->str = str;
-        // comment is for display in mtv, if not supplied create a comment containing up to 50 characters of cond string
-        if (comment.empty()) {
-            condition_list[num]->comment = str.substr(0,50);
-        } else {
-            condition_list[num]->comment = comment;
-        }
-        // dummy must contain max conditions used in any event so it can replace any event in mtv when deleted
-    } else {
-        /** @li Emit an error if specified index num is not sequential. */
-        message_publish(MSG_WARNING, "Event condition not added: condition number %d is not sequential.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to set an existing condition to hold, so that when it fires it stays in the fired state.
-int Trick::IPPythonEvent::condition_hold_on(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        condition_list[num]->hold = true ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition hold not set. Condition number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to set an existing condition to not hold its fired state.
-int Trick::IPPythonEvent::condition_hold_off(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        condition_list[num]->hold = false ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition hold not set. Condition number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to enable an existing condition (default is enabled) so that it is evaluated during event processing.
-int Trick::IPPythonEvent::condition_enable(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        condition_list[num]->enabled = true ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition not enabled. Condition number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to disable an existing condition so that it is not evaluated during event processing.
-int Trick::IPPythonEvent::condition_disable(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        condition_list[num]->enabled = false ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition not disabled. Condition number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Accessor function to test if the condition, indicated by num, fired (is currently in the fired state).
-bool Trick::IPPythonEvent::condition_fired(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        return (condition_list[num]->fired ? true : false) ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition fired state not returned. Condition number %d is invalid.\n", num) ;
-    }
-    return(false);
-}
-
-//Accessor function to see how many times the condition, indicated by num, fired.
-int Trick::IPPythonEvent::condition_fired_count(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        return (condition_list[num]->fired_count) ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition fired count not returned. Condition number %d is invalid.\n", num) ;
-    }
-    return(0) ;
-}
-
-//Accessor function to see when was the last time the condition, indicated by num, fired.
-double Trick::IPPythonEvent::condition_fired_time(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        return (condition_list[num]->fired_time) ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition fired time not returned. Condition number %d is invalid.\n", num) ;
-    }
-    return(0.0) ;
-}
-
-//Accessor function to return the condition string, indicated by num.
-std::string Trick::IPPythonEvent::condition_string(int num) {
-
-    if ((num >=0) && (num < condition_count)) {
-        return (condition_list[num]->str) ;
-    } else {
-        message_publish(MSG_WARNING, "Event condition string not returned. Condition number %d is invalid.\n", num) ;
-    }
-    return "" ;
-}
-
-//Command to create a new action using a model job (or reset an existing action job), num is index starting at 0.
-int Trick::IPPythonEvent::action_job(int num, std::string jobname, std::string comment) {
-    /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to action() */
-    JobData *job = exec_get_job(jobname.c_str(),1);
-    /** @li Emit an error if specified jobname does not exist. */
-    if (job==NULL) {
-        message_publish(MSG_WARNING, "Event action job %s not found. No action was added.\n", jobname.c_str()) ;
-    } else {
-        if (! job->job_class_name.compare("malfunction")) {
-            // enable it if it's a malf job because they are not in any queue
-            job->disabled = false;
-        }
-        action(num, jobname, comment, job, 3 );
-    }
-    return(0);
-}
-
-//Command to create a new action to turn a model job ON, num is index starting at 0.
-int Trick::IPPythonEvent::action_job_on(int num, std::string jobname, std::string comment) {
-    /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to action() */
-    JobData *job = exec_get_job(jobname.c_str(),1);
-    /** @li Emit an error if specified jobname does not exist. */
-    if (job==NULL) {
-        message_publish(MSG_WARNING, "Event action job %s not found. No action was added.\n", jobname.c_str()) ;
-    } else {
-        action(num, jobname, comment, job, 1 );
-    }
-    return(0);
-}
-
-//Command to create a new action to turn a model job OFF, num is index starting at 0.
-int Trick::IPPythonEvent::action_job_off(int num, std::string jobname, std::string comment) {
-    /** @par Detailed Design: */
-    /** @li Find the job for the jobname string and pass it to action() */
-    JobData *job = exec_get_job(jobname.c_str(),1);
-    /** @li Emit an error if specified jobname does not exist. */
-    if (job==NULL) {
-        message_publish(MSG_WARNING, "Event action job %s not found. No action was added.\n", jobname.c_str()) ;
-    } else {
-        action(num, jobname, comment, job, 2 );
-    }
-    return(0);
-}
-
-//Command to create a new action and set its input string (or reset an existing action string), num is index starting at 0.
-int Trick::IPPythonEvent::action(int num, std::string str, std::string comment, JobData *job, int act_type) {
-    /** @par Detailed Design: */
-
-    if (num == action_count) {
-        /** @li Add a new action when num is sequential, i.e. it is equal to action_count */
-        action_count++;
-        if (action_count == 1) {
-            action_list = (Trick::action_t **)TMM_declare_var_s("Trick::action_t*[1]");
-        } else {
-            action_list = (Trick::action_t **)TMM_resize_array_1d_a(action_list, action_count);
-        }
-        action_list[num] =
-            (Trick::action_t *)TMM_declare_var_s("Trick::action_t");
-
-        action_list[num]->ran_count = 0;
-        action_list[num]->ran_time = -1.0;
-    }
-    if ((num >=0) && (num < action_count)) {
-        /** @li This is either a new action or user is changing the action. */
-        /** @li Initialize action variables - default as enabled. */
-        action_list[num]->job = job ;
-        action_list[num]->act_type = act_type ;
-        action_list[num]->enabled = true;
-        action_list[num]->ran = false;
-        action_list[num]->str = str;
-        // comment is for display in mtv, if not supplied create a comment containing up to 50 characters of act string
-        if (comment.empty()) {
-            action_list[num]->comment = str.substr(0,50);
-        } else {
-            action_list[num]->comment = comment;
-        }
-        // dummy must contain max actions used in any event so it can replace any event in mtv when deleted
-#if 0
-        if (num == ip->dummy_event.action_count) {
-            ip->dummy_event.action(num, "XXX_DELETED_ACT");
-        }
+//Command	to	make	event	evaluation	require	that	ANY	of	event's	conditions	be	true	to	make	action(s)	run	(default).
+int	Trick::IPPythonEvent::condition_any()	{
+				cond_all	=	false	;
+				return(0);
+}
+
+//Command	to	manually	fire	the	event	next	cycle	and	hold	it	fired	(enter	manual	mode,	bypasses	normal	condition	processing).
+void	Trick::IPPythonEvent::manual_on()	{
+				manual	=	true	;
+				manual_fired	=	true	;
+				hold	=	true	;
+				fired	=	false	;
+}
+
+//Command	to	manually	fire	the	event	once	NOW	(enter	manual	mode,	bypasses	normal	condition	processing).
+void	Trick::IPPythonEvent::manual_fire()	{
+				manual	=	true	;
+				manual_fired	=	true	;
+				hold	=	false	;
+				fired	=	false	;
+				process_user_event(exec_get_time_tics())	;
+}
+
+//Command	to	manually	set	the	event	as	not	fired	(enter	manual	mode,	bypasses	normal	condition	processing).
+void	Trick::IPPythonEvent::manual_off()	{
+				manual	=	true	;
+				manual_fired	=	false	;
+				hold	=	false	;
+				fired	=	false	;
+}
+
+//Command	to	return	to	normal	event	processing	(needed	to	end	manual	mode	after	any	manual	commands).
+void	Trick::IPPythonEvent::manual_done()	{
+				manual	=	false	;
+				manual_fired	=	false	;
+				hold	=	false	;
+}
+
+void	Trick::IPPythonEvent::add()	{
+				added	=	true	;
+}
+
+void	Trick::IPPythonEvent::remove()	{
+				added	=	false	;
+}
+
+//	Command	to	turn	on	info	messages
+void	Trick::IPPythonEvent::set_event_info_msg_on()	{
+				info_msg	=	true;
+}
+
+//	Command	to	turn	off	info	messages
+void	Trick::IPPythonEvent::set_event_info_msg_off()	{
+				info_msg	=	false;
+}
+
+void	Trick::IPPythonEvent::terminate_on_event_parse_error(bool	on_off)	{
+				terminate_sim_on_event_python_error	=	on_off;
+}
+
+void	Trick::IPPythonEvent::restart()	{
+				int	jj	;
+
+				for	(jj=0;	jj<condition_count;	jj++)	{
+								if	(condition_list[jj]->cond_type==1)	{	//	condition	variable
+												condition_list[jj]->ref	=	ref_attributes(condition_list[jj]->str.c_str());
+								}
+								if	(condition_list[jj]->cond_type==2)	{	//	condition	job
+												condition_list[jj]->job	=	exec_get_job(condition_list[jj]->str.c_str(),1);
+								}
+				}
+				for	(jj=0;	jj<action_count;	jj++)	{
+								if	(action_list[jj]->act_type!=0)	{	//	action	job
+												action_list[jj]->job	=	exec_get_job(action_list[jj]->str.c_str(),1);
+								}
+				}
+
+}
+
+//Command	to	create	a	new	condition	using	a	model	variable	(or	reset	an	existing	condition	variable),	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::condition_var(int	num,	std::string	varname,	std::string	comment)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Find	the	variable	reference	for	the	varname	string	and	pass	it	to	condition()	*/
+				REF2*	ref	=	ref_attributes(varname.c_str());
+				/**	@li	Emit	an	error	if	specified	varname	does	not	exist.	*/
+				if	(ref==NULL)	{
+								message_publish(MSG_WARNING,	"Event	condition	variable	%s	not	found.	Setting	condition	to	False.\n",	varname.c_str())	;
+								condition(num,	"False",	comment,	NULL,	NULL	);
+				}	else	{
+								condition(num,	varname,	comment,	ref,	NULL	);
+				}
+				return(0);
+}
+
+//Command	to	create	a	new	condition	using	a	model	job	(or	reset	an	existing	condition	job),	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::condition_job(int	num,	std::string	jobname,	std::string	comment)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Find	the	job	for	the	jobname	string	and	pass	it	to	condition()	*/
+				JobData	*job	=	exec_get_job(jobname.c_str(),1);
+				/**	@li	Emit	an	error	if	specified	jobname	does	not	exist.	*/
+				if	(job==NULL)	{
+								message_publish(MSG_WARNING,	"Event	condition	job	%s	not	found.	Setting	condition	to	False.\n",	jobname.c_str())	;
+								condition(num,	"False",	comment,	NULL,	NULL	);
+				}	else	{
+								if	(!	job->job_class_name.compare("malfunction"))	{
+												//	enable	it	if	it's	a	malf	job	because	they	are	not	in	any	queue
+												job->disabled	=	false;
+								}
+								condition(num,	jobname,	comment,	NULL,	job	);
+				}
+				return(0);
+}
+
+//Command	to	create	a	new	condition	and	set	its	input	string	(or	reset	an	existing	condition	string),	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::condition(int	num,	std::string	str,	std::string	comment,	REF2*	ref,	JobData*	job)	{
+				/**	@par	Detailed	Design:	*/
+
+				if	(num	==	condition_count)	{
+								/**	@li	Add	a	new	condition	when	num	is	sequential,	i.e.	it	is	equal	to	condition_count	*/
+								condition_count++;
+								if	(condition_count	==	1)	{
+												condition_list	=
+																(Trick::condition_t	**)TMM_declare_var_s("Trick::condition_t*[1]");
+								}	else	{
+												condition_list	=
+																(Trick::condition_t	**)TMM_resize_array_1d_a(condition_list,	condition_count);
+								}
+								condition_list[num]	=
+												(Trick::condition_t	*)TMM_declare_var_s("Trick::condition_t");
+									
+								condition_list[num]->fired_count	=	0;
+								condition_list[num]->fired_time	=	-1.0;
+				}
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								/**	@li	This	is	either	a	new	condition	or	user	is	changing	the	condition.	*/
+								/**	@li	Initialize	condition	variables	-	default	as	enabled.	*/
+								condition_list[num]->ref	=	ref	;
+								condition_list[num]->job	=	job	;
+								condition_list[num]->enabled	=	true;
+								condition_list[num]->hold	=	false;
+								condition_list[num]->fired	=	false;
+								if	(ref	!=	NULL)	{
+												condition_list[num]->cond_type	=	1;
+								}	else	if	(job	!=	NULL)	{
+												condition_list[num]->cond_type	=	2;
+								}	else	condition_list[num]->cond_type	=	0;
+								condition_list[num]->str	=	str;
+								//	comment	is	for	display	in	mtv,	if	not	supplied	create	a	comment	containing	up	to	50	characters	of	cond	string
+								if	(comment.empty())	{
+												condition_list[num]->comment	=	str.substr(0,50);
+								}	else	{
+												condition_list[num]->comment	=	comment;
+								}
+								//	dummy	must	contain	max	conditions	used	in	any	event	so	it	can	replace	any	event	in	mtv	when	deleted
+				}	else	{
+								/**	@li	Emit	an	error	if	specified	index	num	is	not	sequential.	*/
+								message_publish(MSG_WARNING,	"Event	condition	not	added:	condition	number	%d	is	not	sequential.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	set	an	existing	condition	to	hold,	so	that	when	it	fires	it	stays	in	the	fired	state.
+int	Trick::IPPythonEvent::condition_hold_on(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								condition_list[num]->hold	=	true	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	hold	not	set.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	set	an	existing	condition	to	not	hold	its	fired	state.
+int	Trick::IPPythonEvent::condition_hold_off(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								condition_list[num]->hold	=	false	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	hold	not	set.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	enable	an	existing	condition	(default	is	enabled)	so	that	it	is	evaluated	during	event	processing.
+int	Trick::IPPythonEvent::condition_enable(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								condition_list[num]->enabled	=	true	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	not	enabled.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	disable	an	existing	condition	so	that	it	is	not	evaluated	during	event	processing.
+int	Trick::IPPythonEvent::condition_disable(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								condition_list[num]->enabled	=	false	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	not	disabled.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Accessor	function	to	test	if	the	condition,	indicated	by	num,	fired	(is	currently	in	the	fired	state).
+bool	Trick::IPPythonEvent::condition_fired(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								return	(condition_list[num]->fired	?	true	:	false)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	fired	state	not	returned.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(false);
+}
+
+//Accessor	function	to	see	how	many	times	the	condition,	indicated	by	num,	fired.
+int	Trick::IPPythonEvent::condition_fired_count(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								return	(condition_list[num]->fired_count)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	fired	count	not	returned.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0)	;
+}
+
+//Accessor	function	to	see	when	was	the	last	time	the	condition,	indicated	by	num,	fired.
+double	Trick::IPPythonEvent::condition_fired_time(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								return	(condition_list[num]->fired_time)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	fired	time	not	returned.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0.0)	;
+}
+
+//Accessor	function	to	return	the	condition	string,	indicated	by	num.
+std::string	Trick::IPPythonEvent::condition_string(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	condition_count))	{
+								return	(condition_list[num]->str)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	condition	string	not	returned.	Condition	number	%d	is	invalid.\n",	num)	;
+				}
+				return	""	;
+}
+
+//Command	to	create	a	new	action	using	a	model	job	(or	reset	an	existing	action	job),	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::action_job(int	num,	std::string	jobname,	std::string	comment)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Find	the	job	for	the	jobname	string	and	pass	it	to	action()	*/
+				JobData	*job	=	exec_get_job(jobname.c_str(),1);
+				/**	@li	Emit	an	error	if	specified	jobname	does	not	exist.	*/
+				if	(job==NULL)	{
+								message_publish(MSG_WARNING,	"Event	action	job	%s	not	found.	No	action	was	added.\n",	jobname.c_str())	;
+				}	else	{
+								if	(!	job->job_class_name.compare("malfunction"))	{
+												//	enable	it	if	it's	a	malf	job	because	they	are	not	in	any	queue
+												job->disabled	=	false;
+								}
+								action(num,	jobname,	comment,	job,	3	);
+				}
+				return(0);
+}
+
+//Command	to	create	a	new	action	to	turn	a	model	job	ON,	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::action_job_on(int	num,	std::string	jobname,	std::string	comment)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Find	the	job	for	the	jobname	string	and	pass	it	to	action()	*/
+				JobData	*job	=	exec_get_job(jobname.c_str(),1);
+				/**	@li	Emit	an	error	if	specified	jobname	does	not	exist.	*/
+				if	(job==NULL)	{
+								message_publish(MSG_WARNING,	"Event	action	job	%s	not	found.	No	action	was	added.\n",	jobname.c_str())	;
+				}	else	{
+								action(num,	jobname,	comment,	job,	1	);
+				}
+				return(0);
+}
+
+//Command	to	create	a	new	action	to	turn	a	model	job	OFF,	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::action_job_off(int	num,	std::string	jobname,	std::string	comment)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Find	the	job	for	the	jobname	string	and	pass	it	to	action()	*/
+				JobData	*job	=	exec_get_job(jobname.c_str(),1);
+				/**	@li	Emit	an	error	if	specified	jobname	does	not	exist.	*/
+				if	(job==NULL)	{
+								message_publish(MSG_WARNING,	"Event	action	job	%s	not	found.	No	action	was	added.\n",	jobname.c_str())	;
+				}	else	{
+								action(num,	jobname,	comment,	job,	2	);
+				}
+				return(0);
+}
+
+//Command	to	create	a	new	action	and	set	its	input	string	(or	reset	an	existing	action	string),	num	is	index	starting	at	0.
+int	Trick::IPPythonEvent::action(int	num,	std::string	str,	std::string	comment,	JobData	*job,	int	act_type)	{
+				/**	@par	Detailed	Design:	*/
+
+				if	(num	==	action_count)	{
+								/**	@li	Add	a	new	action	when	num	is	sequential,	i.e.	it	is	equal	to	action_count	*/
+								action_count++;
+								if	(action_count	==	1)	{
+												action_list	=	(Trick::action_t	**)TMM_declare_var_s("Trick::action_t*[1]");
+								}	else	{
+												action_list	=	(Trick::action_t	**)TMM_resize_array_1d_a(action_list,	action_count);
+								}
+								action_list[num]	=
+												(Trick::action_t	*)TMM_declare_var_s("Trick::action_t");
+
+								action_list[num]->ran_count	=	0;
+								action_list[num]->ran_time	=	-1.0;
+				}
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								/**	@li	This	is	either	a	new	action	or	user	is	changing	the	action.	*/
+								/**	@li	Initialize	action	variables	-	default	as	enabled.	*/
+								action_list[num]->job	=	job	;
+								action_list[num]->act_type	=	act_type	;
+								action_list[num]->enabled	=	true;
+								action_list[num]->ran	=	false;
+								action_list[num]->str	=	str;
+								//	comment	is	for	display	in	mtv,	if	not	supplied	create	a	comment	containing	up	to	50	characters	of	act	string
+								if	(comment.empty())	{
+												action_list[num]->comment	=	str.substr(0,50);
+								}	else	{
+												action_list[num]->comment	=	comment;
+								}
+								//	dummy	must	contain	max	actions	used	in	any	event	so	it	can	replace	any	event	in	mtv	when	deleted
+#if	0
+								if	(num	==	ip->dummy_event.action_count)	{
+												ip->dummy_event.action(num,	"XXX_DELETED_ACT");
+								}
 #endif
-    } else {
-        /** @li Emit an error if specified index num is not sequential. */
-        message_publish(MSG_WARNING, "Event action not added: action number %d is not sequential.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to enable an existing action (default is enabled) so that it is run when fired during event processing.
-int Trick::IPPythonEvent::action_enable(int num) {
-
-    if ((num >=0) && (num < action_count)) {
-        action_list[num]->enabled = true ;
-    } else {
-        message_publish(MSG_WARNING, "Event action not enabled. Action number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Command to disable an existing action so that it is not run when fired during event processing.
-int Trick::IPPythonEvent::action_disable(int num) {
-
-    if ((num >=0) && (num < action_count)) {
-        action_list[num]->enabled = false ;
-    } else {
-        message_publish(MSG_WARNING, "Event action not disabled. Action number %d is invalid.\n", num) ;
-    }
-    return(0);
-}
-
-//Accessor function to test if the action, indicated by num, ran.
-bool Trick::IPPythonEvent::action_ran(int num) {
-
-    if ((num >=0) && (num < action_count)) {
-        return (action_list[num]->ran ? true : false) ;
-    } else {
-        message_publish(MSG_WARNING, "Event action ran state not returned. Action number %d is invalid.\n", num) ;
-    }
-    return(false);
-}
-
-//Accessor function to see how many times the action, indicated by num, ran.
-int Trick::IPPythonEvent::action_ran_count(int num) {
-
-    if ((num >=0) && (num < action_count)) {
-        return (action_list[num]->ran_count) ;
-    } else {
-        message_publish(MSG_WARNING, "Event action ran count not returned. Action number %d is invalid.\n", num) ;
-    }
-    return(0) ;
-}
-
-//Accessor function to see when was the last time the action, indicated by num, ran.
-double Trick::IPPythonEvent::action_ran_time(int num) {
-
-    if ((num >=0) && (num < action_count)) {
-        return (action_list[num]->ran_time) ;
-    } else {
-        message_publish(MSG_WARNING, "Event action ran time not returned. Action number %d is invalid.\n", num) ;
-    }
-    return(0.0) ;
-}
-
-int Trick::IPPythonEvent::process( long long curr_time ) {
-
-    if ( active || manual_fired ) {
-            /** @li If it's a user's input event, process it by calling Trick::IPPython::process_triggers. */
-            if ( is_user_event ) {
-                // it's an input file event
-                process_user_event(curr_time) ;
-            /** @li Otherwise if it's a trick event (like a read), process it. */
-            } else {
-                // it's a read event
-                active = false ;
-                int ret = ip->parse(action_list[0]->str) ;
-                if (ret != 0 && terminate_sim_on_event_python_error) {
-                    exec_terminate_with_return( ret , __FILE__ , __LINE__ , "Python error in event processing" ) ;
-                }
-                // keep stats so mtv will show when it ran
-                fired_count++ ;
-                fired_time = curr_time ;
-                ran = true ;
-                ran_count++ ;
-                ran_time = curr_time ;
-                action_list[0]->ran = true ;
-                action_list[0]->ran_count++ ;
-                action_list[0]->ran_time = curr_time ;
-            }
-    }
-    return 0 ;
-}
-
-bool Trick::IPPythonEvent::process_user_event( long long curr_time ) {
-
-    int ii ;
-    int return_val ;
-    bool it_fired, it_ran;
-
-    fired = false ;
-    ran = false ;
-    /** @li No need to evaluate any conditions if in manual mode. */
-    if (! manual) {
-        hold = false ;
-        /** @li Loop thru all conditions. */
-        for (ii=0; ii<condition_count; ii++) {
-            /** @li Skip condition if it's been disabled. */
-            if (! condition_list[ii]->enabled ) {
-                condition_list[ii]->fired = false ;
-                continue ;
-            }
-            /** @li No need to evaluate condition if previously fired and hold is on. */
-            if (condition_list[ii]->hold && condition_list[ii]->fired) {
-                ;
-            } else {
-                /** @li Evaluate the condition and set its fired state. */
-                condition_list[ii]->fired = false ;
-                return_val = 0 ;
-                if (condition_list[ii]->ref != NULL) {
-                // if it's a variable, get it as a boolean
-                    if ( condition_list[ii]->ref->pointer_present ) {
-                        condition_list[ii]->ref->address = follow_address_path(condition_list[ii]->ref) ;
-                    }
-                    if ( condition_list[ii]->ref->address != NULL ) {
-                        return_val = *(bool *)condition_list[ii]->ref->address ;
-                    }
-                } else if (condition_list[ii]->job != NULL) {
-                // if it's a job, get its return value
-                    bool save_disabled_state = condition_list[ii]->job->disabled;
-                    condition_list[ii]->job->disabled = false;
-                    return_val = condition_list[ii]->job->call();
-                    condition_list[ii]->job->disabled = save_disabled_state;
-                } else {
-                // otherwise use python to evaluate string
-                    std::string full_in_string ;
-                    int python_ret = ip->parse_condition(condition_list[ii]->str, return_val) ;
-                    if (python_ret != 0 && terminate_sim_on_event_python_error) {
-                        exec_terminate_with_return( python_ret , __FILE__ , __LINE__ , "Python error in event condition processing" ) ;
-                    }
-                }
-                if (return_val) {
-                //TODO: write to log/send_hs that trigger fired
-                    condition_list[ii]->fired = true ;
-                    condition_list[ii]->fired_count++ ;
-                    condition_list[ii]->fired_time = curr_time ;
-                }
-            } // end evaluate condition
-            /** @li If cond_all is true, only set event fired/hold after all enabled conditions evaluated. */
-            if (ii==0) {
-                fired = condition_list[ii]->fired ;
-                hold  = condition_list[ii]->hold ;
-            }  else {
-                if (cond_all) {
-                    fired &= condition_list[ii]->fired ;
-                    hold  &= condition_list[ii]->hold ;
-                } else {
-                    fired |= condition_list[ii]->fired ;
-                    hold  |= condition_list[ii]->hold ;
-                }
-            }
-        } //end condition loop
-    }
-    it_fired = manual_fired || fired ;
-    /** @li Set the event's fired state...cond_all: if all conditions fired , otherwise if any condition fired. */
-    if (it_fired) {
-        fired_count++ ;
-        fired_time = curr_time ;
-        if (info_msg) {
-            message_publish( MSG_INFO , "%12.6f Event %s fired.\n" , exec_get_sim_time() , name.c_str()) ;
-        }
-        if (!manual_fired) {
-            active = false ;
-        }
-    }
-
-    /** @li If the user specified any actions, run them here if a condition fired or manually fired. */
-    it_ran = false ;
-    if (it_fired && (action_count > 0)) {
-        /** @li Loop thru all actions. */
-        for (ii=0; ii<action_count; ii++) {
-            /** @li No need to run action if it's been disabled. */
-            if (! action_list[ii]->enabled ) {
-                action_list[ii]->ran = false ;
-                continue ;
-            }
-            /** @li Run the action and set its ran state. */
-            if (action_list[ii]->job != NULL) {
-            // if it's a job, do what the action type tells you
-                switch (action_list[ii]->act_type) {
-                    case 0 : // python, should not get here
-                        break;
-                    case 1 : // On
-                        action_list[ii]->job->disabled = false;
-                        break;
-                    case 2 : // Off
-                        action_list[ii]->job->disabled = true;
-                        break;
-                    case 3 : // Call
-                        bool save_disabled_state = action_list[ii]->job->disabled;
-                        action_list[ii]->job->disabled = false;
-                        action_list[ii]->job->call();
-                        action_list[ii]->job->disabled = save_disabled_state;
-                        break;
-                }
-            } else {
-                // otherwise use python to evaluate string
-                int ret = ip->parse(action_list[ii]->str) ;
-                if (ret != 0 && terminate_sim_on_event_python_error) {
-                    exec_terminate_with_return( ret , __FILE__ , __LINE__ , "Python error in event action processing" ) ;
-                }
-            }
-            it_ran = true ;
-            action_list[ii]->ran = true ;
-            action_list[ii]->ran_count++ ;
-            action_list[ii]->ran_time = curr_time ;
-            ran = true ;
-        }
-        /** @li Leave event fired state on if hold is on. */
-        manual_fired &= hold ;
-        fired &= hold ;
-    }
-    /** @li Set the event's ran state if any actions were run. */
-    if (it_ran) {
-        ran_count++ ;
-        ran_time = curr_time ;
-    }
-
-    /** @li Return true if the event fired. */
-    return(it_fired) ;
+				}	else	{
+								/**	@li	Emit	an	error	if	specified	index	num	is	not	sequential.	*/
+								message_publish(MSG_WARNING,	"Event	action	not	added:	action	number	%d	is	not	sequential.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	enable	an	existing	action	(default	is	enabled)	so	that	it	is	run	when	fired	during	event	processing.
+int	Trick::IPPythonEvent::action_enable(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								action_list[num]->enabled	=	true	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	action	not	enabled.	Action	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Command	to	disable	an	existing	action	so	that	it	is	not	run	when	fired	during	event	processing.
+int	Trick::IPPythonEvent::action_disable(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								action_list[num]->enabled	=	false	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	action	not	disabled.	Action	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0);
+}
+
+//Accessor	function	to	test	if	the	action,	indicated	by	num,	ran.
+bool	Trick::IPPythonEvent::action_ran(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								return	(action_list[num]->ran	?	true	:	false)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	action	ran	state	not	returned.	Action	number	%d	is	invalid.\n",	num)	;
+				}
+				return(false);
+}
+
+//Accessor	function	to	see	how	many	times	the	action,	indicated	by	num,	ran.
+int	Trick::IPPythonEvent::action_ran_count(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								return	(action_list[num]->ran_count)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	action	ran	count	not	returned.	Action	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0)	;
+}
+
+//Accessor	function	to	see	when	was	the	last	time	the	action,	indicated	by	num,	ran.
+double	Trick::IPPythonEvent::action_ran_time(int	num)	{
+
+				if	((num	>=0)	&&	(num	<	action_count))	{
+								return	(action_list[num]->ran_time)	;
+				}	else	{
+								message_publish(MSG_WARNING,	"Event	action	ran	time	not	returned.	Action	number	%d	is	invalid.\n",	num)	;
+				}
+				return(0.0)	;
+}
+
+int	Trick::IPPythonEvent::process(	long	long	curr_time	)	{
+
+				if	(	active	||	manual_fired	)	{
+												/**	@li	If	it's	a	user's	input	event,	process	it	by	calling	Trick::IPPython::process_triggers.	*/
+												if	(	is_user_event	)	{
+																//	it's	an	input	file	event
+																process_user_event(curr_time)	;
+												/**	@li	Otherwise	if	it's	a	trick	event	(like	a	read),	process	it.	*/
+												}	else	{
+																//	it's	a	read	event
+																active	=	false	;
+																int	ret	=	ip->parse(action_list[0]->str)	;
+																if	(ret	!=	0	&&	terminate_sim_on_event_python_error)	{
+																				exec_terminate_with_return(	ret	,	__FILE__	,	__LINE__	,	"Python	error	in	event	processing"	)	;
+																}
+																//	keep	stats	so	mtv	will	show	when	it	ran
+																fired_count++	;
+																fired_time	=	curr_time	;
+																ran	=	true	;
+																ran_count++	;
+																ran_time	=	curr_time	;
+																action_list[0]->ran	=	true	;
+																action_list[0]->ran_count++	;
+																action_list[0]->ran_time	=	curr_time	;
+												}
+				}
+				return	0	;
+}
+
+bool	Trick::IPPythonEvent::process_user_event(	long	long	curr_time	)	{
+
+				int	ii	;
+				int	return_val	;
+				bool	it_fired,	it_ran;
+
+				fired	=	false	;
+				ran	=	false	;
+				/**	@li	No	need	to	evaluate	any	conditions	if	in	manual	mode.	*/
+				if	(!	manual)	{
+								hold	=	false	;
+								/**	@li	Loop	thru	all	conditions.	*/
+								for	(ii=0;	ii<condition_count;	ii++)	{
+												/**	@li	Skip	condition	if	it's	been	disabled.	*/
+												if	(!	condition_list[ii]->enabled	)	{
+																condition_list[ii]->fired	=	false	;
+																continue	;
+												}
+												/**	@li	No	need	to	evaluate	condition	if	previously	fired	and	hold	is	on.	*/
+												if	(condition_list[ii]->hold	&&	condition_list[ii]->fired)	{
+																;
+												}	else	{
+																/**	@li	Evaluate	the	condition	and	set	its	fired	state.	*/
+																condition_list[ii]->fired	=	false	;
+																return_val	=	0	;
+																if	(condition_list[ii]->ref	!=	NULL)	{
+																//	if	it's	a	variable,	get	it	as	a	boolean
+																				if	(	condition_list[ii]->ref->pointer_present	)	{
+																								condition_list[ii]->ref->address	=	follow_address_path(condition_list[ii]->ref)	;
+																				}
+																				if	(	condition_list[ii]->ref->address	!=	NULL	)	{
+																								return_val	=	*(bool	*)condition_list[ii]->ref->address	;
+																				}
+																}	else	if	(condition_list[ii]->job	!=	NULL)	{
+																//	if	it's	a	job,	get	its	return	value
+																				bool	save_disabled_state	=	condition_list[ii]->job->disabled;
+																				condition_list[ii]->job->disabled	=	false;
+																				return_val	=	condition_list[ii]->job->call();
+																				condition_list[ii]->job->disabled	=	save_disabled_state;
+																}	else	{
+																//	otherwise	use	python	to	evaluate	string
+																				std::string	full_in_string	;
+																				int	python_ret	=	ip->parse_condition(condition_list[ii]->str,	return_val)	;
+																				if	(python_ret	!=	0	&&	terminate_sim_on_event_python_error)	{
+																								exec_terminate_with_return(	python_ret	,	__FILE__	,	__LINE__	,	"Python	error	in	event	condition	processing"	)	;
+																				}
+																}
+																if	(return_val)	{
+																//TODO:	write	to	log/send_hs	that	trigger	fired
+																				condition_list[ii]->fired	=	true	;
+																				condition_list[ii]->fired_count++	;
+																				condition_list[ii]->fired_time	=	curr_time	;
+																}
+												}	//	end	evaluate	condition
+												/**	@li	If	cond_all	is	true,	only	set	event	fired/hold	after	all	enabled	conditions	evaluated.	*/
+												if	(ii==0)	{
+																fired	=	condition_list[ii]->fired	;
+																hold		=	condition_list[ii]->hold	;
+												}		else	{
+																if	(cond_all)	{
+																				fired	&=	condition_list[ii]->fired	;
+																				hold		&=	condition_list[ii]->hold	;
+																}	else	{
+																				fired	|=	condition_list[ii]->fired	;
+																				hold		|=	condition_list[ii]->hold	;
+																}
+												}
+								}	//end	condition	loop
+				}
+				it_fired	=	manual_fired	||	fired	;
+				/**	@li	Set	the	event's	fired	state...cond_all:	if	all	conditions	fired	,	otherwise	if	any	condition	fired.	*/
+				if	(it_fired)	{
+								fired_count++	;
+								fired_time	=	curr_time	;
+								if	(info_msg)	{
+												message_publish(	MSG_INFO	,	"%12.6f	Event	%s	fired.\n"	,	exec_get_sim_time()	,	name.c_str())	;
+								}
+								if	(!manual_fired)	{
+												active	=	false	;
+								}
+				}
+
+				/**	@li	If	the	user	specified	any	actions,	run	them	here	if	a	condition	fired	or	manually	fired.	*/
+				it_ran	=	false	;
+				if	(it_fired	&&	(action_count	>	0))	{
+								/**	@li	Loop	thru	all	actions.	*/
+								for	(ii=0;	ii<action_count;	ii++)	{
+												/**	@li	No	need	to	run	action	if	it's	been	disabled.	*/
+												if	(!	action_list[ii]->enabled	)	{
+																action_list[ii]->ran	=	false	;
+																continue	;
+												}
+												/**	@li	Run	the	action	and	set	its	ran	state.	*/
+												if	(action_list[ii]->job	!=	NULL)	{
+												//	if	it's	a	job,	do	what	the	action	type	tells	you
+																switch	(action_list[ii]->act_type)	{
+																				case	0	:	//	python,	should	not	get	here
+																								break;
+																				case	1	:	//	On
+																								action_list[ii]->job->disabled	=	false;
+																								break;
+																				case	2	:	//	Off
+																								action_list[ii]->job->disabled	=	true;
+																								break;
+																				case	3	:	//	Call
+																								bool	save_disabled_state	=	action_list[ii]->job->disabled;
+																								action_list[ii]->job->disabled	=	false;
+																								action_list[ii]->job->call();
+																								action_list[ii]->job->disabled	=	save_disabled_state;
+																								break;
+																}
+												}	else	{
+																//	otherwise	use	python	to	evaluate	string
+																int	ret	=	ip->parse(action_list[ii]->str)	;
+																if	(ret	!=	0	&&	terminate_sim_on_event_python_error)	{
+																				exec_terminate_with_return(	ret	,	__FILE__	,	__LINE__	,	"Python	error	in	event	action	processing"	)	;
+																}
+												}
+												it_ran	=	true	;
+												action_list[ii]->ran	=	true	;
+												action_list[ii]->ran_count++	;
+												action_list[ii]->ran_time	=	curr_time	;
+												ran	=	true	;
+								}
+								/**	@li	Leave	event	fired	state	on	if	hold	is	on.	*/
+								manual_fired	&=	hold	;
+								fired	&=	hold	;
+				}
+				/**	@li	Set	the	event's	ran	state	if	any	actions	were	run.	*/
+				if	(it_ran)	{
+								ran_count++	;
+								ran_time	=	curr_time	;
+				}
+
+				/**	@li	Return	true	if	the	event	fired.	*/
+				return(it_fired)	;
 }
 
diff --git a/trick_source/sim_services/InputProcessor/InputProcessor.cpp b/trick_source/sim_services/InputProcessor/InputProcessor.cpp
index f4d1b60e7..1bb1dca34 100644
--- a/trick_source/sim_services/InputProcessor/InputProcessor.cpp
+++ b/trick_source/sim_services/InputProcessor/InputProcessor.cpp
@@ -1,58 +1,58 @@
 /*
-   PURPOSE: ( Handle the simulation command line args )
+			PURPOSE:	(	Handle	the	simulation	command	line	args	)
 
-   REFERENCE: ( Trick Simulation Environment )
+			REFERENCE:	(	Trick	Simulation	Environment	)
 
-   ASSUMPTIONS AND LIMITATIONS: ( None )
+			ASSUMPTIONS	AND	LIMITATIONS:	(	None	)
 
-   CLASS: ( N/A )
+			CLASS:	(	N/A	)
 
-   LIBRARY DEPENDENCY: ( None )
+			LIBRARY	DEPENDENCY:	(	None	)
 
-   PROGRAMMERS: ( Keith Vetter LinCom 6/2003 ) */
+			PROGRAMMERS:	(	Keith	Vetter	LinCom	6/2003	)	*/
 
-#include <iostream>
-#include <string.h>
+#include	<iostream>
+#include	<string.h>
 
-#include "trick/InputProcessor.hh"
-#include "trick/command_line_protos.h"
+#include	"trick/InputProcessor.hh"
+#include	"trick/command_line_protos.h"
 
-Trick::InputProcessor * the_ip ;
+Trick::InputProcessor	*	the_ip	;
 
-Trick::InputProcessor::InputProcessor() {
+Trick::InputProcessor::InputProcessor()	{
 
-    the_ip = this ;
+				the_ip	=	this	;
 
 }
 
-int Trick::InputProcessor::process_sim_args() {
+int	Trick::InputProcessor::process_sim_args()	{
 
-    int i ;
-    int argc ;
-    char ** argv ;
+				int	i	;
+				int	argc	;
+				char	**	argv	;
 
-    argc = command_line_args_get_argc() ;
-    argv = command_line_args_get_argv() ;
-    input_file = command_line_args_get_input_file() ;
+				argc	=	command_line_args_get_argc()	;
+				argv	=	command_line_args_get_argv()	;
+				input_file	=	command_line_args_get_input_file()	;
 
-    /* Process all other calling arguments */
-    for (i = 1; i < argc; i++) {
+				/*	Process	all	other	calling	arguments	*/
+				for	(i	=	1;	i	<	argc;	i++)	{
 
-        /*
-         * If there are more than 2 calling arguments
-         */
+								/*
+									*	If	there	are	more	than	2	calling	arguments
+									*/
 
-        if (!strcmp("-d", argv[i])) {
-            /* Set the 'input verification only' and echo input flags */
-            verify_input = 1 ;
-        }
-    }
+								if	(!strcmp("-d",	argv[i]))	{
+												/*	Set	the	'input	verification	only'	and	echo	input	flags	*/
+												verify_input	=	1	;
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::InputProcessor::shutdown() {
-    return(0) ;
+int	Trick::InputProcessor::shutdown()	{
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/InputProcessor/MTV.cpp b/trick_source/sim_services/InputProcessor/MTV.cpp
index 414b0f328..a9a40e1de 100644
--- a/trick_source/sim_services/InputProcessor/MTV.cpp
+++ b/trick_source/sim_services/InputProcessor/MTV.cpp
@@ -1,134 +1,134 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/MTV.hh"
-#include "trick/VariableServer.hh"
-#include "trick/EventManager_c_intf.hh"
+#include	"trick/MTV.hh"
+#include	"trick/VariableServer.hh"
+#include	"trick/EventManager_c_intf.hh"
 
-Trick::MTV * the_mtv ;
+Trick::MTV	*	the_mtv	;
 
-Trick::MTV::MTV() :
-mtv_list(NULL), mtv_count(0) {
-    the_mtv = this ;
+Trick::MTV::MTV()	:
+mtv_list(NULL),	mtv_count(0)	{
+				the_mtv	=	this	;
 }
 
 /**
 @details
-Adds an event to mtv list.
+Adds	an	event	to	mtv	list.
 
--# Check to see if the event is already in the mtv list, return if it is.
--# Increment the number of events in the mtv list.
--# Reallocate the mtv_list to accomodate the new event.
--# Assign the last element of mtv_list to the incoming event.
--# Increment the update ticker so mtv knows something changed.
+-#	Check	to	see	if	the	event	is	already	in	the	mtv	list,	return	if	it	is.
+-#	Increment	the	number	of	events	in	the	mtv	list.
+-#	Reallocate	the	mtv_list	to	accomodate	the	new	event.
+-#	Assign	the	last	element	of	mtv_list	to	the	incoming	event.
+-#	Increment	the	update	ticker	so	mtv	knows	something	changed.
 */
-int Trick::MTV::add_event( Trick::IPPythonEvent * in_event ) {
-    for ( unsigned int ii = 0 ; ii < mtv_count ; ii++ ) {
-        if (in_event == mtv_list[ii]) {
-            return (0) ;
-        }
-    }
-    mtv_count++;
-    if (mtv_count == 1) {
-        mtv_list = (Trick::IPPythonEvent **)TMM_declare_var_s("Trick::IPPythonEvent* mtv_list[1]");
-    } else {
-        mtv_list = (Trick::IPPythonEvent **)TMM_resize_array_1d_a(mtv_list, mtv_count);
-    }
-    mtv_list[mtv_count-1] = in_event ;
-    mtv_update_ticker++;
-
-    return 0 ;
+int	Trick::MTV::add_event(	Trick::IPPythonEvent	*	in_event	)	{
+				for	(	unsigned	int	ii	=	0	;	ii	<	mtv_count	;	ii++	)	{
+								if	(in_event	==	mtv_list[ii])	{
+												return	(0)	;
+								}
+				}
+				mtv_count++;
+				if	(mtv_count	==	1)	{
+								mtv_list	=	(Trick::IPPythonEvent	**)TMM_declare_var_s("Trick::IPPythonEvent*	mtv_list[1]");
+				}	else	{
+								mtv_list	=	(Trick::IPPythonEvent	**)TMM_resize_array_1d_a(mtv_list,	mtv_count);
+				}
+				mtv_list[mtv_count-1]	=	in_event	;
+				mtv_update_ticker++;
+
+				return	0	;
 }
 
 /**
 @details
-Delete an event from mtv list.
+Delete	an	event	from	mtv	list.
 
--# If the event is in the mtv list
- -# Set the event to a dummy event.
- -# Increment the update ticker so mtv knows something changed.
+-#	If	the	event	is	in	the	mtv	list
+	-#	Set	the	event	to	a	dummy	event.
+	-#	Increment	the	update	ticker	so	mtv	knows	something	changed.
 */
-int Trick::MTV::delete_event( Trick::IPPythonEvent * in_event ) {
-    unsigned int ii ;
-    /* Remove it from mtv's event list. */
-    for ( ii = 0 ; ii < mtv_count ; ii++ ) {
-        if (in_event == mtv_list[ii]) {
-            mtv_list[ii] = &dummy_event;
-            mtv_update_ticker++;
-            break ;
-        }
-    }
-    return 0 ;
+int	Trick::MTV::delete_event(	Trick::IPPythonEvent	*	in_event	)	{
+				unsigned	int	ii	;
+				/*	Remove	it	from	mtv's	event	list.	*/
+				for	(	ii	=	0	;	ii	<	mtv_count	;	ii++	)	{
+								if	(in_event	==	mtv_list[ii])	{
+												mtv_list[ii]	=	&dummy_event;
+												mtv_update_ticker++;
+												break	;
+								}
+				}
+				return	0	;
 }
 
 /**
 @details
-Find an event in the mtv list.
+Find	an	event	in	the	mtv	list.
 
--# If the event is in the mtv list return it
+-#	If	the	event	is	in	the	mtv	list	return	it
 */
-Trick::IPPythonEvent * Trick::MTV::get_event(std::string event_name) {
-    unsigned int ii ;
-    Trick::IPPythonEvent* ret = NULL;
+Trick::IPPythonEvent	*	Trick::MTV::get_event(std::string	event_name)	{
+				unsigned	int	ii	;
+				Trick::IPPythonEvent*	ret	=	NULL;
 
-    for ( ii = 0 ; ii < mtv_count ; ii++ ) {
-        if ( ! mtv_list[ii]->get_name().compare(event_name) ) {
-            ret = mtv_list[ii];
-            break ;
-        }
-    }
+				for	(	ii	=	0	;	ii	<	mtv_count	;	ii++	)	{
+								if	(	!	mtv_list[ii]->get_name().compare(event_name)	)	{
+												ret	=	mtv_list[ii];
+												break	;
+								}
+				}
 
-    return(ret) ;
+				return(ret)	;
 
 }
 
 /**
 @details
-Send mtv event data through the variable server.
+Send	mtv	event	data	through	the	variable	server.
 
--# For each event in the mtv_list
- -# call var_add() for all the event information
--# Send the size of list of variables we've added
--# Send the data
--# Clear the var_add list.
+-#	For	each	event	in	the	mtv_list
+	-#	call	var_add()	for	all	the	event	information
+-#	Send	the	size	of	list	of	variables	we've	added
+-#	Send	the	data
+-#	Clear	the	var_add	list.
 */
-int Trick::MTV::send_event_data() {
-
-    char varname[80];
-    const char *mtv_name = "trick_ip.mtv.mtv_list";
-    unsigned int ii ;
-    int jj;
-
-    for (ii=0; ii < mtv_count; ii++) {
-        snprintf(varname, sizeof(varname), "%s[%u][0].name", mtv_name,ii);
-        var_add(varname);
-        snprintf(varname, sizeof(varname), "%s[%u][0].active", mtv_name,ii);
-        var_add(varname);
-        snprintf(varname, sizeof(varname), "%s[%u][0].added", mtv_name,ii);
-        var_add(varname);
-        snprintf(varname, sizeof(varname), "%s[%u][0].condition_count", mtv_name,ii);
-        var_add(varname);
-        snprintf(varname, sizeof(varname), "%s[%u][0].action_count", mtv_name,ii);
-        var_add(varname);
-        snprintf(varname, sizeof(varname), "%s[%u][0].before_after", mtv_name,ii);
-        var_add(varname);
-        for (jj=0; jj< mtv_list[ii]->condition_count; jj++) {
-            snprintf(varname, sizeof(varname), "%s[%u][0].cond[%d].comment", mtv_name,ii,jj);
-            var_add(varname);
-        }
-        for (jj=0; jj< mtv_list[ii]->action_count; jj++) {
-            snprintf(varname, sizeof(varname), "%s[%u][0].act[%d].comment", mtv_name,ii,jj);
-            var_add(varname);
-        }
-        if (mtv_list[ii]->get_before_after() > 0) {
-            snprintf(varname, sizeof(varname), "%s[%u][0].target_name", mtv_name,ii);
-            var_add(varname);
-        }
-    }
-    var_send_list_size() ;
-    var_send() ;
-    var_clear() ;
-
-    return 0 ;
+int	Trick::MTV::send_event_data()	{
+
+				char	varname[80];
+				const	char	*mtv_name	=	"trick_ip.mtv.mtv_list";
+				unsigned	int	ii	;
+				int	jj;
+
+				for	(ii=0;	ii	<	mtv_count;	ii++)	{
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].name",	mtv_name,ii);
+								var_add(varname);
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].active",	mtv_name,ii);
+								var_add(varname);
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].added",	mtv_name,ii);
+								var_add(varname);
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].condition_count",	mtv_name,ii);
+								var_add(varname);
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].action_count",	mtv_name,ii);
+								var_add(varname);
+								snprintf(varname,	sizeof(varname),	"%s[%u][0].before_after",	mtv_name,ii);
+								var_add(varname);
+								for	(jj=0;	jj<	mtv_list[ii]->condition_count;	jj++)	{
+												snprintf(varname,	sizeof(varname),	"%s[%u][0].cond[%d].comment",	mtv_name,ii,jj);
+												var_add(varname);
+								}
+								for	(jj=0;	jj<	mtv_list[ii]->action_count;	jj++)	{
+												snprintf(varname,	sizeof(varname),	"%s[%u][0].act[%d].comment",	mtv_name,ii,jj);
+												var_add(varname);
+								}
+								if	(mtv_list[ii]->get_before_after()	>	0)	{
+												snprintf(varname,	sizeof(varname),	"%s[%u][0].target_name",	mtv_name,ii);
+												var_add(varname);
+								}
+				}
+				var_send_list_size()	;
+				var_send()	;
+				var_clear()	;
+
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp b/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp
index c785a6a35..bca8303f5 100644
--- a/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp
+++ b/trick_source/sim_services/InputProcessor/MTV_c_intf.cpp
@@ -1,49 +1,49 @@
 
-#include "trick/MTV.hh"
+#include	"trick/MTV.hh"
 
-extern Trick::MTV * the_mtv ;
+extern	Trick::MTV	*	the_mtv	;
 
 /**
 @details
--# Add an event to the mtv list
+-#	Add	an	event	to	the	mtv	list
 */
-int mtv_add_event(Trick::IPPythonEvent * in_event) {
-    if ( the_mtv != NULL ) {
-        the_mtv->add_event(in_event) ;
-    }
-    return 0 ;
+int	mtv_add_event(Trick::IPPythonEvent	*	in_event)	{
+				if	(	the_mtv	!=	NULL	)	{
+								the_mtv->add_event(in_event)	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# Delete an event from the mtv list
+-#	Delete	an	event	from	the	mtv	list
 */
-int mtv_delete_event(Trick::IPPythonEvent * in_event) {
-    if ( the_mtv != NULL ) {
-        the_mtv->delete_event(in_event) ;
-    }
-    return 0 ;
+int	mtv_delete_event(Trick::IPPythonEvent	*	in_event)	{
+				if	(	the_mtv	!=	NULL	)	{
+								the_mtv->delete_event(in_event)	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# Get an event by name from the mtv list
+-#	Get	an	event	by	name	from	the	mtv	list
 */
-Trick::IPPythonEvent * mtv_get_event(std::string event_name) {
-    if ( the_mtv != NULL ) {
-        return the_mtv->get_event(event_name) ;
-    }
-    return NULL ;
+Trick::IPPythonEvent	*	mtv_get_event(std::string	event_name)	{
+				if	(	the_mtv	!=	NULL	)	{
+								return	the_mtv->get_event(event_name)	;
+				}
+				return	NULL	;
 }
 
 /**
 @details
--# Sends the mtv list information through the variable server
+-#	Sends	the	mtv	list	information	through	the	variable	server
 */
-int mtv_send_event_data() {
-    if ( the_mtv != NULL ) {
-        the_mtv->send_event_data() ;
-    }
-    return 0 ;
+int	mtv_send_event_data()	{
+				if	(	the_mtv	!=	NULL	)	{
+								the_mtv->send_event_data()	;
+				}
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/InputProcessor/input_processor_ext.cpp b/trick_source/sim_services/InputProcessor/input_processor_ext.cpp
index 9a7b38f51..b3981dbce 100644
--- a/trick_source/sim_services/InputProcessor/input_processor_ext.cpp
+++ b/trick_source/sim_services/InputProcessor/input_processor_ext.cpp
@@ -1,178 +1,178 @@
 
-#include <iostream>
-#include <sstream>
-#include <cmath>
-
-#include "trick/input_processor_proto.h"
-#include "trick/IPPython.hh"
-#include "trick/IPPythonEvent.hh"
-#include "trick/MTV.hh"
-#include "trick/EventManager_c_intf.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.h"
-
-extern Trick::InputProcessor * the_ip ;
-
-extern "C" int ip_parse(const char * in_string) {
-    return the_ip->parse(in_string) ;
+#include	<iostream>
+#include	<sstream>
+#include	<cmath>
+
+#include	"trick/input_processor_proto.h"
+#include	"trick/IPPython.hh"
+#include	"trick/IPPythonEvent.hh"
+#include	"trick/MTV.hh"
+#include	"trick/EventManager_c_intf.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.h"
+
+extern	Trick::InputProcessor	*	the_ip	;
+
+extern	"C"	int	ip_parse(const	char	*	in_string)	{
+				return	the_ip->parse(in_string)	;
 }
 
 /**
 @details
-Command to create new user event, the given name will be used for display in mtv.
-This command is tied to "trick.new_event(event_name)" in the input processor.
+Command	to	create	new	user	event,	the	given	name	will	be	used	for	display	in	mtv.
+This	command	is	tied	to	"trick.new_event(event_name)"	in	the	input	processor.
 
--# Allocate space for the event.
+-#	Allocate	space	for	the	event.
 */
-Trick::IPPythonEvent * ippython_new_event(std::string event_name) {
-    std::ostringstream oss ;
-    // Allocate space for the event.
-    oss << "Trick::IPPythonEvent " << event_name << "[1]" ;
-    Trick::IPPythonEvent * event = (Trick::IPPythonEvent*) TMM_declare_var_s(oss.str().c_str());
-    if (event != NULL) {
-        event->set_name(event_name) ;
-    }
-
-    return (event);
+Trick::IPPythonEvent	*	ippython_new_event(std::string	event_name)	{
+				std::ostringstream	oss	;
+				//	Allocate	space	for	the	event.
+				oss	<<	"Trick::IPPythonEvent	"	<<	event_name	<<	"[1]"	;
+				Trick::IPPythonEvent	*	event	=	(Trick::IPPythonEvent*)	TMM_declare_var_s(oss.str().c_str());
+				if	(event	!=	NULL)	{
+								event->set_name(event_name)	;
+				}
+
+				return	(event);
 }
 
 /**
 @details
-Command to add an event to be processed by an event processor.
+Command	to	add	an	event	to	be	processed	by	an	event	processor.
 
--# Add the event to the event manager.
--# Add the event to the mtv list.
+-#	Add	the	event	to	the	event	manager.
+-#	Add	the	event	to	the	mtv	list.
 */
-int ippython_add_event( Trick::IPPythonEvent * in_event ) {
-    event_manager_add_event(in_event) ;
-    mtv_add_event(in_event) ;
-    return 0 ;
+int	ippython_add_event(	Trick::IPPythonEvent	*	in_event	)	{
+				event_manager_add_event(in_event)	;
+				mtv_add_event(in_event)	;
+				return	0	;
 }
 
 /**
 @details
-Command to add an event to be processed immediately before a target job.
+Command	to	add	an	event	to	be	processed	immediately	before	a	target	job.
 
--# Add the event to the event manager.
--# Add the event to the mtv list.
+-#	Add	the	event	to	the	event	manager.
+-#	Add	the	event	to	the	mtv	list.
 */
-int ippython_add_event_before( Trick::IPPythonEvent * in_event, std::string target_name, unsigned int target_inst ) {
-    event_manager_add_event_before(in_event, target_name, target_inst) ;
-    mtv_add_event(in_event) ;
-    return 0 ;
+int	ippython_add_event_before(	Trick::IPPythonEvent	*	in_event,	std::string	target_name,	unsigned	int	target_inst	)	{
+				event_manager_add_event_before(in_event,	target_name,	target_inst)	;
+				mtv_add_event(in_event)	;
+				return	0	;
 }
 
 /**
 @details
-Command to add an event to be processed immediately after a target job.
+Command	to	add	an	event	to	be	processed	immediately	after	a	target	job.
 
--# Add the event to the event manager.
--# Add the event to the mtv list.
+-#	Add	the	event	to	the	event	manager.
+-#	Add	the	event	to	the	mtv	list.
 */
-int ippython_add_event_after( Trick::IPPythonEvent * in_event, std::string target_name, unsigned int target_inst ) {
-    event_manager_add_event_after(in_event, target_name, target_inst) ;
-    mtv_add_event(in_event) ;
-    return 0 ;
+int	ippython_add_event_after(	Trick::IPPythonEvent	*	in_event,	std::string	target_name,	unsigned	int	target_inst	)	{
+				event_manager_add_event_after(in_event,	target_name,	target_inst)	;
+				mtv_add_event(in_event)	;
+				return	0	;
 }
 
 /**
 @details
-Command to create a new read event.
-This command is tied to "trick.add_read(thread_id, time, event_text)" in the input processor.
-
--# Allocate space for the event.
--# Set the event's action to the incoming event string.
--# Set the event as not a user event.
--# Set the event cycle to 0
--# Activate the event
--# Set the event thread to the incoming thread_id
--# Add the event to the event manager
+Command	to	create	a	new	read	event.
+This	command	is	tied	to	"trick.add_read(thread_id,	time,	event_text)"	in	the	input	processor.
+
+-#	Allocate	space	for	the	event.
+-#	Set	the	event's	action	to	the	incoming	event	string.
+-#	Set	the	event	as	not	a	user	event.
+-#	Set	the	event	cycle	to	0
+-#	Activate	the	event
+-#	Set	the	event	thread	to	the	incoming	thread_id
+-#	Add	the	event	to	the	event	manager
 */
-int ippython_add_read( unsigned int thread_id , double in_time , char * in_string ) {
+int	ippython_add_read(	unsigned	int	thread_id	,	double	in_time	,	char	*	in_string	)	{
 
-    Trick::IPPythonEvent * event = ippython_new_event();
+				Trick::IPPythonEvent	*	event	=	ippython_new_event();
 
-    event->action(0, in_string) ;
-    event->is_user_event = false ;
+				event->action(0,	in_string)	;
+				event->is_user_event	=	false	;
 
-    event->set_cycle(0) ;
-    event->activate() ;
-    event->set_thread(thread_id) ;
-    event->set_next_tics((long long)round(in_time * exec_get_time_tic_value())) ;
+				event->set_cycle(0)	;
+				event->activate()	;
+				event->set_thread(thread_id)	;
+				event->set_next_tics((long	long)round(in_time	*	exec_get_time_tic_value()))	;
 
-    event_manager_add_event(event) ;
-    return 0 ;
+				event_manager_add_event(event)	;
+				return	0	;
 }
 
 /**
 @details
-Command to create a new read event.  This variant is the backwards compatible 2 argument
-version where a thread_id is not specified.  All events of this type will be run
-on the main thread.
+Command	to	create	a	new	read	event.		This	variant	is	the	backwards	compatible	2	argument
+version	where	a	thread_id	is	not	specified.		All	events	of	this	type	will	be	run
+on	the	main	thread.
 
--# Call ippython_add_read with thread_id = 0.
+-#	Call	ippython_add_read	with	thread_id	=	0.
 */
-int ippython_add_read( double in_time , char * in_string ) {
-    return ippython_add_read( 0 , in_time , in_string ) ;
+int	ippython_add_read(	double	in_time	,	char	*	in_string	)	{
+				return	ippython_add_read(	0	,	in_time	,	in_string	)	;
 }
 
 /**
 @details
-Command to completely delete an event.
+Command	to	completely	delete	an	event.
 
--# Remove the event from the event manager.
--# Remove the event from the mtv list.
+-#	Remove	the	event	from	the	event	manager.
+-#	Remove	the	event	from	the	mtv	list.
 */
-int ippython_delete_event(Trick::IPPythonEvent * in_event) {
-    event_manager_remove_event(in_event) ;
-    mtv_delete_event(in_event) ;
-    return 0 ;
+int	ippython_delete_event(Trick::IPPythonEvent	*	in_event)	{
+				event_manager_remove_event(in_event)	;
+				mtv_delete_event(in_event)	;
+				return	0	;
 }
 
 /**
 @details
--# If the event exists, call manual_on for the event.
+-#	If	the	event	exists,	call	manual_on	for	the	event.
 */
-int ippython_manual_on(std::string event_name) {
-    Trick::IPPythonEvent * event = mtv_get_event(event_name) ;
-    if ( event != NULL ) {
-        event->manual_on() ;
-    }
-    return 0 ;
+int	ippython_manual_on(std::string	event_name)	{
+				Trick::IPPythonEvent	*	event	=	mtv_get_event(event_name)	;
+				if	(	event	!=	NULL	)	{
+								event->manual_on()	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# If the event exists, call manual_fire for the event.
+-#	If	the	event	exists,	call	manual_fire	for	the	event.
 */
-int ippython_manual_fire(std::string event_name) {
-    Trick::IPPythonEvent * event = mtv_get_event(event_name) ;
-    if ( event != NULL ) {
-        event->manual_fire() ;
-    }
-    return 0 ;
+int	ippython_manual_fire(std::string	event_name)	{
+				Trick::IPPythonEvent	*	event	=	mtv_get_event(event_name)	;
+				if	(	event	!=	NULL	)	{
+								event->manual_fire()	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# If the event exists, call manual_off for the event.
+-#	If	the	event	exists,	call	manual_off	for	the	event.
 */
-int ippython_manual_off(std::string event_name) {
-    Trick::IPPythonEvent * event = mtv_get_event(event_name) ;
-    if ( event != NULL ) {
-        event->manual_off() ;
-    }
-    return 0 ;
+int	ippython_manual_off(std::string	event_name)	{
+				Trick::IPPythonEvent	*	event	=	mtv_get_event(event_name)	;
+				if	(	event	!=	NULL	)	{
+								event->manual_off()	;
+				}
+				return	0	;
 }
 
 /**
 @details
--# If the event exists, call manual_done for the event.
+-#	If	the	event	exists,	call	manual_done	for	the	event.
 */
-int ippython_manual_done(std::string event_name) {
-    Trick::IPPythonEvent * event = mtv_get_event(event_name) ;
-    if ( event != NULL ) {
-        event->manual_done() ;
-    }
-    return 0 ;
+int	ippython_manual_done(std::string	event_name)	{
+				Trick::IPPythonEvent	*	event	=	mtv_get_event(event_name)	;
+				if	(	event	!=	NULL	)	{
+								event->manual_done()	;
+				}
+				return	0	;
 }
diff --git a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
index a3c5e80a9..900f10379 100644
--- a/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
+++ b/trick_source/sim_services/Integrator/src/IntegLoopManager.cpp
@@ -1,404 +1,404 @@
 /*******************************************************************************
 
 Purpose:
-  (Define the class IntegrationManager, which provides the ability to
-   move sim object from one integration loop scheduler to another.)
+		(Define	the	class	IntegrationManager,	which	provides	the	ability	to
+			move	sim	object	from	one	integration	loop	scheduler	to	another.)
 
 Programmers:
-  (((David Hammen) (Odyssey Space Research) (Oct 2011) (Initial version)))
-  (((Donna Panter) (L3)                     (2012)))
-  (((David Hammen) (Odyssey Space Research) (Nov 2013) (Reintegrate w/ JEOD)))
+		(((David	Hammen)	(Odyssey	Space	Research)	(Oct	2011)	(Initial	version)))
+		(((Donna	Panter)	(L3)																					(2012)))
+		(((David	Hammen)	(Odyssey	Space	Research)	(Nov	2013)	(Reintegrate	w/	JEOD)))
 
 *******************************************************************************/
 
 
-// Local includes
-#include "trick/IntegLoopManager.hh"
+//	Local	includes
+#include	"trick/IntegLoopManager.hh"
 
-#include "trick/Integrator.hh"
-#include "trick/IntegJobClassId.hh"
-#include "trick/IntegLoopScheduler.hh"
+#include	"trick/Integrator.hh"
+#include	"trick/IntegJobClassId.hh"
+#include	"trick/IntegLoopScheduler.hh"
 
-// Trick includes
-#include "trick/MemoryManager.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/exec_proto.hh"
-#include "trick/exec_proto.h"
+//	Trick	includes
+#include	"trick/MemoryManager.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/exec_proto.h"
 
-// System includes
-#include <cmath>
+//	System	includes
+#include	<cmath>
 
 
 /**
- IntegrationManager default constructor.
- */
+	IntegrationManager	default	constructor.
+	*/
 Trick::IntegrationManager::IntegrationManager()
 :
-    sim_objects_info()
+				sim_objects_info()
 {}
 
 /**
- Build representations of each sim object in a simulation.
- */
-void Trick::IntegrationManager::build_sim_object_info() {
-
-    typedef std::vector<Trick::SimObject*> SimObjectVector;
-    SimObjectVector sim_object_vector;
-
-    exec_get_sim_objects (sim_object_vector);
-
-    bool rebuild;
-
-    // Determine if sim_objects_info needs to be rebuilt.
-    // There should be a one-to-one relation between the just obtained vector
-    // and sim_objects_info.
-
-    // Simple case: Rebuild is needed if sizes are different.
-    if (sim_object_vector.size() != sim_objects_info.size()) {
-        rebuild = true;
-    }
-
-    // Sizes match:
-    // Check that every sim object is in sim_objects_info, in order.
-    else {
-        rebuild = false;
-        for (unsigned int ii = 0; ii < sim_object_vector.size(); ++ii) {
-            if (sim_object_vector[ii] != sim_objects_info[ii].sim_object) {
-                rebuild = true;
-                break;
-            }
-        }
-    }
-
-    // Nothing to do if a rebuild isn't needed.
-    // Note: This assumes that sim objects' jobs haven't changed.
-    if (! rebuild) {
-        return;
-    }
-
-    // Whatever is in sim_objects_info is out of date garbage. Trash it.
-    sim_objects_info.clear();
-
-    // Construct an entry for each sim object in the sim.
-    for (SimObjectVector::iterator iter = sim_object_vector.begin();
-         iter != sim_object_vector.end();
-         ++iter)
-    {
-        Trick::SimObject* sim_object = *iter;
-        create_sim_object_info (sim_object);
-    }
-
-    // Now that every sim object is represented, jobs that are relegated
-    // to some other sim object can be assigned to those other sim objects.
-    for (SimObjectIntegInfoVector::iterator obj_iter = sim_objects_info.begin();
-         obj_iter != sim_objects_info.end();
-         ++obj_iter)
-    {
-        SimObjectIntegInfo & sim_obj_info = *obj_iter;
-        transfer_relegated_jobs (sim_obj_info);
-    }
+	Build	representations	of	each	sim	object	in	a	simulation.
+	*/
+void	Trick::IntegrationManager::build_sim_object_info()	{
+
+				typedef	std::vector<Trick::SimObject*>	SimObjectVector;
+				SimObjectVector	sim_object_vector;
+
+				exec_get_sim_objects	(sim_object_vector);
+
+				bool	rebuild;
+
+				//	Determine	if	sim_objects_info	needs	to	be	rebuilt.
+				//	There	should	be	a	one-to-one	relation	between	the	just	obtained	vector
+				//	and	sim_objects_info.
+
+				//	Simple	case:	Rebuild	is	needed	if	sizes	are	different.
+				if	(sim_object_vector.size()	!=	sim_objects_info.size())	{
+								rebuild	=	true;
+				}
+
+				//	Sizes	match:
+				//	Check	that	every	sim	object	is	in	sim_objects_info,	in	order.
+				else	{
+								rebuild	=	false;
+								for	(unsigned	int	ii	=	0;	ii	<	sim_object_vector.size();	++ii)	{
+												if	(sim_object_vector[ii]	!=	sim_objects_info[ii].sim_object)	{
+																rebuild	=	true;
+																break;
+												}
+								}
+				}
+
+				//	Nothing	to	do	if	a	rebuild	isn't	needed.
+				//	Note:	This	assumes	that	sim	objects'	jobs	haven't	changed.
+				if	(!	rebuild)	{
+								return;
+				}
+
+				//	Whatever	is	in	sim_objects_info	is	out	of	date	garbage.	Trash	it.
+				sim_objects_info.clear();
+
+				//	Construct	an	entry	for	each	sim	object	in	the	sim.
+				for	(SimObjectVector::iterator	iter	=	sim_object_vector.begin();
+									iter	!=	sim_object_vector.end();
+									++iter)
+				{
+								Trick::SimObject*	sim_object	=	*iter;
+								create_sim_object_info	(sim_object);
+				}
+
+				//	Now	that	every	sim	object	is	represented,	jobs	that	are	relegated
+				//	to	some	other	sim	object	can	be	assigned	to	those	other	sim	objects.
+				for	(SimObjectIntegInfoVector::iterator	obj_iter	=	sim_objects_info.begin();
+									obj_iter	!=	sim_objects_info.end();
+									++obj_iter)
+				{
+								SimObjectIntegInfo	&	sim_obj_info	=	*obj_iter;
+								transfer_relegated_jobs	(sim_obj_info);
+				}
 }
 
 /**
- Create a SimObjectIntegInfo that represents the specified sim object,
- adding the representation to the set of such and populating the
- object with the jobs in the sim object that pertain to the integration.
- @param sim_object The sim object to be represented.
- */
-void Trick::IntegrationManager::create_sim_object_info (
-    Trick::SimObject * sim_object)
+	Create	a	SimObjectIntegInfo	that	represents	the	specified	sim	object,
+	adding	the	representation	to	the	set	of	such	and	populating	the
+	object	with	the	jobs	in	the	sim	object	that	pertain	to	the	integration.
+	@param	sim_object	The	sim	object	to	be	represented.
+	*/
+void	Trick::IntegrationManager::create_sim_object_info	(
+				Trick::SimObject	*	sim_object)
 {
-    sim_objects_info.push_back (SimObjectIntegInfo(sim_object));
-    SimObjectIntegInfo & sim_obj_info = sim_objects_info.back();
-
-    for (std::vector<Trick::JobData*>::iterator iter = sim_object->jobs.begin();
-         iter != sim_object->jobs.end();
-         ++iter)
-    {
-        Trick::JobData * job = *iter;
-        void * assign_to;
-        std::string * job_class_name;
-        SimObjectIntegInfo::JobClassMap::iterator class_iter;
-// The below code is commented out because it will not work with the new EchoJobs class
-// I will fix in the future.
-//      if (job->job_class == Trick::InstrumentationJobClassId) {
-//          Trick::InstrumentationJobData * instrument_job =
-//                    dynamic_cast<Trick::InstrumentationJobData*>(job);
-//          class_iter = sim_obj_info.job_class_to_info.find (
-//                             instrument_job->target_job->job_class_name);
-//          job_class_name = &instrument_job->target_job->job_class_name;
-//          assign_to = instrument_job->target_job->sup_class_data;
-//      } else {
-        class_iter = sim_obj_info.job_class_to_info.find(job->job_class_name);
-        job_class_name = &job->job_class_name;
-        assign_to = job->sup_class_data;
-//      }
-
-        if (class_iter != sim_obj_info.job_class_to_info.end()) {
-            JobClassJobs * job_info = class_iter->second;
-
-            // All integration jobs and non-integration jobs that have a null
-            // sup_class_data field "belong" directly to the sim object.
-            if ((assign_to == NULL) ||
-                (job_class_name->compare("integration") == 0)) {
-                job_info->owned_jobs.push_back (job);
-
-            // Add non-integration jobs with non-null sup_class_data field
-            // to the relegated_jobs so these jobs can later be assigned to
-            // the sim object represented by the sup_class_data field.
-            }
-            else {
-                job_info->relegated_jobs.push_back (job);
-            }
-        }
-    }
+				sim_objects_info.push_back	(SimObjectIntegInfo(sim_object));
+				SimObjectIntegInfo	&	sim_obj_info	=	sim_objects_info.back();
+
+				for	(std::vector<Trick::JobData*>::iterator	iter	=	sim_object->jobs.begin();
+									iter	!=	sim_object->jobs.end();
+									++iter)
+				{
+								Trick::JobData	*	job	=	*iter;
+								void	*	assign_to;
+								std::string	*	job_class_name;
+								SimObjectIntegInfo::JobClassMap::iterator	class_iter;
+//	The	below	code	is	commented	out	because	it	will	not	work	with	the	new	EchoJobs	class
+//	I	will	fix	in	the	future.
+//						if	(job->job_class	==	Trick::InstrumentationJobClassId)	{
+//										Trick::InstrumentationJobData	*	instrument_job	=
+//																				dynamic_cast<Trick::InstrumentationJobData*>(job);
+//										class_iter	=	sim_obj_info.job_class_to_info.find	(
+//																													instrument_job->target_job->job_class_name);
+//										job_class_name	=	&instrument_job->target_job->job_class_name;
+//										assign_to	=	instrument_job->target_job->sup_class_data;
+//						}	else	{
+								class_iter	=	sim_obj_info.job_class_to_info.find(job->job_class_name);
+								job_class_name	=	&job->job_class_name;
+								assign_to	=	job->sup_class_data;
+//						}
+
+								if	(class_iter	!=	sim_obj_info.job_class_to_info.end())	{
+												JobClassJobs	*	job_info	=	class_iter->second;
+
+												//	All	integration	jobs	and	non-integration	jobs	that	have	a	null
+												//	sup_class_data	field	"belong"	directly	to	the	sim	object.
+												if	((assign_to	==	NULL)	||
+																(job_class_name->compare("integration")	==	0))	{
+																job_info->owned_jobs.push_back	(job);
+
+												//	Add	non-integration	jobs	with	non-null	sup_class_data	field
+												//	to	the	relegated_jobs	so	these	jobs	can	later	be	assigned	to
+												//	the	sim	object	represented	by	the	sup_class_data	field.
+												}
+												else	{
+																job_info->relegated_jobs.push_back	(job);
+												}
+								}
+				}
 }
 
 /**
- Transfer the relegated jobs in a SimObjectIntegInfo to the SimObjectIntegInfo
- specfied by the relegated job's sup_class_data handle.
- @param sim_obj_info A member of the manager's sim_objects_info vector.
- */
-void Trick::IntegrationManager::transfer_relegated_jobs (
-    SimObjectIntegInfo & sim_obj_info)
+	Transfer	the	relegated	jobs	in	a	SimObjectIntegInfo	to	the	SimObjectIntegInfo
+	specfied	by	the	relegated	job's	sup_class_data	handle.
+	@param	sim_obj_info	A	member	of	the	manager's	sim_objects_info	vector.
+	*/
+void	Trick::IntegrationManager::transfer_relegated_jobs	(
+				SimObjectIntegInfo	&	sim_obj_info)
 {
-    // Walk over all of the job classes, transferring relegated jobs in each.
-    SimObjectIntegInfo::JobClassMap & obj_map = sim_obj_info.job_class_to_info;
-    for (SimObjectIntegInfo::JobClassMap::iterator map_iter = obj_map.begin();
-         map_iter != obj_map.end();
-         ++map_iter)
-    {
-        const std::string & key = map_iter->first;
-        JobClassJobs * jobs = map_iter->second;
-
-        // Walk over all the relegated jobs in this job class,
-        // transferring each relegated job to the sim object specified
-        // by the job's sup_class_data field.
-        for (JobVector::iterator job_iter = jobs->relegated_jobs.begin();
-             job_iter != jobs->relegated_jobs.end();
-             ++job_iter)
-        {
-            Trick::JobData * job = *job_iter;
-
-            // The job's sup_class_data field should be a pointer to an instance
-            // of a SimObject derived class. Find the SimObjectIntegInfo
-            // (*if any*) that represents the job's sup_class_data.
-            // Note that the call precludes rebuilding. Rebuilding the
-            // sim_objects_info would be of no value here.
-            SimObjectIntegInfo * assign_to =
-                find_sim_object_info (job->sup_class_data, false);
-            if (assign_to != NULL) {
-                assign_to->job_class_to_info[key]->owned_jobs.push_back (job);
-            } else {
-                message_publish (MSG_ERROR,
-                                 "job %s lost it relegated sim object\n",
-                                 job->name.c_str());
-            }
-        }
-    }
+				//	Walk	over	all	of	the	job	classes,	transferring	relegated	jobs	in	each.
+				SimObjectIntegInfo::JobClassMap	&	obj_map	=	sim_obj_info.job_class_to_info;
+				for	(SimObjectIntegInfo::JobClassMap::iterator	map_iter	=	obj_map.begin();
+									map_iter	!=	obj_map.end();
+									++map_iter)
+				{
+								const	std::string	&	key	=	map_iter->first;
+								JobClassJobs	*	jobs	=	map_iter->second;
+
+								//	Walk	over	all	the	relegated	jobs	in	this	job	class,
+								//	transferring	each	relegated	job	to	the	sim	object	specified
+								//	by	the	job's	sup_class_data	field.
+								for	(JobVector::iterator	job_iter	=	jobs->relegated_jobs.begin();
+													job_iter	!=	jobs->relegated_jobs.end();
+													++job_iter)
+								{
+												Trick::JobData	*	job	=	*job_iter;
+
+												//	The	job's	sup_class_data	field	should	be	a	pointer	to	an	instance
+												//	of	a	SimObject	derived	class.	Find	the	SimObjectIntegInfo
+												//	(*if	any*)	that	represents	the	job's	sup_class_data.
+												//	Note	that	the	call	precludes	rebuilding.	Rebuilding	the
+												//	sim_objects_info	would	be	of	no	value	here.
+												SimObjectIntegInfo	*	assign_to	=
+																find_sim_object_info	(job->sup_class_data,	false);
+												if	(assign_to	!=	NULL)	{
+																assign_to->job_class_to_info[key]->owned_jobs.push_back	(job);
+												}	else	{
+																message_publish	(MSG_ERROR,
+																																	"job	%s	lost	it	relegated	sim	object\n",
+																																	job->name.c_str());
+												}
+								}
+				}
 }
 
 /**
- Clear all indications of sim objects integrated by the specified scheduler,
- called in anticipation of respecifying the integrated objects.
- @param integrator The integ loop whose job queues are being rebuilt.
- */
-void Trick::IntegrationManager::clear_integrated_by (
-   IntegLoopScheduler * integrator)
+	Clear	all	indications	of	sim	objects	integrated	by	the	specified	scheduler,
+	called	in	anticipation	of	respecifying	the	integrated	objects.
+	@param	integrator	The	integ	loop	whose	job	queues	are	being	rebuilt.
+	*/
+void	Trick::IntegrationManager::clear_integrated_by	(
+			IntegLoopScheduler	*	integrator)
 {
-    for (SimObjectIntegInfoVector::iterator obj_iter = sim_objects_info.begin();
-         obj_iter != sim_objects_info.end();
-         ++obj_iter)
-    {
-        SimObjectIntegInfo & sim_obj_info = *obj_iter;
-        if (sim_obj_info.integrated_by == integrator) {
-            sim_obj_info.integrated_by = NULL;
-        }
-    }
+				for	(SimObjectIntegInfoVector::iterator	obj_iter	=	sim_objects_info.begin();
+									obj_iter	!=	sim_objects_info.end();
+									++obj_iter)
+				{
+								SimObjectIntegInfo	&	sim_obj_info	=	*obj_iter;
+								if	(sim_obj_info.integrated_by	==	integrator)	{
+												sim_obj_info.integrated_by	=	NULL;
+								}
+				}
 }
 
 /**
- Find the scheduler responsible for integrating the specified sim object.
- @return The integ loop that integrates the specified sim object.
- @param sim_object A sim object, which may or may not be integrated yet.
- */
-Trick::IntegLoopScheduler* Trick::IntegrationManager::get_integrated_by (
-    Trick::SimObject* sim_object)
+	Find	the	scheduler	responsible	for	integrating	the	specified	sim	object.
+	@return	The	integ	loop	that	integrates	the	specified	sim	object.
+	@param	sim_object	A	sim	object,	which	may	or	may	not	be	integrated	yet.
+	*/
+Trick::IntegLoopScheduler*	Trick::IntegrationManager::get_integrated_by	(
+				Trick::SimObject*	sim_object)
 {
-    SimObjectIntegInfo * sim_obj_info =
-        find_sim_object_info (sim_object, false);
-
-    if (sim_obj_info != NULL) {
-        return sim_obj_info->integrated_by;
-    } else {
-        return NULL;
-    }
+				SimObjectIntegInfo	*	sim_obj_info	=
+								find_sim_object_info	(sim_object,	false);
+
+				if	(sim_obj_info	!=	NULL)	{
+								return	sim_obj_info->integrated_by;
+				}	else	{
+								return	NULL;
+				}
 }
 
 /**
- Note the scheduler responsible for integrating the specified sim object.
- This annotation makes it possible to automatically remove a sim object from
- some integration loop if that object is added to another loop.
- @param sim_object A sim object integrated by the specified integ loop.
- @param integrator The integ loop that integrates the specified sim object.
- */
-void Trick::IntegrationManager::set_integrated_by (
-    Trick::SimObject* sim_object,
-    Trick::IntegLoopScheduler * integrator)
+	Note	the	scheduler	responsible	for	integrating	the	specified	sim	object.
+	This	annotation	makes	it	possible	to	automatically	remove	a	sim	object	from
+	some	integration	loop	if	that	object	is	added	to	another	loop.
+	@param	sim_object	A	sim	object	integrated	by	the	specified	integ	loop.
+	@param	integrator	The	integ	loop	that	integrates	the	specified	sim	object.
+	*/
+void	Trick::IntegrationManager::set_integrated_by	(
+				Trick::SimObject*	sim_object,
+				Trick::IntegLoopScheduler	*	integrator)
 {
-    // Find the SimObjectIntegInfo that represents the sim object.
-    SimObjectIntegInfo * sim_obj_info =
-        find_sim_object_info (sim_object, true);
+				//	Find	the	SimObjectIntegInfo	that	represents	the	sim	object.
+				SimObjectIntegInfo	*	sim_obj_info	=
+								find_sim_object_info	(sim_object,	true);
 
-    if (sim_obj_info != NULL) {
-        sim_obj_info->integrated_by = integrator;
-    }
+				if	(sim_obj_info	!=	NULL)	{
+								sim_obj_info->integrated_by	=	integrator;
+				}
 }
 
 /**
- Find the managed sim object that represents the specified sim object.
- @param derived_sim_object  pointer to the derived sim object user wants to find.
- */
-Trick::SimObject *
-Trick::IntegrationManager::find_sim_object (
-   const void * derived_sim_object)
+	Find	the	managed	sim	object	that	represents	the	specified	sim	object.
+	@param	derived_sim_object		pointer	to	the	derived	sim	object	user	wants	to	find.
+	*/
+Trick::SimObject	*
+Trick::IntegrationManager::find_sim_object	(
+			const	void	*	derived_sim_object)
 {
-    SimObjectIntegInfo * sim_obj_info =
-        find_sim_object_info (derived_sim_object, true);
-
-    if (sim_obj_info != NULL) {
-        return sim_obj_info->sim_object;
-    } else {
-        return NULL;
-    }
+				SimObjectIntegInfo	*	sim_obj_info	=
+								find_sim_object_info	(derived_sim_object,	true);
+
+				if	(sim_obj_info	!=	NULL)	{
+								return	sim_obj_info->sim_object;
+				}	else	{
+								return	NULL;
+				}
 }
 
 /**
- Clear all cached information about sim objects.
- This function should be called as a preload_checkpoint job.
- */
-void Trick::IntegrationManager::clear_sim_object_info () {
-    if (! sim_objects_info.empty()) {
-        sim_objects_info.clear();
-    }
+	Clear	all	cached	information	about	sim	objects.
+	This	function	should	be	called	as	a	preload_checkpoint	job.
+	*/
+void	Trick::IntegrationManager::clear_sim_object_info	()	{
+				if	(!	sim_objects_info.empty())	{
+								sim_objects_info.clear();
+				}
 }
 
 /**
- Find the manager's representation (if any) of the specified sim object.
- @return Pointer to the SimObjectIntegInfo that represents the sim object.
- @param sim_object Pointer to the sim object to be found.
- @param allow_rebuild boolean of whether the sim object info should be re-built.
- */
+	Find	the	manager's	representation	(if	any)	of	the	specified	sim	object.
+	@return	Pointer	to	the	SimObjectIntegInfo	that	represents	the	sim	object.
+	@param	sim_object	Pointer	to	the	sim	object	to	be	found.
+	@param	allow_rebuild	boolean	of	whether	the	sim	object	info	should	be	re-built.
+	*/
 Trick::IntegrationManager::SimObjectIntegInfo*
 Trick::IntegrationManager::find_sim_object_info(
-    const Trick::SimObject* sim_object,
-    bool allow_rebuild)
+				const	Trick::SimObject*	sim_object,
+				bool	allow_rebuild)
 {
-    FindSimObject search_predicate (sim_object);
-
-    SimObjectIntegInfoVector::iterator found_iter =
-        std::find_if (sim_objects_info.begin(), sim_objects_info.end(),
-                      search_predicate);
-    if (allow_rebuild && (found_iter == sim_objects_info.end())) {
-        build_sim_object_info();
-        found_iter = std::find_if (sim_objects_info.begin(),
-                                   sim_objects_info.end(),
-                                   search_predicate);
-    }
-    if (found_iter == sim_objects_info.end()) {
-        return NULL;
-    }
-    else {
-        return &(*found_iter);
-    }
+				FindSimObject	search_predicate	(sim_object);
+
+				SimObjectIntegInfoVector::iterator	found_iter	=
+								std::find_if	(sim_objects_info.begin(),	sim_objects_info.end(),
+																						search_predicate);
+				if	(allow_rebuild	&&	(found_iter	==	sim_objects_info.end()))	{
+								build_sim_object_info();
+								found_iter	=	std::find_if	(sim_objects_info.begin(),
+																																			sim_objects_info.end(),
+																																			search_predicate);
+				}
+				if	(found_iter	==	sim_objects_info.end())	{
+								return	NULL;
+				}
+				else	{
+								return	&(*found_iter);
+				}
 }
 
 /**
- Find the manager's representation (if any) of the specified sim object.
- @return Pointer to the derived sim object.
- @param derived_sim_object Pointer to the sim object to be found.
- @param allow_rebuild boolean to determine whether sim_object_info should be re-built.
- */
+	Find	the	manager's	representation	(if	any)	of	the	specified	sim	object.
+	@return	Pointer	to	the	derived	sim	object.
+	@param	derived_sim_object	Pointer	to	the	sim	object	to	be	found.
+	@param	allow_rebuild	boolean	to	determine	whether	sim_object_info	should	be	re-built.
+	*/
 Trick::IntegrationManager::SimObjectIntegInfo*
 Trick::IntegrationManager::find_sim_object_info(
-    const void* derived_sim_object,
-    bool allow_rebuild)
+				const	void*	derived_sim_object,
+				bool	allow_rebuild)
 {
-    FindDerivedSimObject search_predicate (derived_sim_object);
-
-    SimObjectIntegInfoVector::iterator found_iter =
-        std::find_if (sim_objects_info.begin(), sim_objects_info.end(),
-                      search_predicate);
-    if (allow_rebuild && (found_iter == sim_objects_info.end())) {
-        build_sim_object_info();
-        found_iter = std::find_if (sim_objects_info.begin(),
-                                   sim_objects_info.end(),
-                                   search_predicate);
-    }
-    if (found_iter == sim_objects_info.end()) {
-        return NULL;
-    }
-    else {
-        return &(*found_iter);
-    }
+				FindDerivedSimObject	search_predicate	(derived_sim_object);
+
+				SimObjectIntegInfoVector::iterator	found_iter	=
+								std::find_if	(sim_objects_info.begin(),	sim_objects_info.end(),
+																						search_predicate);
+				if	(allow_rebuild	&&	(found_iter	==	sim_objects_info.end()))	{
+								build_sim_object_info();
+								found_iter	=	std::find_if	(sim_objects_info.begin(),
+																																			sim_objects_info.end(),
+																																			search_predicate);
+				}
+				if	(found_iter	==	sim_objects_info.end())	{
+								return	NULL;
+				}
+				else	{
+								return	&(*found_iter);
+				}
 }
 
 
 /**
- Add jobs for the specified sim object to the specified job queue.
- @param job_class_name The job class name.
- @param job_class_id   The job class ID number.
- @param sim_object     The sim object whose jobs of the specified class
-                       are to be added to the provided queue.
- @param queue          The job queue to be updated.
- */
-void Trick::IntegrationManager::add_jobs_to_queue(const std::string & job_class_name,
-                                                  int job_class_id,
-                                                  Trick::SimObject* sim_object,
-                                                  Trick::ScheduledJobQueue & queue)
+	Add	jobs	for	the	specified	sim	object	to	the	specified	job	queue.
+	@param	job_class_name	The	job	class	name.
+	@param	job_class_id			The	job	class	ID	number.
+	@param	sim_object					The	sim	object	whose	jobs	of	the	specified	class
+																							are	to	be	added	to	the	provided	queue.
+	@param	queue										The	job	queue	to	be	updated.
+	*/
+void	Trick::IntegrationManager::add_jobs_to_queue(const	std::string	&	job_class_name,
+																																																		int	job_class_id,
+																																																		Trick::SimObject*	sim_object,
+																																																		Trick::ScheduledJobQueue	&	queue)
 {
-    // Find the SimObjectIntegInfo that represents the specified sim object.
-    SimObjectIntegInfo * sim_obj_info = find_sim_object_info (sim_object);
-
-    // Sanity check: The SimObjectIntegInfo should be non-null.
-    // A null value means something is very, very wrong.
-    // Famous last words: "This should never happen."
-    if (sim_obj_info == NULL) {
-        throw std::out_of_range ("bad sim object");
-    }
-
-    // Find the JobClassMap that represents the jobs for the specified job class
-    // within the SimObjectIntegInfo.
-    SimObjectIntegInfo::JobClassMap::iterator map_iter =
-                        sim_obj_info->job_class_to_info.find (job_class_name);
-
-    // Sanity check: The JobClassMap should be valid (i.e., not the end()).
-    // An invalid value again means something is very, very wrong.
-    if (map_iter == sim_obj_info->job_class_to_info.end()) {
-        throw std::out_of_range ("bad class name " + job_class_name);
-    }
-
-    // All is cool. Add the owned jobs to the queue.
-    // Note: The jobs are added via push rather than push_ignore_sim_object.
-    JobClassJobs * jobs = map_iter->second;
-    for (JobVector::iterator job_iter = jobs->owned_jobs.begin();
-         job_iter != jobs->owned_jobs.end(); ++job_iter)
-    {
-        Trick::JobData * job = *job_iter;
-        job->job_class = job_class_id;
-        queue.push_ignore_sim_object (job);
-    }
+				//	Find	the	SimObjectIntegInfo	that	represents	the	specified	sim	object.
+				SimObjectIntegInfo	*	sim_obj_info	=	find_sim_object_info	(sim_object);
+
+				//	Sanity	check:	The	SimObjectIntegInfo	should	be	non-null.
+				//	A	null	value	means	something	is	very,	very	wrong.
+				//	Famous	last	words:	"This	should	never	happen."
+				if	(sim_obj_info	==	NULL)	{
+								throw	std::out_of_range	("bad	sim	object");
+				}
+
+				//	Find	the	JobClassMap	that	represents	the	jobs	for	the	specified	job	class
+				//	within	the	SimObjectIntegInfo.
+				SimObjectIntegInfo::JobClassMap::iterator	map_iter	=
+																								sim_obj_info->job_class_to_info.find	(job_class_name);
+
+				//	Sanity	check:	The	JobClassMap	should	be	valid	(i.e.,	not	the	end()).
+				//	An	invalid	value	again	means	something	is	very,	very	wrong.
+				if	(map_iter	==	sim_obj_info->job_class_to_info.end())	{
+								throw	std::out_of_range	("bad	class	name	"	+	job_class_name);
+				}
+
+				//	All	is	cool.	Add	the	owned	jobs	to	the	queue.
+				//	Note:	The	jobs	are	added	via	push	rather	than	push_ignore_sim_object.
+				JobClassJobs	*	jobs	=	map_iter->second;
+				for	(JobVector::iterator	job_iter	=	jobs->owned_jobs.begin();
+									job_iter	!=	jobs->owned_jobs.end();	++job_iter)
+				{
+								Trick::JobData	*	job	=	*job_iter;
+								job->job_class	=	job_class_id;
+								queue.push_ignore_sim_object	(job);
+				}
 }
 
 /**
- Complete the construction of a SimObjectIntegInfo.
- All constructors but the copy constructor call this method.
- */
-void Trick::IntegrationManager::SimObjectIntegInfo::init_job_class_to_info () {
-    job_class_to_info["pre_integration"]  = &pre_integ_jobs;
-    job_class_to_info["derivative"]       = &deriv_jobs;
-    job_class_to_info["integration"]      = &integ_jobs;
-    job_class_to_info["dynamic_event"]    = &dynamic_event_jobs;
-    job_class_to_info["post_integration"] = &post_integ_jobs;
+	Complete	the	construction	of	a	SimObjectIntegInfo.
+	All	constructors	but	the	copy	constructor	call	this	method.
+	*/
+void	Trick::IntegrationManager::SimObjectIntegInfo::init_job_class_to_info	()	{
+				job_class_to_info["pre_integration"]		=	&pre_integ_jobs;
+				job_class_to_info["derivative"]							=	&deriv_jobs;
+				job_class_to_info["integration"]						=	&integ_jobs;
+				job_class_to_info["dynamic_event"]				=	&dynamic_event_jobs;
+				job_class_to_info["post_integration"]	=	&post_integ_jobs;
 }
diff --git a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
index 1e0cd8600..4f224574f 100644
--- a/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
+++ b/trick_source/sim_services/Integrator/src/IntegLoopScheduler.cpp
@@ -1,702 +1,702 @@
 
 
-// Local includes
-#include "trick/IntegLoopScheduler.hh"
-
-#include "trick/IntegLoopManager.hh"
-#include "trick/IntegJobClassId.hh"
-
-// Trick includes
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/JobData.hh"
-
-// System includes
-#include <iostream>
-#include <iomanip>
-#include <cstdarg>
-#include <math.h>
-
-
-// Anonymous namespace for local functions
-namespace {
-    /**
-     * Process the enabled job in the provided job queue.
-     * @param job_queue  Job queue to be processed.
-     */
-    inline void call_jobs (
-        Trick::ScheduledJobQueue & job_queue)
-    {
-        Trick::JobData * curr_job;
-        job_queue.reset_curr_index();
-        while ((curr_job = job_queue.get_next_job()) != NULL) {
-            curr_job->call();
-        }
-    }
+//	Local	includes
+#include	"trick/IntegLoopScheduler.hh"
+
+#include	"trick/IntegLoopManager.hh"
+#include	"trick/IntegJobClassId.hh"
+
+//	Trick	includes
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/JobData.hh"
+
+//	System	includes
+#include	<iostream>
+#include	<iomanip>
+#include	<cstdarg>
+#include	<math.h>
+
+
+//	Anonymous	namespace	for	local	functions
+namespace	{
+				/**
+					*	Process	the	enabled	job	in	the	provided	job	queue.
+					*	@param	job_queue		Job	queue	to	be	processed.
+					*/
+				inline	void	call_jobs	(
+								Trick::ScheduledJobQueue	&	job_queue)
+				{
+								Trick::JobData	*	curr_job;
+								job_queue.reset_curr_index();
+								while	((curr_job	=	job_queue.get_next_job())	!=	NULL)	{
+												curr_job->call();
+								}
+				}
 }
 
 
 /**
- The singleton IntegrationManager object.
- It is a protected static member of the IntegLoopScheduler class.
- */
-Trick::IntegrationManager Trick::IntegLoopScheduler::manager;
+	The	singleton	IntegrationManager	object.
+	It	is	a	protected	static	member	of	the	IntegLoopScheduler	class.
+	*/
+Trick::IntegrationManager	Trick::IntegLoopScheduler::manager;
 
 /**
- The Integrator currently being processed.
- */
-Trick::Integrator* trick_curr_integ = NULL;
+	The	Integrator	currently	being	processed.
+	*/
+Trick::Integrator*	trick_curr_integ	=	NULL;
 
 /**
- Non-default constructor.
- @param in_cycle The time interval at which the loop's integrate function is called
- @param in_parent_so Pointer to the parent sim object.
- */
+	Non-default	constructor.
+	@param	in_cycle	The	time	interval	at	which	the	loop's	integrate	function	is	called
+	@param	in_parent_so	Pointer	to	the	parent	sim	object.
+	*/
 Trick::IntegLoopScheduler::IntegLoopScheduler(
-    double in_cycle, Trick::SimObject * in_parent_so)
+				double	in_cycle,	Trick::SimObject	*	in_parent_so)
 :
-    Scheduler (),
-
-    verbosity (0),
-    last_step_deriv (false),
-    first_step_deriv (false),
-    integ_ptr (NULL),
-    sim_objects (),
-
-    nominal_cycle (in_cycle),
-    next_cycle (in_cycle),
-    parent_sim_object (in_parent_so),
-    pre_integ_jobs (),
-    deriv_jobs (),
-    integ_jobs (),
-    dynamic_event_jobs (),
-    post_integ_jobs ()
+				Scheduler	(),
+
+				verbosity	(0),
+				last_step_deriv	(false),
+				first_step_deriv	(false),
+				integ_ptr	(NULL),
+				sim_objects	(),
+
+				nominal_cycle	(in_cycle),
+				next_cycle	(in_cycle),
+				parent_sim_object	(in_parent_so),
+				pre_integ_jobs	(),
+				deriv_jobs	(),
+				integ_jobs	(),
+				dynamic_event_jobs	(),
+				post_integ_jobs	()
 {
-    complete_construction();
+				complete_construction();
 }
 
 /**
- Default constructor
- */
+	Default	constructor
+	*/
 Trick::IntegLoopScheduler::IntegLoopScheduler()
 :
-    Scheduler (),
-
-    verbosity (0),
-    last_step_deriv (false),
-    first_step_deriv (false),
-    integ_ptr (NULL),
-    sim_objects (),
-
-    nominal_cycle (),
-    next_cycle (),
-    parent_sim_object (NULL),
-    pre_integ_jobs (),
-    deriv_jobs (),
-    integ_jobs (),
-    dynamic_event_jobs (),
-    post_integ_jobs ()
+				Scheduler	(),
+
+				verbosity	(0),
+				last_step_deriv	(false),
+				first_step_deriv	(false),
+				integ_ptr	(NULL),
+				sim_objects	(),
+
+				nominal_cycle	(),
+				next_cycle	(),
+				parent_sim_object	(NULL),
+				pre_integ_jobs	(),
+				deriv_jobs	(),
+				integ_jobs	(),
+				dynamic_event_jobs	(),
+				post_integ_jobs	()
 {
-    complete_construction();
+				complete_construction();
 }
 
 /**
- Complete the construction of an integration loop.
- All constructors but the copy constructor call this method.
- */
-void Trick::IntegLoopScheduler::complete_construction()
+	Complete	the	construction	of	an	integration	loop.
+	All	constructors	but	the	copy	constructor	call	this	method.
+	*/
+void	Trick::IntegLoopScheduler::complete_construction()
 {
 
-    // Create the class_name to class_id mapping.
-    class_map["derivative"] = Trick::DerivativeJobClassId;
-    class_to_queue[Trick::DerivativeJobClassId] = &deriv_jobs;
+				//	Create	the	class_name	to	class_id	mapping.
+				class_map["derivative"]	=	Trick::DerivativeJobClassId;
+				class_to_queue[Trick::DerivativeJobClassId]	=	&deriv_jobs;
 
-    class_map["integration"] = Trick::IntegrationJobClassId;
-    class_to_queue[Trick::IntegrationJobClassId] = &integ_jobs;
+				class_map["integration"]	=	Trick::IntegrationJobClassId;
+				class_to_queue[Trick::IntegrationJobClassId]	=	&integ_jobs;
 
-    class_map["dynamic_event"] = Trick::DynamicEventJobClassId;
-    class_to_queue[Trick::DynamicEventJobClassId] = &dynamic_event_jobs;
+				class_map["dynamic_event"]	=	Trick::DynamicEventJobClassId;
+				class_to_queue[Trick::DynamicEventJobClassId]	=	&dynamic_event_jobs;
 
-    class_map["post_integration"] = Trick::PostIntegrationJobClassId;
-    class_to_queue[Trick::PostIntegrationJobClassId] = &post_integ_jobs;
+				class_map["post_integration"]	=	Trick::PostIntegrationJobClassId;
+				class_to_queue[Trick::PostIntegrationJobClassId]	=	&post_integ_jobs;
 
-    class_map["pre_integration"] = Trick::PreIntegrationJobClassId;
-    class_to_queue[Trick::PreIntegrationJobClassId] = &pre_integ_jobs;
+				class_map["pre_integration"]	=	Trick::PreIntegrationJobClassId;
+				class_to_queue[Trick::PreIntegrationJobClassId]	=	&pre_integ_jobs;
 }
 
 /**
- Find the specified sim object in the set of objects managed by this loop.
- @return Iterator pointing to the object, or to sim_objects.end() if not found.
- @param sim_obj Object to be found.
- */
+	Find	the	specified	sim	object	in	the	set	of	objects	managed	by	this	loop.
+	@return	Iterator	pointing	to	the	object,	or	to	sim_objects.end()	if	not	found.
+	@param	sim_obj	Object	to	be	found.
+	*/
 Trick::IntegLoopScheduler::SimObjectVector::iterator
-Trick::IntegLoopScheduler::find_sim_object(Trick::SimObject & sim_obj)
+Trick::IntegLoopScheduler::find_sim_object(Trick::SimObject	&	sim_obj)
 {
-    return std::find (sim_objects.begin(), sim_objects.end(), &sim_obj);
+				return	std::find	(sim_objects.begin(),	sim_objects.end(),	&sim_obj);
 }
 
 /**
- Add jobs from specified object.
- @param in_obj Pointer to the sim object from which the integration jobs
-        should be added.
- Deprecated!
- */
-int Trick::IntegLoopScheduler::add_integ_jobs_from_sim_object (
-    Trick::SimObject * in_obj)
+	Add	jobs	from	specified	object.
+	@param	in_obj	Pointer	to	the	sim	object	from	which	the	integration	jobs
+								should	be	added.
+	Deprecated!
+	*/
+int	Trick::IntegLoopScheduler::add_integ_jobs_from_sim_object	(
+				Trick::SimObject	*	in_obj)
 {
 
-    unsigned int ii ;
-    std::map<std::string, int>::iterator class_id_it ;
-    std::map<int, Trick::ScheduledJobQueue *>::iterator queue_it ;
-    Trick::ScheduledJobQueue * curr_queue ;
-    JobData * job ;
+				unsigned	int	ii	;
+				std::map<std::string,	int>::iterator	class_id_it	;
+				std::map<int,	Trick::ScheduledJobQueue	*>::iterator	queue_it	;
+				Trick::ScheduledJobQueue	*	curr_queue	;
+				JobData	*	job	;
 
-    // TODO:  add check to make sure the integ job is not set to another object before adding job to queue
-    // TODO:  Check other simobjects for jobs that are to be added to this integration
-    // TODO:  check all integration schemes for integrate structures are the same
+				//	TODO:		add	check	to	make	sure	the	integ	job	is	not	set	to	another	object	before	adding	job	to	queue
+				//	TODO:		Check	other	simobjects	for	jobs	that	are	to	be	added	to	this	integration
+				//	TODO:		check	all	integration	schemes	for	integrate	structures	are	the	same
 
-    // For each of the jobs in the SimObject
-    for ( ii = 0 ; ii < in_obj->jobs.size() ; ii++ ) {
-        job = in_obj->jobs[ii] ;
+				//	For	each	of	the	jobs	in	the	SimObject
+				for	(	ii	=	0	;	ii	<	in_obj->jobs.size()	;	ii++	)	{
+								job	=	in_obj->jobs[ii]	;
 
-        // if the job's job_class_name is in the class map then set its job_class to the corresponding class_id
-        if ( (class_id_it = class_map.find(job->job_class_name)) != class_map.end() ) {
+								//	if	the	job's	job_class_name	is	in	the	class	map	then	set	its	job_class	to	the	corresponding	class_id
+								if	(	(class_id_it	=	class_map.find(job->job_class_name))	!=	class_map.end()	)	{
 
-            // set this integration loop frequency to all its individual jobs
-            job->cycle = nominal_cycle;
+												//	set	this	integration	loop	frequency	to	all	its	individual	jobs
+												job->cycle	=	nominal_cycle;
 
-            job->job_class = class_id_it->second ;
+												job->job_class	=	class_id_it->second	;
 
-            if ( (queue_it = class_to_queue.find(job->job_class)) != class_to_queue.end() ) {
-                curr_queue = queue_it->second ;
-                curr_queue->push_ignore_sim_object( job ) ;
-            }
-        }
-    }
+												if	(	(queue_it	=	class_to_queue.find(job->job_class))	!=	class_to_queue.end()	)	{
+																curr_queue	=	queue_it->second	;
+																curr_queue->push_ignore_sim_object(	job	)	;
+												}
+								}
+				}
 
-    return 0;
+				return	0;
 
 }
 
-// Overload of Scheduler::add_sim_object that does nothing.
-int Trick::IntegLoopScheduler::add_sim_object(Trick::SimObject * sim_obj __attribute((unused))) {
-    return 0;
+//	Overload	of	Scheduler::add_sim_object	that	does	nothing.
+int	Trick::IntegLoopScheduler::add_sim_object(Trick::SimObject	*	sim_obj	__attribute((unused)))	{
+				return	0;
 }
 
 /**
- Add a sim object to the set of objects integrated by this integration loop.
- The job queues for this loop are rebuild after adding the sim object.
- @param sim_obj Address of the sim object that should be added to scheduler.
- */
-int Trick::IntegLoopScheduler::add_sim_object(Trick::SimObject & sim_obj)
+	Add	a	sim	object	to	the	set	of	objects	integrated	by	this	integration	loop.
+	The	job	queues	for	this	loop	are	rebuild	after	adding	the	sim	object.
+	@param	sim_obj	Address	of	the	sim	object	that	should	be	added	to	scheduler.
+	*/
+int	Trick::IntegLoopScheduler::add_sim_object(Trick::SimObject	&	sim_obj)
 {
-    // Disallow duplicate objects.
-    if (find_sim_object (sim_obj) != sim_objects.end()) {
-        message_publish (
-            MSG_ERROR,
-            "Integ Scheduler ERROR: "
-            "SimObject '%s' is already managed by this integration loop.\n",
-            sim_obj.name.c_str());
-        return 1;
-    }
-
-    // Object is not in the set. Add it.
-    sim_objects.push_back (&sim_obj);
-    // Rebuild jobs, but only if the manager has been initialized.
-    // Adding jobs prior to the initial build are legal; they are addressed
-    // by an S_define-level call to rebuild_jobs.
-    if (! manager.is_empty()) {
-        // If this object is already managed by a different integration loop,
-        // remove it from that other loop to avoid integrating the object twice.
-        IntegLoopScheduler * other = manager.get_integrated_by (&sim_obj);
-        if (other != NULL) {
-            other->remove_sim_object (sim_obj);
-        }
-
-        // Now rebuild our jobs.
-        rebuild_jobs();
-    }
-    return 0;
+				//	Disallow	duplicate	objects.
+				if	(find_sim_object	(sim_obj)	!=	sim_objects.end())	{
+								message_publish	(
+												MSG_ERROR,
+												"Integ	Scheduler	ERROR:	"
+												"SimObject	'%s'	is	already	managed	by	this	integration	loop.\n",
+												sim_obj.name.c_str());
+								return	1;
+				}
+
+				//	Object	is	not	in	the	set.	Add	it.
+				sim_objects.push_back	(&sim_obj);
+				//	Rebuild	jobs,	but	only	if	the	manager	has	been	initialized.
+				//	Adding	jobs	prior	to	the	initial	build	are	legal;	they	are	addressed
+				//	by	an	S_define-level	call	to	rebuild_jobs.
+				if	(!	manager.is_empty())	{
+								//	If	this	object	is	already	managed	by	a	different	integration	loop,
+								//	remove	it	from	that	other	loop	to	avoid	integrating	the	object	twice.
+								IntegLoopScheduler	*	other	=	manager.get_integrated_by	(&sim_obj);
+								if	(other	!=	NULL)	{
+												other->remove_sim_object	(sim_obj);
+								}
+
+								//	Now	rebuild	our	jobs.
+								rebuild_jobs();
+				}
+				return	0;
 }
 
 /**
- Remove a sim object from the objects integrated by this integration loop.
- The job queues for this loop are rebuilt after removing the sim object.
- @param sim_obj Address of sim object that should be removed from scheduler.
- */
-int Trick::IntegLoopScheduler::remove_sim_object(Trick::SimObject & sim_obj)
+	Remove	a	sim	object	from	the	objects	integrated	by	this	integration	loop.
+	The	job	queues	for	this	loop	are	rebuilt	after	removing	the	sim	object.
+	@param	sim_obj	Address	of	sim	object	that	should	be	removed	from	scheduler.
+	*/
+int	Trick::IntegLoopScheduler::remove_sim_object(Trick::SimObject	&	sim_obj)
 {
-    // Find the object in the set of objects managed by this loop;
-    // The object must be in that set if it is to be removed.
-    SimObjectVector::iterator iter = find_sim_object (sim_obj);
-    if (iter == sim_objects.end()) {
-        message_publish (
-            MSG_ERROR,
-            "Integ Scheduler ERROR: "
-            "SimObject '%s' is not managed by this integration loop.\n",
-            sim_obj.name.c_str());
-        return 1;
-    }
-
-    // Object is in the set. Remove it.
-    sim_objects.erase (iter);
-
-    // Rebuild jobs, but only if the manager has been initialized.
-    // Calls to remove prior to the initial build are legal (but silly).
-    if (! manager.is_empty()) {
-        rebuild_jobs();
-    }
-    return 0;
+				//	Find	the	object	in	the	set	of	objects	managed	by	this	loop;
+				//	The	object	must	be	in	that	set	if	it	is	to	be	removed.
+				SimObjectVector::iterator	iter	=	find_sim_object	(sim_obj);
+				if	(iter	==	sim_objects.end())	{
+								message_publish	(
+												MSG_ERROR,
+												"Integ	Scheduler	ERROR:	"
+												"SimObject	'%s'	is	not	managed	by	this	integration	loop.\n",
+												sim_obj.name.c_str());
+								return	1;
+				}
+
+				//	Object	is	in	the	set.	Remove	it.
+				sim_objects.erase	(iter);
+
+				//	Rebuild	jobs,	but	only	if	the	manager	has	been	initialized.
+				//	Calls	to	remove	prior	to	the	initial	build	are	legal	(but	silly).
+				if	(!	manager.is_empty())	{
+								rebuild_jobs();
+				}
+				return	0;
 }
 
 /**
- Prepare for a restart.
- */
-void Trick::IntegLoopScheduler::restart_checkpoint()
+	Prepare	for	a	restart.
+	*/
+void	Trick::IntegLoopScheduler::restart_checkpoint()
 {
-    manager.clear_sim_object_info();
+				manager.clear_sim_object_info();
 }
 
 /**
- Rebuild the integration loop's job queues.
- This method is called internally upon adding or deleting sim objects,
- and is called externally (S_define level) during initialization and
- after a checkpoint restart.
- */
-void Trick::IntegLoopScheduler::rebuild_jobs ()
+	Rebuild	the	integration	loop's	job	queues.
+	This	method	is	called	internally	upon	adding	or	deleting	sim	objects,
+	and	is	called	externally	(S_define	level)	during	initialization	and
+	after	a	checkpoint	restart.
+	*/
+void	Trick::IntegLoopScheduler::rebuild_jobs	()
 {
-    // Rebuild the manager.
-    manager.build_sim_object_info();
-
-    // Reset the manager's notion of which objects this integrator integrates.
-    manager.clear_integrated_by (this);
-    for (SimObjectVector::iterator so_iter = sim_objects.begin();
-         so_iter != sim_objects.end();
-         ++so_iter) {
-        Trick::SimObject * sim_object = *so_iter;
-        manager.set_integrated_by (sim_object, this);
-    }
-
-    // Rebuild each of this integration loop's job queues.
-    for (std::map<std::string, int>::iterator id_iter = class_map.begin();
-         id_iter != class_map.end();
-         ++id_iter) {
-        const std::string & job_class_name = id_iter->first;
-        int job_class_id = id_iter->second;
-        Trick::ScheduledJobQueue & queue = *(class_to_queue.at(job_class_id));
-
-        // Rebuild the queue by first tearing it down to nothing
-        // and then rebuilding from scratch.
-        clear_queue (queue);
-        for (SimObjectVector::iterator so_iter = sim_objects.begin();
-             so_iter != sim_objects.end();
-             ++so_iter) {
-            Trick::SimObject * sim_object = *so_iter;
-            manager.add_jobs_to_queue (
-                job_class_name, job_class_id, sim_object, queue);
-        }
-    }
+				//	Rebuild	the	manager.
+				manager.build_sim_object_info();
+
+				//	Reset	the	manager's	notion	of	which	objects	this	integrator	integrates.
+				manager.clear_integrated_by	(this);
+				for	(SimObjectVector::iterator	so_iter	=	sim_objects.begin();
+									so_iter	!=	sim_objects.end();
+									++so_iter)	{
+								Trick::SimObject	*	sim_object	=	*so_iter;
+								manager.set_integrated_by	(sim_object,	this);
+				}
+
+				//	Rebuild	each	of	this	integration	loop's	job	queues.
+				for	(std::map<std::string,	int>::iterator	id_iter	=	class_map.begin();
+									id_iter	!=	class_map.end();
+									++id_iter)	{
+								const	std::string	&	job_class_name	=	id_iter->first;
+								int	job_class_id	=	id_iter->second;
+								Trick::ScheduledJobQueue	&	queue	=	*(class_to_queue.at(job_class_id));
+
+								//	Rebuild	the	queue	by	first	tearing	it	down	to	nothing
+								//	and	then	rebuilding	from	scratch.
+								clear_queue	(queue);
+								for	(SimObjectVector::iterator	so_iter	=	sim_objects.begin();
+													so_iter	!=	sim_objects.end();
+													++so_iter)	{
+												Trick::SimObject	*	sim_object	=	*so_iter;
+												manager.add_jobs_to_queue	(
+																job_class_name,	job_class_id,	sim_object,	queue);
+								}
+				}
 }
 
 /**
- Empty a job queue in anticipation of the queue being rebuilt.
- @param job_queue Address of job queue that should be cleared.
- */
-void Trick::IntegLoopScheduler::clear_queue (
-    Trick::ScheduledJobQueue & job_queue)
+	Empty	a	job	queue	in	anticipation	of	the	queue	being	rebuilt.
+	@param	job_queue	Address	of	job	queue	that	should	be	cleared.
+	*/
+void	Trick::IntegLoopScheduler::clear_queue	(
+				Trick::ScheduledJobQueue	&	job_queue)
 {
-    if (job_queue.size() != 0) {
-        Trick::JobData * curr_job;
-        job_queue.reset_curr_index();
-        while ((curr_job = job_queue.get_next_job()) != NULL) {
-            curr_job->set_handled (false);
-        }
-        job_queue.clear ();
-    }
+				if	(job_queue.size()	!=	0)	{
+								Trick::JobData	*	curr_job;
+								job_queue.reset_curr_index();
+								while	((curr_job	=	job_queue.get_next_job())	!=	NULL)	{
+												curr_job->set_handled	(false);
+								}
+								job_queue.clear	();
+				}
 }
 
 /**
- Call the enabled derivative jobs.
- */
-void Trick::IntegLoopScheduler::call_deriv_jobs ()
+	Call	the	enabled	derivative	jobs.
+	*/
+void	Trick::IntegLoopScheduler::call_deriv_jobs	()
 {
-    call_jobs (deriv_jobs);
+				call_jobs	(deriv_jobs);
 }
 
 /**
- Integrate objects to the current simulation time.
- Note that sim_time is advanced before integration, so integration has to
- be from sim_time-cycle to sim_time.
- */
-int Trick::IntegLoopScheduler::integrate()
+	Integrate	objects	to	the	current	simulation	time.
+	Note	that	sim_time	is	advanced	before	integration,	so	integration	has	to
+	be	from	sim_time-cycle	to	sim_time.
+	*/
+int	Trick::IntegLoopScheduler::integrate()
 {
-    double t_end = exec_get_sim_time();
-    double t_start = t_end - next_cycle; // This is the time of the current state vector.
-    int status;
+				double	t_end	=	exec_get_sim_time();
+				double	t_start	=	t_end	-	next_cycle;	//	This	is	the	time	of	the	current	state	vector.
+				int	status;
 
-    // Call all of the jobs in the pre-integration job queue.
-    call_jobs (pre_integ_jobs);
+				//	Call	all	of	the	jobs	in	the	pre-integration	job	queue.
+				call_jobs	(pre_integ_jobs);
 
-    // Integrate sim objects to the current time.
-    status = integrate_dt (t_start, next_cycle);
-    if (status != 0) {
-        return status;
-    }
+				//	Integrate	sim	objects	to	the	current	time.
+				status	=	integrate_dt	(t_start,	next_cycle);
+				if	(status	!=	0)	{
+								return	status;
+				}
 
-    // Process dynamic events, if any.
-    if (! dynamic_event_jobs.empty()) {
+				//	Process	dynamic	events,	if	any.
+				if	(!	dynamic_event_jobs.empty())	{
 
-        status = process_dynamic_events (t_start, t_end);
+								status	=	process_dynamic_events	(t_start,	t_end);
 
-        if (status != 0) {
-            return status;
-        }
-    }
+								if	(status	!=	0)	{
+												return	status;
+								}
+				}
 
-    // Call the jobs in the derivative job queue one more time if indicated.
-    if (get_last_step_deriv()) {
-         call_jobs (deriv_jobs);
-    }
+				//	Call	the	jobs	in	the	derivative	job	queue	one	more	time	if	indicated.
+				if	(get_last_step_deriv())	{
+									call_jobs	(deriv_jobs);
+				}
 
-    // Call all of the jobs in the post-integration job queue.
-    call_jobs (post_integ_jobs);
+				//	Call	all	of	the	jobs	in	the	post-integration	job	queue.
+				call_jobs	(post_integ_jobs);
 
-    // We should now be back in sync with the nominal cycle rate.
-    next_cycle = nominal_cycle;
+				//	We	should	now	be	back	in	sync	with	the	nominal	cycle	rate.
+				next_cycle	=	nominal_cycle;
 
-    return 0;
+				return	0;
 }
 
 /**
- Determine whether derivative jobs should be called on the first step.
- True if any integrator needs derivatives on the first step, false otherwise.
- */
-bool Trick::IntegLoopScheduler::get_first_step_deriv_from_integrator()
+	Determine	whether	derivative	jobs	should	be	called	on	the	first	step.
+	True	if	any	integrator	needs	derivatives	on	the	first	step,	false	otherwise.
+	*/
+bool	Trick::IntegLoopScheduler::get_first_step_deriv_from_integrator()
 {
-    // We need derivatives if the integ_ptr says so.
-    if ((integ_ptr != NULL) && integ_ptr->first_step_deriv) {
-        return true;
-    }
-
-    // Other integrators may be set in sup_class_data. Check them.
-    else {
-        Trick::JobData * curr_job;
-        void* sup_class_data;
-        Trick::Integrator* trick_integrator;
-
-        integ_jobs.reset_curr_index();
-        while ((curr_job = integ_jobs.get_next_job()) != NULL) {
-            if ((curr_job->job_class == Trick::IntegrationJobClassId) &&
-                ((sup_class_data = curr_job->sup_class_data) != NULL) &&
-                ((trick_integrator =
-                      *(static_cast<Trick::Integrator**>(sup_class_data))) != NULL) &&
-                trick_integrator->first_step_deriv) {
-                return true;
-            }
-        }
-    }
-
-    return false;
+				//	We	need	derivatives	if	the	integ_ptr	says	so.
+				if	((integ_ptr	!=	NULL)	&&	integ_ptr->first_step_deriv)	{
+								return	true;
+				}
+
+				//	Other	integrators	may	be	set	in	sup_class_data.	Check	them.
+				else	{
+								Trick::JobData	*	curr_job;
+								void*	sup_class_data;
+								Trick::Integrator*	trick_integrator;
+
+								integ_jobs.reset_curr_index();
+								while	((curr_job	=	integ_jobs.get_next_job())	!=	NULL)	{
+												if	((curr_job->job_class	==	Trick::IntegrationJobClassId)	&&
+																((sup_class_data	=	curr_job->sup_class_data)	!=	NULL)	&&
+																((trick_integrator	=
+																						*(static_cast<Trick::Integrator**>(sup_class_data)))	!=	NULL)	&&
+																trick_integrator->first_step_deriv)	{
+																return	true;
+												}
+								}
+				}
+
+				return	false;
 }
 
 /**
- Determine whether derivative jobs should be called prior to exiting the
- main integration function. True if this object's last_deriv_flag is set,
- or if any integrator's last_deriv_flag is set. False otherwise.
- */
-bool Trick::IntegLoopScheduler::get_last_step_deriv()
+	Determine	whether	derivative	jobs	should	be	called	prior	to	exiting	the
+	main	integration	function.	True	if	this	object's	last_deriv_flag	is	set,
+	or	if	any	integrator's	last_deriv_flag	is	set.	False	otherwise.
+	*/
+bool	Trick::IntegLoopScheduler::get_last_step_deriv()
 {
-    // We need to calculate post-integration derivatives if this object
-    // or the integ_ptr says to do so.
-    if (last_step_deriv ||
-        ((integ_ptr != NULL) && integ_ptr->last_step_deriv)) {
-        return true;
-    }
-
-    // Other integrators may be set in sup_class_data. Check them.
-    else {
-        Trick::JobData * curr_job;
-        void* sup_class_data;
-        Trick::Integrator* trick_integrator;
-
-        integ_jobs.reset_curr_index();
-        while ((curr_job = integ_jobs.get_next_job()) != NULL) {
-            if ((curr_job->job_class == Trick::IntegrationJobClassId) &&
-                ((sup_class_data = curr_job->sup_class_data) != NULL) &&
-                ((trick_integrator =
-                      *(static_cast<Trick::Integrator**>(sup_class_data))) != NULL) &&
-                trick_integrator->last_step_deriv) {
-                return true;
-            }
-        }
-    }
-
-    return false;
+				//	We	need	to	calculate	post-integration	derivatives	if	this	object
+				//	or	the	integ_ptr	says	to	do	so.
+				if	(last_step_deriv	||
+								((integ_ptr	!=	NULL)	&&	integ_ptr->last_step_deriv))	{
+								return	true;
+				}
+
+				//	Other	integrators	may	be	set	in	sup_class_data.	Check	them.
+				else	{
+								Trick::JobData	*	curr_job;
+								void*	sup_class_data;
+								Trick::Integrator*	trick_integrator;
+
+								integ_jobs.reset_curr_index();
+								while	((curr_job	=	integ_jobs.get_next_job())	!=	NULL)	{
+												if	((curr_job->job_class	==	Trick::IntegrationJobClassId)	&&
+																((sup_class_data	=	curr_job->sup_class_data)	!=	NULL)	&&
+																((trick_integrator	=
+																						*(static_cast<Trick::Integrator**>(sup_class_data)))	!=	NULL)	&&
+																trick_integrator->last_step_deriv)	{
+																return	true;
+												}
+								}
+				}
+
+				return	false;
 }
 
 /**
- Integrate over the specified time interval.
- */
-int Trick::IntegLoopScheduler::integrate_dt ( double t_start, double dt) {
-
-    int ipass = 0;
-    int ex_pass = 0;
-    bool need_derivs = get_first_step_deriv_from_integrator();
-
-    double target_time = t_start + dt;
-
-    do {
-        ex_pass ++;
-        // Call all of the jobs in the derivative job queue if needed.
-        if (need_derivs) {
-             call_jobs (deriv_jobs);
-        }
-        need_derivs = true;
-
-        // Call all of the jobs in the integration job queue.
-        Trick::JobData * curr_job;
-        integ_jobs.reset_curr_index();
-        while ((curr_job = integ_jobs.get_next_job()) != NULL) {
-
-
-            void* sup_class_data = curr_job->sup_class_data;
-            // Jobs without supplemental data use the default integrator.
-            if (sup_class_data == NULL) {
-                trick_curr_integ = integ_ptr;
-            }
-            // Non-null supplemental data:
-            // Resolve as a pointer-to-a-pointer to a Trick::Integrator.
-            else {
-                trick_curr_integ =
-                    *(static_cast<Trick::Integrator**>(sup_class_data));
-            }
-
-
-            if (trick_curr_integ == NULL) {
-                message_publish (
-                    MSG_ERROR,
-                    "Integ Scheduler ERROR: "
-                    "Integrate job has no associated Integrator.\n");
-                return 1;
-            }
-
-            if (ex_pass == 1) {
-                trick_curr_integ->time = t_start;
-                trick_curr_integ->dt   = dt;
-                trick_curr_integ->target_integ_time = target_time;
-            }
-
-            if (verbosity || trick_curr_integ->verbosity) {
-                message_publish (MSG_DEBUG, "Job: %s, target_integ_time: %f, integ_time: %f, dt: %f, ipass = %d\n",
-                                 curr_job->name.c_str(), target_time, t_start, dt, ipass);
-            }
-
-            ipass = curr_job->call();
-
-            // Trick integrators are expected to advance from step one to step
-            // two, etc., and then back to zero to indicate completion.
-            // All integrators are expected to march to the same beat.
-            // FIXME, future: This restricts Trick to using only rather
-            // simple integration techniques.
-            if ((ipass != 0) && (ipass != ex_pass)) {
-                message_publish (
-                    MSG_ERROR,
-                    "Integ Scheduler ERROR: Integrators not in sync.\n");
-                return 1;
-            }
-        }
-    } while (ipass);
-
-    return 0;
+	Integrate	over	the	specified	time	interval.
+	*/
+int	Trick::IntegLoopScheduler::integrate_dt	(	double	t_start,	double	dt)	{
+
+				int	ipass	=	0;
+				int	ex_pass	=	0;
+				bool	need_derivs	=	get_first_step_deriv_from_integrator();
+
+				double	target_time	=	t_start	+	dt;
+
+				do	{
+								ex_pass	++;
+								//	Call	all	of	the	jobs	in	the	derivative	job	queue	if	needed.
+								if	(need_derivs)	{
+													call_jobs	(deriv_jobs);
+								}
+								need_derivs	=	true;
+
+								//	Call	all	of	the	jobs	in	the	integration	job	queue.
+								Trick::JobData	*	curr_job;
+								integ_jobs.reset_curr_index();
+								while	((curr_job	=	integ_jobs.get_next_job())	!=	NULL)	{
+
+
+												void*	sup_class_data	=	curr_job->sup_class_data;
+												//	Jobs	without	supplemental	data	use	the	default	integrator.
+												if	(sup_class_data	==	NULL)	{
+																trick_curr_integ	=	integ_ptr;
+												}
+												//	Non-null	supplemental	data:
+												//	Resolve	as	a	pointer-to-a-pointer	to	a	Trick::Integrator.
+												else	{
+																trick_curr_integ	=
+																				*(static_cast<Trick::Integrator**>(sup_class_data));
+												}
+
+
+												if	(trick_curr_integ	==	NULL)	{
+																message_publish	(
+																				MSG_ERROR,
+																				"Integ	Scheduler	ERROR:	"
+																				"Integrate	job	has	no	associated	Integrator.\n");
+																return	1;
+												}
+
+												if	(ex_pass	==	1)	{
+																trick_curr_integ->time	=	t_start;
+																trick_curr_integ->dt			=	dt;
+																trick_curr_integ->target_integ_time	=	target_time;
+												}
+
+												if	(verbosity	||	trick_curr_integ->verbosity)	{
+																message_publish	(MSG_DEBUG,	"Job:	%s,	target_integ_time:	%f,	integ_time:	%f,	dt:	%f,	ipass	=	%d\n",
+																																	curr_job->name.c_str(),	target_time,	t_start,	dt,	ipass);
+												}
+
+												ipass	=	curr_job->call();
+
+												//	Trick	integrators	are	expected	to	advance	from	step	one	to	step
+												//	two,	etc.,	and	then	back	to	zero	to	indicate	completion.
+												//	All	integrators	are	expected	to	march	to	the	same	beat.
+												//	FIXME,	future:	This	restricts	Trick	to	using	only	rather
+												//	simple	integration	techniques.
+												if	((ipass	!=	0)	&&	(ipass	!=	ex_pass))	{
+																message_publish	(
+																				MSG_ERROR,
+																				"Integ	Scheduler	ERROR:	Integrators	not	in	sync.\n");
+																return	1;
+												}
+								}
+				}	while	(ipass);
+
+				return	0;
 }
 
-int Trick::IntegLoopScheduler::process_dynamic_events ( double t_start, double t_end, unsigned int depth) {
-
-    bool fired = false;
-    double t_to = t_end;
-    double t_from = t_start;
-    Trick::JobData * curr_job;
-    dynamic_event_jobs.reset_curr_index();
-    while ((curr_job = dynamic_event_jobs.get_next_job()) != NULL) {
-        // Call the dynamic event job to calculate an estimated time-to-go.
-        double tgo = curr_job->call_double();
-       if (tgo < 0.0) {   // If there is a root in this interval ...
-            fired = true;
-            while (tgo != 0.0) {
-                if (tgo > 0.0) {
-                    t_from = t_to;
-                    t_to = t_to + tgo;
-                    int status = integrate_dt( t_from, (t_to-t_from));
-                    if (status != 0) { return status; }
-                } else {
-#define FORWARD_INTEGRATION 0
-#if FORWARD_INTEGRATION
-                    integ_ptr->state_reset(); // We always want to integrate forward.
-                    t_to = t_to + tgo;
+int	Trick::IntegLoopScheduler::process_dynamic_events	(	double	t_start,	double	t_end,	unsigned	int	depth)	{
+
+				bool	fired	=	false;
+				double	t_to	=	t_end;
+				double	t_from	=	t_start;
+				Trick::JobData	*	curr_job;
+				dynamic_event_jobs.reset_curr_index();
+				while	((curr_job	=	dynamic_event_jobs.get_next_job())	!=	NULL)	{
+								//	Call	the	dynamic	event	job	to	calculate	an	estimated	time-to-go.
+								double	tgo	=	curr_job->call_double();
+							if	(tgo	<	0.0)	{			//	If	there	is	a	root	in	this	interval	...
+												fired	=	true;
+												while	(tgo	!=	0.0)	{
+																if	(tgo	>	0.0)	{
+																				t_from	=	t_to;
+																				t_to	=	t_to	+	tgo;
+																				int	status	=	integrate_dt(	t_from,	(t_to-t_from));
+																				if	(status	!=	0)	{	return	status;	}
+																}	else	{
+#define	FORWARD_INTEGRATION	0
+#if	FORWARD_INTEGRATION
+																				integ_ptr->state_reset();	//	We	always	want	to	integrate	forward.
+																				t_to	=	t_to	+	tgo;
 #else
-                    t_from = t_to;
-                    t_to   = t_from + tgo;
+																				t_from	=	t_to;
+																				t_to			=	t_from	+	tgo;
 #endif
-                    int status = integrate_dt( t_from, (t_to-t_from));
-                    if (status != 0) { return status; }
-                }
-                tgo = curr_job->call_double();
-            }
-        }
-    }
-    /*
-    Integrate to the end of the integration cycle using the updated derivatives.
-    */
-    if (fired) {
-        t_from = t_to;
-        t_to = t_end;
-        /*
-        Because the derivatives have likely changed, we need to recursively
-        check for new events in the remaining interval.
-        */
-        int status = integrate_dt( t_from, (t_to-t_from));
-        if (status != 0) { return status; }
-        status = process_dynamic_events(t_from, t_to, depth+1);
-        if (status != 0) { return status; }
-    }
-    return 0;
+																				int	status	=	integrate_dt(	t_from,	(t_to-t_from));
+																				if	(status	!=	0)	{	return	status;	}
+																}
+																tgo	=	curr_job->call_double();
+												}
+								}
+				}
+				/*
+				Integrate	to	the	end	of	the	integration	cycle	using	the	updated	derivatives.
+				*/
+				if	(fired)	{
+								t_from	=	t_to;
+								t_to	=	t_end;
+								/*
+								Because	the	derivatives	have	likely	changed,	we	need	to	recursively
+								check	for	new	events	in	the	remaining	interval.
+								*/
+								int	status	=	integrate_dt(	t_from,	(t_to-t_from));
+								if	(status	!=	0)	{	return	status;	}
+								status	=	process_dynamic_events(t_from,	t_to,	depth+1);
+								if	(status	!=	0)	{	return	status;	}
+				}
+				return	0;
 }
 
 /**
- Utility function to get an integrator.
- @param alg The integration algorithm to use.
- @param state_size the total number of integration variables and derivative variables.
- */
-Trick::Integrator * Trick::IntegLoopScheduler::getIntegrator (
-    Integrator_type alg, unsigned int state_size)
+	Utility	function	to	get	an	integrator.
+	@param	alg	The	integration	algorithm	to	use.
+	@param	state_size	the	total	number	of	integration	variables	and	derivative	variables.
+	*/
+Trick::Integrator	*	Trick::IntegLoopScheduler::getIntegrator	(
+				Integrator_type	alg,	unsigned	int	state_size)
 {
-    integ_ptr = Trick::getIntegrator (alg, state_size);
-    trick_curr_integ = integ_ptr;
-    return integ_ptr;
+				integ_ptr	=	Trick::getIntegrator	(alg,	state_size);
+				trick_curr_integ	=	integ_ptr;
+				return	integ_ptr;
 }
 
 /**
- Set the interval at which this job is called.
- @param in_cycle The frequency for the integration cycle.
- */
-int Trick::IntegLoopScheduler::set_integ_cycle (
-    double in_cycle)
+	Set	the	interval	at	which	this	job	is	called.
+	@param	in_cycle	The	frequency	for	the	integration	cycle.
+	*/
+int	Trick::IntegLoopScheduler::set_integ_cycle	(
+				double	in_cycle)
 {
-    JobData * found_job = NULL;
-    int loops_found = 0;
-
-    // Search through the parent sim object looking for integ_loop jobs.
-    // There should be exactly one such job.
-    for (std::vector<Trick::JobData *>::iterator vit =
-             parent_sim_object->jobs.begin();
-         vit != parent_sim_object->jobs.end();
-         ++vit) {
-        JobData * vit_job = *vit;
-        if (! vit_job->job_class_name.compare("integ_loop")) {
-            ++loops_found;
-            found_job = vit_job;
-        }
-    }
-
-    // Not finding exactly one integ_loop job is an error.
-    if (loops_found != 1) {
-        message_publish (
-            MSG_ERROR,
-            "Integ Scheduler ERROR: %s\n",
-            (loops_found == 0) ? "integ_loop job not found." :
-                                 "multiple integ_loop jobs found.");
-        return 1;
-    }
-
-    // Found exactly one integ_loop job.
-    // Set the cycle rate for that one job and for this object.
-    // Note: This assumes that the one found job pertains to this scheduler.
-    else {
-        long long prev_tics = found_job->next_tics - found_job->cycle_tics;
-        long long curr_tics = exec_get_time_tics();
-        found_job->set_cycle (in_cycle);
-        found_job->set_next_call_time (curr_tics);
-        nominal_cycle = in_cycle;
-        next_cycle = double((found_job->next_tics - prev_tics)) /
-                     double(found_job->time_tic_value);
-        return 0;
-    }
+				JobData	*	found_job	=	NULL;
+				int	loops_found	=	0;
+
+				//	Search	through	the	parent	sim	object	looking	for	integ_loop	jobs.
+				//	There	should	be	exactly	one	such	job.
+				for	(std::vector<Trick::JobData	*>::iterator	vit	=
+													parent_sim_object->jobs.begin();
+									vit	!=	parent_sim_object->jobs.end();
+									++vit)	{
+								JobData	*	vit_job	=	*vit;
+								if	(!	vit_job->job_class_name.compare("integ_loop"))	{
+												++loops_found;
+												found_job	=	vit_job;
+								}
+				}
+
+				//	Not	finding	exactly	one	integ_loop	job	is	an	error.
+				if	(loops_found	!=	1)	{
+								message_publish	(
+												MSG_ERROR,
+												"Integ	Scheduler	ERROR:	%s\n",
+												(loops_found	==	0)	?	"integ_loop	job	not	found."	:
+																																	"multiple	integ_loop	jobs	found.");
+								return	1;
+				}
+
+				//	Found	exactly	one	integ_loop	job.
+				//	Set	the	cycle	rate	for	that	one	job	and	for	this	object.
+				//	Note:	This	assumes	that	the	one	found	job	pertains	to	this	scheduler.
+				else	{
+								long	long	prev_tics	=	found_job->next_tics	-	found_job->cycle_tics;
+								long	long	curr_tics	=	exec_get_time_tics();
+								found_job->set_cycle	(in_cycle);
+								found_job->set_next_call_time	(curr_tics);
+								nominal_cycle	=	in_cycle;
+								next_cycle	=	double((found_job->next_tics	-	prev_tics))	/
+																					double(found_job->time_tic_value);
+								return	0;
+				}
 }
 
 /**
- Write the content of the S_job_execution file.
- @param fp The pointer to the file to write the S_job_execution file.
- */
-int Trick::IntegLoopScheduler::write_s_job_execution(FILE *fp)
+	Write	the	content	of	the	S_job_execution	file.
+	@param	fp	The	pointer	to	the	file	to	write	the	S_job_execution	file.
+	*/
+int	Trick::IntegLoopScheduler::write_s_job_execution(FILE	*fp)
 {
 
-    if (fp == NULL) {
-        return 0;
-    }
+				if	(fp	==	NULL)	{
+								return	0;
+				}
 
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "Integration Loop:\n\n") ;
-    pre_integ_jobs.write_sched_queue(fp) ;
-    deriv_jobs.write_sched_queue(fp) ;
-    integ_jobs.write_sched_queue(fp) ;
-    dynamic_event_jobs.write_sched_queue(fp) ;
-    post_integ_jobs.write_sched_queue(fp) ;
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"Integration	Loop:\n\n")	;
+				pre_integ_jobs.write_sched_queue(fp)	;
+				deriv_jobs.write_sched_queue(fp)	;
+				integ_jobs.write_sched_queue(fp)	;
+				dynamic_event_jobs.write_sched_queue(fp)	;
+				post_integ_jobs.write_sched_queue(fp)	;
 
-    return 0;
+				return	0;
 }
 
 /**
- Adds the incoming instrumentation job before target job if specified, or all jobs in the list.
- @param instrument_job Pointer to the job that should be run previously.
- */
-int Trick::IntegLoopScheduler::instrument_job_before (
-    Trick::JobData * instrument_job)
+	Adds	the	incoming	instrumentation	job	before	target	job	if	specified,	or	all	jobs	in	the	list.
+	@param	instrument_job	Pointer	to	the	job	that	should	be	run	previously.
+	*/
+int	Trick::IntegLoopScheduler::instrument_job_before	(
+				Trick::JobData	*	instrument_job)
 {
-    int count = 0 ;
-    /** @par Detailed Design */
+				int	count	=	0	;
+				/**	@par	Detailed	Design	*/
 
-    count += pre_integ_jobs.instrument_before(instrument_job) ;
-    count += deriv_jobs.instrument_before(instrument_job) ;
-    count += integ_jobs.instrument_before(instrument_job) ;
-    count += dynamic_event_jobs.instrument_before(instrument_job) ;
-    count += post_integ_jobs.instrument_before(instrument_job) ;
+				count	+=	pre_integ_jobs.instrument_before(instrument_job)	;
+				count	+=	deriv_jobs.instrument_before(instrument_job)	;
+				count	+=	integ_jobs.instrument_before(instrument_job)	;
+				count	+=	dynamic_event_jobs.instrument_before(instrument_job)	;
+				count	+=	post_integ_jobs.instrument_before(instrument_job)	;
 
-    /** @li Return how many insertions were done. */
-    return count;
+				/**	@li	Return	how	many	insertions	were	done.	*/
+				return	count;
 
 }
 
 /**
- Adds the incoming instrumentation job after target job if specified, or all jobs in the list.
- @param instrument_job Pointer to the job that should be run after each job.
- */
-int Trick::IntegLoopScheduler::instrument_job_after (
-    Trick::JobData * instrument_job)
+	Adds	the	incoming	instrumentation	job	after	target	job	if	specified,	or	all	jobs	in	the	list.
+	@param	instrument_job	Pointer	to	the	job	that	should	be	run	after	each	job.
+	*/
+int	Trick::IntegLoopScheduler::instrument_job_after	(
+				Trick::JobData	*	instrument_job)
 {
-    int count = 0 ;
+				int	count	=	0	;
 
-    count += pre_integ_jobs.instrument_after(instrument_job) ;
-    count += deriv_jobs.instrument_after(instrument_job) ;
-    count += integ_jobs.instrument_after(instrument_job) ;
-    count += dynamic_event_jobs.instrument_after(instrument_job) ;
-    count += post_integ_jobs.instrument_after(instrument_job) ;
+				count	+=	pre_integ_jobs.instrument_after(instrument_job)	;
+				count	+=	deriv_jobs.instrument_after(instrument_job)	;
+				count	+=	integ_jobs.instrument_after(instrument_job)	;
+				count	+=	dynamic_event_jobs.instrument_after(instrument_job)	;
+				count	+=	post_integ_jobs.instrument_after(instrument_job)	;
 
-    return count;
+				return	count;
 
 }
 
 /**
- Removes all jobs in the list that match the name in_job.
- @param in_job name of the job that should be removed.
- */
-int Trick::IntegLoopScheduler::instrument_job_remove(std::string in_job)
+	Removes	all	jobs	in	the	list	that	match	the	name	in_job.
+	@param	in_job	name	of	the	job	that	should	be	removed.
+	*/
+int	Trick::IntegLoopScheduler::instrument_job_remove(std::string	in_job)
 {
-    pre_integ_jobs.instrument_remove(in_job) ;
-    deriv_jobs.instrument_remove(in_job) ;
-    integ_jobs.instrument_remove(in_job) ;
-    dynamic_event_jobs.instrument_remove(in_job) ;
-    post_integ_jobs.instrument_remove(in_job) ;
+				pre_integ_jobs.instrument_remove(in_job)	;
+				deriv_jobs.instrument_remove(in_job)	;
+				integ_jobs.instrument_remove(in_job)	;
+				dynamic_event_jobs.instrument_remove(in_job)	;
+				post_integ_jobs.instrument_remove(in_job)	;
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp b/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp
index f450b4ae8..0d87d0bf1 100644
--- a/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp
+++ b/trick_source/sim_services/Integrator/src/IntegLoopSimObject.cpp
@@ -1,73 +1,73 @@
 
-#include "trick/IntegLoopSimObject.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/IntegLoopSimObject.hh"
+#include	"trick/exec_proto.hh"
 
-void IntegLoopSimObject::add_jobs(double in_cycle, unsigned int child) {
-    Trick::JobData * job ;
+void	IntegLoopSimObject::add_jobs(double	in_cycle,	unsigned	int	child)	{
+				Trick::JobData	*	job	;
 
-    exec_register_scheduler(&integ_sched) ;
-    job = add_job(0, 0, "default_data", NULL, 1, "integ_sched.rebuild_jobs", "", 65534) ;
-    job->add_tag("TRK") ;
-    job = add_job(0, 1, "initialization", NULL, 1, "integ_sched.get_first_step_deriv_from_integrator", "", 65535) ;
-    job->add_tag("TRK") ;
-    job = add_job(0, 2, "initialization", NULL, 1, "integ_sched.call_deriv_jobs", "", 65535) ;
-    job->add_tag("TRK") ;
-    job = add_job(child, 3, "integ_loop", NULL, in_cycle, "integ_sched.integrate", "", 60000) ;
-    job->add_tag("TRK") ;
-    job = add_job(0, 4, "preload_checkpoint", NULL, 1, "integ_sched.restart_checkpoint", "", 0) ;
-    job->add_tag("TRK") ;
-    job = add_job(0, 5, "restart", NULL, 1, "integ_sched.rebuild_jobs", "", 60000) ;
-    job->add_tag("TRK") ;
-    job = add_job(0, 6, "restart", NULL, 1, "integ_sched.get_first_step_deriv_from_integrator", "", 65535) ;
-    job->add_tag("TRK") ;
+				exec_register_scheduler(&integ_sched)	;
+				job	=	add_job(0,	0,	"default_data",	NULL,	1,	"integ_sched.rebuild_jobs",	"",	65534)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(0,	1,	"initialization",	NULL,	1,	"integ_sched.get_first_step_deriv_from_integrator",	"",	65535)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(0,	2,	"initialization",	NULL,	1,	"integ_sched.call_deriv_jobs",	"",	65535)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(child,	3,	"integ_loop",	NULL,	in_cycle,	"integ_sched.integrate",	"",	60000)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(0,	4,	"preload_checkpoint",	NULL,	1,	"integ_sched.restart_checkpoint",	"",	0)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(0,	5,	"restart",	NULL,	1,	"integ_sched.rebuild_jobs",	"",	60000)	;
+				job->add_tag("TRK")	;
+				job	=	add_job(0,	6,	"restart",	NULL,	1,	"integ_sched.get_first_step_deriv_from_integrator",	"",	65535)	;
+				job->add_tag("TRK")	;
 }
 
-int IntegLoopSimObject::call_function ( Trick::JobData * curr_job ) {
+int	IntegLoopSimObject::call_function	(	Trick::JobData	*	curr_job	)	{
 
-    int trick_ret = 0 ;
-    if ( curr_job->disabled ) return (trick_ret) ;
+				int	trick_ret	=	0	;
+				if	(	curr_job->disabled	)	return	(trick_ret)	;
 
-    switch ( curr_job->id ) {
-        case 0:
-            integ_sched.rebuild_jobs() ;
-            break ;
-        case 1:
-            integ_sched.get_first_step_deriv_from_integrator() ;
-            break ;
-        case 2:
-            integ_sched.call_deriv_jobs() ;
-            break ;
-        case 3:
-            integ_sched.integrate() ;
-            break ;
-        case 4:
-            integ_sched.restart_checkpoint() ;
-            break ;
-        case 5:
-            integ_sched.rebuild_jobs() ;
-            break ;
-        case 6:
-            integ_sched.get_first_step_deriv_from_integrator() ;
-            break ;
-        default:
-            trick_ret = -1 ;
-            break ;
-    }
+				switch	(	curr_job->id	)	{
+								case	0:
+												integ_sched.rebuild_jobs()	;
+												break	;
+								case	1:
+												integ_sched.get_first_step_deriv_from_integrator()	;
+												break	;
+								case	2:
+												integ_sched.call_deriv_jobs()	;
+												break	;
+								case	3:
+												integ_sched.integrate()	;
+												break	;
+								case	4:
+												integ_sched.restart_checkpoint()	;
+												break	;
+								case	5:
+												integ_sched.rebuild_jobs()	;
+												break	;
+								case	6:
+												integ_sched.get_first_step_deriv_from_integrator()	;
+												break	;
+								default:
+												trick_ret	=	-1	;
+												break	;
+				}
 
-    return(trick_ret) ;
+				return(trick_ret)	;
 }
 
-double IntegLoopSimObject::call_function_double ( Trick::JobData * curr_job ) {
+double	IntegLoopSimObject::call_function_double	(	Trick::JobData	*	curr_job	)	{
 
-    double trick_ret = 0.0 ;
-    if ( curr_job->disabled ) return (trick_ret) ;
+				double	trick_ret	=	0.0	;
+				if	(	curr_job->disabled	)	return	(trick_ret)	;
 
-    switch ( curr_job->id ) {
-        default:
-            trick_ret = 0.0 ;
-            break ;
-    }
+				switch	(	curr_job->id	)	{
+								default:
+												trick_ret	=	0.0	;
+												break	;
+				}
 
-    return(trick_ret) ;
+				return(trick_ret)	;
 }
 
diff --git a/trick_source/sim_services/Integrator/src/Integrator.cpp b/trick_source/sim_services/Integrator/src/Integrator.cpp
index c1c897896..567a21995 100644
--- a/trick_source/sim_services/Integrator/src/Integrator.cpp
+++ b/trick_source/sim_services/Integrator/src/Integrator.cpp
@@ -1,231 +1,231 @@
-#include "trick/Integrator.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include <cstdarg>
-#include <iostream>
+#include	"trick/Integrator.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	<cstdarg>
+#include	<iostream>
 
 /**
- */
-Trick::Integrator::Integrator() {
-
-   num_state = 0;
-   first_step_deriv = 1;
-   last_step_deriv  = 0;
-   intermediate_step = 0;
-   is_2nd_order_ODE_technique = 0;
-   use_deriv2 = 0;
-   dt = 0.01;
-   target_integ_time = dt;
-   state = NULL;
-   deriv = NULL;
-   deriv2 = NULL;
-   state_ws = NULL;
-#ifndef USE_ER7_UTILS_INTEGRATORS
-   state_origin = NULL;
+	*/
+Trick::Integrator::Integrator()	{
+
+			num_state	=	0;
+			first_step_deriv	=	1;
+			last_step_deriv		=	0;
+			intermediate_step	=	0;
+			is_2nd_order_ODE_technique	=	0;
+			use_deriv2	=	0;
+			dt	=	0.01;
+			target_integ_time	=	dt;
+			state	=	NULL;
+			deriv	=	NULL;
+			deriv2	=	NULL;
+			state_ws	=	NULL;
+#ifndef	USE_ER7_UTILS_INTEGRATORS
+			state_origin	=	NULL;
 #endif
-   time = 0.0;
-   time_0 = 0.0;
-   verbosity = 0 ;
+			time	=	0.0;
+			time_0	=	0.0;
+			verbosity	=	0	;
 }
 
 /**
- */
-int Trick::Integrator::integrate_1st_order_ode (
-    double const* derivs_in, double* state_in_out) {
-    int rc;
+	*/
+int	Trick::Integrator::integrate_1st_order_ode	(
+				double	const*	derivs_in,	double*	state_in_out)	{
+				int	rc;
 
-    if (is_2nd_order_ODE_technique) {
-        message_publish(MSG_ERROR,
-                        "Integrator ERROR: "
-                        "Current integrator is a 2nd order technique.\n");
-        return 0;
-    }
+				if	(is_2nd_order_ODE_technique)	{
+								message_publish(MSG_ERROR,
+																								"Integrator	ERROR:	"
+																								"Current	integrator	is	a	2nd	order	technique.\n");
+								return	0;
+				}
 
-    for (int ii = 0; ii < num_state; ++ii) {
-        state[ii] = state_in_out[ii];
-        deriv[intermediate_step][ii] = derivs_in[ii];
-    }
+				for	(int	ii	=	0;	ii	<	num_state;	++ii)	{
+								state[ii]	=	state_in_out[ii];
+								deriv[intermediate_step][ii]	=	derivs_in[ii];
+				}
 
-    rc = integrate ();
+				rc	=	integrate	();
 
-    for (int ii = 0; ii < num_state; ++ii) {
-        state_in_out[ii] = state_ws[intermediate_step][ii];
-    }
+				for	(int	ii	=	0;	ii	<	num_state;	++ii)	{
+								state_in_out[ii]	=	state_ws[intermediate_step][ii];
+				}
 
-    return rc;
+				return	rc;
 }
 
 /**
- */
-int Trick::Integrator::integrate_2nd_order_ode (
-    double const* accel, double* velocity, double* position) {
-    int rc;
-    int half_size = num_state / 2;
-
-    if (use_deriv2) {
-        for (int ii = 0; ii < half_size; ++ii) {
-            state[ii] = position[ii];
-            deriv[intermediate_step][ii]  = velocity[ii];
-            deriv2[intermediate_step][ii] = accel[ii];
-        }
-    }
-
-    else {
-        for (int ii = 0; ii < half_size; ++ii) {
-            state[ii]           = position[ii];
-            state[ii+half_size] = velocity[ii];
-            deriv[intermediate_step][ii]           = velocity[ii];
-            deriv[intermediate_step][ii+half_size] = accel[ii];
-        }
-    }
-
-    rc = integrate ();
-
-    for (int ii = 0; ii < half_size; ++ii) {
-        position[ii] = state_ws[intermediate_step][ii];
-        velocity[ii] = state_ws[intermediate_step][ii+half_size];
-    }
-
-    return rc;
-}
-
-void Trick::Integrator::state_reset () {
-#ifdef USE_ER7_UTILS_INTEGRATORS
+	*/
+int	Trick::Integrator::integrate_2nd_order_ode	(
+				double	const*	accel,	double*	velocity,	double*	position)	{
+				int	rc;
+				int	half_size	=	num_state	/	2;
+
+				if	(use_deriv2)	{
+								for	(int	ii	=	0;	ii	<	half_size;	++ii)	{
+												state[ii]	=	position[ii];
+												deriv[intermediate_step][ii]		=	velocity[ii];
+												deriv2[intermediate_step][ii]	=	accel[ii];
+								}
+				}
+
+				else	{
+								for	(int	ii	=	0;	ii	<	half_size;	++ii)	{
+												state[ii]											=	position[ii];
+												state[ii+half_size]	=	velocity[ii];
+												deriv[intermediate_step][ii]											=	velocity[ii];
+												deriv[intermediate_step][ii+half_size]	=	accel[ii];
+								}
+				}
+
+				rc	=	integrate	();
+
+				for	(int	ii	=	0;	ii	<	half_size;	++ii)	{
+								position[ii]	=	state_ws[intermediate_step][ii];
+								velocity[ii]	=	state_ws[intermediate_step][ii+half_size];
+				}
+
+				return	rc;
+}
+
+void	Trick::Integrator::state_reset	()	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
 #else
-    if (intermediate_step == 0) {
+				if	(intermediate_step	==	0)	{
 
-        if (verbosity) message_publish(MSG_DEBUG, "STATE RESET");
-        for (int i=0; i<num_state ; i++) {
-            *state_origin[i] = state[i];
-        }
-    }
+								if	(verbosity)	message_publish(MSG_DEBUG,	"STATE	RESET");
+								for	(int	i=0;	i<num_state	;	i++)	{
+												*state_origin[i]	=	state[i];
+								}
+				}
 #endif
 }
 
-#ifdef USE_ER7_UTILS_INTEGRATORS
-void Trick::Integrator::state_in (double* arg1, va_list argp) {
-    int i = 0;
-    double* next_arg = arg1;
-    if (verbosity) message_publish(MSG_DEBUG, "LOAD STATE: ");
-    while (next_arg != (double*) NULL) {
-        state[i] = *next_arg;
-        if (verbosity) message_publish(MSG_DEBUG, "  %g", *next_arg);
-        next_arg = va_arg(argp, double*);
-        i++;
-    }
-    if (verbosity) message_publish(MSG_DEBUG, "\n");
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+void	Trick::Integrator::state_in	(double*	arg1,	va_list	argp)	{
+				int	i	=	0;
+				double*	next_arg	=	arg1;
+				if	(verbosity)	message_publish(MSG_DEBUG,	"LOAD	STATE:	");
+				while	(next_arg	!=	(double*)	NULL)	{
+								state[i]	=	*next_arg;
+								if	(verbosity)	message_publish(MSG_DEBUG,	"		%g",	*next_arg);
+								next_arg	=	va_arg(argp,	double*);
+								i++;
+				}
+				if	(verbosity)	message_publish(MSG_DEBUG,	"\n");
 }
 #else
-void Trick::Integrator::state_in (double* arg1, va_list argp) {
-    if (intermediate_step == 0) {
-        int i = 0;
-        double* next_arg = arg1;
-        state_origin[i] = next_arg;
-        if (verbosity) std::cout << "LOAD STATE: \n";
-        while (next_arg != (double*) NULL) {
-            state_origin[i] = next_arg;
-            state[i] = *next_arg;
-            if (verbosity) std::cout << "  " << *next_arg << "\n";
-            next_arg = va_arg(argp, double*);
-            i++;
-        }
-        state_origin[i] = (double*)NULL;
-        if (verbosity) std::cout << std::endl;
-    }
-}
-
-void Trick::Integrator::state_element_in (unsigned int index , double* state_p) {
-    if (intermediate_step == 0) {
-        state_origin[index] = state_p;
-        state[index] = *state_p;
-    }
+void	Trick::Integrator::state_in	(double*	arg1,	va_list	argp)	{
+				if	(intermediate_step	==	0)	{
+								int	i	=	0;
+								double*	next_arg	=	arg1;
+								state_origin[i]	=	next_arg;
+								if	(verbosity)	std::cout	<<	"LOAD	STATE:	\n";
+								while	(next_arg	!=	(double*)	NULL)	{
+												state_origin[i]	=	next_arg;
+												state[i]	=	*next_arg;
+												if	(verbosity)	std::cout	<<	"		"	<<	*next_arg	<<	"\n";
+												next_arg	=	va_arg(argp,	double*);
+												i++;
+								}
+								state_origin[i]	=	(double*)NULL;
+								if	(verbosity)	std::cout	<<	std::endl;
+				}
+}
+
+void	Trick::Integrator::state_element_in	(unsigned	int	index	,	double*	state_p)	{
+				if	(intermediate_step	==	0)	{
+								state_origin[index]	=	state_p;
+								state[index]	=	*state_p;
+				}
 }
 
 #endif
 
-void Trick::Integrator::state_in (double* arg1, ...) {
-    va_list argp;
-    va_start(argp, arg1);
-    state_in(arg1, argp);
-    va_end(argp);
+void	Trick::Integrator::state_in	(double*	arg1,	...)	{
+				va_list	argp;
+				va_start(argp,	arg1);
+				state_in(arg1,	argp);
+				va_end(argp);
 }
 
-void Trick::Integrator::deriv_in ( double* arg1, va_list argp) {
-    int i = 0;
-    double* next_arg = arg1;
-    if (verbosity) message_publish(MSG_DEBUG, "LOAD DERIV: ");
-    while (next_arg != (double*) NULL) {
-        deriv[intermediate_step][i] = *next_arg;
-        if (verbosity) message_publish(MSG_DEBUG,"  %g", *next_arg);
-        next_arg = va_arg(argp, double*);
-        i++;
-    }
-    if (verbosity) message_publish(MSG_DEBUG,"\n");
+void	Trick::Integrator::deriv_in	(	double*	arg1,	va_list	argp)	{
+				int	i	=	0;
+				double*	next_arg	=	arg1;
+				if	(verbosity)	message_publish(MSG_DEBUG,	"LOAD	DERIV:	");
+				while	(next_arg	!=	(double*)	NULL)	{
+								deriv[intermediate_step][i]	=	*next_arg;
+								if	(verbosity)	message_publish(MSG_DEBUG,"		%g",	*next_arg);
+								next_arg	=	va_arg(argp,	double*);
+								i++;
+				}
+				if	(verbosity)	message_publish(MSG_DEBUG,"\n");
 }
 
-void Trick::Integrator::deriv_in ( double* arg1, ...) {
-    va_list argp;
-    va_start(argp, arg1);
-    deriv_in(arg1, argp);
-    va_end(argp);
+void	Trick::Integrator::deriv_in	(	double*	arg1,	...)	{
+				va_list	argp;
+				va_start(argp,	arg1);
+				deriv_in(arg1,	argp);
+				va_end(argp);
 }
 
-void Trick::Integrator::deriv2_in ( double* arg1, va_list argp) {
-    int i = 0;
-    double* next_arg = arg1;
-    if (verbosity) message_publish(MSG_DEBUG, "LOAD DERIV2: ");
-    while (next_arg != (double*) NULL) {
-        deriv2[intermediate_step][i] = *next_arg;
-        if (verbosity) message_publish(MSG_DEBUG,"  %g", *next_arg);
-        next_arg = va_arg(argp, double*);
-        i++;
-    }
-    if (verbosity) message_publish(MSG_DEBUG,"\n");
+void	Trick::Integrator::deriv2_in	(	double*	arg1,	va_list	argp)	{
+				int	i	=	0;
+				double*	next_arg	=	arg1;
+				if	(verbosity)	message_publish(MSG_DEBUG,	"LOAD	DERIV2:	");
+				while	(next_arg	!=	(double*)	NULL)	{
+								deriv2[intermediate_step][i]	=	*next_arg;
+								if	(verbosity)	message_publish(MSG_DEBUG,"		%g",	*next_arg);
+								next_arg	=	va_arg(argp,	double*);
+								i++;
+				}
+				if	(verbosity)	message_publish(MSG_DEBUG,"\n");
 }
 
-void Trick::Integrator::deriv2_in ( double* arg1, ...) {
-    va_list argp;
-    va_start(argp, arg1);
-    deriv2_in(arg1, argp);
-    va_end(argp);
+void	Trick::Integrator::deriv2_in	(	double*	arg1,	...)	{
+				va_list	argp;
+				va_start(argp,	arg1);
+				deriv2_in(arg1,	argp);
+				va_end(argp);
 }
 
-void Trick::Integrator::state_out (double* arg1, va_list argp) {
-    int i = 0;
-    double* next_arg = arg1;
-    if (verbosity) message_publish(MSG_DEBUG, "UNLOAD STATE: ");
-    while (next_arg != (double*) NULL) {
-        *next_arg = state_ws[intermediate_step][i];
-        if (verbosity) message_publish(MSG_DEBUG,"  %g", *next_arg);
-        next_arg = va_arg(argp, double*);
-        i++;
-    }
-    if (verbosity) message_publish(MSG_DEBUG,"\n");
+void	Trick::Integrator::state_out	(double*	arg1,	va_list	argp)	{
+				int	i	=	0;
+				double*	next_arg	=	arg1;
+				if	(verbosity)	message_publish(MSG_DEBUG,	"UNLOAD	STATE:	");
+				while	(next_arg	!=	(double*)	NULL)	{
+								*next_arg	=	state_ws[intermediate_step][i];
+								if	(verbosity)	message_publish(MSG_DEBUG,"		%g",	*next_arg);
+								next_arg	=	va_arg(argp,	double*);
+								i++;
+				}
+				if	(verbosity)	message_publish(MSG_DEBUG,"\n");
 }
 
-void Trick::Integrator::state_out (double* arg1, ...) {
-    va_list argp;
-    va_start(argp, arg1);
-    state_out(arg1, argp);
-    va_end(argp);
+void	Trick::Integrator::state_out	(double*	arg1,	...)	{
+				va_list	argp;
+				va_start(argp,	arg1);
+				state_out(arg1,	argp);
+				va_end(argp);
 }
 
-bool Trick::Integrator::get_first_step_deriv() {
-    return (first_step_deriv);
+bool	Trick::Integrator::get_first_step_deriv()	{
+				return	(first_step_deriv);
 }
 
-void Trick::Integrator::set_first_step_deriv(bool first_step) {
-    first_step_deriv = first_step;
+void	Trick::Integrator::set_first_step_deriv(bool	first_step)	{
+				first_step_deriv	=	first_step;
 }
 
-bool Trick::Integrator::get_last_step_deriv() {
-    return (last_step_deriv);
+bool	Trick::Integrator::get_last_step_deriv()	{
+				return	(last_step_deriv);
 }
 
-void Trick::Integrator::set_last_step_deriv(bool last_step) {
-    last_step_deriv = last_step;
+void	Trick::Integrator::set_last_step_deriv(bool	last_step)	{
+				last_step_deriv	=	last_step;
 }
 
-void Trick::Integrator::set_verbosity(int level) {
-    verbosity = level;
+void	Trick::Integrator::set_verbosity(int	level)	{
+				verbosity	=	level;
 }
diff --git a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
index 39eeeebd9..455b63017 100644
--- a/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
+++ b/trick_source/sim_services/Integrator/src/Integrator_C_Intf.cpp
@@ -1,159 +1,159 @@
 
-#include "trick/integrator_c_intf.h"
-#include "trick/Integrator.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include <stdarg.h>
-#include <iostream>
+#include	"trick/integrator_c_intf.h"
+#include	"trick/Integrator.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	<stdarg.h>
+#include	<iostream>
 
-/* GLOBAL Integrator. */
-extern Trick::Integrator* trick_curr_integ ;
+/*	GLOBAL	Integrator.	*/
+extern	Trick::Integrator*	trick_curr_integ	;
 
-extern "C" int integrate() {
-    return (trick_curr_integ->integrate());
+extern	"C"	int	integrate()	{
+				return	(trick_curr_integ->integrate());
 }
 
-extern "C" int integrate_1st_order_ode(const double* deriv, double* state) {
-    return (trick_curr_integ->integrate_1st_order_ode(deriv, state));
+extern	"C"	int	integrate_1st_order_ode(const	double*	deriv,	double*	state)	{
+				return	(trick_curr_integ->integrate_1st_order_ode(deriv,	state));
 }
 
-extern "C" int integrate_2nd_order_ode(const double* acc, double* vel, double * pos) {
-    return (trick_curr_integ->integrate_2nd_order_ode(acc, vel, pos));
+extern	"C"	int	integrate_2nd_order_ode(const	double*	acc,	double*	vel,	double	*	pos)	{
+				return	(trick_curr_integ->integrate_2nd_order_ode(acc,	vel,	pos));
 }
 
-extern "C" double get_integ_time() {
-	return (trick_curr_integ->time);
+extern	"C"	double	get_integ_time()	{
+	return	(trick_curr_integ->time);
 }
 
-extern "C" double get_integ_dt(void) {
-	return (trick_curr_integ->dt);
+extern	"C"	double	get_integ_dt(void)	{
+	return	(trick_curr_integ->dt);
 }
 
-extern "C" double get_integ_target_time(void) {
-	return (trick_curr_integ->target_integ_time);
+extern	"C"	double	get_integ_target_time(void)	{
+	return	(trick_curr_integ->target_integ_time);
 }
 
-extern "C" void set_integ_time(double time_value) {
-    trick_curr_integ->time = time_value;
-    trick_curr_integ->target_integ_time = time_value;
+extern	"C"	void	set_integ_time(double	time_value)	{
+				trick_curr_integ->time	=	time_value;
+				trick_curr_integ->target_integ_time	=	time_value;
 }
 
-extern "C" void reset_state() {
-#ifdef USE_ER7_UTILS_INTEGRATORS
+extern	"C"	void	reset_state()	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
 #else
-    trick_curr_integ->state_reset();
+				trick_curr_integ->state_reset();
 #endif
 }
 
-extern "C" void load_state(double* arg1, ... ) {
-    va_list argp;
-    if (trick_curr_integ != NULL) {
-        va_start(argp, arg1);
-        trick_curr_integ->state_in(arg1, argp);
-        va_end(argp);
-    } else {
-       message_publish(MSG_ERROR, "Integ load_state ERROR: trick_curr_integ is not set.\n") ;
-    }
+extern	"C"	void	load_state(double*	arg1,	...	)	{
+				va_list	argp;
+				if	(trick_curr_integ	!=	NULL)	{
+								va_start(argp,	arg1);
+								trick_curr_integ->state_in(arg1,	argp);
+								va_end(argp);
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	load_state	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" void load_indexed_state(unsigned int index , double state) {
+extern	"C"	void	load_indexed_state(unsigned	int	index	,	double	state)	{
 
-    if (trick_curr_integ != NULL) {
-        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG," LOAD INDEXED STATE: %f\n", state);
-        trick_curr_integ->state[index] = state ;
-    } else {
-       message_publish(MSG_ERROR, "Integ load_indexed_state ERROR: trick_curr_integ is not set.\n") ;
-    }
+				if	(trick_curr_integ	!=	NULL)	{
+								if	(trick_curr_integ->verbosity)	message_publish(MSG_DEBUG,"	LOAD	INDEXED	STATE:	%f\n",	state);
+								trick_curr_integ->state[index]	=	state	;
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	load_indexed_state	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-#ifndef USE_ER7_UTILS_INTEGRATORS
-// Warning: state_p should never point to an automatic local variable.
-extern "C" void load_state_element(unsigned int index , double* state_p) {
+#ifndef	USE_ER7_UTILS_INTEGRATORS
+//	Warning:	state_p	should	never	point	to	an	automatic	local	variable.
+extern	"C"	void	load_state_element(unsigned	int	index	,	double*	state_p)	{
 
-    if (trick_curr_integ != NULL) {
-        trick_curr_integ->state_element_in (index, state_p);
-    } else {
-       message_publish(MSG_ERROR, "Integ load_indexed_state ERROR: trick_curr_integ is not set.\n") ;
-    }
+				if	(trick_curr_integ	!=	NULL)	{
+								trick_curr_integ->state_element_in	(index,	state_p);
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	load_indexed_state	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 #endif
 
-extern "C" void load_deriv( double* arg1, ...) {
+extern	"C"	void	load_deriv(	double*	arg1,	...)	{
 
-    va_list argp;
-    if (trick_curr_integ != NULL) {
-        va_start(argp, arg1);
-        trick_curr_integ->deriv_in(arg1, argp);
-        va_end(argp);
-    } else {
-       message_publish(MSG_ERROR, "Integ load_deriv ERROR: trick_curr_integ is not set.\n") ;
-    }
+				va_list	argp;
+				if	(trick_curr_integ	!=	NULL)	{
+								va_start(argp,	arg1);
+								trick_curr_integ->deriv_in(arg1,	argp);
+								va_end(argp);
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	load_deriv	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" void load_indexed_deriv(unsigned int index , double deriv) {
+extern	"C"	void	load_indexed_deriv(unsigned	int	index	,	double	deriv)	{
 
-    if (trick_curr_integ != NULL) {
-        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"LOAD INDEXED DERIV: %f\n", deriv);
-        trick_curr_integ->deriv[trick_curr_integ->intermediate_step][index] = deriv ;
-    } else {
-        message_publish(MSG_ERROR, "Integ load_indexed_deriv ERROR: trick_curr_integ is not set.\n") ;
-    }
+				if	(trick_curr_integ	!=	NULL)	{
+								if	(trick_curr_integ->verbosity)	message_publish(MSG_DEBUG,"LOAD	INDEXED	DERIV:	%f\n",	deriv);
+								trick_curr_integ->deriv[trick_curr_integ->intermediate_step][index]	=	deriv	;
+				}	else	{
+								message_publish(MSG_ERROR,	"Integ	load_indexed_deriv	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" void load_deriv2( double* arg1, ...) {
+extern	"C"	void	load_deriv2(	double*	arg1,	...)	{
 
-    va_list argp;
-    if (trick_curr_integ != NULL) {
-        va_start(argp, arg1);
-        trick_curr_integ->deriv2_in(arg1, argp);
-        va_end(argp);
-    } else {
-       message_publish(MSG_ERROR, "Integ load_deriv2 ERROR: trick_curr_integ is not set.\n") ;
-    }
+				va_list	argp;
+				if	(trick_curr_integ	!=	NULL)	{
+								va_start(argp,	arg1);
+								trick_curr_integ->deriv2_in(arg1,	argp);
+								va_end(argp);
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	load_deriv2	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" void load_indexed_deriv2(unsigned int index , double deriv2) {
+extern	"C"	void	load_indexed_deriv2(unsigned	int	index	,	double	deriv2)	{
 
-    if (trick_curr_integ != NULL) {
-        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"LOAD INDEXED DERIV2: %f\n", deriv2);
-        trick_curr_integ->deriv2[trick_curr_integ->intermediate_step][index] = deriv2 ;
-    } else {
-        message_publish(MSG_ERROR, "Integ load_indexed_deriv2 ERROR: trick_curr_integ is not set.\n") ;
-    }
+				if	(trick_curr_integ	!=	NULL)	{
+								if	(trick_curr_integ->verbosity)	message_publish(MSG_DEBUG,"LOAD	INDEXED	DERIV2:	%f\n",	deriv2);
+								trick_curr_integ->deriv2[trick_curr_integ->intermediate_step][index]	=	deriv2	;
+				}	else	{
+								message_publish(MSG_ERROR,	"Integ	load_indexed_deriv2	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" void unload_state (double* arg1, ...) {
+extern	"C"	void	unload_state	(double*	arg1,	...)	{
 
-    va_list argp;
-    if (trick_curr_integ != NULL) {
-        va_start(argp, arg1);
-        trick_curr_integ->state_out(arg1, argp);
-        va_end(argp);
-    } else {
-       message_publish(MSG_ERROR, "Integ unload_state ERROR: trick_curr_integ is not set.\n") ;
-    }
+				va_list	argp;
+				if	(trick_curr_integ	!=	NULL)	{
+								va_start(argp,	arg1);
+								trick_curr_integ->state_out(arg1,	argp);
+								va_end(argp);
+				}	else	{
+							message_publish(MSG_ERROR,	"Integ	unload_state	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 }
 
-extern "C" double unload_indexed_state (unsigned int index) {
+extern	"C"	double	unload_indexed_state	(unsigned	int	index)	{
 
-    if (trick_curr_integ != NULL) {
-        if (trick_curr_integ->verbosity) message_publish(MSG_DEBUG,"UNLOAD INDEXED STATE: %u\n", index);
-        return(trick_curr_integ->state_ws[trick_curr_integ->intermediate_step][index]) ;
-    } else {
-        message_publish(MSG_ERROR, "Integ unload_indexed_state ERROR: trick_curr_integ is not set.\n") ;
-    }
+				if	(trick_curr_integ	!=	NULL)	{
+								if	(trick_curr_integ->verbosity)	message_publish(MSG_DEBUG,"UNLOAD	INDEXED	STATE:	%u\n",	index);
+								return(trick_curr_integ->state_ws[trick_curr_integ->intermediate_step][index])	;
+				}	else	{
+								message_publish(MSG_ERROR,	"Integ	unload_indexed_state	ERROR:	trick_curr_integ	is	not	set.\n")	;
+				}
 
-    return 0.0 ;
+				return	0.0	;
 }
 
-extern "C" int get_intermediate_step() {
-    return( trick_curr_integ->intermediate_step);
+extern	"C"	int	get_intermediate_step()	{
+				return(	trick_curr_integ->intermediate_step);
 }
 
-extern "C" void set_intermediate_step(int intermediate_step_value) {
-    trick_curr_integ->intermediate_step = intermediate_step_value;
+extern	"C"	void	set_intermediate_step(int	intermediate_step_value)	{
+				trick_curr_integ->intermediate_step	=	intermediate_step_value;
 }
 
-extern "C" int get_integ_type() {
-    return( trick_curr_integ->get_Integrator_type());
+extern	"C"	int	get_integ_type()	{
+				return(	trick_curr_integ->get_Integrator_type());
 }
diff --git a/trick_source/sim_services/Integrator/src/getIntegrator.cpp b/trick_source/sim_services/Integrator/src/getIntegrator.cpp
index 31c774f1b..50ccac300 100644
--- a/trick_source/sim_services/Integrator/src/getIntegrator.cpp
+++ b/trick_source/sim_services/Integrator/src/getIntegrator.cpp
@@ -1,207 +1,207 @@
 /*******************************************************************************
 
 Purpose:
-  (Implement free function TrickgetIntegrator.)
+		(Implement	free	function	TrickgetIntegrator.)
 
 Programmers:
-  (((Alex Lin)     (NASA) (2009))
-   ((John Penn)    (L3) (2010))
-   ((Donna Panter) (L3) (2012))
-   ((David Hammen) (Odyssey) (July 2012) (JEOD_2.2 #462) (Joint Trick/JEOD integration framework))
-  )
+		(((Alex	Lin)					(NASA)	(2009))
+			((John	Penn)				(L3)	(2010))
+			((Donna	Panter)	(L3)	(2012))
+			((David	Hammen)	(Odyssey)	(July	2012)	(JEOD_2.2	#462)	(Joint	Trick/JEOD	integration	framework))
+		)
 
 *******************************************************************************/
 
-// System includes
-#include <iostream>
+//	System	includes
+#include	<iostream>
 
-// Trick includes
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+//	Trick	includes
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-#ifdef USE_ER7_UTILS_INTEGRATORS
-// Interface includes
-#include "er7_utils/interface/include/alloc.hh"
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+//	Interface	includes
+#include	"er7_utils/interface/include/alloc.hh"
 
-// Integration includes
-#include "er7_utils/integration/core/include/integrator_constructor_factory.hh"
+//	Integration	includes
+#include	"er7_utils/integration/core/include/integrator_constructor_factory.hh"
 #endif
 
-// Local includes
-#include "trick/Integrator.hh"
-#include "trick/IntegAlgorithms.hh"
+//	Local	includes
+#include	"trick/Integrator.hh"
+#include	"trick/IntegAlgorithms.hh"
 
-#ifdef USE_ER7_UTILS_INTEGRATORS
+#ifdef	USE_ER7_UTILS_INTEGRATORS
 /**
- * Allocate an integrator of type T.
- */
-template <typename T>
-static T* allocate_integrator (
-   unsigned int state_size,
-   double delta_t)
+	*	Allocate	an	integrator	of	type	T.
+	*/
+template	<typename	T>
+static	T*	allocate_integrator	(
+			unsigned	int	state_size,
+			double	delta_t)
 {
-   return er7_utils::alloc::allocate_object<T, unsigned int, double> ( state_size, delta_t);
+			return	er7_utils::alloc::allocate_object<T,	unsigned	int,	double>	(	state_size,	delta_t);
 }
 #endif
 
 /**
- * Create an integrator of the specified type.
- * Note well: The caller is responsible for deleting the allocated integrator.
- * @param[in] alg         Integration technique
- * @param[in] state_size  Number of elements in the state vector
- * @param[in] delta_t     Simulation engine time step
- */
+	*	Create	an	integrator	of	the	specified	type.
+	*	Note	well:	The	caller	is	responsible	for	deleting	the	allocated	integrator.
+	*	@param[in]	alg									Integration	technique
+	*	@param[in]	state_size		Number	of	elements	in	the	state	vector
+	*	@param[in]	delta_t					Simulation	engine	time	step
+	*/
 Trick::Integrator*
-Trick::getIntegrator ( Integrator_type alg, unsigned int state_size, double delta_t) {
-   switch(alg) {
+Trick::getIntegrator	(	Integrator_type	alg,	unsigned	int	state_size,	double	delta_t)	{
+			switch(alg)	{
 
-   case Euler : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return er7_utils::alloc::allocate_object<Trick::Euler_Integrator,unsigned int, double>( state_size, delta_t);
+			case	Euler	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	er7_utils::alloc::allocate_object<Trick::Euler_Integrator,unsigned	int,	double>(	state_size,	delta_t);
 #else
-      Trick::Euler_Integrator* I = INTEG_NEW( Trick::Euler_Integrator);
-      I = new (I) Trick::Euler_Integrator( state_size, delta_t);
-      return I;
+						Trick::Euler_Integrator*	I	=	INTEG_NEW(	Trick::Euler_Integrator);
+						I	=	new	(I)	Trick::Euler_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Euler_Cromer : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::Euler_Cromer_Integrator> ( state_size, delta_t);
+			case	Euler_Cromer	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::Euler_Cromer_Integrator>	(	state_size,	delta_t);
 #else
-      Trick::Euler_Cromer_Integrator* I = INTEG_NEW( Trick::Euler_Cromer_Integrator);
-      I = new (I) Trick::Euler_Cromer_Integrator( state_size, delta_t);
-      return I;
+						Trick::Euler_Cromer_Integrator*	I	=	INTEG_NEW(	Trick::Euler_Cromer_Integrator);
+						I	=	new	(I)	Trick::Euler_Cromer_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Nystrom_Lear_2 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::NL2_Integrator> (
-                state_size, delta_t);
+			case	Nystrom_Lear_2	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::NL2_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::NL2_Integrator* I = INTEG_NEW( Trick::NL2_Integrator);
-      I = new (I) Trick::NL2_Integrator( state_size, delta_t);
-      return I;
+						Trick::NL2_Integrator*	I	=	INTEG_NEW(	Trick::NL2_Integrator);
+						I	=	new	(I)	Trick::NL2_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Runge_Kutta_2 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::RK2_Integrator> (
-                state_size, delta_t);
+			case	Runge_Kutta_2	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::RK2_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::RK2_Integrator* I = INTEG_NEW( Trick::RK2_Integrator);
-      I = new (I) Trick::RK2_Integrator( state_size, delta_t);
-      return I;
+						Trick::RK2_Integrator*	I	=	INTEG_NEW(	Trick::RK2_Integrator);
+						I	=	new	(I)	Trick::RK2_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Modified_Midpoint_4 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::MM4_Integrator> (
-                state_size, delta_t);
+			case	Modified_Midpoint_4	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::MM4_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::MM4_Integrator* I = INTEG_NEW( Trick::MM4_Integrator);
-      I = new (I) Trick::MM4_Integrator( state_size, delta_t);
-      return I;
+						Trick::MM4_Integrator*	I	=	INTEG_NEW(	Trick::MM4_Integrator);
+						I	=	new	(I)	Trick::MM4_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Runge_Kutta_4 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::RK4_Integrator> (
-                state_size, delta_t);
+			case	Runge_Kutta_4	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::RK4_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::RK4_Integrator* I = INTEG_NEW( Trick::RK4_Integrator);
-      I = new (I) Trick::RK4_Integrator( state_size, delta_t);
-      return I;
+						Trick::RK4_Integrator*	I	=	INTEG_NEW(	Trick::RK4_Integrator);
+						I	=	new	(I)	Trick::RK4_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Runge_Kutta_Gill_4 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::RKG4_Integrator> (
-                state_size, delta_t);
+			case	Runge_Kutta_Gill_4	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::RKG4_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::RKG4_Integrator* I = INTEG_NEW( Trick::RKG4_Integrator);
-      I = new (I) Trick::RKG4_Integrator( state_size, delta_t);
-      return I;
+						Trick::RKG4_Integrator*	I	=	INTEG_NEW(	Trick::RKG4_Integrator);
+						I	=	new	(I)	Trick::RKG4_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Runge_Kutta_Fehlberg_45 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::RKF45_Integrator> (
-                state_size, delta_t);
+			case	Runge_Kutta_Fehlberg_45	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::RKF45_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::RKF45_Integrator* I = INTEG_NEW( Trick::RKF45_Integrator);
-      I = new (I) Trick::RKF45_Integrator( state_size, delta_t);
-      return I;
+						Trick::RKF45_Integrator*	I	=	INTEG_NEW(	Trick::RKF45_Integrator);
+						I	=	new	(I)	Trick::RKF45_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case Runge_Kutta_Fehlberg_78 : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::RKF78_Integrator> (
-                state_size, delta_t);
+			case	Runge_Kutta_Fehlberg_78	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::RKF78_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::RKF78_Integrator* I = INTEG_NEW( Trick::RKF78_Integrator);
-      I = new (I) Trick::RKF78_Integrator( state_size, delta_t);
-      return I;
+						Trick::RKF78_Integrator*	I	=	INTEG_NEW(	Trick::RKF78_Integrator);
+						I	=	new	(I)	Trick::RKF78_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   case ABM_Method : {
-#ifdef USE_ER7_UTILS_INTEGRATORS
-      return allocate_integrator<Trick::ABM_Integrator> (
-                state_size, delta_t);
+			case	ABM_Method	:	{
+#ifdef	USE_ER7_UTILS_INTEGRATORS
+						return	allocate_integrator<Trick::ABM_Integrator>	(
+																state_size,	delta_t);
 #else
-      Trick::ABM_Integrator* I = INTEG_NEW( Trick::ABM_Integrator);
-      I = new (I) Trick::ABM_Integrator( state_size, delta_t);
-      return I;
+						Trick::ABM_Integrator*	I	=	INTEG_NEW(	Trick::ABM_Integrator);
+						I	=	new	(I)	Trick::ABM_Integrator(	state_size,	delta_t);
+						return	I;
 #endif
-   } break;
+			}	break;
 
-   default :
-      message_publish (MSG_ERROR,
-                       "Integ getIntegrator ERROR: No such Integrator.\n") ;
-      return (NULL);
-   }
+			default	:
+						message_publish	(MSG_ERROR,
+																							"Integ	getIntegrator	ERROR:	No	such	Integrator.\n")	;
+						return	(NULL);
+			}
 }
 
-#if 0
+#if	0
 /**
- * Create an integrator of the specified type.
- * Note well: The caller is responsible for deleting the allocated integrator.
- * @param[in] alg         Integration technique
- * @param[in] state_size  Number of elements in the state vector
- * @param[in] delta_t     Simulation engine time step
- */
+	*	Create	an	integrator	of	the	specified	type.
+	*	Note	well:	The	caller	is	responsible	for	deleting	the	allocated	integrator.
+	*	@param[in]	alg									Integration	technique
+	*	@param[in]	state_size		Number	of	elements	in	the	state	vector
+	*	@param[in]	delta_t					Simulation	engine	time	step
+	*/
 Trick::Integrator*
-Trick::getEr7Integrator (
-   er7_utils::Integration::Technique alg,
-   unsigned int state_size,
-   double delta_t)
+Trick::getEr7Integrator	(
+			er7_utils::Integration::Technique	alg,
+			unsigned	int	state_size,
+			double	delta_t)
 {
-   er7_utils::IntegratorConstructor * integ_constructor =
-      er7_utils::IntegratorConstructorFactory::create (alg);
-
-   if (integ_constructor->is_second_order_ode_technique()) {
-      bool use_deriv2 = alg == er7_utils::Integration::SymplecticEuler;
-      return er7_utils::alloc::allocate_object<
-                   er7_utils::TrickSecondOrderOdeIntegrator,
-                   er7_utils::IntegratorConstructor&,
-                   unsigned int, double, bool> (
-                *integ_constructor, state_size, delta_t, use_deriv2);
-   }
-   else {
-      return er7_utils::alloc::allocate_object<
-                   er7_utils::TrickFirstOrderOdeIntegrator,
-                   er7_utils::IntegratorConstructor&,
-                   unsigned int, double> (
-                *integ_constructor, state_size, delta_t);
-   }
+			er7_utils::IntegratorConstructor	*	integ_constructor	=
+						er7_utils::IntegratorConstructorFactory::create	(alg);
+
+			if	(integ_constructor->is_second_order_ode_technique())	{
+						bool	use_deriv2	=	alg	==	er7_utils::Integration::SymplecticEuler;
+						return	er7_utils::alloc::allocate_object<
+																			er7_utils::TrickSecondOrderOdeIntegrator,
+																			er7_utils::IntegratorConstructor&,
+																			unsigned	int,	double,	bool>	(
+																*integ_constructor,	state_size,	delta_t,	use_deriv2);
+			}
+			else	{
+						return	er7_utils::alloc::allocate_object<
+																			er7_utils::TrickFirstOrderOdeIntegrator,
+																			er7_utils::IntegratorConstructor&,
+																			unsigned	int,	double>	(
+																*integ_constructor,	state_size,	delta_t);
+			}
 }
 #endif
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp
index 3a6ba9d6b..c756386e2 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp
@@ -1,189 +1,189 @@
-#include "trick/ABM_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/ABM_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::ABM_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-
-    /** Init parent class */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, 4);
-    for(i=0; i<4 ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, 4);
-    for(i=0; i<4 ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the stored data.*/
-    stored_data = INTEG_ALLOC( double*, 8);
-    for(i=0; i<8 ; i++) {
-        stored_data[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::ABM_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+
+				/**	Init	parent	class	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	4);
+				for(i=0;	i<4	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	4);
+				for(i=0;	i<4	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	stored	data.*/
+				stored_data	=	INTEG_ALLOC(	double*,	8);
+				for(i=0;	i<8	;	i++)	{
+								stored_data[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::ABM_Integrator::ABM_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::ABM_Integrator().\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::ABM_Integrator::ABM_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::ABM_Integrator().\n");
+				}
+				initialize(State_size,	Dt);
 }
 
-Trick::ABM_Integrator::~ABM_Integrator() {
+Trick::ABM_Integrator::~ABM_Integrator()	{
 
-    int i;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    if (state) INTEG_FREE(state);
+				if	(state)	INTEG_FREE(state);
 
-    for(i=0; i<4 ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				for(i=0;	i<4	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    for(i=0; i<4 ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				for(i=0;	i<4	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 
-    for(i=0; i<8 ; i++) {
-        if (stored_data[i]) INTEG_FREE(stored_data[i]);
-    }
-    if (stored_data) INTEG_FREE(stored_data);
+				for(i=0;	i<8	;	i++)	{
+								if	(stored_data[i])	INTEG_FREE(stored_data[i]);
+				}
+				if	(stored_data)	INTEG_FREE(stored_data);
 }
 
 /**
- */
-int Trick::ABM_Integrator::integrate() {
-
-    int i;
-    int j;
-    double dto2;
-    double dto3, dto6;
-
-    if (!primed) {
-        /* 1) prime using standard rk_4 2) set primed to 1 */
-        switch (intermediate_step) {
-            case 0:
-                /* Do a sanity check on stored_data to see if it is allocated */
-                if (stored_data == NULL) {
-                    message_publish(MSG_ERROR, "ABM_Integrator: stored_data is NULL\n");
-                    return(0);
-                }
-
-                /* Save initial time and compute time increments */
-                time_0 = time;
-                dto2 = dt / 2.0;
-
-                /* Save initial state and compute state at t = t + dt/2 */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[0][i] = state[i];
-                    state_ws[1][i] = state[i] + deriv[0][i] * dto2;
-                }
-                intermediate_step = 1;
-                break;
-            case 1:
-                /* Compute time increments */
-                dto2 = dt / 2.0;
-                /* Compute adjusted state at t = t + dt/2 */
-                for (i = 0; i < num_state; i++)
-                    state_ws[2][i] = state_ws[0][i] + deriv[1][i] * dto2;
-                intermediate_step = 2;
-                break;
-            case 2:
-                /* Compute state at t = t + dt */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[3][i] = state_ws[0][i] + deriv[2][i] * dt;
-                }
-
-                intermediate_step = 3;
-                break;
-            case 3:
-                /* Calculate time step increments */
-                dto3 = dt / 3.0;
-                dto6 = dt / 6.0;
-
-                /* Compute adjusted state at t = t + dt */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[0][i] +=
-                        ((deriv[0][i] + deriv[3][i]) * dto6 + (deriv[1][i] + deriv[2][i]) * dto3);
-                    stored_data[4 + counter][i] = deriv[3][i];
-                }
-
-                /* Update time */
-                time = time_0 + dt;
-
-                intermediate_step = 0;
-                counter = counter + 1;
-                if ((counter + 4) == 8) {
-                    first_step_deriv = 0;
-                    primed = 1;
-                }
-                break;
-        }
-    } else {
-        switch (intermediate_step) {
-            case 0:
-                /* Use the predictor method to calc deriv */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[0][i] = state[i];
-                    state_ws[1][i] = state[i] + dt / 24.0 * (55.0 * stored_data[7][i]
-                                                                      - 59.0 * stored_data[6][i]
-                                                                      + 37.0 * stored_data[5][i]
-                                                                      - 9.0 * stored_data[4][i]);
-                }
-                intermediate_step = 1;
-                break;
-            case 1:
-                /* Use the corrector method to calc new deriv */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[2][i] = state_ws[0][i] + dt / 24.0 * (9.0 * deriv[1][i]
-                                                                            + 19.0 * stored_data[7][i]
-                                                                            - 5.0 * stored_data[6][i]
-                                                                            + stored_data[5][i]);
-                }
-                intermediate_step = 2;
-                break;
-            case 2:
-                /* Reset the values in the array of derivatives */
-                for (i = 0; i < num_state; i++) {
-                    state_ws[0][i] = state_ws[2][i];
-                }
-                /* Shift values in data array and add new data */
-                for (i = 0; i < num_state; i++) {
-                    for (j = 0; j < 7; j++) {
-                        stored_data[j][i] = stored_data[j + 1][i];
-                    }
-                    stored_data[7][i] = deriv[2][i];
-                }
-
-                /* Update time */
-                time = time_0 + dt;
-
-                intermediate_step = 0;
-                break;
-        }
-    }
-
-    return( intermediate_step);
+	*/
+int	Trick::ABM_Integrator::integrate()	{
+
+				int	i;
+				int	j;
+				double	dto2;
+				double	dto3,	dto6;
+
+				if	(!primed)	{
+								/*	1)	prime	using	standard	rk_4	2)	set	primed	to	1	*/
+								switch	(intermediate_step)	{
+												case	0:
+																/*	Do	a	sanity	check	on	stored_data	to	see	if	it	is	allocated	*/
+																if	(stored_data	==	NULL)	{
+																				message_publish(MSG_ERROR,	"ABM_Integrator:	stored_data	is	NULL\n");
+																				return(0);
+																}
+
+																/*	Save	initial	time	and	compute	time	increments	*/
+																time_0	=	time;
+																dto2	=	dt	/	2.0;
+
+																/*	Save	initial	state	and	compute	state	at	t	=	t	+	dt/2	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[0][i]	=	state[i];
+																				state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dto2;
+																}
+																intermediate_step	=	1;
+																break;
+												case	1:
+																/*	Compute	time	increments	*/
+																dto2	=	dt	/	2.0;
+																/*	Compute	adjusted	state	at	t	=	t	+	dt/2	*/
+																for	(i	=	0;	i	<	num_state;	i++)
+																				state_ws[2][i]	=	state_ws[0][i]	+	deriv[1][i]	*	dto2;
+																intermediate_step	=	2;
+																break;
+												case	2:
+																/*	Compute	state	at	t	=	t	+	dt	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[3][i]	=	state_ws[0][i]	+	deriv[2][i]	*	dt;
+																}
+
+																intermediate_step	=	3;
+																break;
+												case	3:
+																/*	Calculate	time	step	increments	*/
+																dto3	=	dt	/	3.0;
+																dto6	=	dt	/	6.0;
+
+																/*	Compute	adjusted	state	at	t	=	t	+	dt	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[0][i]	+=
+																								((deriv[0][i]	+	deriv[3][i])	*	dto6	+	(deriv[1][i]	+	deriv[2][i])	*	dto3);
+																				stored_data[4	+	counter][i]	=	deriv[3][i];
+																}
+
+																/*	Update	time	*/
+																time	=	time_0	+	dt;
+
+																intermediate_step	=	0;
+																counter	=	counter	+	1;
+																if	((counter	+	4)	==	8)	{
+																				first_step_deriv	=	0;
+																				primed	=	1;
+																}
+																break;
+								}
+				}	else	{
+								switch	(intermediate_step)	{
+												case	0:
+																/*	Use	the	predictor	method	to	calc	deriv	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[0][i]	=	state[i];
+																				state_ws[1][i]	=	state[i]	+	dt	/	24.0	*	(55.0	*	stored_data[7][i]
+																																																																						-	59.0	*	stored_data[6][i]
+																																																																						+	37.0	*	stored_data[5][i]
+																																																																						-	9.0	*	stored_data[4][i]);
+																}
+																intermediate_step	=	1;
+																break;
+												case	1:
+																/*	Use	the	corrector	method	to	calc	new	deriv	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[2][i]	=	state_ws[0][i]	+	dt	/	24.0	*	(9.0	*	deriv[1][i]
+																																																																												+	19.0	*	stored_data[7][i]
+																																																																												-	5.0	*	stored_data[6][i]
+																																																																												+	stored_data[5][i]);
+																}
+																intermediate_step	=	2;
+																break;
+												case	2:
+																/*	Reset	the	values	in	the	array	of	derivatives	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				state_ws[0][i]	=	state_ws[2][i];
+																}
+																/*	Shift	values	in	data	array	and	add	new	data	*/
+																for	(i	=	0;	i	<	num_state;	i++)	{
+																				for	(j	=	0;	j	<	7;	j++)	{
+																								stored_data[j][i]	=	stored_data[j	+	1][i];
+																				}
+																				stored_data[7][i]	=	deriv[2][i];
+																}
+
+																/*	Update	time	*/
+																time	=	time_0	+	dt;
+
+																intermediate_step	=	0;
+																break;
+								}
+				}
+
+				return(	intermediate_step);
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp
index 64409ac8f..66f47a6e4 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp
@@ -1,130 +1,130 @@
-#include "trick/Euler_Cromer_Integrator.hh"
-#include "trick/message_proto.h"
-#include <cstdarg>
+#include	"trick/Euler_Cromer_Integrator.hh"
+#include	"trick/message_proto.h"
+#include	<cstdarg>
 
 /**
- */
-void Trick::Euler_Cromer_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 1;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the state second deriv vector.*/
-    deriv2 = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv2[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::Euler_Cromer_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	1;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	state	second	deriv	vector.*/
+				deriv2	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv2[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::Euler_Cromer_Integrator::Euler_Cromer_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::Euler_Cromer_Integrator()\n");
-    }
-    initialize( State_size, Dt);
+	*/
+Trick::Euler_Cromer_Integrator::Euler_Cromer_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::Euler_Cromer_Integrator()\n");
+				}
+				initialize(	State_size,	Dt);
 }
 
 /**
- */
-Trick::Euler_Cromer_Integrator::~Euler_Cromer_Integrator() {
+	*/
+Trick::Euler_Cromer_Integrator::~Euler_Cromer_Integrator()	{
 
-    const int n_steps = 1;
-    int i;
+				const	int	n_steps	=	1;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the state second deriv vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv2[i]) INTEG_FREE(deriv2[i]);
-    }
-    if (deriv2) INTEG_FREE(deriv2);
+				/**	Free	the	state	second	deriv	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv2[i])	INTEG_FREE(deriv2[i]);
+				}
+				if	(deriv2)	INTEG_FREE(deriv2);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 
 }
 
 /**
- */
-void Trick::Euler_Cromer_Integrator::deriv2_in ( double* arg1, ...) {
-
-    va_list ap;
-    int i;
-    double* narg;
-
-    va_start(ap, arg1);
-
-    i=0;
-    narg = arg1;
-    if (verbosity) message_publish(MSG_DEBUG,"LOAD DERIV2: ");
-    while (narg != (double*)NULL) {
-        deriv2[intermediate_step][i] = *narg;
-        if (verbosity) message_publish(MSG_DEBUG,"  %g",*narg);
-        narg = va_arg(ap, double*);
-        i++;
-    };
-    if (verbosity) message_publish(MSG_DEBUG,"\n");
-    va_end(ap);
+	*/
+void	Trick::Euler_Cromer_Integrator::deriv2_in	(	double*	arg1,	...)	{
+
+				va_list	ap;
+				int	i;
+				double*	narg;
+
+				va_start(ap,	arg1);
+
+				i=0;
+				narg	=	arg1;
+				if	(verbosity)	message_publish(MSG_DEBUG,"LOAD	DERIV2:	");
+				while	(narg	!=	(double*)NULL)	{
+								deriv2[intermediate_step][i]	=	*narg;
+								if	(verbosity)	message_publish(MSG_DEBUG,"		%g",*narg);
+								narg	=	va_arg(ap,	double*);
+								i++;
+				};
+				if	(verbosity)	message_publish(MSG_DEBUG,"\n");
+				va_end(ap);
 }
 
 /**
- */
-int Trick::Euler_Cromer_Integrator::integrate() {
-
-    int i;
-    int ns;
-
-    ns = num_state / 2;
-
-    switch (intermediate_step) {
-        time_0 = time;
-        case 0:
-            for (i = 0; i < ns; i++) {
-                deriv[0][i] = deriv[0][i] + deriv2[0][i] * dt;
-                state_ws[0][i] = state[i] + deriv[0][i] * dt;
-                state_ws[0][i + ns] = deriv[0][i];
-            }
-
-            time = time_0 += dt;
-            intermediate_step = 0;
-            break;
-    }
-    return ( intermediate_step);
+	*/
+int	Trick::Euler_Cromer_Integrator::integrate()	{
+
+				int	i;
+				int	ns;
+
+				ns	=	num_state	/	2;
+
+				switch	(intermediate_step)	{
+								time_0	=	time;
+								case	0:
+												for	(i	=	0;	i	<	ns;	i++)	{
+																deriv[0][i]	=	deriv[0][i]	+	deriv2[0][i]	*	dt;
+																state_ws[0][i]	=	state[i]	+	deriv[0][i]	*	dt;
+																state_ws[0][i	+	ns]	=	deriv[0][i];
+												}
+
+												time	=	time_0	+=	dt;
+												intermediate_step	=	0;
+												break;
+				}
+				return	(	intermediate_step);
 }
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp
index f66f44598..1536ea80e 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp
@@ -1,86 +1,86 @@
-#include "trick/Euler_Integrator.hh"
-#include "trick/message_proto.h"
-#include <iostream>
-#include <stdlib.h>
+#include	"trick/Euler_Integrator.hh"
+#include	"trick/message_proto.h"
+#include	<iostream>
+#include	<stdlib.h>
 
 /**
- */
-void Trick::Euler_Integrator::initialize(int State_size, double Dt) {
+	*/
+void	Trick::Euler_Integrator::initialize(int	State_size,	double	Dt)	{
 
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::Euler_Integrator::initialize().\n") ;
-    }
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::Euler_Integrator::initialize().\n")	;
+				}
 
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
 
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(int i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(int	i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
 
-    /** Allocate the state vector.*/
-    state = INTEG_ALLOC( double, num_state );
+				/**	Allocate	the	state	vector.*/
+				state	=	INTEG_ALLOC(	double,	num_state	);
 
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, 1);
-    deriv[0] = INTEG_ALLOC( double, num_state);
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	1);
+				deriv[0]	=	INTEG_ALLOC(	double,	num_state);
 
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, 1);
-    state_ws[0] = INTEG_ALLOC( double, num_state);
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	1);
+				state_ws[0]	=	INTEG_ALLOC(	double,	num_state);
 }
 
 /**
- */
-Trick::Euler_Integrator::Euler_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::Euler_Integrator().\n") ;
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::Euler_Integrator::Euler_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::Euler_Integrator().\n")	;
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::Euler_Integrator::~Euler_Integrator() {
+	*/
+Trick::Euler_Integrator::~Euler_Integrator()	{
 
-    if (state_origin) INTEG_FREE(state_origin);
-    if (state) INTEG_FREE(state);
-    if (deriv[0]) INTEG_FREE(deriv[0]);
-    if (deriv) INTEG_FREE(deriv);
-    if (state_ws[0]) INTEG_FREE(state_ws[0]);
-    if (state_ws) INTEG_FREE(state_ws);
+				if	(state_origin)	INTEG_FREE(state_origin);
+				if	(state)	INTEG_FREE(state);
+				if	(deriv[0])	INTEG_FREE(deriv[0]);
+				if	(deriv)	INTEG_FREE(deriv);
+				if	(state_ws[0])	INTEG_FREE(state_ws[0]);
+				if	(state_ws)	INTEG_FREE(state_ws);
 
 }
 
 /**
- */
-int Trick::Euler_Integrator::integrate() {
+	*/
+int	Trick::Euler_Integrator::integrate()	{
 
-    int i;
+				int	i;
 
-    switch (intermediate_step) {
-        case 0:
-            time_0 = time;
-            /* Compute 1st state estimate at t = t + dt */
-            for (i = 0; i < num_state; i++)
-                state_ws[0][i] = state[i] + deriv[0][i] * dt;
+				switch	(intermediate_step)	{
+								case	0:
+												time_0	=	time;
+												/*	Compute	1st	state	estimate	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[0][i]	=	state[i]	+	deriv[0][i]	*	dt;
 
-            /* Update time */
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
+												/*	Update	time	*/
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
 
-    return ( intermediate_step);
+				return	(	intermediate_step);
 
 }
 
-void Trick::Euler_Integrator::set_first_step_deriv(bool first_step) {
-    if ( !first_step  ) {
-        message_publish(MSG_WARNING, "Euler Integration scheme should always have first_step_deriv = 1\n");
-    }
-    first_step_deriv = first_step;
+void	Trick::Euler_Integrator::set_first_step_deriv(bool	first_step)	{
+				if	(	!first_step		)	{
+								message_publish(MSG_WARNING,	"Euler	Integration	scheme	should	always	have	first_step_deriv	=	1\n");
+				}
+				first_step_deriv	=	first_step;
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp
index a2924374c..c8d680d61 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp
@@ -1,127 +1,127 @@
-#include "trick/MM4_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/MM4_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::MM4_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 3;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::MM4_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	3;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::MM4_Integrator::MM4_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::MM4_Integrator()\n");
-    }
-    initialize( State_size, Dt);
+	*/
+Trick::MM4_Integrator::MM4_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::MM4_Integrator()\n");
+				}
+				initialize(	State_size,	Dt);
 }
 
 /**
- */
-Trick::MM4_Integrator::~MM4_Integrator() {
+	*/
+Trick::MM4_Integrator::~MM4_Integrator()	{
 
-    const int n_steps = 3;
-    int i;
+				const	int	n_steps	=	3;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 
 
 
 /**
- */
-int Trick::MM4_Integrator::integrate() {
-
-    int i, ii;
-    double dto2;                /* dt / 2 */
-    int no2;                    /* num_state / 2 */
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time and compute time increments */
-            time_0 = time;
-            dto2 = dt / 2.00000000;
-
-            /* Save initial state and compute state at t = t + dt/2 */
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * dto2;
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Update state */
-            for (i = 0; i < num_state; i++)
-                state_ws[2][i] = state_ws[0][i] + deriv[1][i] * dt;
-
-            /* Update time */
-            time = time_0 + dt;
-            intermediate_step = 2;
-            break;
-
-        case 2:
-            dto2 = dt / 2.00000000;
-            no2 = num_state / 2;
-
-            /* Update velocities first, then positions to the full step */
-            for (i = no2; i < num_state; i++) {
-                ii = i - no2;
-                state_ws[0][i] = (state_ws[1][i]
-                                     + state_ws[2][i]
-                                     + deriv[2][i] * dto2) / 2.0;
-                deriv[2][ii] = state_ws[0][i];
-                state_ws[0][ii] = (state_ws[1][ii]
-                                      + state_ws[2][ii]
-                                      + deriv[2][ii] * dto2) / 2.0;
-            }
-            intermediate_step = 0;
-            break;
-    }
-
-    return(intermediate_step);
+	*/
+int	Trick::MM4_Integrator::integrate()	{
+
+				int	i,	ii;
+				double	dto2;																/*	dt	/	2	*/
+				int	no2;																				/*	num_state	/	2	*/
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	and	compute	time	increments	*/
+												time_0	=	time;
+												dto2	=	dt	/	2.00000000;
+
+												/*	Save	initial	state	and	compute	state	at	t	=	t	+	dt/2	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dto2;
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Update	state	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[2][i]	=	state_ws[0][i]	+	deriv[1][i]	*	dt;
+
+												/*	Update	time	*/
+												time	=	time_0	+	dt;
+												intermediate_step	=	2;
+												break;
+
+								case	2:
+												dto2	=	dt	/	2.00000000;
+												no2	=	num_state	/	2;
+
+												/*	Update	velocities	first,	then	positions	to	the	full	step	*/
+												for	(i	=	no2;	i	<	num_state;	i++)	{
+																ii	=	i	-	no2;
+																state_ws[0][i]	=	(state_ws[1][i]
+																																					+	state_ws[2][i]
+																																					+	deriv[2][i]	*	dto2)	/	2.0;
+																deriv[2][ii]	=	state_ws[0][i];
+																state_ws[0][ii]	=	(state_ws[1][ii]
+																																						+	state_ws[2][ii]
+																																						+	deriv[2][ii]	*	dto2)	/	2.0;
+												}
+												intermediate_step	=	0;
+												break;
+				}
+
+				return(intermediate_step);
 
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp
index af2d13d8d..9de0ec611 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp
@@ -1,122 +1,122 @@
-#include "trick/NL2_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/NL2_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::NL2_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 2;
-
-    /** Init parent class. */
-    first_step_deriv = 0;
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::NL2_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	2;
+
+				/**	Init	parent	class.	*/
+				first_step_deriv	=	0;
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::NL2_Integrator::NL2_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::NL2_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::NL2_Integrator::NL2_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::NL2_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::NL2_Integrator::~NL2_Integrator() {
+	*/
+Trick::NL2_Integrator::~NL2_Integrator()	{
 
-    const int n_steps = 2;
-    int i;
+				const	int	n_steps	=	2;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 /**
- */
-int Trick::NL2_Integrator::integrate() {
-
-    int i, no2;
-    double dto2;                /* dt/2 */
-
-    dto2 = dt / 2.0;
-    no2 = num_state / 2;
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time */
-            time_0 = time;
-
-            /* Save first step 0 state and compute 1st state estimate at t = t + dt */
-            for (i = 0; i < no2; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * dto2;
-            }
-            for (; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i];
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-
-            /* Compute final state estimate at t = t + dt */
-            for (i = no2; i < num_state; i++)
-                state_ws[0][i] += (deriv[1][i] * dt);
-
-            for (i = 0; i < no2; i++) {
-                deriv[1][i] = state_ws[0][no2 + i];
-                state_ws[0][i] = state_ws[1][i] + deriv[1][i] * dto2;
-            }
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
-
-    return (intermediate_step);
+	*/
+int	Trick::NL2_Integrator::integrate()	{
+
+				int	i,	no2;
+				double	dto2;																/*	dt/2	*/
+
+				dto2	=	dt	/	2.0;
+				no2	=	num_state	/	2;
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	*/
+												time_0	=	time;
+
+												/*	Save	first	step	0	state	and	compute	1st	state	estimate	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	no2;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dto2;
+												}
+												for	(;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i];
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+
+												/*	Compute	final	state	estimate	at	t	=	t	+	dt	*/
+												for	(i	=	no2;	i	<	num_state;	i++)
+																state_ws[0][i]	+=	(deriv[1][i]	*	dt);
+
+												for	(i	=	0;	i	<	no2;	i++)	{
+																deriv[1][i]	=	state_ws[0][no2	+	i];
+																state_ws[0][i]	=	state_ws[1][i]	+	deriv[1][i]	*	dto2;
+												}
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
+
+				return	(intermediate_step);
 }
 
-void Trick::NL2_Integrator::set_first_step_deriv(bool first_step) {
-    if ( first_step ) {
-        message_publish(MSG_WARNING, "2nd order Nystrom-Lear should always have first_step_deriv = 0\n");
-    }
-    first_step_deriv = first_step;
+void	Trick::NL2_Integrator::set_first_step_deriv(bool	first_step)	{
+				if	(	first_step	)	{
+								message_publish(MSG_WARNING,	"2nd	order	Nystrom-Lear	should	always	have	first_step_deriv	=	0\n");
+				}
+				first_step_deriv	=	first_step;
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp
index 1321b7358..eb18dd098 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp
@@ -1,110 +1,110 @@
 
-#include "trick/RK2_Integrator.hh"
-#include <iostream>
-#include "trick/message_proto.h"
+#include	"trick/RK2_Integrator.hh"
+#include	<iostream>
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::RK2_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 2;
-
-    /** Init parent class */
-    num_state = State_size;
-    dt = Dt;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::RK2_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	2;
+
+				/**	Init	parent	class	*/
+				num_state	=	State_size;
+				dt	=	Dt;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::RK2_Integrator::RK2_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::RK2_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::RK2_Integrator::RK2_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::RK2_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::RK2_Integrator::~RK2_Integrator() {
+	*/
+Trick::RK2_Integrator::~RK2_Integrator()	{
 
-    const int n_steps = 2;
-    int i;
+				const	int	n_steps	=	2;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 /**
- */
-int Trick::RK2_Integrator::integrate() {
-
-    int i;
-    double dto2;                /* dt/2 */
-
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time */
-            time_0 = time;
-
-            /* Save first step 0 state and compute 1st state estimate at t = t + dt */
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * dt;
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Calculate half time step */
-            dto2 = dt / 2.0;
-
-            /* Compute final state estimate at t = t + dt */
-            for (i = 0; i < num_state; i++) {
-                   state_ws[0][i] += ((deriv[0][i] + deriv[1][i]) * dto2);
-            }
-            intermediate_step = 0;
-
-            /* Update time */
-            time = time_0 + dt;
-            break;
-    }
-
-    return( intermediate_step);
+	*/
+int	Trick::RK2_Integrator::integrate()	{
+
+				int	i;
+				double	dto2;																/*	dt/2	*/
+
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	*/
+												time_0	=	time;
+
+												/*	Save	first	step	0	state	and	compute	1st	state	estimate	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dt;
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Calculate	half	time	step	*/
+												dto2	=	dt	/	2.0;
+
+												/*	Compute	final	state	estimate	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																			state_ws[0][i]	+=	((deriv[0][i]	+	deriv[1][i])	*	dto2);
+												}
+												intermediate_step	=	0;
+
+												/*	Update	time	*/
+												time	=	time_0	+	dt;
+												break;
+				}
+
+				return(	intermediate_step);
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp
index 373779295..c6b00c6dc 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp
@@ -1,129 +1,129 @@
-#include "trick/RK4_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/RK4_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::RK4_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 4;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::RK4_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	4;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::RK4_Integrator::RK4_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::RK4_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::RK4_Integrator::RK4_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::RK4_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::RK4_Integrator::~RK4_Integrator() {
+	*/
+Trick::RK4_Integrator::~RK4_Integrator()	{
 
-    const int n_steps = 4;
-    int i;
+				const	int	n_steps	=	4;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 /**
- */
-int Trick::RK4_Integrator::integrate() {
-
-    int i;
-    double dto2;                /* dt/2 */
-    double dto3;                /* dt/3 */
-    double dto6;                /* dt/6 */
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time and compute time increments */
-            time_0 = time;
-            dto2 = dt / 2.0;
-
-            /* Save initial state and compute state at t = t + dt/2 */
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * dto2;
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Compute time increments */
-            dto2 = dt / 2.0;
-
-            /* Compute adjusted state at t = t + dt/2 */
-            for (i = 0; i < num_state; i++)
-                state_ws[2][i] = state_ws[0][i] + deriv[1][i] * dto2;
-            intermediate_step = 2;
-            break;
-
-        case 2:
-            /* Compute state at t = t + dt */
-            for (i = 0; i < num_state; i++)
-                state_ws[3][i] = state_ws[0][i] + deriv[2][i] * dt;
-
-            intermediate_step = 3;
-            break;
-
-        case 3:
-            /* Calculate time step increments */
-            dto3 = dt / 3.0;
-            dto6 = dt / 6.0;
-
-            /* Compute adjusted state at t = t + dt */
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] +=
-                    ((deriv[0][i] + deriv[3][i]) * dto6 + (deriv[1][i] + deriv[2][i]) * dto3);
-            }
-
-            /* Update time */
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
-
-    return( intermediate_step);
+	*/
+int	Trick::RK4_Integrator::integrate()	{
+
+				int	i;
+				double	dto2;																/*	dt/2	*/
+				double	dto3;																/*	dt/3	*/
+				double	dto6;																/*	dt/6	*/
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	and	compute	time	increments	*/
+												time_0	=	time;
+												dto2	=	dt	/	2.0;
+
+												/*	Save	initial	state	and	compute	state	at	t	=	t	+	dt/2	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dto2;
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Compute	time	increments	*/
+												dto2	=	dt	/	2.0;
+
+												/*	Compute	adjusted	state	at	t	=	t	+	dt/2	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[2][i]	=	state_ws[0][i]	+	deriv[1][i]	*	dto2;
+												intermediate_step	=	2;
+												break;
+
+								case	2:
+												/*	Compute	state	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[3][i]	=	state_ws[0][i]	+	deriv[2][i]	*	dt;
+
+												intermediate_step	=	3;
+												break;
+
+								case	3:
+												/*	Calculate	time	step	increments	*/
+												dto3	=	dt	/	3.0;
+												dto6	=	dt	/	6.0;
+
+												/*	Compute	adjusted	state	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	+=
+																				((deriv[0][i]	+	deriv[3][i])	*	dto6	+	(deriv[1][i]	+	deriv[2][i])	*	dto3);
+												}
+
+												/*	Update	time	*/
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
+
+				return(	intermediate_step);
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
index 770435be5..fcaad96db 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp
@@ -1,180 +1,180 @@
-#include "trick/RKF45_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/RKF45_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::RKF45_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 6;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::RKF45_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	6;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::RKF45_Integrator::RKF45_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::RKF45_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::RKF45_Integrator::RKF45_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::RKF45_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::RKF45_Integrator::~RKF45_Integrator() {
+	*/
+Trick::RKF45_Integrator::~RKF45_Integrator()	{
 
-    const int n_steps = 6;
-    int i;
+				const	int	n_steps	=	6;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 
 /**
- */
-int Trick::RKF45_Integrator::integrate() {
-
-    int i;
-    double dto4;                /* dt/4 */
-    double b_1, b_2, b_3, b_4, b_5;     /* dt workspace */
-    double c_1, c_3, c_4, c_5, c_6;     /* dt workspace */
-
-    static const double ch_45[] = { 0.0, 16.0 / 135.0, 0.0, 6656.0 / 12825.0, 28561.0 / 56430.0, -9.0 / 50.0, 2.0 / 55.0 };
-    static const double b3_45[] = { 0.0, 3.0 / 32.0, 9.0 / 32.0 };
-    static const double b4_45[] = { 0.0, 1932.0 / 2197.0, -7200.0 / 2197.0, 7296.0 / 2197.0 };
-    static const double b5_45[] = { 0.0, 439.0 / 216.0, -8.0, 3680.0 / 513.0, -845.0 / 4104.0 };
-    static const double b6_45[] = { 0.0, -8.0 / 27.0, 2.0, -3544.0 / 2565.0, 1859.0 / 4104.0, -11.0 / 40.0 };
-
-
-    switch (intermediate_step) {
-
-        case 0:
-            /* Save initial time and calculate quarter time step */
-            time_0 = time;
-            dto4 = dt / 4.0;
-
-            /* Save initial state and compute state at t = t + dt/4 */
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * dto4;
-            }
-
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Compute next state */
-            b_1 = b3_45[1] * dt;
-            b_2 = b3_45[2] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[2][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[1][i] * b_2;
-
-            intermediate_step = 2;
-            break;
-
-        case 2:
-            /* Compute next state */
-            b_1 = b4_45[1] * dt;
-            b_2 = b4_45[2] * dt;
-            b_3 = b4_45[3] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[3][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[1][i] * b_2 + deriv[2][i] * b_3;
-
-            intermediate_step = 3;
-            break;
-
-        case 3:
-            /* Compute next state */
-            b_1 = b5_45[1] * dt;
-            b_2 = b5_45[2] * dt;
-            b_3 = b5_45[3] * dt;
-            b_4 = b5_45[4] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[4][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[1][i] * b_2 + deriv[2][i] * b_3 + deriv[3][i] * b_4;
-
-            intermediate_step = 4;
-            break;
-
-        case 4:
-            /* Compute next state */
-            b_1 = b6_45[1] * dt;
-            b_2 = b6_45[2] * dt;
-            b_3 = b6_45[3] * dt;
-            b_4 = b6_45[4] * dt;
-            b_5 = b6_45[5] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[5][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1
-                    + deriv[1][i] * b_2 + deriv[2][i] * b_3 + deriv[3][i] * b_4 + deriv[4][i] * b_5;
-
-            intermediate_step = 5;
-            break;
-
-        case 5:
-            /* Set up coefficients for final state comuptation */
-            c_1 = ch_45[1] * dt;
-            c_3 = ch_45[3] * dt;
-            c_4 = ch_45[4] * dt;
-            c_5 = ch_45[5] * dt;
-            c_6 = ch_45[6] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[0][i] += (deriv[0][i] * c_1
-                                      + deriv[2][i] * c_3
-                                      + deriv[3][i] * c_4 + deriv[4][i] * c_5 + deriv[5][i] * c_6);
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
-
-    return (intermediate_step);
+	*/
+int	Trick::RKF45_Integrator::integrate()	{
+
+				int	i;
+				double	dto4;																/*	dt/4	*/
+				double	b_1,	b_2,	b_3,	b_4,	b_5;					/*	dt	workspace	*/
+				double	c_1,	c_3,	c_4,	c_5,	c_6;					/*	dt	workspace	*/
+
+				static	const	double	ch_45[]	=	{	0.0,	16.0	/	135.0,	0.0,	6656.0	/	12825.0,	28561.0	/	56430.0,	-9.0	/	50.0,	2.0	/	55.0	};
+				static	const	double	b3_45[]	=	{	0.0,	3.0	/	32.0,	9.0	/	32.0	};
+				static	const	double	b4_45[]	=	{	0.0,	1932.0	/	2197.0,	-7200.0	/	2197.0,	7296.0	/	2197.0	};
+				static	const	double	b5_45[]	=	{	0.0,	439.0	/	216.0,	-8.0,	3680.0	/	513.0,	-845.0	/	4104.0	};
+				static	const	double	b6_45[]	=	{	0.0,	-8.0	/	27.0,	2.0,	-3544.0	/	2565.0,	1859.0	/	4104.0,	-11.0	/	40.0	};
+
+
+				switch	(intermediate_step)	{
+
+								case	0:
+												/*	Save	initial	time	and	calculate	quarter	time	step	*/
+												time_0	=	time;
+												dto4	=	dt	/	4.0;
+
+												/*	Save	initial	state	and	compute	state	at	t	=	t	+	dt/4	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	dto4;
+												}
+
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Compute	next	state	*/
+												b_1	=	b3_45[1]	*	dt;
+												b_2	=	b3_45[2]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[2][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[1][i]	*	b_2;
+
+												intermediate_step	=	2;
+												break;
+
+								case	2:
+												/*	Compute	next	state	*/
+												b_1	=	b4_45[1]	*	dt;
+												b_2	=	b4_45[2]	*	dt;
+												b_3	=	b4_45[3]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[3][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[1][i]	*	b_2	+	deriv[2][i]	*	b_3;
+
+												intermediate_step	=	3;
+												break;
+
+								case	3:
+												/*	Compute	next	state	*/
+												b_1	=	b5_45[1]	*	dt;
+												b_2	=	b5_45[2]	*	dt;
+												b_3	=	b5_45[3]	*	dt;
+												b_4	=	b5_45[4]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[4][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[1][i]	*	b_2	+	deriv[2][i]	*	b_3	+	deriv[3][i]	*	b_4;
+
+												intermediate_step	=	4;
+												break;
+
+								case	4:
+												/*	Compute	next	state	*/
+												b_1	=	b6_45[1]	*	dt;
+												b_2	=	b6_45[2]	*	dt;
+												b_3	=	b6_45[3]	*	dt;
+												b_4	=	b6_45[4]	*	dt;
+												b_5	=	b6_45[5]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[5][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1
+																				+	deriv[1][i]	*	b_2	+	deriv[2][i]	*	b_3	+	deriv[3][i]	*	b_4	+	deriv[4][i]	*	b_5;
+
+												intermediate_step	=	5;
+												break;
+
+								case	5:
+												/*	Set	up	coefficients	for	final	state	comuptation	*/
+												c_1	=	ch_45[1]	*	dt;
+												c_3	=	ch_45[3]	*	dt;
+												c_4	=	ch_45[4]	*	dt;
+												c_5	=	ch_45[5]	*	dt;
+												c_6	=	ch_45[6]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[0][i]	+=	(deriv[0][i]	*	c_1
+																																						+	deriv[2][i]	*	c_3
+																																						+	deriv[3][i]	*	c_4	+	deriv[4][i]	*	c_5	+	deriv[5][i]	*	c_6);
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
+
+				return	(intermediate_step);
 
 }
 
-void Trick::RKF45_Integrator::set_first_step_deriv(bool first_step) {
-    if ( !first_step ) {
-        message_publish(MSG_WARNING, "5th Order Runge Kutta Fehlberg should always have first_step_deriv = 1\n");
-    }
-    first_step_deriv = first_step;
+void	Trick::RKF45_Integrator::set_first_step_deriv(bool	first_step)	{
+				if	(	!first_step	)	{
+								message_publish(MSG_WARNING,	"5th	Order	Runge	Kutta	Fehlberg	should	always	have	first_step_deriv	=	1\n");
+				}
+				first_step_deriv	=	first_step;
 }
 
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
index 6226a710b..f05097e4a 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp
@@ -1,247 +1,247 @@
-#include "trick/RKF78_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/RKF78_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::RKF78_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 12;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::RKF78_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	12;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 /**
- */
-Trick::RKF78_Integrator::RKF78_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::RKF78_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::RKF78_Integrator::RKF78_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::RKF78_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::RKF78_Integrator::~RKF78_Integrator() {
+	*/
+Trick::RKF78_Integrator::~RKF78_Integrator()	{
 
-    const int n_steps = 12;
-    int i;
+				const	int	n_steps	=	12;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<n_steps ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 /**
- */
-int Trick::RKF78_Integrator::integrate() {
-
-    int i;
-    double b_1, b_2, b_3, b_4, b_5, b_6, b_7;   /* temporary dt values */
-    double c_1, c_2, c_3, c_4;  /* temporary dt values */
-
-    static double ch_78[] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 34.0 / 105.0, 9.0 / 35.0, 9.0 / 35.0, 9.0 / 280.0,
-                              9.0 / 280.0, 0.0, 41.0 / 840.0, 41.0 / 840.0 };
-    static double b2_78[] = { 0.0, 2.0 / 27.0 };
-    static double b3_78[] = { 0.0, 1.0 / 36.0, 1.0 / 12.0 };
-    static double b4_78[] = { 0.0, 1.0 / 24.0, 0.0, 1.0 / 8.0 };
-    static double b5_78[] = { 0.0, 5.0 / 12.0, 0.0, -25.0 / 16.0, 25.0 / 16.0 };
-    static double b6_78[] = { 0.0, 1.0 / 20.0, 0.0, 0.0, 1.0 / 4.0, 1.0 / 5.0 };
-    static double b7_78[] = { 0.0, -25.0 / 108.0, 0.0, 0.0, 125.0 / 108.0, -65.0 / 27.0, 125.0 / 54.0 };
-    static double b8_78[] = { 0.0, 31.0 / 300.0, 0.0, 0.0, 0.0, 61.0 / 225.0, -2.0 / 9.0, 13.0 / 900.0 };
-    static double b9_78[] = { 0.0, 2.0, 0.0, 0.0, -53.0 / 6.0, 704.0 / 45.0, -107.0 / 9.0, 67.0 / 90.0, 3.0 };
-    static double b10_78[] = { 0.0, -91.0 / 108.0, 0.0, 0.0, 23.0 / 108.0, -976.0 / 135.0, 311.0 / 54.0,
-                               -19.0 / 60.0, 17.0 / 6.0, -1.0 / 12.0 };
-    static double b12_78[] = { 0.0, 3.0 / 205.0, 0.0, 0.0, 0.0, 0.0, -6.0 / 41.0, -3.0 / 205.0, -3.0 / 41.0,
-                               3.0 / 41.0, 6.0 / 41.0 };
-    static double b13_78[] = { 0.0, -1777.0 / 4100.0, 0.0, 0.0, -341.0 / 164.0, 4496.0 / 1025.0, -289.0 / 82.0,
-                               2193.0 / 4100.0, 51.0 / 82.0, 33.0 / 164.0, 12.0 / 41.0, 0.0, 1.0 };
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time */
-            time_0 = time;
-
-            /* Save initial state and compute the next step state */
-            b_1 = b2_78[1] * dt;
-            for (i = 0; i < num_state; i++) {
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + deriv[0][i] * b_1;
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Compute the next state */
-            b_1 = b3_78[1] * dt;
-            b_2 = b3_78[2] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[2][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[1][i] * b_2;
-            intermediate_step = 2;
-            break;
-
-        case 2:
-            /* Compute the next state */
-            b_1 = b4_78[1] * dt;
-            b_3 = b4_78[3] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[3][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[2][i] * b_3;
-            intermediate_step = 3;
-            break;
-
-        case 3:
-            /* Compute the next state */
-            b_1 = b5_78[1] * dt;
-            b_3 = b5_78[3] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[4][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + (deriv[2][i] - deriv[3][i]) * b_3;
-            intermediate_step = 4;
-            break;
-
-        case 4:
-            /* Compute the next state */
-            b_1 = b6_78[1] * dt;
-            b_4 = b6_78[4] * dt;
-            b_5 = b6_78[5] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[5][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[3][i] * b_4 + deriv[4][i] * b_5;
-            intermediate_step = 5;
-            break;
-
-        case 5:
-            /* Compute the next state */
-            b_1 = b7_78[1] * dt;
-            b_4 = b7_78[4] * dt;
-            b_5 = b7_78[5] * dt;
-            b_6 = b7_78[6] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[6][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[3][i] * b_4 + deriv[4][i] * b_5 + deriv[5][i] * b_6;
-            intermediate_step = 6;
-            break;
-
-        case 6:
-            /* Compute the next state */
-            b_1 = b8_78[1] * dt;
-            b_5 = b8_78[5] * dt;
-            b_6 = b8_78[6] * dt;
-            b_7 = b8_78[7] * dt;
-            for (i = 0; i < num_state; i++)
-                state_ws[7][i] = state_ws[0][i]
-                    + deriv[0][i] * b_1 + deriv[4][i] * b_5 + deriv[5][i] * b_6 + deriv[6][i] * b_7;
-            intermediate_step = 7;
-            break;
-
-        case 7:
-            /* Compute the next state */
-            for (i = 0; i < num_state; i++)
-                state_ws[8][i] = state_ws[0][i] + (deriv[0][i] * b9_78[1]
-                                                         + deriv[3][i] * b9_78[4]
-                                                         + deriv[4][i] * b9_78[5]
-                                                         + deriv[5][i] * b9_78[6]
-                                                         + deriv[6][i] * b9_78[7]
-                                                         + deriv[7][i] * b9_78[8]) * dt;
-            intermediate_step = 8;
-            break;
-
-        case 8:
-            /* Compute the next state */
-            for (i = 0; i < num_state; i++)
-                state_ws[9][i] = state_ws[0][i] + (deriv[0][i] * b10_78[1]
-                                                         + deriv[3][i] * b10_78[4]
-                                                         + deriv[4][i] * b10_78[5]
-                                                         + deriv[5][i] * b10_78[6]
-                                                         + deriv[6][i] * b10_78[7]
-                                                         + deriv[7][i] * b10_78[8]
-                                                         + deriv[8][i] * b10_78[9]) * dt;
-            intermediate_step = 9;
-            break;
-
-        case 9:
-            /* Compute the next state */
-            for (i = 0; i < num_state; i++)
-                state_ws[10][i] = state_ws[0][i] + (deriv[0][i] * b12_78[1]
-                                                          + deriv[5][i] * b12_78[6]
-                                                          + deriv[6][i] * b12_78[7]
-                                                          + deriv[7][i] * b12_78[8]
-                                                          + deriv[8][i] * b12_78[9]
-                                                          + deriv[9][i] * b12_78[10]) * dt;
-            intermediate_step = 10;
-            break;
-
-        case 10:
-            /* Compute the next state */
-            for (i = 0; i < num_state; i++)
-                state_ws[11][i] = state_ws[0][i] + (deriv[0][i] * b13_78[1]
-                                                          + deriv[3][i] * b13_78[4]
-                                                          + deriv[4][i] * b13_78[5]
-                                                          + deriv[5][i] * b13_78[6]
-                                                          + deriv[6][i] * b13_78[7]
-                                                          + deriv[7][i] * b13_78[8]
-                                                          + deriv[8][i] * b13_78[9]
-                                                          + deriv[9][i] * b13_78[10]
-                                                          + deriv[10][i]) * dt;
-            intermediate_step = 11;
-            break;
-
-        case 11:
-            /* Set coefficients for final state computation */
-            c_1 = ch_78[6] * dt;
-            c_2 = ch_78[7] * dt;
-            c_3 = ch_78[9] * dt;
-            c_4 = ch_78[12] * dt;
-
-            /* Compute state at t = t + dt */
-            for (i = 0; i < num_state; i++)
-                state_ws[0][i] += (deriv[5][i] * c_1
-                                      + (deriv[6][i] +
-                                         deriv[7][i]) * c_2 +
-                                      (deriv[8][i] +
-                                       deriv[9][i]) * c_3 + (deriv[10][i] + deriv[11][i]) * c_4);
-
-            /* Update time */
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
-    return ( intermediate_step);
+	*/
+int	Trick::RKF78_Integrator::integrate()	{
+
+				int	i;
+				double	b_1,	b_2,	b_3,	b_4,	b_5,	b_6,	b_7;			/*	temporary	dt	values	*/
+				double	c_1,	c_2,	c_3,	c_4;		/*	temporary	dt	values	*/
+
+				static	double	ch_78[]	=	{	0.0,	0.0,	0.0,	0.0,	0.0,	0.0,	34.0	/	105.0,	9.0	/	35.0,	9.0	/	35.0,	9.0	/	280.0,
+																														9.0	/	280.0,	0.0,	41.0	/	840.0,	41.0	/	840.0	};
+				static	double	b2_78[]	=	{	0.0,	2.0	/	27.0	};
+				static	double	b3_78[]	=	{	0.0,	1.0	/	36.0,	1.0	/	12.0	};
+				static	double	b4_78[]	=	{	0.0,	1.0	/	24.0,	0.0,	1.0	/	8.0	};
+				static	double	b5_78[]	=	{	0.0,	5.0	/	12.0,	0.0,	-25.0	/	16.0,	25.0	/	16.0	};
+				static	double	b6_78[]	=	{	0.0,	1.0	/	20.0,	0.0,	0.0,	1.0	/	4.0,	1.0	/	5.0	};
+				static	double	b7_78[]	=	{	0.0,	-25.0	/	108.0,	0.0,	0.0,	125.0	/	108.0,	-65.0	/	27.0,	125.0	/	54.0	};
+				static	double	b8_78[]	=	{	0.0,	31.0	/	300.0,	0.0,	0.0,	0.0,	61.0	/	225.0,	-2.0	/	9.0,	13.0	/	900.0	};
+				static	double	b9_78[]	=	{	0.0,	2.0,	0.0,	0.0,	-53.0	/	6.0,	704.0	/	45.0,	-107.0	/	9.0,	67.0	/	90.0,	3.0	};
+				static	double	b10_78[]	=	{	0.0,	-91.0	/	108.0,	0.0,	0.0,	23.0	/	108.0,	-976.0	/	135.0,	311.0	/	54.0,
+																															-19.0	/	60.0,	17.0	/	6.0,	-1.0	/	12.0	};
+				static	double	b12_78[]	=	{	0.0,	3.0	/	205.0,	0.0,	0.0,	0.0,	0.0,	-6.0	/	41.0,	-3.0	/	205.0,	-3.0	/	41.0,
+																															3.0	/	41.0,	6.0	/	41.0	};
+				static	double	b13_78[]	=	{	0.0,	-1777.0	/	4100.0,	0.0,	0.0,	-341.0	/	164.0,	4496.0	/	1025.0,	-289.0	/	82.0,
+																															2193.0	/	4100.0,	51.0	/	82.0,	33.0	/	164.0,	12.0	/	41.0,	0.0,	1.0	};
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	*/
+												time_0	=	time;
+
+												/*	Save	initial	state	and	compute	the	next	step	state	*/
+												b_1	=	b2_78[1]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	deriv[0][i]	*	b_1;
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Compute	the	next	state	*/
+												b_1	=	b3_78[1]	*	dt;
+												b_2	=	b3_78[2]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[2][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[1][i]	*	b_2;
+												intermediate_step	=	2;
+												break;
+
+								case	2:
+												/*	Compute	the	next	state	*/
+												b_1	=	b4_78[1]	*	dt;
+												b_3	=	b4_78[3]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[3][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[2][i]	*	b_3;
+												intermediate_step	=	3;
+												break;
+
+								case	3:
+												/*	Compute	the	next	state	*/
+												b_1	=	b5_78[1]	*	dt;
+												b_3	=	b5_78[3]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[4][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	(deriv[2][i]	-	deriv[3][i])	*	b_3;
+												intermediate_step	=	4;
+												break;
+
+								case	4:
+												/*	Compute	the	next	state	*/
+												b_1	=	b6_78[1]	*	dt;
+												b_4	=	b6_78[4]	*	dt;
+												b_5	=	b6_78[5]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[5][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[3][i]	*	b_4	+	deriv[4][i]	*	b_5;
+												intermediate_step	=	5;
+												break;
+
+								case	5:
+												/*	Compute	the	next	state	*/
+												b_1	=	b7_78[1]	*	dt;
+												b_4	=	b7_78[4]	*	dt;
+												b_5	=	b7_78[5]	*	dt;
+												b_6	=	b7_78[6]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[6][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[3][i]	*	b_4	+	deriv[4][i]	*	b_5	+	deriv[5][i]	*	b_6;
+												intermediate_step	=	6;
+												break;
+
+								case	6:
+												/*	Compute	the	next	state	*/
+												b_1	=	b8_78[1]	*	dt;
+												b_5	=	b8_78[5]	*	dt;
+												b_6	=	b8_78[6]	*	dt;
+												b_7	=	b8_78[7]	*	dt;
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[7][i]	=	state_ws[0][i]
+																				+	deriv[0][i]	*	b_1	+	deriv[4][i]	*	b_5	+	deriv[5][i]	*	b_6	+	deriv[6][i]	*	b_7;
+												intermediate_step	=	7;
+												break;
+
+								case	7:
+												/*	Compute	the	next	state	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[8][i]	=	state_ws[0][i]	+	(deriv[0][i]	*	b9_78[1]
+																																																									+	deriv[3][i]	*	b9_78[4]
+																																																									+	deriv[4][i]	*	b9_78[5]
+																																																									+	deriv[5][i]	*	b9_78[6]
+																																																									+	deriv[6][i]	*	b9_78[7]
+																																																									+	deriv[7][i]	*	b9_78[8])	*	dt;
+												intermediate_step	=	8;
+												break;
+
+								case	8:
+												/*	Compute	the	next	state	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[9][i]	=	state_ws[0][i]	+	(deriv[0][i]	*	b10_78[1]
+																																																									+	deriv[3][i]	*	b10_78[4]
+																																																									+	deriv[4][i]	*	b10_78[5]
+																																																									+	deriv[5][i]	*	b10_78[6]
+																																																									+	deriv[6][i]	*	b10_78[7]
+																																																									+	deriv[7][i]	*	b10_78[8]
+																																																									+	deriv[8][i]	*	b10_78[9])	*	dt;
+												intermediate_step	=	9;
+												break;
+
+								case	9:
+												/*	Compute	the	next	state	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[10][i]	=	state_ws[0][i]	+	(deriv[0][i]	*	b12_78[1]
+																																																										+	deriv[5][i]	*	b12_78[6]
+																																																										+	deriv[6][i]	*	b12_78[7]
+																																																										+	deriv[7][i]	*	b12_78[8]
+																																																										+	deriv[8][i]	*	b12_78[9]
+																																																										+	deriv[9][i]	*	b12_78[10])	*	dt;
+												intermediate_step	=	10;
+												break;
+
+								case	10:
+												/*	Compute	the	next	state	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[11][i]	=	state_ws[0][i]	+	(deriv[0][i]	*	b13_78[1]
+																																																										+	deriv[3][i]	*	b13_78[4]
+																																																										+	deriv[4][i]	*	b13_78[5]
+																																																										+	deriv[5][i]	*	b13_78[6]
+																																																										+	deriv[6][i]	*	b13_78[7]
+																																																										+	deriv[7][i]	*	b13_78[8]
+																																																										+	deriv[8][i]	*	b13_78[9]
+																																																										+	deriv[9][i]	*	b13_78[10]
+																																																										+	deriv[10][i])	*	dt;
+												intermediate_step	=	11;
+												break;
+
+								case	11:
+												/*	Set	coefficients	for	final	state	computation	*/
+												c_1	=	ch_78[6]	*	dt;
+												c_2	=	ch_78[7]	*	dt;
+												c_3	=	ch_78[9]	*	dt;
+												c_4	=	ch_78[12]	*	dt;
+
+												/*	Compute	state	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)
+																state_ws[0][i]	+=	(deriv[5][i]	*	c_1
+																																						+	(deriv[6][i]	+
+																																									deriv[7][i])	*	c_2	+
+																																						(deriv[8][i]	+
+																																							deriv[9][i])	*	c_3	+	(deriv[10][i]	+	deriv[11][i])	*	c_4);
+
+												/*	Update	time	*/
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
+				return	(	intermediate_step);
 }
diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp
index fcf982963..59e66ef5b 100644
--- a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp
+++ b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp
@@ -1,146 +1,146 @@
-#include "trick/RKG4_Integrator.hh"
-#include "trick/message_proto.h"
+#include	"trick/RKG4_Integrator.hh"
+#include	"trick/message_proto.h"
 
 /**
- */
-void Trick::RKG4_Integrator::initialize(int State_size, double Dt) {
-
-    int i;
-    const int n_steps = 4;
-
-    /** Init parent class. */
-    dt = Dt;
-    num_state = State_size;
-
-    state_origin =  INTEG_ALLOC( double*, num_state );
-    for(i=0; i<num_state ; i++) {
-        state_origin[i] = (double*)NULL;
-    }
-
-    /** Allocate the state vector.*/
-    state =  INTEG_ALLOC( double, num_state );
-
-    /** Allocate the state deriv vector.*/
-    deriv = INTEG_ALLOC( double*, n_steps);
-    for(i=0; i<n_steps ; i++) {
-        deriv[i] = INTEG_ALLOC( double, num_state);
-    }
-
-    /** Allocate the workspace.*/
-    state_ws = INTEG_ALLOC( double*, 5);
-    for(i=0; i<5 ; i++) {
-        state_ws[i] = INTEG_ALLOC( double, num_state);
-    }
+	*/
+void	Trick::RKG4_Integrator::initialize(int	State_size,	double	Dt)	{
+
+				int	i;
+				const	int	n_steps	=	4;
+
+				/**	Init	parent	class.	*/
+				dt	=	Dt;
+				num_state	=	State_size;
+
+				state_origin	=		INTEG_ALLOC(	double*,	num_state	);
+				for(i=0;	i<num_state	;	i++)	{
+								state_origin[i]	=	(double*)NULL;
+				}
+
+				/**	Allocate	the	state	vector.*/
+				state	=		INTEG_ALLOC(	double,	num_state	);
+
+				/**	Allocate	the	state	deriv	vector.*/
+				deriv	=	INTEG_ALLOC(	double*,	n_steps);
+				for(i=0;	i<n_steps	;	i++)	{
+								deriv[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
+
+				/**	Allocate	the	workspace.*/
+				state_ws	=	INTEG_ALLOC(	double*,	5);
+				for(i=0;	i<5	;	i++)	{
+								state_ws[i]	=	INTEG_ALLOC(	double,	num_state);
+				}
 }
 
 
 /**
- */
-Trick::RKG4_Integrator::RKG4_Integrator(int State_size, double Dt) {
-    if (verbosity) {
-        message_publish(MSG_DEBUG, "Trick::RKG4_Integrator()\n");
-    }
-    initialize(State_size, Dt);
+	*/
+Trick::RKG4_Integrator::RKG4_Integrator(int	State_size,	double	Dt)	{
+				if	(verbosity)	{
+								message_publish(MSG_DEBUG,	"Trick::RKG4_Integrator()\n");
+				}
+				initialize(State_size,	Dt);
 }
 
 /**
- */
-Trick::RKG4_Integrator::~RKG4_Integrator() {
+	*/
+Trick::RKG4_Integrator::~RKG4_Integrator()	{
 
-    const int n_steps = 4;
-    int i;
+				const	int	n_steps	=	4;
+				int	i;
 
-    if (state_origin) INTEG_FREE(state_origin);
+				if	(state_origin)	INTEG_FREE(state_origin);
 
-    /** Free the state vector.*/
-    if (state) INTEG_FREE(state);
+				/**	Free	the	state	vector.*/
+				if	(state)	INTEG_FREE(state);
 
-    /** Free the state derivative vector.*/
-    for(i=0; i<n_steps ; i++) {
-        if (deriv[i]) INTEG_FREE(deriv[i]);
-    }
-    if (deriv) INTEG_FREE(deriv);
+				/**	Free	the	state	derivative	vector.*/
+				for(i=0;	i<n_steps	;	i++)	{
+								if	(deriv[i])	INTEG_FREE(deriv[i]);
+				}
+				if	(deriv)	INTEG_FREE(deriv);
 
-    /** Free the workspace.*/
-    for(i=0; i<5 ; i++) {
-        if (state_ws[i]) INTEG_FREE(state_ws[i]);
-    }
-    if (state_ws) INTEG_FREE(state_ws);
+				/**	Free	the	workspace.*/
+				for(i=0;	i<5	;	i++)	{
+								if	(state_ws[i])	INTEG_FREE(state_ws[i]);
+				}
+				if	(state_ws)	INTEG_FREE(state_ws);
 }
 
 /**
- */
-int Trick::RKG4_Integrator::integrate() {
-
-    int i;
-    double tm;
-    double cx;
-
-    static const double b1 =  0.5857864376269049;  // 2-sqrt(2)
-    static const double b2 =  3.414213562373095;   // 2+sqrt(2)
-    static const double c1 =  0.1213203435596426;  // (sqrt(2)-1)/(2+sqrt(2))
-    static const double c2 = -4.121320343559642;   //
-    static const double d1 =  0.1666666666666667;  // 1/6
-    static const double d2 = -0.3333333333333333;  // -1/3
-
-    switch (intermediate_step) {
-        case 0:
-            /* Save initial time and compute time increments */
-            time_0 = time;
-            dt = dt;
-
-            /* Save initial state and compute state at t = t + dt/2 */
-            for (i = 0; i < num_state; i++) {
-                state_ws[4][i] = dt * deriv[0][i];
-                state_ws[0][i] = state[i];
-                state_ws[1][i] = state[i] + state_ws[4][i] * 0.5;
-            }
-            intermediate_step = 1;
-            break;
-
-        case 1:
-            /* Compute time increments */
-            dt = dt;
-            cx = 0.5 * b1;
-
-            /* Compute adjusted state at t = t + dt/2 */
-            for (i = 0; i < num_state; i++) {
-                tm = dt * deriv[1][i];
-                state_ws[2][i] = state_ws[1][i] + cx * (tm - state_ws[4][i]);
-                state_ws[4][i] = b1 * tm + c1 * state_ws[4][i];
-            }
-            intermediate_step = 2;
-            break;
-
-        case 2:
-
-            /* Compute time increments */
-            dt = dt;
-            cx = 0.5 * b2;
-
-            /* Compute state at t = t + dt */
-            for (i = 0; i < num_state; i++) {
-                tm = dt * deriv[2][i];
-                state_ws[3][i] = state_ws[2][i] + cx * (tm - state_ws[4][i]);
-                state_ws[4][i] = b2 * tm + c2 * state_ws[4][i];
-            }
-            intermediate_step = 3;
-            break;
-
-        case 3:
-            /* Compute time increments */
-            dt = dt;
-
-            /* Compute adjusted state at t = t + dt */
-            for (i = 0; i < num_state; i++) {
-                tm = dt * deriv[3][i];
-                state_ws[0][i] = state_ws[3][i] + d1 * tm + d2 * state_ws[4][i];
-            }
-
-            time = time_0 + dt;
-            intermediate_step = 0;
-            break;
-    }
-
-    return(intermediate_step);
+	*/
+int	Trick::RKG4_Integrator::integrate()	{
+
+				int	i;
+				double	tm;
+				double	cx;
+
+				static	const	double	b1	=		0.5857864376269049;		//	2-sqrt(2)
+				static	const	double	b2	=		3.414213562373095;			//	2+sqrt(2)
+				static	const	double	c1	=		0.1213203435596426;		//	(sqrt(2)-1)/(2+sqrt(2))
+				static	const	double	c2	=	-4.121320343559642;			//
+				static	const	double	d1	=		0.1666666666666667;		//	1/6
+				static	const	double	d2	=	-0.3333333333333333;		//	-1/3
+
+				switch	(intermediate_step)	{
+								case	0:
+												/*	Save	initial	time	and	compute	time	increments	*/
+												time_0	=	time;
+												dt	=	dt;
+
+												/*	Save	initial	state	and	compute	state	at	t	=	t	+	dt/2	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																state_ws[4][i]	=	dt	*	deriv[0][i];
+																state_ws[0][i]	=	state[i];
+																state_ws[1][i]	=	state[i]	+	state_ws[4][i]	*	0.5;
+												}
+												intermediate_step	=	1;
+												break;
+
+								case	1:
+												/*	Compute	time	increments	*/
+												dt	=	dt;
+												cx	=	0.5	*	b1;
+
+												/*	Compute	adjusted	state	at	t	=	t	+	dt/2	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																tm	=	dt	*	deriv[1][i];
+																state_ws[2][i]	=	state_ws[1][i]	+	cx	*	(tm	-	state_ws[4][i]);
+																state_ws[4][i]	=	b1	*	tm	+	c1	*	state_ws[4][i];
+												}
+												intermediate_step	=	2;
+												break;
+
+								case	2:
+
+												/*	Compute	time	increments	*/
+												dt	=	dt;
+												cx	=	0.5	*	b2;
+
+												/*	Compute	state	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																tm	=	dt	*	deriv[2][i];
+																state_ws[3][i]	=	state_ws[2][i]	+	cx	*	(tm	-	state_ws[4][i]);
+																state_ws[4][i]	=	b2	*	tm	+	c2	*	state_ws[4][i];
+												}
+												intermediate_step	=	3;
+												break;
+
+								case	3:
+												/*	Compute	time	increments	*/
+												dt	=	dt;
+
+												/*	Compute	adjusted	state	at	t	=	t	+	dt	*/
+												for	(i	=	0;	i	<	num_state;	i++)	{
+																tm	=	dt	*	deriv[3][i];
+																state_ws[0][i]	=	state_ws[3][i]	+	d1	*	tm	+	d2	*	state_ws[4][i];
+												}
+
+												time	=	time_0	+	dt;
+												intermediate_step	=	0;
+												break;
+				}
+
+				return(intermediate_step);
 }
diff --git a/trick_source/sim_services/Integrator/unittest/IBall.cpp b/trick_source/sim_services/Integrator/unittest/IBall.cpp
index 1fb43972d..e906b013d 100644
--- a/trick_source/sim_services/Integrator/unittest/IBall.cpp
+++ b/trick_source/sim_services/Integrator/unittest/IBall.cpp
@@ -1,150 +1,150 @@
-#include "Integrator.hh"
-#include <math.h>
-#include <iostream>
-#include <ostream>
-#include <fstream>
-#include <iomanip>
+#include	"Integrator.hh"
+#include	<math.h>
+#include	<iostream>
+#include	<ostream>
+#include	<fstream>
+#include	<iomanip>
 
-#include <string.h>
+#include	<string.h>
 
-#define PI 3.141592653589793
-#define RAD_PER_DEG (PI/180.0)
+#define	PI	3.141592653589793
+#define	RAD_PER_DEG	(PI/180.0)
 
-typedef struct {
-    double pos[2];
-    double vel[2];
-    double acc[2];
-} BALL;
+typedef	struct	{
+				double	pos[2];
+				double	vel[2];
+				double	acc[2];
+}	BALL;
 
-void deriv(BALL *B) {
+void	deriv(BALL	*B)	{
 
-    B->acc[0] = -9.81;
-    B->acc[1] = 0;
+				B->acc[0]	=	-9.81;
+				B->acc[1]	=	0;
 
 }
 
-void IBall_sim( Integrator_type Alg,
-                std::ostream&   dataout) {
+void	IBall_sim(	Integrator_type	Alg,
+																std::ostream&			dataout)	{
 
-    BALL   ball;
-    long   tick;
-    double sim_time;
+				BALL			ball;
+				long			tick;
+				double	sim_time;
 
-    const double seconds_per_tick = 0.5;
-    const double initial_speed = 50.0;
-    const double initial_angle = 30.0;
+				const	double	seconds_per_tick	=	0.5;
+				const	double	initial_speed	=	50.0;
+				const	double	initial_angle	=	30.0;
 
-    dataout.width(16);
-    dataout.precision(14);
+				dataout.width(16);
+				dataout.precision(14);
 
-    // Initialization
-    tick = 0;
-    sim_time = 0.0;
+				//	Initialization
+				tick	=	0;
+				sim_time	=	0.0;
 
-    ball.pos[0] = 5.0;
-    ball.pos[1] = 5.0;
-    ball.vel[0] = initial_speed * sin(initial_angle * RAD_PER_DEG);
-    ball.vel[1] = initial_speed * cos(initial_angle * RAD_PER_DEG);
+				ball.pos[0]	=	5.0;
+				ball.pos[1]	=	5.0;
+				ball.vel[0]	=	initial_speed	*	sin(initial_angle	*	RAD_PER_DEG);
+				ball.vel[1]	=	initial_speed	*	cos(initial_angle	*	RAD_PER_DEG);
 
-    Trick::Integrator *I = Trick::getIntegrator( Alg, 4, seconds_per_tick );
+				Trick::Integrator	*I	=	Trick::getIntegrator(	Alg,	4,	seconds_per_tick	);
 
-    do { // Simulation loop
+				do	{	//	Simulation	loop
 
-        sim_time = tick * seconds_per_tick ;
+								sim_time	=	tick	*	seconds_per_tick	;
 
-        do { // Integration Loop
+								do	{	//	Integration	Loop
 
-            I->time = sim_time;
+												I->time	=	sim_time;
 
-            deriv( &ball);
-            //printf("TIME: %g\n",sim_time);
+												deriv(	&ball);
+												//printf("TIME:	%g\n",sim_time);
 
-            I->state_in( &ball.pos[0], &ball.pos[1], &ball.vel[0], &ball.vel[1], NULL);
-            //printf("LOAD STATE: %g %g %g %g\n",ball.pos[0], ball.pos[1], ball.vel[0], ball.vel[1]);
+												I->state_in(	&ball.pos[0],	&ball.pos[1],	&ball.vel[0],	&ball.vel[1],	NULL);
+												//printf("LOAD	STATE:	%g	%g	%g	%g\n",ball.pos[0],	ball.pos[1],	ball.vel[0],	ball.vel[1]);
 
-            I->deriv_in( &ball.vel[0], &ball.vel[1], &ball.acc[0], &ball.acc[1], NULL);
-            //printf("LOAD DERIV: %g %g %g %g\n", ball.vel[0], ball.vel[1], ball.acc[0], ball.acc[1]);
+												I->deriv_in(	&ball.vel[0],	&ball.vel[1],	&ball.acc[0],	&ball.acc[1],	NULL);
+												//printf("LOAD	DERIV:	%g	%g	%g	%g\n",	ball.vel[0],	ball.vel[1],	ball.acc[0],	ball.acc[1]);
 
-            I->integrate();
+												I->integrate();
 
-            I->state_out( &ball.pos[0], &ball.pos[1], &ball.vel[0], &ball.vel[1], NULL);
-            //printf("STATE OUT: %g %g %g %g\n",  ball.pos[0], ball.pos[1], ball.vel[0], ball.vel[1]);
+												I->state_out(	&ball.pos[0],	&ball.pos[1],	&ball.vel[0],	&ball.vel[1],	NULL);
+												//printf("STATE	OUT:	%g	%g	%g	%g\n",		ball.pos[0],	ball.pos[1],	ball.vel[0],	ball.vel[1]);
 
-        } while ( I->intermediate_step);
+								}	while	(	I->intermediate_step);
 
-        dataout << sim_time << " " << ball.pos[0] << " " << ball.pos[1] << std::endl;
+								dataout	<<	sim_time	<<	"	"	<<	ball.pos[0]	<<	"	"	<<	ball.pos[1]	<<	std::endl;
 
-        tick++;
+								tick++;
 
-    } while (ball.pos[0] >= 0.0);
+				}	while	(ball.pos[0]	>=	0.0);
 
-    delete( I);
+				delete(	I);
 }
 
 
-int main(int argc, const char* argv[]) {
-
-    std::ofstream dataout;
-    std::ofstream gplout;
-
-    char dataout_name[80];
-    Integrator_type Algorithm ;
-    const char* Algorithm_name;
-    int test_number;
-
-    gplout.open("IBall.gpl", std::ofstream::out);
-    gplout << "plot \\" << std::endl;
-
-    for (test_number = 0; test_number < 5 ; test_number++) {
-
-        // Select test.
-        switch (test_number) {
-        case 0:
-            Algorithm = Euler;
-            Algorithm_name = "Euler";
-            break;
-        case 1:
-            Algorithm = Runge_Kutta_2;
-            Algorithm_name = "Runge_Kutta_2";
-            break;
-        case 2:
-            Algorithm = Runge_Kutta_4;
-            Algorithm_name = "Runge_Kutta_4";
-            break;
-        case 3:
-            Algorithm = Runge_Kutta_Fehlberg_45;
-            Algorithm_name = "Runge_Kutta_Fehlberg_45";
-            break;
-        case 4:
-            Algorithm = Runge_Kutta_Fehlberg_78;
-            Algorithm_name = "Runge_Kutta_Fehlberg_78";
-            break;
-//      case 5:
-//          Algorithm = Runge_Kutta_Gill_4;
-//          Algorithm_name = "Runge_Kutta_Gill_4";
-//          break;
-        default:
-            std::cerr << "Invalid test number." << std::endl;
-        }
-
-        strcpy (dataout_name, "IBall_");
-        strcat (dataout_name, Algorithm_name);
-        strcat (dataout_name, ".dat");
-        dataout.open( dataout_name);
-        IBall_sim( Algorithm, dataout);
-        dataout.close();
-
-        if (test_number > 0) {
-            gplout << ", \\" << std::endl;
-        }
-
-        gplout << "\"" << dataout_name << "\" using 3:2 title \'" << Algorithm_name << "\' with lines";
-
-    }
-
-    gplout.close();
-
-    system("gnuplot -persist IBall.gpl");
-
-    return (0);
+int	main(int	argc,	const	char*	argv[])	{
+
+				std::ofstream	dataout;
+				std::ofstream	gplout;
+
+				char	dataout_name[80];
+				Integrator_type	Algorithm	;
+				const	char*	Algorithm_name;
+				int	test_number;
+
+				gplout.open("IBall.gpl",	std::ofstream::out);
+				gplout	<<	"plot	\\"	<<	std::endl;
+
+				for	(test_number	=	0;	test_number	<	5	;	test_number++)	{
+
+								//	Select	test.
+								switch	(test_number)	{
+								case	0:
+												Algorithm	=	Euler;
+												Algorithm_name	=	"Euler";
+												break;
+								case	1:
+												Algorithm	=	Runge_Kutta_2;
+												Algorithm_name	=	"Runge_Kutta_2";
+												break;
+								case	2:
+												Algorithm	=	Runge_Kutta_4;
+												Algorithm_name	=	"Runge_Kutta_4";
+												break;
+								case	3:
+												Algorithm	=	Runge_Kutta_Fehlberg_45;
+												Algorithm_name	=	"Runge_Kutta_Fehlberg_45";
+												break;
+								case	4:
+												Algorithm	=	Runge_Kutta_Fehlberg_78;
+												Algorithm_name	=	"Runge_Kutta_Fehlberg_78";
+												break;
+//						case	5:
+//										Algorithm	=	Runge_Kutta_Gill_4;
+//										Algorithm_name	=	"Runge_Kutta_Gill_4";
+//										break;
+								default:
+												std::cerr	<<	"Invalid	test	number."	<<	std::endl;
+								}
+
+								strcpy	(dataout_name,	"IBall_");
+								strcat	(dataout_name,	Algorithm_name);
+								strcat	(dataout_name,	".dat");
+								dataout.open(	dataout_name);
+								IBall_sim(	Algorithm,	dataout);
+								dataout.close();
+
+								if	(test_number	>	0)	{
+												gplout	<<	",	\\"	<<	std::endl;
+								}
+
+								gplout	<<	"\""	<<	dataout_name	<<	"\"	using	3:2	title	\'"	<<	Algorithm_name	<<	"\'	with	lines";
+
+				}
+
+				gplout.close();
+
+				system("gnuplot	-persist	IBall.gpl");
+
+				return	(0);
 }
diff --git a/trick_source/sim_services/Integrator/unittest/IRFBall.cpp b/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
index 66379200b..f52f969e6 100644
--- a/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
+++ b/trick_source/sim_services/Integrator/unittest/IRFBall.cpp
@@ -1,38 +1,38 @@
-#include "Integrator.hh"
-#include <math.h>
-#include <iostream>
-#include <ostream>
-#include <fstream>
-#include <iomanip>
-#include "regula_falsi.h"
+#include	"Integrator.hh"
+#include	<math.h>
+#include	<iostream>
+#include	<ostream>
+#include	<fstream>
+#include	<iomanip>
+#include	"regula_falsi.h"
 
-#include <string.h>
+#include	<string.h>
 
-#define PI 3.141592653589793
-#define RAD_PER_DEG (2.0*PI/180.0)
+#define	PI	3.141592653589793
+#define	RAD_PER_DEG	(2.0*PI/180.0)
 
-typedef struct {
-    double pos[2];
-    double vel[2];
-    double acc[2];
-} BALL;
+typedef	struct	{
+				double	pos[2];
+				double	vel[2];
+				double	acc[2];
+}	BALL;
 
-void deriv(BALL *B) {
+void	deriv(BALL	*B)	{
 
-    B->acc[0] = -9.81;
-    B->acc[1] = 0;
+				B->acc[0]	=	-9.81;
+				B->acc[1]	=	0;
 
 }
 
-void integ(Trick::Integrator *I, BALL *ball ) {
+void	integ(Trick::Integrator	*I,	BALL	*ball	)	{
 
-    do {
-        deriv( ball);
-        I->state_in( &ball->pos[0], &ball->pos[1], &ball->vel[0], &ball->vel[1], NULL);
-        I->deriv_in( &ball->vel[0], &ball->vel[1], &ball->acc[0], &ball->acc[1], NULL);
-        I->integrate();
-        I->state_out( &ball->pos[0], &ball->pos[1], &ball->vel[0], &ball->vel[1], NULL);
-    } while ( I->intermediate_step);
+				do	{
+								deriv(	ball);
+								I->state_in(	&ball->pos[0],	&ball->pos[1],	&ball->vel[0],	&ball->vel[1],	NULL);
+								I->deriv_in(	&ball->vel[0],	&ball->vel[1],	&ball->acc[0],	&ball->acc[1],	NULL);
+								I->integrate();
+								I->state_out(	&ball->pos[0],	&ball->pos[1],	&ball->vel[0],	&ball->vel[1],	NULL);
+				}	while	(	I->intermediate_step);
 }
 
 
@@ -40,183 +40,183 @@ void integ(Trick::Integrator *I, BALL *ball ) {
 
 
 
-void IBall_sim( Integrator_type Alg,
-                std::ostream&   dataout) {
+void	IBall_sim(	Integrator_type	Alg,
+																std::ostream&			dataout)	{
 
-    BALL   ball;
-    long   tick;
-    double sim_time;
-    REGULA_FALSI rf;
+				BALL			ball;
+				long			tick;
+				double	sim_time;
+				REGULA_FALSI	rf;
 
-    const double seconds_per_tick = 0.01;
-    const double initial_angle = 30.0;
-    const double initial_speed = 50.0;
-    const int    doing_dynamic_events = 1;
+				const	double	seconds_per_tick	=	0.01;
+				const	double	initial_angle	=	30.0;
+				const	double	initial_speed	=	50.0;
+				const	int				doing_dynamic_events	=	1;
 
-    dataout.width(16);
-    dataout.precision(14);
+				dataout.width(16);
+				dataout.precision(14);
 
-    // ========================================
-    //             Initialization
-    // ========================================
-    tick = 0;
-    sim_time = 0.0;
+				//	========================================
+				//													Initialization
+				//	========================================
+				tick	=	0;
+				sim_time	=	0.0;
 
-    ball.pos[0] = 0.0;
-    ball.pos[1] = 0.0;
-    ball.vel[0] = initial_speed * cos( initial_angle * RAD_PER_DEG);
-    ball.vel[1] = initial_speed * sin( initial_angle * RAD_PER_DEG);
+				ball.pos[0]	=	0.0;
+				ball.pos[1]	=	0.0;
+				ball.vel[0]	=	initial_speed	*	cos(	initial_angle	*	RAD_PER_DEG);
+				ball.vel[1]	=	initial_speed	*	sin(	initial_angle	*	RAD_PER_DEG);
 
-    Trick::Integrator *I = Trick::getIntegrator( Alg, 4, seconds_per_tick );
+				Trick::Integrator	*I	=	Trick::getIntegrator(	Alg,	4,	seconds_per_tick	);
 
-    sim_time = tick * seconds_per_tick ;
+				sim_time	=	tick	*	seconds_per_tick	;
 
-    // Initialize Regula Falsi.
-    reset_regula_falsi(sim_time, &rf);
-    rf.error_tol = 1.0e-15;
-    rf.mode = Any;
+				//	Initialize	Regula	Falsi.
+				reset_regula_falsi(sim_time,	&rf);
+				rf.error_tol	=	1.0e-15;
+				rf.mode	=	Any;
 
-    // Note: We don't care what the tgo estimate is because here,
-    // we are just initializing the bounds.
-    rf.error = ball.pos[0];
-    regula_falsi(sim_time, &rf);
+				//	Note:	We	don't	care	what	the	tgo	estimate	is	because	here,
+				//	we	are	just	initializing	the	bounds.
+				rf.error	=	ball.pos[0];
+				regula_falsi(sim_time,	&rf);
 
-    // ========================================
-    //               Simulation loop
-    // ========================================
-    do {
+				//	========================================
+				//															Simulation	loop
+				//	========================================
+				do	{
 
-        dataout << sim_time << " " << ball.pos[0] << " " << ball.pos[1] << std::endl;
+								dataout	<<	sim_time	<<	"	"	<<	ball.pos[0]	<<	"	"	<<	ball.pos[1]	<<	std::endl;
 
-        I->time = sim_time;
+								I->time	=	sim_time;
 
-        // ###I### Integrate over the time step.
-        integ(I, &ball);
+								//	###I###	Integrate	over	the	time	step.
+								integ(I,	&ball);
 
-        // Advance time.
-        tick++;
-        sim_time = tick * seconds_per_tick ;
+								//	Advance	time.
+								tick++;
+								sim_time	=	tick	*	seconds_per_tick	;
 
-        // If we are looking for roots ...
-        if ( doing_dynamic_events ) {
-            double tgo;
+								//	If	we	are	looking	for	roots	...
+								if	(	doing_dynamic_events	)	{
+												double	tgo;
 
-            // ###RF### Given the current error, estimate how far (in time) we are from a root.
-            rf.error = ball.pos[0];
-            tgo = regula_falsi(sim_time, &rf);
+												//	###RF###	Given	the	current	error,	estimate	how	far	(in	time)	we	are	from	a	root.
+												rf.error	=	ball.pos[0];
+												tgo	=	regula_falsi(sim_time,	&rf);
 
-            // If regula_falsi found a root in the last interval ...
-            if ( tgo < seconds_per_tick) {
+												//	If	regula_falsi	found	a	root	in	the	last	interval	...
+												if	(	tgo	<	seconds_per_tick)	{
 
-                int root_found = 0;
-                double t_test = sim_time;
+																int	root_found	=	0;
+																double	t_test	=	sim_time;
 
-                // Iterate until we find the root.
+																//	Iterate	until	we	find	the	root.
 
-                // NOTE: the regula_falsi function gives up and returns with tgo=0 if
-                // it hasn't converged on a root after 20 iterations.
-                while (! root_found) {
+																//	NOTE:	the	regula_falsi	function	gives	up	and	returns	with	tgo=0	if
+																//	it	hasn't	converged	on	a	root	after	20	iterations.
+																while	(!	root_found)	{
 
-                    // ###I### Integrate over the time-correction.
-                    I->dt = tgo;
-                    integ(I, &ball);
+																				//	###I###	Integrate	over	the	time-correction.
+																				I->dt	=	tgo;
+																				integ(I,	&ball);
 
-                    t_test += tgo;
+																				t_test	+=	tgo;
 
-                    // ###RF### Given the current error, estimate how far (in time) we are from the root.
-                    rf.error = ball.pos[0];
-                    tgo = regula_falsi( t_test, &rf);
+																				//	###RF###	Given	the	current	error,	estimate	how	far	(in	time)	we	are	from	the	root.
+																				rf.error	=	ball.pos[0];
+																				tgo	=	regula_falsi(	t_test,	&rf);
 
-                    // If the estimated time-to-go is less than the chosen tolerance, then we have our root.
-                    if (fabs( tgo) < rf.error_tol) {
-                        printf("ROOT@ %18.14g\n", t_test);
-                        root_found = 1;
-                        reset_regula_falsi(t_test, &rf);
-                    }
-                }
-                root_found = 0;
+																				//	If	the	estimated	time-to-go	is	less	than	the	chosen	tolerance,	then	we	have	our	root.
+																				if	(fabs(	tgo)	<	rf.error_tol)	{
+																								printf("ROOT@	%18.14g\n",	t_test);
+																								root_found	=	1;
+																								reset_regula_falsi(t_test,	&rf);
+																				}
+																}
+																root_found	=	0;
 
-                // ###I### Integrate from t=t_test back (forward actually) to t=sim_time.
-                I->dt =  sim_time - t_test ;
-                integ(I, &ball);
+																//	###I###	Integrate	from	t=t_test	back	(forward	actually)	to	t=sim_time.
+																I->dt	=		sim_time	-	t_test	;
+																integ(I,	&ball);
 
-                // Restore the normal time-step.
-                I->dt = seconds_per_tick;
-            }
+																//	Restore	the	normal	time-step.
+																I->dt	=	seconds_per_tick;
+												}
 
-        } // End of doing_dynamic_events.
+								}	//	End	of	doing_dynamic_events.
 
-    } while (ball.pos[0] >= -3.0);
+				}	while	(ball.pos[0]	>=	-3.0);
 
-    dataout << sim_time << " " << ball.pos[0] << " " << ball.pos[1] << std::endl;
+				dataout	<<	sim_time	<<	"	"	<<	ball.pos[0]	<<	"	"	<<	ball.pos[1]	<<	std::endl;
 
-    delete( I);
+				delete(	I);
 }
 
 
-int main(int argc, const char* argv[]) {
-
-    std::ofstream dataout;
-    std::ofstream gplout;
-
-    char dataout_name[80];
-    Integrator_type Algorithm ;
-    const char* Algorithm_name;
-    int test_number;
-
-    gplout.open("IBall.gpl", std::ofstream::out);
-    gplout << "plot \\" << std::endl;
-
-    for (test_number = 0; test_number < 5 ; test_number++) {
-
-        // Select test.
-        switch (test_number) {
-        case 0:
-            Algorithm = Euler;
-            Algorithm_name = "Euler";
-            break;
-        case 1:
-            Algorithm = Runge_Kutta_2;
-            Algorithm_name = "Runge_Kutta_2";
-            break;
-        case 2:
-            Algorithm = Runge_Kutta_4;
-            Algorithm_name = "Runge_Kutta_4";
-            break;
-        case 3:
-            Algorithm = Runge_Kutta_Fehlberg_45;
-            Algorithm_name = "Runge_Kutta_Fehlberg_45";
-            break;
-        case 4:
-            Algorithm = Runge_Kutta_Fehlberg_78;
-            Algorithm_name = "Runge_Kutta_Fehlberg_78";
-            break;
-//      case 5:
-//          Algorithm = Runge_Kutta_Gill_4;
-//          Algorithm_name = "Runge_Kutta_Gill_4";
-//          break;
-        default:
-            std::cerr << "Invalid test number." << std::endl;
-        }
-
-        strcpy (dataout_name, "IBall_");
-        strcat (dataout_name, Algorithm_name);
-        strcat (dataout_name, ".dat");
-        dataout.open( dataout_name);
-        IBall_sim( Algorithm, dataout);
-        dataout.close();
-
-        if (test_number > 0) {
-            gplout << ", \\" << std::endl;
-        }
-
-        gplout << "\"" << dataout_name << "\" using 3:2 title \'" << Algorithm_name << "\' with lines";
-
-    }
-
-    gplout.close();
-
-    system("gnuplot -persist IBall.gpl");
-
-    return (0);
+int	main(int	argc,	const	char*	argv[])	{
+
+				std::ofstream	dataout;
+				std::ofstream	gplout;
+
+				char	dataout_name[80];
+				Integrator_type	Algorithm	;
+				const	char*	Algorithm_name;
+				int	test_number;
+
+				gplout.open("IBall.gpl",	std::ofstream::out);
+				gplout	<<	"plot	\\"	<<	std::endl;
+
+				for	(test_number	=	0;	test_number	<	5	;	test_number++)	{
+
+								//	Select	test.
+								switch	(test_number)	{
+								case	0:
+												Algorithm	=	Euler;
+												Algorithm_name	=	"Euler";
+												break;
+								case	1:
+												Algorithm	=	Runge_Kutta_2;
+												Algorithm_name	=	"Runge_Kutta_2";
+												break;
+								case	2:
+												Algorithm	=	Runge_Kutta_4;
+												Algorithm_name	=	"Runge_Kutta_4";
+												break;
+								case	3:
+												Algorithm	=	Runge_Kutta_Fehlberg_45;
+												Algorithm_name	=	"Runge_Kutta_Fehlberg_45";
+												break;
+								case	4:
+												Algorithm	=	Runge_Kutta_Fehlberg_78;
+												Algorithm_name	=	"Runge_Kutta_Fehlberg_78";
+												break;
+//						case	5:
+//										Algorithm	=	Runge_Kutta_Gill_4;
+//										Algorithm_name	=	"Runge_Kutta_Gill_4";
+//										break;
+								default:
+												std::cerr	<<	"Invalid	test	number."	<<	std::endl;
+								}
+
+								strcpy	(dataout_name,	"IBall_");
+								strcat	(dataout_name,	Algorithm_name);
+								strcat	(dataout_name,	".dat");
+								dataout.open(	dataout_name);
+								IBall_sim(	Algorithm,	dataout);
+								dataout.close();
+
+								if	(test_number	>	0)	{
+												gplout	<<	",	\\"	<<	std::endl;
+								}
+
+								gplout	<<	"\""	<<	dataout_name	<<	"\"	using	3:2	title	\'"	<<	Algorithm_name	<<	"\'	with	lines";
+
+				}
+
+				gplout.close();
+
+				system("gnuplot	-persist	IBall.gpl");
+
+				return	(0);
 }
diff --git a/trick_source/sim_services/Integrator/unittest/ISat.cpp b/trick_source/sim_services/Integrator/unittest/ISat.cpp
index c06213b9d..ae10709db 100644
--- a/trick_source/sim_services/Integrator/unittest/ISat.cpp
+++ b/trick_source/sim_services/Integrator/unittest/ISat.cpp
@@ -1,117 +1,117 @@
-#include "Integrator.hh"
-#include <math.h>
-#include <iostream>
-
-// This is from matrix_macros.h in Trick.
-      /* matrix times vector : prod[i] = mat[i][j] * vect[i] */
-#define MxV( prod , mat , vect ) { \
-   prod[0] = mat[0][0] * vect[0] + mat[0][1] * vect[1] + mat[0][2] * vect[2] ; \
-   prod[1] = mat[1][0] * vect[0] + mat[1][1] * vect[1] + mat[1][2] * vect[2] ; \
-   prod[2] = mat[2][0] * vect[0] + mat[2][1] * vect[1] + mat[2][2] * vect[2] ; \
+#include	"Integrator.hh"
+#include	<math.h>
+#include	<iostream>
+
+//	This	is	from	matrix_macros.h	in	Trick.
+						/*	matrix	times	vector	:	prod[i]	=	mat[i][j]	*	vect[i]	*/
+#define	MxV(	prod	,	mat	,	vect	)	{	\
+			prod[0]	=	mat[0][0]	*	vect[0]	+	mat[0][1]	*	vect[1]	+	mat[0][2]	*	vect[2]	;	\
+			prod[1]	=	mat[1][0]	*	vect[0]	+	mat[1][1]	*	vect[1]	+	mat[1][2]	*	vect[2]	;	\
+			prod[2]	=	mat[2][0]	*	vect[0]	+	mat[2][1]	*	vect[1]	+	mat[2][2]	*	vect[2]	;	\
 }
 
-// GRAVITATIONAL_CONSTANT (Nm2/kg2)
-#define GRAVITATIONAL_CONSTANT 6.67e-11
-// LUNAR_MASS (kg)
-#define LUNAR_MASS   7.36e22
-// LUNAR RADIUS (m)
-#define LUNAR_RADIUS 1737400.0
-
-#define RADIANS_PER_DEGREE 0.0174532925
-
-typedef struct {
-    double mass;
-    double pos[3];
-    double vel[3];
-    double acc[3];
-} SATELLITE;
-
-typedef struct {
-    double radius;
-    double mass;
-} PLANET;
-
-typedef struct {
-    double semi_major_axis;     /* (m)  */
-    double eccentricity;        /* (--) */
-    double inclination;         /* (r)  */
-    double argument_of_perigee; /* (r)  */
-    double right_ascension;     /* (r)  */
-    double true_anomaly;        /* (r)  */
-} ORBITAL_ELEMENTS;
-
-void calc_gravity( SATELLITE * S,
-                   PLANET    * P,
-                   double    * G ) {
-
-   double distance;
-   double pos_hat[3];
-   double g_force_mag;
-
-   // Calculate Gravitational Force
-   distance = sqrt( S->pos[0] * S->pos[0] +
-                    S->pos[1] * S->pos[1] +
-                    S->pos[2] * S->pos[2] );
-
-   pos_hat[0] = S->pos[0] / distance ;
-   pos_hat[1] = S->pos[1] / distance ;
-   pos_hat[2] = S->pos[2] / distance ;
-
-   g_force_mag = ( GRAVITATIONAL_CONSTANT * P->mass * S->mass ) / ( distance * distance ) ;
-
-   G[0] = g_force_mag * - pos_hat[0] ;
-   G[1] = g_force_mag * - pos_hat[1] ;
-   G[2] = g_force_mag * - pos_hat[2] ;
+//	GRAVITATIONAL_CONSTANT	(Nm2/kg2)
+#define	GRAVITATIONAL_CONSTANT	6.67e-11
+//	LUNAR_MASS	(kg)
+#define	LUNAR_MASS			7.36e22
+//	LUNAR	RADIUS	(m)
+#define	LUNAR_RADIUS	1737400.0
+
+#define	RADIANS_PER_DEGREE	0.0174532925
+
+typedef	struct	{
+				double	mass;
+				double	pos[3];
+				double	vel[3];
+				double	acc[3];
+}	SATELLITE;
+
+typedef	struct	{
+				double	radius;
+				double	mass;
+}	PLANET;
+
+typedef	struct	{
+				double	semi_major_axis;					/*	(m)		*/
+				double	eccentricity;								/*	(--)	*/
+				double	inclination;									/*	(r)		*/
+				double	argument_of_perigee;	/*	(r)		*/
+				double	right_ascension;					/*	(r)		*/
+				double	true_anomaly;								/*	(r)		*/
+}	ORBITAL_ELEMENTS;
+
+void	calc_gravity(	SATELLITE	*	S,
+																			PLANET				*	P,
+																			double				*	G	)	{
+
+			double	distance;
+			double	pos_hat[3];
+			double	g_force_mag;
+
+			//	Calculate	Gravitational	Force
+			distance	=	sqrt(	S->pos[0]	*	S->pos[0]	+
+																				S->pos[1]	*	S->pos[1]	+
+																				S->pos[2]	*	S->pos[2]	);
+
+			pos_hat[0]	=	S->pos[0]	/	distance	;
+			pos_hat[1]	=	S->pos[1]	/	distance	;
+			pos_hat[2]	=	S->pos[2]	/	distance	;
+
+			g_force_mag	=	(	GRAVITATIONAL_CONSTANT	*	P->mass	*	S->mass	)	/	(	distance	*	distance	)	;
+
+			G[0]	=	g_force_mag	*	-	pos_hat[0]	;
+			G[1]	=	g_force_mag	*	-	pos_hat[1]	;
+			G[2]	=	g_force_mag	*	-	pos_hat[2]	;
 
 }
 
 //
-// Reference: ISS SIGI Attitude Processor Orbit Equations EG2/Rodolfo Gonzalez 20 Aug 2003
-void orb_elem_to_intl( ORBITAL_ELEMENTS * O,          /* IN  */
-                       PLANET           * P,          /* IN  */
-                       double           * R_intl,     /* OUT */
-                       double           * V_intl ) {  /* OUT */
+//	Reference:	ISS	SIGI	Attitude	Processor	Orbit	Equations	EG2/Rodolfo	Gonzalez	20	Aug	2003
+void	orb_elem_to_intl(	ORBITAL_ELEMENTS	*	O,										/*	IN		*/
+																							PLANET											*	P,										/*	IN		*/
+																							double											*	R_intl,					/*	OUT	*/
+																							double											*	V_intl	)	{		/*	OUT	*/
 
-    double ra, wp, in ;
-    double M_pci_perif[3][3];   /* Perifocal --> Inertial transform */
-    double semi_latus_rectum;
-    double r_magnitude;
-    double r_perifocal[3];
-    double v_perifocal[3];
-    double v_mag;
+				double	ra,	wp,	in	;
+				double	M_pci_perif[3][3];			/*	Perifocal	-->	Inertial	transform	*/
+				double	semi_latus_rectum;
+				double	r_magnitude;
+				double	r_perifocal[3];
+				double	v_perifocal[3];
+				double	v_mag;
 
-    semi_latus_rectum = O->semi_major_axis * ( 1.0 - O->eccentricity * O->eccentricity );
+				semi_latus_rectum	=	O->semi_major_axis	*	(	1.0	-	O->eccentricity	*	O->eccentricity	);
 
-    r_magnitude = semi_latus_rectum / (1.0 + O->eccentricity * cos( O->true_anomaly ));
+				r_magnitude	=	semi_latus_rectum	/	(1.0	+	O->eccentricity	*	cos(	O->true_anomaly	));
 
-    r_perifocal[0] = r_magnitude * cos( O->true_anomaly);
-    r_perifocal[1] = r_magnitude * sin( O->true_anomaly);
-    r_perifocal[2] = 0;
+				r_perifocal[0]	=	r_magnitude	*	cos(	O->true_anomaly);
+				r_perifocal[1]	=	r_magnitude	*	sin(	O->true_anomaly);
+				r_perifocal[2]	=	0;
 
-    v_mag = sqrt( GRAVITATIONAL_CONSTANT * P->mass / semi_latus_rectum);
+				v_mag	=	sqrt(	GRAVITATIONAL_CONSTANT	*	P->mass	/	semi_latus_rectum);
 
-    v_perifocal[0] = v_mag * (-sin(O->true_anomaly));
-    v_perifocal[1] = v_mag * (O->eccentricity + cos(O->true_anomaly));
-    v_perifocal[2] = 0;
+				v_perifocal[0]	=	v_mag	*	(-sin(O->true_anomaly));
+				v_perifocal[1]	=	v_mag	*	(O->eccentricity	+	cos(O->true_anomaly));
+				v_perifocal[2]	=	0;
 
-    ra = O->right_ascension;
-    wp = O->argument_of_perigee;
-    in = O->inclination;
+				ra	=	O->right_ascension;
+				wp	=	O->argument_of_perigee;
+				in	=	O->inclination;
 
-    M_pci_perif[0][0] =  cos(ra)*cos(wp) - sin(ra)*cos(in)*sin(wp) ;
-    M_pci_perif[0][1] = -cos(ra)*sin(wp) - sin(ra)*cos(in)*cos(wp) ;
-    M_pci_perif[0][2] =  sin(ra)*sin(in);
+				M_pci_perif[0][0]	=		cos(ra)*cos(wp)	-	sin(ra)*cos(in)*sin(wp)	;
+				M_pci_perif[0][1]	=	-cos(ra)*sin(wp)	-	sin(ra)*cos(in)*cos(wp)	;
+				M_pci_perif[0][2]	=		sin(ra)*sin(in);
 
-    M_pci_perif[1][0] =  sin(ra)*cos(wp) + cos(ra)*cos(in)*sin(wp) ;
-    M_pci_perif[1][1] = -sin(ra)*sin(wp) + cos(ra)*cos(in)*cos(wp) ;
-    M_pci_perif[1][2] = -cos(ra)*sin(in) ;
+				M_pci_perif[1][0]	=		sin(ra)*cos(wp)	+	cos(ra)*cos(in)*sin(wp)	;
+				M_pci_perif[1][1]	=	-sin(ra)*sin(wp)	+	cos(ra)*cos(in)*cos(wp)	;
+				M_pci_perif[1][2]	=	-cos(ra)*sin(in)	;
 
-    M_pci_perif[2][0] = sin(in)*sin(wp) ;
-    M_pci_perif[2][1] = sin(in)*cos(wp) ;
-    M_pci_perif[2][2] = cos(in) ;
+				M_pci_perif[2][0]	=	sin(in)*sin(wp)	;
+				M_pci_perif[2][1]	=	sin(in)*cos(wp)	;
+				M_pci_perif[2][2]	=	cos(in)	;
 
-    MxV( R_intl , M_pci_perif , r_perifocal) ;
-    MxV( V_intl , M_pci_perif , v_perifocal) ;
+				MxV(	R_intl	,	M_pci_perif	,	r_perifocal)	;
+				MxV(	V_intl	,	M_pci_perif	,	v_perifocal)	;
 
 }
 
@@ -119,95 +119,95 @@ void orb_elem_to_intl( ORBITAL_ELEMENTS * O,          /* IN  */
 
 
 
-void deriv(SATELLITE *S, PLANET *P) {
+void	deriv(SATELLITE	*S,	PLANET	*P)	{
 
-    double    gforce[3];
+				double				gforce[3];
 
-    calc_gravity(S, P, gforce );
+				calc_gravity(S,	P,	gforce	);
 
-    S->acc[0] = gforce[0] / S->mass ;
-    S->acc[1] = gforce[1] / S->mass ;
-    S->acc[2] = gforce[2] / S->mass ;
+				S->acc[0]	=	gforce[0]	/	S->mass	;
+				S->acc[1]	=	gforce[1]	/	S->mass	;
+				S->acc[2]	=	gforce[2]	/	S->mass	;
 
 }
 
-int main(int argc, const char* argv[]) {
+int	main(int	argc,	const	char*	argv[])	{
 
-    SATELLITE satellite;
-    PLANET    planet;
-    ORBITAL_ELEMENTS orbital_elements;
+				SATELLITE	satellite;
+				PLANET				planet;
+				ORBITAL_ELEMENTS	orbital_elements;
 
-    long      tick = 0;
-    double    seconds_per_tick = 1.0;
-    double    sim_time = 0.0;
+				long						tick	=	0;
+				double				seconds_per_tick	=	1.0;
+				double				sim_time	=	0.0;
 
-    // Initialization
-    satellite.mass = 100;
-    planet.mass   = LUNAR_MASS;
-    planet.radius = LUNAR_RADIUS;
+				//	Initialization
+				satellite.mass	=	100;
+				planet.mass			=	LUNAR_MASS;
+				planet.radius	=	LUNAR_RADIUS;
 
-    orbital_elements.semi_major_axis = 2000000; // meters
-    orbital_elements.eccentricity = 0.2;
-    orbital_elements.inclination = 5.0 * RADIANS_PER_DEGREE;
-    orbital_elements.argument_of_perigee = 0.0;
-    orbital_elements.right_ascension = 0.0;   // radians
-    orbital_elements.true_anomaly = 0.0;      // radians
+				orbital_elements.semi_major_axis	=	2000000;	//	meters
+				orbital_elements.eccentricity	=	0.2;
+				orbital_elements.inclination	=	5.0	*	RADIANS_PER_DEGREE;
+				orbital_elements.argument_of_perigee	=	0.0;
+				orbital_elements.right_ascension	=	0.0;			//	radians
+				orbital_elements.true_anomaly	=	0.0;						//	radians
 
-    orb_elem_to_intl( &orbital_elements,
-                      &planet,
-                      satellite.pos,
-                      satellite.vel);
+				orb_elem_to_intl(	&orbital_elements,
+																						&planet,
+																						satellite.pos,
+																						satellite.vel);
 
-    Trick::Integrator *I = getIntegrator( Euler, 6, 1.0);
+				Trick::Integrator	*I	=	getIntegrator(	Euler,	6,	1.0);
 
-    do { // sim loop
-        sim_time = tick * seconds_per_tick ;
-        std::cout << "sim_time = " << sim_time << std::endl;
+				do	{	//	sim	loop
+								sim_time	=	tick	*	seconds_per_tick	;
+								std::cout	<<	"sim_time	=	"	<<	sim_time	<<	std::endl;
 
-        do { // Integration Loop
+								do	{	//	Integration	Loop
 
-            I->time = sim_time;
+												I->time	=	sim_time;
 
-            std::cout << "step #" << I->intermediate_step << std::endl; std::cout.flush();
+												std::cout	<<	"step	#"	<<	I->intermediate_step	<<	std::endl;	std::cout.flush();
 
-            std::cout << "deriv ...";  std::cout.flush();
-            deriv( &satellite, &planet);
-            std::cout << "done." << std::endl; std::cout.flush();
+												std::cout	<<	"deriv	...";		std::cout.flush();
+												deriv(	&satellite,	&planet);
+												std::cout	<<	"done."	<<	std::endl;	std::cout.flush();
 
-            std::cout << "loading state ..."; std::cout.flush();
-            I->state[0] = satellite.pos[0];
-            I->state[1] = satellite.pos[1];
-            I->state[2] = satellite.pos[2];
-            I->state[3] = satellite.vel[0];
-            I->state[4] = satellite.vel[1];
-            I->state[5] = satellite.vel[2];
-            std::cout << "done." << std::endl; std::cout.flush();
+												std::cout	<<	"loading	state	...";	std::cout.flush();
+												I->state[0]	=	satellite.pos[0];
+												I->state[1]	=	satellite.pos[1];
+												I->state[2]	=	satellite.pos[2];
+												I->state[3]	=	satellite.vel[0];
+												I->state[4]	=	satellite.vel[1];
+												I->state[5]	=	satellite.vel[2];
+												std::cout	<<	"done."	<<	std::endl;	std::cout.flush();
 
-            std::cout << "loading state deriv ..."; std::cout.flush();
-            I->deriv[I->intermediate_step][0] = satellite.vel[0];
-            I->deriv[I->intermediate_step][1] = satellite.vel[1];
-            I->deriv[I->intermediate_step][2] = satellite.vel[2];
-            I->deriv[I->intermediate_step][3] = satellite.acc[0];
-            I->deriv[I->intermediate_step][4] = satellite.acc[1];
-            I->deriv[I->intermediate_step][5] = satellite.acc[2];
-            std::cout << "done." << std::endl; std::cout.flush();
+												std::cout	<<	"loading	state	deriv	...";	std::cout.flush();
+												I->deriv[I->intermediate_step][0]	=	satellite.vel[0];
+												I->deriv[I->intermediate_step][1]	=	satellite.vel[1];
+												I->deriv[I->intermediate_step][2]	=	satellite.vel[2];
+												I->deriv[I->intermediate_step][3]	=	satellite.acc[0];
+												I->deriv[I->intermediate_step][4]	=	satellite.acc[1];
+												I->deriv[I->intermediate_step][5]	=	satellite.acc[2];
+												std::cout	<<	"done."	<<	std::endl;	std::cout.flush();
 
-            std::cout << "integrate" << std::endl; std::cout.flush();
-            I->integrate();
-            std::cout << "done." << std::endl; std::cout.flush();
+												std::cout	<<	"integrate"	<<	std::endl;	std::cout.flush();
+												I->integrate();
+												std::cout	<<	"done."	<<	std::endl;	std::cout.flush();
 
-            satellite.pos[0] = I->state_ws[I->intermediate_step][0];
-            satellite.pos[1] = I->state_ws[I->intermediate_step][1];
-            satellite.pos[2] = I->state_ws[I->intermediate_step][2];
-            satellite.vel[0] = I->state_ws[I->intermediate_step][3];
-            satellite.vel[1] = I->state_ws[I->intermediate_step][4];
-            satellite.vel[2] = I->state_ws[I->intermediate_step][5];
+												satellite.pos[0]	=	I->state_ws[I->intermediate_step][0];
+												satellite.pos[1]	=	I->state_ws[I->intermediate_step][1];
+												satellite.pos[2]	=	I->state_ws[I->intermediate_step][2];
+												satellite.vel[0]	=	I->state_ws[I->intermediate_step][3];
+												satellite.vel[1]	=	I->state_ws[I->intermediate_step][4];
+												satellite.vel[2]	=	I->state_ws[I->intermediate_step][5];
 
-        } while ( I->intermediate_step);
+								}	while	(	I->intermediate_step);
 
-        std::cout << "(" << satellite.pos[0] <<","<< satellite.pos[1] <<","<< satellite.pos[2] << ")" << std::endl;
+								std::cout	<<	"("	<<	satellite.pos[0]	<<","<<	satellite.pos[1]	<<","<<	satellite.pos[2]	<<	")"	<<	std::endl;
 
-        tick++;
+								tick++;
 
-    } while (sim_time < 10.0);
+				}	while	(sim_time	<	10.0);
 }
diff --git a/trick_source/sim_services/JITInputFile/JITEvent.cpp b/trick_source/sim_services/JITInputFile/JITEvent.cpp
index eeed683b3..6f75e654f 100644
--- a/trick_source/sim_services/JITInputFile/JITEvent.cpp
+++ b/trick_source/sim_services/JITInputFile/JITEvent.cpp
@@ -1,54 +1,54 @@
 
-#include "trick/JITEvent.hh"
-#include "trick/jit_input_file_proto.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
+#include	"trick/JITEvent.hh"
+#include	"trick/jit_input_file_proto.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
 
-// Default constructor used by Trick for checkpoints.
-Trick::JITEvent::JITEvent() :
- func_ptr(NULL) {
-    active = false ;
+//	Default	constructor	used	by	Trick	for	checkpoints.
+Trick::JITEvent::JITEvent()	:
+	func_ptr(NULL)	{
+				active	=	false	;
 }
 
-Trick::JITEvent::JITEvent(std::string in_func_name , std::string in_name , double in_cycle ) :
- Trick::Event(in_name, in_cycle) ,
- func_name(in_func_name) {
-    // Set active to true by default for all JITEvents
-    active = true ;
-    get_func_ptr_from_name() ;
+Trick::JITEvent::JITEvent(std::string	in_func_name	,	std::string	in_name	,	double	in_cycle	)	:
+	Trick::Event(in_name,	in_cycle)	,
+	func_name(in_func_name)	{
+				//	Set	active	to	true	by	default	for	all	JITEvents
+				active	=	true	;
+				get_func_ptr_from_name()	;
 }
 
 /**
 @details
--# call the function and return it's return value.
+-#	call	the	function	and	return	it's	return	value.
 */
-int Trick::JITEvent::process( long long curr_time __attribute__ ((unused)) ) {
-    if ( func_ptr != NULL ) {
-        return (*func_ptr)() ;
-    }
-    return 1 ;
+int	Trick::JITEvent::process(	long	long	curr_time	__attribute__	((unused))	)	{
+				if	(	func_ptr	!=	NULL	)	{
+								return	(*func_ptr)()	;
+				}
+				return	1	;
 }
 
 /**
 @details
--# Get the function pointer associated with this event.
+-#	Get	the	function	pointer	associated	with	this	event.
 */
-void Trick::JITEvent::restart() {
-    get_func_ptr_from_name() ;
+void	Trick::JITEvent::restart()	{
+				get_func_ptr_from_name()	;
 }
 
 /**
 @details
--# If func_name is not empty
- -# Get the function pointer associated with the func_name
- -# If the function is not found
-  -# Print an error message saying we can't find the function
+-#	If	func_name	is	not	empty
+	-#	Get	the	function	pointer	associated	with	the	func_name
+	-#	If	the	function	is	not	found
+		-#	Print	an	error	message	saying	we	can't	find	the	function
 */
-void Trick::JITEvent::get_func_ptr_from_name() {
-    if ( ! func_name.empty() ) {
-        func_ptr = (int (*)(void))jit_find_symbol(func_name) ;
-        if ( func_ptr == NULL ) {
-            message_publish( MSG_WARNING, "JITEvent could not find function named %s", func_name.c_str() ) ;
-        }
-    }
+void	Trick::JITEvent::get_func_ptr_from_name()	{
+				if	(	!	func_name.empty()	)	{
+								func_ptr	=	(int	(*)(void))jit_find_symbol(func_name)	;
+								if	(	func_ptr	==	NULL	)	{
+												message_publish(	MSG_WARNING,	"JITEvent	could	not	find	function	named	%s",	func_name.c_str()	)	;
+								}
+				}
 }
diff --git a/trick_source/sim_services/JITInputFile/JITInputFile.cpp b/trick_source/sim_services/JITInputFile/JITInputFile.cpp
index 0e255be6e..cf5ba05cd 100644
--- a/trick_source/sim_services/JITInputFile/JITInputFile.cpp
+++ b/trick_source/sim_services/JITInputFile/JITInputFile.cpp
@@ -1,284 +1,284 @@
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <cstring>
-#include <string>
-
-#include <string.h>
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-
-#include "trick/JITInputFile.hh"
-#include "trick/command_line_protos.h"
-#include "trick/message_type.h"
-#include "trick/message_proto.h"
-#include "trick/env_proto.h"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
-#include "trick/TrickConstant.hh"
-
-Trick::JITInputFile * the_jit = NULL ;
-
-//TODO: Move JITLibInfo code into the JITLibInfo object.
-
-Trick::JITInputFile::JITInputFile() {
-    the_jit = this ;
-
-    JITLibInfo li ;
-    li.library_name = "S_main" ;
-    li.handle = dlopen( NULL , RTLD_LAZY ) ;
-    file_to_libinfo_map["S_main"] = li ;
+#include	<iostream>
+#include	<fstream>
+#include	<sstream>
+#include	<cstring>
+#include	<string>
+
+#include	<string.h>
+#include	<dlfcn.h>
+#include	<stdlib.h>
+#include	<sys/types.h>
+#include	<sys/stat.h>
+#include	<unistd.h>
+#include	<errno.h>
+
+
+#include	"trick/JITInputFile.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_type.h"
+#include	"trick/message_proto.h"
+#include	"trick/env_proto.h"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/TrickConstant.hh"
+
+Trick::JITInputFile	*	the_jit	=	NULL	;
+
+//TODO:	Move	JITLibInfo	code	into	the	JITLibInfo	object.
+
+Trick::JITInputFile::JITInputFile()	{
+				the_jit	=	this	;
+
+				JITLibInfo	li	;
+				li.library_name	=	"S_main"	;
+				li.handle	=	dlopen(	NULL	,	RTLD_LAZY	)	;
+				file_to_libinfo_map["S_main"]	=	li	;
 
 }
 
 /**
 @details
--# Test if the input file on the command line ends in .cpp or .cc
--# If it does save the input file locally and clear the command line argument so
-   the cpp input file will not go through the input processor.
+-#	Test	if	the	input	file	on	the	command	line	ends	in	.cpp	or	.cc
+-#	If	it	does	save	the	input	file	locally	and	clear	the	command	line	argument	so
+			the	cpp	input	file	will	not	go	through	the	input	processor.
 */
-int Trick::JITInputFile::process_sim_args() {
+int	Trick::JITInputFile::process_sim_args()	{
 
-    std::string cpp = ".cpp" ;
-    std::string cc = ".cc" ;
+				std::string	cpp	=	".cpp"	;
+				std::string	cc	=	".cc"	;
 
-    std::string & ifr = command_line_args_get_input_file_ref() ;
-    if ( ! ifr.empty() ) {
-        if (! ifr.compare( ifr.length() - cpp.length() , cpp.length(), cpp) or
-            ! ifr.compare( ifr.length() -  cc.length() ,  cc.length(),  cc) ) {
-            input_file = ifr ;
-            ifr.clear() ;
-        }
-    }
+				std::string	&	ifr	=	command_line_args_get_input_file_ref()	;
+				if	(	!	ifr.empty()	)	{
+								if	(!	ifr.compare(	ifr.length()	-	cpp.length()	,	cpp.length(),	cpp)	or
+												!	ifr.compare(	ifr.length()	-		cc.length()	,		cc.length(),		cc)	)	{
+												input_file	=	ifr	;
+												ifr.clear()	;
+								}
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# If the incoming file name has already been successfully compiled, return 0
--# Get the basename of the input file
--# Get the root name of the input file (no extension)
--# Set all of the output file names based on the output directory and the input file root name
--# Make the output directory
--# Open the makefile for writing
--# Create a makefile that will compile the input file to a shared library
--# Call make to compile the library file.
--# Extract the return status from the system call.
--# If the compilation was unsuccessful, exec_terminate
--# The library compile successfully.  Add library name to map
+-#	If	the	incoming	file	name	has	already	been	successfully	compiled,	return	0
+-#	Get	the	basename	of	the	input	file
+-#	Get	the	root	name	of	the	input	file	(no	extension)
+-#	Set	all	of	the	output	file	names	based	on	the	output	directory	and	the	input	file	root	name
+-#	Make	the	output	directory
+-#	Open	the	makefile	for	writing
+-#	Create	a	makefile	that	will	compile	the	input	file	to	a	shared	library
+-#	Call	make	to	compile	the	library	file.
+-#	Extract	the	return	status	from	the	system	call.
+-#	If	the	compilation	was	unsuccessful,	exec_terminate
+-#	The	library	compile	successfully.		Add	library	name	to	map
 */
-int Trick::JITInputFile::compile(std::string file_name) {
-
-    std::ofstream outfile ;
-    std::ostringstream ss ;
-
-    std::string output_directory ;
-    std::string object_fullpath_name ;
-    std::string library_fullpath_name ;
-    std::string makefile_fullpath_name ;
-    std::string input_file_rootname ;
-    std::string input_file_basename ;
-    std::string dep_file_name ;
-    struct stat output_dir_stat ;
-    int ret ;
-    size_t pos ;
-
-    // If the incoming file name has already been successfully compiled, return now.
-    if ( file_to_libinfo_map.find(file_name) != file_to_libinfo_map.end() ) {
-        return 0 ;
-    }
-
-    // get the basename of the input file
-    if ( (pos = file_name.find_last_of("/")) != std::string::npos ) {
-        input_file_basename = file_name.substr(pos + 1 ) ;
-    } else {
-        input_file_basename = file_name ;
-    }
-
-    // get the root name of the input file (no extension)
-    if ( (pos = input_file_basename.find_last_of(".")) != std::string::npos ) {
-        input_file_rootname = input_file_basename.substr(0, pos) ;
-    } else {
-        input_file_rootname = input_file_basename ;
-    }
-
-    // set all of the output file names based on the output directory and the input file root name
-    output_directory = std::string(command_line_args_get_output_dir()) + "/jitlib" ;
-    makefile_fullpath_name = output_directory + "/Makefile." + input_file_rootname ;
-    object_fullpath_name = output_directory + "/" + input_file_rootname + ".o" ;
-    library_fullpath_name = output_directory + "/lib" + input_file_rootname + ".so" ;
-    dep_file_name = output_directory + "/" + input_file_rootname + ".d" ;
-
-    // make the output directory
-    ret = stat( output_directory.c_str(), &output_dir_stat) ;
-    if ( ret == -1 and errno == ENOENT ) {
-        mkdir(output_directory.c_str(), 0775) ;
-    } else if ( ret == 0 and ! S_ISDIR(output_dir_stat.st_mode)) {
-        std::string error_message = "JITInputfile could not create directory " + output_directory ;
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str() ) ;
-    }
-
-    // open the makefile for writing
-    outfile.open(makefile_fullpath_name.c_str()) ;
-
-    // create a makefile that will compile the input file to a shared library
-    outfile << "# JITInputFile auto generated Makefile.  Paths are relative to the simulation directory" << std::endl ;
-    outfile << "# To manually use this file go to sim directory and use \"make -f " << makefile_fullpath_name << " <makefile_target>\"" ;
-    outfile << std::endl << std::endl ;
-    // rule to link shared library
-    outfile << library_fullpath_name << ": " << object_fullpath_name << std::endl ;
-#ifdef __APPLE__
-    outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_LDFLAGS") << " -shared -undefined dynamic_lookup -o $@ $< " << std::endl << std::endl ;
+int	Trick::JITInputFile::compile(std::string	file_name)	{
+
+				std::ofstream	outfile	;
+				std::ostringstream	ss	;
+
+				std::string	output_directory	;
+				std::string	object_fullpath_name	;
+				std::string	library_fullpath_name	;
+				std::string	makefile_fullpath_name	;
+				std::string	input_file_rootname	;
+				std::string	input_file_basename	;
+				std::string	dep_file_name	;
+				struct	stat	output_dir_stat	;
+				int	ret	;
+				size_t	pos	;
+
+				//	If	the	incoming	file	name	has	already	been	successfully	compiled,	return	now.
+				if	(	file_to_libinfo_map.find(file_name)	!=	file_to_libinfo_map.end()	)	{
+								return	0	;
+				}
+
+				//	get	the	basename	of	the	input	file
+				if	(	(pos	=	file_name.find_last_of("/"))	!=	std::string::npos	)	{
+								input_file_basename	=	file_name.substr(pos	+	1	)	;
+				}	else	{
+								input_file_basename	=	file_name	;
+				}
+
+				//	get	the	root	name	of	the	input	file	(no	extension)
+				if	(	(pos	=	input_file_basename.find_last_of("."))	!=	std::string::npos	)	{
+								input_file_rootname	=	input_file_basename.substr(0,	pos)	;
+				}	else	{
+								input_file_rootname	=	input_file_basename	;
+				}
+
+				//	set	all	of	the	output	file	names	based	on	the	output	directory	and	the	input	file	root	name
+				output_directory	=	std::string(command_line_args_get_output_dir())	+	"/jitlib"	;
+				makefile_fullpath_name	=	output_directory	+	"/Makefile."	+	input_file_rootname	;
+				object_fullpath_name	=	output_directory	+	"/"	+	input_file_rootname	+	".o"	;
+				library_fullpath_name	=	output_directory	+	"/lib"	+	input_file_rootname	+	".so"	;
+				dep_file_name	=	output_directory	+	"/"	+	input_file_rootname	+	".d"	;
+
+				//	make	the	output	directory
+				ret	=	stat(	output_directory.c_str(),	&output_dir_stat)	;
+				if	(	ret	==	-1	and	errno	==	ENOENT	)	{
+								mkdir(output_directory.c_str(),	0775)	;
+				}	else	if	(	ret	==	0	and	!	S_ISDIR(output_dir_stat.st_mode))	{
+								std::string	error_message	=	"JITInputfile	could	not	create	directory	"	+	output_directory	;
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str()	)	;
+				}
+
+				//	open	the	makefile	for	writing
+				outfile.open(makefile_fullpath_name.c_str())	;
+
+				//	create	a	makefile	that	will	compile	the	input	file	to	a	shared	library
+				outfile	<<	"#	JITInputFile	auto	generated	Makefile.		Paths	are	relative	to	the	simulation	directory"	<<	std::endl	;
+				outfile	<<	"#	To	manually	use	this	file	go	to	sim	directory	and	use	\"make	-f	"	<<	makefile_fullpath_name	<<	"	<makefile_target>\""	;
+				outfile	<<	std::endl	<<	std::endl	;
+				//	rule	to	link	shared	library
+				outfile	<<	library_fullpath_name	<<	":	"	<<	object_fullpath_name	<<	std::endl	;
+#ifdef	__APPLE__
+				outfile	<<	"\t"	<<	get_trick_env((char	*)"TRICK_CXX")	<<	"	"	<<	get_trick_env((char	*)"TRICK_LDFLAGS")	<<	"	-shared	-undefined	dynamic_lookup	-o	$@	$<	"	<<	std::endl	<<	std::endl	;
 #else
-    outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_LDFLAGS") << " -shared -o $@ $< " << std::endl << std::endl ;
+				outfile	<<	"\t"	<<	get_trick_env((char	*)"TRICK_CXX")	<<	"	"	<<	get_trick_env((char	*)"TRICK_LDFLAGS")	<<	"	-shared	-o	$@	$<	"	<<	std::endl	<<	std::endl	;
 #endif
-    // rule to compile cpp file
-    outfile << object_fullpath_name << ": " << file_name << std::endl ;
-    outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_CXXFLAGS") ;
-    outfile << " " << get_trick_env((char *)"TRICK_SYSTEM_CXXFLAGS") ;
-    outfile << " -MMD -c -fPIC -o $@ $<" << std::endl << std::endl ;
-    // rule to clean
-    outfile << "clean:" << std::endl ;
-    outfile << "\t rm -f " << object_fullpath_name << " " << library_fullpath_name ;
-    outfile << " " << dep_file_name << std::endl << std::endl ;
-    // dependency file
-    outfile << "-include " << dep_file_name << std::endl ;
-
-    outfile.close() ;
-
-    // call make to compile the library file.
-    ss << "make -s -f " << makefile_fullpath_name << std::endl ;
-    ret = system(ss.str().c_str()) ;
-
-    // extract the return status from the system call.
-    ret = WEXITSTATUS(ret) ;
-
-    // If the compilation was unsuccessful, exec_terminate
-    if ( ret != 0 ) {
-        std::string error_message = std::string("JITInputFile shared library creation failed: ")
-                                  + std::strerror(errno);
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str());
-    }
-
-    // The library compile successfully.  Add library name to map
-    JITLibInfo li ;
-    li.library_name = library_fullpath_name ;
-    file_to_libinfo_map[file_name] = li ;
-
-    return 0 ;
+				//	rule	to	compile	cpp	file
+				outfile	<<	object_fullpath_name	<<	":	"	<<	file_name	<<	std::endl	;
+				outfile	<<	"\t"	<<	get_trick_env((char	*)"TRICK_CXX")	<<	"	"	<<	get_trick_env((char	*)"TRICK_CXXFLAGS")	;
+				outfile	<<	"	"	<<	get_trick_env((char	*)"TRICK_SYSTEM_CXXFLAGS")	;
+				outfile	<<	"	-MMD	-c	-fPIC	-o	$@	$<"	<<	std::endl	<<	std::endl	;
+				//	rule	to	clean
+				outfile	<<	"clean:"	<<	std::endl	;
+				outfile	<<	"\t	rm	-f	"	<<	object_fullpath_name	<<	"	"	<<	library_fullpath_name	;
+				outfile	<<	"	"	<<	dep_file_name	<<	std::endl	<<	std::endl	;
+				//	dependency	file
+				outfile	<<	"-include	"	<<	dep_file_name	<<	std::endl	;
+
+				outfile.close()	;
+
+				//	call	make	to	compile	the	library	file.
+				ss	<<	"make	-s	-f	"	<<	makefile_fullpath_name	<<	std::endl	;
+				ret	=	system(ss.str().c_str())	;
+
+				//	extract	the	return	status	from	the	system	call.
+				ret	=	WEXITSTATUS(ret)	;
+
+				//	If	the	compilation	was	unsuccessful,	exec_terminate
+				if	(	ret	!=	0	)	{
+								std::string	error_message	=	std::string("JITInputFile	shared	library	creation	failed:	")
+																																		+	std::strerror(errno);
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str());
+				}
+
+				//	The	library	compile	successfully.		Add	library	name	to	map
+				JITLibInfo	li	;
+				li.library_name	=	library_fullpath_name	;
+				file_to_libinfo_map[file_name]	=	li	;
+
+				return	0	;
 
 }
 
 /**
 @details
--# Check if we have compiled this library yet
-    -# If we have not compiled the library then exec_terminate
--# If the library handle is NULL, try and open the library
-    -# If the library open fails, exec_terminate
--# Look up the symbol run_function
-    -# If the symbol is not found exec_terminate.
--# Call the function
+-#	Check	if	we	have	compiled	this	library	yet
+				-#	If	we	have	not	compiled	the	library	then	exec_terminate
+-#	If	the	library	handle	is	NULL,	try	and	open	the	library
+				-#	If	the	library	open	fails,	exec_terminate
+-#	Look	up	the	symbol	run_function
+				-#	If	the	symbol	is	not	found	exec_terminate.
+-#	Call	the	function
 */
-int Trick::JITInputFile::run(std::string file_name , std::string run_function ) {
-    // Check if we have compiled this library yet.
-    if ( file_to_libinfo_map.find(file_name) == file_to_libinfo_map.end() ) {
-        // If we have not compiled the library then exec_terminate
-        std::string error_message = "JITInputfile library not found for " + file_name ;
-        exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str() ) ;
-    }
-
-    JITLibInfo & li = file_to_libinfo_map.find(file_name)->second ;
-    // if the library handle is NULL, try and open the library.
-    if ( li.handle == NULL ) {
-        li.handle = dlopen( li.library_name.c_str() , RTLD_LAZY ) ;
-        // if the library open fails, exec_terminate
-        if ( li.handle == NULL ) {
-            std::string error_message = "JITInputfile dlopen failed on " + li.library_name ;
-            exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str() ) ;
-        }
-    }
-
-    // Look up the symbol name
-    int (*call_me)(void) = (int (*)(void))dlsym( li.handle , run_function.c_str()) ;
-    if ( call_me == NULL ) {
-        std::string error_message = "JITInputfile could not find function " + run_function ;
-        return exec_terminate_with_return(-1 , __FILE__ , __LINE__ , error_message.c_str() ) ;
-    } else {
-        // We found the function, call it!
-        return (*call_me)() ;
-    }
+int	Trick::JITInputFile::run(std::string	file_name	,	std::string	run_function	)	{
+				//	Check	if	we	have	compiled	this	library	yet.
+				if	(	file_to_libinfo_map.find(file_name)	==	file_to_libinfo_map.end()	)	{
+								//	If	we	have	not	compiled	the	library	then	exec_terminate
+								std::string	error_message	=	"JITInputfile	library	not	found	for	"	+	file_name	;
+								exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str()	)	;
+				}
+
+				JITLibInfo	&	li	=	file_to_libinfo_map.find(file_name)->second	;
+				//	if	the	library	handle	is	NULL,	try	and	open	the	library.
+				if	(	li.handle	==	NULL	)	{
+								li.handle	=	dlopen(	li.library_name.c_str()	,	RTLD_LAZY	)	;
+								//	if	the	library	open	fails,	exec_terminate
+								if	(	li.handle	==	NULL	)	{
+												std::string	error_message	=	"JITInputfile	dlopen	failed	on	"	+	li.library_name	;
+												exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str()	)	;
+								}
+				}
+
+				//	Look	up	the	symbol	name
+				int	(*call_me)(void)	=	(int	(*)(void))dlsym(	li.handle	,	run_function.c_str())	;
+				if	(	call_me	==	NULL	)	{
+								std::string	error_message	=	"JITInputfile	could	not	find	function	"	+	run_function	;
+								return	exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	error_message.c_str()	)	;
+				}	else	{
+								//	We	found	the	function,	call	it!
+								return	(*call_me)()	;
+				}
 }
 
 /**
 @details
--# If the file_name is not empty
-    -# Compile the file_name
-    -# If the file compiled successfully
-        -# Execute the run_function
+-#	If	the	file_name	is	not	empty
+				-#	Compile	the	file_name
+				-#	If	the	file	compiled	successfully
+								-#	Execute	the	run_function
 */
-int Trick::JITInputFile::compile_and_run(std::string file_name, std::string run_function) {
-
-    int ret = 0 ;
-
-    // If the file name is not empty
-    if ( ! file_name.empty() ) {
-        // Attempt to compile the library.
-        ret = compile(file_name) ;
-        if ( ret == 0 ) {
-            // If the compilation was successful execute run_function.
-            ret = run( file_name , run_function ) ;
-        }
-    }
-
-    // Return 0 or the return value of compile/run.
-    return ret ;
+int	Trick::JITInputFile::compile_and_run(std::string	file_name,	std::string	run_function)	{
+
+				int	ret	=	0	;
+
+				//	If	the	file	name	is	not	empty
+				if	(	!	file_name.empty()	)	{
+								//	Attempt	to	compile	the	library.
+								ret	=	compile(file_name)	;
+								if	(	ret	==	0	)	{
+												//	If	the	compilation	was	successful	execute	run_function.
+												ret	=	run(	file_name	,	run_function	)	;
+								}
+				}
+
+				//	Return	0	or	the	return	value	of	compile/run.
+				return	ret	;
 }
 
 /**
 @details
--# If the incoming file name has already been added, return 0
--# Add library name to map
+-#	If	the	incoming	file	name	has	already	been	added,	return	0
+-#	Add	library	name	to	map
 */
-int Trick::JITInputFile::add_library(std::string lib_name) {
+int	Trick::JITInputFile::add_library(std::string	lib_name)	{
 
-    // If the incoming file name has already been added, return 0
-    if ( file_to_libinfo_map.find(lib_name) != file_to_libinfo_map.end() ) {
-        return 0 ;
-    }
+				//	If	the	incoming	file	name	has	already	been	added,	return	0
+				if	(	file_to_libinfo_map.find(lib_name)	!=	file_to_libinfo_map.end()	)	{
+								return	0	;
+				}
 
-    // Add library name to map
-    JITLibInfo li ;
-    li.library_name = lib_name ;
-    li.handle = dlopen( li.library_name.c_str() , RTLD_LAZY ) ;
-    file_to_libinfo_map[lib_name] = li ;
+				//	Add	library	name	to	map
+				JITLibInfo	li	;
+				li.library_name	=	lib_name	;
+				li.handle	=	dlopen(	li.library_name.c_str()	,	RTLD_LAZY	)	;
+				file_to_libinfo_map[lib_name]	=	li	;
 
-    return 0 ;
+				return	0	;
 }
 
-void * Trick::JITInputFile::find_symbol(std::string sym) {
-    std::map< std::string , JITLibInfo >::iterator it ;
-    for ( it = file_to_libinfo_map.begin() ; it != file_to_libinfo_map.end() ; ++it ) {
-        void * ret = (*it).second.find_symbol(sym) ;
-        if (ret != NULL) {
-            return ret ;
-        }
-    }
-    return NULL ;
+void	*	Trick::JITInputFile::find_symbol(std::string	sym)	{
+				std::map<	std::string	,	JITLibInfo	>::iterator	it	;
+				for	(	it	=	file_to_libinfo_map.begin()	;	it	!=	file_to_libinfo_map.end()	;	++it	)	{
+								void	*	ret	=	(*it).second.find_symbol(sym)	;
+								if	(ret	!=	NULL)	{
+												return	ret	;
+								}
+				}
+				return	NULL	;
 }
 
 /**
 @details
--# Call compile_and_run with the input_file from the command line
+-#	Call	compile_and_run	with	the	input_file	from	the	command	line
 */
-int Trick::JITInputFile::init() {
-    // Compile and run the input file.  It's ok if input_file is empty.
-    return compile_and_run(input_file) ;
+int	Trick::JITInputFile::init()	{
+				//	Compile	and	run	the	input	file.		It's	ok	if	input_file	is	empty.
+				return	compile_and_run(input_file)	;
 }
 
diff --git a/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp b/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp
index d16730dd1..f027317ff 100644
--- a/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp
+++ b/trick_source/sim_services/JITInputFile/jit_input_file_c_intf.cpp
@@ -1,74 +1,74 @@
-#include <cmath>
+#include	<cmath>
 
-#include "trick/jit_input_file_proto.hh"
-#include "trick/JITInputFile.hh"
-#include "trick/exec_proto.h"
-#include "trick/EventManager_c_intf.hh"
+#include	"trick/jit_input_file_proto.hh"
+#include	"trick/JITInputFile.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/EventManager_c_intf.hh"
 
-extern Trick::JITInputFile * the_jit ;
+extern	Trick::JITInputFile	*	the_jit	;
 
-int jit_compile(std::string file_name) {
-    if ( the_jit != NULL ) {
-        return the_jit->compile(file_name) ;
-    }
-    return -1 ;
+int	jit_compile(std::string	file_name)	{
+				if	(	the_jit	!=	NULL	)	{
+								return	the_jit->compile(file_name)	;
+				}
+				return	-1	;
 }
 
-int jit_run(std::string library_name , std::string run_function ) {
-    if ( the_jit != NULL ) {
-        return the_jit->run(library_name, run_function) ;
-    }
-    return -1 ;
+int	jit_run(std::string	library_name	,	std::string	run_function	)	{
+				if	(	the_jit	!=	NULL	)	{
+								return	the_jit->run(library_name,	run_function)	;
+				}
+				return	-1	;
 }
 
-int jit_compile_and_run(std::string file_name, std::string run_function ) {
-    if ( the_jit != NULL ) {
-        return the_jit->compile_and_run(file_name, run_function) ;
-    }
-    return -1 ;
+int	jit_compile_and_run(std::string	file_name,	std::string	run_function	)	{
+				if	(	the_jit	!=	NULL	)	{
+								return	the_jit->compile_and_run(file_name,	run_function)	;
+				}
+				return	-1	;
 }
 
-int jit_add_library(std::string lib_name ) {
-    if ( the_jit != NULL ) {
-        return the_jit->add_library(lib_name) ;
-    }
-    return -1 ;
+int	jit_add_library(std::string	lib_name	)	{
+				if	(	the_jit	!=	NULL	)	{
+								return	the_jit->add_library(lib_name)	;
+				}
+				return	-1	;
 }
 
-void * jit_find_symbol(std::string sym ) {
-    if ( the_jit != NULL ) {
-        return the_jit->find_symbol(sym) ;
-    }
-    return NULL ;
+void	*	jit_find_symbol(std::string	sym	)	{
+				if	(	the_jit	!=	NULL	)	{
+								return	the_jit->find_symbol(sym)	;
+				}
+				return	NULL	;
 }
 
-int jit_add_read( unsigned int thread_id , double in_time , std::string func_name ) {
-    Trick::JITEvent * event = (Trick::JITEvent *)TMM_declare_var_1d("Trick::JITEvent", 1) ;
-    new (event) Trick::JITEvent(func_name, "jit_read_event" , 0) ;
-    event->set_thread(thread_id) ;
-    event->set_next_tics((long long)round(in_time * exec_get_time_tic_value())) ;
-    return event_manager_add_event(event) ;
+int	jit_add_read(	unsigned	int	thread_id	,	double	in_time	,	std::string	func_name	)	{
+				Trick::JITEvent	*	event	=	(Trick::JITEvent	*)TMM_declare_var_1d("Trick::JITEvent",	1)	;
+				new	(event)	Trick::JITEvent(func_name,	"jit_read_event"	,	0)	;
+				event->set_thread(thread_id)	;
+				event->set_next_tics((long	long)round(in_time	*	exec_get_time_tic_value()))	;
+				return	event_manager_add_event(event)	;
 }
 
-int jit_add_read( double in_time , std::string func_name) {
-    return jit_add_read( 0 , in_time , func_name) ;
+int	jit_add_read(	double	in_time	,	std::string	func_name)	{
+				return	jit_add_read(	0	,	in_time	,	func_name)	;
 }
 
-int jit_add_event( std::string func_name, std::string name , double cycle ) {
-    Trick::JITEvent * event = (Trick::JITEvent *)TMM_declare_var_1d("Trick::JITEvent", 1) ;
-    new (event) Trick::JITEvent(func_name , name , cycle ) ;
-    return event_manager_add_event(event) ;
+int	jit_add_event(	std::string	func_name,	std::string	name	,	double	cycle	)	{
+				Trick::JITEvent	*	event	=	(Trick::JITEvent	*)TMM_declare_var_1d("Trick::JITEvent",	1)	;
+				new	(event)	Trick::JITEvent(func_name	,	name	,	cycle	)	;
+				return	event_manager_add_event(event)	;
 }
 
-int jit_add_event_before( std::string func_name , std::string name , std::string target_name , unsigned int target_inst ) {
-    Trick::JITEvent * event = (Trick::JITEvent *)TMM_declare_var_1d("Trick::JITEvent", 1) ;
-    new (event) Trick::JITEvent(func_name , name ) ;
-    return event_manager_add_event_before(event, target_name , target_inst) ;
+int	jit_add_event_before(	std::string	func_name	,	std::string	name	,	std::string	target_name	,	unsigned	int	target_inst	)	{
+				Trick::JITEvent	*	event	=	(Trick::JITEvent	*)TMM_declare_var_1d("Trick::JITEvent",	1)	;
+				new	(event)	Trick::JITEvent(func_name	,	name	)	;
+				return	event_manager_add_event_before(event,	target_name	,	target_inst)	;
 }
 
-int jit_add_event_after( std::string func_name, std::string name , std::string target_name , unsigned int target_inst ) {
-    Trick::JITEvent * event = (Trick::JITEvent *)TMM_declare_var_1d("Trick::JITEvent", 1) ;
-    new (event) Trick::JITEvent(func_name , name ) ;
-    return event_manager_add_event_after(event, target_name , target_inst) ;
+int	jit_add_event_after(	std::string	func_name,	std::string	name	,	std::string	target_name	,	unsigned	int	target_inst	)	{
+				Trick::JITEvent	*	event	=	(Trick::JITEvent	*)TMM_declare_var_1d("Trick::JITEvent",	1)	;
+				new	(event)	Trick::JITEvent(func_name	,	name	)	;
+				return	event_manager_add_event_after(event,	target_name	,	target_inst)	;
 }
 
diff --git a/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp b/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp
index b4868b08d..15b232adf 100644
--- a/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp
+++ b/trick_source/sim_services/JSONVariableServer/JSONVariableServer.cpp
@@ -1,193 +1,193 @@
 
-#include <iostream>
-#include <pwd.h>
-#include <sstream>
-
-#include "trick/JSONVariableServer.hh"
-#include "trick/JSONVariableServerThread.hh"
-#include "trick/tc_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-Trick::JSONVariableServer::JSONVariableServer() :
- Trick::ThreadBase("JSONVarServLis"),
- enabled(true),
- port(0),
- user_port_requested(false),
- listen_dev()
+#include	<iostream>
+#include	<pwd.h>
+#include	<sstream>
+
+#include	"trick/JSONVariableServer.hh"
+#include	"trick/JSONVariableServerThread.hh"
+#include	"trick/tc_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+Trick::JSONVariableServer::JSONVariableServer()	:
+	Trick::ThreadBase("JSONVarServLis"),
+	enabled(true),
+	port(0),
+	user_port_requested(false),
+	listen_dev()
 {
-    char hname[80];
-    gethostname(hname , (size_t) 80 ) ;
-    source_address = std::string(hname) ;
-    strcpy(listen_dev.client_tag, "<empty>");
-    tc_error(&listen_dev, 0);
+				char	hname[80];
+				gethostname(hname	,	(size_t)	80	)	;
+				source_address	=	std::string(hname)	;
+				strcpy(listen_dev.client_tag,	"<empty>");
+				tc_error(&listen_dev,	0);
 }
 
-Trick::JSONVariableServer::~JSONVariableServer() {
-        free(listen_dev.hostname) ;
-        free(listen_dev.error_handler) ;
+Trick::JSONVariableServer::~JSONVariableServer()	{
+								free(listen_dev.hostname)	;
+								free(listen_dev.error_handler)	;
 }
 
-const char * Trick::JSONVariableServer::get_hostname() {
-    return listen_dev.hostname;
+const	char	*	Trick::JSONVariableServer::get_hostname()	{
+				return	listen_dev.hostname;
 }
 
-unsigned short Trick::JSONVariableServer::get_port() {
-    return port;
+unsigned	short	Trick::JSONVariableServer::get_port()	{
+				return	port;
 }
 
-void Trick::JSONVariableServer::set_port(unsigned short in_port) {
-    port = in_port;
-    user_port_requested = true ;
+void	Trick::JSONVariableServer::set_port(unsigned	short	in_port)	{
+				port	=	in_port;
+				user_port_requested	=	true	;
 }
 
-void Trick::JSONVariableServer::set_source_address(const char * address) {
-    if ( address == NULL ) {
-        source_address = std::string("") ;
-    } else {
-        source_address = std::string(address) ;
-    }
-    user_port_requested = true ;
+void	Trick::JSONVariableServer::set_source_address(const	char	*	address)	{
+				if	(	address	==	NULL	)	{
+								source_address	=	std::string("")	;
+				}	else	{
+								source_address	=	std::string(address)	;
+				}
+				user_port_requested	=	true	;
 }
 
-std::string Trick::JSONVariableServer::get_source_address() {
-    return source_address ;
+std::string	Trick::JSONVariableServer::get_source_address()	{
+				return	source_address	;
 }
 
 /*
 @details
--# call tc_init to initialize the listen device
- -# save the port number if tc_init was successful
+-#	call	tc_init	to	initialize	the	listen	device
+	-#	save	the	port	number	if	tc_init	was	successful
 */
-int Trick::JSONVariableServer::init_listen_device() {
-    int ret;
-
-    ret = tc_init(&listen_dev);
-    if (ret == TC_SUCCESS) {
-        port = listen_dev.port ;
-    } else {
-        fprintf(stderr, "ERROR: Could not establish listen port for Variable Server. Aborting.\n");
-        ret = -1 ;
-    }
-    return ret ;
+int	Trick::JSONVariableServer::init_listen_device()	{
+				int	ret;
+
+				ret	=	tc_init(&listen_dev);
+				if	(ret	==	TC_SUCCESS)	{
+								port	=	listen_dev.port	;
+				}	else	{
+								fprintf(stderr,	"ERROR:	Could	not	establish	listen	port	for	Variable	Server.	Aborting.\n");
+								ret	=	-1	;
+				}
+				return	ret	;
 }
 
 /*
 @details
--# if enabled
- -# move listen device to user specified address and port.
- -# create listening thread
+-#	if	enabled
+	-#	move	listen	device	to	user	specified	address	and	port.
+	-#	create	listening	thread
 */
-int Trick::JSONVariableServer::init() {
-    int ret = 0 ;
-    if ( enabled ) {
-        ret = check_and_move_listen_device() ;
-        if ( ret == 0 ) {
-            create_thread() ;
-        }
-    } else {
-        tc_disconnect(&listen_dev) ;
-    }
-    return ret ;
+int	Trick::JSONVariableServer::init()	{
+				int	ret	=	0	;
+				if	(	enabled	)	{
+								ret	=	check_and_move_listen_device()	;
+								if	(	ret	==	0	)	{
+												create_thread()	;
+								}
+				}	else	{
+								tc_disconnect(&listen_dev)	;
+				}
+				return	ret	;
 }
 
 /*
 @details
--# If the source address or port number does not match the current listen device
- -# disconnect current listen device
- -# initialize listen device with new source address and port
+-#	If	the	source	address	or	port	number	does	not	match	the	current	listen	device
+	-#	disconnect	current	listen	device
+	-#	initialize	listen	device	with	new	source	address	and	port
 */
-int Trick::JSONVariableServer::check_and_move_listen_device() {
-    int ret ;
-
-    if ( source_address.compare(listen_dev.hostname) or port != listen_dev.port ) {
-        /* The user has requested a different source address or port in the input file */
-        tc_disconnect(&listen_dev) ;
-        ret = tc_init_with_connection_info(&listen_dev, AF_INET, SOCK_STREAM, source_address.c_str(), port) ;
-        if (ret != TC_SUCCESS) {
-            message_publish(MSG_ERROR, "ERROR: Could not establish variable server source_address %s: port %d. Aborting.\n",
-             source_address.c_str(), port);
-            return -1 ;
-        }
-    }
-    return 0 ;
+int	Trick::JSONVariableServer::check_and_move_listen_device()	{
+				int	ret	;
+
+				if	(	source_address.compare(listen_dev.hostname)	or	port	!=	listen_dev.port	)	{
+								/*	The	user	has	requested	a	different	source	address	or	port	in	the	input	file	*/
+								tc_disconnect(&listen_dev)	;
+								ret	=	tc_init_with_connection_info(&listen_dev,	AF_INET,	SOCK_STREAM,	source_address.c_str(),	port)	;
+								if	(ret	!=	TC_SUCCESS)	{
+												message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	variable	server	source_address	%s:	port	%d.	Aborting.\n",
+													source_address.c_str(),	port);
+												return	-1	;
+								}
+				}
+				return	0	;
 }
 
 /*
 @details
--# Loop forever for new connections
- -# create a new VariableServerThread when new conection found
- -# create new VariableServerThread thread
+-#	Loop	forever	for	new	connections
+	-#	create	a	new	VariableServerThread	when	new	conection	found
+	-#	create	new	VariableServerThread	thread
 */
-void * Trick::JSONVariableServer::thread_body() {
+void	*	Trick::JSONVariableServer::thread_body()	{
 
-    fd_set rfds;
-    struct timeval timeout_time = { 2, 0 };
+				fd_set	rfds;
+				struct	timeval	timeout_time	=	{	2,	0	};
 
-    while (1) {
-        FD_ZERO(&rfds);
-        FD_SET(listen_dev.socket, &rfds);
-        timeout_time.tv_sec = 2 ;
-        select(listen_dev.socket + 1, &rfds, NULL, NULL, &timeout_time);
+				while	(1)	{
+								FD_ZERO(&rfds);
+								FD_SET(listen_dev.socket,	&rfds);
+								timeout_time.tv_sec	=	2	;
+								select(listen_dev.socket	+	1,	&rfds,	NULL,	NULL,	&timeout_time);
 
-        if (FD_ISSET(listen_dev.socket, &rfds)) {
-            Trick::JSONVariableServerThread * vst = new Trick::JSONVariableServerThread(&listen_dev) ;
-            vst->copy_cpus(get_cpus()) ;
-            vst->create_thread() ;
-        }
-    }
+								if	(FD_ISSET(listen_dev.socket,	&rfds))	{
+												Trick::JSONVariableServerThread	*	vst	=	new	Trick::JSONVariableServerThread(&listen_dev)	;
+												vst->copy_cpus(get_cpus())	;
+												vst->create_thread()	;
+								}
+				}
 
-    return NULL ;
+				return	NULL	;
 }
 
 /*
 @details
--# If the user specified an address and port
- -# disconnect the current listen port
- -# initialize listen port to new address and port
--# else print message of current port number of listen device
+-#	If	the	user	specified	an	address	and	port
+	-#	disconnect	the	current	listen	port
+	-#	initialize	listen	port	to	new	address	and	port
+-#	else	print	message	of	current	port	number	of	listen	device
 */
-int Trick::JSONVariableServer::restart() {
-
-    int ret ;
-
-    if ( user_port_requested ) {
-        char hname[80];
-        static struct sockaddr_in s_in;
-        gethostname(hname, (size_t) 80);
-        // Test to see if the restart address is on this machine.  If it is not, it's not an error, clear source address
-        if ( strcmp( source_address.c_str(), hname )) {
-            if (! inet_pton(AF_INET, source_address.c_str(), (struct in_addr *)&s_in.sin_addr.s_addr) ) {
-                //printf("clearing source_address\n") ;
-                source_address.clear() ;
-            }
-        }
-
-        printf("JSON variable server restart user_port requested set %d\n", port) ;
-
-        tc_disconnect(&listen_dev) ;
-        ret = tc_init_with_connection_info(&listen_dev, AF_INET, SOCK_STREAM, source_address.c_str(), port) ;
-        if (ret != TC_SUCCESS) {
-            message_publish(MSG_ERROR, "ERROR: Could not establish listen port %d for JSON Variable Server. Aborting.\n", port);
-            return (-1);
-        }
-    } else {
-        struct sockaddr_in s_in;
-        int s_in_size =  sizeof(s_in) ;
-        getsockname( listen_dev.socket , (struct sockaddr *)&s_in, (socklen_t *)&s_in_size) ;
-        printf("restart JSON variable server message port = %d\n" , ntohs(s_in.sin_port)) ;
-        port = listen_dev.port = ntohs(s_in.sin_port);
-    }
-
-    return 0 ;
+int	Trick::JSONVariableServer::restart()	{
+
+				int	ret	;
+
+				if	(	user_port_requested	)	{
+								char	hname[80];
+								static	struct	sockaddr_in	s_in;
+								gethostname(hname,	(size_t)	80);
+								//	Test	to	see	if	the	restart	address	is	on	this	machine.		If	it	is	not,	it's	not	an	error,	clear	source	address
+								if	(	strcmp(	source_address.c_str(),	hname	))	{
+												if	(!	inet_pton(AF_INET,	source_address.c_str(),	(struct	in_addr	*)&s_in.sin_addr.s_addr)	)	{
+																//printf("clearing	source_address\n")	;
+																source_address.clear()	;
+												}
+								}
+
+								printf("JSON	variable	server	restart	user_port	requested	set	%d\n",	port)	;
+
+								tc_disconnect(&listen_dev)	;
+								ret	=	tc_init_with_connection_info(&listen_dev,	AF_INET,	SOCK_STREAM,	source_address.c_str(),	port)	;
+								if	(ret	!=	TC_SUCCESS)	{
+												message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	listen	port	%d	for	JSON	Variable	Server.	Aborting.\n",	port);
+												return	(-1);
+								}
+				}	else	{
+								struct	sockaddr_in	s_in;
+								int	s_in_size	=		sizeof(s_in)	;
+								getsockname(	listen_dev.socket	,	(struct	sockaddr	*)&s_in,	(socklen_t	*)&s_in_size)	;
+								printf("restart	JSON	variable	server	message	port	=	%d\n"	,	ntohs(s_in.sin_port))	;
+								port	=	listen_dev.port	=	ntohs(s_in.sin_port);
+				}
+
+				return	0	;
 }
 
-void Trick::JSONVariableServer::dump( std::ostream & oss ) {
-    oss << "Trick::JSONVariableServer (" << name << ")\n";
-    oss << "    enabled = " << enabled << "\n";
-    oss << "    source_address = " << source_address << "\n";
-    oss << "    port = " << port << "\n";
-    oss << "    user_port_requested = " << user_port_requested << std::endl ;
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::JSONVariableServer::dump(	std::ostream	&	oss	)	{
+				oss	<<	"Trick::JSONVariableServer	("	<<	name	<<	")\n";
+				oss	<<	"				enabled	=	"	<<	enabled	<<	"\n";
+				oss	<<	"				source_address	=	"	<<	source_address	<<	"\n";
+				oss	<<	"				port	=	"	<<	port	<<	"\n";
+				oss	<<	"				user_port_requested	=	"	<<	user_port_requested	<<	std::endl	;
+				Trick::ThreadBase::dump(oss)	;
 }
 
diff --git a/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp b/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp
index af03e8d89..7729c140a 100644
--- a/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp
+++ b/trick_source/sim_services/JSONVariableServer/JSONVariableServerThread.cpp
@@ -1,314 +1,314 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<string.h>
 
-#include "trick/JSONVariableServerThread.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.h"
-#include "trick/PythonPrint.hh"
-#include "trick/tc_proto.h"
-#include "trick/TrickConstant.hh"
+#include	"trick/JSONVariableServerThread.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.h"
+#include	"trick/PythonPrint.hh"
+#include	"trick/tc_proto.h"
+#include	"trick/TrickConstant.hh"
 
-Trick::JSONVariableServerThread::JSONVariableServerThread(TCDevice * listen_dev) :
- Trick::ThreadBase("JSONVarServer") {
+Trick::JSONVariableServerThread::JSONVariableServerThread(TCDevice	*	listen_dev)	:
+	Trick::ThreadBase("JSONVarServer")	{
 
-    connection.disable_handshaking = TC_COMM_TRUE ;
-    connection.blockio_type = TC_COMM_BLOCKIO ;
+				connection.disable_handshaking	=	TC_COMM_TRUE	;
+				connection.blockio_type	=	TC_COMM_BLOCKIO	;
 
-    tc_accept(listen_dev, &connection);
+				tc_accept(listen_dev,	&connection);
 
-    // Save the hostname and port of the listen server
-    hostname = listen_dev->hostname ;
-    port = listen_dev->port ;
+				//	Save	the	hostname	and	port	of	the	listen	server
+				hostname	=	listen_dev->hostname	;
+				port	=	listen_dev->port	;
 
-    incoming_msg = new char[MAX_CMD_LEN] ;
+				incoming_msg	=	new	char[MAX_CMD_LEN]	;
 }
 
 /*
 @details
--# delete the space for incominig_msg.
--# These classes are always allocated... free the memory on the way out.
+-#	delete	the	space	for	incominig_msg.
+-#	These	classes	are	always	allocated...	free	the	memory	on	the	way	out.
 */
-Trick::JSONVariableServerThread::~JSONVariableServerThread() {
-    delete [] incoming_msg ;
+Trick::JSONVariableServerThread::~JSONVariableServerThread()	{
+				delete	[]	incoming_msg	;
 }
 
 /*
 @details
--# Loop until the connection is broken or timed_out
- -# Call select to wait up to 15 seconds for a message.
- -# If a message is found, read it into the incoming_msg buffer
- -# Call parse_request on the incoming_msg buffer
--# Disconnect the socket connection
+-#	Loop	until	the	connection	is	broken	or	timed_out
+	-#	Call	select	to	wait	up	to	15	seconds	for	a	message.
+	-#	If	a	message	is	found,	read	it	into	the	incoming_msg	buffer
+	-#	Call	parse_request	on	the	incoming_msg	buffer
+-#	Disconnect	the	socket	connection
 */
-void * Trick::JSONVariableServerThread::thread_body() {
+void	*	Trick::JSONVariableServerThread::thread_body()	{
 
-    int nbytes = -1 ;
-    socklen_t sock_size = sizeof(connection.remoteServAddr) ;
-    fd_set rfds;
-    struct timeval timeout_time = { 15, 0 };
-    bool timed_out = false ;
+				int	nbytes	=	-1	;
+				socklen_t	sock_size	=	sizeof(connection.remoteServAddr)	;
+				fd_set	rfds;
+				struct	timeval	timeout_time	=	{	15,	0	};
+				bool	timed_out	=	false	;
 
-    while (! timed_out and nbytes != 0 ) {
-        FD_ZERO(&rfds);
-        FD_SET(connection.socket, &rfds);
-        timeout_time.tv_sec = 15 ;
-        select(connection.socket + 1, &rfds, NULL, NULL, &timeout_time);
+				while	(!	timed_out	and	nbytes	!=	0	)	{
+								FD_ZERO(&rfds);
+								FD_SET(connection.socket,	&rfds);
+								timeout_time.tv_sec	=	15	;
+								select(connection.socket	+	1,	&rfds,	NULL,	NULL,	&timeout_time);
 
-        if ( FD_ISSET(connection.socket, &rfds)) {
-            nbytes = recvfrom( connection.socket, incoming_msg, MAX_CMD_LEN, 0 ,
-                     (struct sockaddr *)&connection.remoteServAddr, &sock_size ) ;
-            //std::cout << "nbytes = " << nbytes << std::endl ;
-            if (nbytes != 0 ) {
-                //std::cout << incoming_msg << std::endl ;
-                parse_request() ;
-            }
-        } else {
-            timed_out = true ;
-        }
-    }
-    tc_disconnect(&connection) ;
-    //std::cout << "closed variable server connection" << std::endl ;
+								if	(	FD_ISSET(connection.socket,	&rfds))	{
+												nbytes	=	recvfrom(	connection.socket,	incoming_msg,	MAX_CMD_LEN,	0	,
+																					(struct	sockaddr	*)&connection.remoteServAddr,	&sock_size	)	;
+												//std::cout	<<	"nbytes	=	"	<<	nbytes	<<	std::endl	;
+												if	(nbytes	!=	0	)	{
+																//std::cout	<<	incoming_msg	<<	std::endl	;
+																parse_request()	;
+												}
+								}	else	{
+												timed_out	=	true	;
+								}
+				}
+				tc_disconnect(&connection)	;
+				//std::cout	<<	"closed	variable	server	connection"	<<	std::endl	;
 
-    return NULL ;
+				return	NULL	;
 }
 
 /*
 @details
--# scan the incoming message for the command and requested path
--# start the return message with a "{"
--# if both a command and request is present
- -# if the command is "GET"
-  -# if the path is "/" call get_top_page
-  -# else if the path starts with "/vars" call get_vars
-  -# else if the path starts with "/commands" call get_commands
-  -# else create an error message reply
- -# else if the command is "POST" do something at some point.
- -# else create an error message reply
--# else create an error message reply
--# close the return message with a "}"
--# create the http header for the reply message
--# call tc_write to send the reply message
+-#	scan	the	incoming	message	for	the	command	and	requested	path
+-#	start	the	return	message	with	a	"{"
+-#	if	both	a	command	and	request	is	present
+	-#	if	the	command	is	"GET"
+		-#	if	the	path	is	"/"	call	get_top_page
+		-#	else	if	the	path	starts	with	"/vars"	call	get_vars
+		-#	else	if	the	path	starts	with	"/commands"	call	get_commands
+		-#	else	create	an	error	message	reply
+	-#	else	if	the	command	is	"POST"	do	something	at	some	point.
+	-#	else	create	an	error	message	reply
+-#	else	create	an	error	message	reply
+-#	close	the	return	message	with	a	"}"
+-#	create	the	http	header	for	the	reply	message
+-#	call	tc_write	to	send	the	reply	message
 */
-void Trick::JSONVariableServerThread::parse_request() {
-    // Need to protect against buffer overflow
-    char command[32] ;
-    char path[512] ;
-    std::stringstream ss ;
-    std::stringstream body ;
-    int ret ;
+void	Trick::JSONVariableServerThread::parse_request()	{
+				//	Need	to	protect	against	buffer	overflow
+				char	command[32]	;
+				char	path[512]	;
+				std::stringstream	ss	;
+				std::stringstream	body	;
+				int	ret	;
 
-    ret = sscanf(incoming_msg, "%s %s", command , path) ;
+				ret	=	sscanf(incoming_msg,	"%s	%s",	command	,	path)	;
 
-    body << "{" << std::endl ;
-    if ( ret == 2 ) {
-        //std::cout << "command = " << command << std::endl ;
-        //std::cout << "path = " << path << std::endl ;
+				body	<<	"{"	<<	std::endl	;
+				if	(	ret	==	2	)	{
+								//std::cout	<<	"command	=	"	<<	command	<<	std::endl	;
+								//std::cout	<<	"path	=	"	<<	path	<<	std::endl	;
 
-        if ( ! strcmp(command, "GET") ) {
-            if ( ! strcmp(path, "/") ) {
-                // send the top page
-                ret = get_top_page(body) ;
-            } else if ( ! strncmp(path, "/vars", 5)) {
-                // get list of variables or value
-                ret = get_vars(body, &path[5]) ;
-            } else if ( ! strncmp(path, "/commands", 9)) {
-                // get list of commands
-                ret = get_commands(body, &path[9]) ;
-            } else {
-                ret = 404 ;
-                body << "    \"name\" : \"" << path << "\" ," << std::endl ;
-                body << "    \"message\" : \"Not Found\"" << std::endl ;
-            }
-        } else if ( ! strcmp( command, "POST") ) {
-            //TODO: Allow setting variable values with POST.
-            ret = 405 ;
-            body << "    \"verb\" : \"" << command << "\" ," << std::endl ;
-            body << "    \"message\" : \"Method not allowed\"" << std::endl ;
-        } else {
-            ret = 405 ;
-            body << "    \"verb\" : \"" << command << "\" ," << std::endl ;
-            body << "    \"message\" : \"Method not allowed\"" << std::endl ;
-        }
+								if	(	!	strcmp(command,	"GET")	)	{
+												if	(	!	strcmp(path,	"/")	)	{
+																//	send	the	top	page
+																ret	=	get_top_page(body)	;
+												}	else	if	(	!	strncmp(path,	"/vars",	5))	{
+																//	get	list	of	variables	or	value
+																ret	=	get_vars(body,	&path[5])	;
+												}	else	if	(	!	strncmp(path,	"/commands",	9))	{
+																//	get	list	of	commands
+																ret	=	get_commands(body,	&path[9])	;
+												}	else	{
+																ret	=	404	;
+																body	<<	"				\"name\"	:	\""	<<	path	<<	"\"	,"	<<	std::endl	;
+																body	<<	"				\"message\"	:	\"Not	Found\""	<<	std::endl	;
+												}
+								}	else	if	(	!	strcmp(	command,	"POST")	)	{
+												//TODO:	Allow	setting	variable	values	with	POST.
+												ret	=	405	;
+												body	<<	"				\"verb\"	:	\""	<<	command	<<	"\"	,"	<<	std::endl	;
+												body	<<	"				\"message\"	:	\"Method	not	allowed\""	<<	std::endl	;
+								}	else	{
+												ret	=	405	;
+												body	<<	"				\"verb\"	:	\""	<<	command	<<	"\"	,"	<<	std::endl	;
+												body	<<	"				\"message\"	:	\"Method	not	allowed\""	<<	std::endl	;
+								}
 
-    } else {
-        ret = 400 ;
-        body << "    \"message\" : \"Bad Request\"" << std::endl ;
-    }
-    body << "}" << std::endl ;
+				}	else	{
+								ret	=	400	;
+								body	<<	"				\"message\"	:	\"Bad	Request\""	<<	std::endl	;
+				}
+				body	<<	"}"	<<	std::endl	;
 
-    ss << "HTTP/1.1 " << ret ;
-    switch (ret) {
-        case 200:
-            ss << " OK" ;
-            break ;
-        case 400:
-            ss << " Bad Request" ;
-            break ;
-        case 404:
-            ss << " Not Found" ;
-            break ;
-        case 405:
-            ss << " Method Not Allowed" ;
-            break ;
-        default:
-            ss << " Unknown" ;
-            break ;
-    }
-    ss << std::endl ;
-    ss << "Content-Type: application/json" << std::endl ;
-    ss << "Content-Length: " << body.str().size() << std::endl << std::endl ;
-    ss << body.str() ;
-    //std::cout << ss.str() ;
-    tc_write(&connection, (char *)ss.str().c_str() , ss.str().size()) ;
+				ss	<<	"HTTP/1.1	"	<<	ret	;
+				switch	(ret)	{
+								case	200:
+												ss	<<	"	OK"	;
+												break	;
+								case	400:
+												ss	<<	"	Bad	Request"	;
+												break	;
+								case	404:
+												ss	<<	"	Not	Found"	;
+												break	;
+								case	405:
+												ss	<<	"	Method	Not	Allowed"	;
+												break	;
+								default:
+												ss	<<	"	Unknown"	;
+												break	;
+				}
+				ss	<<	std::endl	;
+				ss	<<	"Content-Type:	application/json"	<<	std::endl	;
+				ss	<<	"Content-Length:	"	<<	body.str().size()	<<	std::endl	<<	std::endl	;
+				ss	<<	body.str()	;
+				//std::cout	<<	ss.str()	;
+				tc_write(&connection,	(char	*)ss.str().c_str()	,	ss.str().size())	;
 }
 
 /*
 @details
--# create top page contents and return success
+-#	create	top	page	contents	and	return	success
 */
-int Trick::JSONVariableServerThread::get_top_page( std::stringstream & body ) {
-    body << "   \"commands\": \"http://" << hostname << ":" << port << "/commands\"," << std::endl ;
-    body << "   \"vars\": \"http://" << hostname << ":" << port << "/vars\"" << std::endl ;
-    return 200 ;
+int	Trick::JSONVariableServerThread::get_top_page(	std::stringstream	&	body	)	{
+				body	<<	"			\"commands\":	\"http://"	<<	hostname	<<	":"	<<	port	<<	"/commands\","	<<	std::endl	;
+				body	<<	"			\"vars\":	\"http://"	<<	hostname	<<	":"	<<	port	<<	"/vars\""	<<	std::endl	;
+				return	200	;
 }
 
 /*
 @details
--# if the path is empty after /commands create commands top level page.
--# else if the path is exec_get_sim_time return create a message with the sim time.
--# else create an error message.
+-#	if	the	path	is	empty	after	/commands	create	commands	top	level	page.
+-#	else	if	the	path	is	exec_get_sim_time	return	create	a	message	with	the	sim	time.
+-#	else	create	an	error	message.
 */
-int Trick::JSONVariableServerThread::get_commands( std::stringstream & body , char * path ) {
-    int ret = 200 ;
-    if ( path[strlen(path) - 1] == '/') {
-        path[strlen(path) - 1] = '\0' ;
-    }
-    if ( path[0] == '\0' ) {
-        body << "   \"exec_get_sim_time\": \"exec_get_sim_time()\"" << std::endl ;
-    } else if ( ! strcmp( path , "/exec_get_sim_time" ) ) {
-        body << "   \"sim_time\": \"" << exec_get_sim_time() << "\"" << std::endl ;
-    } else {
-        body << "    \"message\" : \"Not Found\"" << std::endl ;
-        ret = 404 ;
-    }
-    return ret ;
+int	Trick::JSONVariableServerThread::get_commands(	std::stringstream	&	body	,	char	*	path	)	{
+				int	ret	=	200	;
+				if	(	path[strlen(path)	-	1]	==	'/')	{
+								path[strlen(path)	-	1]	=	'\0'	;
+				}
+				if	(	path[0]	==	'\0'	)	{
+								body	<<	"			\"exec_get_sim_time\":	\"exec_get_sim_time()\""	<<	std::endl	;
+				}	else	if	(	!	strcmp(	path	,	"/exec_get_sim_time"	)	)	{
+								body	<<	"			\"sim_time\":	\""	<<	exec_get_sim_time()	<<	"\""	<<	std::endl	;
+				}	else	{
+								body	<<	"				\"message\"	:	\"Not	Found\""	<<	std::endl	;
+								ret	=	404	;
+				}
+				return	ret	;
 }
 
 /*
 @details
--# if the path is empty after /vars
- -# loop through all allocations in the memory manager
- -# if the allocation has a name create an item in the reply message for that allocation.
--# else
- -# convert "/" characters to "." in the path and strip trailing "/" characters.
- -# add converted variable name to the reply message.
- -# call ref_attributes to find the variable.
-  -# if the variable exists
-   -# if the variable type is a structure.
-    -# loop through the attributes and add each of the struct/class variables as links in the reply message.
-   -# else add the variables value and units to the reply message.
-   -# add the description text to the reply message
-   -# add the type information to the reply message
-   -# add the type io specification to the reply message
-   -# if the variable has dimensions add the dimension information to the reply message.
- -# else add an error message to the reply message
+-#	if	the	path	is	empty	after	/vars
+	-#	loop	through	all	allocations	in	the	memory	manager
+	-#	if	the	allocation	has	a	name	create	an	item	in	the	reply	message	for	that	allocation.
+-#	else
+	-#	convert	"/"	characters	to	"."	in	the	path	and	strip	trailing	"/"	characters.
+	-#	add	converted	variable	name	to	the	reply	message.
+	-#	call	ref_attributes	to	find	the	variable.
+		-#	if	the	variable	exists
+			-#	if	the	variable	type	is	a	structure.
+				-#	loop	through	the	attributes	and	add	each	of	the	struct/class	variables	as	links	in	the	reply	message.
+			-#	else	add	the	variables	value	and	units	to	the	reply	message.
+			-#	add	the	description	text	to	the	reply	message
+			-#	add	the	type	information	to	the	reply	message
+			-#	add	the	type	io	specification	to	the	reply	message
+			-#	if	the	variable	has	dimensions	add	the	dimension	information	to	the	reply	message.
+	-#	else	add	an	error	message	to	the	reply	message
 */
-int Trick::JSONVariableServerThread::get_vars( std::stringstream & body , char * path ) {
+int	Trick::JSONVariableServerThread::get_vars(	std::stringstream	&	body	,	char	*	path	)	{
 
-    int ret = 200 ;
+				int	ret	=	200	;
 
-    //std::cout << "get_vars " << path << std::endl ;
-    if ( path[0] == '\0' ) {
-        Trick::ALLOC_INFO_MAP_ITER aim_it ;
-        bool first_item = true ;
-        for ( aim_it = trick_MM->alloc_info_map_begin() ; aim_it != trick_MM->alloc_info_map_end() ; ++aim_it ) {
-            ALLOC_INFO * alloc_info = (*aim_it).second ;
-            if ( alloc_info->name != NULL and alloc_info->user_type_name != NULL ) {
-                if ( first_item == true ) {
-                    first_item = false ;
-                } else {
-                    body << " ," << std::endl ;
-                }
-                body << "    \"" << alloc_info->name << "\" : \"" << alloc_info->user_type_name << "\"" ;
-            }
-        }
-        body << std::endl ;
-    } else {
+				//std::cout	<<	"get_vars	"	<<	path	<<	std::endl	;
+				if	(	path[0]	==	'\0'	)	{
+								Trick::ALLOC_INFO_MAP_ITER	aim_it	;
+								bool	first_item	=	true	;
+								for	(	aim_it	=	trick_MM->alloc_info_map_begin()	;	aim_it	!=	trick_MM->alloc_info_map_end()	;	++aim_it	)	{
+												ALLOC_INFO	*	alloc_info	=	(*aim_it).second	;
+												if	(	alloc_info->name	!=	NULL	and	alloc_info->user_type_name	!=	NULL	)	{
+																if	(	first_item	==	true	)	{
+																				first_item	=	false	;
+																}	else	{
+																				body	<<	"	,"	<<	std::endl	;
+																}
+																body	<<	"				\""	<<	alloc_info->name	<<	"\"	:	\""	<<	alloc_info->user_type_name	<<	"\""	;
+												}
+								}
+								body	<<	std::endl	;
+				}	else	{
 
-        //TODO: More path character translations for characters like "[]"
+								//TODO:	More	path	character	translations	for	characters	like	"[]"
 
-        if ( path[strlen(path) - 1] == '/') {
-            path[strlen(path) - 1] = '\0' ;
-        }
-        for ( unsigned int ii = 1 ; ii < strlen(path) ; ii++ ) {
-            if ( path[ii] == '/') {
-                path[ii] = '.' ;
-            }
-        }
+								if	(	path[strlen(path)	-	1]	==	'/')	{
+												path[strlen(path)	-	1]	=	'\0'	;
+								}
+								for	(	unsigned	int	ii	=	1	;	ii	<	strlen(path)	;	ii++	)	{
+												if	(	path[ii]	==	'/')	{
+																path[ii]	=	'.'	;
+												}
+								}
 
-        body << "    \"name\" : \"" << &path[1] << "\" ," << std::endl ;
-        //std::cout << "getting var " << path << std::endl ;
-        // skip leading "/"
-        REF2 * ref = ref_attributes( &path[1] ) ;
-        if ( ref != NULL and ref->attr != NULL ) {
-            ret = 200 ;
-            //std::cout << "num_index " << ref->num_index << std::endl ;
-            if ( ref->attr->type == TRICK_STRUCTURED ) {
-                ATTRIBUTES * attr = (ATTRIBUTES *)ref->attr->attr ;
-                body << "    \"links\" : [" << std::endl ;
-                for ( int ii = 0 ; attr[ii].name[0] != '\0' ; ii++ ) {
-                    if ( ii != 0 ) {
-                        body << " ," << std::endl ;
-                    }
-                    body << "                \"" << attr[ii].name << "\"" ;
-                }
-                body << std::endl << "              ] ," << std::endl ;
-            } else {
-                body << "    \"value\" : " ;
-                Trick::PythonPrint::write_rvalue(body, ref->address, ref->attr, ref->num_index, 0, false, true) ;
-                body << " ," << std::endl ;
-                if ( ref->attr->units != NULL ) {
-                    body << "    \"units\" : \"" << ref->attr->units << "\" ," << std::endl ;
-                }
-            }
-            if ( ref->attr->des != NULL ) {
-                body << "    \"description\" : \"" << ref->attr->des << "\" ," << std::endl ;
-            }
-            body << "    \"type_name\" : " ;
-            if ( ref->attr->type_name != NULL ) {
-                body << "\"" << ref->attr->type_name << "\" ," << std::endl ;
-            } else {
-                body << "\"(null)\" ," << std::endl ;
-            }
-            body << "    \"type\" : " << ref->attr->type << " ," << std::endl ;
-            body << "    \"io\" : " << ref->attr->io ;
-            if ( (ref->attr->num_index - ref->num_index) > 0 ) {
-                body << " ," << std::endl ;
-                body << "    \"num_index\" : " << ref->attr->num_index - ref->num_index << " ," << std::endl ;
-                body << "    \"index\" : [" << std::endl ;
-                for ( int ii = ref->num_index , jj = 0 ; ii < ref->attr->num_index ; ii++ , jj++ ) {
-                    if ( jj != 0 ) {
-                        body << " ," << std::endl ;
-                    }
-                    body << "                {" << std::endl ;
-                    body << "                    \"size\" : " << ref->attr->index[ii].size << " ," << std::endl ;
-                    body << "                    \"start\" : " << ref->attr->index[ii].start << std::endl ;
-                    body << "                }" ;
-                }
-                body << std::endl << "              ]" << std::endl ;
-            } else {
-                body << std::endl ;
-            }
-            free(ref) ;
-        } else {
-            body << "    \"message\" : \"Not Found\"" << std::endl ;
-            ret = 404 ;
-        }
-    }
-    return ret ;
+								body	<<	"				\"name\"	:	\""	<<	&path[1]	<<	"\"	,"	<<	std::endl	;
+								//std::cout	<<	"getting	var	"	<<	path	<<	std::endl	;
+								//	skip	leading	"/"
+								REF2	*	ref	=	ref_attributes(	&path[1]	)	;
+								if	(	ref	!=	NULL	and	ref->attr	!=	NULL	)	{
+												ret	=	200	;
+												//std::cout	<<	"num_index	"	<<	ref->num_index	<<	std::endl	;
+												if	(	ref->attr->type	==	TRICK_STRUCTURED	)	{
+																ATTRIBUTES	*	attr	=	(ATTRIBUTES	*)ref->attr->attr	;
+																body	<<	"				\"links\"	:	["	<<	std::endl	;
+																for	(	int	ii	=	0	;	attr[ii].name[0]	!=	'\0'	;	ii++	)	{
+																				if	(	ii	!=	0	)	{
+																								body	<<	"	,"	<<	std::endl	;
+																				}
+																				body	<<	"																\""	<<	attr[ii].name	<<	"\""	;
+																}
+																body	<<	std::endl	<<	"														]	,"	<<	std::endl	;
+												}	else	{
+																body	<<	"				\"value\"	:	"	;
+																Trick::PythonPrint::write_rvalue(body,	ref->address,	ref->attr,	ref->num_index,	0,	false,	true)	;
+																body	<<	"	,"	<<	std::endl	;
+																if	(	ref->attr->units	!=	NULL	)	{
+																				body	<<	"				\"units\"	:	\""	<<	ref->attr->units	<<	"\"	,"	<<	std::endl	;
+																}
+												}
+												if	(	ref->attr->des	!=	NULL	)	{
+																body	<<	"				\"description\"	:	\""	<<	ref->attr->des	<<	"\"	,"	<<	std::endl	;
+												}
+												body	<<	"				\"type_name\"	:	"	;
+												if	(	ref->attr->type_name	!=	NULL	)	{
+																body	<<	"\""	<<	ref->attr->type_name	<<	"\"	,"	<<	std::endl	;
+												}	else	{
+																body	<<	"\"(null)\"	,"	<<	std::endl	;
+												}
+												body	<<	"				\"type\"	:	"	<<	ref->attr->type	<<	"	,"	<<	std::endl	;
+												body	<<	"				\"io\"	:	"	<<	ref->attr->io	;
+												if	(	(ref->attr->num_index	-	ref->num_index)	>	0	)	{
+																body	<<	"	,"	<<	std::endl	;
+																body	<<	"				\"num_index\"	:	"	<<	ref->attr->num_index	-	ref->num_index	<<	"	,"	<<	std::endl	;
+																body	<<	"				\"index\"	:	["	<<	std::endl	;
+																for	(	int	ii	=	ref->num_index	,	jj	=	0	;	ii	<	ref->attr->num_index	;	ii++	,	jj++	)	{
+																				if	(	jj	!=	0	)	{
+																								body	<<	"	,"	<<	std::endl	;
+																				}
+																				body	<<	"																{"	<<	std::endl	;
+																				body	<<	"																				\"size\"	:	"	<<	ref->attr->index[ii].size	<<	"	,"	<<	std::endl	;
+																				body	<<	"																				\"start\"	:	"	<<	ref->attr->index[ii].start	<<	std::endl	;
+																				body	<<	"																}"	;
+																}
+																body	<<	std::endl	<<	"														]"	<<	std::endl	;
+												}	else	{
+																body	<<	std::endl	;
+												}
+												free(ref)	;
+								}	else	{
+												body	<<	"				\"message\"	:	\"Not	Found\""	<<	std::endl	;
+												ret	=	404	;
+								}
+				}
+				return	ret	;
 }
 
diff --git a/trick_source/sim_services/MasterSlave/MSSharedMem.cpp b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
index 412ff1040..58acfd914 100644
--- a/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
+++ b/trick_source/sim_services/MasterSlave/MSSharedMem.cpp
@@ -1,294 +1,294 @@
 
-#include <iostream>
-#include <sstream>
-#include <cstring> // for memcpy
-#include <unistd.h>
+#include	<iostream>
+#include	<sstream>
+#include	<cstring>	//	for	memcpy
+#include	<unistd.h>
 
-#include "trick/MSSharedMem.hh"
-#include "trick/tsm_proto.h"
-#include "trick/command_line_protos.h"
+#include	"trick/MSSharedMem.hh"
+#include	"trick/tsm_proto.h"
+#include	"trick/command_line_protos.h"
 
-Trick::MSSharedMem::MSSharedMem() : tsm_dev() {
-    tsm_dev.default_val = -1;
+Trick::MSSharedMem::MSSharedMem()	:	tsm_dev()	{
+				tsm_dev.default_val	=	-1;
 
-    // default is a non-zero sync wait limit; helpful when slave reading initial data from master
-    sync_wait_limit = 5.0 ;
+				//	default	is	a	non-zero	sync	wait	limit;	helpful	when	slave	reading	initial	data	from	master
+				sync_wait_limit	=	5.0	;
 }
 
-Trick::MSSharedMem::~MSSharedMem() {
-    // detach shared memory
-    tsm_disconnect(&tsm_dev);
+Trick::MSSharedMem::~MSSharedMem()	{
+				//	detach	shared	memory
+				tsm_disconnect(&tsm_dev);
 }
 
-int Trick::MSSharedMem::set_sync_wait_limit(double in_limit) {
-    /** @par Detailed Design */
-    if ( in_limit > 0.0 ) {
-        /** @li if the incoming limit time is greater than zero, we will use it
-                as the timeout value during read and write */
-        sync_wait_limit = in_limit ;
-    } else {
-        /** @li if the incoming limit time is less than or equal to zero, wait forever */
-        sync_wait_limit = TSM_MAX_TIMEOUT_LIMIT;
-    }
-    return(0) ;
+int	Trick::MSSharedMem::set_sync_wait_limit(double	in_limit)	{
+				/**	@par	Detailed	Design	*/
+				if	(	in_limit	>	0.0	)	{
+								/**	@li	if	the	incoming	limit	time	is	greater	than	zero,	we	will	use	it
+																as	the	timeout	value	during	read	and	write	*/
+								sync_wait_limit	=	in_limit	;
+				}	else	{
+								/**	@li	if	the	incoming	limit	time	is	less	than	or	equal	to	zero,	wait	forever	*/
+								sync_wait_limit	=	TSM_MAX_TIMEOUT_LIMIT;
+				}
+				return(0)	;
 }
 
-std::string Trick::MSSharedMem::add_sim_args(std::string slave_type __attribute__((unused))) {
+std::string	Trick::MSSharedMem::add_sim_args(std::string	slave_type	__attribute__((unused)))	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li nothing to do here for shared memory. */
-    return("");
+				/**	@li	nothing	to	do	here	for	shared	memory.	*/
+				return("");
 }
 
-int Trick::MSSharedMem::process_sim_args() {
+int	Trick::MSSharedMem::process_sim_args()	{
 
-    //int ii ;
-    //int argc ;
-    //char ** argv ;
+				//int	ii	;
+				//int	argc	;
+				//char	**	argv	;
 
-    //argc = command_line_args_get_argc() ;
-    //argv = command_line_args_get_argv() ;
+				//argc	=	command_line_args_get_argc()	;
+				//argv	=	command_line_args_get_argv()	;
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li no shared memory arguments to search for, return 1 to enable slave */
-    //for (ii = 2; ii < argc; ii++) {
-    //}
-    return(1) ;
+				/**	@li	no	shared	memory	arguments	to	search	for,	return	1	to	enable	slave	*/
+				//for	(ii	=	2;	ii	<	argc;	ii++)	{
+				//}
+				return(1)	;
 }
 
-int Trick::MSSharedMem::accept() {
-
-    int ret ;
-    /** @par Detailed Design */
-    /** @li Call tsm_init to create shared memory for master. */
-    tsm_dev.size = sizeof(MSSharedMemData);
-    ret = tsm_init(&tsm_dev);
-    shm_addr = (MSSharedMemData*) tsm_dev.addr;
-    /** @li Save master process id so we can keep master and slave data seperate. */
-    // (the master calls accept)
-    if (ret==TSM_SUCCESS) {
-        shm_addr->master_pid = getpid();
-//fprintf(stderr, "====accept master=%d\n", getpid());
-        MSQ_INIT(shm_addr->master_time);
-        MSQ_INIT(shm_addr->master_command);
-        MSQ_INIT(shm_addr->slave_command);
-        shm_addr->slave_port = MS_ERROR_PORT;
-        shm_addr->chkpnt_name[0] = MS_ERROR_NAME;
-    } else {
-//fprintf(stderr, "====accept SHARED MEMORY ERROR\n");
-    }
-    return(ret) ;
+int	Trick::MSSharedMem::accept()	{
+
+				int	ret	;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tsm_init	to	create	shared	memory	for	master.	*/
+				tsm_dev.size	=	sizeof(MSSharedMemData);
+				ret	=	tsm_init(&tsm_dev);
+				shm_addr	=	(MSSharedMemData*)	tsm_dev.addr;
+				/**	@li	Save	master	process	id	so	we	can	keep	master	and	slave	data	seperate.	*/
+				//	(the	master	calls	accept)
+				if	(ret==TSM_SUCCESS)	{
+								shm_addr->master_pid	=	getpid();
+//fprintf(stderr,	"====accept	master=%d\n",	getpid());
+								MSQ_INIT(shm_addr->master_time);
+								MSQ_INIT(shm_addr->master_command);
+								MSQ_INIT(shm_addr->slave_command);
+								shm_addr->slave_port	=	MS_ERROR_PORT;
+								shm_addr->chkpnt_name[0]	=	MS_ERROR_NAME;
+				}	else	{
+//fprintf(stderr,	"====accept	SHARED	MEMORY	ERROR\n");
+				}
+				return(ret)	;
 }
 
-int Trick::MSSharedMem::connect() {
-    int ret ;
-    /** @par Detailed Design */
-    /** @li Call tsm_init to create shared memory for slave. */
-    if (tsm_dev.size == 0) {
-        tsm_dev.size = sizeof(MSSharedMemData);
-        ret = tsm_init(&tsm_dev);
-    } else {
-        ret = tsm_reconnect(&tsm_dev);
-    }
-    shm_addr = (MSSharedMemData*) tsm_dev.addr;
-    return(ret) ;
+int	Trick::MSSharedMem::connect()	{
+				int	ret	;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tsm_init	to	create	shared	memory	for	slave.	*/
+				if	(tsm_dev.size	==	0)	{
+								tsm_dev.size	=	sizeof(MSSharedMemData);
+								ret	=	tsm_init(&tsm_dev);
+				}	else	{
+								ret	=	tsm_reconnect(&tsm_dev);
+				}
+				shm_addr	=	(MSSharedMemData*)	tsm_dev.addr;
+				return(ret)	;
 }
 
-int Trick::MSSharedMem::disconnect() {
-    return(0) ;
+int	Trick::MSSharedMem::disconnect()	{
+				return(0)	;
 }
 
 
-double Trick::MSSharedMem::read_wait(struct timespec *in_start) {
-    struct timespec ts_Current, ts_Difference;
-
-    RELEASE();
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Current);
-    if ((ts_Current.tv_nsec - in_start->tv_nsec) < 0) {
-        ts_Difference.tv_sec = ts_Current.tv_sec - in_start->tv_sec - 1;
-        ts_Difference.tv_nsec = 1000000000 + ts_Current.tv_nsec - in_start->tv_nsec;
-    } else {
-        ts_Difference.tv_sec = ts_Current.tv_sec - in_start->tv_sec;
-        ts_Difference.tv_nsec = ts_Current.tv_nsec - in_start->tv_nsec;
-    }
-    // return the total elapsed time we've waited since in_start
-    return ((double)ts_Difference.tv_nsec / 1000000000.0) + ts_Difference.tv_sec;
+double	Trick::MSSharedMem::read_wait(struct	timespec	*in_start)	{
+				struct	timespec	ts_Current,	ts_Difference;
+
+				RELEASE();
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Current);
+				if	((ts_Current.tv_nsec	-	in_start->tv_nsec)	<	0)	{
+								ts_Difference.tv_sec	=	ts_Current.tv_sec	-	in_start->tv_sec	-	1;
+								ts_Difference.tv_nsec	=	1000000000	+	ts_Current.tv_nsec	-	in_start->tv_nsec;
+				}	else	{
+								ts_Difference.tv_sec	=	ts_Current.tv_sec	-	in_start->tv_sec;
+								ts_Difference.tv_nsec	=	ts_Current.tv_nsec	-	in_start->tv_nsec;
+				}
+				//	return	the	total	elapsed	time	we've	waited	since	in_start
+				return	((double)ts_Difference.tv_nsec	/	1000000000.0)	+	ts_Difference.tv_sec;
 }
 
-long long Trick::MSSharedMem::read_time() {
-
-    long long in_time;
-    double readtry_time = 0.0;
-    struct timespec ts_Start;
-
-    /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-
-    /** @li Get time from shared memory */
-    while (MSQ_ISEMPTY(shm_addr->master_time)) {
-        if (readtry_time >= sync_wait_limit) {
-            break;
-        }
-        readtry_time = read_wait(&ts_Start);
-    }
-    if (!MSQ_ISEMPTY(shm_addr->master_time)) {
-        in_time = MSQ_FRONT(shm_addr->master_time);
-//fprintf(stderr, "+++++read_time pid=%d time=%lld readtry=%f\n", getpid(), in_time, readtry_time);
-        MSQ_POP(shm_addr->master_time);
-        return (in_time) ;
-    /** @li If no new data before timeout limit, return "error" time */
-    } else {
-//fprintf(stderr, "+++++read_time pid=%d time=%lld ERROR readtry=%f\n", getpid(), in_time, readtry_time,); fflush(stderr);
-        return (MS_ERROR_TIME) ;
-    }
+long	long	Trick::MSSharedMem::read_time()	{
+
+				long	long	in_time;
+				double	readtry_time	=	0.0;
+				struct	timespec	ts_Start;
+
+				/**	@par	Detailed	Design	*/
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+
+				/**	@li	Get	time	from	shared	memory	*/
+				while	(MSQ_ISEMPTY(shm_addr->master_time))	{
+								if	(readtry_time	>=	sync_wait_limit)	{
+												break;
+								}
+								readtry_time	=	read_wait(&ts_Start);
+				}
+				if	(!MSQ_ISEMPTY(shm_addr->master_time))	{
+								in_time	=	MSQ_FRONT(shm_addr->master_time);
+//fprintf(stderr,	"+++++read_time	pid=%d	time=%lld	readtry=%f\n",	getpid(),	in_time,	readtry_time);
+								MSQ_POP(shm_addr->master_time);
+								return	(in_time)	;
+				/**	@li	If	no	new	data	before	timeout	limit,	return	"error"	time	*/
+				}	else	{
+//fprintf(stderr,	"+++++read_time	pid=%d	time=%lld	ERROR	readtry=%f\n",	getpid(),	in_time,	readtry_time,);	fflush(stderr);
+								return	(MS_ERROR_TIME)	;
+				}
 }
 
-MS_SIM_COMMAND Trick::MSSharedMem::read_command() {
-
-    MS_SIM_COMMAND command;
-    double readtry_time = 0.0;
-    struct timespec ts_Start;
-
-    /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-
-    if (getpid() == shm_addr->master_pid) {
-    /** @li Get slave command from shared memory */
-    // I am master, so read slave command
-        while (MSQ_ISEMPTY(shm_addr->slave_command)) {
-            if (readtry_time >= sync_wait_limit) {
-                break;
-            }
-            readtry_time = read_wait(&ts_Start);
-        }
-        if (!MSQ_ISEMPTY(shm_addr->slave_command)) {
-            command = MSQ_FRONT(shm_addr->slave_command);
-//fprintf(stderr, "+++++read_command pid=%d command=%d (from slave)\n", getpid(), command);
-            MSQ_POP(shm_addr->slave_command);
-            return (command) ;
-        /** @li If no new data before timeout limit, return "error" command */
-        } else {
-//fprintf(stderr, "+++++read_command pid=%d command=%d (from slave) ERROR readtry=%f\n", getpid(), command, readtry_time);
-            return (MS_ErrorCmd) ;
-        }
-    } else {
-    /** @li Get master command from shared memory */
-    // I am slave, so read master command
-        while (MSQ_ISEMPTY(shm_addr->master_command)) {
-            if (readtry_time >= sync_wait_limit) {
-                break;
-            }
-            readtry_time = read_wait(&ts_Start);
-        }
-        if (!MSQ_ISEMPTY(shm_addr->master_command)) {
-            command = MSQ_FRONT(shm_addr->master_command);
-//fprintf(stderr, "+++++read_command pid=%d command=%d (from master)\n", getpid(), command);
-            MSQ_POP(shm_addr->master_command);
-            return (command) ;
-        /** @li If no new data before timeout limit, return "error" command */
-        } else {
-//fprintf(stderr, "+++++read_command pid=%d command=%d (from master) ERROR readtry=%f\n", getpid(), command, readtry_time);
-            return (MS_ErrorCmd) ;
-        }
-    }
+MS_SIM_COMMAND	Trick::MSSharedMem::read_command()	{
+
+				MS_SIM_COMMAND	command;
+				double	readtry_time	=	0.0;
+				struct	timespec	ts_Start;
+
+				/**	@par	Detailed	Design	*/
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+
+				if	(getpid()	==	shm_addr->master_pid)	{
+				/**	@li	Get	slave	command	from	shared	memory	*/
+				//	I	am	master,	so	read	slave	command
+								while	(MSQ_ISEMPTY(shm_addr->slave_command))	{
+												if	(readtry_time	>=	sync_wait_limit)	{
+																break;
+												}
+												readtry_time	=	read_wait(&ts_Start);
+								}
+								if	(!MSQ_ISEMPTY(shm_addr->slave_command))	{
+												command	=	MSQ_FRONT(shm_addr->slave_command);
+//fprintf(stderr,	"+++++read_command	pid=%d	command=%d	(from	slave)\n",	getpid(),	command);
+												MSQ_POP(shm_addr->slave_command);
+												return	(command)	;
+								/**	@li	If	no	new	data	before	timeout	limit,	return	"error"	command	*/
+								}	else	{
+//fprintf(stderr,	"+++++read_command	pid=%d	command=%d	(from	slave)	ERROR	readtry=%f\n",	getpid(),	command,	readtry_time);
+												return	(MS_ErrorCmd)	;
+								}
+				}	else	{
+				/**	@li	Get	master	command	from	shared	memory	*/
+				//	I	am	slave,	so	read	master	command
+								while	(MSQ_ISEMPTY(shm_addr->master_command))	{
+												if	(readtry_time	>=	sync_wait_limit)	{
+																break;
+												}
+												readtry_time	=	read_wait(&ts_Start);
+								}
+								if	(!MSQ_ISEMPTY(shm_addr->master_command))	{
+												command	=	MSQ_FRONT(shm_addr->master_command);
+//fprintf(stderr,	"+++++read_command	pid=%d	command=%d	(from	master)\n",	getpid(),	command);
+												MSQ_POP(shm_addr->master_command);
+												return	(command)	;
+								/**	@li	If	no	new	data	before	timeout	limit,	return	"error"	command	*/
+								}	else	{
+//fprintf(stderr,	"+++++read_command	pid=%d	command=%d	(from	master)	ERROR	readtry=%f\n",	getpid(),	command,	readtry_time);
+												return	(MS_ErrorCmd)	;
+								}
+				}
 }
 
-int Trick::MSSharedMem::read_port() {
-
-    int in_port;
-    double readtry_time = 0.0;
-    struct timespec ts_Start;
-
-    /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-
-    /** @li Get port number from shared memory */
-    while (shm_addr->slave_port == MS_ERROR_PORT) {
-        if (readtry_time >= sync_wait_limit) {
-            break;
-        }
-        readtry_time = read_wait(&ts_Start);
-    }
-    if (shm_addr->slave_port != MS_ERROR_PORT) {
-        in_port = shm_addr->slave_port;
-        shm_addr->slave_port = MS_ERROR_PORT; // default value
-        return (in_port) ;
-    /** @li If no new data before timeout limit, return "error" port */
-    } else {
-        return (MS_ERROR_PORT) ;
-    }
+int	Trick::MSSharedMem::read_port()	{
+
+				int	in_port;
+				double	readtry_time	=	0.0;
+				struct	timespec	ts_Start;
+
+				/**	@par	Detailed	Design	*/
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+
+				/**	@li	Get	port	number	from	shared	memory	*/
+				while	(shm_addr->slave_port	==	MS_ERROR_PORT)	{
+								if	(readtry_time	>=	sync_wait_limit)	{
+												break;
+								}
+								readtry_time	=	read_wait(&ts_Start);
+				}
+				if	(shm_addr->slave_port	!=	MS_ERROR_PORT)	{
+								in_port	=	shm_addr->slave_port;
+								shm_addr->slave_port	=	MS_ERROR_PORT;	//	default	value
+								return	(in_port)	;
+				/**	@li	If	no	new	data	before	timeout	limit,	return	"error"	port	*/
+				}	else	{
+								return	(MS_ERROR_PORT)	;
+				}
 }
 
-char Trick::MSSharedMem::read_name(char * read_data, size_t size) {
-
-    double readtry_time = 0.0;
-    struct timespec ts_Start;
-
-    /** @par Detailed Design */
-    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts_Start);
-
-    /** @li Get name (character array) from shared memory */
-    while (shm_addr->chkpnt_name[0] == MS_ERROR_NAME) {
-        if (readtry_time >= sync_wait_limit) {
-            break;
-        }
-        readtry_time = read_wait(&ts_Start);
-    }
-    if (shm_addr->chkpnt_name[0] != MS_ERROR_NAME) {
-        memcpy(read_data, shm_addr->chkpnt_name, size);
-        shm_addr->chkpnt_name[0] = MS_ERROR_NAME; // default value
-        return (0) ;
-    /** @li If no new data before timeout limit, return "error" name */
-    } else {
-        return (MS_ERROR_NAME) ;
-    }
+char	Trick::MSSharedMem::read_name(char	*	read_data,	size_t	size)	{
+
+				double	readtry_time	=	0.0;
+				struct	timespec	ts_Start;
+
+				/**	@par	Detailed	Design	*/
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID,	&ts_Start);
+
+				/**	@li	Get	name	(character	array)	from	shared	memory	*/
+				while	(shm_addr->chkpnt_name[0]	==	MS_ERROR_NAME)	{
+								if	(readtry_time	>=	sync_wait_limit)	{
+												break;
+								}
+								readtry_time	=	read_wait(&ts_Start);
+				}
+				if	(shm_addr->chkpnt_name[0]	!=	MS_ERROR_NAME)	{
+								memcpy(read_data,	shm_addr->chkpnt_name,	size);
+								shm_addr->chkpnt_name[0]	=	MS_ERROR_NAME;	//	default	value
+								return	(0)	;
+				/**	@li	If	no	new	data	before	timeout	limit,	return	"error"	name	*/
+				}	else	{
+								return	(MS_ERROR_NAME)	;
+				}
 }
 
-int Trick::MSSharedMem::write_time(long long in_time) {
+int	Trick::MSSharedMem::write_time(long	long	in_time)	{
 
-    /** @par Detailed Design */
-    /** @li Write time to shared memory */
-//fprintf(stderr, "====write_time pid=%d time=%lld\n", getpid(), in_time);
-    MSQ_PUSH(shm_addr->master_time, in_time);
+				/**	@par	Detailed	Design	*/
+				/**	@li	Write	time	to	shared	memory	*/
+//fprintf(stderr,	"====write_time	pid=%d	time=%lld\n",	getpid(),	in_time);
+				MSQ_PUSH(shm_addr->master_time,	in_time);
 
-    /** @li Return the number of bytes written */
-    return(sizeof(long long)) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(sizeof(long	long))	;
 }
 
-int Trick::MSSharedMem::write_command(MS_SIM_COMMAND command) {
+int	Trick::MSSharedMem::write_command(MS_SIM_COMMAND	command)	{
 
-    /** @par Detailed Design */
-    /** @li Write command to shared memory */
-    if (getpid() == shm_addr->master_pid) {
-//fprintf(stderr, "====write_command pid=%d command=%d (master)\n", getpid(), command);
-        MSQ_PUSH(shm_addr->master_command, command);
-    } else {
-//fprintf(stderr, "====write_command pid=%d command=%d (slave)\n", getpid(), command);
-        MSQ_PUSH(shm_addr->slave_command, command);
-    }
+				/**	@par	Detailed	Design	*/
+				/**	@li	Write	command	to	shared	memory	*/
+				if	(getpid()	==	shm_addr->master_pid)	{
+//fprintf(stderr,	"====write_command	pid=%d	command=%d	(master)\n",	getpid(),	command);
+								MSQ_PUSH(shm_addr->master_command,	command);
+				}	else	{
+//fprintf(stderr,	"====write_command	pid=%d	command=%d	(slave)\n",	getpid(),	command);
+								MSQ_PUSH(shm_addr->slave_command,	command);
+				}
 
-    /** @li Return the number of bytes written */
-    return(sizeof(MS_SIM_COMMAND)) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(sizeof(MS_SIM_COMMAND))	;
 }
 
-int Trick::MSSharedMem::write_port(int in_port) {
+int	Trick::MSSharedMem::write_port(int	in_port)	{
 
-    /** @par Detailed Design */
-    /** @li Write port number to shared memory */
-    shm_addr->slave_port = in_port;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Write	port	number	to	shared	memory	*/
+				shm_addr->slave_port	=	in_port;
 
-    /** @li Return the number of bytes written */
-    return(sizeof(int)) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(sizeof(int))	;
 }
 
-int Trick::MSSharedMem::write_name(char * in_data, size_t size) {
+int	Trick::MSSharedMem::write_name(char	*	in_data,	size_t	size)	{
 
-    /** @par Detailed Design */
-    /** @li Write name (character array) to shared memory */
-    memcpy(shm_addr->chkpnt_name, in_data, size);
+				/**	@par	Detailed	Design	*/
+				/**	@li	Write	name	(character	array)	to	shared	memory	*/
+				memcpy(shm_addr->chkpnt_name,	in_data,	size);
 
-    /** @li Return the number of bytes written */
-    return(size);
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(size);
 }
diff --git a/trick_source/sim_services/MasterSlave/MSSocket.cpp b/trick_source/sim_services/MasterSlave/MSSocket.cpp
index 769c3264a..cffefdf54 100644
--- a/trick_source/sim_services/MasterSlave/MSSocket.cpp
+++ b/trick_source/sim_services/MasterSlave/MSSocket.cpp
@@ -1,230 +1,230 @@
 
-#include <iostream>
-#include <sstream>
-#include <string.h>
-#include <unistd.h>
-
-#include "trick/MSSocket.hh"
-#include "trick/Master.hh"
-#include "trick/tc_proto.h"
-#include "trick/exec_proto.h"
-#include "trick/command_line_protos.h"
-
-Trick::MSSocket::MSSocket() : tc_dev() {
-
-    tc_dev.disabled = TC_COMM_FALSE ;
-    tc_dev.error_handler = NULL ;
-    tc_dev.blockio_type = TC_COMM_TIMED_BLOCKIO ;
-    tc_dev.blockio_type = TC_COMM_BLOCKIO ;
-    tc_dev.port = 0 ; // tc_multiconnect needs this so that it will send broadcast msg !
-
-    // default is a non-zero sync wait limit; helpful when slave reading initial data from master
-    sync_wait_limit = 5.0 ;
+#include	<iostream>
+#include	<sstream>
+#include	<string.h>
+#include	<unistd.h>
+
+#include	"trick/MSSocket.hh"
+#include	"trick/Master.hh"
+#include	"trick/tc_proto.h"
+#include	"trick/exec_proto.h"
+#include	"trick/command_line_protos.h"
+
+Trick::MSSocket::MSSocket()	:	tc_dev()	{
+
+				tc_dev.disabled	=	TC_COMM_FALSE	;
+				tc_dev.error_handler	=	NULL	;
+				tc_dev.blockio_type	=	TC_COMM_TIMED_BLOCKIO	;
+				tc_dev.blockio_type	=	TC_COMM_BLOCKIO	;
+				tc_dev.port	=	0	;	//	tc_multiconnect	needs	this	so	that	it	will	send	broadcast	msg	!
+
+				//	default	is	a	non-zero	sync	wait	limit;	helpful	when	slave	reading	initial	data	from	master
+				sync_wait_limit	=	5.0	;
 }
 
-int Trick::MSSocket::set_sync_wait_limit(double in_limit) {
-    /** @par Detailed Design */
-    sync_wait_limit = in_limit ;
-    if ( in_limit > 0.0 ) {
-        /** @li if the incoming limit time is greater than zero, set the socket
-                to TC_COMM_TIMED_BLOCKIO with the time limit of in_limit */
-        tc_blockio(&tc_dev, TC_COMM_TIMED_BLOCKIO);
-        tc_set_blockio_timeout_limit(&tc_dev, sync_wait_limit);
-    } else {
-        /** @li if the incoming limit time is less than or equal to zero, set the socket
-                to TC_COMM_BLOCKIO (infinite block) */
-        tc_blockio(&tc_dev, TC_COMM_BLOCKIO);
-    }
-    return(0) ;
+int	Trick::MSSocket::set_sync_wait_limit(double	in_limit)	{
+				/**	@par	Detailed	Design	*/
+				sync_wait_limit	=	in_limit	;
+				if	(	in_limit	>	0.0	)	{
+								/**	@li	if	the	incoming	limit	time	is	greater	than	zero,	set	the	socket
+																to	TC_COMM_TIMED_BLOCKIO	with	the	time	limit	of	in_limit	*/
+								tc_blockio(&tc_dev,	TC_COMM_TIMED_BLOCKIO);
+								tc_set_blockio_timeout_limit(&tc_dev,	sync_wait_limit);
+				}	else	{
+								/**	@li	if	the	incoming	limit	time	is	less	than	or	equal	to	zero,	set	the	socket
+																to	TC_COMM_BLOCKIO	(infinite	block)	*/
+								tc_blockio(&tc_dev,	TC_COMM_BLOCKIO);
+				}
+				return(0)	;
 }
 
-std::string Trick::MSSocket::add_sim_args( std::string slave_type ) {
+std::string	Trick::MSSocket::add_sim_args(	std::string	slave_type	)	{
 
-    char master_host[80];
-    std::stringstream temp_stream ;
+				char	master_host[80];
+				std::stringstream	temp_stream	;
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li create a unique identifier based on the <machine>_<current pid>. */
-    gethostname(master_host, (size_t) 80);
+				/**	@li	create	a	unique	identifier	based	on	the	<machine>_<current	pid>.	*/
+				gethostname(master_host,	(size_t)	80);
 
-    temp_stream << master_host << "_" << getpid() ;
+				temp_stream	<<	master_host	<<	"_"	<<	getpid()	;
 
-    sync_port_tag = temp_stream.str() ;
+				sync_port_tag	=	temp_stream.str()	;
 
-    /** @li return the unique identifier with the "-p" argument that is
-            specific to master/slave communications. */
-    return("-p " + temp_stream.str()) ;
+				/**	@li	return	the	unique	identifier	with	the	"-p"	argument	that	is
+												specific	to	master/slave	communications.	*/
+				return("-p	"	+	temp_stream.str())	;
 }
 
-int Trick::MSSocket::process_sim_args() {
+int	Trick::MSSocket::process_sim_args()	{
 
-    int ii ;
-    int argc ;
-    char ** argv ;
+				int	ii	;
+				int	argc	;
+				char	**	argv	;
 
-    argc = command_line_args_get_argc() ;
-    argv = command_line_args_get_argv() ;
+				argc	=	command_line_args_get_argc()	;
+				argv	=	command_line_args_get_argv()	;
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li search for the "-p" argument.  If found get the master identifier as the next argument */
-    for (ii = 1; ii < argc; ii++) {
-        if (!strncmp("-p", argv[ii], (size_t) 2)) {
-            if (argc >= ii + 1) {
-                sync_port_tag = argv[ii+1] ;
-                return(1) ;
-            }
-        }
-    }
+				/**	@li	search	for	the	"-p"	argument.		If	found	get	the	master	identifier	as	the	next	argument	*/
+				for	(ii	=	1;	ii	<	argc;	ii++)	{
+								if	(!strncmp("-p",	argv[ii],	(size_t)	2))	{
+												if	(argc	>=	ii	+	1)	{
+																sync_port_tag	=	argv[ii+1]	;
+																return(1)	;
+												}
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::MSSocket::accept() {
+int	Trick::MSSocket::accept()	{
 
-    int ret ;
-    /** @par Detailed Design */
-    /** @li Call tc_multiconnect to connect this master.  Use "master" as the my_tag argument */
-    ret = tc_multiconnect(&tc_dev, (char *)"master", (char *)sync_port_tag.c_str(), NULL);
+				int	ret	;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_multiconnect	to	connect	this	master.		Use	"master"	as	the	my_tag	argument	*/
+				ret	=	tc_multiconnect(&tc_dev,	(char	*)"master",	(char	*)sync_port_tag.c_str(),	NULL);
 
-    return(ret) ;
+				return(ret)	;
 }
 
-int Trick::MSSocket::connect() {
-    int ret ;
-    /** @par Detailed Design */
-    /** @li Call tc_multiconnect to connect this slave.  Use "slave" as the my_tag argument */
-    ret = tc_multiconnect(&tc_dev, (char *)"slave", (char *)sync_port_tag.c_str(), NULL);
+int	Trick::MSSocket::connect()	{
+				int	ret	;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_multiconnect	to	connect	this	slave.		Use	"slave"	as	the	my_tag	argument	*/
+				ret	=	tc_multiconnect(&tc_dev,	(char	*)"slave",	(char	*)sync_port_tag.c_str(),	NULL);
 
-    return(ret) ;
+				return(ret)	;
 }
 
-int Trick::MSSocket::disconnect() {
-    int ret;
-    /** @par Detailed Design */
-    /** @li Call tc_disconnect to disconnect this device. */
-    ret = tc_disconnect( &tc_dev );
+int	Trick::MSSocket::disconnect()	{
+				int	ret;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_disconnect	to	disconnect	this	device.	*/
+				ret	=	tc_disconnect(	&tc_dev	);
 
-    tc_dev.disabled = TC_COMM_FALSE ;
-    tc_dev.error_handler = NULL ;
-    tc_dev.blockio_type = TC_COMM_TIMED_BLOCKIO ;
-    tc_dev.blockio_type = TC_COMM_BLOCKIO ;
-    tc_dev.port = 0 ;
+				tc_dev.disabled	=	TC_COMM_FALSE	;
+				tc_dev.error_handler	=	NULL	;
+				tc_dev.blockio_type	=	TC_COMM_TIMED_BLOCKIO	;
+				tc_dev.blockio_type	=	TC_COMM_BLOCKIO	;
+				tc_dev.port	=	0	;
 
-    return(ret);
+				return(ret);
 }
 
-long long Trick::MSSocket::read_time() {
+long	long	Trick::MSSocket::read_time()	{
 
-    long long in_time = 0 ;
-    int ret ;
+				long	long	in_time	=	0	;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_read to get the time */
-    ret = tc_read(&tc_dev , (char *)&in_time, sizeof(long long));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_read	to	get	the	time	*/
+				ret	=	tc_read(&tc_dev	,	(char	*)&in_time,	sizeof(long	long));
 
-    /** @li If the read call returned the correct number of bytes return the read in time */
-    if ( ret == sizeof(long long)) {
-        return(in_time) ;
-    }
-    /** @li Else return the special "error" time */
-    return (MS_ERROR_TIME) ;
+				/**	@li	If	the	read	call	returned	the	correct	number	of	bytes	return	the	read	in	time	*/
+				if	(	ret	==	sizeof(long	long))	{
+								return(in_time)	;
+				}
+				/**	@li	Else	return	the	special	"error"	time	*/
+				return	(MS_ERROR_TIME)	;
 }
 
-MS_SIM_COMMAND Trick::MSSocket::read_command() {
+MS_SIM_COMMAND	Trick::MSSocket::read_command()	{
 
-    MS_SIM_COMMAND command ;
-    int ret ;
+				MS_SIM_COMMAND	command	;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_read to get the command */
-    ret = tc_read(&tc_dev , (char *)&command, sizeof(MS_SIM_COMMAND));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_read	to	get	the	command	*/
+				ret	=	tc_read(&tc_dev	,	(char	*)&command,	sizeof(MS_SIM_COMMAND));
 
-    /** @li If the read call returned the correct number of bytes return the read in command */
-    if ( ret == sizeof(MS_SIM_COMMAND)) {
-        return(command) ;
-    }
+				/**	@li	If	the	read	call	returned	the	correct	number	of	bytes	return	the	read	in	command	*/
+				if	(	ret	==	sizeof(MS_SIM_COMMAND))	{
+								return(command)	;
+				}
 
-    /** @li Else return ErrorCmd  */
-    return(MS_ErrorCmd) ;
+				/**	@li	Else	return	ErrorCmd		*/
+				return(MS_ErrorCmd)	;
 }
 
-int Trick::MSSocket::read_port() {
+int	Trick::MSSocket::read_port()	{
 
-    int in_port = 0 ;
-    int ret ;
+				int	in_port	=	0	;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_read to get the port number */
-    ret = tc_read(&tc_dev , (char *)&in_port, sizeof(int));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_read	to	get	the	port	number	*/
+				ret	=	tc_read(&tc_dev	,	(char	*)&in_port,	sizeof(int));
 
-    /** @li If the read call returned the correct number of bytes return the read in port */
-    if ( ret == sizeof(int)) {
-        return(in_port) ;
-    }
-    /** @li Else return the special "error" port */
-    return (MS_ERROR_PORT) ;
+				/**	@li	If	the	read	call	returned	the	correct	number	of	bytes	return	the	read	in	port	*/
+				if	(	ret	==	sizeof(int))	{
+								return(in_port)	;
+				}
+				/**	@li	Else	return	the	special	"error"	port	*/
+				return	(MS_ERROR_PORT)	;
 }
 
-char Trick::MSSocket::read_name(char * read_data, size_t size) {
+char	Trick::MSSocket::read_name(char	*	read_data,	size_t	size)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_read to get the name (character array) */
-    ret = tc_read(&tc_dev , (char *)read_data, (int)size);
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_read	to	get	the	name	(character	array)	*/
+				ret	=	tc_read(&tc_dev	,	(char	*)read_data,	(int)size);
 
-    /** @li If the read call returned the correct number of bytes return 1st character read */
-    if ( ret == int(size)) {
-        return(read_data[0]) ;
-    }
-    /** @li Else return the special "error" name character */
-    return (MS_ERROR_NAME) ;
+				/**	@li	If	the	read	call	returned	the	correct	number	of	bytes	return	1st	character	read	*/
+				if	(	ret	==	int(size))	{
+								return(read_data[0])	;
+				}
+				/**	@li	Else	return	the	special	"error"	name	character	*/
+				return	(MS_ERROR_NAME)	;
 }
 
-int Trick::MSSocket::write_time(long long in_time) {
+int	Trick::MSSocket::write_time(long	long	in_time)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_write to write the time */
-    ret = tc_write(&tc_dev , (char *)&in_time, sizeof(long long));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_write	to	write	the	time	*/
+				ret	=	tc_write(&tc_dev	,	(char	*)&in_time,	sizeof(long	long));
 
-    /** @li Return the number of bytes written */
-    return(ret) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(ret)	;
 }
 
-int Trick::MSSocket::write_command(MS_SIM_COMMAND command) {
+int	Trick::MSSocket::write_command(MS_SIM_COMMAND	command)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_write to write the command */
-    ret = tc_write(&tc_dev , (char *)&command, sizeof(unsigned int));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_write	to	write	the	command	*/
+				ret	=	tc_write(&tc_dev	,	(char	*)&command,	sizeof(unsigned	int));
 
-    /** @li Return the number of bytes written */
-    return(ret) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(ret)	;
 }
 
-int Trick::MSSocket::write_port(int in_port) {
+int	Trick::MSSocket::write_port(int	in_port)	{
 
-    int ret ;
+				int	ret	;
 
-    /** @par Detailed Design */
-    /** @li Call tc_write to write the port number */
-    ret = tc_write(&tc_dev , (char *)&in_port, sizeof(int));
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_write	to	write	the	port	number	*/
+				ret	=	tc_write(&tc_dev	,	(char	*)&in_port,	sizeof(int));
 
-    /** @li Return the number of bytes written */
-    return(ret) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(ret)	;
 }
 
-int Trick::MSSocket::write_name(char * in_data, size_t size) {
+int	Trick::MSSocket::write_name(char	*	in_data,	size_t	size)	{
 
-    /** @par Detailed Design */
-    /** @li Call tc_write to write the name (character array) */
-    tc_write(&tc_dev , (char *)in_data, size);
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	tc_write	to	write	the	name	(character	array)	*/
+				tc_write(&tc_dev	,	(char	*)in_data,	size);
 
-    /** @li Return the number of bytes written */
-    return(size) ;
+				/**	@li	Return	the	number	of	bytes	written	*/
+				return(size)	;
 }
diff --git a/trick_source/sim_services/MasterSlave/Master.cpp b/trick_source/sim_services/MasterSlave/Master.cpp
index d4c834a65..0e2e4559a 100644
--- a/trick_source/sim_services/MasterSlave/Master.cpp
+++ b/trick_source/sim_services/MasterSlave/Master.cpp
@@ -1,524 +1,524 @@
 /*
-   PURPOSE: (Master for master/slave syncrhonization)
- */
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <pwd.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "trick/Master.hh"
-#include "trick/master_proto.h"
-#include "trick/MSSocket.hh"
-#include "trick/MSSharedMem.hh"
-#include "trick/exec_proto.h"
-#include "trick/sim_mode.h"
-#include "trick/command_line_protos.h"
-#include "trick/unix_commands.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/env_proto.h"
-#include "trick/CheckPointRestart_c_intf.hh" // for checkpoint_get_output_file
-
-Trick::Master * the_ms_master ;
-
-Trick::SlaveInfo::SlaveInfo() {
-
-    enabled = true ;
-    activated = false ;
-    slave_type = "undefined";
-
-    /* default the slaves to start with ssh */
-    remote_shell = TRICK_SSH ;
-
-    /* default the master not to quit if a slave dies */
-    sync_error_terminate = false ;
-
-    /* default the slaves to start on the localhost */
-    machine_name = "localhost" ;
-
-    sync_wait_limit = 0.0 ;
-    reconnect_wait_limit = 0.0 ;
-    reconnect_count = 0;
-    chkpnt_dump_auto = true ;
-    chkpnt_load_auto = true ;
+			PURPOSE:	(Master	for	master/slave	syncrhonization)
+	*/
+
+#include	<iostream>
+#include	<sstream>
+#include	<string>
+#include	<pwd.h>
+#include	<stdlib.h>
+#include	<unistd.h>
+
+#include	<sys/types.h>
+#include	<sys/wait.h>
+
+#include	"trick/Master.hh"
+#include	"trick/master_proto.h"
+#include	"trick/MSSocket.hh"
+#include	"trick/MSSharedMem.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/sim_mode.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/unix_commands.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/env_proto.h"
+#include	"trick/CheckPointRestart_c_intf.hh"	//	for	checkpoint_get_output_file
+
+Trick::Master	*	the_ms_master	;
+
+Trick::SlaveInfo::SlaveInfo()	{
+
+				enabled	=	true	;
+				activated	=	false	;
+				slave_type	=	"undefined";
+
+				/*	default	the	slaves	to	start	with	ssh	*/
+				remote_shell	=	TRICK_SSH	;
+
+				/*	default	the	master	not	to	quit	if	a	slave	dies	*/
+				sync_error_terminate	=	false	;
+
+				/*	default	the	slaves	to	start	on	the	localhost	*/
+				machine_name	=	"localhost"	;
+
+				sync_wait_limit	=	0.0	;
+				reconnect_wait_limit	=	0.0	;
+				reconnect_count	=	0;
+				chkpnt_dump_auto	=	true	;
+				chkpnt_load_auto	=	true	;
 }
 
-int Trick::SlaveInfo::set_connection_type(Trick::MSConnect * in_connection) {
+int	Trick::SlaveInfo::set_connection_type(Trick::MSConnect	*	in_connection)	{
 
-    connection = in_connection ;
-    return(0) ;
+				connection	=	in_connection	;
+				return(0)	;
 }
 
-int Trick::SlaveInfo::start() {
-
-    int arg_i;
-    char *display;
-
-    std::stringstream startup_command ;
-    std::stringstream temp_stream ;
-
-    struct passwd *passp;
-
-    int argc ;
-    char ** argv ;
-
-    std::string slave = "undefined";
-
-    /** @par Detailed Design */
-    argc = command_line_args_get_argc() ;
-    argv = command_line_args_get_argv() ;
-
-    /** @li If the slave connection type is not specified return an error */
-    if ( connection == NULL ) {
-        message_publish(MSG_ERROR , "Slave connection type not specified.\n") ;
-        return(-1) ;
-    }
-
-    /** @li Start remote startup command with remote shell to use and remote machine name*/
-    switch ( remote_shell ) {
-        case TRICK_RSH:
-            startup_command << unix_rsh << " " << remote_shell_args ;
-            break;
-        case TRICK_USER_REMOTE_SH:
-            if ( user_remote_shell.empty() ) {
-                message_publish(MSG_WARNING , "TRICK_USER_REMOTE_SH specified for Slave startup, but no shell given.\nDefaulting to %s.\n", unix_ssh) ;
-                user_remote_shell = unix_ssh ;
-            }
-            startup_command << user_remote_shell << " " << remote_shell_args ;
-            break;
-        case TRICK_SSH:
-        default:
-            startup_command << unix_ssh << " " << remote_shell_args ;
-            break;
-    }
-    startup_command << " " << machine_name ;
-
-    /** @li Add the remote display. If a remote display has not been specified, use the environment's */
-    if ( machine_display.empty() ) {
-        if ((display = (char *) env_get_var("DISPLAY")) == NULL) {
-            message_publish(MSG_ERROR, "Cannot get environment variable $DISPLAY for Slave.\n") ;
-        } else {
-            machine_display = display ;
-        }
-    }
-
-    /** @li cd to the simulation path in the remote startup command */
-    if ( sim_path.empty() ) {
-        message_publish(MSG_ERROR, "Slave startup sim_path is empty.\n") ;
-        return(-1) ;
-    }
-    /** @li Set the DISPLAY environment variable in the remote startup command.
-            Use setenv for *csh or export for all other shells */
-    passp = getpwuid(getuid());
-    if ( ! machine_display.empty() ) {
-        if (strstr(passp->pw_shell, "csh")) {
-            startup_command << " 'setenv DISPLAY " << machine_display ;
-        } else {
-            startup_command << " 'export DISPLAY=" << machine_display ;
-        }
-        startup_command << " ; cd " << sim_path << " ; " ;
-    } else {
-        startup_command << " 'cd " << sim_path << " ; " ;
-    }
-
-    if (strstr(passp->pw_shell, "csh")) {
-        startup_command << " setenv TRICK_HOST_CPU `trick-gte TRICK_HOST_CPU` ; " ;
-    } else {
-        startup_command << " export TRICK_HOST_CPU=`trick-gte TRICK_HOST_CPU` ; " ;
-    }
-
-
-    /** @li start the simulation in the remote startup command */
-    if ( S_main_name.empty() ) {
-        S_main_name = "./S_main_${TRICK_HOST_CPU}.exe" ;
-    }
-    startup_command << S_main_name ;
-
-    /** @li add the user provided run input file if provided */
-    if ( ! run_input_file.empty() ) {
-
-        startup_command << " " << run_input_file ;
-    }
-
-    /** @li Add the connection specific arguments to the startup command */
-    startup_command << " " << connection->add_sim_args( slave_type ) ;
-
-    /* @li Add the additional user arguments to the remote command */
-    if ( ! other_args.empty() ) {
-        startup_command << " -u " << other_args ;
-    }
-    for (arg_i = 2; arg_i < argc ; arg_i++) {
-        startup_command << " " << argv[arg_i] ;
-    }
-
-    /* @li start the remote command in the background */
-    startup_command << "' &"  ;
-
-    message_publish(MSG_INFO, startup_command.str().c_str()) ;
-
-    /* @li Execute the startup command */
-    if (system(startup_command.str().c_str())) {
-        perror("Slave_start");
-        return (-2) ;
-    }
-
-    /* @li Wait for the slave to connect to the master */
-    connection->accept() ;
-
-    /* @li Set the synchronization wait limit */
-    connection->set_sync_wait_limit(sync_wait_limit) ;
-
-    /* Set slave to activated */
-    activated = true;
-
-    return (0) ;
+int	Trick::SlaveInfo::start()	{
+
+				int	arg_i;
+				char	*display;
+
+				std::stringstream	startup_command	;
+				std::stringstream	temp_stream	;
+
+				struct	passwd	*passp;
+
+				int	argc	;
+				char	**	argv	;
+
+				std::string	slave	=	"undefined";
+
+				/**	@par	Detailed	Design	*/
+				argc	=	command_line_args_get_argc()	;
+				argv	=	command_line_args_get_argv()	;
+
+				/**	@li	If	the	slave	connection	type	is	not	specified	return	an	error	*/
+				if	(	connection	==	NULL	)	{
+								message_publish(MSG_ERROR	,	"Slave	connection	type	not	specified.\n")	;
+								return(-1)	;
+				}
+
+				/**	@li	Start	remote	startup	command	with	remote	shell	to	use	and	remote	machine	name*/
+				switch	(	remote_shell	)	{
+								case	TRICK_RSH:
+												startup_command	<<	unix_rsh	<<	"	"	<<	remote_shell_args	;
+												break;
+								case	TRICK_USER_REMOTE_SH:
+												if	(	user_remote_shell.empty()	)	{
+																message_publish(MSG_WARNING	,	"TRICK_USER_REMOTE_SH	specified	for	Slave	startup,	but	no	shell	given.\nDefaulting	to	%s.\n",	unix_ssh)	;
+																user_remote_shell	=	unix_ssh	;
+												}
+												startup_command	<<	user_remote_shell	<<	"	"	<<	remote_shell_args	;
+												break;
+								case	TRICK_SSH:
+								default:
+												startup_command	<<	unix_ssh	<<	"	"	<<	remote_shell_args	;
+												break;
+				}
+				startup_command	<<	"	"	<<	machine_name	;
+
+				/**	@li	Add	the	remote	display.	If	a	remote	display	has	not	been	specified,	use	the	environment's	*/
+				if	(	machine_display.empty()	)	{
+								if	((display	=	(char	*)	env_get_var("DISPLAY"))	==	NULL)	{
+												message_publish(MSG_ERROR,	"Cannot	get	environment	variable	$DISPLAY	for	Slave.\n")	;
+								}	else	{
+												machine_display	=	display	;
+								}
+				}
+
+				/**	@li	cd	to	the	simulation	path	in	the	remote	startup	command	*/
+				if	(	sim_path.empty()	)	{
+								message_publish(MSG_ERROR,	"Slave	startup	sim_path	is	empty.\n")	;
+								return(-1)	;
+				}
+				/**	@li	Set	the	DISPLAY	environment	variable	in	the	remote	startup	command.
+												Use	setenv	for	*csh	or	export	for	all	other	shells	*/
+				passp	=	getpwuid(getuid());
+				if	(	!	machine_display.empty()	)	{
+								if	(strstr(passp->pw_shell,	"csh"))	{
+												startup_command	<<	"	'setenv	DISPLAY	"	<<	machine_display	;
+								}	else	{
+												startup_command	<<	"	'export	DISPLAY="	<<	machine_display	;
+								}
+								startup_command	<<	"	;	cd	"	<<	sim_path	<<	"	;	"	;
+				}	else	{
+								startup_command	<<	"	'cd	"	<<	sim_path	<<	"	;	"	;
+				}
+
+				if	(strstr(passp->pw_shell,	"csh"))	{
+								startup_command	<<	"	setenv	TRICK_HOST_CPU	`trick-gte	TRICK_HOST_CPU`	;	"	;
+				}	else	{
+								startup_command	<<	"	export	TRICK_HOST_CPU=`trick-gte	TRICK_HOST_CPU`	;	"	;
+				}
+
+
+				/**	@li	start	the	simulation	in	the	remote	startup	command	*/
+				if	(	S_main_name.empty()	)	{
+								S_main_name	=	"./S_main_${TRICK_HOST_CPU}.exe"	;
+				}
+				startup_command	<<	S_main_name	;
+
+				/**	@li	add	the	user	provided	run	input	file	if	provided	*/
+				if	(	!	run_input_file.empty()	)	{
+
+								startup_command	<<	"	"	<<	run_input_file	;
+				}
+
+				/**	@li	Add	the	connection	specific	arguments	to	the	startup	command	*/
+				startup_command	<<	"	"	<<	connection->add_sim_args(	slave_type	)	;
+
+				/*	@li	Add	the	additional	user	arguments	to	the	remote	command	*/
+				if	(	!	other_args.empty()	)	{
+								startup_command	<<	"	-u	"	<<	other_args	;
+				}
+				for	(arg_i	=	2;	arg_i	<	argc	;	arg_i++)	{
+								startup_command	<<	"	"	<<	argv[arg_i]	;
+				}
+
+				/*	@li	start	the	remote	command	in	the	background	*/
+				startup_command	<<	"'	&"		;
+
+				message_publish(MSG_INFO,	startup_command.str().c_str())	;
+
+				/*	@li	Execute	the	startup	command	*/
+				if	(system(startup_command.str().c_str()))	{
+								perror("Slave_start");
+								return	(-2)	;
+				}
+
+				/*	@li	Wait	for	the	slave	to	connect	to	the	master	*/
+				connection->accept()	;
+
+				/*	@li	Set	the	synchronization	wait	limit	*/
+				connection->set_sync_wait_limit(sync_wait_limit)	;
+
+				/*	Set	slave	to	activated	*/
+				activated	=	true;
+
+				return	(0)	;
 }
 
-int Trick::SlaveInfo::read_slave_status() {
-
-    MS_SIM_COMMAND slave_command ;
-    MS_SIM_COMMAND exec_command ;
-
-    /** @par Detailed Design: */
-    /** @li If the slave is an active synchronization partner (activated == true) */
-    if (activated == true) {
-
-        /** @li read the current slave exec_command */
-        slave_command = connection->read_command() ;
-        //printf("DEBUG master read %d command from slave\n", slave_command);fflush(stdout);
-
-        exec_command = (MS_SIM_COMMAND)exec_get_exec_command() ;
-        // fixup: is it possible we won't get slave's Exit command over socket when it terminates?, set it here if that happens
-        if (dynamic_cast<MSSocket*>(connection)) {
-            if ((slave_command == MS_ErrorCmd) && (reconnect_wait_limit > 0.0) && (reconnect_count == 0)) {
-                slave_command = MS_ExitCmd;
-            }
-        }
-
-        /** @li If the master is not currently exiting, change modes if the slave is freezing/exiting or has an error */
-        if ( exec_command != MS_ExitCmd ) {
-            switch ( slave_command ) {
-                case (MS_ErrorCmd):
-                    /** @li if the user has set a reconnect_wait_limit, continue on if we are still under that limit, otherwise
-                            if the current slave mode cannot be read, exit the master if sync_error_terminate == true,
-                            otherwise set the activated flag to false */
-                    if ( (reconnect_count * exec_get_freeze_frame()) < reconnect_wait_limit) {
-                        reconnect_count++;
-                    } else if (sync_error_terminate == true) {
-                        message_publish(MSG_ERROR, "Master lost sync with slave, so master is terminating.\n") ;
-                        exec_terminate_with_return(-1, __FILE__, __LINE__ , "Master lost sync with slave.") ;
-                    }
-                    else {
-                        message_publish(MSG_ERROR, "Master lost sync with slave, so slave is being deactivated.\n") ;
-                        activated = false ;
-                        return(0) ;
-                    }
-                    break ;
-                case (MS_ExitCmd):
-                    /** @li if the current slave mode is exiting, exit the master if sync_error_terminate == true.
-                            otherwise wait for slave to reconnect. when wait limit is 0, set the activated flag to false */
-                    if  (sync_error_terminate == true){
-                        message_publish(MSG_WARNING, "sync_error_terminate is true: Slave is exiting, so master is terminating.\n") ;
-                        exec_terminate_with_return(-1, __FILE__, __LINE__ , "Slave is exiting, so is the master.") ;
-                    }
-                    else {
-                        message_publish(MSG_WARNING, "Slave is exiting.\n") ;
-                        // if reconnect_wait_limit is set, master waits for slave to reconnect
-                        if (reconnect_wait_limit > 0.0) {
-                            message_publish(MSG_WARNING, "Master will wait %f seconds for slave to reconnect.\n", reconnect_wait_limit) ;
-                            // make reads (shared mem connection) return quickly so we don't overrun waiting for reconnect
-                            connection->set_sync_wait_limit(exec_get_freeze_frame());
-                        }
-                        else {
-                            message_publish(MSG_WARNING, "reconnect_wait_limit: 0.0 - Master will stop communicating with slave.\n") ;
-                            activated = false ;
-                        }
-                        return(0) ;
-                    }
-                    break ;
-                case (MS_FreezeCmd):
-                    /** @li if the current slave is freezing, freeze the master too */
-                    message_publish(MSG_INFO, "Slave is freezing.\n") ;
-                    exec_set_exec_command(FreezeCmd) ;
-                    reconnect_count = 0;
-                    break ;
-                case (MS_ReconnectCmd):
-                    // set the sync wait limit back to its default
-                    connection->set_sync_wait_limit(sync_wait_limit);
-                    message_publish(MSG_INFO, "Master has reconnected to slave.\n") ;
-                    reconnect_count = 0;
-                    break ;
-                default:
-                    break ;
-            }
-        }
-    }
-    return(0) ;
+int	Trick::SlaveInfo::read_slave_status()	{
+
+				MS_SIM_COMMAND	slave_command	;
+				MS_SIM_COMMAND	exec_command	;
+
+				/**	@par	Detailed	Design:	*/
+				/**	@li	If	the	slave	is	an	active	synchronization	partner	(activated	==	true)	*/
+				if	(activated	==	true)	{
+
+								/**	@li	read	the	current	slave	exec_command	*/
+								slave_command	=	connection->read_command()	;
+								//printf("DEBUG	master	read	%d	command	from	slave\n",	slave_command);fflush(stdout);
+
+								exec_command	=	(MS_SIM_COMMAND)exec_get_exec_command()	;
+								//	fixup:	is	it	possible	we	won't	get	slave's	Exit	command	over	socket	when	it	terminates?,	set	it	here	if	that	happens
+								if	(dynamic_cast<MSSocket*>(connection))	{
+												if	((slave_command	==	MS_ErrorCmd)	&&	(reconnect_wait_limit	>	0.0)	&&	(reconnect_count	==	0))	{
+																slave_command	=	MS_ExitCmd;
+												}
+								}
+
+								/**	@li	If	the	master	is	not	currently	exiting,	change	modes	if	the	slave	is	freezing/exiting	or	has	an	error	*/
+								if	(	exec_command	!=	MS_ExitCmd	)	{
+												switch	(	slave_command	)	{
+																case	(MS_ErrorCmd):
+																				/**	@li	if	the	user	has	set	a	reconnect_wait_limit,	continue	on	if	we	are	still	under	that	limit,	otherwise
+																												if	the	current	slave	mode	cannot	be	read,	exit	the	master	if	sync_error_terminate	==	true,
+																												otherwise	set	the	activated	flag	to	false	*/
+																				if	(	(reconnect_count	*	exec_get_freeze_frame())	<	reconnect_wait_limit)	{
+																								reconnect_count++;
+																				}	else	if	(sync_error_terminate	==	true)	{
+																								message_publish(MSG_ERROR,	"Master	lost	sync	with	slave,	so	master	is	terminating.\n")	;
+																								exec_terminate_with_return(-1,	__FILE__,	__LINE__	,	"Master	lost	sync	with	slave.")	;
+																				}
+																				else	{
+																								message_publish(MSG_ERROR,	"Master	lost	sync	with	slave,	so	slave	is	being	deactivated.\n")	;
+																								activated	=	false	;
+																								return(0)	;
+																				}
+																				break	;
+																case	(MS_ExitCmd):
+																				/**	@li	if	the	current	slave	mode	is	exiting,	exit	the	master	if	sync_error_terminate	==	true.
+																												otherwise	wait	for	slave	to	reconnect.	when	wait	limit	is	0,	set	the	activated	flag	to	false	*/
+																				if		(sync_error_terminate	==	true){
+																								message_publish(MSG_WARNING,	"sync_error_terminate	is	true:	Slave	is	exiting,	so	master	is	terminating.\n")	;
+																								exec_terminate_with_return(-1,	__FILE__,	__LINE__	,	"Slave	is	exiting,	so	is	the	master.")	;
+																				}
+																				else	{
+																								message_publish(MSG_WARNING,	"Slave	is	exiting.\n")	;
+																								//	if	reconnect_wait_limit	is	set,	master	waits	for	slave	to	reconnect
+																								if	(reconnect_wait_limit	>	0.0)	{
+																												message_publish(MSG_WARNING,	"Master	will	wait	%f	seconds	for	slave	to	reconnect.\n",	reconnect_wait_limit)	;
+																												//	make	reads	(shared	mem	connection)	return	quickly	so	we	don't	overrun	waiting	for	reconnect
+																												connection->set_sync_wait_limit(exec_get_freeze_frame());
+																								}
+																								else	{
+																												message_publish(MSG_WARNING,	"reconnect_wait_limit:	0.0	-	Master	will	stop	communicating	with	slave.\n")	;
+																												activated	=	false	;
+																								}
+																								return(0)	;
+																				}
+																				break	;
+																case	(MS_FreezeCmd):
+																				/**	@li	if	the	current	slave	is	freezing,	freeze	the	master	too	*/
+																				message_publish(MSG_INFO,	"Slave	is	freezing.\n")	;
+																				exec_set_exec_command(FreezeCmd)	;
+																				reconnect_count	=	0;
+																				break	;
+																case	(MS_ReconnectCmd):
+																				//	set	the	sync	wait	limit	back	to	its	default
+																				connection->set_sync_wait_limit(sync_wait_limit);
+																				message_publish(MSG_INFO,	"Master	has	reconnected	to	slave.\n")	;
+																				reconnect_count	=	0;
+																				break	;
+																default:
+																				break	;
+												}
+								}
+				}
+				return(0)	;
 }
 
-int Trick::SlaveInfo::write_master_status() {
-    /** @par Detailed Design: */
-    /** @li If the slave is an active synchronization partner (activated == true) */
-    /** @li and we are not currently waiting for slave to reconnect, */
-    if (( activated == true ) && (reconnect_count == 0)) {
-        /** @li write the current time according to the master to the slave */
-        connection->write_time(exec_get_time_tics()) ;
-        /** @li write the current exec_command according to the master to the slave */
-        connection->write_command((MS_SIM_COMMAND)exec_get_exec_command()) ;
-    }
-    return(0) ;
+int	Trick::SlaveInfo::write_master_status()	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	If	the	slave	is	an	active	synchronization	partner	(activated	==	true)	*/
+				/**	@li	and	we	are	not	currently	waiting	for	slave	to	reconnect,	*/
+				if	((	activated	==	true	)	&&	(reconnect_count	==	0))	{
+								/**	@li	write	the	current	time	according	to	the	master	to	the	slave	*/
+								connection->write_time(exec_get_time_tics())	;
+								/**	@li	write	the	current	exec_command	according	to	the	master	to	the	slave	*/
+								connection->write_command((MS_SIM_COMMAND)exec_get_exec_command())	;
+				}
+				return(0)	;
 }
 
-int Trick::SlaveInfo::write_master_chkpnt_name(std::string full_path_name) {
-    /** @par Detailed Design: */
-    /** @li If the slave is an active synchronization partner (activated == true) */
-    if ( activated == true ) {
-        /** @li write the checkpoint dir/filename to the slave */
-        if (full_path_name.length() > sizeof(chkpnt_name)-1) {
-            message_publish(MSG_ERROR, "Master could not send checkpoint name to slave because name too long (max = %d).\n",
-                            sizeof(chkpnt_name)) ;
-            chkpnt_name[0] = MS_ERROR_NAME; // send error character
-        } else {
-            strcpy(chkpnt_name, full_path_name.c_str());
-        }
-        connection->write_name(chkpnt_name, sizeof(chkpnt_name)) ;
-    }
-
-    return(0) ;
+int	Trick::SlaveInfo::write_master_chkpnt_name(std::string	full_path_name)	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	If	the	slave	is	an	active	synchronization	partner	(activated	==	true)	*/
+				if	(	activated	==	true	)	{
+								/**	@li	write	the	checkpoint	dir/filename	to	the	slave	*/
+								if	(full_path_name.length()	>	sizeof(chkpnt_name)-1)	{
+												message_publish(MSG_ERROR,	"Master	could	not	send	checkpoint	name	to	slave	because	name	too	long	(max	=	%d).\n",
+																												sizeof(chkpnt_name))	;
+												chkpnt_name[0]	=	MS_ERROR_NAME;	//	send	error	character
+								}	else	{
+												strcpy(chkpnt_name,	full_path_name.c_str());
+								}
+								connection->write_name(chkpnt_name,	sizeof(chkpnt_name))	;
+				}
+
+				return(0)	;
 }
 
-Trick::Master::Master() {
-    enabled = false ;
-    the_ms_master = this ;
-    num_slaves = 0 ;
+Trick::Master::Master()	{
+				enabled	=	false	;
+				the_ms_master	=	this	;
+				num_slaves	=	0	;
 }
 
-int Trick::Master::enable() {
-    enabled = true ;
-    return(0);
+int	Trick::Master::enable()	{
+				enabled	=	true	;
+				return(0);
 }
 
-int Trick::Master::disable() {
-    enabled = false ;
-    return(0);
+int	Trick::Master::disable()	{
+				enabled	=	false	;
+				return(0);
 }
 
-Trick::SlaveInfo * Trick::Master::add_slave(Trick::SlaveInfo * new_slave) {
+Trick::SlaveInfo	*	Trick::Master::add_slave(Trick::SlaveInfo	*	new_slave)	{
 
 
-    /** @par Detailed Design: */
-    /** @li if the incoming parameter is NULL or not specified allocate space for a new slave */
-    if (new_slave == NULL ) {
-        new_slave = new Trick::SlaveInfo ;
-    }
+				/**	@par	Detailed	Design:	*/
+				/**	@li	if	the	incoming	parameter	is	NULL	or	not	specified	allocate	space	for	a	new	slave	*/
+				if	(new_slave	==	NULL	)	{
+								new_slave	=	new	Trick::SlaveInfo	;
+				}
 
-    /** @li push the slave onto the vector of slaves */
-    slaves.push_back(new_slave) ;
+				/**	@li	push	the	slave	onto	the	vector	of	slaves	*/
+				slaves.push_back(new_slave)	;
 
-    num_slaves++ ;
+				num_slaves++	;
 
-    /** @li return the address of the new slave */
-    return(new_slave) ;
+				/**	@li	return	the	address	of	the	new	slave	*/
+				return(new_slave)	;
 
 }
 
-int Trick::Master::process_sim_args() {
+int	Trick::Master::process_sim_args()	{
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::Master::init() {
-
-    unsigned int ii ;
-
-    /** @li Call Trick::SlaveInfo::start() for each slave */
-    if ( enabled ) {
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            slaves[ii]->start() ;
-            /** @li Write the master's software frame to each slave */
-            slaves[ii]->connection->write_time(exec_get_software_frame_tics()) ;
-            /** @li Write the master's time tic value to each slave */
-            slaves[ii]->connection->write_time(exec_get_time_tic_value()) ;
-            /** @li Write the master's sync_wait_limit to each slave */
-            slaves[ii]->connection->write_time((long long)(slaves[ii]->sync_wait_limit * exec_get_time_tic_value())) ;
-            /** @li Cast the freeze command and write it to the slave */
-            slaves[ii]->connection->write_command((MS_SIM_COMMAND)exec_get_freeze_command()) ;
-            /** @li Write a flag word containing the checkpoint pre_init, post_init, and end flags to the slave */
-            slaves[ii]->connection->write_time((long long) ((get_checkpoint_pre_init() << 2) +
-                                                            (get_checkpoint_post_init() << 1) +
-                                                            (get_checkpoint_end())) );
-        }
-
-        // Freezes are only allowed on frame boundaries when Master/Slave is enabled.
-        exec_set_freeze_on_frame_boundary(true) ;
-
-    }
-
-    return(0) ;
+int	Trick::Master::init()	{
+
+				unsigned	int	ii	;
+
+				/**	@li	Call	Trick::SlaveInfo::start()	for	each	slave	*/
+				if	(	enabled	)	{
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												slaves[ii]->start()	;
+												/**	@li	Write	the	master's	software	frame	to	each	slave	*/
+												slaves[ii]->connection->write_time(exec_get_software_frame_tics())	;
+												/**	@li	Write	the	master's	time	tic	value	to	each	slave	*/
+												slaves[ii]->connection->write_time(exec_get_time_tic_value())	;
+												/**	@li	Write	the	master's	sync_wait_limit	to	each	slave	*/
+												slaves[ii]->connection->write_time((long	long)(slaves[ii]->sync_wait_limit	*	exec_get_time_tic_value()))	;
+												/**	@li	Cast	the	freeze	command	and	write	it	to	the	slave	*/
+												slaves[ii]->connection->write_command((MS_SIM_COMMAND)exec_get_freeze_command())	;
+												/**	@li	Write	a	flag	word	containing	the	checkpoint	pre_init,	post_init,	and	end	flags	to	the	slave	*/
+												slaves[ii]->connection->write_time((long	long)	((get_checkpoint_pre_init()	<<	2)	+
+																																																												(get_checkpoint_post_init()	<<	1)	+
+																																																												(get_checkpoint_end()))	);
+								}
+
+								//	Freezes	are	only	allowed	on	frame	boundaries	when	Master/Slave	is	enabled.
+								exec_set_freeze_on_frame_boundary(true)	;
+
+				}
+
+				return(0)	;
 }
 
 /**
 @details
--# Read the status of all slaves
+-#	Read	the	status	of	all	slaves
 */
-int Trick::Master::end_of_frame_status_from_slave() {
-    unsigned int ii ;
-    if ( enabled ) {
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            slaves[ii]->read_slave_status() ;
-        }
-    }
-
-    return(0) ;
+int	Trick::Master::end_of_frame_status_from_slave()	{
+				unsigned	int	ii	;
+				if	(	enabled	)	{
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												slaves[ii]->read_slave_status()	;
+								}
+				}
+
+				return(0)	;
 }
 
 /**
 @details
--# Write the master status to all slaves
+-#	Write	the	master	status	to	all	slaves
 */
-int Trick::Master::end_of_frame_status_to_slave() {
-    unsigned int ii ;
-    if ( enabled ) {
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            slaves[ii]->write_master_status() ;
-        }
-    }
-
-    return(0) ;
+int	Trick::Master::end_of_frame_status_to_slave()	{
+				unsigned	int	ii	;
+				if	(	enabled	)	{
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												slaves[ii]->write_master_status()	;
+								}
+				}
+
+				return(0)	;
 }
 
-int Trick::Master::freeze_init() {
+int	Trick::Master::freeze_init()	{
 
-    unsigned int ii ;
-    Trick::SlaveInfo * curr_slave ;
+				unsigned	int	ii	;
+				Trick::SlaveInfo	*	curr_slave	;
 
-    if ( enabled ) {
-        /** @par Detailed Design: */
-        /** @li Set the connection sync_wait_limit to infinite as we enter freeze */
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            curr_slave = slaves[ii] ;
-            if ( curr_slave->activated == true ) {
-                curr_slave->connection->set_sync_wait_limit(-1.0) ;
-            }
-        }
-    }
-    return(0) ;
+				if	(	enabled	)	{
+								/**	@par	Detailed	Design:	*/
+								/**	@li	Set	the	connection	sync_wait_limit	to	infinite	as	we	enter	freeze	*/
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												curr_slave	=	slaves[ii]	;
+												if	(	curr_slave->activated	==	true	)	{
+																curr_slave->connection->set_sync_wait_limit(-1.0)	;
+												}
+								}
+				}
+				return(0)	;
 
 }
 
-int Trick::Master::freeze() {
-    /** @par Detailed Design: */
-    /** @li Sync with slave(s) */
-    end_of_frame_status_from_slave() ;
-    end_of_frame_status_to_slave() ;
-    return(0) ;
+int	Trick::Master::freeze()	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Sync	with	slave(s)	*/
+				end_of_frame_status_from_slave()	;
+				end_of_frame_status_to_slave()	;
+				return(0)	;
 }
 
-int Trick::Master::checkpoint() {
-    /** @par Detailed Design: */
-    /** @li If chkpnt_dump_auto, tell slave to dump a checkpoint */
-    unsigned int ii ;
-    // do not tell slave to dump if this is a pre_init, post_init, or end checkpoint
-    // those are handled with flags sent to slave in init()
-    if ((exec_get_mode() == Initialization) || (exec_get_mode() == ExitMode)) {
-        return(0);
-    }
-    if (enabled) {
-        // Use 2 loops to read all slave status before writing any status out.
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            slaves[ii]->read_slave_status() ;
-        }
-        SIM_COMMAND save_command = exec_get_exec_command() ;
-        std::string full_path_name = checkpoint_get_output_file();
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            if (slaves[ii]->chkpnt_dump_auto) {
-                exec_set_exec_command((SIM_COMMAND)MS_ChkpntDumpAsciiCmd) ;
-                slaves[ii]->write_master_status() ;
-                slaves[ii]->write_master_chkpnt_name(full_path_name) ;
-                exec_set_exec_command(save_command) ;
-            } else { // no auto dump
-                slaves[ii]->write_master_status() ;
-            }
-        }
-    }
-    return(0) ;
+int	Trick::Master::checkpoint()	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	If	chkpnt_dump_auto,	tell	slave	to	dump	a	checkpoint	*/
+				unsigned	int	ii	;
+				//	do	not	tell	slave	to	dump	if	this	is	a	pre_init,	post_init,	or	end	checkpoint
+				//	those	are	handled	with	flags	sent	to	slave	in	init()
+				if	((exec_get_mode()	==	Initialization)	||	(exec_get_mode()	==	ExitMode))	{
+								return(0);
+				}
+				if	(enabled)	{
+								//	Use	2	loops	to	read	all	slave	status	before	writing	any	status	out.
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												slaves[ii]->read_slave_status()	;
+								}
+								SIM_COMMAND	save_command	=	exec_get_exec_command()	;
+								std::string	full_path_name	=	checkpoint_get_output_file();
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												if	(slaves[ii]->chkpnt_dump_auto)	{
+																exec_set_exec_command((SIM_COMMAND)MS_ChkpntDumpAsciiCmd)	;
+																slaves[ii]->write_master_status()	;
+																slaves[ii]->write_master_chkpnt_name(full_path_name)	;
+																exec_set_exec_command(save_command)	;
+												}	else	{	//	no	auto	dump
+																slaves[ii]->write_master_status()	;
+												}
+								}
+				}
+				return(0)	;
 }
-int Trick::Master::preload_checkpoint() {
-    /** @par Detailed Design: */
-    /** @li If chkpnt_load_auto, tell slave to load a checkpoint */
-    unsigned int ii ;
-    if (enabled) {
-        // Use 2 loops to read all slave status before writing any status out.
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            slaves[ii]->read_slave_status() ;
-        }
-        SIM_COMMAND save_command = exec_get_exec_command() ;
-        std::string full_path_name = checkpoint_get_load_file();
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            if (slaves[ii]->chkpnt_load_auto) {
-                exec_set_exec_command((SIM_COMMAND)MS_ChkpntLoadAsciiCmd) ;
-                slaves[ii]->write_master_status() ;
-                slaves[ii]->write_master_chkpnt_name(full_path_name) ;
-                exec_set_exec_command(save_command) ;
-            } else { // no auto load
-                slaves[ii]->write_master_status() ;
-            }
-        }
-    }
-    return(0) ;
+int	Trick::Master::preload_checkpoint()	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	If	chkpnt_load_auto,	tell	slave	to	load	a	checkpoint	*/
+				unsigned	int	ii	;
+				if	(enabled)	{
+								//	Use	2	loops	to	read	all	slave	status	before	writing	any	status	out.
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												slaves[ii]->read_slave_status()	;
+								}
+								SIM_COMMAND	save_command	=	exec_get_exec_command()	;
+								std::string	full_path_name	=	checkpoint_get_load_file();
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												if	(slaves[ii]->chkpnt_load_auto)	{
+																exec_set_exec_command((SIM_COMMAND)MS_ChkpntLoadAsciiCmd)	;
+																slaves[ii]->write_master_status()	;
+																slaves[ii]->write_master_chkpnt_name(full_path_name)	;
+																exec_set_exec_command(save_command)	;
+												}	else	{	//	no	auto	load
+																slaves[ii]->write_master_status()	;
+												}
+								}
+				}
+				return(0)	;
 }
 
-int Trick::Master::unfreeze() {
+int	Trick::Master::unfreeze()	{
 
-    unsigned int ii ;
-    Trick::SlaveInfo * curr_slave ;
+				unsigned	int	ii	;
+				Trick::SlaveInfo	*	curr_slave	;
 
-    if ( enabled ) {
-        for ( ii = 0 ; ii < slaves.size() ; ii++ ) {
-            /** @par Detailed Design: */
-            /** @li Set the connection sync_wait_limit to the default for each slave */
-            curr_slave = slaves[ii] ;
-            if ( curr_slave->activated == true ) {
-                curr_slave->connection->set_sync_wait_limit(curr_slave->sync_wait_limit) ;
-            }
-        }
-    }
-    return(0) ;
+				if	(	enabled	)	{
+								for	(	ii	=	0	;	ii	<	slaves.size()	;	ii++	)	{
+												/**	@par	Detailed	Design:	*/
+												/**	@li	Set	the	connection	sync_wait_limit	to	the	default	for	each	slave	*/
+												curr_slave	=	slaves[ii]	;
+												if	(	curr_slave->activated	==	true	)	{
+																curr_slave->connection->set_sync_wait_limit(curr_slave->sync_wait_limit)	;
+												}
+								}
+				}
+				return(0)	;
 
 }
 
-int Trick::Master::shutdown() {
-    /** @par Detailed Design: */
-    /** @li Sync with slave(s) */
-    if ( enabled ) {
-        end_of_frame_status_from_slave() ;
-        end_of_frame_status_to_slave() ;
-    }
-    return(0) ;
+int	Trick::Master::shutdown()	{
+				/**	@par	Detailed	Design:	*/
+				/**	@li	Sync	with	slave(s)	*/
+				if	(	enabled	)	{
+								end_of_frame_status_from_slave()	;
+								end_of_frame_status_to_slave()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::Master
- * C binded function to toggle the master/slave synchronization flag to on.
- * @return always 0
- */
-extern "C" int ms_master_enable(void) {
-    the_ms_master->enable() ;
-    return(0) ;
+	*	@relates	Trick::Master
+	*	C	binded	function	to	toggle	the	master/slave	synchronization	flag	to	on.
+	*	@return	always	0
+	*/
+extern	"C"	int	ms_master_enable(void)	{
+				the_ms_master->enable()	;
+				return(0)	;
 }
 
 /**
- * @relates Trick::Master
- * C binded function to toggle the master/slave synchronization flag to off.
- * @return always 0
- */
-extern "C" int ms_master_disable(void) {
-    the_ms_master->disable() ;
-    return(0) ;
+	*	@relates	Trick::Master
+	*	C	binded	function	to	toggle	the	master/slave	synchronization	flag	to	off.
+	*	@return	always	0
+	*/
+extern	"C"	int	ms_master_disable(void)	{
+				the_ms_master->disable()	;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/MasterSlave/Slave.cpp b/trick_source/sim_services/MasterSlave/Slave.cpp
index 2aa12a840..7884086df 100644
--- a/trick_source/sim_services/MasterSlave/Slave.cpp
+++ b/trick_source/sim_services/MasterSlave/Slave.cpp
@@ -1,275 +1,275 @@
 /*
-   PURPOSE: (Slave for master/slave synchronization)
- */
-
-#include <iostream>
-#include <iomanip> // for setprecision
-#include <sstream>
-#include <dlfcn.h>
-#include <stdlib.h> // for getenv
-#include <cstring>
-
-#include "trick/Slave.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/CheckPointRestart_c_intf.hh" // for checkpoint
-#include "trick/command_line_protos.h" // output dir get/set
-
-Trick::Slave::Slave() {
-    enabled = false ;
-    reconnected = false ;
-    activated = false;
-    msg_published = false;
-    sent_reconnect_cmd = false;
+			PURPOSE:	(Slave	for	master/slave	synchronization)
+	*/
+
+#include	<iostream>
+#include	<iomanip>	//	for	setprecision
+#include	<sstream>
+#include	<dlfcn.h>
+#include	<stdlib.h>	//	for	getenv
+#include	<cstring>
+
+#include	"trick/Slave.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/CheckPointRestart_c_intf.hh"	//	for	checkpoint
+#include	"trick/command_line_protos.h"	//	output	dir	get/set
+
+Trick::Slave::Slave()	{
+				enabled	=	false	;
+				reconnected	=	false	;
+				activated	=	false;
+				msg_published	=	false;
+				sent_reconnect_cmd	=	false;
 }
 
-int Trick::Slave::set_connection_type(Trick::MSConnect * in_connection) {
-    connection = in_connection ;
-    return 0 ;
+int	Trick::Slave::set_connection_type(Trick::MSConnect	*	in_connection)	{
+				connection	=	in_connection	;
+				return	0	;
 }
 
-int Trick::Slave::process_sim_args() {
-    /** @par Detailed Design */
-    if ( connection != NULL ) {
-        /** @li the return_value of Trick::MSConnect::process_sim_args() sets the enabled flag for the slave. */
-        enabled = connection->process_sim_args() ;
-    }
+int	Trick::Slave::process_sim_args()	{
+				/**	@par	Detailed	Design	*/
+				if	(	connection	!=	NULL	)	{
+								/**	@li	the	return_value	of	Trick::MSConnect::process_sim_args()	sets	the	enabled	flag	for	the	slave.	*/
+								enabled	=	connection->process_sim_args()	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::Slave::init() {
-
-    std::string rts_disable_name ;
-    std::string ms_master_disable_name ;
-    void* dlhandle ;
-    int (*rts_disable)(void) = NULL ;
-    int (*ms_master_disable)(void) = NULL ;
-    long long software_frame_tics ;
-    long long sync_wait_limit_tics ;
-    int chkpnt_flag;
-
-    /** @par Detailed Design */
-
-    if ( enabled ) {
-
-        /** @li Connect to the master by calling Trick::MSConnect::connect() */
-        connection->connect() ;
-
-        dlhandle = dlopen( NULL, RTLD_LAZY) ;
-
-        /** @li Turn off RealtimeSync if it exists.  We are not assuming that the function even
-                exists.  Search for the routine and execute it if it exists */
-        rts_disable_name = "real_time_disable" ;
-        rts_disable = (int (*)(void))dlsym( dlhandle , rts_disable_name.c_str()) ;
-        if ( rts_disable != NULL ) {
-            message_publish(MSG_INFO , "Slave synchronization starting.  Turning realtime synchronization off.\n") ;
-            (*rts_disable)() ;
-        }
-
-        /** @li Turn off Master synchronization if it exists.  We are not assuming that the function even
-                exists.  Search for the routine and execute it if it exists */
-        ms_master_disable_name = "ms_master_disable" ;
-        ms_master_disable = (int (*)(void))dlsym( dlhandle , ms_master_disable_name.c_str()) ;
-        if ( ms_master_disable != NULL ) {
-            message_publish(MSG_INFO , "Slave synchronization starting.  Turning master off.\n") ;
-            (*ms_master_disable)() ;
-        }
-
-        /** @li Read and set the slave software frame and time tic value according to the master. */
-        software_frame_tics = connection->read_time() ;
-        exec_set_time_tic_value (connection->read_time());
-        exec_set_software_frame (double (software_frame_tics) / double(exec_get_time_tic_value()) ) ;
-        /** @li Read and set the sync_wait_limit according to the master. */
-        sync_wait_limit_tics = connection->read_time() ;
-        sync_wait_limit = double (sync_wait_limit_tics) / double(exec_get_time_tic_value()) ;
-        connection->set_sync_wait_limit(sync_wait_limit) ;
-
-        /** @li  Read the initial freeze command from the master. */
-        exec_set_freeze_command(int(connection->read_command())) ;
-        /** @li Read and set the pre_init, post_init, and end checkpoint flags according to the master. */
-        chkpnt_flag = (int)connection->read_time();
-        checkpoint_pre_init(chkpnt_flag>>2 & 0x1);
-        checkpoint_post_init(chkpnt_flag>>1 & 0x1);
-        checkpoint_end(chkpnt_flag & 0x1);
-
-        dlclose(dlhandle) ;
-
-        // Executive freezes are only allowed on freeze frame boundaries in Master/Slave
-        exec_set_freeze_on_frame_boundary(true) ;
-
-        activated = true;
-    }
-
-    return(0) ;
+int	Trick::Slave::init()	{
+
+				std::string	rts_disable_name	;
+				std::string	ms_master_disable_name	;
+				void*	dlhandle	;
+				int	(*rts_disable)(void)	=	NULL	;
+				int	(*ms_master_disable)(void)	=	NULL	;
+				long	long	software_frame_tics	;
+				long	long	sync_wait_limit_tics	;
+				int	chkpnt_flag;
+
+				/**	@par	Detailed	Design	*/
+
+				if	(	enabled	)	{
+
+								/**	@li	Connect	to	the	master	by	calling	Trick::MSConnect::connect()	*/
+								connection->connect()	;
+
+								dlhandle	=	dlopen(	NULL,	RTLD_LAZY)	;
+
+								/**	@li	Turn	off	RealtimeSync	if	it	exists.		We	are	not	assuming	that	the	function	even
+																exists.		Search	for	the	routine	and	execute	it	if	it	exists	*/
+								rts_disable_name	=	"real_time_disable"	;
+								rts_disable	=	(int	(*)(void))dlsym(	dlhandle	,	rts_disable_name.c_str())	;
+								if	(	rts_disable	!=	NULL	)	{
+												message_publish(MSG_INFO	,	"Slave	synchronization	starting.		Turning	realtime	synchronization	off.\n")	;
+												(*rts_disable)()	;
+								}
+
+								/**	@li	Turn	off	Master	synchronization	if	it	exists.		We	are	not	assuming	that	the	function	even
+																exists.		Search	for	the	routine	and	execute	it	if	it	exists	*/
+								ms_master_disable_name	=	"ms_master_disable"	;
+								ms_master_disable	=	(int	(*)(void))dlsym(	dlhandle	,	ms_master_disable_name.c_str())	;
+								if	(	ms_master_disable	!=	NULL	)	{
+												message_publish(MSG_INFO	,	"Slave	synchronization	starting.		Turning	master	off.\n")	;
+												(*ms_master_disable)()	;
+								}
+
+								/**	@li	Read	and	set	the	slave	software	frame	and	time	tic	value	according	to	the	master.	*/
+								software_frame_tics	=	connection->read_time()	;
+								exec_set_time_tic_value	(connection->read_time());
+								exec_set_software_frame	(double	(software_frame_tics)	/	double(exec_get_time_tic_value())	)	;
+								/**	@li	Read	and	set	the	sync_wait_limit	according	to	the	master.	*/
+								sync_wait_limit_tics	=	connection->read_time()	;
+								sync_wait_limit	=	double	(sync_wait_limit_tics)	/	double(exec_get_time_tic_value())	;
+								connection->set_sync_wait_limit(sync_wait_limit)	;
+
+								/**	@li		Read	the	initial	freeze	command	from	the	master.	*/
+								exec_set_freeze_command(int(connection->read_command()))	;
+								/**	@li	Read	and	set	the	pre_init,	post_init,	and	end	checkpoint	flags	according	to	the	master.	*/
+								chkpnt_flag	=	(int)connection->read_time();
+								checkpoint_pre_init(chkpnt_flag>>2	&	0x1);
+								checkpoint_post_init(chkpnt_flag>>1	&	0x1);
+								checkpoint_end(chkpnt_flag	&	0x1);
+
+								dlclose(dlhandle)	;
+
+								//	Executive	freezes	are	only	allowed	on	freeze	frame	boundaries	in	Master/Slave
+								exec_set_freeze_on_frame_boundary(true)	;
+
+								activated	=	true;
+				}
+
+				return(0)	;
 }
 
-std::string Trick::Slave::get_checkpoint_name(MS_SIM_COMMAND command) {
-
-    std::string dir;
-    std::stringstream file_name_stream ;
-    /** @par Detailed Design */
-    /** @li Read the checkpoint name from master, it's in the form "dir/filename" */
-    connection->read_name(chkpnt_name, sizeof(chkpnt_name)); // dir/filename
-    /** @li Return the appropriate checkpoint name to use for given dump/load command */
-    // ascii checkpoint() only wants a filename -- no dir path
-    if (command == MS_ChkpntDumpAsciiCmd) {
-        if (chkpnt_name[0] != MS_ERROR_NAME) {
-            file_name_stream << strrchr(chkpnt_name, '/')+1; // filename only
-            //std::cout << "----> Slave: parsed checkpoint file name: " << file_name_stream.str() << std::endl;
-        } else { // create default name
-            file_name_stream << "chkpnt_" << std::fixed << std::setprecision(2) << exec_get_sim_time() ;
-        }
-    }
-    // ascii load_checkpoint() wants the dir/filename path
-    if (command == MS_ChkpntLoadAsciiCmd) {
-        dir = command_line_args_get_output_dir(); // run dir
-        if (chkpnt_name[0] != MS_ERROR_NAME) {
-            file_name_stream << dir << std::string(strrchr(chkpnt_name, '/')); // my run dir / filename
-        } else { // create default name
-            file_name_stream << dir << "/chkpnt_" << std::fixed << std::setprecision(2) << exec_get_sim_time() ;
-        }
-    }
-
-    return(file_name_stream.str()) ;
+std::string	Trick::Slave::get_checkpoint_name(MS_SIM_COMMAND	command)	{
+
+				std::string	dir;
+				std::stringstream	file_name_stream	;
+				/**	@par	Detailed	Design	*/
+				/**	@li	Read	the	checkpoint	name	from	master,	it's	in	the	form	"dir/filename"	*/
+				connection->read_name(chkpnt_name,	sizeof(chkpnt_name));	//	dir/filename
+				/**	@li	Return	the	appropriate	checkpoint	name	to	use	for	given	dump/load	command	*/
+				//	ascii	checkpoint()	only	wants	a	filename	--	no	dir	path
+				if	(command	==	MS_ChkpntDumpAsciiCmd)	{
+								if	(chkpnt_name[0]	!=	MS_ERROR_NAME)	{
+												file_name_stream	<<	strrchr(chkpnt_name,	'/')+1;	//	filename	only
+												//std::cout	<<	"---->	Slave:	parsed	checkpoint	file	name:	"	<<	file_name_stream.str()	<<	std::endl;
+								}	else	{	//	create	default	name
+												file_name_stream	<<	"chkpnt_"	<<	std::fixed	<<	std::setprecision(2)	<<	exec_get_sim_time()	;
+								}
+				}
+				//	ascii	load_checkpoint()	wants	the	dir/filename	path
+				if	(command	==	MS_ChkpntLoadAsciiCmd)	{
+								dir	=	command_line_args_get_output_dir();	//	run	dir
+								if	(chkpnt_name[0]	!=	MS_ERROR_NAME)	{
+												file_name_stream	<<	dir	<<	std::string(strrchr(chkpnt_name,	'/'));	//	my	run	dir	/	filename
+								}	else	{	//	create	default	name
+												file_name_stream	<<	dir	<<	"/chkpnt_"	<<	std::fixed	<<	std::setprecision(2)	<<	exec_get_sim_time()	;
+								}
+				}
+
+				return(file_name_stream.str())	;
 }
 
-int Trick::Slave::end_of_frame() {
-
-    long long master_time ;
-    MS_SIM_COMMAND command ;
-    MS_SIM_COMMAND slave_command ;
-    std::string chkpt_name_str;
-
-    /** @par Detailed Design */
-    if ( (enabled) and (activated) ){
-
-        /** @li write the current slave exec_command to the master */
-        slave_command = (MS_SIM_COMMAND)exec_get_exec_command();
-
-        // send a special command so master knows to print a "we reconnected" message
-        if (reconnected) {
-            slave_command = MS_ReconnectCmd;
-
-            if (msg_published)
-                reconnected = false;
-            else
-                sent_reconnect_cmd = true;
-        }
-
-        //printf("DEBUG slave write %d command to master\n", slave_command); fflush(stdout);
-        connection->write_command(slave_command) ;
-
-        /** @li read the simulation time according to the master */
-        master_time = connection->read_time() ;
-
-        if ( master_time == MS_ERROR_TIME ) {
-
-            if ( sync_error_terminate == true ) {
-                /** @li if reading the master time returned an error exit the sim if sync_error_terminate == true */
-                message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is true: Slave is terminating.\n") ;
-                exec_terminate_with_return(-1, __FILE__, __LINE__ , "Slave lost sync with master") ;
-            }
-            else {
-                if (slave_command != MS_FreezeCmd){
-                    /** @li if reading the master time returned an error freeze the sim if sync_error_terminate == false */
-                    activated = false;
-                    message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is false: Slave is entering Freeze mode.\n") ;
-                    exec_set_exec_command(FreezeCmd) ;
-                    connection->write_command(MS_FreezeCmd) ;
-                    return(0);
-                }
-            }
-        }
-
-        /** @li read the master mode command */
-        command = connection->read_command() ;
-        //printf("DEBUG slave read %d command from master\n", command); fflush(stdout);
-
-        switch ( command ) {
-            case (MS_ErrorCmd):
-                if ( sync_error_terminate == true ) {
-                    /** @li if reading the master mode command returned an error exit the sim if sync_error_terminate == true */
-                    message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is true: Slave is terminating.\n") ;
-                    exec_terminate_with_return(-1, __FILE__, __LINE__ , "Slave lost sync with master") ;
-                }
-                else {
-                    if (slave_command != MS_FreezeCmd) {
-                        /** @li if reading the master mode command returned an error freeze the sim if sync_error_terminate == false */
-                        activated = false;
-                        message_publish(MSG_ERROR , "Slave lost sync with master. sync_error_terminate is false: Slave is entering Freeze mode.\n") ;
-                        exec_set_exec_command(FreezeCmd) ;
-                        connection->write_command(MS_FreezeCmd) ;
-                        return(0);
-                    }
-                }
-                break;
-            /** @li if reading the master mode command returned a checkpoint dump command, dump a checkpoint */
-            case (MS_ChkpntDumpAsciiCmd):   // Master tells slave to dump an ascii checkpoint
-                message_publish(MSG_WARNING , "Slave received Checkpoint Dump command from master.\n") ;
-                chkpt_name_str = get_checkpoint_name(MS_ChkpntDumpAsciiCmd);
-                checkpoint(chkpt_name_str.c_str());
-                break;
-            /** @li if reading the master mode command returned a checkpoint load command, load a checkpoint */
-            case (MS_ChkpntLoadAsciiCmd):  // Master tells slave to load an ascii checkpoint
-                message_publish(MSG_WARNING , "Slave received Checkpoint Load command from master.\n") ;
-                chkpt_name_str = get_checkpoint_name(MS_ChkpntLoadAsciiCmd);
-                load_checkpoint(chkpt_name_str.c_str()); // load done in freeze or end_of_frame job
-                //load_checkpoint_job(); // do the load NOW
-                break;
-            default:
-                /** @li if reading the master mode command returned an Executive mode, set the slave mode command to the master mode command */
-                exec_set_exec_command((SIM_COMMAND)command) ;
-                if (reconnected) {
-                    message_publish(MSG_INFO , "Slave has reconnected to master.\n") ;
-                    if (sent_reconnect_cmd)
-                        reconnected = false;
-                    else
-                        msg_published = true;
-                }
-                break;
-        }
-    }
-
-    return(0) ;
+int	Trick::Slave::end_of_frame()	{
+
+				long	long	master_time	;
+				MS_SIM_COMMAND	command	;
+				MS_SIM_COMMAND	slave_command	;
+				std::string	chkpt_name_str;
+
+				/**	@par	Detailed	Design	*/
+				if	(	(enabled)	and	(activated)	){
+
+								/**	@li	write	the	current	slave	exec_command	to	the	master	*/
+								slave_command	=	(MS_SIM_COMMAND)exec_get_exec_command();
+
+								//	send	a	special	command	so	master	knows	to	print	a	"we	reconnected"	message
+								if	(reconnected)	{
+												slave_command	=	MS_ReconnectCmd;
+
+												if	(msg_published)
+																reconnected	=	false;
+												else
+																sent_reconnect_cmd	=	true;
+								}
+
+								//printf("DEBUG	slave	write	%d	command	to	master\n",	slave_command);	fflush(stdout);
+								connection->write_command(slave_command)	;
+
+								/**	@li	read	the	simulation	time	according	to	the	master	*/
+								master_time	=	connection->read_time()	;
+
+								if	(	master_time	==	MS_ERROR_TIME	)	{
+
+												if	(	sync_error_terminate	==	true	)	{
+																/**	@li	if	reading	the	master	time	returned	an	error	exit	the	sim	if	sync_error_terminate	==	true	*/
+																message_publish(MSG_ERROR	,	"Slave	lost	sync	with	master.	sync_error_terminate	is	true:	Slave	is	terminating.\n")	;
+																exec_terminate_with_return(-1,	__FILE__,	__LINE__	,	"Slave	lost	sync	with	master")	;
+												}
+												else	{
+																if	(slave_command	!=	MS_FreezeCmd){
+																				/**	@li	if	reading	the	master	time	returned	an	error	freeze	the	sim	if	sync_error_terminate	==	false	*/
+																				activated	=	false;
+																				message_publish(MSG_ERROR	,	"Slave	lost	sync	with	master.	sync_error_terminate	is	false:	Slave	is	entering	Freeze	mode.\n")	;
+																				exec_set_exec_command(FreezeCmd)	;
+																				connection->write_command(MS_FreezeCmd)	;
+																				return(0);
+																}
+												}
+								}
+
+								/**	@li	read	the	master	mode	command	*/
+								command	=	connection->read_command()	;
+								//printf("DEBUG	slave	read	%d	command	from	master\n",	command);	fflush(stdout);
+
+								switch	(	command	)	{
+												case	(MS_ErrorCmd):
+																if	(	sync_error_terminate	==	true	)	{
+																				/**	@li	if	reading	the	master	mode	command	returned	an	error	exit	the	sim	if	sync_error_terminate	==	true	*/
+																				message_publish(MSG_ERROR	,	"Slave	lost	sync	with	master.	sync_error_terminate	is	true:	Slave	is	terminating.\n")	;
+																				exec_terminate_with_return(-1,	__FILE__,	__LINE__	,	"Slave	lost	sync	with	master")	;
+																}
+																else	{
+																				if	(slave_command	!=	MS_FreezeCmd)	{
+																								/**	@li	if	reading	the	master	mode	command	returned	an	error	freeze	the	sim	if	sync_error_terminate	==	false	*/
+																								activated	=	false;
+																								message_publish(MSG_ERROR	,	"Slave	lost	sync	with	master.	sync_error_terminate	is	false:	Slave	is	entering	Freeze	mode.\n")	;
+																								exec_set_exec_command(FreezeCmd)	;
+																								connection->write_command(MS_FreezeCmd)	;
+																								return(0);
+																				}
+																}
+																break;
+												/**	@li	if	reading	the	master	mode	command	returned	a	checkpoint	dump	command,	dump	a	checkpoint	*/
+												case	(MS_ChkpntDumpAsciiCmd):			//	Master	tells	slave	to	dump	an	ascii	checkpoint
+																message_publish(MSG_WARNING	,	"Slave	received	Checkpoint	Dump	command	from	master.\n")	;
+																chkpt_name_str	=	get_checkpoint_name(MS_ChkpntDumpAsciiCmd);
+																checkpoint(chkpt_name_str.c_str());
+																break;
+												/**	@li	if	reading	the	master	mode	command	returned	a	checkpoint	load	command,	load	a	checkpoint	*/
+												case	(MS_ChkpntLoadAsciiCmd):		//	Master	tells	slave	to	load	an	ascii	checkpoint
+																message_publish(MSG_WARNING	,	"Slave	received	Checkpoint	Load	command	from	master.\n")	;
+																chkpt_name_str	=	get_checkpoint_name(MS_ChkpntLoadAsciiCmd);
+																load_checkpoint(chkpt_name_str.c_str());	//	load	done	in	freeze	or	end_of_frame	job
+																//load_checkpoint_job();	//	do	the	load	NOW
+																break;
+												default:
+																/**	@li	if	reading	the	master	mode	command	returned	an	Executive	mode,	set	the	slave	mode	command	to	the	master	mode	command	*/
+																exec_set_exec_command((SIM_COMMAND)command)	;
+																if	(reconnected)	{
+																				message_publish(MSG_INFO	,	"Slave	has	reconnected	to	master.\n")	;
+																				if	(sent_reconnect_cmd)
+																								reconnected	=	false;
+																				else
+																								msg_published	=	true;
+																}
+																break;
+								}
+				}
+
+				return(0)	;
 }
 
-int Trick::Slave::freeze_init() {
-    /** @par Detailed Design */
-    if ( enabled ) {
-        /** @li Set the connection sync_wait_limit to infinite upon entering freeze */
-        connection->set_sync_wait_limit(-1.0) ;
-    }
-    return(0) ;
+int	Trick::Slave::freeze_init()	{
+				/**	@par	Detailed	Design	*/
+				if	(	enabled	)	{
+								/**	@li	Set	the	connection	sync_wait_limit	to	infinite	upon	entering	freeze	*/
+								connection->set_sync_wait_limit(-1.0)	;
+				}
+				return(0)	;
 }
 
-int Trick::Slave::freeze() {
-    /** @par Detailed Design */
-    /** @li Call Trick::Slave::end_of_frame() */
+int	Trick::Slave::freeze()	{
+				/**	@par	Detailed	Design	*/
+				/**	@li	Call	Trick::Slave::end_of_frame()	*/
 
-    if ( enabled ) {
-        exec_set_exec_command(NoCmd) ; // so master won't keep reading freeze command during freeze
-        end_of_frame() ;
-    }
-    return(0) ;
+				if	(	enabled	)	{
+								exec_set_exec_command(NoCmd)	;	//	so	master	won't	keep	reading	freeze	command	during	freeze
+								end_of_frame()	;
+				}
+				return(0)	;
 }
 
-int Trick::Slave::unfreeze() {
-    /** @par Detailed Design */
-    if ( enabled ) {
-        /** @li Set the connection sync_wait_limit to the default upon exiting freeze */
-        connection->set_sync_wait_limit(sync_wait_limit) ;
-    }
-    return(0) ;
+int	Trick::Slave::unfreeze()	{
+				/**	@par	Detailed	Design	*/
+				if	(	enabled	)	{
+								/**	@li	Set	the	connection	sync_wait_limit	to	the	default	upon	exiting	freeze	*/
+								connection->set_sync_wait_limit(sync_wait_limit)	;
+				}
+				return(0)	;
 }
 
-int Trick::Slave::shutdown() {
-    /** @par Detailed Design */
-    if ( enabled ) {
-        /** @li write the exit mode command to the master when the slave is shutting down */
-        connection->write_command(MS_ExitCmd) ;
-    }
-    return(0) ;
+int	Trick::Slave::shutdown()	{
+				/**	@par	Detailed	Design	*/
+				if	(	enabled	)	{
+								/**	@li	write	the	exit	mode	command	to	the	master	when	the	slave	is	shutting	down	*/
+								connection->write_command(MS_ExitCmd)	;
+				}
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/ADefParseContext.cpp b/trick_source/sim_services/MemoryManager/ADefParseContext.cpp
index a21f93227..8e5aaca1b 100644
--- a/trick_source/sim_services/MemoryManager/ADefParseContext.cpp
+++ b/trick_source/sim_services/MemoryManager/ADefParseContext.cpp
@@ -1,83 +1,83 @@
 /**
- @page ADEF_Syntax Allocation Declaration Syntax
+	@page	ADEF_Syntax	Allocation	Declaration	Syntax
 
- An allocation declaration string is used to declare type information for a chunk of memory.
- They are taken as parameters by the Memory Managers's declare_var and declare_ext_var member
- functions as well as "C" interface calls TMM_declare_var_s and TMM_declare_ext_var_s.
+	An	allocation	declaration	string	is	used	to	declare	type	information	for	a	chunk	of	memory.
+	They	are	taken	as	parameters	by	the	Memory	Managers's	declare_var	and	declare_ext_var	member
+	functions	as	well	as	"C"	interface	calls	TMM_declare_var_s	and	TMM_declare_ext_var_s.
 
- An allocation declaration is an intrinsic type or a user-defined-type followed by a declarator.
- A declarator is zero or more asterisks (pointers), followed by an optional variable name,
- followed by zero or more bracketed integers (a dimension list).
+	An	allocation	declaration	is	an	intrinsic	type	or	a	user-defined-type	followed	by	a	declarator.
+	A	declarator	is	zero	or	more	asterisks	(pointers),	followed	by	an	optional	variable	name,
+	followed	by	zero	or	more	bracketed	integers	(a	dimension	list).
 
- An intrinsic type is one of the "built-in" types, like "char", "int", "double", etc.
+	An	intrinsic	type	is	one	of	the	"built-in"	types,	like	"char",	"int",	"double",	etc.
 
- A user defined type is a typedef-struct name or a class name, including if necessary, scope resolution operators ( i.e., "::").
+	A	user	defined	type	is	a	typedef-struct	name	or	a	class	name,	including	if	necessary,	scope	resolution	operators	(	i.e.,	"::").
 
-Example Allocation Declaration strings:
+Example	Allocation	Declaration	strings:
 
- - "double"
- - "double[3]"
- - "double*[3]"
- - "char[3][4]"
- - "int narf"
- - "int *baz[3]"
- - "VEHICLE truck"
- - "FOO::BAR zortz[2][5]"
+	-	"double"
+	-	"double[3]"
+	-	"double*[3]"
+	-	"char[3][4]"
+	-	"int	narf"
+	-	"int	*baz[3]"
+	-	"VEHICLE	truck"
+	-	"FOO::BAR	zortz[2][5]"
 
 
- \b Syntax of an Allocation Declaration String:
- @verbatim
-    <alloc-declaration> ::= <intrinsic-type> <declarator>
-                          | <user-defined-type> <declarator>
+	\b	Syntax	of	an	Allocation	Declaration	String:
+	@verbatim
+				<alloc-declaration>	::=	<intrinsic-type>	<declarator>
+																										|	<user-defined-type>	<declarator>
 
-    <declarator> ::= <pointers> <opt-name> <dim-list>
+				<declarator>	::=	<pointers>	<opt-name>	<dim-list>
 
-    <opt-name> ::= nil
-                 | NAME
+				<opt-name>	::=	nil
+																	|	NAME
 
-    <pointers> ::= nil
-                 | pointers '*'
+				<pointers>	::=	nil
+																	|	pointers	'*'
 
-    <user-defined-type> ::= NAME
-                          | <user-defined-type> ":" ":" NAME
+				<user-defined-type>	::=	NAME
+																										|	<user-defined-type>	":"	":"	NAME
 
-    <dim-list> ::= nil
-                 | <dim-list> "[" INTEGER "]"
+				<dim-list>	::=	nil
+																	|	<dim-list>	"["	INTEGER	"]"
 
-    intrinsic_type ::= "char"
-                     | "short"
-                     | "int"
-                     | "long"
-                     | "float"
-                     | "double"
-                     | "long long"
-                     | "wchar_t"
-                     | "unsigned char"
-                     | "unsigned short"
-                     | "unsigned int"
-                     | "unsigned long"
-                     | "unsigned long long"
+				intrinsic_type	::=	"char"
+																					|	"short"
+																					|	"int"
+																					|	"long"
+																					|	"float"
+																					|	"double"
+																					|	"long	long"
+																					|	"wchar_t"
+																					|	"unsigned	char"
+																					|	"unsigned	short"
+																					|	"unsigned	int"
+																					|	"unsigned	long"
+																					|	"unsigned	long	long"
 
-    NAME ::=  [_a-zA-Z][_a-zA-Z0-9:]*
- @endverbatim
+				NAME	::=		[_a-zA-Z][_a-zA-Z0-9:]*
+	@endverbatim
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "trick/ADefParseContext.hh"
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	"trick/ADefParseContext.hh"
 
 /**
- Constructor
- */
-Trick::ADefParseContext::ADefParseContext( std::istream* in_is ) {
-   init_scanner();
-   this->is = in_is;
+	Constructor
+	*/
+Trick::ADefParseContext::ADefParseContext(	std::istream*	in_is	)	{
+			init_scanner();
+			this->is	=	in_is;
 }
 
 /**
- Destructor
- */
-Trick::ADefParseContext::~ADefParseContext() {
-    destroy_scanner();
+	Destructor
+	*/
+Trick::ADefParseContext::~ADefParseContext()	{
+				destroy_scanner();
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager.cpp b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
index 1cb398a64..e78567221 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
@@ -1,116 +1,116 @@
-#include <dlfcn.h>
-#include <stdlib.h>
-#include "trick/MemoryManager.hh"
-#include "trick/ClassicCheckPointAgent.hh"
-// Global pointer to the (singleton) MemoryManager for the C language interface.
-Trick::MemoryManager * trick_MM = NULL;
-
-// CLASS VARIABLE INITIALIZATION
-int Trick::MemoryManager::instance_count = 0;
-bool Trick::MemoryManager::restore_stls_default = true;
-
-// CONSTRUCTOR
+#include	<dlfcn.h>
+#include	<stdlib.h>
+#include	"trick/MemoryManager.hh"
+#include	"trick/ClassicCheckPointAgent.hh"
+//	Global	pointer	to	the	(singleton)	MemoryManager	for	the	C	language	interface.
+Trick::MemoryManager	*	trick_MM	=	NULL;
+
+//	CLASS	VARIABLE	INITIALIZATION
+int	Trick::MemoryManager::instance_count	=	0;
+bool	Trick::MemoryManager::restore_stls_default	=	true;
+
+//	CONSTRUCTOR
 Trick::MemoryManager::MemoryManager()
 {
 
 
-    // The MemoryManager is a singleton. That is only one instance of it is allowed.
-    if (instance_count != 0) {
-        throw std::logic_error("Only one instance of the Memory Manager is allowed.");
-    }
-    instance_count ++;
-
-    debug_level = 0;
-    hexfloat_checkpoint = 0;
-    reduced_checkpoint  = 1;
-    resetting_memory = false;
-    expanded_arrays  = 0;
-    // start counter at 100mil.  This (hopefully) ensures all alloc'ed ids are after external variables.
-    alloc_info_map_counter = 100000000 ;
-    // start counter at 0.  This forces extern vars to appear in front of actual allocations in checkpoint.
-    extern_alloc_info_map_counter = 0 ;
-    pthread_mutex_init(&mm_mutex, NULL);
-
-    defaultCheckPointAgent = new ClassicCheckPointAgent( this);
-    defaultCheckPointAgent->set_reduced_checkpoint( reduced_checkpoint);
-    defaultCheckPointAgent->set_hexfloat_checkpoint( hexfloat_checkpoint);
-    defaultCheckPointAgent->set_debug_level( debug_level);
-
-    currentCheckPointAgent = defaultCheckPointAgent;
-
-    dlhandles.push_back(dlopen( NULL, RTLD_LAZY)) ;
-
-    local_anon_var_prefix = "trick_anon_local_";
-    extern_anon_var_prefix = "trick_anon_extern_";
-
-    primitive_types.insert(std::string("char")) ;
-    primitive_types.insert(std::string("unsigned char")) ;
-    primitive_types.insert(std::string("short")) ;
-    primitive_types.insert(std::string("unsigned short")) ;
-    primitive_types.insert(std::string("int")) ;
-    primitive_types.insert(std::string("unsigned int")) ;
-    primitive_types.insert(std::string("long")) ;
-    primitive_types.insert(std::string("unsigned long")) ;
-    primitive_types.insert(std::string("long long")) ;
-    primitive_types.insert(std::string("unsigned long long")) ;
-    primitive_types.insert(std::string("double")) ;
-    primitive_types.insert(std::string("float")) ;
-    primitive_types.insert(std::string("bool")) ;
-    // add stdint.h types
-    primitive_types.insert(std::string("int8_t")) ;
-    primitive_types.insert(std::string("uint8_t")) ;
-    primitive_types.insert(std::string("int16_t")) ;
-    primitive_types.insert(std::string("uint16_t")) ;
-    primitive_types.insert(std::string("int32_t")) ;
-    primitive_types.insert(std::string("uint32_t")) ;
-    primitive_types.insert(std::string("int64_t")) ;
-    primitive_types.insert(std::string("uint64_t")) ;
-
-    trick_MM = this;
-    return ;
+				//	The	MemoryManager	is	a	singleton.	That	is	only	one	instance	of	it	is	allowed.
+				if	(instance_count	!=	0)	{
+								throw	std::logic_error("Only	one	instance	of	the	Memory	Manager	is	allowed.");
+				}
+				instance_count	++;
+
+				debug_level	=	0;
+				hexfloat_checkpoint	=	0;
+				reduced_checkpoint		=	1;
+				resetting_memory	=	false;
+				expanded_arrays		=	0;
+				//	start	counter	at	100mil.		This	(hopefully)	ensures	all	alloc'ed	ids	are	after	external	variables.
+				alloc_info_map_counter	=	100000000	;
+				//	start	counter	at	0.		This	forces	extern	vars	to	appear	in	front	of	actual	allocations	in	checkpoint.
+				extern_alloc_info_map_counter	=	0	;
+				pthread_mutex_init(&mm_mutex,	NULL);
+
+				defaultCheckPointAgent	=	new	ClassicCheckPointAgent(	this);
+				defaultCheckPointAgent->set_reduced_checkpoint(	reduced_checkpoint);
+				defaultCheckPointAgent->set_hexfloat_checkpoint(	hexfloat_checkpoint);
+				defaultCheckPointAgent->set_debug_level(	debug_level);
+
+				currentCheckPointAgent	=	defaultCheckPointAgent;
+
+				dlhandles.push_back(dlopen(	NULL,	RTLD_LAZY))	;
+
+				local_anon_var_prefix	=	"trick_anon_local_";
+				extern_anon_var_prefix	=	"trick_anon_extern_";
+
+				primitive_types.insert(std::string("char"))	;
+				primitive_types.insert(std::string("unsigned	char"))	;
+				primitive_types.insert(std::string("short"))	;
+				primitive_types.insert(std::string("unsigned	short"))	;
+				primitive_types.insert(std::string("int"))	;
+				primitive_types.insert(std::string("unsigned	int"))	;
+				primitive_types.insert(std::string("long"))	;
+				primitive_types.insert(std::string("unsigned	long"))	;
+				primitive_types.insert(std::string("long	long"))	;
+				primitive_types.insert(std::string("unsigned	long	long"))	;
+				primitive_types.insert(std::string("double"))	;
+				primitive_types.insert(std::string("float"))	;
+				primitive_types.insert(std::string("bool"))	;
+				//	add	stdint.h	types
+				primitive_types.insert(std::string("int8_t"))	;
+				primitive_types.insert(std::string("uint8_t"))	;
+				primitive_types.insert(std::string("int16_t"))	;
+				primitive_types.insert(std::string("uint16_t"))	;
+				primitive_types.insert(std::string("int32_t"))	;
+				primitive_types.insert(std::string("uint32_t"))	;
+				primitive_types.insert(std::string("int64_t"))	;
+				primitive_types.insert(std::string("uint64_t"))	;
+
+				trick_MM	=	this;
+				return	;
 }
 
-Trick::MemoryManager::~MemoryManager() {
-
-    ALLOC_INFO_MAP::iterator ait ;
-
-    if (instance_count > 0) {
-        instance_count --;
-    }
-
-    delete defaultCheckPointAgent ;
-
-    for ( ait = alloc_info_map.begin() ; ait != alloc_info_map.end() ; ++ait ) {
-        ALLOC_INFO * ai_ptr = (*ait).second ;
-        if (ai_ptr->stcl == TRICK_LOCAL) {
-            if ( ai_ptr->alloc_type == TRICK_ALLOC_MALLOC ) {
-                free((char *)ai_ptr->start - ai_ptr->sentinel_bytes) ;
-            } else if ( ai_ptr->alloc_type == TRICK_ALLOC_NEW ) {
-                io_src_delete_class( ai_ptr );
-            }
-        }
-        if (ai_ptr->name) { free(ai_ptr->name); }
-        if (ai_ptr->user_type_name) { free(ai_ptr->user_type_name); }
-        free(ai_ptr) ;
-    }
-    alloc_info_map.clear() ;
+Trick::MemoryManager::~MemoryManager()	{
+
+				ALLOC_INFO_MAP::iterator	ait	;
+
+				if	(instance_count	>	0)	{
+								instance_count	--;
+				}
+
+				delete	defaultCheckPointAgent	;
+
+				for	(	ait	=	alloc_info_map.begin()	;	ait	!=	alloc_info_map.end()	;	++ait	)	{
+								ALLOC_INFO	*	ai_ptr	=	(*ait).second	;
+								if	(ai_ptr->stcl	==	TRICK_LOCAL)	{
+												if	(	ai_ptr->alloc_type	==	TRICK_ALLOC_MALLOC	)	{
+																free((char	*)ai_ptr->start	-	ai_ptr->sentinel_bytes)	;
+												}	else	if	(	ai_ptr->alloc_type	==	TRICK_ALLOC_NEW	)	{
+																io_src_delete_class(	ai_ptr	);
+												}
+								}
+								if	(ai_ptr->name)	{	free(ai_ptr->name);	}
+								if	(ai_ptr->user_type_name)	{	free(ai_ptr->user_type_name);	}
+								free(ai_ptr)	;
+				}
+				alloc_info_map.clear()	;
 }
 
-#include <sstream>
-void Trick::MemoryManager::emitMessage( std::string message) {
-    std::cerr << "MemoryManager:" << message << std::endl;
-    std::cerr.flush();
+#include	<sstream>
+void	Trick::MemoryManager::emitMessage(	std::string	message)	{
+				std::cerr	<<	"MemoryManager:"	<<	message	<<	std::endl;
+				std::cerr.flush();
 }
 
-void Trick::MemoryManager::emitError( std::string message) {
-    std::stringstream ss;
-    ss << "ERROR:" << message << std::endl;
-    emitMessage( ss.str() );
+void	Trick::MemoryManager::emitError(	std::string	message)	{
+				std::stringstream	ss;
+				ss	<<	"ERROR:"	<<	message	<<	std::endl;
+				emitMessage(	ss.str()	);
 }
 
-void Trick::MemoryManager::emitWarning( std::string message) {
-    std::stringstream ss;
-    ss << "WARNING:" << message << std::endl;
-    emitMessage( ss.str() );
+void	Trick::MemoryManager::emitWarning(	std::string	message)	{
+				std::stringstream	ss;
+				ss	<<	"WARNING:"	<<	message	<<	std::endl;
+				emitMessage(	ss.str()	);
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
index 527ded9ec..4fbdb0ab9 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_C_Intf.cpp
@@ -1,593 +1,593 @@
-#include <string>
-#include <iostream>
-#include "trick/memorymanager_c_intf.h"
-#include "trick/MemoryManager.hh"
-
-/* Global singleton pointer to the memory manager. */
-extern Trick::MemoryManager* trick_MM;
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 6 argument version of Trick::MemoryManager::declare_var.
- The arguments and return value are the same except that std::string args are replaced with const char * args.
- */
-extern "C" void* TMM_declare_var( TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims) {
-    if (trick_MM != NULL) {
-        std::string sclass_name = class_name;
-        std::string svar_name = var_name;
-        return ( trick_MM->declare_var( type, sclass_name, n_stars, svar_name, n_cdims, cdims));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_var() called before MemoryManager instantiation. Returning NULL.") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 2 argument version of Trick::MemoryManager::declare_var.
- The arguments and return value are the same.
- */
-extern "C" void* TMM_declare_var_1d( const char* enh_type_spec, int e_elems) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->declare_var( enh_type_spec, e_elems));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_var_1d() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 1 argument version of Trick::MemoryManager::declare_var.
- The arguments and return value are the same.
- */
-extern "C" void* TMM_declare_var_s( const char* declaration) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->declare_var( declaration));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_var_s() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is a C Language interface to the 2 argument version of Trick::MemoryManager::declare_var.
- The arguments are the same but switched in order and the return value is the same.
- It's here because I caved to Alex's whine about backwards compatibility.
-
- */
-extern "C" void* alloc_type( int e_elems, const char* enh_type_spec) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->declare_var( enh_type_spec, e_elems));
-    } else {
-        Trick::MemoryManager::emitError("alloc_type() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 6 argument version of Trick::MemoryManager::declare_var.
- The arguments and return value are the same except that std::string args are replaced with const char * args.
- */
-extern "C" void* TMM_declare_operatornew_var( const char * class_name, unsigned int alloc_size , unsigned int element_size ) {
-    if (trick_MM != NULL) {
-        return trick_MM->declare_operatornew_var( std::string(class_name), alloc_size, element_size ) ;
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_var() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return (void*)NULL ;
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 7 argument version of Trick::MemoryManager::declare_ext_var.
- The arguments and return value are the same except that std::string args are replaced with const char * args.
- */
-extern "C" void* TMM_declare_ext_var( void* addr, TRICK_TYPE type, const char*class_name, int n_stars, const char* var_name, int n_cdims, int *cdims) {
-    if (trick_MM != NULL) {
-        std::string sclass_name = class_name;
-        std::string svar_name = var_name;
-        return ( trick_MM->declare_extern_var( addr, type, sclass_name, n_stars, svar_name, n_cdims, cdims));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_ext_var() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 4 argument version of Trick::MemoryManager::declare_var.
- The arguments and return value are the same.
- */
-extern "C" void* TMM_declare_ext_var_1d( void* addr, const char* elem_decl, int n_elems) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->declare_extern_var( addr, elem_decl, n_elems));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_ext_var_1d() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of the 1 argument version of Trick::MemoryManager::declare_extern_var.
- The arguments and return value are the same.
- */
-extern "C" void* TMM_declare_ext_var_s( void* addr, const char* declaration) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->declare_extern_var(addr, declaration));
-    } else {
-        Trick::MemoryManager::emitError("TMM_declare_ext_var_s() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language, "identify the array by address", version of Trick::MemoryManager::resize_array.
- Resize each of the dimensions of the array at the given address. n_cdims specifies the number
- of dimensions and must match those of the array being resized. cdims specifies the new sizes
- for each of the dimensions.
- */
-void* TMM_resize_array_a(void *address, int n_cdims, int *cdims){
-    if (trick_MM != NULL) {
-        return ( trick_MM->resize_array(address, n_cdims, cdims));
-    } else {
-        Trick::MemoryManager::emitError("TMM_resize_array_a() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language, "identify the array by name", version of Trick::MemoryManager::resize_array.
- Resize each of the dimensions of the array whose name is given. n_cdims specifies the number
- of dimensions and must match those of the array being resized. cdims specifies the new sizes
- for each of the dimensions.
- */
-void* TMM_resize_array_n(const char *name, int n_cdims, int *cdims){
-    if (trick_MM != NULL) {
-        return ( trick_MM->resize_array(name, n_cdims, cdims));
-    } else {
-        Trick::MemoryManager::emitError("TMM_resize_array_n() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::resize_array(address, num).
- Resize the one dimensional array at the given address.
- */
-void* TMM_resize_array_1d_a(void* address, int num){
-    if (trick_MM != NULL) {
-        return ( trick_MM->resize_array(address, num));
-    } else {
-        Trick::MemoryManager::emitError("TMM_resize_array_1d_a() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::resize_array(name, num).
- Resize the one dimensional array whose name is given.
- */
-void* TMM_resize_array_1d_n(const char *name, int num){
-    if (trick_MM != NULL) {
-        return ( trick_MM->resize_array(name, num));
-    } else {
-        Trick::MemoryManager::emitError("TMM_resize_array_1d_n() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::mm_strdup( str).
- Duplicate and catalog the given character string.
- */
-extern "C" char* TMM_strdup(char *str) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->mm_strdup( str));
-    } else {
-        Trick::MemoryManager::emitError("TMM_strdup called before MemoryManager instantiation. Returning NULL.\n") ;
-        return( (char*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::var_exists().
- Test whether the given variable_name is in use.
- */
-extern "C" int TMM_var_exists( const char* var_name) {
-    if (trick_MM != NULL) {
-        std::string svar_name = var_name;
-        return ( trick_MM->var_exists( svar_name));
-    } else {
-        Trick::MemoryManager::emitError("TMM_var_exists() called before MemoryManager instantiation.\n") ;
-        return (0);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::var_exists().
- Test whether the given address is in Trick managed memory.  C interface to Trick::MemoryManager::is_alloced( addr).
- */
-extern "C" int TMM_is_alloced(char *addr) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->is_alloced( addr));
-    } else {
-        Trick::MemoryManager::emitError("TMM_is_alloced() called before MemoryManager instantiation.\n") ;
-        return (0);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::set_debug_level(level).
- Set the verbosity of MemoryManager debug messages.  C interface to Trick::MemoryManager::set_debug_level( level).
- */
-extern "C" void TMM_set_debug_level(int level) {
-    if (trick_MM != NULL) {
-        trick_MM->set_debug_level( level);
-    } else {
-        Trick::MemoryManager::emitError("TMM_set_debug_level() called before MemoryManager instantiation.\n") ;
-    }
-}
-
-/**
- This is the C Language version of Trick::MemoryManager::set_reduced_checkpoint( yesno).
- @relates Trick::MemoryManager
- */
-extern "C" void TMM_reduced_checkpoint(int yesno) {
-    if (trick_MM != NULL) {
-        trick_MM->set_reduced_checkpoint( yesno!=0 );
-    } else {
-        Trick::MemoryManager::emitError("TMM_reduced_checkpoint() called before MemoryManager instantiation.\n") ;
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::set_hexfloat_checkpoint( yesno).
- */
-extern "C" void TMM_hexfloat_checkpoint(int yesno) {
-    if (trick_MM != NULL) {
-        trick_MM->set_hexfloat_checkpoint( yesno!=0 );
-    } else {
-        Trick::MemoryManager::emitError("TMM_hexfloat_checkpoint() called before MemoryManager instantiation.\n") ;
-    }
-}
-
-
-
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::clear_var( addr).
- */
-extern "C" void TMM_clear_var_a(void *addr) {
-    if (trick_MM != NULL) {
-        trick_MM->clear_var( addr);
-    } else {
-        Trick::MemoryManager::emitError("TMM_clear_var_a() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::clear_var( name).
- */
-extern "C" void TMM_clear_var_n( const char* name) {
-    if (trick_MM != NULL) {
-        trick_MM->clear_var( name);
-    } else {
-        Trick::MemoryManager::emitError("TMM_clear_var_n() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::delete_var( addr).
- */
-extern "C" void TMM_delete_var_a(void *addr) {
-    if (trick_MM != NULL) {
-        trick_MM->delete_var( addr);
-    } else {
-        Trick::MemoryManager::emitError("TMM_delete_var_a() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
+#include	<string>
+#include	<iostream>
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/MemoryManager.hh"
+
+/*	Global	singleton	pointer	to	the	memory	manager.	*/
+extern	Trick::MemoryManager*	trick_MM;
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	6	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	and	return	value	are	the	same	except	that	std::string	args	are	replaced	with	const	char	*	args.
+	*/
+extern	"C"	void*	TMM_declare_var(	TRICK_TYPE	type,	const	char*class_name,	int	n_stars,	const	char*	var_name,	int	n_cdims,	int	*cdims)	{
+				if	(trick_MM	!=	NULL)	{
+								std::string	sclass_name	=	class_name;
+								std::string	svar_name	=	var_name;
+								return	(	trick_MM->declare_var(	type,	sclass_name,	n_stars,	svar_name,	n_cdims,	cdims));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_var()	called	before	MemoryManager	instantiation.	Returning	NULL.")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	2	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	and	return	value	are	the	same.
+	*/
+extern	"C"	void*	TMM_declare_var_1d(	const	char*	enh_type_spec,	int	e_elems)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->declare_var(	enh_type_spec,	e_elems));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_var_1d()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	1	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	and	return	value	are	the	same.
+	*/
+extern	"C"	void*	TMM_declare_var_s(	const	char*	declaration)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->declare_var(	declaration));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_var_s()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	a	C	Language	interface	to	the	2	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	are	the	same	but	switched	in	order	and	the	return	value	is	the	same.
+	It's	here	because	I	caved	to	Alex's	whine	about	backwards	compatibility.
+
+	*/
+extern	"C"	void*	alloc_type(	int	e_elems,	const	char*	enh_type_spec)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->declare_var(	enh_type_spec,	e_elems));
+				}	else	{
+								Trick::MemoryManager::emitError("alloc_type()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	6	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	and	return	value	are	the	same	except	that	std::string	args	are	replaced	with	const	char	*	args.
+	*/
+extern	"C"	void*	TMM_declare_operatornew_var(	const	char	*	class_name,	unsigned	int	alloc_size	,	unsigned	int	element_size	)	{
+				if	(trick_MM	!=	NULL)	{
+								return	trick_MM->declare_operatornew_var(	std::string(class_name),	alloc_size,	element_size	)	;
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_var()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(void*)NULL	;
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	7	argument	version	of	Trick::MemoryManager::declare_ext_var.
+	The	arguments	and	return	value	are	the	same	except	that	std::string	args	are	replaced	with	const	char	*	args.
+	*/
+extern	"C"	void*	TMM_declare_ext_var(	void*	addr,	TRICK_TYPE	type,	const	char*class_name,	int	n_stars,	const	char*	var_name,	int	n_cdims,	int	*cdims)	{
+				if	(trick_MM	!=	NULL)	{
+								std::string	sclass_name	=	class_name;
+								std::string	svar_name	=	var_name;
+								return	(	trick_MM->declare_extern_var(	addr,	type,	sclass_name,	n_stars,	svar_name,	n_cdims,	cdims));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_ext_var()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	4	argument	version	of	Trick::MemoryManager::declare_var.
+	The	arguments	and	return	value	are	the	same.
+	*/
+extern	"C"	void*	TMM_declare_ext_var_1d(	void*	addr,	const	char*	elem_decl,	int	n_elems)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->declare_extern_var(	addr,	elem_decl,	n_elems));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_ext_var_1d()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	the	1	argument	version	of	Trick::MemoryManager::declare_extern_var.
+	The	arguments	and	return	value	are	the	same.
+	*/
+extern	"C"	void*	TMM_declare_ext_var_s(	void*	addr,	const	char*	declaration)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->declare_extern_var(addr,	declaration));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_declare_ext_var_s()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language,	"identify	the	array	by	address",	version	of	Trick::MemoryManager::resize_array.
+	Resize	each	of	the	dimensions	of	the	array	at	the	given	address.	n_cdims	specifies	the	number
+	of	dimensions	and	must	match	those	of	the	array	being	resized.	cdims	specifies	the	new	sizes
+	for	each	of	the	dimensions.
+	*/
+void*	TMM_resize_array_a(void	*address,	int	n_cdims,	int	*cdims){
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->resize_array(address,	n_cdims,	cdims));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_resize_array_a()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language,	"identify	the	array	by	name",	version	of	Trick::MemoryManager::resize_array.
+	Resize	each	of	the	dimensions	of	the	array	whose	name	is	given.	n_cdims	specifies	the	number
+	of	dimensions	and	must	match	those	of	the	array	being	resized.	cdims	specifies	the	new	sizes
+	for	each	of	the	dimensions.
+	*/
+void*	TMM_resize_array_n(const	char	*name,	int	n_cdims,	int	*cdims){
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->resize_array(name,	n_cdims,	cdims));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_resize_array_n()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::resize_array(address,	num).
+	Resize	the	one	dimensional	array	at	the	given	address.
+	*/
+void*	TMM_resize_array_1d_a(void*	address,	int	num){
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->resize_array(address,	num));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_resize_array_1d_a()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::resize_array(name,	num).
+	Resize	the	one	dimensional	array	whose	name	is	given.
+	*/
+void*	TMM_resize_array_1d_n(const	char	*name,	int	num){
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->resize_array(name,	num));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_resize_array_1d_n()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::mm_strdup(	str).
+	Duplicate	and	catalog	the	given	character	string.
+	*/
+extern	"C"	char*	TMM_strdup(char	*str)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->mm_strdup(	str));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_strdup	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return(	(char*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::var_exists().
+	Test	whether	the	given	variable_name	is	in	use.
+	*/
+extern	"C"	int	TMM_var_exists(	const	char*	var_name)	{
+				if	(trick_MM	!=	NULL)	{
+								std::string	svar_name	=	var_name;
+								return	(	trick_MM->var_exists(	svar_name));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_var_exists()	called	before	MemoryManager	instantiation.\n")	;
+								return	(0);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::var_exists().
+	Test	whether	the	given	address	is	in	Trick	managed	memory.		C	interface	to	Trick::MemoryManager::is_alloced(	addr).
+	*/
+extern	"C"	int	TMM_is_alloced(char	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->is_alloced(	addr));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_is_alloced()	called	before	MemoryManager	instantiation.\n")	;
+								return	(0);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::set_debug_level(level).
+	Set	the	verbosity	of	MemoryManager	debug	messages.		C	interface	to	Trick::MemoryManager::set_debug_level(	level).
+	*/
+extern	"C"	void	TMM_set_debug_level(int	level)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->set_debug_level(	level);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_set_debug_level()	called	before	MemoryManager	instantiation.\n")	;
+				}
+}
+
+/**
+	This	is	the	C	Language	version	of	Trick::MemoryManager::set_reduced_checkpoint(	yesno).
+	@relates	Trick::MemoryManager
+	*/
+extern	"C"	void	TMM_reduced_checkpoint(int	yesno)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->set_reduced_checkpoint(	yesno!=0	);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_reduced_checkpoint()	called	before	MemoryManager	instantiation.\n")	;
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::set_hexfloat_checkpoint(	yesno).
+	*/
+extern	"C"	void	TMM_hexfloat_checkpoint(int	yesno)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->set_hexfloat_checkpoint(	yesno!=0	);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_hexfloat_checkpoint()	called	before	MemoryManager	instantiation.\n")	;
+				}
+}
+
+
+
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::clear_var(	addr).
+	*/
+extern	"C"	void	TMM_clear_var_a(void	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->clear_var(	addr);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_clear_var_a()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::clear_var(	name).
+	*/
+extern	"C"	void	TMM_clear_var_n(	const	char*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->clear_var(	name);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_clear_var_n()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::delete_var(	addr).
+	*/
+extern	"C"	void	TMM_delete_var_a(void	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->delete_var(	addr);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_delete_var_a()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
 /**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::delete_var( name).
- */
-extern "C" void TMM_delete_var_n( const char* name) {
-    if (trick_MM != NULL) {
-        trick_MM->delete_var( name);
-    } else {
-        Trick::MemoryManager::emitError("TMM_delete_var_n() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::delete_var(	name).
+	*/
+extern	"C"	void	TMM_delete_var_n(	const	char*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->delete_var(	name);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_delete_var_n()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
 /**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::delete_extern_var( addr).
- */
-extern "C" void TMM_delete_extern_var_a(void *addr) {
-    if (trick_MM != NULL) {
-        trick_MM->delete_extern_var( addr);
-    } else {
-        Trick::MemoryManager::emitError("TMM_delete_extern_var_a() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::delete_extern_var(	addr).
+	*/
+extern	"C"	void	TMM_delete_extern_var_a(void	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->delete_extern_var(	addr);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_delete_extern_var_a()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
 /**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::delete_extern_var( name).
- */
-extern "C" void TMM_delete_extern_var_n( const char* name) {
-    if (trick_MM != NULL) {
-        trick_MM->delete_extern_var( name);
-    } else {
-        Trick::MemoryManager::emitError("TMM_delete_extern_var_n() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::delete_extern_var(	name).
+	*/
+extern	"C"	void	TMM_delete_extern_var_n(	const	char*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->delete_extern_var(	name);
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_delete_extern_var_n()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
 /**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::write_checkpoint( filename).
- */
-extern "C" void TMM_write_checkpoint(const char* filename) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->write_checkpoint( filename));
-    } else {
-        Trick::MemoryManager::emitError("TMM_write_checkpoint_fn() called before MemoryManager instantiation.\n") ;
-        return;
-    }
-}
-
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::write_checkpoint(	filename).
+	*/
+extern	"C"	void	TMM_write_checkpoint(const	char*	filename)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->write_checkpoint(	filename));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_write_checkpoint_fn()	called	before	MemoryManager	instantiation.\n")	;
+								return;
+				}
+}
+
 /**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::read_checkpoint( filename).
- */
-extern "C" int TMM_read_checkpoint(const char* filename) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->read_checkpoint( filename ));
-    } else {
-        Trick::MemoryManager::emitError("TMM_read_checkpoint() called before MemoryManager instantiation.\n") ;
-        return(1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::read_checkpoint_from_string( str).
- */
-extern "C" int TMM_read_checkpoint_from_string(const char* str) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->read_checkpoint_from_string( str ));
-    } else {
-        Trick::MemoryManager::emitError("TMM_read_checkpoint_from_string() called before MemoryManager instantiation.\n") ;
-        return(1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::init_from_checkpoint( filename).
- */
-extern "C" int TMM_init_from_checkpoint(const char* filename) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->init_from_checkpoint( filename ));
-    } else {
-        Trick::MemoryManager::emitError("TMM_init_from_checkpoint() called before MemoryManager instantiation.\n") ;
-        return(1);
-    }
-}
-
-extern "C" int TMM_set_stl_restore (int on_off) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->set_restore_stls_default( (bool) on_off ));
-    } else {
-        Trick::MemoryManager::emitError("TMM_set_stl_restore() called before MemoryManager instantiation.\n") ;
-        return(1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::add_shared_library_symbols( filename).
- */
-extern "C" int TMM_add_shared_library_symbols(const char* filename) {
-    if (trick_MM != NULL) {
-        return ( trick_MM->add_shared_library_symbols( filename));
-    } else {
-        Trick::MemoryManager::emitError("TMM_add_shared_library_symbols() called before MemoryManager instantiation.\n") ;
-        return(1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::add_var( type, stype, var_declare, units).
- */
-extern "C" void* add_var( TRICK_TYPE type, const char* stype, VAR_DECLARE* var_declare, char* units) {
-    if (trick_MM != NULL) {
-        return( trick_MM->add_var(type, stype, var_declare, units ));
-    } else {
-        Trick::MemoryManager::emitError("add_var() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ((void*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::add_vars( type, stype, var_list, units).
- */
-extern "C" int add_vars( TRICK_TYPE type, const char* stype, VAR_LIST* var_list, char* units) {
-    if (trick_MM != NULL) {
-        return( trick_MM->add_vars(type, stype, var_list, units ));
-    } else {
-        Trick::MemoryManager::emitError("add_vars() called before MemoryManager instantiation.\n") ;
-        return (1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager::ref_allocate
- This is the C Language version of Trick::MemoryManager::ref_allocate( R, num).
- */
-extern "C" int ref_allocate(REF2 *R, int num) {
-    if (trick_MM != NULL) {
-        return( trick_MM->ref_allocate( R, num));
-    } else {
-        Trick::MemoryManager::emitError("ref_allocate() called before MemoryManager instantiation.\n") ;
-        return (1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::ref_attributes( name).
- */
-extern "C" REF2* ref_attributes(const char* name) {
-    if (trick_MM != NULL) {
-        return( trick_MM->ref_attributes( name));
-    } else {
-        Trick::MemoryManager::emitError("ref_attributes() called before MemoryManager instantiation. Returning NULL.\n") ;
-        return ( (REF2*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::ref_assignment( REF2*, V_TREE*).
- */
-extern "C" int ref_assignment(REF2* R, V_TREE* V) {
-    if (trick_MM != NULL) {
-        return( trick_MM->ref_assignment( R, V));
-    } else {
-        Trick::MemoryManager::emitError("ref_assignment() called before MemoryManager instantiation.\n") ;
-        return (1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::ref_var( REF2*, name).
- */
-extern "C" int ref_var(REF2 *R, char* name) {
-    if (trick_MM != NULL) {
-        return( trick_MM->ref_var( R, name));
-    } else {
-        Trick::MemoryManager::emitError("ref_var() called before MemoryManager instantiation.\n") ;
-        return (1);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::ref_var( REF2*, name).
- */
-extern "C" int get_size(void *addr) {
-    if (trick_MM != NULL) {
-        return( trick_MM->get_size( addr));
-    } else {
-        Trick::MemoryManager::emitError("get_size() called before MemoryManager instantiation.\n") ;
-        return (0);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::get_truncated_size( addr).
- */
-extern "C" int get_truncated_size(void *addr) {
-    if (trick_MM != NULL) {
-        return( trick_MM->get_truncated_size( addr));
-    } else {
-        Trick::MemoryManager::emitError("get_truncated_size() called before MemoryManager instantiation.\n") ;
-        return (0);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::get_truncated_size( ptr).
- */
-extern "C" int io_get_fixed_truncated_size(char *ptr __attribute__ ((unused)),
-                                           ATTRIBUTES * A __attribute__ ((unused)),
-                                           char *str __attribute__ ((unused)),
-                                           int dims __attribute__ ((unused)),
-                                           ATTRIBUTES * left_type __attribute__ ((unused))) {
-    Trick::MemoryManager::emitError("io_get_fixed_truncated_size() is not implemented yet.\n") ;
-    return(0);
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::get_alloc_info_of( addr).
- */
-extern "C" ALLOC_INFO* get_alloc_info_of(void * addr) {
-    if (trick_MM != NULL) {
-        return( trick_MM->get_alloc_info_of( addr));
-    } else {
-        Trick::MemoryManager::emitError("get_alloc_info_of() called before MemoryManager instantiation.\n") ;
-        return ( (ALLOC_INFO*)NULL);
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::get_alloc_info_at( addr).
- */
-extern "C" ALLOC_INFO* get_alloc_info_at(void * addr) {
-    if (trick_MM != NULL) {
-        return( trick_MM->get_alloc_info_at( addr));
-    } else {
-        Trick::MemoryManager::emitError("get_alloc_info_at() called before MemoryManager instantiation.\n") ;
-        return ( (ALLOC_INFO*)NULL);
-    }
-}
-
-extern "C" int set_alloc_name_at(void * addr, const char * name ) {
-    if (trick_MM != NULL) {
-        return( trick_MM->set_name_at(addr, name));
-    } else {
-        Trick::MemoryManager::emitError("get_alloc_info_at() called before MemoryManager instantiation.\n") ;
-        return ( -1 );
-    }
-}
-
-/**
- @relates Trick::MemoryManager
- This is the C Language version of Trick::MemoryManager::get_enumerated(const char* name, V_DATA* v_data).
- */
-extern "C" int get_enumerated(const char* name, V_DATA* v_data) {
-    if (trick_MM != NULL) {
-        return( trick_MM->get_enumerated(name, v_data ));
-    } else {
-        Trick::MemoryManager::emitError("get_enumerated() called before MemoryManager instantiation.\n") ;
-        return 1 ;
-    }
-}
-
-extern "C" void TMM_add_checkpoint_alloc_dependency(const char * name) {
-    if (trick_MM != NULL) {
-        trick_MM->add_checkpoint_alloc_dependency(name) ;
-    }
-    return ;
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::read_checkpoint(	filename).
+	*/
+extern	"C"	int	TMM_read_checkpoint(const	char*	filename)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->read_checkpoint(	filename	));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_read_checkpoint()	called	before	MemoryManager	instantiation.\n")	;
+								return(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::read_checkpoint_from_string(	str).
+	*/
+extern	"C"	int	TMM_read_checkpoint_from_string(const	char*	str)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->read_checkpoint_from_string(	str	));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_read_checkpoint_from_string()	called	before	MemoryManager	instantiation.\n")	;
+								return(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::init_from_checkpoint(	filename).
+	*/
+extern	"C"	int	TMM_init_from_checkpoint(const	char*	filename)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->init_from_checkpoint(	filename	));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_init_from_checkpoint()	called	before	MemoryManager	instantiation.\n")	;
+								return(1);
+				}
+}
+
+extern	"C"	int	TMM_set_stl_restore	(int	on_off)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->set_restore_stls_default(	(bool)	on_off	));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_set_stl_restore()	called	before	MemoryManager	instantiation.\n")	;
+								return(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::add_shared_library_symbols(	filename).
+	*/
+extern	"C"	int	TMM_add_shared_library_symbols(const	char*	filename)	{
+				if	(trick_MM	!=	NULL)	{
+								return	(	trick_MM->add_shared_library_symbols(	filename));
+				}	else	{
+								Trick::MemoryManager::emitError("TMM_add_shared_library_symbols()	called	before	MemoryManager	instantiation.\n")	;
+								return(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::add_var(	type,	stype,	var_declare,	units).
+	*/
+extern	"C"	void*	add_var(	TRICK_TYPE	type,	const	char*	stype,	VAR_DECLARE*	var_declare,	char*	units)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->add_var(type,	stype,	var_declare,	units	));
+				}	else	{
+								Trick::MemoryManager::emitError("add_var()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	((void*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::add_vars(	type,	stype,	var_list,	units).
+	*/
+extern	"C"	int	add_vars(	TRICK_TYPE	type,	const	char*	stype,	VAR_LIST*	var_list,	char*	units)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->add_vars(type,	stype,	var_list,	units	));
+				}	else	{
+								Trick::MemoryManager::emitError("add_vars()	called	before	MemoryManager	instantiation.\n")	;
+								return	(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager::ref_allocate
+	This	is	the	C	Language	version	of	Trick::MemoryManager::ref_allocate(	R,	num).
+	*/
+extern	"C"	int	ref_allocate(REF2	*R,	int	num)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->ref_allocate(	R,	num));
+				}	else	{
+								Trick::MemoryManager::emitError("ref_allocate()	called	before	MemoryManager	instantiation.\n")	;
+								return	(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::ref_attributes(	name).
+	*/
+extern	"C"	REF2*	ref_attributes(const	char*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->ref_attributes(	name));
+				}	else	{
+								Trick::MemoryManager::emitError("ref_attributes()	called	before	MemoryManager	instantiation.	Returning	NULL.\n")	;
+								return	(	(REF2*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::ref_assignment(	REF2*,	V_TREE*).
+	*/
+extern	"C"	int	ref_assignment(REF2*	R,	V_TREE*	V)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->ref_assignment(	R,	V));
+				}	else	{
+								Trick::MemoryManager::emitError("ref_assignment()	called	before	MemoryManager	instantiation.\n")	;
+								return	(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::ref_var(	REF2*,	name).
+	*/
+extern	"C"	int	ref_var(REF2	*R,	char*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->ref_var(	R,	name));
+				}	else	{
+								Trick::MemoryManager::emitError("ref_var()	called	before	MemoryManager	instantiation.\n")	;
+								return	(1);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::ref_var(	REF2*,	name).
+	*/
+extern	"C"	int	get_size(void	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->get_size(	addr));
+				}	else	{
+								Trick::MemoryManager::emitError("get_size()	called	before	MemoryManager	instantiation.\n")	;
+								return	(0);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::get_truncated_size(	addr).
+	*/
+extern	"C"	int	get_truncated_size(void	*addr)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->get_truncated_size(	addr));
+				}	else	{
+								Trick::MemoryManager::emitError("get_truncated_size()	called	before	MemoryManager	instantiation.\n")	;
+								return	(0);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::get_truncated_size(	ptr).
+	*/
+extern	"C"	int	io_get_fixed_truncated_size(char	*ptr	__attribute__	((unused)),
+																																											ATTRIBUTES	*	A	__attribute__	((unused)),
+																																											char	*str	__attribute__	((unused)),
+																																											int	dims	__attribute__	((unused)),
+																																											ATTRIBUTES	*	left_type	__attribute__	((unused)))	{
+				Trick::MemoryManager::emitError("io_get_fixed_truncated_size()	is	not	implemented	yet.\n")	;
+				return(0);
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::get_alloc_info_of(	addr).
+	*/
+extern	"C"	ALLOC_INFO*	get_alloc_info_of(void	*	addr)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->get_alloc_info_of(	addr));
+				}	else	{
+								Trick::MemoryManager::emitError("get_alloc_info_of()	called	before	MemoryManager	instantiation.\n")	;
+								return	(	(ALLOC_INFO*)NULL);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::get_alloc_info_at(	addr).
+	*/
+extern	"C"	ALLOC_INFO*	get_alloc_info_at(void	*	addr)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->get_alloc_info_at(	addr));
+				}	else	{
+								Trick::MemoryManager::emitError("get_alloc_info_at()	called	before	MemoryManager	instantiation.\n")	;
+								return	(	(ALLOC_INFO*)NULL);
+				}
+}
+
+extern	"C"	int	set_alloc_name_at(void	*	addr,	const	char	*	name	)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->set_name_at(addr,	name));
+				}	else	{
+								Trick::MemoryManager::emitError("get_alloc_info_at()	called	before	MemoryManager	instantiation.\n")	;
+								return	(	-1	);
+				}
+}
+
+/**
+	@relates	Trick::MemoryManager
+	This	is	the	C	Language	version	of	Trick::MemoryManager::get_enumerated(const	char*	name,	V_DATA*	v_data).
+	*/
+extern	"C"	int	get_enumerated(const	char*	name,	V_DATA*	v_data)	{
+				if	(trick_MM	!=	NULL)	{
+								return(	trick_MM->get_enumerated(name,	v_data	));
+				}	else	{
+								Trick::MemoryManager::emitError("get_enumerated()	called	before	MemoryManager	instantiation.\n")	;
+								return	1	;
+				}
+}
+
+extern	"C"	void	TMM_add_checkpoint_alloc_dependency(const	char	*	name)	{
+				if	(trick_MM	!=	NULL)	{
+								trick_MM->add_checkpoint_alloc_dependency(name)	;
+				}
+				return	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_JSON_Intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_JSON_Intf.cpp
index 77fa5ecd8..062c849f6 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_JSON_Intf.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_JSON_Intf.cpp
@@ -1,64 +1,64 @@
-#include <iostream>
-#include "trick/MemoryManager.hh"
+#include	<iostream>
+#include	"trick/MemoryManager.hh"
 
-void Trick::MemoryManager::write_JSON_alloc_info(std::ostream& s, ALLOC_INFO *alloc_info) {
-    s << "{\n";
-    if (!alloc_info->name) {
-        s << "\"name\":null,\n";
-    } else {
-        s << "\"name\":\"" << alloc_info->name << "\",\n";
-    }
-    s << "\"start\":\"" << alloc_info->start << "\",\n";
-    s << "\"end\":\"" << alloc_info->end << "\",\n";
-    s << "\"num\":\"" << alloc_info->num << "\",\n";
-    s << "\"size\":\"" << alloc_info->size << "\",\n";
-    s << "\"type\":\"" << trickTypeCharString(alloc_info->type, alloc_info->user_type_name) << "\",\n";
-    s << "\"stcl\":" ;
-    if (alloc_info->stcl == TRICK_LOCAL) {
-        s << "\"TRICK_LOCAL\",\n";
-    }
-    if (alloc_info->stcl == TRICK_EXTERN) {
-        s << "\"TRICK_EXTERN\",\n";
-    }
-    s << "\"language\":";
-    if (alloc_info->language == Language_C  ) {
-        s << "\"Language_C\",\n";
-    }
-    if (alloc_info->language == Language_CPP) {
-        s << "\"Language_CPP\",\n";
-    }
-    s << "\"index\": [" ;
-    for (int ii=0; ii<alloc_info->num_index; ii++) {
-        if (ii != 0) {
-            s << "," ;
-        } 
-        s << alloc_info->index[ii] ;
-    }
-    s << "]}" << std::endl;
+void	Trick::MemoryManager::write_JSON_alloc_info(std::ostream&	s,	ALLOC_INFO	*alloc_info)	{
+				s	<<	"{\n";
+				if	(!alloc_info->name)	{
+								s	<<	"\"name\":null,\n";
+				}	else	{
+								s	<<	"\"name\":\""	<<	alloc_info->name	<<	"\",\n";
+				}
+				s	<<	"\"start\":\""	<<	alloc_info->start	<<	"\",\n";
+				s	<<	"\"end\":\""	<<	alloc_info->end	<<	"\",\n";
+				s	<<	"\"num\":\""	<<	alloc_info->num	<<	"\",\n";
+				s	<<	"\"size\":\""	<<	alloc_info->size	<<	"\",\n";
+				s	<<	"\"type\":\""	<<	trickTypeCharString(alloc_info->type,	alloc_info->user_type_name)	<<	"\",\n";
+				s	<<	"\"stcl\":"	;
+				if	(alloc_info->stcl	==	TRICK_LOCAL)	{
+								s	<<	"\"TRICK_LOCAL\",\n";
+				}
+				if	(alloc_info->stcl	==	TRICK_EXTERN)	{
+								s	<<	"\"TRICK_EXTERN\",\n";
+				}
+				s	<<	"\"language\":";
+				if	(alloc_info->language	==	Language_C		)	{
+								s	<<	"\"Language_C\",\n";
+				}
+				if	(alloc_info->language	==	Language_CPP)	{
+								s	<<	"\"Language_CPP\",\n";
+				}
+				s	<<	"\"index\":	["	;
+				for	(int	ii=0;	ii<alloc_info->num_index;	ii++)	{
+								if	(ii	!=	0)	{
+												s	<<	","	;
+								}	
+								s	<<	alloc_info->index[ii]	;
+				}
+				s	<<	"]}"	<<	std::endl;
 }
 
 
-void Trick::MemoryManager::write_JSON_alloc_list(std::ostream& s, int chunk_start, int chunk_size) {
+void	Trick::MemoryManager::write_JSON_alloc_list(std::ostream&	s,	int	chunk_start,	int	chunk_size)	{
 
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
 
-    int size = alloc_info_map.size();
-    s << "{\n";
-    s << "\"alloc_total\":" << size << ",\n";
-    s << "\"chunk_size\":" << chunk_size << ",\n";
-    s << "\"chunk_start\":" << chunk_start << ",\n";
-    s << "\"alloc_list\":[\n";
-    pos = alloc_info_map.begin();
-    std::advance(pos, chunk_start);
+				int	size	=	alloc_info_map.size();
+				s	<<	"{\n";
+				s	<<	"\"alloc_total\":"	<<	size	<<	",\n";
+				s	<<	"\"chunk_size\":"	<<	chunk_size	<<	",\n";
+				s	<<	"\"chunk_start\":"	<<	chunk_start	<<	",\n";
+				s	<<	"\"alloc_list\":[\n";
+				pos	=	alloc_info_map.begin();
+				std::advance(pos,	chunk_start);
 
-    for (int count = 0; count < chunk_size && pos!=alloc_info_map.end() ; pos++, count++) {
-        alloc_info = pos->second;
-        if (count != 0) {
-            s << ",\n";
-        } 
-        write_JSON_alloc_info(s, alloc_info);
-    }
-    s << "]}" << std::endl;
+				for	(int	count	=	0;	count	<	chunk_size	&&	pos!=alloc_info_map.end()	;	pos++,	count++)	{
+								alloc_info	=	pos->second;
+								if	(count	!=	0)	{
+												s	<<	",\n";
+								}	
+								write_JSON_alloc_info(s,	alloc_info);
+				}
+				s	<<	"]}"	<<	std::endl;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
index 14692ca71..a2ea9a28b 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
@@ -1,150 +1,150 @@
-#include <iostream>
-#include <sstream>
-#include <algorithm>
-#include <dlfcn.h>
+#include	<iostream>
+#include	<sstream>
+#include	<algorithm>
+#include	<dlfcn.h>
 
-#ifdef __GNUC__
-#include <cxxabi.h>
+#ifdef	__GNUC__
+#include	<cxxabi.h>
 #endif
 
-#include "trick/SimObject.hh"
-#include "trick/MemoryManager.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/MemoryManager.hh"
 
 /**
- *
- */
-int Trick::MemoryManager::add_attr_info( const std::string & user_type_string , ATTRIBUTES * attr , const char * file_name , unsigned int line_num ) {
-
-    std::string user_type_name ;
-    std::string sub_attr_name ;
-    std::string enum_attr_name ;
-    std::string sub_attr_init_name ;
-    std::string size_func_name ;
-    size_t spos ;
-    ATTRIBUTES* sub_attr = NULL ;
-    ENUM_ATTR* enum_attr = NULL ;
-    void (*init_sub_attr)(void) = NULL ;
-    size_t (*size_func)(void) = NULL ;
-    unsigned int ii ;
-    std::set<std::string>::iterator it ;
-
-    /** @par Design Details: */
-
-    user_type_name = user_type_string ;
-
-    // Check if the type is a primitive type.  If so, we don't need to continue
-    it = primitive_types.find(user_type_string) ;
-    if ( it != primitive_types.end() ) {
-        return 0 ;
-    }
-
-    // The user type name may start as const Foo<int>::Bar[4].  We need to convert that to Foo_int___Bar
-    // remove const from the typename if it exists
-    spos = user_type_name.find("const ") ;
-    if ( spos != std::string::npos ) {
-        user_type_name.erase( spos , spos + 6) ;
-    }
-    // remove any brackets
+	*
+	*/
+int	Trick::MemoryManager::add_attr_info(	const	std::string	&	user_type_string	,	ATTRIBUTES	*	attr	,	const	char	*	file_name	,	unsigned	int	line_num	)	{
+
+				std::string	user_type_name	;
+				std::string	sub_attr_name	;
+				std::string	enum_attr_name	;
+				std::string	sub_attr_init_name	;
+				std::string	size_func_name	;
+				size_t	spos	;
+				ATTRIBUTES*	sub_attr	=	NULL	;
+				ENUM_ATTR*	enum_attr	=	NULL	;
+				void	(*init_sub_attr)(void)	=	NULL	;
+				size_t	(*size_func)(void)	=	NULL	;
+				unsigned	int	ii	;
+				std::set<std::string>::iterator	it	;
+
+				/**	@par	Design	Details:	*/
+
+				user_type_name	=	user_type_string	;
+
+				//	Check	if	the	type	is	a	primitive	type.		If	so,	we	don't	need	to	continue
+				it	=	primitive_types.find(user_type_string)	;
+				if	(	it	!=	primitive_types.end()	)	{
+								return	0	;
+				}
+
+				//	The	user	type	name	may	start	as	const	Foo<int>::Bar[4].		We	need	to	convert	that	to	Foo_int___Bar
+				//	remove	const	from	the	typename	if	it	exists
+				spos	=	user_type_name.find("const	")	;
+				if	(	spos	!=	std::string::npos	)	{
+								user_type_name.erase(	spos	,	spos	+	6)	;
+				}
+				//	remove	any	brackets
 /*
-    spos = user_type_name.find("[") ;
-    if ( spos != std::string::npos ) {
-        user_type_name.erase( spos ) ;
-    }
+				spos	=	user_type_name.find("[")	;
+				if	(	spos	!=	std::string::npos	)	{
+								user_type_name.erase(	spos	)	;
+				}
 */
-    // replace ":<>,*[]" with '_'
-    std::replace( user_type_name.begin(), user_type_name.end(), ':', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), '<', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), '>', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), ',', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), '*', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), '[', '_') ;
-    std::replace( user_type_name.begin(), user_type_name.end(), ']', '_') ;
-    // remove spaces
-    user_type_name.erase(std::remove_if(user_type_name.begin(), user_type_name.end(), (int(*)(int))std::isspace), user_type_name.end()) ;
-
-    // Attempt to find an io_src_sizeof function for the named user type.
-    size_func_name = "io_src_sizeof_" + user_type_name ;
-    for ( ii = 0 ; ii < dlhandles.size() && size_func == NULL ; ii++ ) {
-        size_func     = (size_t (*)(void))dlsym( dlhandles[ii] , size_func_name.c_str()) ;
-        if ( size_func != NULL ) {
-            attr->size = (*size_func)() ;
-        }
-    }
-
-    if ( size_func == NULL)  {
-        std::stringstream message;
-        message << "(" << file_name << ":" << line_num
-            << "): Couldn't find an io_src_sizeof_ function for type "
-            << user_type_string.c_str() << "[" << size_func_name.c_str() << "()].";
-        emitWarning(message.str());
-    }
-
-    // Attempt to find an attributes list for the named user type.
-    sub_attr_name = "attr" + user_type_name ;
-    for ( ii = 0 ; ii < dlhandles.size() && sub_attr == NULL ; ii++ ) {
-        sub_attr      = (ATTRIBUTES *)dlsym( dlhandles[ii] , sub_attr_name.c_str()) ;
-    }
-
-    if (sub_attr != NULL) {  // If attributes for the named type were found ...
-
-        // Set type and attr of the ATTRIBUTES structure that we're populating.
-        attr->type = TRICK_STRUCTURED ;
-        attr->attr = sub_attr;
-
-        // Attempt to find the initialization function for the attributes that we just found.
-        sub_attr_init_name = "init_attr" + user_type_name + "_c_intf" ;
-
-        for ( ii = 0 ; ii < dlhandles.size() && init_sub_attr == NULL ; ii++ ) {
-            init_sub_attr = (void (*)(void))dlsym( dlhandles[ii] , sub_attr_init_name.c_str()) ;
-        }
-
-        if ( init_sub_attr != NULL ) {     // If the initialization function was found,
-            (*init_sub_attr)() ;           // then call it.
-        } else {
-            std::stringstream message;
-            message << " ATTRIBUTES init routine for type \""
-                    << user_type_name.c_str() << "\" not found.";
-            emitWarning(message.str());
-            return(1) ;
-        }
-
-    } else { // The named user type isn't a structure type. Maybe it's an enumeration type.
-
-        // Check to see whether the user type name is in the enumeration_map.
-        ENUMERATION_MAP::iterator curr_pos = enumeration_map.find( user_type_name);
-
-        // If it's not in the enumeration map then
-        if (curr_pos == enumeration_map.end()) {
-
-            // Construct the name of the enumeration attributes.
-            enum_attr_name = "enum" + user_type_name ;
-
-            // Attempt to find enumeration attributes for the named user type.
-            for ( ii = 0 ; ii < dlhandles.size() && enum_attr == NULL ; ii++ ) {
-                enum_attr = (ENUM_ATTR *)dlsym( dlhandles[ii] , enum_attr_name.c_str()) ;
-            }
-
-            // If enumeration attributes for the named type were found then
-            if ( enum_attr != NULL ) {
-
-                // Put them in the enumeration map.
-                enumeration_map[ user_type_name] = enum_attr;
-
-            // otherwise ...
-            } else {
-                std::stringstream message;
-                message << "ATTRIBUTES for type \"" << user_type_name.c_str() << "\" not found.";
-                emitWarning(message.str());
-                return(1) ;
-            }
-        } else {
-            enum_attr = curr_pos->second;
-        }
-
-        // Set the type information in the ATTRIBUTES structure that we are populating.
-        attr->type = TRICK_ENUMERATED ;
-        attr->attr = enum_attr;
-    }
-    return(0) ;
+				//	replace	":<>,*[]"	with	'_'
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	':',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	'<',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	'>',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	',',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	'*',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	'[',	'_')	;
+				std::replace(	user_type_name.begin(),	user_type_name.end(),	']',	'_')	;
+				//	remove	spaces
+				user_type_name.erase(std::remove_if(user_type_name.begin(),	user_type_name.end(),	(int(*)(int))std::isspace),	user_type_name.end())	;
+
+				//	Attempt	to	find	an	io_src_sizeof	function	for	the	named	user	type.
+				size_func_name	=	"io_src_sizeof_"	+	user_type_name	;
+				for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	size_func	==	NULL	;	ii++	)	{
+								size_func					=	(size_t	(*)(void))dlsym(	dlhandles[ii]	,	size_func_name.c_str())	;
+								if	(	size_func	!=	NULL	)	{
+												attr->size	=	(*size_func)()	;
+								}
+				}
+
+				if	(	size_func	==	NULL)		{
+								std::stringstream	message;
+								message	<<	"("	<<	file_name	<<	":"	<<	line_num
+												<<	"):	Couldn't	find	an	io_src_sizeof_	function	for	type	"
+												<<	user_type_string.c_str()	<<	"["	<<	size_func_name.c_str()	<<	"()].";
+								emitWarning(message.str());
+				}
+
+				//	Attempt	to	find	an	attributes	list	for	the	named	user	type.
+				sub_attr_name	=	"attr"	+	user_type_name	;
+				for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	sub_attr	==	NULL	;	ii++	)	{
+								sub_attr						=	(ATTRIBUTES	*)dlsym(	dlhandles[ii]	,	sub_attr_name.c_str())	;
+				}
+
+				if	(sub_attr	!=	NULL)	{		//	If	attributes	for	the	named	type	were	found	...
+
+								//	Set	type	and	attr	of	the	ATTRIBUTES	structure	that	we're	populating.
+								attr->type	=	TRICK_STRUCTURED	;
+								attr->attr	=	sub_attr;
+
+								//	Attempt	to	find	the	initialization	function	for	the	attributes	that	we	just	found.
+								sub_attr_init_name	=	"init_attr"	+	user_type_name	+	"_c_intf"	;
+
+								for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	init_sub_attr	==	NULL	;	ii++	)	{
+												init_sub_attr	=	(void	(*)(void))dlsym(	dlhandles[ii]	,	sub_attr_init_name.c_str())	;
+								}
+
+								if	(	init_sub_attr	!=	NULL	)	{					//	If	the	initialization	function	was	found,
+												(*init_sub_attr)()	;											//	then	call	it.
+								}	else	{
+												std::stringstream	message;
+												message	<<	"	ATTRIBUTES	init	routine	for	type	\""
+																				<<	user_type_name.c_str()	<<	"\"	not	found.";
+												emitWarning(message.str());
+												return(1)	;
+								}
+
+				}	else	{	//	The	named	user	type	isn't	a	structure	type.	Maybe	it's	an	enumeration	type.
+
+								//	Check	to	see	whether	the	user	type	name	is	in	the	enumeration_map.
+								ENUMERATION_MAP::iterator	curr_pos	=	enumeration_map.find(	user_type_name);
+
+								//	If	it's	not	in	the	enumeration	map	then
+								if	(curr_pos	==	enumeration_map.end())	{
+
+												//	Construct	the	name	of	the	enumeration	attributes.
+												enum_attr_name	=	"enum"	+	user_type_name	;
+
+												//	Attempt	to	find	enumeration	attributes	for	the	named	user	type.
+												for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	enum_attr	==	NULL	;	ii++	)	{
+																enum_attr	=	(ENUM_ATTR	*)dlsym(	dlhandles[ii]	,	enum_attr_name.c_str())	;
+												}
+
+												//	If	enumeration	attributes	for	the	named	type	were	found	then
+												if	(	enum_attr	!=	NULL	)	{
+
+																//	Put	them	in	the	enumeration	map.
+																enumeration_map[	user_type_name]	=	enum_attr;
+
+												//	otherwise	...
+												}	else	{
+																std::stringstream	message;
+																message	<<	"ATTRIBUTES	for	type	\""	<<	user_type_name.c_str()	<<	"\"	not	found.";
+																emitWarning(message.str());
+																return(1)	;
+												}
+								}	else	{
+												enum_attr	=	curr_pos->second;
+								}
+
+								//	Set	the	type	information	in	the	ATTRIBUTES	structure	that	we	are	populating.
+								attr->type	=	TRICK_ENUMERATED	;
+								attr->attr	=	enum_attr;
+				}
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_checkpoint_alloc_dependency.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_checkpoint_alloc_dependency.cpp
index e461b754c..f813caf54 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_checkpoint_alloc_dependency.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_checkpoint_alloc_dependency.cpp
@@ -1,11 +1,11 @@
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
-// MEMBER FUNCTION:
-void Trick::MemoryManager::add_checkpoint_alloc_dependency(const char *name) {
-    VARIABLE_MAP_ITER it = variable_map.find(name) ;
-    if ( it != variable_map.end() ) {
-        dependencies.push_back(it->second) ;
-        stl_dependencies.push_back(it->second) ;
-    }
+//	MEMBER	FUNCTION:
+void	Trick::MemoryManager::add_checkpoint_alloc_dependency(const	char	*name)	{
+				VARIABLE_MAP_ITER	it	=	variable_map.find(name)	;
+				if	(	it	!=	variable_map.end()	)	{
+								dependencies.push_back(it->second)	;
+								stl_dependencies.push_back(it->second)	;
+				}
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp
index 035e84242..db4000725 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_shared_library_symbols.cpp
@@ -1,30 +1,30 @@
 /*
-   PURPOSE: ( Add a shared library )
-   REFERENCE:
-   ASSUMPTIONS AND LIMITATIONS:
-   PROGRAMMERS: ( (Alex Lin) (NASA) (3/17/03) )
- */
+			PURPOSE:	(	Add	a	shared	library	)
+			REFERENCE:
+			ASSUMPTIONS	AND	LIMITATIONS:
+			PROGRAMMERS:	(	(Alex	Lin)	(NASA)	(3/17/03)	)
+	*/
 
-#include <iostream>
-#include <sstream>
-#include <dlfcn.h>
+#include	<iostream>
+#include	<sstream>
+#include	<dlfcn.h>
 
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
-/* This routine only returns the size if ptr points to the beginning of the allocation area */
-int Trick::MemoryManager::add_shared_library_symbols(const char * file_name) {
+/*	This	routine	only	returns	the	size	if	ptr	points	to	the	beginning	of	the	allocation	area	*/
+int	Trick::MemoryManager::add_shared_library_symbols(const	char	*	file_name)	{
 
-    void * new_handle ;
+				void	*	new_handle	;
 
-    new_handle = dlopen( file_name , RTLD_LAZY ) ;
-    if ( new_handle != NULL ) {
-        dlhandles.push_back(new_handle) ;
-    } else {
-        std::stringstream message;
-        message << "add_shared_library_symbols could not find library file: \"" << file_name << "\".";
-        emitError(message.str());
-    }
+				new_handle	=	dlopen(	file_name	,	RTLD_LAZY	)	;
+				if	(	new_handle	!=	NULL	)	{
+								dlhandles.push_back(new_handle)	;
+				}	else	{
+								std::stringstream	message;
+								message	<<	"add_shared_library_symbols	could	not	find	library	file:	\""	<<	file_name	<<	"\".";
+								emitError(message.str());
+				}
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp
index a2b522596..750070734 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_template_name_trans.cpp
@@ -1,11 +1,11 @@
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
 /**
- *
- */
-int Trick::MemoryManager::add_template_name_trans( std::string template_name , std::string attr_name ) {
+	*
+	*/
+int	Trick::MemoryManager::add_template_name_trans(	std::string	template_name	,	std::string	attr_name	)	{
 
-    template_name_map[template_name] = attr_name ;
-    return(0) ;
+				template_name_map[template_name]	=	attr_name	;
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp
index d377cdf22..b75f3f812 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_add_var.cpp
@@ -1,86 +1,86 @@
 
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <iostream>
-#include <sstream>
+#include	<string.h>
+#include	<ctype.h>
+#include	<stdlib.h>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/value.h"
-#include "trick/vval.h"
-#include "trick/MemoryManager.hh"
+#include	"trick/value.h"
+#include	"trick/vval.h"
+#include	"trick/MemoryManager.hh"
 
-void* Trick::MemoryManager::add_var( TRICK_TYPE   type,
-                                     const char*  class_name,
-                                     VAR_DECLARE* var_declare,
-                                     char*        units __attribute__ ((unused))) {
+void*	Trick::MemoryManager::add_var(	TRICK_TYPE			type,
+																																					const	char*		class_name,
+																																					VAR_DECLARE*	var_declare,
+																																					char*								units	__attribute__	((unused)))	{
 
-    int ii;
-    int n_stars;
-    int n_cdims;
-    int cdims[TRICK_MAX_INDEX];
-    VARIABLE_MAP::iterator variable_pos;
-    std::string class_name_string;
-    void* address;
+				int	ii;
+				int	n_stars;
+				int	n_cdims;
+				int	cdims[TRICK_MAX_INDEX];
+				VARIABLE_MAP::iterator	variable_pos;
+				std::string	class_name_string;
+				void*	address;
 
-    /** @par Design Details: */
+				/**	@par	Design	Details:	*/
 
-    class_name_string = "";
-    if (class_name) {
-        class_name_string = class_name;
-    }
+				class_name_string	=	"";
+				if	(class_name)	{
+								class_name_string	=	class_name;
+				}
 
-    /** @li Determine whether the name of the given variable declaration is already in use. */
-    pthread_mutex_lock(&mm_mutex);
-    variable_pos = variable_map.find( var_declare->name);
-    if (variable_pos != variable_map.end()) {
-        std::stringstream ss;
-        ss << "Variable \""<<  var_declare->name << "\" is already declared.\n";
-        emitError(ss.str());
-        pthread_mutex_unlock(&mm_mutex);
-        return ((void*)NULL);
-    }
-    pthread_mutex_unlock(&mm_mutex);
+				/**	@li	Determine	whether	the	name	of	the	given	variable	declaration	is	already	in	use.	*/
+				pthread_mutex_lock(&mm_mutex);
+				variable_pos	=	variable_map.find(	var_declare->name);
+				if	(variable_pos	!=	variable_map.end())	{
+								std::stringstream	ss;
+								ss	<<	"Variable	\""<<		var_declare->name	<<	"\"	is	already	declared.\n";
+								emitError(ss.str());
+								pthread_mutex_unlock(&mm_mutex);
+								return	((void*)NULL);
+				}
+				pthread_mutex_unlock(&mm_mutex);
 
-    /** @li From VAR_DECLARE, extract: 1) unconstrained dimensions
-        (i.e., n_stars) and 2) constrain dimensions (i.e., ndims, dims[]). */
-    n_stars = var_declare->num_pointers;
-    n_cdims = var_declare->dim_list->num_val ;
-    for ( ii=0 ; ii< n_cdims; ii++) {
-        cdims[ii] = vval_int( &var_declare->dim_list->v_data[ii]);
-    }
+				/**	@li	From	VAR_DECLARE,	extract:	1)	unconstrained	dimensions
+								(i.e.,	n_stars)	and	2)	constrain	dimensions	(i.e.,	ndims,	dims[]).	*/
+				n_stars	=	var_declare->num_pointers;
+				n_cdims	=	var_declare->dim_list->num_val	;
+				for	(	ii=0	;	ii<	n_cdims;	ii++)	{
+								cdims[ii]	=	vval_int(	&var_declare->dim_list->v_data[ii]);
+				}
 
-    /** @li Call declare_var to create a named-allocation. */
-    if ((address = declare_var( type, class_name_string, n_stars, var_declare->name, n_cdims, cdims)) == NULL) {
-        std::stringstream ss;
-        ss << "Declaration \"" ;
-        ss << make_decl_string( type, class_name_string, n_stars, var_declare->name, n_cdims, cdims);
-        ss << "\" failed.";
-        emitError( ss.str()) ;
-        return ((void*)NULL);
-    }
+				/**	@li	Call	declare_var	to	create	a	named-allocation.	*/
+				if	((address	=	declare_var(	type,	class_name_string,	n_stars,	var_declare->name,	n_cdims,	cdims))	==	NULL)	{
+								std::stringstream	ss;
+								ss	<<	"Declaration	\""	;
+								ss	<<	make_decl_string(	type,	class_name_string,	n_stars,	var_declare->name,	n_cdims,	cdims);
+								ss	<<	"\"	failed.";
+								emitError(	ss.str())	;
+								return	((void*)NULL);
+				}
 
-    /** @li Return the address of the allocation. */
-    return(address);
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return(address);
 }
 
 /**
- @par Detailed Description:
- */
-int Trick::MemoryManager::add_vars( TRICK_TYPE   type,
-                                    const char*  class_name,
-                                    VAR_LIST*    var_list,
-                                    char*        units) {
-    int i;
-    int ret = 0;
+	@par	Detailed	Description:
+	*/
+int	Trick::MemoryManager::add_vars(	TRICK_TYPE			type,
+																																				const	char*		class_name,
+																																				VAR_LIST*				var_list,
+																																				char*								units)	{
+				int	i;
+				int	ret	=	0;
 
-    /** @par Design: */
+				/**	@par	Design:	*/
 
-    /** @li For each of the declarators in the VAR_LIST call add_var(). */
-    for (i = 0; i < var_list->num_vars; i++) {
-        if( add_var(type, class_name, &var_list->var_declare[i], units) == NULL) {
-            ret = 1;
-        }
-    }
-    /** @li Return the error status. */
-    return (ret);
+				/**	@li	For	each	of	the	declarators	in	the	VAR_LIST	call	add_var().	*/
+				for	(i	=	0;	i	<	var_list->num_vars;	i++)	{
+								if(	add_var(type,	class_name,	&var_list->var_declare[i],	units)	==	NULL)	{
+												ret	=	1;
+								}
+				}
+				/**	@li	Return	the	error	status.	*/
+				return	(ret);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
index acb927aa5..1058c07d9 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_depends.cpp
@@ -1,240 +1,240 @@
-#include "trick/MemoryManager.hh"
-#include "trick/attributes.h"
-
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_alloc_deps_in_allocation(ALLOC_INFO* alloc_info ) {
-
-    ATTRIBUTES* reference_attr;
-
-    bool found = false;
-    int n_depends = dependencies.size();
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (alloc_info == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::get_alloc_deps_in_allocation called with alloc_info == NULL." << std::endl;
-        std::cout.flush();
-        return;
-    }
-
-    if (debug_level > 1) {
-        debug_write_alloc_info(alloc_info);
-    }
-
-    if (debug_level) {
-        std::cout << __FUNCTION__ << ": Allocation @" << (void*)alloc_info->start ;
-        if (alloc_info->name != NULL) {
-            std::cout << " is named \"" << alloc_info->name << "\"." << std::endl;
-        } else {
-            std::cout << " is anonymous." << std::endl;
-        }
-    }
-
-    std::cout.flush();
-
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        if (alloc_info == dependencies[ii]) {
-            found = true;
-            if (debug_level) {
-                std::cout << __FUNCTION__ << ": Dependencies of allocation @"<< (void*)alloc_info->start <<" are already known." << std::endl;
-            }
-            return;
-        }
-    }
-
-    if (!found) {
-
-        if (debug_level) {
-            std::cout << __FUNCTION__ <<  ": Begin scan of allocation @" << (void*)alloc_info->start << " for dependencies." << std::endl;
-        }
-
-        // The allocation is dependent upon itself.
-        dependencies.push_back(alloc_info);
-
-        reference_attr = make_reference_attr( alloc_info);
-
-        // Get the dependencies of the allocation
-        if (alloc_info->type == TRICK_STRUCTURED) {
-            if (reference_attr->num_index > 0) {
-                get_alloc_deps_in_arrayed_class( (char*)(alloc_info->start), reference_attr, 0, 0) ;
-            } else {
-                get_alloc_deps_in_class( (char*)(alloc_info->start), alloc_info->attr) ;
-            }
-        } else {
-            get_alloc_deps_in_intrinsic( alloc_info->start, reference_attr, 0, 0 );
-        }
-
-        if (debug_level) {
-            std::cout <<  __FUNCTION__ << ": End scan of allocation @" << (void*)alloc_info->start << "." << std::endl;
-        }
-
-        free_reference_attr( reference_attr);
-    }
+#include	"trick/MemoryManager.hh"
+#include	"trick/attributes.h"
+
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_alloc_deps_in_allocation(ALLOC_INFO*	alloc_info	)	{
+
+				ATTRIBUTES*	reference_attr;
+
+				bool	found	=	false;
+				int	n_depends	=	dependencies.size();
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(alloc_info	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::get_alloc_deps_in_allocation	called	with	alloc_info	==	NULL."	<<	std::endl;
+								std::cout.flush();
+								return;
+				}
+
+				if	(debug_level	>	1)	{
+								debug_write_alloc_info(alloc_info);
+				}
+
+				if	(debug_level)	{
+								std::cout	<<	__FUNCTION__	<<	":	Allocation	@"	<<	(void*)alloc_info->start	;
+								if	(alloc_info->name	!=	NULL)	{
+												std::cout	<<	"	is	named	\""	<<	alloc_info->name	<<	"\"."	<<	std::endl;
+								}	else	{
+												std::cout	<<	"	is	anonymous."	<<	std::endl;
+								}
+				}
+
+				std::cout.flush();
+
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								if	(alloc_info	==	dependencies[ii])	{
+												found	=	true;
+												if	(debug_level)	{
+																std::cout	<<	__FUNCTION__	<<	":	Dependencies	of	allocation	@"<<	(void*)alloc_info->start	<<"	are	already	known."	<<	std::endl;
+												}
+												return;
+								}
+				}
+
+				if	(!found)	{
+
+								if	(debug_level)	{
+												std::cout	<<	__FUNCTION__	<<		":	Begin	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"	for	dependencies."	<<	std::endl;
+								}
+
+								//	The	allocation	is	dependent	upon	itself.
+								dependencies.push_back(alloc_info);
+
+								reference_attr	=	make_reference_attr(	alloc_info);
+
+								//	Get	the	dependencies	of	the	allocation
+								if	(alloc_info->type	==	TRICK_STRUCTURED)	{
+												if	(reference_attr->num_index	>	0)	{
+																get_alloc_deps_in_arrayed_class(	(char*)(alloc_info->start),	reference_attr,	0,	0)	;
+												}	else	{
+																get_alloc_deps_in_class(	(char*)(alloc_info->start),	alloc_info->attr)	;
+												}
+								}	else	{
+												get_alloc_deps_in_intrinsic(	alloc_info->start,	reference_attr,	0,	0	);
+								}
+
+								if	(debug_level)	{
+												std::cout	<<		__FUNCTION__	<<	":	End	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"."	<<	std::endl;
+								}
+
+								free_reference_attr(	reference_attr);
+				}
 
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_alloc_deps_in_allocation( const char* var_name ) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_alloc_deps_in_allocation(	const	char*	var_name	)	{
 
-    VARIABLE_MAP::iterator pos;
-    ALLOC_INFO *alloc_info;
+				VARIABLE_MAP::iterator	pos;
+				ALLOC_INFO	*alloc_info;
 
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
 
-    pos = variable_map.find( var_name);
+				pos	=	variable_map.find(	var_name);
 
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
-        get_alloc_deps_in_allocation( alloc_info );
-    } else {
-        std::cerr << "ERROR: get_alloc_deps_in_allocation(\""<< var_name
-                  <<"\") failed because the given name is'nt known by the MemoryManager."
-                  << std::endl;
-        std::cerr.flush();
-    }
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
+								get_alloc_deps_in_allocation(	alloc_info	);
+				}	else	{
+								std::cerr	<<	"ERROR:	get_alloc_deps_in_allocation(\""<<	var_name
+																		<<"\")	failed	because	the	given	name	is'nt	known	by	the	MemoryManager."
+																		<<	std::endl;
+								std::cerr.flush();
+				}
 }
 
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_alloc_deps_in_class( char* address, ATTRIBUTES* attr) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::get_alloc_deps_in_class called with attr = NULL." << std::endl;
-        return;
-    }
-
-    for (ii = 0; attr[ii].name[0] != '\0'; ii++) {
-        if (currentCheckPointAgent->output_perm_check(&attr[ii])) {
-            char *elem_addr;
-            if (attr[ii].mods & 2) {
-                elem_addr = (char *) attr[ii].offset;
-            } else {
-                elem_addr = address + attr[ii].offset;
-            }
-
-            if (attr[ii].type == TRICK_STRUCTURED) {
-                if (attr[ii].num_index != 0) {
-                    get_alloc_deps_in_arrayed_class( elem_addr, &attr[ii], 0, 0);
-                } else {
-                    get_alloc_deps_in_class( elem_addr, (ATTRIBUTES*)(attr[ii].attr));
-                }
-            } else {
-                get_alloc_deps_in_intrinsic( elem_addr, &(attr[ii]), 0, 0);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_alloc_deps_in_class(	char*	address,	ATTRIBUTES*	attr)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::get_alloc_deps_in_class	called	with	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				for	(ii	=	0;	attr[ii].name[0]	!=	'\0';	ii++)	{
+								if	(currentCheckPointAgent->output_perm_check(&attr[ii]))	{
+												char	*elem_addr;
+												if	(attr[ii].mods	&	2)	{
+																elem_addr	=	(char	*)	attr[ii].offset;
+												}	else	{
+																elem_addr	=	address	+	attr[ii].offset;
+												}
+
+												if	(attr[ii].type	==	TRICK_STRUCTURED)	{
+																if	(attr[ii].num_index	!=	0)	{
+																				get_alloc_deps_in_arrayed_class(	elem_addr,	&attr[ii],	0,	0);
+																}	else	{
+																				get_alloc_deps_in_class(	elem_addr,	(ATTRIBUTES*)(attr[ii].attr));
+																}
+												}	else	{
+																get_alloc_deps_in_intrinsic(	elem_addr,	&(attr[ii]),	0,	0);
+												}
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_alloc_deps_in_arrayed_class(
-                                                char*       address,
-                                                ATTRIBUTES* attr,
-                                                int         curr_dim,
-                                                int         offset) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "Trick::MemoryManager::get_alloc_deps_in_arrayed_class: ERROR: attr = NULL." << std::endl;
-        return;
-    }
-
-    if (attr->index[curr_dim].size == 0) {
-
-        void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-        if (pointer != NULL) {
-            ALLOC_INFO *alloc_info;
-            alloc_info = get_alloc_info_of( pointer);
-            if (alloc_info != NULL) {
-
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                }
-                get_alloc_deps_in_allocation(alloc_info);
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                    std::cout.flush();
-                }
-            }
-        } else {
-            if (debug_level) {
-                std::cout << __FUNCTION__ << ": Allocation reference is NULL." << std::endl;
-                std::cout.flush();
-            }
-        }
-
-    } else {
-        int curr_dim_size;
-        curr_dim_size = attr->index[curr_dim].size;
-        for (ii = 0; ii < curr_dim_size; ii++) {
-            if (curr_dim < attr->num_index - 1) {
-                get_alloc_deps_in_arrayed_class( address, attr, curr_dim + 1, offset * curr_dim_size + ii);
-            } else {
-                char* elem_addr;
-                elem_addr = address + (offset * curr_dim + ii) * attr->size ;
-                get_alloc_deps_in_class( elem_addr, (ATTRIBUTES*)attr->attr );
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_alloc_deps_in_arrayed_class(
+																																																char*							address,
+																																																ATTRIBUTES*	attr,
+																																																int									curr_dim,
+																																																int									offset)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"Trick::MemoryManager::get_alloc_deps_in_arrayed_class:	ERROR:	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				if	(attr->index[curr_dim].size	==	0)	{
+
+								void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+								if	(pointer	!=	NULL)	{
+												ALLOC_INFO	*alloc_info;
+												alloc_info	=	get_alloc_info_of(	pointer);
+												if	(alloc_info	!=	NULL)	{
+
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																}
+																get_alloc_deps_in_allocation(alloc_info);
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+								}	else	{
+												if	(debug_level)	{
+																std::cout	<<	__FUNCTION__	<<	":	Allocation	reference	is	NULL."	<<	std::endl;
+																std::cout.flush();
+												}
+								}
+
+				}	else	{
+								int	curr_dim_size;
+								curr_dim_size	=	attr->index[curr_dim].size;
+								for	(ii	=	0;	ii	<	curr_dim_size;	ii++)	{
+												if	(curr_dim	<	attr->num_index	-	1)	{
+																get_alloc_deps_in_arrayed_class(	address,	attr,	curr_dim	+	1,	offset	*	curr_dim_size	+	ii);
+												}	else	{
+																char*	elem_addr;
+																elem_addr	=	address	+	(offset	*	curr_dim	+	ii)	*	attr->size	;
+																get_alloc_deps_in_class(	elem_addr,	(ATTRIBUTES*)attr->attr	);
+												}
+								}
+				}
 }
 
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_alloc_deps_in_intrinsic( void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    // If the variable that we are pointing to is an arrayed
-    if (curr_dim < attr->num_index) {
-
-        // If it is an unconstrained array (a pointer)
-        if (attr->index[curr_dim].size == 0) {
-
-            void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-            if (pointer != NULL) {
-                ALLOC_INFO *alloc_info;
-                alloc_info = get_alloc_info_of( pointer);
-                if (alloc_info != NULL) {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                    }
-                    get_alloc_deps_in_allocation(alloc_info);
-                } else {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                        std::cout.flush();
-                    }
-                }
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ <<  ": Allocation reference is NULL." << std::endl;
-                    std::cout.flush();
-                }
-            }
-
-        } else { // otherwise its a constrained array.
-            int ii;
-            for (ii=0 ; ii< attr->index[curr_dim].size ; ii++) {
-                get_alloc_deps_in_intrinsic( address, attr, curr_dim + 1, offset * attr->index[curr_dim].size + ii);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_alloc_deps_in_intrinsic(	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				//	If	the	variable	that	we	are	pointing	to	is	an	arrayed
+				if	(curr_dim	<	attr->num_index)	{
+
+								//	If	it	is	an	unconstrained	array	(a	pointer)
+								if	(attr->index[curr_dim].size	==	0)	{
+
+												void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+												if	(pointer	!=	NULL)	{
+																ALLOC_INFO	*alloc_info;
+																alloc_info	=	get_alloc_info_of(	pointer);
+																if	(alloc_info	!=	NULL)	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																				}
+																				get_alloc_deps_in_allocation(alloc_info);
+																}	else	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																								std::cout.flush();
+																				}
+																}
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<		":	Allocation	reference	is	NULL."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+
+								}	else	{	//	otherwise	its	a	constrained	array.
+												int	ii;
+												for	(ii=0	;	ii<	attr->index[curr_dim].size	;	ii++)	{
+																get_alloc_deps_in_intrinsic(	address,	attr,	curr_dim	+	1,	offset	*	attr->index[curr_dim].size	+	ii);
+												}
+								}
+				}
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp
index 03904c4f5..cc11fa922 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_alloc_info_map.cpp
@@ -1,52 +1,52 @@
-#include "trick/MemoryManager.hh"
-#include <sstream>
-#include <string.h>
+#include	"trick/MemoryManager.hh"
+#include	<sstream>
+#include	<string.h>
 
-ALLOC_INFO* Trick::MemoryManager::get_alloc_info_of( void* addr) {
+ALLOC_INFO*	Trick::MemoryManager::get_alloc_info_of(	void*	addr)	{
 
-    ALLOC_INFO_MAP::iterator pos = alloc_info_map.lower_bound(addr);
-    if (pos != alloc_info_map.end()) {
-        ALLOC_INFO* alloc_info = pos->second;
-        if (( addr >= alloc_info->start) && ( addr <= alloc_info->end)) {
-            return(alloc_info);
-        }
-    }
-    return NULL;
+				ALLOC_INFO_MAP::iterator	pos	=	alloc_info_map.lower_bound(addr);
+				if	(pos	!=	alloc_info_map.end())	{
+								ALLOC_INFO*	alloc_info	=	pos->second;
+								if	((	addr	>=	alloc_info->start)	&&	(	addr	<=	alloc_info->end))	{
+												return(alloc_info);
+								}
+				}
+				return	NULL;
 }
 
-ALLOC_INFO* Trick::MemoryManager::get_alloc_info_at( void* addr) {
+ALLOC_INFO*	Trick::MemoryManager::get_alloc_info_at(	void*	addr)	{
 
-    ALLOC_INFO_MAP::iterator pos = alloc_info_map.find( addr);
-    if (pos == alloc_info_map.end()) {
-        return NULL;
-    } else {
-        return( pos->second);
-    }
+				ALLOC_INFO_MAP::iterator	pos	=	alloc_info_map.find(	addr);
+				if	(pos	==	alloc_info_map.end())	{
+								return	NULL;
+				}	else	{
+								return(	pos->second);
+				}
 }
 
-int Trick::MemoryManager::set_name_at( void* addr , const char * name ) {
+int	Trick::MemoryManager::set_name_at(	void*	addr	,	const	char	*	name	)	{
 
-    int ret = 0 ;
+				int	ret	=	0	;
 
-    ALLOC_INFO_MAP::iterator pos = alloc_info_map.find( addr);
-    if (pos != alloc_info_map.end()) {
-        pos->second->name = strdup(name) ;
-        pthread_mutex_lock(&mm_mutex);
-        VARIABLE_MAP::iterator variable_pos;
-        variable_pos = variable_map.find(name);
-        if (variable_pos != variable_map.end()) {
-            std::stringstream ss;
-            ss << "Call to set_name_at() failed because a variable named \""
-               << name << "\" already exists.";
-            emitError(ss.str());
-            pthread_mutex_unlock(&mm_mutex);
-            ret = -1 ;
-        } else {
-            variable_map[name] = pos->second ;
-        }
-        pthread_mutex_unlock(&mm_mutex);
-    } else {
-        ret = -1 ;
-    }
-    return ret ;
+				ALLOC_INFO_MAP::iterator	pos	=	alloc_info_map.find(	addr);
+				if	(pos	!=	alloc_info_map.end())	{
+								pos->second->name	=	strdup(name)	;
+								pthread_mutex_lock(&mm_mutex);
+								VARIABLE_MAP::iterator	variable_pos;
+								variable_pos	=	variable_map.find(name);
+								if	(variable_pos	!=	variable_map.end())	{
+												std::stringstream	ss;
+												ss	<<	"Call	to	set_name_at()	failed	because	a	variable	named	\""
+															<<	name	<<	"\"	already	exists.";
+												emitError(ss.str());
+												pthread_mutex_unlock(&mm_mutex);
+												ret	=	-1	;
+								}	else	{
+												variable_map[name]	=	pos->second	;
+								}
+								pthread_mutex_unlock(&mm_mutex);
+				}	else	{
+								ret	=	-1	;
+				}
+				return	ret	;
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
index 94e7b7c6a..e56fb75dd 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp
@@ -1,322 +1,322 @@
-#include "trick/MemoryManager.hh"
-#include "trick/bitfield_proto.h"
-#include <sstream>
-
-void Trick::MemoryManager::clear_rvalue( void* base_address, ATTRIBUTES* attr, int curr_dim, int offset) {
-
-    char* final_address;
-    int remaining_dimensions = attr->num_index - curr_dim;
-
-    /** @par Detailed Description: */
-
-    /** @par
-        If we're referencing a singleton then calculate the address
-        from the (base) address, the offset and the data-type. Then
-        set the value at that address to nil.
-     */
-    if (remaining_dimensions ==0) {
-
-        switch (attr->type) {
-           case TRICK_CHARACTER :
-           case TRICK_UNSIGNED_CHARACTER :
-               final_address = (char*)base_address + offset * sizeof(char);
-               *(char*)final_address = '\0';
-               break;
-           case TRICK_BOOLEAN:
-               final_address = (char*)base_address + offset * sizeof(bool);
-               *(bool*)final_address = false;
-               break;
-           case TRICK_WCHAR :
-               final_address = (char*)base_address + offset * sizeof(wchar_t);
-               *(wchar_t*)final_address = 0;
-               break;
-           case TRICK_SHORT :
-           case TRICK_UNSIGNED_SHORT :
-               final_address = (char*)base_address + offset * sizeof(short);
-               *(short*)final_address = 0;
-               break;
-           case TRICK_INTEGER :
-           case TRICK_UNSIGNED_INTEGER :
-               final_address = (char*)base_address + offset * sizeof(int);
-               *(int*)final_address = 0;
-               break;
-           case TRICK_ENUMERATED :
-               if ((size_t)attr->size == sizeof(int)) {
-                   final_address = (char*)base_address + offset * sizeof(int);
-                   *(int*)final_address = 0;
-               } else if ((size_t)attr->size == sizeof(short)) {
-                   final_address = (char*)base_address + offset * sizeof(short);
-                   *(short*)final_address = 0;
-               } else {
-                   emitError("INTERNAL-ERROR - Unexpected size of ENUMERATION type.") ;
-               }
-               break;
-           case TRICK_LONG :
-           case TRICK_UNSIGNED_LONG :
-               final_address = (char*)base_address + offset * sizeof(long);
-               *(long*)final_address = 0;
-               break;
-           case TRICK_FLOAT :
-               final_address = (char*)base_address + offset * sizeof(float);
-               *(float*)final_address = 0.0;
-               break;
-           case TRICK_DOUBLE :
-               final_address = (char*)base_address + offset * sizeof(double);
-               *(double*)final_address = 0.0;
-               break;
-           case TRICK_LONG_LONG :
-           case TRICK_UNSIGNED_LONG_LONG :
-               final_address = (char*)base_address + offset * sizeof(long long);
-               *(long long*)final_address = 0;
-               break;
-           case TRICK_BITFIELD :
-           case TRICK_UNSIGNED_BITFIELD :
-               final_address = (char*)base_address + offset * (size_t)attr->size;
-               if (attr->size == sizeof(int)) {
-                   *(unsigned int*)final_address = insert_bitfield_any(
-                       *(unsigned int*)final_address, 0, attr->size, attr->index[0].start, attr->index[0].size);
-               } else if (attr->size == sizeof(short)) {
-                   *(unsigned short*)final_address = insert_bitfield_any(
-                       *(unsigned short*)final_address, 0, attr->size, attr->index[0].start, attr->index[0].size);
-               } else if (attr->size == sizeof(char)) {
-                   *(unsigned char*)final_address = insert_bitfield_any(
-                       *(unsigned char*)final_address, 0, attr->size, attr->index[0].start, attr->index[0].size);
-               } else {
-                   std::stringstream message;
-                   message << "INTERNAL - Unhandled bitfield struct size (" << attr->size << ") in bitfield assignment.";
-                   emitError(message.str());
-               }
-               break;
-           case TRICK_FILE_PTR :
-               final_address = (char*)base_address + offset * sizeof(void*);
-               *(void**)final_address = (void*)NULL;
-               break;
-           case TRICK_STRING :
-               final_address = (char*)base_address + offset * sizeof(std::string);
-               *(std::string*)final_address = "";
-               break;
-           case TRICK_STL :
-               final_address = (char*)base_address + offset * attr->size ;
-               if ( attr->clear_stl ) {
-                   (*attr->clear_stl)(final_address) ;
-               }
-               break;
-           default :
-               std::stringstream message;
-               message << "Unhandled Type (" << (int)attr->type << ").";
-               emitError(message.str());
-               break;
-        }
-
-    /** @par
-        If on the otherhand we are referencing an array, then we must consider two cases.
-     */
-    } else if (remaining_dimensions > 0) {
-       int extent;
-
-       extent = attr->index[curr_dim].size ;
-
-       /**  @par
-            If the array is unconstrained (i.e., it's a pointer) then we just need to check
-            whether the pointer is NULL.
-        */
-       if ( extent == 0) {
-           final_address = (char*)base_address;
-           *(void**)final_address = NULL;
-
-       /** @par
-           If the array (at this dimension) is constrained (i.e., it's a fixed array )
-           then it is nil if and only if each of it's sub-elements (at the next dimension,
-           which can themselves be arrays) are nil. So, for each of the elements in current
-           dimension, we recursively call is_nil_valued() on each of the sub-elements to
-           find out whether this array is nil valued and return the result.
-           */
-       } else {
-           int ii;
-
-           for (ii=0; ii < extent; ii++) {
-               clear_rvalue( base_address, attr, curr_dim + 1, offset * extent + ii);
-           }
-       }
-
-    } else {
-        std::stringstream message;
-        message << "This is bad. Remaining dimensions are negative!?.";
-        emitError(message.str());
-    }
+#include	"trick/MemoryManager.hh"
+#include	"trick/bitfield_proto.h"
+#include	<sstream>
+
+void	Trick::MemoryManager::clear_rvalue(	void*	base_address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
+
+				char*	final_address;
+				int	remaining_dimensions	=	attr->num_index	-	curr_dim;
+
+				/**	@par	Detailed	Description:	*/
+
+				/**	@par
+								If	we're	referencing	a	singleton	then	calculate	the	address
+								from	the	(base)	address,	the	offset	and	the	data-type.	Then
+								set	the	value	at	that	address	to	nil.
+					*/
+				if	(remaining_dimensions	==0)	{
+
+								switch	(attr->type)	{
+											case	TRICK_CHARACTER	:
+											case	TRICK_UNSIGNED_CHARACTER	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(char);
+															*(char*)final_address	=	'\0';
+															break;
+											case	TRICK_BOOLEAN:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(bool);
+															*(bool*)final_address	=	false;
+															break;
+											case	TRICK_WCHAR	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(wchar_t);
+															*(wchar_t*)final_address	=	0;
+															break;
+											case	TRICK_SHORT	:
+											case	TRICK_UNSIGNED_SHORT	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(short);
+															*(short*)final_address	=	0;
+															break;
+											case	TRICK_INTEGER	:
+											case	TRICK_UNSIGNED_INTEGER	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(int);
+															*(int*)final_address	=	0;
+															break;
+											case	TRICK_ENUMERATED	:
+															if	((size_t)attr->size	==	sizeof(int))	{
+																			final_address	=	(char*)base_address	+	offset	*	sizeof(int);
+																			*(int*)final_address	=	0;
+															}	else	if	((size_t)attr->size	==	sizeof(short))	{
+																			final_address	=	(char*)base_address	+	offset	*	sizeof(short);
+																			*(short*)final_address	=	0;
+															}	else	{
+																			emitError("INTERNAL-ERROR	-	Unexpected	size	of	ENUMERATION	type.")	;
+															}
+															break;
+											case	TRICK_LONG	:
+											case	TRICK_UNSIGNED_LONG	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(long);
+															*(long*)final_address	=	0;
+															break;
+											case	TRICK_FLOAT	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(float);
+															*(float*)final_address	=	0.0;
+															break;
+											case	TRICK_DOUBLE	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(double);
+															*(double*)final_address	=	0.0;
+															break;
+											case	TRICK_LONG_LONG	:
+											case	TRICK_UNSIGNED_LONG_LONG	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(long	long);
+															*(long	long*)final_address	=	0;
+															break;
+											case	TRICK_BITFIELD	:
+											case	TRICK_UNSIGNED_BITFIELD	:
+															final_address	=	(char*)base_address	+	offset	*	(size_t)attr->size;
+															if	(attr->size	==	sizeof(int))	{
+																			*(unsigned	int*)final_address	=	insert_bitfield_any(
+																							*(unsigned	int*)final_address,	0,	attr->size,	attr->index[0].start,	attr->index[0].size);
+															}	else	if	(attr->size	==	sizeof(short))	{
+																			*(unsigned	short*)final_address	=	insert_bitfield_any(
+																							*(unsigned	short*)final_address,	0,	attr->size,	attr->index[0].start,	attr->index[0].size);
+															}	else	if	(attr->size	==	sizeof(char))	{
+																			*(unsigned	char*)final_address	=	insert_bitfield_any(
+																							*(unsigned	char*)final_address,	0,	attr->size,	attr->index[0].start,	attr->index[0].size);
+															}	else	{
+																			std::stringstream	message;
+																			message	<<	"INTERNAL	-	Unhandled	bitfield	struct	size	("	<<	attr->size	<<	")	in	bitfield	assignment.";
+																			emitError(message.str());
+															}
+															break;
+											case	TRICK_FILE_PTR	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(void*);
+															*(void**)final_address	=	(void*)NULL;
+															break;
+											case	TRICK_STRING	:
+															final_address	=	(char*)base_address	+	offset	*	sizeof(std::string);
+															*(std::string*)final_address	=	"";
+															break;
+											case	TRICK_STL	:
+															final_address	=	(char*)base_address	+	offset	*	attr->size	;
+															if	(	attr->clear_stl	)	{
+																			(*attr->clear_stl)(final_address)	;
+															}
+															break;
+											default	:
+															std::stringstream	message;
+															message	<<	"Unhandled	Type	("	<<	(int)attr->type	<<	").";
+															emitError(message.str());
+															break;
+								}
+
+				/**	@par
+								If	on	the	otherhand	we	are	referencing	an	array,	then	we	must	consider	two	cases.
+					*/
+				}	else	if	(remaining_dimensions	>	0)	{
+							int	extent;
+
+							extent	=	attr->index[curr_dim].size	;
+
+							/**		@par
+												If	the	array	is	unconstrained	(i.e.,	it's	a	pointer)	then	we	just	need	to	check
+												whether	the	pointer	is	NULL.
+								*/
+							if	(	extent	==	0)	{
+											final_address	=	(char*)base_address;
+											*(void**)final_address	=	NULL;
+
+							/**	@par
+											If	the	array	(at	this	dimension)	is	constrained	(i.e.,	it's	a	fixed	array	)
+											then	it	is	nil	if	and	only	if	each	of	it's	sub-elements	(at	the	next	dimension,
+											which	can	themselves	be	arrays)	are	nil.	So,	for	each	of	the	elements	in	current
+											dimension,	we	recursively	call	is_nil_valued()	on	each	of	the	sub-elements	to
+											find	out	whether	this	array	is	nil	valued	and	return	the	result.
+											*/
+							}	else	{
+											int	ii;
+
+											for	(ii=0;	ii	<	extent;	ii++)	{
+															clear_rvalue(	base_address,	attr,	curr_dim	+	1,	offset	*	extent	+	ii);
+											}
+							}
+
+				}	else	{
+								std::stringstream	message;
+								message	<<	"This	is	bad.	Remaining	dimensions	are	negative!?.";
+								emitError(message.str());
+				}
 }
 
-void Trick::MemoryManager::clear_class( char *address, ATTRIBUTES * A) {
-
-    int jj;
-    char *element_addr;
-
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
-
-    for (jj = 0; A[jj].name[0] != '\0'; jj++) {
-        /*
-         * For all the parameters in this data structure...
-         */
-
-        if (currentCheckPointAgent->input_perm_check(&A[jj])) {
-
-            /**
-             Determine the address of the structure/class element. If the element is a
-             C++ static variable, then the element's ATTRIBUTES.offset contains the
-             it's address.  Otherwise the element's address is the structure/class
-             base address + the element's ATTRIBUTES.offset.
-             */
-            if (A[jj].mods & 2) {
-                element_addr = (char *) A[jj].offset;
-            } else {
-                element_addr = address + A[jj].offset;
-            }
-
-            if (A[jj].type == TRICK_STRUCTURED) {
-                if (A[jj].num_index != 0) {
-                    clear_arrayed_class( element_addr, &A[jj], 0, 0);
-                } else {
-                    if ( A[jj].attr != NULL ) {
-                        clear_class( element_addr, (ATTRIBUTES*)(A[jj].attr));
-                    }
-                }
-            } else {
-                clear_rvalue( element_addr, &(A[jj]), 0, 0);
-            }
-
-        }
-    }
-    return;
+void	Trick::MemoryManager::clear_class(	char	*address,	ATTRIBUTES	*	A)	{
+
+				int	jj;
+				char	*element_addr;
+
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
+
+				for	(jj	=	0;	A[jj].name[0]	!=	'\0';	jj++)	{
+								/*
+									*	For	all	the	parameters	in	this	data	structure...
+									*/
+
+								if	(currentCheckPointAgent->input_perm_check(&A[jj]))	{
+
+												/**
+													Determine	the	address	of	the	structure/class	element.	If	the	element	is	a
+													C++	static	variable,	then	the	element's	ATTRIBUTES.offset	contains	the
+													it's	address.		Otherwise	the	element's	address	is	the	structure/class
+													base	address	+	the	element's	ATTRIBUTES.offset.
+													*/
+												if	(A[jj].mods	&	2)	{
+																element_addr	=	(char	*)	A[jj].offset;
+												}	else	{
+																element_addr	=	address	+	A[jj].offset;
+												}
+
+												if	(A[jj].type	==	TRICK_STRUCTURED)	{
+																if	(A[jj].num_index	!=	0)	{
+																				clear_arrayed_class(	element_addr,	&A[jj],	0,	0);
+																}	else	{
+																				if	(	A[jj].attr	!=	NULL	)	{
+																								clear_class(	element_addr,	(ATTRIBUTES*)(A[jj].attr));
+																				}
+																}
+												}	else	{
+																clear_rvalue(	element_addr,	&(A[jj]),	0,	0);
+												}
+
+								}
+				}
+				return;
 }
 
-void Trick::MemoryManager::clear_arrayed_class( char* address, ATTRIBUTES* A, int curr_dim, int offset) {
+void	Trick::MemoryManager::clear_arrayed_class(	char*	address,	ATTRIBUTES*	A,	int	curr_dim,	int	offset)	{
 
-    int ii, extent;
+				int	ii,	extent;
 
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
 
-    /** If we are looking at the pointer then clear it..*/
-    if (A->index[curr_dim].size == 0) {
-        clear_rvalue( address, A, curr_dim, offset);
-    } else {
-        extent = A->index[curr_dim].size;
+				/**	If	we	are	looking	at	the	pointer	then	clear	it..*/
+				if	(A->index[curr_dim].size	==	0)	{
+								clear_rvalue(	address,	A,	curr_dim,	offset);
+				}	else	{
+								extent	=	A->index[curr_dim].size;
 
-        for (ii = 0; ii < extent; ii++) {
+								for	(ii	=	0;	ii	<	extent;	ii++)	{
 
-            if (curr_dim < A->num_index - 1) {
-                clear_arrayed_class( address, A, curr_dim + 1, offset * extent + ii);
-            } else {
-                char* element_addr;
-                element_addr = address + (offset * extent + ii) * A->size ;
-                clear_class( element_addr, (ATTRIBUTES*)A->attr);
-            }
-        }
+												if	(curr_dim	<	A->num_index	-	1)	{
+																clear_arrayed_class(	address,	A,	curr_dim	+	1,	offset	*	extent	+	ii);
+												}	else	{
+																char*	element_addr;
+																element_addr	=	address	+	(offset	*	extent	+	ii)	*	A->size	;
+																clear_class(	element_addr,	(ATTRIBUTES*)A->attr);
+												}
+								}
 
-    }
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::clear_var_critical_section( void* address) {
-    ATTRIBUTES* reference_attr;
-    ALLOC_INFO* alloc_info;
-    alloc_info = get_alloc_info_at( address);
-    if (alloc_info != NULL) {
-        reference_attr = make_reference_attr( alloc_info);
-        if (alloc_info->type == TRICK_STRUCTURED ) {
-            if (alloc_info->num_index != 0) {
-                clear_arrayed_class( (char*)(alloc_info->start), reference_attr, 0, 0) ;
-            } else {
-                clear_class( (char*)(alloc_info->start), alloc_info->attr) ;
-            }
-        } else {
-            clear_rvalue( alloc_info->start, reference_attr, 0, 0 );
-        }
-        free_reference_attr( reference_attr);
-    } else {
-        std::stringstream message;
-        message << "Cannot clear the variable at address " << address
-                << "because memory manager knows nothing about it." ;
-        emitError(message.str());
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::clear_var_critical_section(	void*	address)	{
+				ATTRIBUTES*	reference_attr;
+				ALLOC_INFO*	alloc_info;
+				alloc_info	=	get_alloc_info_at(	address);
+				if	(alloc_info	!=	NULL)	{
+								reference_attr	=	make_reference_attr(	alloc_info);
+								if	(alloc_info->type	==	TRICK_STRUCTURED	)	{
+												if	(alloc_info->num_index	!=	0)	{
+																clear_arrayed_class(	(char*)(alloc_info->start),	reference_attr,	0,	0)	;
+												}	else	{
+																clear_class(	(char*)(alloc_info->start),	alloc_info->attr)	;
+												}
+								}	else	{
+												clear_rvalue(	alloc_info->start,	reference_attr,	0,	0	);
+								}
+								free_reference_attr(	reference_attr);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Cannot	clear	the	variable	at	address	"	<<	address
+																<<	"because	memory	manager	knows	nothing	about	it."	;
+								emitError(message.str());
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::clear_var( void* address) {
-    pthread_mutex_lock(&mm_mutex);
-    clear_var_critical_section(address);
-    pthread_mutex_unlock(&mm_mutex);
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::clear_var(	void*	address)	{
+				pthread_mutex_lock(&mm_mutex);
+				clear_var_critical_section(address);
+				pthread_mutex_unlock(&mm_mutex);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::clear_var( const char* name) {
-
-    VARIABLE_MAP::iterator pos;
-    ALLOC_INFO *alloc_info;
-
-    pthread_mutex_lock(&mm_mutex);
-    pos = variable_map.find( name);
-
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
-        clear_var_critical_section( alloc_info->start);
-    } else {
-        std::stringstream message;
-        message << "Can't clear variable \"" << name
-                << "\" because it doesn't exist.";
-        emitError(message.str());
-    }
-    pthread_mutex_unlock(&mm_mutex);
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::clear_var(	const	char*	name)	{
+
+				VARIABLE_MAP::iterator	pos;
+				ALLOC_INFO	*alloc_info;
+
+				pthread_mutex_lock(&mm_mutex);
+				pos	=	variable_map.find(	name);
+
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
+								clear_var_critical_section(	alloc_info->start);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Can't	clear	variable	\""	<<	name
+																<<	"\"	because	it	doesn't	exist.";
+								emitError(message.str());
+				}
+				pthread_mutex_unlock(&mm_mutex);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::clear_all_vars() {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::clear_all_vars()	{
 
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
 
-    pthread_mutex_lock(&mm_mutex);
-    for (pos=alloc_info_map.begin() ; pos!=alloc_info_map.end() ; pos++ ) {
-        alloc_info = pos->second;
-        clear_var_critical_section( alloc_info->start);
-    }
-    pthread_mutex_unlock(&mm_mutex);
+				pthread_mutex_lock(&mm_mutex);
+				for	(pos=alloc_info_map.begin()	;	pos!=alloc_info_map.end()	;	pos++	)	{
+								alloc_info	=	pos->second;
+								clear_var_critical_section(	alloc_info->start);
+				}
+				pthread_mutex_unlock(&mm_mutex);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::reset_memory() {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::reset_memory()	{
 
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
-    std::vector<void*> deletion_list;
-    int ii, n_addrs;
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
+				std::vector<void*>	deletion_list;
+				int	ii,	n_addrs;
 
-    // Clear the deleted_addr_list at the start of reset memory. As delete_var() is called,
-    // and resetting_memory == true, the deleted address will be added to the deleted_addr_list.
-    resetting_memory = true;
-    deleted_addr_list.clear();
+				//	Clear	the	deleted_addr_list	at	the	start	of	reset	memory.	As	delete_var()	is	called,
+				//	and	resetting_memory	==	true,	the	deleted	address	will	be	added	to	the	deleted_addr_list.
+				resetting_memory	=	true;
+				deleted_addr_list.clear();
 
-    pthread_mutex_lock(&mm_mutex);
-    for (pos=alloc_info_map.begin() ; pos!=alloc_info_map.end() ; pos++ ) {
-        alloc_info = pos->second;
+				pthread_mutex_lock(&mm_mutex);
+				for	(pos=alloc_info_map.begin()	;	pos!=alloc_info_map.end()	;	pos++	)	{
+								alloc_info	=	pos->second;
 
-        if (alloc_info->stcl == TRICK_LOCAL) {
-            deletion_list.push_back( alloc_info->start);
-        }
-    }
-    pthread_mutex_unlock(&mm_mutex);
+								if	(alloc_info->stcl	==	TRICK_LOCAL)	{
+												deletion_list.push_back(	alloc_info->start);
+								}
+				}
+				pthread_mutex_unlock(&mm_mutex);
 
-    n_addrs = deletion_list.size();
-    for (ii = 0 ; ii < n_addrs ; ii ++) {
-        delete_var( deletion_list[ii]);
-    }
+				n_addrs	=	deletion_list.size();
+				for	(ii	=	0	;	ii	<	n_addrs	;	ii	++)	{
+								delete_var(	deletion_list[ii]);
+				}
 
-    resetting_memory = false;
-    deleted_addr_list.clear();
+				resetting_memory	=	false;
+				deleted_addr_list.clear();
 
-    // reset counter to 100mil.  This (hopefully) ensures all alloc'ed ids are after external variables.
-    alloc_info_map_counter = 100000000 ;
+				//	reset	counter	to	100mil.		This	(hopefully)	ensures	all	alloc'ed	ids	are	after	external	variables.
+				alloc_info_map_counter	=	100000000	;
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
index 6d4e9a2f9..075a02810 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_declare_var.cpp
@@ -1,419 +1,419 @@
-#include <stdlib.h>
-#include <iostream>
+#include	<stdlib.h>
+#include	<iostream>
 
-#include <sstream>
-#include <dlfcn.h>
-#include <string.h>
-#include "trick/MemoryManager.hh"
-#include "trick/ADefParseContext.hh"
+#include	<sstream>
+#include	<dlfcn.h>
+#include	<string.h>
+#include	"trick/MemoryManager.hh"
+#include	"trick/ADefParseContext.hh"
 
 /**
- @page examples_declare_var Examples of declare_var
-
- Allocation of an anonymous singleton of type double:
- \code double *D = (double*)trick_MM->declare_var("double"); \endcode
-
- Allocation of an anonymous array of 3 doubles:
- \code double *D = (double*)trick_MM->declare_var("double[3]"); \endcode
-
- Allocation of an anonymous array of 3 pointers to double:
- \code double **D = (double**)trick_MM->declare_var("double*[3]"); \endcode
-
- Allocation of an anonymous 2 dimensional array of doubles:
- \code double (*A)[3][4] = (double(*)[3][4])trick_MM->declare_var("double[3][4]"); \endcode
-
- Allocation of a named singleton of type double:
- \code double *D = (double*)trick_MM->declare_var("double mydbl"); \endcode
-
- Allocation of a named array of 3 Pointers to double:
- \code double **D = (double**)trick_MM->declare_var("double* mydbl[3]"); \endcode
-
- Allocation of a named singleton of user-defined type "BAR":
- \code BAR *D = (BAR*)trick_MM->declare_var("BAR mydbl"); \endcode
-
- Allocation of a named 2 dimensional array of user-defined type "BAR" in namespace "FOO":
- \code FOO::BAR (*A)[3][4] = (FOO::BAR(*)[3][4])trick_MM->declare_var("FOO::BAR my_array[3][4]"); \endcode
- */
-
-// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_var(TRICK_TYPE type,std::string user_type_name, int n_stars, std::string var_name, int n_cdims, int *cdims);
-void* Trick::MemoryManager::declare_var( TRICK_TYPE type,
-                                        std::string user_type_name,
-                                        int n_stars,
-                                        std::string var_name,
-                                        int n_cdims,
-                                        int *cdims) {
-    int size;
-    char* allocation_name;
-    int n_elems;
-    Language language;
-    TRICK_ALLOC_TYPE allocation_type;
-    void* address;
-    ATTRIBUTES* sub_attr;
-    ALLOC_INFO *new_alloc;
-    VARIABLE_MAP::iterator variable_pos;
-
-    if (debug_level > 1) {
-        std::cout << __FUNCTION__ << ": Parameters: " << std::endl;
-        std::cout << "           type = " << type << std::endl;
-        std::cout << "           user_type_name = " << user_type_name << std::endl;
-        std::cout << "           n_stars = " << n_stars << std::endl;
-        std::cout << "           var_name = " << var_name << std::endl;
-        std::cout << "           n_cdims = " << n_cdims << std::endl;
-    }
-
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
-
-    /** @li If this is a named allocation then determine whether the given variable name is already in use. */
-    if (var_name != "") {
-        pthread_mutex_lock(&mm_mutex);
-        variable_pos = variable_map.find( var_name);
-        if (variable_pos != variable_map.end()) {
-            std::stringstream message;
-            message << "Variable \""<< var_name <<"\" already declared.\n";
-            emitError(message.str());
-            pthread_mutex_unlock(&mm_mutex);
-            return ((void*)NULL);
-        }
-        pthread_mutex_unlock(&mm_mutex);
-        allocation_name = strdup( var_name.c_str());
-    } else {
-        allocation_name = NULL;
-    }
-
-    /** @li Calculate the number of elements to be allocated. The number of elements is
-            the product of the sizes of the constrained dimensions. */
-    n_elems = 1;
-    for (int ii = 0; ii < n_cdims ; ii++ ) {
-        n_elems = n_elems * cdims[ii];
-    }
-    if (n_elems == 0) {
-        std::stringstream message;
-        message << "In the following declaration, ";
-        message << "one or more of the constrained dimensions is zero." ;
-        message << std::endl;
-
-        // Print declaration.
-        message << make_decl_string( type, user_type_name, n_stars, var_name, n_cdims, cdims);
-        emitError(message.str()) ;
-        return ((void*)NULL);
-    }
-
-    /** @li From the TRICK_TYPE, user_type_name and the number of pointers (asterisks),
-            determine the size and the attributes of an element. */
-    if ( get_type_attributes(type, user_type_name, n_stars, sub_attr, size) != 0) {
-        std::stringstream message;
-        message << "get_type_attributes failed for type: ";
-        message << trickTypeCharString(type, user_type_name.c_str());
-        message << std::endl;
-        emitError(message.str()) ;
-
-        return ((void*)NULL);
-    }
-
-    /** @li Allocate memory for the variable. */
-    if ( (type == TRICK_STRUCTURED) &&
-         (sub_attr->language == Language_CPP) &&
-         (n_stars == 0 ) ) {
-
-        if ((address = io_src_allocate_class( user_type_name.c_str(), n_elems)) == NULL) {
-            std::stringstream message;
-            message << "io_src_allocate_class (";
-            message << user_type_name << "," << n_elems ;
-            message << ") failed to allocate any memory.";
-            emitError(message.str()) ;
-
-            return ((void*)NULL);
-        }
-        language = Language_CPP;
-        /* io_src_allocate_class allocates objects using calloc (only).  */
-        allocation_type = TRICK_ALLOC_MALLOC;
-
-    } else if ((type == TRICK_STRING) && (n_stars == 0 ) ) {
-
-        std::string *s = (std::string*)calloc(n_elems, sizeof(std::string));
-        for (int ii=0 ; ii<n_elems ; ii++) {
-            new( &s[ii]) std::string();
-        }
-        address = s;
-
-        if (address == NULL) {
-            return ((void*)NULL);
-        }
-        language = Language_CPP;
-    } else {
-        if ( (address = calloc( (size_t)n_elems, (size_t)size ) ) == NULL) {
-            emitError("Out of memory.") ;
-            return ((void*)NULL);
-        }
-        language = Language_C;
-    }
-
-    /** @li Allocate and populate an ALLOC_INFO record for the allocation. */
-    if ((new_alloc = (ALLOC_INFO*)calloc(1, sizeof(ALLOC_INFO))) != NULL) {
-
-        new_alloc->start = address;
-        new_alloc->end = ( (char*)new_alloc->start) + (n_elems * size) - 1;
-        new_alloc->name = allocation_name;
-        new_alloc->stcl = TRICK_LOCAL;
-        new_alloc->size = size;
-        new_alloc->language = language;
-        new_alloc->type = type;
-        new_alloc->alloc_type = allocation_type;
-
-        if ((type == TRICK_STRUCTURED) || (type == TRICK_ENUMERATED)) {
-            new_alloc->user_type_name = strdup( user_type_name.c_str());
-        } else {
-            new_alloc->user_type_name = NULL ;
-        }
-
-        new_alloc->attr = sub_attr;
-        new_alloc->num = n_elems;
-
-        new_alloc->num_index = 0;
-        for (int ii = 0; ii < n_cdims ; ii++ ) {
-            new_alloc->index[new_alloc->num_index] = cdims[ii];
-            new_alloc->num_index ++ ;
-        }
-        for (int ii = 0 ; ii < n_stars ; ii++) {
-            new_alloc->index[new_alloc->num_index] = 0;
-            new_alloc->num_index ++ ;
-        }
-
-        new_alloc->id = alloc_info_map_counter++ ;
-
-        /** @li Insert the <address, ALLOC_INFO> key-value pair into the alloc_info_map.*/
-        pthread_mutex_lock(&mm_mutex);
-        alloc_info_map[address] = new_alloc;
-
-        /** @li If this is a named allocation: then insert the <variable-name, ALLOC_INFO>
-            key-value pair into the variable map.*/
-        if (new_alloc->name) {
-            variable_map[new_alloc->name] = new_alloc;
-        }
-        pthread_mutex_unlock(&mm_mutex);
-    } else {
-        emitError("Out of memory.\n") ;
-        return ((void*)NULL);
-    }
-
-    /** @li If debug is enabled, show what happened.*/
-    if (debug_level) {
-        int i;
-        std::cout << std::endl;
-        std::cout << "Allocation: " << new_alloc->num << " element(s) of type(" ;
-        std::cout << trickTypeCharString(type, user_type_name.c_str()) ;
-        for (i=0;i<n_stars;i++) std::cout << "*";
-        std::cout << "), size(" << size << ") @ addr(" << address << ")." ;
-        std::cout << std::endl << std::endl;
-        std::cout.flush();
-    }
-
-    /** @li Return the address of the allocation. */
-    return (address);
+	@page	examples_declare_var	Examples	of	declare_var
+
+	Allocation	of	an	anonymous	singleton	of	type	double:
+	\code	double	*D	=	(double*)trick_MM->declare_var("double");	\endcode
+
+	Allocation	of	an	anonymous	array	of	3	doubles:
+	\code	double	*D	=	(double*)trick_MM->declare_var("double[3]");	\endcode
+
+	Allocation	of	an	anonymous	array	of	3	pointers	to	double:
+	\code	double	**D	=	(double**)trick_MM->declare_var("double*[3]");	\endcode
+
+	Allocation	of	an	anonymous	2	dimensional	array	of	doubles:
+	\code	double	(*A)[3][4]	=	(double(*)[3][4])trick_MM->declare_var("double[3][4]");	\endcode
+
+	Allocation	of	a	named	singleton	of	type	double:
+	\code	double	*D	=	(double*)trick_MM->declare_var("double	mydbl");	\endcode
+
+	Allocation	of	a	named	array	of	3	Pointers	to	double:
+	\code	double	**D	=	(double**)trick_MM->declare_var("double*	mydbl[3]");	\endcode
+
+	Allocation	of	a	named	singleton	of	user-defined	type	"BAR":
+	\code	BAR	*D	=	(BAR*)trick_MM->declare_var("BAR	mydbl");	\endcode
+
+	Allocation	of	a	named	2	dimensional	array	of	user-defined	type	"BAR"	in	namespace	"FOO":
+	\code	FOO::BAR	(*A)[3][4]	=	(FOO::BAR(*)[3][4])trick_MM->declare_var("FOO::BAR	my_array[3][4]");	\endcode
+	*/
+
+//	PUBLIC	MEMBER	FUNCTION:	void*	Trick::MemoryManager::declare_var(TRICK_TYPE	type,std::string	user_type_name,	int	n_stars,	std::string	var_name,	int	n_cdims,	int	*cdims);
+void*	Trick::MemoryManager::declare_var(	TRICK_TYPE	type,
+																																								std::string	user_type_name,
+																																								int	n_stars,
+																																								std::string	var_name,
+																																								int	n_cdims,
+																																								int	*cdims)	{
+				int	size;
+				char*	allocation_name;
+				int	n_elems;
+				Language	language;
+				TRICK_ALLOC_TYPE	allocation_type;
+				void*	address;
+				ATTRIBUTES*	sub_attr;
+				ALLOC_INFO	*new_alloc;
+				VARIABLE_MAP::iterator	variable_pos;
+
+				if	(debug_level	>	1)	{
+								std::cout	<<	__FUNCTION__	<<	":	Parameters:	"	<<	std::endl;
+								std::cout	<<	"											type	=	"	<<	type	<<	std::endl;
+								std::cout	<<	"											user_type_name	=	"	<<	user_type_name	<<	std::endl;
+								std::cout	<<	"											n_stars	=	"	<<	n_stars	<<	std::endl;
+								std::cout	<<	"											var_name	=	"	<<	var_name	<<	std::endl;
+								std::cout	<<	"											n_cdims	=	"	<<	n_cdims	<<	std::endl;
+				}
+
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
+
+				/**	@li	If	this	is	a	named	allocation	then	determine	whether	the	given	variable	name	is	already	in	use.	*/
+				if	(var_name	!=	"")	{
+								pthread_mutex_lock(&mm_mutex);
+								variable_pos	=	variable_map.find(	var_name);
+								if	(variable_pos	!=	variable_map.end())	{
+												std::stringstream	message;
+												message	<<	"Variable	\""<<	var_name	<<"\"	already	declared.\n";
+												emitError(message.str());
+												pthread_mutex_unlock(&mm_mutex);
+												return	((void*)NULL);
+								}
+								pthread_mutex_unlock(&mm_mutex);
+								allocation_name	=	strdup(	var_name.c_str());
+				}	else	{
+								allocation_name	=	NULL;
+				}
+
+				/**	@li	Calculate	the	number	of	elements	to	be	allocated.	The	number	of	elements	is
+												the	product	of	the	sizes	of	the	constrained	dimensions.	*/
+				n_elems	=	1;
+				for	(int	ii	=	0;	ii	<	n_cdims	;	ii++	)	{
+								n_elems	=	n_elems	*	cdims[ii];
+				}
+				if	(n_elems	==	0)	{
+								std::stringstream	message;
+								message	<<	"In	the	following	declaration,	";
+								message	<<	"one	or	more	of	the	constrained	dimensions	is	zero."	;
+								message	<<	std::endl;
+
+								//	Print	declaration.
+								message	<<	make_decl_string(	type,	user_type_name,	n_stars,	var_name,	n_cdims,	cdims);
+								emitError(message.str())	;
+								return	((void*)NULL);
+				}
+
+				/**	@li	From	the	TRICK_TYPE,	user_type_name	and	the	number	of	pointers	(asterisks),
+												determine	the	size	and	the	attributes	of	an	element.	*/
+				if	(	get_type_attributes(type,	user_type_name,	n_stars,	sub_attr,	size)	!=	0)	{
+								std::stringstream	message;
+								message	<<	"get_type_attributes	failed	for	type:	";
+								message	<<	trickTypeCharString(type,	user_type_name.c_str());
+								message	<<	std::endl;
+								emitError(message.str())	;
+
+								return	((void*)NULL);
+				}
+
+				/**	@li	Allocate	memory	for	the	variable.	*/
+				if	(	(type	==	TRICK_STRUCTURED)	&&
+									(sub_attr->language	==	Language_CPP)	&&
+									(n_stars	==	0	)	)	{
+
+								if	((address	=	io_src_allocate_class(	user_type_name.c_str(),	n_elems))	==	NULL)	{
+												std::stringstream	message;
+												message	<<	"io_src_allocate_class	(";
+												message	<<	user_type_name	<<	","	<<	n_elems	;
+												message	<<	")	failed	to	allocate	any	memory.";
+												emitError(message.str())	;
+
+												return	((void*)NULL);
+								}
+								language	=	Language_CPP;
+								/*	io_src_allocate_class	allocates	objects	using	calloc	(only).		*/
+								allocation_type	=	TRICK_ALLOC_MALLOC;
+
+				}	else	if	((type	==	TRICK_STRING)	&&	(n_stars	==	0	)	)	{
+
+								std::string	*s	=	(std::string*)calloc(n_elems,	sizeof(std::string));
+								for	(int	ii=0	;	ii<n_elems	;	ii++)	{
+												new(	&s[ii])	std::string();
+								}
+								address	=	s;
+
+								if	(address	==	NULL)	{
+												return	((void*)NULL);
+								}
+								language	=	Language_CPP;
+				}	else	{
+								if	(	(address	=	calloc(	(size_t)n_elems,	(size_t)size	)	)	==	NULL)	{
+												emitError("Out	of	memory.")	;
+												return	((void*)NULL);
+								}
+								language	=	Language_C;
+				}
+
+				/**	@li	Allocate	and	populate	an	ALLOC_INFO	record	for	the	allocation.	*/
+				if	((new_alloc	=	(ALLOC_INFO*)calloc(1,	sizeof(ALLOC_INFO)))	!=	NULL)	{
+
+								new_alloc->start	=	address;
+								new_alloc->end	=	(	(char*)new_alloc->start)	+	(n_elems	*	size)	-	1;
+								new_alloc->name	=	allocation_name;
+								new_alloc->stcl	=	TRICK_LOCAL;
+								new_alloc->size	=	size;
+								new_alloc->language	=	language;
+								new_alloc->type	=	type;
+								new_alloc->alloc_type	=	allocation_type;
+
+								if	((type	==	TRICK_STRUCTURED)	||	(type	==	TRICK_ENUMERATED))	{
+												new_alloc->user_type_name	=	strdup(	user_type_name.c_str());
+								}	else	{
+												new_alloc->user_type_name	=	NULL	;
+								}
+
+								new_alloc->attr	=	sub_attr;
+								new_alloc->num	=	n_elems;
+
+								new_alloc->num_index	=	0;
+								for	(int	ii	=	0;	ii	<	n_cdims	;	ii++	)	{
+												new_alloc->index[new_alloc->num_index]	=	cdims[ii];
+												new_alloc->num_index	++	;
+								}
+								for	(int	ii	=	0	;	ii	<	n_stars	;	ii++)	{
+												new_alloc->index[new_alloc->num_index]	=	0;
+												new_alloc->num_index	++	;
+								}
+
+								new_alloc->id	=	alloc_info_map_counter++	;
+
+								/**	@li	Insert	the	<address,	ALLOC_INFO>	key-value	pair	into	the	alloc_info_map.*/
+								pthread_mutex_lock(&mm_mutex);
+								alloc_info_map[address]	=	new_alloc;
+
+								/**	@li	If	this	is	a	named	allocation:	then	insert	the	<variable-name,	ALLOC_INFO>
+												key-value	pair	into	the	variable	map.*/
+								if	(new_alloc->name)	{
+												variable_map[new_alloc->name]	=	new_alloc;
+								}
+								pthread_mutex_unlock(&mm_mutex);
+				}	else	{
+								emitError("Out	of	memory.\n")	;
+								return	((void*)NULL);
+				}
+
+				/**	@li	If	debug	is	enabled,	show	what	happened.*/
+				if	(debug_level)	{
+								int	i;
+								std::cout	<<	std::endl;
+								std::cout	<<	"Allocation:	"	<<	new_alloc->num	<<	"	element(s)	of	type("	;
+								std::cout	<<	trickTypeCharString(type,	user_type_name.c_str())	;
+								for	(i=0;i<n_stars;i++)	std::cout	<<	"*";
+								std::cout	<<	"),	size("	<<	size	<<	")	@	addr("	<<	address	<<	")."	;
+								std::cout	<<	std::endl	<<	std::endl;
+								std::cout.flush();
+				}
+
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(address);
 }
 
-// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_var( const char *alloc_definition);
-void* Trick::MemoryManager::declare_var( const char *alloc_definition) {
-
-    void* address = NULL;
-
-    Trick::ADefParseContext* context = NULL;
-    std::stringstream alloc_decl_sstream;
-
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
-
-    alloc_decl_sstream << alloc_definition;
-
-    /** @li Create a parse context. */
-    context = new Trick::ADefParseContext( &alloc_decl_sstream);
-
-    /** @li Call ADEF_parse to parse the allocation definition. */
-    if (context != NULL) {
-        if ( ADEF_parse( context) == 0) {
-
-            /** @li Call the general form of declare_var to perform the allocation. */
-            address = declare_var( context->type,
-                                  context->user_type_name,
-                                  context->n_stars,
-                                  context->var_name,
-                                  context->n_cdims,
-                                  context->cdims);
-
-            /** @li Delete the parse context. */
-            delete( context);
-        } else {
-            std::stringstream message;
-            message << "Invalid declaration (failed to parse): \"" << alloc_definition << "\".";
-            emitError(message.str());
-        }
-    }
-    /** @li Return the address of the allocation. */
-    return ( address);
+//	PUBLIC	MEMBER	FUNCTION:	void*	Trick::MemoryManager::declare_var(	const	char	*alloc_definition);
+void*	Trick::MemoryManager::declare_var(	const	char	*alloc_definition)	{
+
+				void*	address	=	NULL;
+
+				Trick::ADefParseContext*	context	=	NULL;
+				std::stringstream	alloc_decl_sstream;
+
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
+
+				alloc_decl_sstream	<<	alloc_definition;
+
+				/**	@li	Create	a	parse	context.	*/
+				context	=	new	Trick::ADefParseContext(	&alloc_decl_sstream);
+
+				/**	@li	Call	ADEF_parse	to	parse	the	allocation	definition.	*/
+				if	(context	!=	NULL)	{
+								if	(	ADEF_parse(	context)	==	0)	{
+
+												/**	@li	Call	the	general	form	of	declare_var	to	perform	the	allocation.	*/
+												address	=	declare_var(	context->type,
+																																		context->user_type_name,
+																																		context->n_stars,
+																																		context->var_name,
+																																		context->n_cdims,
+																																		context->cdims);
+
+												/**	@li	Delete	the	parse	context.	*/
+												delete(	context);
+								}	else	{
+												std::stringstream	message;
+												message	<<	"Invalid	declaration	(failed	to	parse):	\""	<<	alloc_definition	<<	"\".";
+												emitError(message.str());
+								}
+				}
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(	address);
 }
 
-// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_var( const char *element_definition, int n_elems);
+//	PUBLIC	MEMBER	FUNCTION:	void*	Trick::MemoryManager::declare_var(	const	char	*element_definition,	int	n_elems);
 
-void* Trick::MemoryManager::declare_var( const char *element_definition, int n_elems) {
+void*	Trick::MemoryManager::declare_var(	const	char	*element_definition,	int	n_elems)	{
 
-    void* address = NULL;
-    int cdims[8];
-    int n_cdims;
+				void*	address	=	NULL;
+				int	cdims[8];
+				int	n_cdims;
 
-    Trick::ADefParseContext* context = NULL;
-    std::stringstream alloc_decl_sstream;
+				Trick::ADefParseContext*	context	=	NULL;
+				std::stringstream	alloc_decl_sstream;
 
-    /** We know that our array will be at least one dimensional and that dimension contains n_elems elements. */
-    cdims[0] = n_elems;
-    n_cdims = 1;
+				/**	We	know	that	our	array	will	be	at	least	one	dimensional	and	that	dimension	contains	n_elems	elements.	*/
+				cdims[0]	=	n_elems;
+				n_cdims	=	1;
 
-    alloc_decl_sstream << element_definition;
+				alloc_decl_sstream	<<	element_definition;
 
-    /** @li Create a parse context. */
-    context = new Trick::ADefParseContext( &alloc_decl_sstream);
+				/**	@li	Create	a	parse	context.	*/
+				context	=	new	Trick::ADefParseContext(	&alloc_decl_sstream);
 
-    if (context != NULL) {
+				if	(context	!=	NULL)	{
 
-    /** @li Parse the allocation definition and ensure that the dimension is at least one less than the maximum of 8. */
-        if (( ADEF_parse( context) == 0) && (context->n_cdims < 8) ){
+				/**	@li	Parse	the	allocation	definition	and	ensure	that	the	dimension	is	at	least	one	less	than	the	maximum	of	8.	*/
+								if	((	ADEF_parse(	context)	==	0)	&&	(context->n_cdims	<	8)	){
 
-            /** @li Add the dimensions of the element definition. */
-            for (int ii=0 ; ii < context->n_cdims ; ii++) {
-                cdims[ii+1] = context->cdims[ii];
-                n_cdims ++;
-            }
+												/**	@li	Add	the	dimensions	of	the	element	definition.	*/
+												for	(int	ii=0	;	ii	<	context->n_cdims	;	ii++)	{
+																cdims[ii+1]	=	context->cdims[ii];
+																n_cdims	++;
+												}
 
-            /** @li Call the general form of declare_var to perform the allocation. */
-            address = declare_var( context->type,
-                                   context->user_type_name,
-                                   context->n_stars,
-                                   context->var_name,
-                                   n_cdims,
-                                   cdims);
+												/**	@li	Call	the	general	form	of	declare_var	to	perform	the	allocation.	*/
+												address	=	declare_var(	context->type,
+																																			context->user_type_name,
+																																			context->n_stars,
+																																			context->var_name,
+																																			n_cdims,
+																																			cdims);
 
-            /** @li Delete the parse context. */
-            delete( context);
-        } else {
-            std::stringstream message;
-            message << "declare_var( \"" << element_definition << "\"," << n_elems <<").";
-            emitError(message.str());
-        }
-    }
-    /** @li Return the address of the allocation. */
-    return ( address);
+												/**	@li	Delete	the	parse	context.	*/
+												delete(	context);
+								}	else	{
+												std::stringstream	message;
+												message	<<	"declare_var(	\""	<<	element_definition	<<	"\","	<<	n_elems	<<").";
+												emitError(message.str());
+								}
+				}
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(	address);
 }
 
-// PUBLIC MEMBER FUNCTION: void* Trick::MemoryManager::declare_operatornew_var(std::string user_type_name, unsigned int alloc_size , unsigned int element_size );
-
-void* Trick::MemoryManager::declare_operatornew_var( std::string user_type_name, unsigned int alloc_size , unsigned int element_size ) {
-    TRICK_TYPE type = TRICK_STRUCTURED ;
-    int size_ref = 1 ;
-    void* address;
-    int aligned;
-    ATTRIBUTES* sub_attr;
-    ALLOC_INFO *new_alloc;
-
-    if (debug_level > 1) {
-        std::cout << __FUNCTION__ << ": Parameters: " << std::endl;
-        std::cout << "           user_type_name = " << user_type_name << std::endl;
-        std::cout << "               alloc_size = " << alloc_size << std::endl;
-        std::cout << "             element_size = " << element_size << std::endl;
-    }
-
-    /** @li From the TRICK_TYPE, user_type_name and the number of pointers (asterisks),
-            determine the size and the attributes of an element. */
-    if ( get_type_attributes(type, user_type_name, 0, sub_attr, size_ref ) != 0) {
-        std::stringstream message;
-        message << "get_type_attributes failed for type: " << TRICK_STRUCTURED
-                << " " << user_type_name.c_str() << ".";
-        emitError(message.str());
-        return ((void*)NULL);
-    }
-
-    if ( (address = calloc( 1, alloc_size ) ) == NULL) {
-        emitError("Out of memory.") ;
-        return ((void*)NULL);
-    }
-
-    aligned = alloc_size % element_size ;
-
-    /** @li Allocate and populate an ALLOC_INFO record for the allocation. */
-    if ((new_alloc = (ALLOC_INFO*)calloc(1, sizeof(ALLOC_INFO))) != NULL) {
-
-        new_alloc->start = (char *)address + aligned ;
-        new_alloc->end = ( (char*)new_alloc->start) + alloc_size - 1 - aligned ;
-        new_alloc->name = NULL;
-        new_alloc->stcl = TRICK_LOCAL;
-        new_alloc->size = element_size ;
-        new_alloc->sentinel_bytes = aligned ;
-        new_alloc->language = Language_CPP ;
-        new_alloc->type = TRICK_STRUCTURED ;
-
-        new_alloc->user_type_name = strdup( user_type_name.c_str());
-
-        new_alloc->attr = sub_attr;
-        new_alloc->num = alloc_size / element_size ;
-
-        new_alloc->num_index = 1;
-        new_alloc->index[0] = new_alloc->num ;
-
-        new_alloc->id = alloc_info_map_counter++ ;
-
-        /** @li Insert the <address, ALLOC_INFO> key-value pair into the alloc_info_map.*/
-        pthread_mutex_lock(&mm_mutex);
-        alloc_info_map[address] = new_alloc;
-        pthread_mutex_unlock(&mm_mutex);
-    } else {
-        emitError("Out of memory.") ;
-        return ((void*)NULL);
-    }
-
-    /** @li If debug is enabled, show what happened.*/
-    if (debug_level ) {
-        std::cout << std::endl;
-        std::cout << "Allocation: " << new_alloc->num << " element(s) of type(" ;
-        std::cout << user_type_name ;
-        std::cout << "), size(" << new_alloc->size << ") @ addr(" << address << ") sentinel_bytes = " << new_alloc->sentinel_bytes ;
-        std::cout << std::endl << std::endl;
-        std::cout.flush();
-    }
-
-    /** @li Return the address of the allocation. */
-    return (address);
+//	PUBLIC	MEMBER	FUNCTION:	void*	Trick::MemoryManager::declare_operatornew_var(std::string	user_type_name,	unsigned	int	alloc_size	,	unsigned	int	element_size	);
+
+void*	Trick::MemoryManager::declare_operatornew_var(	std::string	user_type_name,	unsigned	int	alloc_size	,	unsigned	int	element_size	)	{
+				TRICK_TYPE	type	=	TRICK_STRUCTURED	;
+				int	size_ref	=	1	;
+				void*	address;
+				int	aligned;
+				ATTRIBUTES*	sub_attr;
+				ALLOC_INFO	*new_alloc;
+
+				if	(debug_level	>	1)	{
+								std::cout	<<	__FUNCTION__	<<	":	Parameters:	"	<<	std::endl;
+								std::cout	<<	"											user_type_name	=	"	<<	user_type_name	<<	std::endl;
+								std::cout	<<	"															alloc_size	=	"	<<	alloc_size	<<	std::endl;
+								std::cout	<<	"													element_size	=	"	<<	element_size	<<	std::endl;
+				}
+
+				/**	@li	From	the	TRICK_TYPE,	user_type_name	and	the	number	of	pointers	(asterisks),
+												determine	the	size	and	the	attributes	of	an	element.	*/
+				if	(	get_type_attributes(type,	user_type_name,	0,	sub_attr,	size_ref	)	!=	0)	{
+								std::stringstream	message;
+								message	<<	"get_type_attributes	failed	for	type:	"	<<	TRICK_STRUCTURED
+																<<	"	"	<<	user_type_name.c_str()	<<	".";
+								emitError(message.str());
+								return	((void*)NULL);
+				}
+
+				if	(	(address	=	calloc(	1,	alloc_size	)	)	==	NULL)	{
+								emitError("Out	of	memory.")	;
+								return	((void*)NULL);
+				}
+
+				aligned	=	alloc_size	%	element_size	;
+
+				/**	@li	Allocate	and	populate	an	ALLOC_INFO	record	for	the	allocation.	*/
+				if	((new_alloc	=	(ALLOC_INFO*)calloc(1,	sizeof(ALLOC_INFO)))	!=	NULL)	{
+
+								new_alloc->start	=	(char	*)address	+	aligned	;
+								new_alloc->end	=	(	(char*)new_alloc->start)	+	alloc_size	-	1	-	aligned	;
+								new_alloc->name	=	NULL;
+								new_alloc->stcl	=	TRICK_LOCAL;
+								new_alloc->size	=	element_size	;
+								new_alloc->sentinel_bytes	=	aligned	;
+								new_alloc->language	=	Language_CPP	;
+								new_alloc->type	=	TRICK_STRUCTURED	;
+
+								new_alloc->user_type_name	=	strdup(	user_type_name.c_str());
+
+								new_alloc->attr	=	sub_attr;
+								new_alloc->num	=	alloc_size	/	element_size	;
+
+								new_alloc->num_index	=	1;
+								new_alloc->index[0]	=	new_alloc->num	;
+
+								new_alloc->id	=	alloc_info_map_counter++	;
+
+								/**	@li	Insert	the	<address,	ALLOC_INFO>	key-value	pair	into	the	alloc_info_map.*/
+								pthread_mutex_lock(&mm_mutex);
+								alloc_info_map[address]	=	new_alloc;
+								pthread_mutex_unlock(&mm_mutex);
+				}	else	{
+								emitError("Out	of	memory.")	;
+								return	((void*)NULL);
+				}
+
+				/**	@li	If	debug	is	enabled,	show	what	happened.*/
+				if	(debug_level	)	{
+								std::cout	<<	std::endl;
+								std::cout	<<	"Allocation:	"	<<	new_alloc->num	<<	"	element(s)	of	type("	;
+								std::cout	<<	user_type_name	;
+								std::cout	<<	"),	size("	<<	new_alloc->size	<<	")	@	addr("	<<	address	<<	")	sentinel_bytes	=	"	<<	new_alloc->sentinel_bytes	;
+								std::cout	<<	std::endl	<<	std::endl;
+								std::cout.flush();
+				}
+
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(address);
 }
 
-// PUBLIC MEMBER FUNCTION: size_t Trick::MemoryManager::sizeof_type( const char* var_definition);
+//	PUBLIC	MEMBER	FUNCTION:	size_t	Trick::MemoryManager::sizeof_type(	const	char*	var_definition);
 
-size_t Trick::MemoryManager::sizeof_type( const char* var_definition) {
+size_t	Trick::MemoryManager::sizeof_type(	const	char*	var_definition)	{
 
-    int size = 0 ;
-    int n_elems = 0 ;
-    ATTRIBUTES* sub_attr;
+				int	size	=	0	;
+				int	n_elems	=	0	;
+				ATTRIBUTES*	sub_attr;
 
-    Trick::ADefParseContext* context = NULL;
-    std::stringstream alloc_decl_sstream;
+				Trick::ADefParseContext*	context	=	NULL;
+				std::stringstream	alloc_decl_sstream;
 
-    alloc_decl_sstream << var_definition;
-    context = new Trick::ADefParseContext( &alloc_decl_sstream);
-    if (context != NULL) {
-        if ( ADEF_parse( context) == 0) {
+				alloc_decl_sstream	<<	var_definition;
+				context	=	new	Trick::ADefParseContext(	&alloc_decl_sstream);
+				if	(context	!=	NULL)	{
+								if	(	ADEF_parse(	context)	==	0)	{
 
-            get_type_attributes(context->type, context->user_type_name, context->n_stars, sub_attr, size);
+												get_type_attributes(context->type,	context->user_type_name,	context->n_stars,	sub_attr,	size);
 
-            n_elems = 1;
-            for (int ii=0; ii<context->n_cdims ; ii++) {
-                n_elems *= context->cdims[ii];
-            }
-        } else {
-            std::stringstream message;
-            message << "Invalid variable definition \"" << var_definition << "\" in sizeof_type.";
-            emitError(message.str());
-        }
-        delete( context);
-    }
+												n_elems	=	1;
+												for	(int	ii=0;	ii<context->n_cdims	;	ii++)	{
+																n_elems	*=	context->cdims[ii];
+												}
+								}	else	{
+												std::stringstream	message;
+												message	<<	"Invalid	variable	definition	\""	<<	var_definition	<<	"\"	in	sizeof_type.";
+												emitError(message.str());
+								}
+								delete(	context);
+				}
 
-    return (size_t)(n_elems * size);
+				return	(size_t)(n_elems	*	size);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp
index 4bde1c45c..4d6f46549 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_delete_var.cpp
@@ -1,147 +1,147 @@
-#include <stdlib.h>
-#include <iostream>
-
-#include <sstream>
-#include <algorithm>
-#include <dlfcn.h>
-#include "trick/MemoryManager.hh"
-
-// MEMBER FUNCTION
-int Trick::MemoryManager::delete_var(void* address ) {
-
-    if (address == 0) {
-        if (debug_level) {
-            std::stringstream message;
-            message << "Cannot delete memory at NULL.";
-            emitWarning(message.str());
-        }
-        return 1;
-    }
-
-    // Find the allocation record for this address.
-    ALLOC_INFO * alloc_info = get_alloc_info_at( address);
-
-    if ((alloc_info != NULL)) {
-        /*
-           Remove the allocation from the map first so we don't have trouble
-           if io_src_destruct_class or io_src_delete_class calls delete_var recursively.
-         */
-        // BEGIN PROTECTION of the alloc_info_map.
-        pthread_mutex_lock(&mm_mutex);
-        alloc_info_map.erase( address);
-        // END PROTECTION of the alloc_info_map.
-        pthread_mutex_unlock(&mm_mutex);
-
-        /* Verify that it's OK to free the memory at the given address.
-           It's OK if an allocation record exists for this address and the
-           MemoryManager allocated it.
-         */
-        if ( alloc_info->stcl == TRICK_LOCAL ) {
-            if ( alloc_info->alloc_type == TRICK_ALLOC_MALLOC ) {
-
-                // This will call a destructor ONLY if alloc_info->type is TRICK_STRUCTURED.
-                // Otherwise it does nothing.
-                io_src_destruct_class( alloc_info );
-
-		// The destructor that we just called MAY have deleted addresses
-		// that are already planned for deletion, say during reset_memory.
-		// So, keep a record of what we've recently deleted so we don't
-		// to warn that we can't find it, when reset_memory also tries to
-		// delete that same address.
+#include	<stdlib.h>
+#include	<iostream>
+
+#include	<sstream>
+#include	<algorithm>
+#include	<dlfcn.h>
+#include	"trick/MemoryManager.hh"
+
+//	MEMBER	FUNCTION
+int	Trick::MemoryManager::delete_var(void*	address	)	{
+
+				if	(address	==	0)	{
+								if	(debug_level)	{
+												std::stringstream	message;
+												message	<<	"Cannot	delete	memory	at	NULL.";
+												emitWarning(message.str());
+								}
+								return	1;
+				}
+
+				//	Find	the	allocation	record	for	this	address.
+				ALLOC_INFO	*	alloc_info	=	get_alloc_info_at(	address);
+
+				if	((alloc_info	!=	NULL))	{
+								/*
+											Remove	the	allocation	from	the	map	first	so	we	don't	have	trouble
+											if	io_src_destruct_class	or	io_src_delete_class	calls	delete_var	recursively.
+									*/
+								//	BEGIN	PROTECTION	of	the	alloc_info_map.
+								pthread_mutex_lock(&mm_mutex);
+								alloc_info_map.erase(	address);
+								//	END	PROTECTION	of	the	alloc_info_map.
+								pthread_mutex_unlock(&mm_mutex);
+
+								/*	Verify	that	it's	OK	to	free	the	memory	at	the	given	address.
+											It's	OK	if	an	allocation	record	exists	for	this	address	and	the
+											MemoryManager	allocated	it.
+									*/
+								if	(	alloc_info->stcl	==	TRICK_LOCAL	)	{
+												if	(	alloc_info->alloc_type	==	TRICK_ALLOC_MALLOC	)	{
+
+																//	This	will	call	a	destructor	ONLY	if	alloc_info->type	is	TRICK_STRUCTURED.
+																//	Otherwise	it	does	nothing.
+																io_src_destruct_class(	alloc_info	);
+
+		//	The	destructor	that	we	just	called	MAY	have	deleted	addresses
+		//	that	are	already	planned	for	deletion,	say	during	reset_memory.
+		//	So,	keep	a	record	of	what	we've	recently	deleted	so	we	don't
+		//	to	warn	that	we	can't	find	it,	when	reset_memory	also	tries	to
+		//	delete	that	same	address.
 		deleted_addr_list.push_back(address);
 
-                free( address);
-            } else if ( alloc_info->alloc_type == TRICK_ALLOC_NEW ) {
-                io_src_delete_class( alloc_info );
-            }
-        }
-
-        if (debug_level) {
-            std::cout << "Deleted allocation at address " << alloc_info->start << "." << std::endl;
-            std::cout.flush();
-        }
-
-        if (alloc_info->name ) {
-            pthread_mutex_lock(&mm_mutex);
-            variable_map.erase( alloc_info->name);
-            pthread_mutex_unlock(&mm_mutex);
-            free(alloc_info->name);
-        }
-
-        if ( alloc_info->user_type_name ) {
-            free(alloc_info->user_type_name);
-        }
-
-        // Delete the alloc_info record.
-        free(alloc_info);
-
-    } else {
-
-        // The allocation (address) we're tring to delete may have just been
-	// deleted by a user's destructor (using delete_var). Check the deleted_addr_list
-	// to see if the allocation was just deleted. If it was, then there's no
-	// problem. If it wasn't, then the MemoryManager never knew about it, and
-	// this call to delete_var() is a problem.
-
-	if ( resetting_memory == true) {
-            // Check the deleted_addr_list to see whether we recently deleted this address.
-	    std::list<void*>::iterator iter =
-	        std::find( deleted_addr_list.begin(), deleted_addr_list.end(), address );
-	    // If we didn't recently delete it, then there's a problem.
-	    if ( iter == deleted_addr_list.end() ) {
-                std::stringstream message;
-                message << "The MemoryManager cannot delete memory at address ["
-                        << address << "] because it has no record of it. Furthermore,"
-			<< " the MemoryManager has not recently deleted it while"
-			<< " resetting memory for a checkpoint reload.";
-                emitWarning(message.str());
-	    }
-	} else {
-            std::stringstream message;
-            message << "The MemoryManager cannot delete memory at address ["
-                    << address << "] because it has no record of it.";
-            emitWarning(message.str());
+																free(	address);
+												}	else	if	(	alloc_info->alloc_type	==	TRICK_ALLOC_NEW	)	{
+																io_src_delete_class(	alloc_info	);
+												}
+								}
+
+								if	(debug_level)	{
+												std::cout	<<	"Deleted	allocation	at	address	"	<<	alloc_info->start	<<	"."	<<	std::endl;
+												std::cout.flush();
+								}
+
+								if	(alloc_info->name	)	{
+												pthread_mutex_lock(&mm_mutex);
+												variable_map.erase(	alloc_info->name);
+												pthread_mutex_unlock(&mm_mutex);
+												free(alloc_info->name);
+								}
+
+								if	(	alloc_info->user_type_name	)	{
+												free(alloc_info->user_type_name);
+								}
+
+								//	Delete	the	alloc_info	record.
+								free(alloc_info);
+
+				}	else	{
+
+								//	The	allocation	(address)	we're	tring	to	delete	may	have	just	been
+	//	deleted	by	a	user's	destructor	(using	delete_var).	Check	the	deleted_addr_list
+	//	to	see	if	the	allocation	was	just	deleted.	If	it	was,	then	there's	no
+	//	problem.	If	it	wasn't,	then	the	MemoryManager	never	knew	about	it,	and
+	//	this	call	to	delete_var()	is	a	problem.
+
+	if	(	resetting_memory	==	true)	{
+												//	Check	the	deleted_addr_list	to	see	whether	we	recently	deleted	this	address.
+					std::list<void*>::iterator	iter	=
+									std::find(	deleted_addr_list.begin(),	deleted_addr_list.end(),	address	);
+					//	If	we	didn't	recently	delete	it,	then	there's	a	problem.
+					if	(	iter	==	deleted_addr_list.end()	)	{
+																std::stringstream	message;
+																message	<<	"The	MemoryManager	cannot	delete	memory	at	address	["
+																								<<	address	<<	"]	because	it	has	no	record	of	it.	Furthermore,"
+			<<	"	the	MemoryManager	has	not	recently	deleted	it	while"
+			<<	"	resetting	memory	for	a	checkpoint	reload.";
+																emitWarning(message.str());
+					}
+	}	else	{
+												std::stringstream	message;
+												message	<<	"The	MemoryManager	cannot	delete	memory	at	address	["
+																				<<	address	<<	"]	because	it	has	no	record	of	it.";
+												emitWarning(message.str());
 	}
 
-        return 1 ;
-    }
+								return	1	;
+				}
 
-    return 0;
+				return	0;
 }
 
-// MEMBER FUNCTION
-int Trick::MemoryManager::delete_var( std::string name) {
+//	MEMBER	FUNCTION
+int	Trick::MemoryManager::delete_var(	std::string	name)	{
 
-    VARIABLE_MAP::iterator pos;
-    ALLOC_INFO *alloc_info;
+				VARIABLE_MAP::iterator	pos;
+				ALLOC_INFO	*alloc_info;
 
-    pthread_mutex_lock(&mm_mutex);
-    pos = variable_map.find( name);
+				pthread_mutex_lock(&mm_mutex);
+				pos	=	variable_map.find(	name);
 
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
 
-        pthread_mutex_unlock(&mm_mutex);
-        return( delete_var( alloc_info->start));
-    } else {
-        std::stringstream message;
-        message << "Cannot delete variable \"" << name
-                << "\" because it doesn't exist." ;
-        emitError(message.str());
-    }
-    pthread_mutex_unlock(&mm_mutex);
-    return 1;
+								pthread_mutex_unlock(&mm_mutex);
+								return(	delete_var(	alloc_info->start));
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Cannot	delete	variable	\""	<<	name
+																<<	"\"	because	it	doesn't	exist."	;
+								emitError(message.str());
+				}
+				pthread_mutex_unlock(&mm_mutex);
+				return	1;
 }
 
-// MEMBER FUNCTION
-int Trick::MemoryManager::delete_extern_var( void* address) {
-    // delete_var will remove the external variable from the allocation map
-    return delete_var(address) ;
+//	MEMBER	FUNCTION
+int	Trick::MemoryManager::delete_extern_var(	void*	address)	{
+				//	delete_var	will	remove	the	external	variable	from	the	allocation	map
+				return	delete_var(address)	;
 }
 
-// MEMBER FUNCTION
-int Trick::MemoryManager::delete_extern_var( std::string name) {
-    // delete_var will remove the external variable from the allocation map
-    return delete_var(name) ;
+//	MEMBER	FUNCTION
+int	Trick::MemoryManager::delete_extern_var(	std::string	name)	{
+				//	delete_var	will	remove	the	external	variable	from	the	allocation	map
+				return	delete_var(name)	;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp
index 9b1146880..d177931c1 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_enumerated.cpp
@@ -1,32 +1,32 @@
-#include "trick/MemoryManager.hh"
-#include <string.h>
+#include	"trick/MemoryManager.hh"
+#include	<string.h>
 
 /**
- * MEMBER FUNCTION
- */
-int Trick::MemoryManager::get_enumerated(const char* name,
-                                         V_DATA*     v_data) {
+	*	MEMBER	FUNCTION
+	*/
+int	Trick::MemoryManager::get_enumerated(const	char*	name,
+																																									V_DATA*					v_data)	{
 
-    int ii;
-    int found = 0;
-    ENUMERATION_MAP::iterator pos;
-    ENUM_ATTR* enum_attr;
+				int	ii;
+				int	found	=	0;
+				ENUMERATION_MAP::iterator	pos;
+				ENUM_ATTR*	enum_attr;
 
-    for ( pos=enumeration_map.begin() ; pos != enumeration_map.end() && !found ; pos++ ) {
-        enum_attr = pos->second;
-        for (ii=0 ; enum_attr[ii].label[0] != '\0' && !found ; ii++ ) {
-            if ( !strcmp( name, enum_attr[ii].label)) {
-              found = 1;
-              v_data->type = TRICK_ENUMERATED;
-              v_data->value.i = enum_attr[ii].value;
-            }
-        }
-    }
+				for	(	pos=enumeration_map.begin()	;	pos	!=	enumeration_map.end()	&&	!found	;	pos++	)	{
+								enum_attr	=	pos->second;
+								for	(ii=0	;	enum_attr[ii].label[0]	!=	'\0'	&&	!found	;	ii++	)	{
+												if	(	!strcmp(	name,	enum_attr[ii].label))	{
+														found	=	1;
+														v_data->type	=	TRICK_ENUMERATED;
+														v_data->value.i	=	enum_attr[ii].value;
+												}
+								}
+				}
 
-    if (!found) {
-        return ( MM_ERROR);
-    }
+				if	(!found)	{
+								return	(	MM_ERROR);
+				}
 
-    return (MM_OK);
+				return	(MM_OK);
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
index 015cae1d4..b20cbb29c 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_size.cpp
@@ -1,162 +1,162 @@
 
 /*
-   PURPOSE: ( These routines get the sizes of memory areas pointed to by ptr )
+			PURPOSE:	(	These	routines	get	the	sizes	of	memory	areas	pointed	to	by	ptr	)
 
-   REFERENCE:
+			REFERENCE:
 
-   ASSUMPTIONS AND LIMITATIONS:
+			ASSUMPTIONS	AND	LIMITATIONS:
 
-   PROGRAMMERS: ( (Alex Lin) (NASA) (3/17/03) )
- */
+			PROGRAMMERS:	(	(Alex	Lin)	(NASA)	(3/17/03)	)
+	*/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "trick/MemoryManager.hh"
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	"trick/MemoryManager.hh"
 
-/* This routine only returns the size if ptr points to the beginning of the allocation area */
-int Trick::MemoryManager::get_size(void *addr) {
+/*	This	routine	only	returns	the	size	if	ptr	points	to	the	beginning	of	the	allocation	area	*/
+int	Trick::MemoryManager::get_size(void	*addr)	{
 
-    ALLOC_INFO *node;
-    int size = 0;
+				ALLOC_INFO	*node;
+				int	size	=	0;
 
-    pthread_mutex_lock(&mm_mutex);
-    node = get_alloc_info_at(addr);
-    if (node != NULL) {
-        size = node->num;
-    }
-    pthread_mutex_unlock(&mm_mutex);
+				pthread_mutex_lock(&mm_mutex);
+				node	=	get_alloc_info_at(addr);
+				if	(node	!=	NULL)	{
+								size	=	node->num;
+				}
+				pthread_mutex_unlock(&mm_mutex);
 
-    return (size);
+				return	(size);
 }
 
-/* This routine returns the remaining space in front of addr in the current allocation area */
-int Trick::MemoryManager::get_truncated_size(void *addr) {
+/*	This	routine	returns	the	remaining	space	in	front	of	addr	in	the	current	allocation	area	*/
+int	Trick::MemoryManager::get_truncated_size(void	*addr)	{
 
-    ALLOC_INFO *node;
-    int size = 0;
+				ALLOC_INFO	*node;
+				int	size	=	0;
 
-    pthread_mutex_lock(&mm_mutex);
-    node = get_alloc_info_of(addr);
-    if (node != NULL) {
-        size = ((int) node->num - (((long) addr - (long) node->start) / node->size));
-    }
-    pthread_mutex_unlock(&mm_mutex);
+				pthread_mutex_lock(&mm_mutex);
+				node	=	get_alloc_info_of(addr);
+				if	(node	!=	NULL)	{
+								size	=	((int)	node->num	-	(((long)	addr	-	(long)	node->start)	/	node->size));
+				}
+				pthread_mutex_unlock(&mm_mutex);
 
-    return (size);
+				return	(size);
 }
 
-// ********************************************************
-// FIXME: Is the following routine actually used somewhere?
-// ********************************************************
+//	********************************************************
+//	FIXME:	Is	the	following	routine	actually	used	somewhere?
+//	********************************************************
 
-/* This routine returns the remaining space in front of ptr within a fixed matrix area */
-int Trick::MemoryManager::io_get_fixed_truncated_size(char *ptr, ATTRIBUTES * A, char *str, int dims, ATTRIBUTES * left_type)
+/*	This	routine	returns	the	remaining	space	in	front	of	ptr	within	a	fixed	matrix	area	*/
+int	Trick::MemoryManager::io_get_fixed_truncated_size(char	*ptr,	ATTRIBUTES	*	A,	char	*str,	int	dims,	ATTRIBUTES	*	left_type)
 {
 
-#if 1
-    int i = 0, j;
-    long offset;
-    int my_index[9];
-    int ret;
-    int size, last_size;
-    int num_fixed_dims = 0;
-
-    /* Find the variable which contains the address pointed to by ptr */
-    while ((A[i].name[0] != '\0')
-           && (long) ptr >= (long) ((long) str + A[i].offset)) {
-        i++;
-    }
-
-    i--;
-
-    if (A[i].attr == NULL) {
-        /* If ptr is pointing to an array determine the dimensions to get to the element pointed to by ptr */
-        if (A[i].num_index != 0) {
-
-            offset = (long) ptr - ((long) str + A[i].offset);
-            size = last_size = A[i].size;
-
-            /* We can only do this for fixed size arrays. */
-            for (j = 0; j < A[i].num_index; j++) {
-                if (A[i].index[j].size > 0) {
-                    num_fixed_dims++;
-                }
-            }
-
-            if (!num_fixed_dims) {
-                /* This is a pointer. */
-                return (1);
-            }
-
-            for (j = num_fixed_dims - 1; j >= 0; j--) {
-                size *= A[i].index[j].size;
-                my_index[j] = (int) ((offset % size) / last_size);
-                offset -= last_size * my_index[j];
-                last_size = size;
-            }
-
-            if (A[i].num_index - dims - 1 < 0) {
-                printf("Big problems: index = %i\n", A[i].num_index - dims - 1);
-                exit(-1);
-            }
-            if (A[i].index[A[i].num_index - dims - 1].size - my_index[A[i].num_index - dims - 1] < 0) {
-                printf("More trouble\n");
-                exit(-1);
-            }
-            return (A[i].index[A[i].num_index - dims - 1].size - my_index[A[i].num_index - dims - 1]);
-        } else {
-            /* If variable is a single value return 1 */
-            if ((long) ptr == (long) ((long) str + A[i].offset)) {
-                return (1);
-            }
-            return (0);
-        }
-
-    } else {
-
-        /* Variable is an struct, continue to call io_get_var_name */
-        if (A[i].num_index == 0) {
-
-            /* If looking for this struct type, don't bother continuing */
-            if (A[i].attr == left_type->attr) {
-                return (1);
-            }
-            /* If we are pointing to a non-arrayed struct */
-            ret = io_get_fixed_truncated_size(ptr, (ATTRIBUTES *) A[i].attr, str + A[i].offset, dims, left_type);
-        } else {
-            /* If we are pointing to an arrayed struct */
-
-            offset = (long) ptr - ((long) str + A[i].offset);
-            size = last_size = A[i].size;
-
-            /* We can only do this for fixed size arrays. */
-            for (j = A[i].num_index - 1; j >= 0; j--) {
-                size *= A[i].index[j].size;
-                my_index[j] = (int) ((offset % size) / last_size);
-                offset -= last_size * my_index[j];
-                last_size = size;
-            }
-
-            /* If we are looking for this struct type don't bother continuing */
-            if (A[i].attr == left_type->attr) {
-                return (A[i].index[dims].size - my_index[dims]);
-            }
-
-            /* Get the offset into the array that ptr points to */
-            offset = A[i].size;
-            for (j = 0; j < A[i].num_index; j++) {
-                offset *= my_index[j];
-            }
-
-            ret =
-                io_get_fixed_truncated_size(ptr, (ATTRIBUTES *) A[i].attr, str + A[i].offset + offset, dims, left_type);
-        }
-
-        return (ret);
-
-    }
+#if	1
+				int	i	=	0,	j;
+				long	offset;
+				int	my_index[9];
+				int	ret;
+				int	size,	last_size;
+				int	num_fixed_dims	=	0;
+
+				/*	Find	the	variable	which	contains	the	address	pointed	to	by	ptr	*/
+				while	((A[i].name[0]	!=	'\0')
+											&&	(long)	ptr	>=	(long)	((long)	str	+	A[i].offset))	{
+								i++;
+				}
+
+				i--;
+
+				if	(A[i].attr	==	NULL)	{
+								/*	If	ptr	is	pointing	to	an	array	determine	the	dimensions	to	get	to	the	element	pointed	to	by	ptr	*/
+								if	(A[i].num_index	!=	0)	{
+
+												offset	=	(long)	ptr	-	((long)	str	+	A[i].offset);
+												size	=	last_size	=	A[i].size;
+
+												/*	We	can	only	do	this	for	fixed	size	arrays.	*/
+												for	(j	=	0;	j	<	A[i].num_index;	j++)	{
+																if	(A[i].index[j].size	>	0)	{
+																				num_fixed_dims++;
+																}
+												}
+
+												if	(!num_fixed_dims)	{
+																/*	This	is	a	pointer.	*/
+																return	(1);
+												}
+
+												for	(j	=	num_fixed_dims	-	1;	j	>=	0;	j--)	{
+																size	*=	A[i].index[j].size;
+																my_index[j]	=	(int)	((offset	%	size)	/	last_size);
+																offset	-=	last_size	*	my_index[j];
+																last_size	=	size;
+												}
+
+												if	(A[i].num_index	-	dims	-	1	<	0)	{
+																printf("Big	problems:	index	=	%i\n",	A[i].num_index	-	dims	-	1);
+																exit(-1);
+												}
+												if	(A[i].index[A[i].num_index	-	dims	-	1].size	-	my_index[A[i].num_index	-	dims	-	1]	<	0)	{
+																printf("More	trouble\n");
+																exit(-1);
+												}
+												return	(A[i].index[A[i].num_index	-	dims	-	1].size	-	my_index[A[i].num_index	-	dims	-	1]);
+								}	else	{
+												/*	If	variable	is	a	single	value	return	1	*/
+												if	((long)	ptr	==	(long)	((long)	str	+	A[i].offset))	{
+																return	(1);
+												}
+												return	(0);
+								}
+
+				}	else	{
+
+								/*	Variable	is	an	struct,	continue	to	call	io_get_var_name	*/
+								if	(A[i].num_index	==	0)	{
+
+												/*	If	looking	for	this	struct	type,	don't	bother	continuing	*/
+												if	(A[i].attr	==	left_type->attr)	{
+																return	(1);
+												}
+												/*	If	we	are	pointing	to	a	non-arrayed	struct	*/
+												ret	=	io_get_fixed_truncated_size(ptr,	(ATTRIBUTES	*)	A[i].attr,	str	+	A[i].offset,	dims,	left_type);
+								}	else	{
+												/*	If	we	are	pointing	to	an	arrayed	struct	*/
+
+												offset	=	(long)	ptr	-	((long)	str	+	A[i].offset);
+												size	=	last_size	=	A[i].size;
+
+												/*	We	can	only	do	this	for	fixed	size	arrays.	*/
+												for	(j	=	A[i].num_index	-	1;	j	>=	0;	j--)	{
+																size	*=	A[i].index[j].size;
+																my_index[j]	=	(int)	((offset	%	size)	/	last_size);
+																offset	-=	last_size	*	my_index[j];
+																last_size	=	size;
+												}
+
+												/*	If	we	are	looking	for	this	struct	type	don't	bother	continuing	*/
+												if	(A[i].attr	==	left_type->attr)	{
+																return	(A[i].index[dims].size	-	my_index[dims]);
+												}
+
+												/*	Get	the	offset	into	the	array	that	ptr	points	to	*/
+												offset	=	A[i].size;
+												for	(j	=	0;	j	<	A[i].num_index;	j++)	{
+																offset	*=	my_index[j];
+												}
+
+												ret	=
+																io_get_fixed_truncated_size(ptr,	(ATTRIBUTES	*)	A[i].attr,	str	+	A[i].offset	+	offset,	dims,	left_type);
+								}
+
+								return	(ret);
+
+				}
 
 #endif
-    return (0);
+				return	(0);
 
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_get_stl_dependencies.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_stl_dependencies.cpp
index 8f111bcbf..e20da029d 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_get_stl_dependencies.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_stl_dependencies.cpp
@@ -1,192 +1,192 @@
 
-#include <algorithm>
+#include	<algorithm>
 
-#include "trick/MemoryManager.hh"
-#include "trick/attributes.h"
+#include	"trick/MemoryManager.hh"
+#include	"trick/attributes.h"
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_stl_dependencies( ALLOC_INFO* alloc_info ) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_stl_dependencies(	ALLOC_INFO*	alloc_info	)	{
 
-    ATTRIBUTES* reference_attr;
+				ATTRIBUTES*	reference_attr;
 
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
 
-    if (alloc_info == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::get_stl_dependencies called with alloc_info == NULL." << std::endl;
-        std::cout.flush();
-        return;
-    }
+				if	(alloc_info	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::get_stl_dependencies	called	with	alloc_info	==	NULL."	<<	std::endl;
+								std::cout.flush();
+								return;
+				}
 
-    if (debug_level) {
-        std::cout << __FUNCTION__ <<  ": Begin scan of allocation @" << (void*)alloc_info->start << " for dependencies." << std::endl;
-    }
+				if	(debug_level)	{
+								std::cout	<<	__FUNCTION__	<<		":	Begin	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"	for	dependencies."	<<	std::endl;
+				}
 
-    reference_attr = make_reference_attr( alloc_info );
+				reference_attr	=	make_reference_attr(	alloc_info	);
 
-    // Get the dependencies of the allocation
-    if (alloc_info->type == TRICK_STRUCTURED) {
-        if (reference_attr->num_index > 0) {
-            get_stl_dependencies_in_arrayed_class(alloc_info->name, (char*)(alloc_info->start), reference_attr, 0, 0) ;
-        } else {
-            get_stl_dependencies_in_class(alloc_info->name, (char*)(alloc_info->start), alloc_info->attr) ;
-        }
-    } else {
-        get_stl_dependencies_in_intrinsic(alloc_info->name, alloc_info->start, reference_attr, 0, 0 );
-    }
+				//	Get	the	dependencies	of	the	allocation
+				if	(alloc_info->type	==	TRICK_STRUCTURED)	{
+								if	(reference_attr->num_index	>	0)	{
+												get_stl_dependencies_in_arrayed_class(alloc_info->name,	(char*)(alloc_info->start),	reference_attr,	0,	0)	;
+								}	else	{
+												get_stl_dependencies_in_class(alloc_info->name,	(char*)(alloc_info->start),	alloc_info->attr)	;
+								}
+				}	else	{
+								get_stl_dependencies_in_intrinsic(alloc_info->name,	alloc_info->start,	reference_attr,	0,	0	);
+				}
 
-    if (debug_level) {
-        std::cout <<  __FUNCTION__ << ": End scan of allocation @" << (void*)alloc_info->start << "." << std::endl;
-    }
+				if	(debug_level)	{
+								std::cout	<<		__FUNCTION__	<<	":	End	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"."	<<	std::endl;
+				}
 
-    free_reference_attr( reference_attr );
+				free_reference_attr(	reference_attr	);
 
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_stl_dependencies_in_class( std::string name, char* address, ATTRIBUTES* attr) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::get_stl_dependencies_in_class called with attr = NULL." << std::endl;
-        return;
-    }
-
-    for (ii = 0; attr[ii].name[0] != '\0'; ii++) {
-        if (currentCheckPointAgent->output_perm_check(&attr[ii])) {
-            char *elem_addr;
-            if (attr[ii].mods & 2) {
-                elem_addr = (char *) attr[ii].offset;
-            } else {
-                elem_addr = address + attr[ii].offset;
-            }
-
-            if (attr[ii].type == TRICK_STRUCTURED) {
-                if (attr[ii].num_index != 0) {
-                    get_stl_dependencies_in_arrayed_class( name + "." + attr[ii].name, elem_addr, &attr[ii], 0, 0);
-                } else {
-                    get_stl_dependencies_in_class( name + "." + attr[ii].name, elem_addr, (ATTRIBUTES*)(attr[ii].attr));
-                }
-            } else if (attr[ii].type == TRICK_STL) {
-                    (*attr[ii].checkpoint_stl)(elem_addr, name.c_str(), attr[ii].name) ;
-            } else {
-                get_stl_dependencies_in_intrinsic( name + "." + attr[ii].name , elem_addr, &(attr[ii]), 0, 0);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_stl_dependencies_in_class(	std::string	name,	char*	address,	ATTRIBUTES*	attr)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::get_stl_dependencies_in_class	called	with	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				for	(ii	=	0;	attr[ii].name[0]	!=	'\0';	ii++)	{
+								if	(currentCheckPointAgent->output_perm_check(&attr[ii]))	{
+												char	*elem_addr;
+												if	(attr[ii].mods	&	2)	{
+																elem_addr	=	(char	*)	attr[ii].offset;
+												}	else	{
+																elem_addr	=	address	+	attr[ii].offset;
+												}
+
+												if	(attr[ii].type	==	TRICK_STRUCTURED)	{
+																if	(attr[ii].num_index	!=	0)	{
+																				get_stl_dependencies_in_arrayed_class(	name	+	"."	+	attr[ii].name,	elem_addr,	&attr[ii],	0,	0);
+																}	else	{
+																				get_stl_dependencies_in_class(	name	+	"."	+	attr[ii].name,	elem_addr,	(ATTRIBUTES*)(attr[ii].attr));
+																}
+												}	else	if	(attr[ii].type	==	TRICK_STL)	{
+																				(*attr[ii].checkpoint_stl)(elem_addr,	name.c_str(),	attr[ii].name)	;
+												}	else	{
+																get_stl_dependencies_in_intrinsic(	name	+	"."	+	attr[ii].name	,	elem_addr,	&(attr[ii]),	0,	0);
+												}
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_stl_dependencies_in_arrayed_class(
-                                                std::string name,
-                                                char*       address,
-                                                ATTRIBUTES* attr,
-                                                int         curr_dim,
-                                                int         offset) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "Trick::MemoryManager::get_stl_dependencies_in_arrayed_class: ERROR: attr = NULL." << std::endl;
-        return;
-    }
-
-    if (attr->index[curr_dim].size == 0) {
-
-        void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-        if (pointer != NULL) {
-            ALLOC_INFO *alloc_info;
-            alloc_info = get_alloc_info_of( pointer);
-            if (alloc_info != NULL) {
-
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                }
-                //get_stl_dependencies(alloc_info);
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                    std::cout.flush();
-                }
-            }
-        } else {
-            if (debug_level) {
-                std::cout << __FUNCTION__ << ": Allocation reference is NULL." << std::endl;
-                std::cout.flush();
-            }
-        }
-
-    } else {
-        int curr_dim_size;
-        curr_dim_size = attr->index[curr_dim].size;
-        for (ii = 0; ii < curr_dim_size; ii++) {
-            char index[16] ;
-            snprintf(index, sizeof(index), "[%d]", ii) ;
-            if (curr_dim < attr->num_index - 1) {
-                get_stl_dependencies_in_arrayed_class( name + index, address, attr, curr_dim + 1, offset * curr_dim_size + ii);
-            } else {
-                char* elem_addr;
-                elem_addr = address + (offset * curr_dim + ii) * attr->size ;
-                get_stl_dependencies_in_class( name + index, elem_addr, (ATTRIBUTES*)attr->attr );
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_stl_dependencies_in_arrayed_class(
+																																																std::string	name,
+																																																char*							address,
+																																																ATTRIBUTES*	attr,
+																																																int									curr_dim,
+																																																int									offset)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"Trick::MemoryManager::get_stl_dependencies_in_arrayed_class:	ERROR:	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				if	(attr->index[curr_dim].size	==	0)	{
+
+								void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+								if	(pointer	!=	NULL)	{
+												ALLOC_INFO	*alloc_info;
+												alloc_info	=	get_alloc_info_of(	pointer);
+												if	(alloc_info	!=	NULL)	{
+
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																}
+																//get_stl_dependencies(alloc_info);
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+								}	else	{
+												if	(debug_level)	{
+																std::cout	<<	__FUNCTION__	<<	":	Allocation	reference	is	NULL."	<<	std::endl;
+																std::cout.flush();
+												}
+								}
+
+				}	else	{
+								int	curr_dim_size;
+								curr_dim_size	=	attr->index[curr_dim].size;
+								for	(ii	=	0;	ii	<	curr_dim_size;	ii++)	{
+												char	index[16]	;
+												snprintf(index,	sizeof(index),	"[%d]",	ii)	;
+												if	(curr_dim	<	attr->num_index	-	1)	{
+																get_stl_dependencies_in_arrayed_class(	name	+	index,	address,	attr,	curr_dim	+	1,	offset	*	curr_dim_size	+	ii);
+												}	else	{
+																char*	elem_addr;
+																elem_addr	=	address	+	(offset	*	curr_dim	+	ii)	*	attr->size	;
+																get_stl_dependencies_in_class(	name	+	index,	elem_addr,	(ATTRIBUTES*)attr->attr	);
+												}
+								}
+				}
 }
 
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::get_stl_dependencies_in_intrinsic( std::string name , void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    // If the variable that we are pointing to is an arrayed
-    if (curr_dim < attr->num_index) {
-
-        // If it is an unconstrained array (a pointer)
-        if (attr->index[curr_dim].size == 0) {
-
-            void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-            if (pointer != NULL) {
-                ALLOC_INFO *alloc_info;
-                alloc_info = get_alloc_info_of( pointer);
-                if (alloc_info != NULL) {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                    }
-                    //get_stl_dependencies(alloc_info);
-                } else {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                        std::cout.flush();
-                    }
-                }
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ <<  ": Allocation reference is NULL." << std::endl;
-                    std::cout.flush();
-                }
-            }
-
-        } else { // otherwise its a constrained array.
-            int ii;
-            for (ii=0 ; ii< attr->index[curr_dim].size ; ii++) {
-                char index[16] ;
-                snprintf(index, sizeof(index), "[%d]", ii) ;
-                //get_stl_dependencies_in_intrinsic( name + index , address, attr, curr_dim + 1, offset * attr->index[curr_dim].size + ii);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::get_stl_dependencies_in_intrinsic(	std::string	name	,	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				//	If	the	variable	that	we	are	pointing	to	is	an	arrayed
+				if	(curr_dim	<	attr->num_index)	{
+
+								//	If	it	is	an	unconstrained	array	(a	pointer)
+								if	(attr->index[curr_dim].size	==	0)	{
+
+												void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+												if	(pointer	!=	NULL)	{
+																ALLOC_INFO	*alloc_info;
+																alloc_info	=	get_alloc_info_of(	pointer);
+																if	(alloc_info	!=	NULL)	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																				}
+																				//get_stl_dependencies(alloc_info);
+																}	else	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																								std::cout.flush();
+																				}
+																}
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<		":	Allocation	reference	is	NULL."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+
+								}	else	{	//	otherwise	its	a	constrained	array.
+												int	ii;
+												for	(ii=0	;	ii<	attr->index[curr_dim].size	;	ii++)	{
+																char	index[16]	;
+																snprintf(index,	sizeof(index),	"[%d]",	ii)	;
+																//get_stl_dependencies_in_intrinsic(	name	+	index	,	address,	attr,	curr_dim	+	1,	offset	*	attr->index[curr_dim].size	+	ii);
+												}
+								}
+				}
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp
index f57f2535b..471e4159d 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_get_type_attributes.cpp
@@ -1,97 +1,97 @@
-#include "trick/MemoryManager.hh"
-#include <sstream>
+#include	"trick/MemoryManager.hh"
+#include	<sstream>
 
-int Trick::MemoryManager::get_type_attributes( TRICK_TYPE& type,
-                                               std::string user_type_name,
-                                               int         n_stars,
-                                               ATTRIBUTES*& sub_attr,
-                                               int&        size) {
+int	Trick::MemoryManager::get_type_attributes(	TRICK_TYPE&	type,
+																																															std::string	user_type_name,
+																																															int									n_stars,
+																																															ATTRIBUTES*&	sub_attr,
+																																															int&								size)	{
 
-    sub_attr = NULL;
+				sub_attr	=	NULL;
 
-    switch (type) {
+				switch	(type)	{
 
-        case TRICK_CHARACTER: {
-           size = (n_stars == 0) ? sizeof(char) : sizeof(void*) ;
-        } break;
-        case TRICK_SHORT: {
-           size = (n_stars == 0) ? sizeof(short) : sizeof(void*) ;
-        } break;
-        case TRICK_INTEGER: {
-           size = (n_stars == 0) ? sizeof(int) : sizeof(void*) ;
-        } break;
-        case TRICK_LONG: {
-           size = (n_stars == 0) ? sizeof(long) : sizeof(void*) ;
-        } break;
-        case TRICK_FLOAT: {
-           size = (n_stars == 0) ? sizeof(float) : sizeof(void*) ;
-        } break;
-        case TRICK_DOUBLE: {
-           size = (n_stars == 0) ? sizeof(double) : sizeof(void*) ;
-        } break;
-        case TRICK_BOOLEAN: {
-           size = (n_stars == 0) ? sizeof(bool) : sizeof(void*) ;
-        } break;
-        case TRICK_LONG_LONG: {
-           size = (n_stars == 0) ? sizeof(long long) : sizeof(void*) ;
-        } break;
-        case TRICK_WCHAR: {
-           size = (n_stars == 0) ? sizeof(wchar_t) : sizeof(void*) ;
-        } break;
-        case TRICK_WSTRING: {
-           size = sizeof(void*) ;
-        } break;
-        case TRICK_UNSIGNED_CHARACTER: {
-           size = (n_stars == 0) ? sizeof(unsigned char) : sizeof(void*) ;
-        } break;
-        case TRICK_UNSIGNED_SHORT: {
-           size = (n_stars == 0) ? sizeof(unsigned short) : sizeof(void*) ;
-        } break;
-        case TRICK_UNSIGNED_INTEGER: {
-           size = (n_stars == 0) ? sizeof(unsigned int) : sizeof(void*) ;
-        } break;
-        case TRICK_UNSIGNED_LONG: {
-           size = (n_stars == 0) ? sizeof(unsigned long) : sizeof(void*) ;
-        } break;
-        case TRICK_UNSIGNED_LONG_LONG: {
-           size = (n_stars == 0) ? sizeof(unsigned long long) : sizeof(void*) ;
-        } break;
-        case TRICK_STRING: {
-           size = (n_stars == 0) ? sizeof(std::string) : sizeof(void*) ;
-        } break;
-        case TRICK_OPAQUE_TYPE:
-        case TRICK_ENUMERATED:
-        case TRICK_STRUCTURED: {
+								case	TRICK_CHARACTER:	{
+											size	=	(n_stars	==	0)	?	sizeof(char)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_SHORT:	{
+											size	=	(n_stars	==	0)	?	sizeof(short)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_INTEGER:	{
+											size	=	(n_stars	==	0)	?	sizeof(int)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_LONG:	{
+											size	=	(n_stars	==	0)	?	sizeof(long)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_FLOAT:	{
+											size	=	(n_stars	==	0)	?	sizeof(float)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_DOUBLE:	{
+											size	=	(n_stars	==	0)	?	sizeof(double)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_BOOLEAN:	{
+											size	=	(n_stars	==	0)	?	sizeof(bool)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_LONG_LONG:	{
+											size	=	(n_stars	==	0)	?	sizeof(long	long)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_WCHAR:	{
+											size	=	(n_stars	==	0)	?	sizeof(wchar_t)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_WSTRING:	{
+											size	=	sizeof(void*)	;
+								}	break;
+								case	TRICK_UNSIGNED_CHARACTER:	{
+											size	=	(n_stars	==	0)	?	sizeof(unsigned	char)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_UNSIGNED_SHORT:	{
+											size	=	(n_stars	==	0)	?	sizeof(unsigned	short)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_UNSIGNED_INTEGER:	{
+											size	=	(n_stars	==	0)	?	sizeof(unsigned	int)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_UNSIGNED_LONG:	{
+											size	=	(n_stars	==	0)	?	sizeof(unsigned	long)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_UNSIGNED_LONG_LONG:	{
+											size	=	(n_stars	==	0)	?	sizeof(unsigned	long	long)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_STRING:	{
+											size	=	(n_stars	==	0)	?	sizeof(std::string)	:	sizeof(void*)	;
+								}	break;
+								case	TRICK_OPAQUE_TYPE:
+								case	TRICK_ENUMERATED:
+								case	TRICK_STRUCTURED:	{
 
-            if (n_stars != 0) {
-                size = sizeof(void*);
-            } else {
-                if ((size = io_src_sizeof_user_type( user_type_name.c_str())) == 0) {
-                    std::stringstream message;
-                    message << "size of type \"" << user_type_name.c_str() <<"\" not found.\n";
-                    emitError(message.str());
-                    return (1);
-                }
-            }
+												if	(n_stars	!=	0)	{
+																size	=	sizeof(void*);
+												}	else	{
+																if	((size	=	io_src_sizeof_user_type(	user_type_name.c_str()))	==	0)	{
+																				std::stringstream	message;
+																				message	<<	"size	of	type	\""	<<	user_type_name.c_str()	<<"\"	not	found.\n";
+																				emitError(message.str());
+																				return	(1);
+																}
+												}
 
-            // Find the attribute info for <user_type_name> and put it in temp_attr.
-            ATTRIBUTES temp_attr;
-            int status = add_attr_info( user_type_name, &temp_attr);
+												//	Find	the	attribute	info	for	<user_type_name>	and	put	it	in	temp_attr.
+												ATTRIBUTES	temp_attr;
+												int	status	=	add_attr_info(	user_type_name,	&temp_attr);
 
-            if ( status == 0 ) {
-                type     = temp_attr.type;
-                sub_attr = (ATTRIBUTES*)(temp_attr.attr);
-            } else {
-                return (1);
-            }
-        } break;
+												if	(	status	==	0	)	{
+																type					=	temp_attr.type;
+																sub_attr	=	(ATTRIBUTES*)(temp_attr.attr);
+												}	else	{
+																return	(1);
+												}
+								}	break;
 
-        default: {
-            std::stringstream message;
-            message << "Unknown data-type \"" << type << "\"." ;
-            emitError(message.str());
-            return (1);
-        } break;
-    }
-    return (0);
+								default:	{
+												std::stringstream	message;
+												message	<<	"Unknown	data-type	\""	<<	type	<<	"\"."	;
+												emitError(message.str());
+												return	(1);
+								}	break;
+				}
+				return	(0);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
index 715cfb498..d1b4c6a6e 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_io_src_intf.cpp
@@ -1,193 +1,193 @@
 
-#include <sstream>
-// Provides stringstream.
-#include <dlfcn.h>
-// Provides dlsym().
-#include <string.h>
-#include "trick/MemoryManager.hh"
+#include	<sstream>
+//	Provides	stringstream.
+#include	<dlfcn.h>
+//	Provides	dlsym().
+#include	<string.h>
+#include	"trick/MemoryManager.hh"
 
-// MEMBER FUNCTION: void* Trick::MemoryManager::io_src_allocate_class(const char* class_name, int num);
+//	MEMBER	FUNCTION:	void*	Trick::MemoryManager::io_src_allocate_class(const	char*	class_name,	int	num);
 
 /**
- * For every class processed by ICG (Interface Code Generator),
- * the generated io_src code contains a function whose name is
- * of the form: io_src_allocate_<class_name>.
- *
- * The purpose of this io_src function is to allocate one or more instances of the class.
- * The purpose of Trick::MemoryManager::io_src_allocate_class() is to call the io_src function.
- * - This requires that the io_src code be linked into the executable.
- * - Then given the name of the class, we can prepend the string "io_src_allocate_"
- * to form the name of the function.
- * - Then we look up the address of the function by name, using dlsym().
- * - If we find it, then we call it and return the address of the allocation.
- * - Otherwise we whine that we couldn't find it and return NULL.
- */
-void* Trick::MemoryManager::io_src_allocate_class(const char* class_name, int num) {
-
-    char alloc_fn_name[512];
-    void* (*construct)(int) = NULL ;
-    void* addr = NULL;
-    unsigned int ii;
-
-    alloc_fn_name[0] = '\0';
-    strcat(alloc_fn_name, "io_src_allocate_");
-    strcat(alloc_fn_name, class_name);
-
-    for (ii = 0; ii < strlen(alloc_fn_name); ii++) {
-        if ( alloc_fn_name[ii] == ':') {
-            alloc_fn_name[ii] = '_';
-        }
-    }
-
-    for ( ii = 0 ; ii < dlhandles.size() && construct == NULL ; ii++ ) {
-        construct = (void*(*)(int)) dlsym( dlhandles[ii], alloc_fn_name);
-    }
-    if ( construct != NULL) {
-        addr = (*construct)(num) ;
-    } else {
-        const char* msg = dlerror();
-        addr = NULL;
-        std::stringstream message;
-        message << "Couldn't find function \"" << alloc_fn_name << "()\". "
-                << "dlerror= " << msg;
-        emitError(message.str());
-    }
-    return (addr);
+	*	For	every	class	processed	by	ICG	(Interface	Code	Generator),
+	*	the	generated	io_src	code	contains	a	function	whose	name	is
+	*	of	the	form:	io_src_allocate_<class_name>.
+	*
+	*	The	purpose	of	this	io_src	function	is	to	allocate	one	or	more	instances	of	the	class.
+	*	The	purpose	of	Trick::MemoryManager::io_src_allocate_class()	is	to	call	the	io_src	function.
+	*	-	This	requires	that	the	io_src	code	be	linked	into	the	executable.
+	*	-	Then	given	the	name	of	the	class,	we	can	prepend	the	string	"io_src_allocate_"
+	*	to	form	the	name	of	the	function.
+	*	-	Then	we	look	up	the	address	of	the	function	by	name,	using	dlsym().
+	*	-	If	we	find	it,	then	we	call	it	and	return	the	address	of	the	allocation.
+	*	-	Otherwise	we	whine	that	we	couldn't	find	it	and	return	NULL.
+	*/
+void*	Trick::MemoryManager::io_src_allocate_class(const	char*	class_name,	int	num)	{
+
+				char	alloc_fn_name[512];
+				void*	(*construct)(int)	=	NULL	;
+				void*	addr	=	NULL;
+				unsigned	int	ii;
+
+				alloc_fn_name[0]	=	'\0';
+				strcat(alloc_fn_name,	"io_src_allocate_");
+				strcat(alloc_fn_name,	class_name);
+
+				for	(ii	=	0;	ii	<	strlen(alloc_fn_name);	ii++)	{
+								if	(	alloc_fn_name[ii]	==	':')	{
+												alloc_fn_name[ii]	=	'_';
+								}
+				}
+
+				for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	construct	==	NULL	;	ii++	)	{
+								construct	=	(void*(*)(int))	dlsym(	dlhandles[ii],	alloc_fn_name);
+				}
+				if	(	construct	!=	NULL)	{
+								addr	=	(*construct)(num)	;
+				}	else	{
+								const	char*	msg	=	dlerror();
+								addr	=	NULL;
+								std::stringstream	message;
+								message	<<	"Couldn't	find	function	\""	<<	alloc_fn_name	<<	"()\".	"
+																<<	"dlerror=	"	<<	msg;
+								emitError(message.str());
+				}
+				return	(addr);
 }
 
-// MEMBER FUNCTION: void Trick::MemoryManager::io_src_destruct_class(ALLOC_INFO * alloc_info);
-void Trick::MemoryManager::io_src_destruct_class(ALLOC_INFO * alloc_info) {
-
-    char destruct_fn_name[512];
-    void* (*destruct)(void*, int) = NULL ;
-
-    if ( (alloc_info->type == TRICK_STRUCTURED) &&
-        (alloc_info->language == Language_CPP) &&
-        ((alloc_info->num_index == 0) || (alloc_info->index[alloc_info->num_index-1] != 0))) {
-
-        destruct_fn_name[0] = '\0';
-        strcat(destruct_fn_name, "io_src_destruct_");
-        strcat(destruct_fn_name, alloc_info->user_type_name );
-
-        for (size_t ii = 0; ii < strlen(destruct_fn_name); ii++) {
-            if ( destruct_fn_name[ii] == ':') {
-                destruct_fn_name[ii] = '_';
-            }
-        }
-
-        for (size_t  ii = 0 ; ii < dlhandles.size() && destruct == NULL ; ii++ ) {
-            destruct = (void*(*)(void*,int)) dlsym( dlhandles[ii], destruct_fn_name);
-        }
-        if ( destruct != NULL) {
-            (*destruct)(alloc_info->start, alloc_info->num) ;
-        } else {
-            const char* msg = dlerror();
-            std::stringstream message;
-            message << "Couldn't find function \"" << destruct_fn_name << "()\". "
-                    << "dlerror= " << msg;
-            emitError(message.str());
-        }
-    }
+//	MEMBER	FUNCTION:	void	Trick::MemoryManager::io_src_destruct_class(ALLOC_INFO	*	alloc_info);
+void	Trick::MemoryManager::io_src_destruct_class(ALLOC_INFO	*	alloc_info)	{
+
+				char	destruct_fn_name[512];
+				void*	(*destruct)(void*,	int)	=	NULL	;
+
+				if	(	(alloc_info->type	==	TRICK_STRUCTURED)	&&
+								(alloc_info->language	==	Language_CPP)	&&
+								((alloc_info->num_index	==	0)	||	(alloc_info->index[alloc_info->num_index-1]	!=	0)))	{
+
+								destruct_fn_name[0]	=	'\0';
+								strcat(destruct_fn_name,	"io_src_destruct_");
+								strcat(destruct_fn_name,	alloc_info->user_type_name	);
+
+								for	(size_t	ii	=	0;	ii	<	strlen(destruct_fn_name);	ii++)	{
+												if	(	destruct_fn_name[ii]	==	':')	{
+																destruct_fn_name[ii]	=	'_';
+												}
+								}
+
+								for	(size_t		ii	=	0	;	ii	<	dlhandles.size()	&&	destruct	==	NULL	;	ii++	)	{
+												destruct	=	(void*(*)(void*,int))	dlsym(	dlhandles[ii],	destruct_fn_name);
+								}
+								if	(	destruct	!=	NULL)	{
+												(*destruct)(alloc_info->start,	alloc_info->num)	;
+								}	else	{
+												const	char*	msg	=	dlerror();
+												std::stringstream	message;
+												message	<<	"Couldn't	find	function	\""	<<	destruct_fn_name	<<	"()\".	"
+																				<<	"dlerror=	"	<<	msg;
+												emitError(message.str());
+								}
+				}
 }
 
-// MEMBER FUNCTION: void Trick::MemoryManager::io_src_delete_class(ALLOC_INFO * alloc_info);
-void Trick::MemoryManager::io_src_delete_class(ALLOC_INFO * alloc_info) {
-    char delete_fn_name[512];
-    void* (*delete_fn)(void*) = NULL ;
-
-    if ( (alloc_info->type == TRICK_STRUCTURED) &&
-        (alloc_info->language == Language_CPP) &&
-        ((alloc_info->num_index == 0) || (alloc_info->index[alloc_info->num_index-1] != 0))) {
-
-        delete_fn_name[0] = '\0';
-        strcat(delete_fn_name, "io_src_delete_");
-        strcat(delete_fn_name, alloc_info->user_type_name );
-
-        for (size_t ii = 0; ii < strlen(delete_fn_name); ii++) {
-            if ( delete_fn_name[ii] == ':') {
-                delete_fn_name[ii] = '_';
-            }
-        }
-
-        for (size_t  ii = 0 ; ii < dlhandles.size() && delete_fn == NULL ; ii++ ) {
-            delete_fn = (void*(*)(void*)) dlsym( dlhandles[ii], delete_fn_name);
-        }
-        if ( delete_fn != NULL) {
-            (*delete_fn)(alloc_info->start) ;
-        } else {
-            const char* msg = dlerror();
-            std::stringstream message;
-            message << "Couldn't find function \"" << delete_fn_name << "()\". "
-                    << "dlerror= " << msg;
-            emitError(message.str());
-        }
-    }
+//	MEMBER	FUNCTION:	void	Trick::MemoryManager::io_src_delete_class(ALLOC_INFO	*	alloc_info);
+void	Trick::MemoryManager::io_src_delete_class(ALLOC_INFO	*	alloc_info)	{
+				char	delete_fn_name[512];
+				void*	(*delete_fn)(void*)	=	NULL	;
+
+				if	(	(alloc_info->type	==	TRICK_STRUCTURED)	&&
+								(alloc_info->language	==	Language_CPP)	&&
+								((alloc_info->num_index	==	0)	||	(alloc_info->index[alloc_info->num_index-1]	!=	0)))	{
+
+								delete_fn_name[0]	=	'\0';
+								strcat(delete_fn_name,	"io_src_delete_");
+								strcat(delete_fn_name,	alloc_info->user_type_name	);
+
+								for	(size_t	ii	=	0;	ii	<	strlen(delete_fn_name);	ii++)	{
+												if	(	delete_fn_name[ii]	==	':')	{
+																delete_fn_name[ii]	=	'_';
+												}
+								}
+
+								for	(size_t		ii	=	0	;	ii	<	dlhandles.size()	&&	delete_fn	==	NULL	;	ii++	)	{
+												delete_fn	=	(void*(*)(void*))	dlsym(	dlhandles[ii],	delete_fn_name);
+								}
+								if	(	delete_fn	!=	NULL)	{
+												(*delete_fn)(alloc_info->start)	;
+								}	else	{
+												const	char*	msg	=	dlerror();
+												std::stringstream	message;
+												message	<<	"Couldn't	find	function	\""	<<	delete_fn_name	<<	"()\".	"
+																				<<	"dlerror=	"	<<	msg;
+												emitError(message.str());
+								}
+				}
 }
 
-// MEMBER FUNCTION: size_t Trick::MemoryManager::io_src_sizeof_user_type( const char* user_type_name);
+//	MEMBER	FUNCTION:	size_t	Trick::MemoryManager::io_src_sizeof_user_type(	const	char*	user_type_name);
 /**
- * There should be a function whose name is of the form:
- *      io_src_sizeof_<user_type>
- * linked into the simulation executable. We need to find
- * it and call it.
- */
-size_t Trick::MemoryManager::io_src_sizeof_user_type( const char* user_type_name) {
-
-    char size_fn_name[512];
-    size_t (*size_fn)(void) = NULL ;
-    size_t class_size = 0;
-    unsigned int ii;
-
-    size_fn_name[0] = '\0';
-    strcat(size_fn_name, "io_src_sizeof_");
-    strcat(size_fn_name, user_type_name);
-
-    for (ii = 0; ii < strlen(size_fn_name); ii++) {
-        if ( size_fn_name[ii] == ':') {
-            size_fn_name[ii] = '_';
-        }
-    }
-
-    for ( ii = 0 ; ii < dlhandles.size() && size_fn == NULL ; ii++ ) {
-        size_fn = (size_t (*)(void)) dlsym( dlhandles[ii], size_fn_name);
-    }
-    if ( size_fn != NULL) {
-        class_size = (*size_fn)() ;
-    } else {
-        const char* msg = dlerror();
-        class_size = 0;
-        std::stringstream message;
-        message << "Couldn't find function \"" << size_fn_name << "()\". "
-                << "dlerror= " << msg;
-        emitError(message.str());
-    }
-    return (class_size);
+	*	There	should	be	a	function	whose	name	is	of	the	form:
+	*						io_src_sizeof_<user_type>
+	*	linked	into	the	simulation	executable.	We	need	to	find
+	*	it	and	call	it.
+	*/
+size_t	Trick::MemoryManager::io_src_sizeof_user_type(	const	char*	user_type_name)	{
+
+				char	size_fn_name[512];
+				size_t	(*size_fn)(void)	=	NULL	;
+				size_t	class_size	=	0;
+				unsigned	int	ii;
+
+				size_fn_name[0]	=	'\0';
+				strcat(size_fn_name,	"io_src_sizeof_");
+				strcat(size_fn_name,	user_type_name);
+
+				for	(ii	=	0;	ii	<	strlen(size_fn_name);	ii++)	{
+								if	(	size_fn_name[ii]	==	':')	{
+												size_fn_name[ii]	=	'_';
+								}
+				}
+
+				for	(	ii	=	0	;	ii	<	dlhandles.size()	&&	size_fn	==	NULL	;	ii++	)	{
+								size_fn	=	(size_t	(*)(void))	dlsym(	dlhandles[ii],	size_fn_name);
+				}
+				if	(	size_fn	!=	NULL)	{
+								class_size	=	(*size_fn)()	;
+				}	else	{
+								const	char*	msg	=	dlerror();
+								class_size	=	0;
+								std::stringstream	message;
+								message	<<	"Couldn't	find	function	\""	<<	size_fn_name	<<	"()\".	"
+																<<	"dlerror=	"	<<	msg;
+								emitError(message.str());
+				}
+				return	(class_size);
 }
 
-// PRIVATE MEMBER FUNCTION
-void Trick::MemoryManager::debug_write_alloc_info( ALLOC_INFO *alloc_info) {
-
-    int ii;
-    std::cout << "alloc_info->start = " << alloc_info->start << std::endl;
-    std::cout << "alloc_info->end   = " << alloc_info->end << std::endl;
-    std::cout << "alloc_info->num   = " << alloc_info->num << std::endl;
-    std::cout << "alloc_info->size  = " << alloc_info->size << std::endl;
-    std::cout << "alloc_info->type  = " << alloc_info->type << std::endl;
-    std::cout << "alloc_info->stcl = " ;
-    if (alloc_info->stcl == TRICK_LOCAL) { std::cout << "TRICK_LOCAL" << std::endl; }
-    if (alloc_info->stcl == TRICK_EXTERN) { std::cout << "TRICK_EXTERN" << std::endl; }
-    std::cout << "alloc_info->language = ";
-    if (alloc_info->language == Language_C  ) { std::cout << "Language_C" << std::endl; }
-    if (alloc_info->language == Language_CPP) { std::cout << "Language_CPP" << std::endl; }
-    std::cout << std::endl;
-    if (alloc_info->user_type_name) {
-        std::cout << "alloc_info->user_type_name = " << alloc_info->user_type_name << std::endl;
-    }
-    std::cout << "alloc_info->index = " ;
-    for (ii=0; ii<alloc_info->num_index; ii++) {
-        std::cout << "[" << alloc_info->index[ii] << "]";
-    }
-    std::cout << std::endl;
-    std::cout.flush();
+//	PRIVATE	MEMBER	FUNCTION
+void	Trick::MemoryManager::debug_write_alloc_info(	ALLOC_INFO	*alloc_info)	{
+
+				int	ii;
+				std::cout	<<	"alloc_info->start	=	"	<<	alloc_info->start	<<	std::endl;
+				std::cout	<<	"alloc_info->end			=	"	<<	alloc_info->end	<<	std::endl;
+				std::cout	<<	"alloc_info->num			=	"	<<	alloc_info->num	<<	std::endl;
+				std::cout	<<	"alloc_info->size		=	"	<<	alloc_info->size	<<	std::endl;
+				std::cout	<<	"alloc_info->type		=	"	<<	alloc_info->type	<<	std::endl;
+				std::cout	<<	"alloc_info->stcl	=	"	;
+				if	(alloc_info->stcl	==	TRICK_LOCAL)	{	std::cout	<<	"TRICK_LOCAL"	<<	std::endl;	}
+				if	(alloc_info->stcl	==	TRICK_EXTERN)	{	std::cout	<<	"TRICK_EXTERN"	<<	std::endl;	}
+				std::cout	<<	"alloc_info->language	=	";
+				if	(alloc_info->language	==	Language_C		)	{	std::cout	<<	"Language_C"	<<	std::endl;	}
+				if	(alloc_info->language	==	Language_CPP)	{	std::cout	<<	"Language_CPP"	<<	std::endl;	}
+				std::cout	<<	std::endl;
+				if	(alloc_info->user_type_name)	{
+								std::cout	<<	"alloc_info->user_type_name	=	"	<<	alloc_info->user_type_name	<<	std::endl;
+				}
+				std::cout	<<	"alloc_info->index	=	"	;
+				for	(ii=0;	ii<alloc_info->num_index;	ii++)	{
+								std::cout	<<	"["	<<	alloc_info->index[ii]	<<	"]";
+				}
+				std::cout	<<	std::endl;
+				std::cout.flush();
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
index d940fc84a..08f6a5d44 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_is_alloced.cpp
@@ -1,29 +1,29 @@
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
-int Trick::MemoryManager::is_alloced(void *addr) {
+int	Trick::MemoryManager::is_alloced(void	*addr)	{
 
-    ALLOC_INFO *info;
+				ALLOC_INFO	*info;
 
-    pthread_mutex_lock(&mm_mutex);
-    if ( (info = get_alloc_info_at( addr)) != NULL) {
-        pthread_mutex_unlock(&mm_mutex);
-        return (1);
-    }
-    pthread_mutex_unlock(&mm_mutex);
-    return (0);
+				pthread_mutex_lock(&mm_mutex);
+				if	(	(info	=	get_alloc_info_at(	addr))	!=	NULL)	{
+								pthread_mutex_unlock(&mm_mutex);
+								return	(1);
+				}
+				pthread_mutex_unlock(&mm_mutex);
+				return	(0);
 }
 
-// MEMBER FUNCTION:
-int Trick::MemoryManager::var_exists( std::string var_name) {
-    VARIABLE_MAP::iterator variable_pos;
+//	MEMBER	FUNCTION:
+int	Trick::MemoryManager::var_exists(	std::string	var_name)	{
+				VARIABLE_MAP::iterator	variable_pos;
 
-    pthread_mutex_lock(&mm_mutex);
-    variable_pos = variable_map.find( var_name);
+				pthread_mutex_lock(&mm_mutex);
+				variable_pos	=	variable_map.find(	var_name);
 
-    if (variable_pos != variable_map.end()) {
-        pthread_mutex_unlock(&mm_mutex);
-        return (1);
-    }
-    pthread_mutex_unlock(&mm_mutex);
-    return (0);
+				if	(variable_pos	!=	variable_map.end())	{
+								pthread_mutex_unlock(&mm_mutex);
+								return	(1);
+				}
+				pthread_mutex_unlock(&mm_mutex);
+				return	(0);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp
index 06e9ec606..c08bdf481 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_make_declaration.cpp
@@ -1,23 +1,23 @@
-#include "trick/MemoryManager.hh"
-#include <sstream>
+#include	"trick/MemoryManager.hh"
+#include	<sstream>
 
-std::string Trick::MemoryManager::make_decl_string( TRICK_TYPE type,
-                                  std::string user_type_name,
-                                  int n_stars,
-                                  std::string var_name,
-                                  int n_cdims,
-                                  int *cdims) {
+std::string	Trick::MemoryManager::make_decl_string(	TRICK_TYPE	type,
+																																		std::string	user_type_name,
+																																		int	n_stars,
+																																		std::string	var_name,
+																																		int	n_cdims,
+																																		int	*cdims)	{
 
-    std::stringstream ss;
+				std::stringstream	ss;
 
-    ss << trickTypeCharString(type, user_type_name.c_str());
-    for (int ii=0; ii<n_stars; ii++) {
-        ss << "*";
-    }
-    ss << " ";
-    ss << var_name ;
-    for (int ii=0; ii<n_cdims; ii++) {
-        ss << "[" << cdims[ii] << "]";
-    }
-    return ss.str();
+				ss	<<	trickTypeCharString(type,	user_type_name.c_str());
+				for	(int	ii=0;	ii<n_stars;	ii++)	{
+								ss	<<	"*";
+				}
+				ss	<<	"	";
+				ss	<<	var_name	;
+				for	(int	ii=0;	ii<n_cdims;	ii++)	{
+								ss	<<	"["	<<	cdims[ii]	<<	"]";
+				}
+				return	ss.str();
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp
index abc991165..88e1de632 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_make_reference_attr.cpp
@@ -1,46 +1,46 @@
 
-#include <stdlib.h>
-
-#include "trick/MemoryManager.hh"
-
-static const char * nil_units = "1";
-
-// MEMBER FUNCTION
-ATTRIBUTES* Trick::MemoryManager::make_reference_attr( ALLOC_INFO* alloc_info) {
-
-    int ii;
-    ATTRIBUTES*  reference_attr;
-
-    // This must be a named allocation.
-
-    reference_attr = (ATTRIBUTES *) calloc(1, (int) sizeof(ATTRIBUTES));
-    reference_attr->name = alloc_info->name;
-    reference_attr->type_name = NULL;
-    reference_attr->units = nil_units;
-    reference_attr->alias = NULL;
-    reference_attr->user_defined = NULL;
-    reference_attr->des = NULL;
-    reference_attr->io = TRICK_VAR_OUTPUT | TRICK_VAR_INPUT | TRICK_CHKPNT_OUTPUT | TRICK_CHKPNT_INPUT ;
-    reference_attr->type = alloc_info->type;
-    reference_attr->size = alloc_info->size;
-    reference_attr->range_min = 0.0;
-    reference_attr->range_max = 0.0;
-    reference_attr->language = alloc_info->language;
-    reference_attr->mods = 0;
-    reference_attr->offset = 0;
-    reference_attr->attr = alloc_info->attr;
-    reference_attr->num_index = alloc_info->num_index;
-    for(ii=0; ii< reference_attr->num_index; ii++) {
-        reference_attr->index[ii].start= 0;
-        reference_attr->index[ii].size = alloc_info->index[ii];
-    }
-    return( reference_attr);
+#include	<stdlib.h>
+
+#include	"trick/MemoryManager.hh"
+
+static	const	char	*	nil_units	=	"1";
+
+//	MEMBER	FUNCTION
+ATTRIBUTES*	Trick::MemoryManager::make_reference_attr(	ALLOC_INFO*	alloc_info)	{
+
+				int	ii;
+				ATTRIBUTES*		reference_attr;
+
+				//	This	must	be	a	named	allocation.
+
+				reference_attr	=	(ATTRIBUTES	*)	calloc(1,	(int)	sizeof(ATTRIBUTES));
+				reference_attr->name	=	alloc_info->name;
+				reference_attr->type_name	=	NULL;
+				reference_attr->units	=	nil_units;
+				reference_attr->alias	=	NULL;
+				reference_attr->user_defined	=	NULL;
+				reference_attr->des	=	NULL;
+				reference_attr->io	=	TRICK_VAR_OUTPUT	|	TRICK_VAR_INPUT	|	TRICK_CHKPNT_OUTPUT	|	TRICK_CHKPNT_INPUT	;
+				reference_attr->type	=	alloc_info->type;
+				reference_attr->size	=	alloc_info->size;
+				reference_attr->range_min	=	0.0;
+				reference_attr->range_max	=	0.0;
+				reference_attr->language	=	alloc_info->language;
+				reference_attr->mods	=	0;
+				reference_attr->offset	=	0;
+				reference_attr->attr	=	alloc_info->attr;
+				reference_attr->num_index	=	alloc_info->num_index;
+				for(ii=0;	ii<	reference_attr->num_index;	ii++)	{
+								reference_attr->index[ii].start=	0;
+								reference_attr->index[ii].size	=	alloc_info->index[ii];
+				}
+				return(	reference_attr);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::free_reference_attr( ATTRIBUTES* reference_attr) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::free_reference_attr(	ATTRIBUTES*	reference_attr)	{
 
-    if (reference_attr) {
-        free (reference_attr);
-    }
+				if	(reference_attr)	{
+								free	(reference_attr);
+				}
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
index 3737547ae..40f0de79a 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_map_external_object.cpp
@@ -1,252 +1,252 @@
-#include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<string.h>
 
-#include "trick/MemoryManager.hh"
-#include "trick/ADefParseContext.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/ADefParseContext.hh"
 
 /**
- @par Description:
- declare_extern_var describes an externally allocated memory object to the memory manager.
- */
-
-// MEMBER FUNCTION
-void* Trick::MemoryManager::
-      declare_extern_var( void* address,
-                           TRICK_TYPE type,
-                           std::string user_type_name,
-                           int n_stars,
-                           std::string var_name,
-                           int n_cdims,
-                           int *cdims) {
-
-    int ii;
-    int size;
-    char* allocation_name;
-    int n_elems;
-    ATTRIBUTES* sub_attr;
-    ALLOC_INFO *new_alloc;
-    VARIABLE_MAP::iterator variable_pos;
-
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
-
-    /** @li Validate Parameters. The address can't be NULL.*/
-    if (address == NULL) {
-        emitError("declare_extern_var() called with NULL address.");
-        return ((void*)NULL);
-    }
-
-    /** @li Determine whether the given variable name is already in use. */
-    if (var_name != "") {
-        pthread_mutex_lock(&mm_mutex);
-        variable_pos = variable_map.find( var_name);
-        if (variable_pos != variable_map.end()) {
-            std::stringstream message;
-            message << "Variable \""<< var_name <<"\" already declared.";
-            emitError(message.str());
-            pthread_mutex_unlock(&mm_mutex);
-            return ((void*)NULL);
-        }
-        pthread_mutex_unlock(&mm_mutex);
-        allocation_name = strdup( var_name.c_str());
-    } else {
-        allocation_name = NULL;
-    }
-
-
-    /** @li Calculate the number of elements in this external variable. This is
-            the product of the sizes of the constrained dimensions. */
-    n_elems = 1;
-    for (ii = 0; ii < n_cdims ; ii++ ) {
-        n_elems = n_elems * cdims[ii];
-    }
-    if (n_elems == 0) {
-        std::stringstream message;
-        message << "declare_extern_var() can't register \"" << var_name
-                << "\" because one or more of its constrained dimensions "
-                << "is zero, thus making its total size zero.";
-        emitError(message.str());
-        return ((void*)NULL);
-    }
-
-    /** @li From the TRICK_TYPE, user_type_name and the number of pointers (asterisks),
-            determine the size and the attributes of an element. */
-    if ( get_type_attributes(type, user_type_name, n_stars, sub_attr, size) != 0) {
-        std::stringstream message;
-        message << "get_type_attributes failed for type "
-                << type << " \"" << user_type_name << "\".";
-        emitError(message.str());
-        return ((void*)NULL);
-    }
-
-    /** @li Allocate and populate an ALLOC_INFO record for the external allocation
-        (the thingy pointed to by @b address).
-     */
-    if ((new_alloc = (ALLOC_INFO*)calloc(1, sizeof(ALLOC_INFO))) != NULL) {
-
-        new_alloc->start = (void *) address;
-        new_alloc->end = ((char*)new_alloc->start) + (n_elems * size) - 1;
-        new_alloc->name = allocation_name;
-        new_alloc->stcl = TRICK_EXTERN;
-        new_alloc->alloc_type = TRICK_ALLOC_OTHER;
-        new_alloc->size = size;
-        if ( sub_attr != NULL ) {
-            new_alloc->language = sub_attr->language ;
-        } else {
-            new_alloc->language = Language_C ;
-        }
-        new_alloc->type = type;
-
-        if ((type == TRICK_STRUCTURED) || (type == TRICK_ENUMERATED) || (type == TRICK_OPAQUE_TYPE)) {
-            new_alloc->user_type_name = strdup( user_type_name.c_str());
-        } else {
-            new_alloc->user_type_name = NULL ;
-        }
-
-        new_alloc->attr = sub_attr;
-        new_alloc->num = n_elems;
-
-        new_alloc->num_index = 0;
-        for (ii = 0; ii < n_cdims ; ii++ ) {
-            new_alloc->index[new_alloc->num_index] = cdims[ii];
-            new_alloc->num_index ++ ;
-        }
-        for (ii = 0 ; ii < n_stars ; ii++) {
-            new_alloc->index[new_alloc->num_index] = 0;
-            new_alloc->num_index ++ ;
-        }
-
-        new_alloc->id = extern_alloc_info_map_counter++ ;
-
-        /** @li Insert the <address, ALLOC_INFO> key-value pair into the alloc_info_map.*/
-        pthread_mutex_lock(&mm_mutex);
-        alloc_info_map[address] = new_alloc;
-
-        /** @li Insert the <variable-name, ALLOC_INFO> key-value pair into the variable map. */
-        if (new_alloc->name) {
-            variable_map[new_alloc->name] = new_alloc;
-        }
-        pthread_mutex_unlock(&mm_mutex);
-    } else {
-        emitError("Out of memory.") ;
-        return ((void*)NULL);
-    }
-
-    if (debug_level) {
-        int i;
-        std::cout << std::endl;
-        std::cout << "Extern declaration: " << new_alloc->num << " element(s) of type(" ;
-        std::cout << trickTypeCharString(type, user_type_name.c_str()) ;
-        for (i=0;i<n_stars;i++) {
-            std::cout << "*";
-        }
-        std::cout << "), size(" << size << ") @ addr(" << address << ")." ;
-        std::cout << std::endl << std::endl;
-        std::cout.flush();
-    }
-
-    /** @li Return the address of the allocation. */
-    return (address);
+	@par	Description:
+	declare_extern_var	describes	an	externally	allocated	memory	object	to	the	memory	manager.
+	*/
+
+//	MEMBER	FUNCTION
+void*	Trick::MemoryManager::
+						declare_extern_var(	void*	address,
+																											TRICK_TYPE	type,
+																											std::string	user_type_name,
+																											int	n_stars,
+																											std::string	var_name,
+																											int	n_cdims,
+																											int	*cdims)	{
+
+				int	ii;
+				int	size;
+				char*	allocation_name;
+				int	n_elems;
+				ATTRIBUTES*	sub_attr;
+				ALLOC_INFO	*new_alloc;
+				VARIABLE_MAP::iterator	variable_pos;
+
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
+
+				/**	@li	Validate	Parameters.	The	address	can't	be	NULL.*/
+				if	(address	==	NULL)	{
+								emitError("declare_extern_var()	called	with	NULL	address.");
+								return	((void*)NULL);
+				}
+
+				/**	@li	Determine	whether	the	given	variable	name	is	already	in	use.	*/
+				if	(var_name	!=	"")	{
+								pthread_mutex_lock(&mm_mutex);
+								variable_pos	=	variable_map.find(	var_name);
+								if	(variable_pos	!=	variable_map.end())	{
+												std::stringstream	message;
+												message	<<	"Variable	\""<<	var_name	<<"\"	already	declared.";
+												emitError(message.str());
+												pthread_mutex_unlock(&mm_mutex);
+												return	((void*)NULL);
+								}
+								pthread_mutex_unlock(&mm_mutex);
+								allocation_name	=	strdup(	var_name.c_str());
+				}	else	{
+								allocation_name	=	NULL;
+				}
+
+
+				/**	@li	Calculate	the	number	of	elements	in	this	external	variable.	This	is
+												the	product	of	the	sizes	of	the	constrained	dimensions.	*/
+				n_elems	=	1;
+				for	(ii	=	0;	ii	<	n_cdims	;	ii++	)	{
+								n_elems	=	n_elems	*	cdims[ii];
+				}
+				if	(n_elems	==	0)	{
+								std::stringstream	message;
+								message	<<	"declare_extern_var()	can't	register	\""	<<	var_name
+																<<	"\"	because	one	or	more	of	its	constrained	dimensions	"
+																<<	"is	zero,	thus	making	its	total	size	zero.";
+								emitError(message.str());
+								return	((void*)NULL);
+				}
+
+				/**	@li	From	the	TRICK_TYPE,	user_type_name	and	the	number	of	pointers	(asterisks),
+												determine	the	size	and	the	attributes	of	an	element.	*/
+				if	(	get_type_attributes(type,	user_type_name,	n_stars,	sub_attr,	size)	!=	0)	{
+								std::stringstream	message;
+								message	<<	"get_type_attributes	failed	for	type	"
+																<<	type	<<	"	\""	<<	user_type_name	<<	"\".";
+								emitError(message.str());
+								return	((void*)NULL);
+				}
+
+				/**	@li	Allocate	and	populate	an	ALLOC_INFO	record	for	the	external	allocation
+								(the	thingy	pointed	to	by	@b	address).
+					*/
+				if	((new_alloc	=	(ALLOC_INFO*)calloc(1,	sizeof(ALLOC_INFO)))	!=	NULL)	{
+
+								new_alloc->start	=	(void	*)	address;
+								new_alloc->end	=	((char*)new_alloc->start)	+	(n_elems	*	size)	-	1;
+								new_alloc->name	=	allocation_name;
+								new_alloc->stcl	=	TRICK_EXTERN;
+								new_alloc->alloc_type	=	TRICK_ALLOC_OTHER;
+								new_alloc->size	=	size;
+								if	(	sub_attr	!=	NULL	)	{
+												new_alloc->language	=	sub_attr->language	;
+								}	else	{
+												new_alloc->language	=	Language_C	;
+								}
+								new_alloc->type	=	type;
+
+								if	((type	==	TRICK_STRUCTURED)	||	(type	==	TRICK_ENUMERATED)	||	(type	==	TRICK_OPAQUE_TYPE))	{
+												new_alloc->user_type_name	=	strdup(	user_type_name.c_str());
+								}	else	{
+												new_alloc->user_type_name	=	NULL	;
+								}
+
+								new_alloc->attr	=	sub_attr;
+								new_alloc->num	=	n_elems;
+
+								new_alloc->num_index	=	0;
+								for	(ii	=	0;	ii	<	n_cdims	;	ii++	)	{
+												new_alloc->index[new_alloc->num_index]	=	cdims[ii];
+												new_alloc->num_index	++	;
+								}
+								for	(ii	=	0	;	ii	<	n_stars	;	ii++)	{
+												new_alloc->index[new_alloc->num_index]	=	0;
+												new_alloc->num_index	++	;
+								}
+
+								new_alloc->id	=	extern_alloc_info_map_counter++	;
+
+								/**	@li	Insert	the	<address,	ALLOC_INFO>	key-value	pair	into	the	alloc_info_map.*/
+								pthread_mutex_lock(&mm_mutex);
+								alloc_info_map[address]	=	new_alloc;
+
+								/**	@li	Insert	the	<variable-name,	ALLOC_INFO>	key-value	pair	into	the	variable	map.	*/
+								if	(new_alloc->name)	{
+												variable_map[new_alloc->name]	=	new_alloc;
+								}
+								pthread_mutex_unlock(&mm_mutex);
+				}	else	{
+								emitError("Out	of	memory.")	;
+								return	((void*)NULL);
+				}
+
+				if	(debug_level)	{
+								int	i;
+								std::cout	<<	std::endl;
+								std::cout	<<	"Extern	declaration:	"	<<	new_alloc->num	<<	"	element(s)	of	type("	;
+								std::cout	<<	trickTypeCharString(type,	user_type_name.c_str())	;
+								for	(i=0;i<n_stars;i++)	{
+												std::cout	<<	"*";
+								}
+								std::cout	<<	"),	size("	<<	size	<<	")	@	addr("	<<	address	<<	")."	;
+								std::cout	<<	std::endl	<<	std::endl;
+								std::cout.flush();
+				}
+
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(address);
 }
 
-// MEMBER FUNCTION
-void* Trick::MemoryManager::
-      declare_extern_var(void*       address,
-                          const char* alloc_definition) {
-
-    void* res_address = NULL;
-
-    ADefParseContext* context = NULL;
-    std::stringstream alloc_decl_sstream;
-
-    /** @par Design Details:
-     This function is implemented using the following algorithm:
-     */
-
-    alloc_decl_sstream << alloc_definition;
-
-    /** @li Create a parse context. */
-    context = new ADefParseContext( &alloc_decl_sstream);
-
-    /** @li Call ADEF_parse to parse the declaration. */
-    if (context != NULL) {
-        if ( ADEF_parse( context) == 0) {
-
-            /** @li Call the general form of declare_extern_var. */
-            res_address = declare_extern_var( address,
-                                               context->type,
-                                               context->user_type_name,
-                                               context->n_stars,
-                                               context->var_name,
-                                               context->n_cdims,
-                                               context->cdims);
-
-            /** @li Delete the parse context. */
-            delete( context);
-        } else {
-            std::stringstream message;
-            message << "Invalid declaration \"" << alloc_definition << "\".";
-            emitError(message.str());
-        }
-    }
-    /** @li Return the address. */
-    return ( res_address);
+//	MEMBER	FUNCTION
+void*	Trick::MemoryManager::
+						declare_extern_var(void*							address,
+																										const	char*	alloc_definition)	{
+
+				void*	res_address	=	NULL;
+
+				ADefParseContext*	context	=	NULL;
+				std::stringstream	alloc_decl_sstream;
+
+				/**	@par	Design	Details:
+					This	function	is	implemented	using	the	following	algorithm:
+					*/
+
+				alloc_decl_sstream	<<	alloc_definition;
+
+				/**	@li	Create	a	parse	context.	*/
+				context	=	new	ADefParseContext(	&alloc_decl_sstream);
+
+				/**	@li	Call	ADEF_parse	to	parse	the	declaration.	*/
+				if	(context	!=	NULL)	{
+								if	(	ADEF_parse(	context)	==	0)	{
+
+												/**	@li	Call	the	general	form	of	declare_extern_var.	*/
+												res_address	=	declare_extern_var(	address,
+																																															context->type,
+																																															context->user_type_name,
+																																															context->n_stars,
+																																															context->var_name,
+																																															context->n_cdims,
+																																															context->cdims);
+
+												/**	@li	Delete	the	parse	context.	*/
+												delete(	context);
+								}	else	{
+												std::stringstream	message;
+												message	<<	"Invalid	declaration	\""	<<	alloc_definition	<<	"\".";
+												emitError(message.str());
+								}
+				}
+				/**	@li	Return	the	address.	*/
+				return	(	res_address);
 }
 
-// MEMBER FUNCTION
-void* Trick::MemoryManager::
-      declare_extern_var( void*       address,
-                          const char* element_definition,
-                          int         n_elems) {
-
-    void* res_address = NULL;
-    int cdims[8];
-    int n_cdims;
-
-    ADefParseContext* context = NULL;
-    std::stringstream alloc_decl_sstream;
-
-    /** We know that our array will be at least one dimensional and that dimension contains n_elems elements. */
-    cdims[0] = n_elems;
-    n_cdims = 1;
-
-    alloc_decl_sstream << element_definition;
-
-    /** @li Create a parse context. */
-    context = new ADefParseContext( &alloc_decl_sstream);
-
-    if (context != NULL) {
-
-    /** @li Parse the allocation definition and ensure that the dimension is at least one less than the maximum of 8. */
-        if (( ADEF_parse( context) == 0) && (context->n_cdims < 8) ){
-            int ii;
-
-            /** @li Add the dimensions of the element definition. */
-            for (ii=0 ; ii < context->n_cdims ; ii++) {
-                cdims[ii+1] = context->cdims[ii];
-                n_cdims ++;
-            }
-
-            /** @li Call the general form of declare_var to perform the allocation. */
-            res_address = declare_extern_var( address,
-                                              context->type,
-                                              context->user_type_name,
-                                              context->n_stars,
-                                              context->var_name,
-                                              n_cdims,
-                                              cdims);
-
-            /** @li Delete the parse context. */
-            delete( context);
-        } else {
-            std::stringstream message;
-            message << "declare_extern_var( \"" << element_definition
-                    << "\"," << n_elems << ") failed.";
-            emitError(message.str());
-        }
-    }
-    /** @li Return the address of the allocation. */
-    return ( res_address);
+//	MEMBER	FUNCTION
+void*	Trick::MemoryManager::
+						declare_extern_var(	void*							address,
+																										const	char*	element_definition,
+																										int									n_elems)	{
+
+				void*	res_address	=	NULL;
+				int	cdims[8];
+				int	n_cdims;
+
+				ADefParseContext*	context	=	NULL;
+				std::stringstream	alloc_decl_sstream;
+
+				/**	We	know	that	our	array	will	be	at	least	one	dimensional	and	that	dimension	contains	n_elems	elements.	*/
+				cdims[0]	=	n_elems;
+				n_cdims	=	1;
+
+				alloc_decl_sstream	<<	element_definition;
+
+				/**	@li	Create	a	parse	context.	*/
+				context	=	new	ADefParseContext(	&alloc_decl_sstream);
+
+				if	(context	!=	NULL)	{
+
+				/**	@li	Parse	the	allocation	definition	and	ensure	that	the	dimension	is	at	least	one	less	than	the	maximum	of	8.	*/
+								if	((	ADEF_parse(	context)	==	0)	&&	(context->n_cdims	<	8)	){
+												int	ii;
+
+												/**	@li	Add	the	dimensions	of	the	element	definition.	*/
+												for	(ii=0	;	ii	<	context->n_cdims	;	ii++)	{
+																cdims[ii+1]	=	context->cdims[ii];
+																n_cdims	++;
+												}
+
+												/**	@li	Call	the	general	form	of	declare_var	to	perform	the	allocation.	*/
+												res_address	=	declare_extern_var(	address,
+																																														context->type,
+																																														context->user_type_name,
+																																														context->n_stars,
+																																														context->var_name,
+																																														n_cdims,
+																																														cdims);
+
+												/**	@li	Delete	the	parse	context.	*/
+												delete(	context);
+								}	else	{
+												std::stringstream	message;
+												message	<<	"declare_extern_var(	\""	<<	element_definition
+																				<<	"\","	<<	n_elems	<<	")	failed.";
+												emitError(message.str());
+								}
+				}
+				/**	@li	Return	the	address	of	the	allocation.	*/
+				return	(	res_address);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
index 72824eaed..da5049bc5 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_realloc.cpp
@@ -1,233 +1,233 @@
-#include "trick/MemoryManager.hh"
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <sstream>
-#include <string.h>
-
-// PRIVATE MEMBER FUNCTION
-void Trick::MemoryManager::recursive_array_copy( void *s_base,
-                                                 void *d_base,
-                                                 int *s_cdims,
-                                                 int *d_cdims,
-                                                 size_t size,
-                                                 int n,
-                                                 int cur,
-                                                 int s_off,
-                                                 int d_off) {
-    char *s_addr, *d_addr;
-    int ii;
-
-    if (cur == n) {
-        s_addr = (char*)s_base + s_off * size;
-        d_addr = (char*)d_base + d_off * size;
-        memcpy( d_addr, s_addr, size);
-    } else {
-
-        for (ii=0 ; (ii<s_cdims[cur])&&(ii<d_cdims[cur]) ; ii++ ) {
-              recursive_array_copy( s_base,
-                                    d_base,
-                                    s_cdims,
-                                    d_cdims,
-                                    size,
-                                    n,
-                                    cur+1,
-                                    s_off * s_cdims[cur] + ii,
-                                    d_off * d_cdims[cur] + ii);
-        }
-    }
+#include	"trick/MemoryManager.hh"
+#include	<dlfcn.h>
+#include	<stdlib.h>
+#include	<sstream>
+#include	<string.h>
+
+//	PRIVATE	MEMBER	FUNCTION
+void	Trick::MemoryManager::recursive_array_copy(	void	*s_base,
+																																																	void	*d_base,
+																																																	int	*s_cdims,
+																																																	int	*d_cdims,
+																																																	size_t	size,
+																																																	int	n,
+																																																	int	cur,
+																																																	int	s_off,
+																																																	int	d_off)	{
+				char	*s_addr,	*d_addr;
+				int	ii;
+
+				if	(cur	==	n)	{
+								s_addr	=	(char*)s_base	+	s_off	*	size;
+								d_addr	=	(char*)d_base	+	d_off	*	size;
+								memcpy(	d_addr,	s_addr,	size);
+				}	else	{
+
+								for	(ii=0	;	(ii<s_cdims[cur])&&(ii<d_cdims[cur])	;	ii++	)	{
+														recursive_array_copy(	s_base,
+																																				d_base,
+																																				s_cdims,
+																																				d_cdims,
+																																				size,
+																																				n,
+																																				cur+1,
+																																				s_off	*	s_cdims[cur]	+	ii,
+																																				d_off	*	d_cdims[cur]	+	ii);
+								}
+				}
 }
 
 
-// PRIVATE MEMBER FUNCTION
-void Trick::MemoryManager::array_copy( void *s_base,
-                                       void *d_base,
-                                       int *s_cdims,
-                                       int *d_cdims,
-                                       size_t size,
-                                       int n) {
+//	PRIVATE	MEMBER	FUNCTION
+void	Trick::MemoryManager::array_copy(	void	*s_base,
+																																							void	*d_base,
+																																							int	*s_cdims,
+																																							int	*d_cdims,
+																																							size_t	size,
+																																							int	n)	{
 
-   recursive_array_copy( s_base, d_base, s_cdims, d_cdims, size, n, 0, 0, 0);
+			recursive_array_copy(	s_base,	d_base,	s_cdims,	d_cdims,	size,	n,	0,	0,	0);
 }
 
 
-// PUBLIC MEMBER FUNCTION
-void* Trick::MemoryManager::resize_array( void *address, int n_cdims, int *cdims) {
-
-    ALLOC_INFO *alloc_info;
-    int ii;
-    int pre_n_cdims;
-    int new_n_elems;
-    int n_stars;
-    void *new_address;
-
-    /** @li Find the ALLOC_INFO record for the object at the given address.*/
-    pthread_mutex_lock(&mm_mutex);
-    alloc_info = get_alloc_info_at( address);
-
-    if (alloc_info == NULL) {
-        emitError("Address passed to resize_array is NULL.") ;
-        pthread_mutex_unlock(&mm_mutex);
-        return ( (void*)NULL);
-    }
-
-    if (alloc_info->stcl != TRICK_LOCAL) {
-        std::stringstream message;
-        message << "Cannot resize the array at [" << address << "] because it's EXTERN.";
-        emitError(message.str());
-        pthread_mutex_unlock(&mm_mutex);
-        return ( (void*)NULL);
-    }
-
-    if (alloc_info->type == TRICK_STRING) {
-        std::stringstream message;
-        message << "resize_array doesn't support STL strings.";
-        emitError(message.str());
-        pthread_mutex_unlock(&mm_mutex);
-        return ( (void*)NULL);
-    }
-
-    /** @li Determine the number of constrained dimensions in the existing allocation.*/
-    pre_n_cdims = 0;
-    for (ii=0 ; ii<alloc_info->num_index ; ii++) {
-       if (alloc_info->index[ii]!=0) {
-           pre_n_cdims++;
-       }
-    }
-    n_stars = alloc_info->num_index - pre_n_cdims;
-    pthread_mutex_unlock(&mm_mutex);
-
-    /** @li Verify that the number of constrained dimensions in the existing allocation
-        are the same as those in the proposed re-allocation.*/
-    if (n_cdims != pre_n_cdims) {
-        if (pre_n_cdims == 0) {
-            std::stringstream message;
-            message << "resize_array: The object at address [" << address
-                    << "] is not an array. If you want to be able to resize "
-                    << "it then declare it as an array (of at least one).";
-            emitError(message.str());
-        } else {
-            std::stringstream message;
-            message << "resize_array: The number of dimensions specified, [" << n_cdims
-                    << "], doesn't match the number of dimensions of the object at "
-                    << address <<", [" << pre_n_cdims << "].";
-            emitError(message.str());
-        }
-        return ( (void*)NULL);
-    }
-
-    /** @li Calculate the new number of elements to be allocated. */
-    new_n_elems = 1;
-    for (ii = 0; ii < n_cdims ; ii++ ) {
-        new_n_elems = new_n_elems * cdims[ii];
-    }
-    if (new_n_elems == 0) {
-        emitError("One or more of the constrained dimensions is zero.");
-        return ((void*)NULL);
-    }
-
-    /** @li Allocate new memory. */
-    pthread_mutex_lock(&mm_mutex);
-    if ( (alloc_info->type == TRICK_STRUCTURED) &&
-         (alloc_info->language == Language_CPP) &&
-         (alloc_info->num_index == n_cdims) ) {
-
-        if ((new_address = io_src_allocate_class( alloc_info->user_type_name, new_n_elems)) == NULL) {
-            std::stringstream message;
-            message << "io_src_allocate_class(" << alloc_info->user_type_name << "," << new_n_elems << ") failed to allocate any memory.";
-            emitError(message.str());
-            pthread_mutex_unlock(&mm_mutex);
-            return ((void*)NULL);
-        }
-    } else if ((alloc_info->type == TRICK_STRING) && (n_stars == 0 ) ) {
-        new_address = new (std::nothrow) std::string[new_n_elems];
-        if (new_address == NULL) {
-            pthread_mutex_unlock(&mm_mutex);
-            return ((void*)NULL);
-        }
-    } else {
-        if ( (new_address = calloc( (size_t)new_n_elems, (size_t)alloc_info->size ) ) == NULL) {
-            emitError("Out of memory.") ;
-            pthread_mutex_unlock(&mm_mutex);
-            return ((void*)NULL);
-        }
-    }
-
-    /** @li Copy the data from the previous array to the new array, constrained by the common extents.*/
-    array_copy( alloc_info->start,
-                new_address,
-                alloc_info->index,
-                cdims,
-                alloc_info->size,
-                n_cdims);
-
-    /** @li Delete the previous memory allocation. */
-    free( address);
-
-    // Remove the old <address, ALLOC_INFO*> key-value pair from the alloc_info_map.
-    alloc_info_map.erase( address);
-
-    /** @li Update the ALLOC_INFO record with new start and end addresses, with
-            new extents and with the new number of elements.*/
-    alloc_info->start = new_address;
-    alloc_info->end   = ( (char*)alloc_info->start) + (new_n_elems * alloc_info->size) - 1;
-    for (ii=0 ; ii < n_cdims ; ii++) {
-        alloc_info->index[ii] = cdims[ii];
-    }
-    alloc_info->num = new_n_elems;
-
-    /** @li Insert the new <address, ALLOC_INFO> key-value pair into the alloc_info_map.*/
-    alloc_info_map[alloc_info->start] = alloc_info;
-    pthread_mutex_unlock(&mm_mutex);
-
-    /** @li If debug is enabled, show what happened.*/
-    if (debug_level) {
-        int i;
-        std::cout << std::endl;
-        std::cout << "Re-allocation: " << alloc_info->num << " element(s) of type(" ;
-        std::cout << trickTypeCharString( alloc_info->type, alloc_info->user_type_name ) ;
-        for (i=0;i<n_stars;i++) std::cout << "*";
-        std::cout << "," << alloc_info->type << "), size(" << alloc_info->size << ") @ addr(" << alloc_info->start << ")." ;
-        std::cout << std::endl << std::endl;
-        std::cout.flush();
-    }
-    return (new_address);
+//	PUBLIC	MEMBER	FUNCTION
+void*	Trick::MemoryManager::resize_array(	void	*address,	int	n_cdims,	int	*cdims)	{
+
+				ALLOC_INFO	*alloc_info;
+				int	ii;
+				int	pre_n_cdims;
+				int	new_n_elems;
+				int	n_stars;
+				void	*new_address;
+
+				/**	@li	Find	the	ALLOC_INFO	record	for	the	object	at	the	given	address.*/
+				pthread_mutex_lock(&mm_mutex);
+				alloc_info	=	get_alloc_info_at(	address);
+
+				if	(alloc_info	==	NULL)	{
+								emitError("Address	passed	to	resize_array	is	NULL.")	;
+								pthread_mutex_unlock(&mm_mutex);
+								return	(	(void*)NULL);
+				}
+
+				if	(alloc_info->stcl	!=	TRICK_LOCAL)	{
+								std::stringstream	message;
+								message	<<	"Cannot	resize	the	array	at	["	<<	address	<<	"]	because	it's	EXTERN.";
+								emitError(message.str());
+								pthread_mutex_unlock(&mm_mutex);
+								return	(	(void*)NULL);
+				}
+
+				if	(alloc_info->type	==	TRICK_STRING)	{
+								std::stringstream	message;
+								message	<<	"resize_array	doesn't	support	STL	strings.";
+								emitError(message.str());
+								pthread_mutex_unlock(&mm_mutex);
+								return	(	(void*)NULL);
+				}
+
+				/**	@li	Determine	the	number	of	constrained	dimensions	in	the	existing	allocation.*/
+				pre_n_cdims	=	0;
+				for	(ii=0	;	ii<alloc_info->num_index	;	ii++)	{
+							if	(alloc_info->index[ii]!=0)	{
+											pre_n_cdims++;
+							}
+				}
+				n_stars	=	alloc_info->num_index	-	pre_n_cdims;
+				pthread_mutex_unlock(&mm_mutex);
+
+				/**	@li	Verify	that	the	number	of	constrained	dimensions	in	the	existing	allocation
+								are	the	same	as	those	in	the	proposed	re-allocation.*/
+				if	(n_cdims	!=	pre_n_cdims)	{
+								if	(pre_n_cdims	==	0)	{
+												std::stringstream	message;
+												message	<<	"resize_array:	The	object	at	address	["	<<	address
+																				<<	"]	is	not	an	array.	If	you	want	to	be	able	to	resize	"
+																				<<	"it	then	declare	it	as	an	array	(of	at	least	one).";
+												emitError(message.str());
+								}	else	{
+												std::stringstream	message;
+												message	<<	"resize_array:	The	number	of	dimensions	specified,	["	<<	n_cdims
+																				<<	"],	doesn't	match	the	number	of	dimensions	of	the	object	at	"
+																				<<	address	<<",	["	<<	pre_n_cdims	<<	"].";
+												emitError(message.str());
+								}
+								return	(	(void*)NULL);
+				}
+
+				/**	@li	Calculate	the	new	number	of	elements	to	be	allocated.	*/
+				new_n_elems	=	1;
+				for	(ii	=	0;	ii	<	n_cdims	;	ii++	)	{
+								new_n_elems	=	new_n_elems	*	cdims[ii];
+				}
+				if	(new_n_elems	==	0)	{
+								emitError("One	or	more	of	the	constrained	dimensions	is	zero.");
+								return	((void*)NULL);
+				}
+
+				/**	@li	Allocate	new	memory.	*/
+				pthread_mutex_lock(&mm_mutex);
+				if	(	(alloc_info->type	==	TRICK_STRUCTURED)	&&
+									(alloc_info->language	==	Language_CPP)	&&
+									(alloc_info->num_index	==	n_cdims)	)	{
+
+								if	((new_address	=	io_src_allocate_class(	alloc_info->user_type_name,	new_n_elems))	==	NULL)	{
+												std::stringstream	message;
+												message	<<	"io_src_allocate_class("	<<	alloc_info->user_type_name	<<	","	<<	new_n_elems	<<	")	failed	to	allocate	any	memory.";
+												emitError(message.str());
+												pthread_mutex_unlock(&mm_mutex);
+												return	((void*)NULL);
+								}
+				}	else	if	((alloc_info->type	==	TRICK_STRING)	&&	(n_stars	==	0	)	)	{
+								new_address	=	new	(std::nothrow)	std::string[new_n_elems];
+								if	(new_address	==	NULL)	{
+												pthread_mutex_unlock(&mm_mutex);
+												return	((void*)NULL);
+								}
+				}	else	{
+								if	(	(new_address	=	calloc(	(size_t)new_n_elems,	(size_t)alloc_info->size	)	)	==	NULL)	{
+												emitError("Out	of	memory.")	;
+												pthread_mutex_unlock(&mm_mutex);
+												return	((void*)NULL);
+								}
+				}
+
+				/**	@li	Copy	the	data	from	the	previous	array	to	the	new	array,	constrained	by	the	common	extents.*/
+				array_copy(	alloc_info->start,
+																new_address,
+																alloc_info->index,
+																cdims,
+																alloc_info->size,
+																n_cdims);
+
+				/**	@li	Delete	the	previous	memory	allocation.	*/
+				free(	address);
+
+				//	Remove	the	old	<address,	ALLOC_INFO*>	key-value	pair	from	the	alloc_info_map.
+				alloc_info_map.erase(	address);
+
+				/**	@li	Update	the	ALLOC_INFO	record	with	new	start	and	end	addresses,	with
+												new	extents	and	with	the	new	number	of	elements.*/
+				alloc_info->start	=	new_address;
+				alloc_info->end			=	(	(char*)alloc_info->start)	+	(new_n_elems	*	alloc_info->size)	-	1;
+				for	(ii=0	;	ii	<	n_cdims	;	ii++)	{
+								alloc_info->index[ii]	=	cdims[ii];
+				}
+				alloc_info->num	=	new_n_elems;
+
+				/**	@li	Insert	the	new	<address,	ALLOC_INFO>	key-value	pair	into	the	alloc_info_map.*/
+				alloc_info_map[alloc_info->start]	=	alloc_info;
+				pthread_mutex_unlock(&mm_mutex);
+
+				/**	@li	If	debug	is	enabled,	show	what	happened.*/
+				if	(debug_level)	{
+								int	i;
+								std::cout	<<	std::endl;
+								std::cout	<<	"Re-allocation:	"	<<	alloc_info->num	<<	"	element(s)	of	type("	;
+								std::cout	<<	trickTypeCharString(	alloc_info->type,	alloc_info->user_type_name	)	;
+								for	(i=0;i<n_stars;i++)	std::cout	<<	"*";
+								std::cout	<<	","	<<	alloc_info->type	<<	"),	size("	<<	alloc_info->size	<<	")	@	addr("	<<	alloc_info->start	<<	")."	;
+								std::cout	<<	std::endl	<<	std::endl;
+								std::cout.flush();
+				}
+				return	(new_address);
 }
 
 
-// PUBLIC MEMBER FUNCTION
-void* Trick::MemoryManager::resize_array( void* address, int num) {
-    int dimension = num;
+//	PUBLIC	MEMBER	FUNCTION
+void*	Trick::MemoryManager::resize_array(	void*	address,	int	num)	{
+				int	dimension	=	num;
 
-    return( resize_array( address, 1, &dimension));
+				return(	resize_array(	address,	1,	&dimension));
 }
 
 
-// PUBLIC MEMBER FUNCTION
-void* Trick::MemoryManager::resize_array( const char* name, int n_cdims, int *cdims) {
+//	PUBLIC	MEMBER	FUNCTION
+void*	Trick::MemoryManager::resize_array(	const	char*	name,	int	n_cdims,	int	*cdims)	{
 
-    VARIABLE_MAP::iterator pos;
-    ALLOC_INFO *alloc_info;
+				VARIABLE_MAP::iterator	pos;
+				ALLOC_INFO	*alloc_info;
 
-    pthread_mutex_lock(&mm_mutex);
-    pos = variable_map.find( name);
+				pthread_mutex_lock(&mm_mutex);
+				pos	=	variable_map.find(	name);
 
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
-        pthread_mutex_unlock(&mm_mutex);
-        return( resize_array( alloc_info->start, n_cdims, cdims));
-    } else {
-        std::stringstream message;
-        message << "Cannot resize variable \"" << name << "\" because it doesn't exist.";
-        emitError(message.str());
-    }
-    pthread_mutex_unlock(&mm_mutex);
-    return NULL ;
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
+								pthread_mutex_unlock(&mm_mutex);
+								return(	resize_array(	alloc_info->start,	n_cdims,	cdims));
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Cannot	resize	variable	\""	<<	name	<<	"\"	because	it	doesn't	exist.";
+								emitError(message.str());
+				}
+				pthread_mutex_unlock(&mm_mutex);
+				return	NULL	;
 }
 
 
-// PUBLIC MEMBER FUNCTION
-void* Trick::MemoryManager::resize_array( const char* name, int num) {
-    int dimension = num;
+//	PUBLIC	MEMBER	FUNCTION
+void*	Trick::MemoryManager::resize_array(	const	char*	name,	int	num)	{
+				int	dimension	=	num;
 
-    return( resize_array( name, 1, &dimension));
+				return(	resize_array(	name,	1,	&dimension));
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
index 91e559802..29492be38 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_allocate.cpp
@@ -1,47 +1,47 @@
-#include <iostream>
-#include <sys/types.h>
-#include <string.h>
-#include <sstream>
-
-#include "trick/attributes.h"
-#include "trick/reference.h"
-#include "trick/MemoryManager.hh"
-
-int Trick::MemoryManager::ref_allocate(REF2 * R , int num ) {
-
-    const char *type_name;
-
-    /** @par Design: */
-
-    /** @li Validate Parameters.*/
-    if (R == NULL) {
-        emitError("R is NULL in call to ref_allocate(R,num).") ;
-        return (1);
-    }
-    if (R->attr == NULL) {
-        emitError("R->attr is NULL in call to ref_allocate(R,num).") ;
-        return (1);
-    }
-    if (num <= 0) {
-        emitError("num is <= 0 in call to ref_allocate(R,num).") ;
-        return (1);
-    }
-
-    type_name = R->attr->type_name;
-
-    /** @li If the reference address is NULL, call declare_var() to allocate an anonymous,
-        one dimensional array the elements of which are specified by R->attr->type_name
-        and whose length is specified by @b num. Otherwise, if the address is not NULL
-        then call reallocate to resize the array.
-     */
-    if ( *((char **)R->address) == NULL) {
-        *((char **)R->address) = (char*)declare_var(type_name, num);
-    } else {
-        // FIXME: Is this correct? Or is this an old Bogus kludge?
-        *((char **)R->address) = (char*)resize_array( *((char **) R->address), num);
-    }
-
-    /** @li Return the error status.*/
-    return (0);
+#include	<iostream>
+#include	<sys/types.h>
+#include	<string.h>
+#include	<sstream>
+
+#include	"trick/attributes.h"
+#include	"trick/reference.h"
+#include	"trick/MemoryManager.hh"
+
+int	Trick::MemoryManager::ref_allocate(REF2	*	R	,	int	num	)	{
+
+				const	char	*type_name;
+
+				/**	@par	Design:	*/
+
+				/**	@li	Validate	Parameters.*/
+				if	(R	==	NULL)	{
+								emitError("R	is	NULL	in	call	to	ref_allocate(R,num).")	;
+								return	(1);
+				}
+				if	(R->attr	==	NULL)	{
+								emitError("R->attr	is	NULL	in	call	to	ref_allocate(R,num).")	;
+								return	(1);
+				}
+				if	(num	<=	0)	{
+								emitError("num	is	<=	0	in	call	to	ref_allocate(R,num).")	;
+								return	(1);
+				}
+
+				type_name	=	R->attr->type_name;
+
+				/**	@li	If	the	reference	address	is	NULL,	call	declare_var()	to	allocate	an	anonymous,
+								one	dimensional	array	the	elements	of	which	are	specified	by	R->attr->type_name
+								and	whose	length	is	specified	by	@b	num.	Otherwise,	if	the	address	is	not	NULL
+								then	call	reallocate	to	resize	the	array.
+					*/
+				if	(	*((char	**)R->address)	==	NULL)	{
+								*((char	**)R->address)	=	(char*)declare_var(type_name,	num);
+				}	else	{
+								//	FIXME:	Is	this	correct?	Or	is	this	an	old	Bogus	kludge?
+								*((char	**)R->address)	=	(char*)resize_array(	*((char	**)	R->address),	num);
+				}
+
+				/**	@li	Return	the	error	status.*/
+				return	(0);
 
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
index 183a0fad2..ced3dccd4 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_assignment.cpp
@@ -1,448 +1,448 @@
-#include "trick/MemoryManager.hh"
-#include "trick/bitfield_proto.h"
-#include "trick/vval.h"
-#include "trick/wcs_ext.h"
-#include <limits.h>
-#include <sstream>
-#include <udunits2.h>
-#include <string.h>
-
-int Trick::MemoryManager::assign_recursive(void* base_addr, ATTRIBUTES* attr, int curr_dim, int offset, V_TREE* v_tree, cv_converter* cf) {
-
-   char* assign_addr;
-   int remaining_dimensions = attr->num_index - curr_dim;
-
-   if ( remaining_dimensions == 0 ) {
-
-      switch (attr->type) {
-
-           case TRICK_CHARACTER :
-           case TRICK_UNSIGNED_CHARACTER :
-               assign_addr = (char*)base_addr + offset * sizeof(char);
-               if (v_tree && v_tree->v_data) {
-                   *(char*)assign_addr = vval_char(v_tree->v_data);
-               } else {
-                   *(char*)assign_addr = '\0';
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(char*)" << (void*)assign_addr
-                             << " = ";
-                   if (isprint(*(char*)assign_addr)) {
-                       std::cout << *(char*)assign_addr;
-                   } else {
-                       std::cout << (int)*(char*)assign_addr;
-                   }
-                   std::cout << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_WCHAR :
-               assign_addr = (char*)base_addr + offset * sizeof(wchar_t);
-               if (v_tree && v_tree->v_data) {
-                   *(wchar_t*)assign_addr = vval_char(v_tree->v_data);
-               } else {
-                   *(wchar_t*)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(wchar_t*)" << (void*)assign_addr
-                             << " = " << *(wchar_t*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_SHORT :
-           case TRICK_UNSIGNED_SHORT :
-               assign_addr = (char*)base_addr + offset * sizeof(short);
-               if (v_tree && v_tree->v_data) {
-                   *(short *)assign_addr = vval_short(v_tree->v_data);
-               } else {
-                   *(short *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(short*)" << (void*)assign_addr
-                             << " = " << *(short*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_INTEGER :
-           case TRICK_UNSIGNED_INTEGER :
-               assign_addr = (char*)base_addr + offset * sizeof(int);
-               if (v_tree && v_tree->v_data) {
-                   int input_value;
-                   input_value = vval_int(v_tree->v_data);
-                   if (cf == NULL) {
-                       *(int *)assign_addr = input_value;
-                   } else {
-                       *(int *)assign_addr = (int)cv_convert_double(cf, (double)input_value) ;
-                   }
-               } else {
-                   *(int *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(int*)" << (void*)assign_addr
-                             << " = " << *(int*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_BOOLEAN :
-               assign_addr = (char*)base_addr + offset * sizeof(bool);
-               if (v_tree && v_tree->v_data) {
-                   *(bool *)assign_addr = (vval_short(v_tree->v_data)!=0);
-               } else {
-                   *(bool *)assign_addr = false;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(bool*)" << (void*)assign_addr
-                             << " = " << *(bool*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_ENUMERATED :
-               if (v_tree && v_tree->v_data) {
-                   if ((size_t)attr->size == sizeof(int)) {
-                       assign_addr = (char*)base_addr + offset * sizeof(int);
-                       *(int *)assign_addr = vval_int(v_tree->v_data);
-                       if (debug_level) {
-                           std::cout << std::endl << "Assignment (Enum): *(int*)" << (void*)assign_addr
-                                     << " = " << *(int*)assign_addr << ";" << std::endl;
-                           std::cout.flush();
-                       }
-                   } else if ((size_t)attr->size == sizeof(short)) {
-                       assign_addr = (char*)base_addr + offset * sizeof(short);
-                       *(short *)assign_addr = vval_short(v_tree->v_data);
-                       if (debug_level) {
-                           std::cout << std::endl << "Assignment (Enum): *(short*)" << (void*)assign_addr
-                                     << " = " << *(short*)assign_addr << ";" << std::endl;
-                           std::cout.flush();
-                       }
-                   } else if ((size_t)attr->size == sizeof(char)) {
-                       assign_addr = (char*)base_addr + offset * sizeof(char);
-                       *(char *)assign_addr = vval_char(v_tree->v_data);
-                       if (debug_level) {
-                           std::cout << std::endl << "Assignment (Enum): *(char*)" << (void*)assign_addr
-                                     << " = " << *(char*)assign_addr << ";" << std::endl;
-                           std::cout.flush();
-                       }
-                   } else {
-                       std::stringstream message;
-                       message << "Enumeration of size " << attr->size << " is not supported.";
-                       emitError(message.str());
-                   }
-               } else {
-                   emitError("v_tree data appears to be corrupted.");
-               }
-               break;
-           case TRICK_LONG :
-           case TRICK_UNSIGNED_LONG :
-               assign_addr = (char*)base_addr + offset * sizeof(long);
-               if (v_tree && v_tree->v_data) {
-                   long input_value;
-                   input_value = vval_long(v_tree->v_data);
-                   if (cf == NULL) {
-                       *(long *)assign_addr = input_value;
-                   } else {
-                       *(long *)assign_addr = (long)cv_convert_double(cf, (double)input_value) ;
-                   }
-               } else {
-                   *(long *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(long*)" << (void*)assign_addr
-                             << " = " << *(long*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_FLOAT :
-               assign_addr = (char*)base_addr + offset * sizeof(float);
-               if (v_tree && v_tree->v_data) {
-                   float input_value;
-                   input_value = vval_float(v_tree->v_data);
-                   if (cf == NULL) {  // There is no units conversion.
-                       *(float *)assign_addr = input_value;
-                   } else { // There is units conversion.
-                       *(float *)assign_addr = (float)cv_convert_double(cf, (double)input_value) ;
-                   }
-               } else {
-                   *(float *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(float*)" << (void*)assign_addr
-                             << " = " << *(float*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_DOUBLE :
-               assign_addr = (char*)base_addr + offset * sizeof(double);
-               if (v_tree && v_tree->v_data) {
-                   double input_value;
-                   input_value = vval_double(v_tree->v_data);
-                   if (cf == NULL) {
-                       *(double *)assign_addr = input_value;
-                   } else {
-                       *(double *)assign_addr = cv_convert_double(cf, input_value) ;
-                   }
-               } else {
-                   *(double *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(double*)" << (void*)assign_addr
-                             << " = " << *(double*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_LONG_LONG :
-           case TRICK_UNSIGNED_LONG_LONG :
-               assign_addr = (char*)base_addr + offset * sizeof(long long);
-               if (v_tree && v_tree->v_data) {
-                   *(long long *)assign_addr = vval_longlong(v_tree->v_data);
-               } else {
-                   *(long long *)assign_addr = 0;
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(long long*)" << (void*)assign_addr
-                             << " = " << *(long long*)assign_addr << ";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_BITFIELD :
-           case TRICK_UNSIGNED_BITFIELD : {
-                   int input_value;
-                   assign_addr = (char*)base_addr + offset * (size_t)attr->size;
-                   if (v_tree && v_tree->v_data) {
-                       input_value = vval_int(v_tree->v_data);
-                   } else {
-                       input_value = 0;
-                   }
-                   if (attr->size == sizeof(int)) {
-                       *(unsigned int*)assign_addr = insert_bitfield_any(
-                           *(unsigned int*)assign_addr, input_value, attr->size, attr->index[0].start, attr->index[0].size);
-                   } else if (attr->size == sizeof(short)) {
-                       *(unsigned short*)assign_addr = insert_bitfield_any(
-                           *(unsigned short*)assign_addr, input_value, attr->size, attr->index[0].start, attr->index[0].size);
-                   } else if (attr->size == sizeof(char)) {
-                       *(unsigned char*)assign_addr = insert_bitfield_any(
-                           *(unsigned char*)assign_addr, input_value, attr->size, attr->index[0].start, attr->index[0].size);
-                   } else {
-                       std::stringstream message;
-                       message << "Unhandled bitfield struct size (" << attr->size << ") in bitfield assignment.";
-                       emitError(message.str());
-                   }
-                   if (debug_level) {
-                       std::cout << std::endl << "Assignment: "
-                                 << "Within the " << attr->size << " byte struct at " << (void*)assign_addr
-                                 << ", the bitfield ["<< attr->index[0].start << ".."
-                                 << attr->index[0].start + attr->index[0].size - 1
-                                 << "] = " << input_value << ";"
-                                 << std::endl;
-                       std::cout.flush();
-                   }
-               } break;
-           case TRICK_FILE_PTR :
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: TRICK_FILE_PTR assignments not yet implemented."
-                             << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_VOID_PTR :
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: TRICK_VOID_PTR assignments not yet implemented."
-                             << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           case TRICK_STRING :
-               assign_addr = (char*)base_addr + offset * sizeof(std::string);
-               if (v_tree && v_tree->v_data) {
-                   *(std::string*)assign_addr = vval_string(v_tree->v_data);
-               } else {
-                   *(std::string*)assign_addr = "";
-               }
-               if (debug_level) {
-                   std::cout << std::endl << "Assignment: *(std::string)" << (void*)assign_addr
-                             << " = \"" << *(std::string*)assign_addr << "\";" << std::endl;
-                   std::cout.flush();
-               }
-               break;
-           default:
-               std::stringstream message;
-               message << "Unhandled Type (" << attr->type << ") in assignment.";
-               emitError(message.str());
-               return (1);
-               break;
-      }
-
-   } else if ( remaining_dimensions > 0 ) {
-
-       int size_of_curr_dim = attr->index[curr_dim].size ;
-
-       if ( size_of_curr_dim == 0) { // the remaining dimensions are pointer dimensions.
-
-           assign_addr = (char*)base_addr + offset * sizeof(void*);
-
-           if (v_tree && v_tree->v_data) {
-
-               if ((remaining_dimensions == 1) && (v_tree->v_data->type == TRICK_STRING)) {
-                   *(char**)assign_addr = mm_strdup( vval_string(v_tree->v_data));
-               } else {
-                   *(void**)assign_addr = vval_voidp(v_tree->v_data);
-               }
-
-           } else {
-               *(void**)assign_addr = 0;
-           }
-
-           if (debug_level) {
-               std::cout << std::endl << "Assignment: *(void**)" << (void*)assign_addr
-                         << " = " << *(void**)assign_addr << ";" << std::endl;
-               std::cout.flush();
-           }
-
-       } else { // next dimension is fixed.
-
-           if ((attr->type == TRICK_CHARACTER) &&
-               (remaining_dimensions == 1) &&
-               (v_tree) &&
-               (v_tree->v_data)
-              ) {
-
-               assign_addr = (char*)base_addr + offset * size_of_curr_dim * sizeof(char);
-
-               if ((v_tree->v_data->type == TRICK_STRING) &&
-                   (v_tree->v_data->value.cp != NULL)) {
-
-                   int rhs_len = (int)strlen(v_tree->v_data->value.cp) + 1;
-                   if (rhs_len <= size_of_curr_dim ) {
-                       strcpy((char*)assign_addr, v_tree->v_data->value.cp);
-                   } else {
-                       emitError("Memory Manager: char array is too small for the attempted string assignment.");
-                       return (1);
-                   }
-               } else {
-                   *(char*)assign_addr = '\0';
-               }
-
-           } else if ( (attr->type == TRICK_WCHAR) &&
-                       (remaining_dimensions == 1)) {
-
-               assign_addr = (char*)base_addr + offset * size_of_curr_dim * sizeof(wchar_t);
-
-               if ((v_tree) &&
-                   (v_tree->v_data->type == TRICK_WSTRING) &&
-                   (v_tree->v_data->value.wcp != NULL)) {
-
-                       int rhs_len = (int)wcslen(v_tree->v_data->value.wcp) + 1;
-                       if (rhs_len <= size_of_curr_dim ) {
-                           wcscpy((wchar_t*)assign_addr, v_tree->v_data->value.wcp);
-                       } else {
-                           std::stringstream message;
-                           message << "wchar_t array at [" << (void*)assign_addr
-                                   << "] is to small for the attempted string assignment." ;
-                           emitError(message.str());
-                           return (1);
-                       }
-               } else if ((v_tree) &&
-                          (v_tree->v_data->type == TRICK_STRING) &&
-                          (v_tree->v_data->value.cp != NULL)) {
-
-                       int rhs_len = (int)ncs_to_wcs_len(v_tree->v_data->value.cp) + 1;
-                       if (rhs_len <= size_of_curr_dim ) {
-                           ncs_to_wcs( v_tree->v_data->value.cp, (wchar_t*)assign_addr, rhs_len);
-                       } else {
-                           std::stringstream message;
-                           message << "wchar_t array at [" << (void*)assign_addr
-                                   << "] is too small for the attempted string assignment." ;
-                           emitError(message.str());
-                           return (1);
-                       }
-               } else {
-                   *(wchar_t*)assign_addr = (wchar_t) NULL;
-               }
-
-           } else {
-               int ii;
-               V_TREE* curr_vt_node;
-               if (v_tree) {
-                   curr_vt_node = v_tree->down;
-               } else {
-                   curr_vt_node =  NULL;
-               }
-
-               for (ii=0; ii < size_of_curr_dim; ii++) {
-                   int ret;
-                   ret = assign_recursive (base_addr,
-                                           attr,
-                                           curr_dim+1,
-                                           offset * size_of_curr_dim + ii,
-                                           curr_vt_node,
-                                           cf);
-
-                   if (ret !=0) {
-                       return(1);
-                   }
-
-                   if (curr_vt_node) {
-                     curr_vt_node = curr_vt_node->next;
-                   }
-               }
-           }
-       }
-   } else {
-        emitError("This is bad. In assign_recursive(), remaining_dimensions is negative.");
-        return (1);
-   }
-   return (0);
+#include	"trick/MemoryManager.hh"
+#include	"trick/bitfield_proto.h"
+#include	"trick/vval.h"
+#include	"trick/wcs_ext.h"
+#include	<limits.h>
+#include	<sstream>
+#include	<udunits2.h>
+#include	<string.h>
+
+int	Trick::MemoryManager::assign_recursive(void*	base_addr,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset,	V_TREE*	v_tree,	cv_converter*	cf)	{
+
+			char*	assign_addr;
+			int	remaining_dimensions	=	attr->num_index	-	curr_dim;
+
+			if	(	remaining_dimensions	==	0	)	{
+
+						switch	(attr->type)	{
+
+											case	TRICK_CHARACTER	:
+											case	TRICK_UNSIGNED_CHARACTER	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(char);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(char*)assign_addr	=	vval_char(v_tree->v_data);
+															}	else	{
+																			*(char*)assign_addr	=	'\0';
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(char*)"	<<	(void*)assign_addr
+																													<<	"	=	";
+																			if	(isprint(*(char*)assign_addr))	{
+																							std::cout	<<	*(char*)assign_addr;
+																			}	else	{
+																							std::cout	<<	(int)*(char*)assign_addr;
+																			}
+																			std::cout	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_WCHAR	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(wchar_t);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(wchar_t*)assign_addr	=	vval_char(v_tree->v_data);
+															}	else	{
+																			*(wchar_t*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(wchar_t*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(wchar_t*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_SHORT	:
+											case	TRICK_UNSIGNED_SHORT	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(short);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(short	*)assign_addr	=	vval_short(v_tree->v_data);
+															}	else	{
+																			*(short	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(short*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(short*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_INTEGER	:
+											case	TRICK_UNSIGNED_INTEGER	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(int);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			int	input_value;
+																			input_value	=	vval_int(v_tree->v_data);
+																			if	(cf	==	NULL)	{
+																							*(int	*)assign_addr	=	input_value;
+																			}	else	{
+																							*(int	*)assign_addr	=	(int)cv_convert_double(cf,	(double)input_value)	;
+																			}
+															}	else	{
+																			*(int	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(int*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(int*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_BOOLEAN	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(bool);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(bool	*)assign_addr	=	(vval_short(v_tree->v_data)!=0);
+															}	else	{
+																			*(bool	*)assign_addr	=	false;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(bool*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(bool*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_ENUMERATED	:
+															if	(v_tree	&&	v_tree->v_data)	{
+																			if	((size_t)attr->size	==	sizeof(int))	{
+																							assign_addr	=	(char*)base_addr	+	offset	*	sizeof(int);
+																							*(int	*)assign_addr	=	vval_int(v_tree->v_data);
+																							if	(debug_level)	{
+																											std::cout	<<	std::endl	<<	"Assignment	(Enum):	*(int*)"	<<	(void*)assign_addr
+																																					<<	"	=	"	<<	*(int*)assign_addr	<<	";"	<<	std::endl;
+																											std::cout.flush();
+																							}
+																			}	else	if	((size_t)attr->size	==	sizeof(short))	{
+																							assign_addr	=	(char*)base_addr	+	offset	*	sizeof(short);
+																							*(short	*)assign_addr	=	vval_short(v_tree->v_data);
+																							if	(debug_level)	{
+																											std::cout	<<	std::endl	<<	"Assignment	(Enum):	*(short*)"	<<	(void*)assign_addr
+																																					<<	"	=	"	<<	*(short*)assign_addr	<<	";"	<<	std::endl;
+																											std::cout.flush();
+																							}
+																			}	else	if	((size_t)attr->size	==	sizeof(char))	{
+																							assign_addr	=	(char*)base_addr	+	offset	*	sizeof(char);
+																							*(char	*)assign_addr	=	vval_char(v_tree->v_data);
+																							if	(debug_level)	{
+																											std::cout	<<	std::endl	<<	"Assignment	(Enum):	*(char*)"	<<	(void*)assign_addr
+																																					<<	"	=	"	<<	*(char*)assign_addr	<<	";"	<<	std::endl;
+																											std::cout.flush();
+																							}
+																			}	else	{
+																							std::stringstream	message;
+																							message	<<	"Enumeration	of	size	"	<<	attr->size	<<	"	is	not	supported.";
+																							emitError(message.str());
+																			}
+															}	else	{
+																			emitError("v_tree	data	appears	to	be	corrupted.");
+															}
+															break;
+											case	TRICK_LONG	:
+											case	TRICK_UNSIGNED_LONG	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(long);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			long	input_value;
+																			input_value	=	vval_long(v_tree->v_data);
+																			if	(cf	==	NULL)	{
+																							*(long	*)assign_addr	=	input_value;
+																			}	else	{
+																							*(long	*)assign_addr	=	(long)cv_convert_double(cf,	(double)input_value)	;
+																			}
+															}	else	{
+																			*(long	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(long*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(long*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_FLOAT	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(float);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			float	input_value;
+																			input_value	=	vval_float(v_tree->v_data);
+																			if	(cf	==	NULL)	{		//	There	is	no	units	conversion.
+																							*(float	*)assign_addr	=	input_value;
+																			}	else	{	//	There	is	units	conversion.
+																							*(float	*)assign_addr	=	(float)cv_convert_double(cf,	(double)input_value)	;
+																			}
+															}	else	{
+																			*(float	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(float*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(float*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_DOUBLE	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(double);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			double	input_value;
+																			input_value	=	vval_double(v_tree->v_data);
+																			if	(cf	==	NULL)	{
+																							*(double	*)assign_addr	=	input_value;
+																			}	else	{
+																							*(double	*)assign_addr	=	cv_convert_double(cf,	input_value)	;
+																			}
+															}	else	{
+																			*(double	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(double*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(double*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_LONG_LONG	:
+											case	TRICK_UNSIGNED_LONG_LONG	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(long	long);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(long	long	*)assign_addr	=	vval_longlong(v_tree->v_data);
+															}	else	{
+																			*(long	long	*)assign_addr	=	0;
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(long	long*)"	<<	(void*)assign_addr
+																													<<	"	=	"	<<	*(long	long*)assign_addr	<<	";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_BITFIELD	:
+											case	TRICK_UNSIGNED_BITFIELD	:	{
+																			int	input_value;
+																			assign_addr	=	(char*)base_addr	+	offset	*	(size_t)attr->size;
+																			if	(v_tree	&&	v_tree->v_data)	{
+																							input_value	=	vval_int(v_tree->v_data);
+																			}	else	{
+																							input_value	=	0;
+																			}
+																			if	(attr->size	==	sizeof(int))	{
+																							*(unsigned	int*)assign_addr	=	insert_bitfield_any(
+																											*(unsigned	int*)assign_addr,	input_value,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																			}	else	if	(attr->size	==	sizeof(short))	{
+																							*(unsigned	short*)assign_addr	=	insert_bitfield_any(
+																											*(unsigned	short*)assign_addr,	input_value,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																			}	else	if	(attr->size	==	sizeof(char))	{
+																							*(unsigned	char*)assign_addr	=	insert_bitfield_any(
+																											*(unsigned	char*)assign_addr,	input_value,	attr->size,	attr->index[0].start,	attr->index[0].size);
+																			}	else	{
+																							std::stringstream	message;
+																							message	<<	"Unhandled	bitfield	struct	size	("	<<	attr->size	<<	")	in	bitfield	assignment.";
+																							emitError(message.str());
+																			}
+																			if	(debug_level)	{
+																							std::cout	<<	std::endl	<<	"Assignment:	"
+																																	<<	"Within	the	"	<<	attr->size	<<	"	byte	struct	at	"	<<	(void*)assign_addr
+																																	<<	",	the	bitfield	["<<	attr->index[0].start	<<	".."
+																																	<<	attr->index[0].start	+	attr->index[0].size	-	1
+																																	<<	"]	=	"	<<	input_value	<<	";"
+																																	<<	std::endl;
+																							std::cout.flush();
+																			}
+															}	break;
+											case	TRICK_FILE_PTR	:
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	TRICK_FILE_PTR	assignments	not	yet	implemented."
+																													<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_VOID_PTR	:
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	TRICK_VOID_PTR	assignments	not	yet	implemented."
+																													<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											case	TRICK_STRING	:
+															assign_addr	=	(char*)base_addr	+	offset	*	sizeof(std::string);
+															if	(v_tree	&&	v_tree->v_data)	{
+																			*(std::string*)assign_addr	=	vval_string(v_tree->v_data);
+															}	else	{
+																			*(std::string*)assign_addr	=	"";
+															}
+															if	(debug_level)	{
+																			std::cout	<<	std::endl	<<	"Assignment:	*(std::string)"	<<	(void*)assign_addr
+																													<<	"	=	\""	<<	*(std::string*)assign_addr	<<	"\";"	<<	std::endl;
+																			std::cout.flush();
+															}
+															break;
+											default:
+															std::stringstream	message;
+															message	<<	"Unhandled	Type	("	<<	attr->type	<<	")	in	assignment.";
+															emitError(message.str());
+															return	(1);
+															break;
+						}
+
+			}	else	if	(	remaining_dimensions	>	0	)	{
+
+							int	size_of_curr_dim	=	attr->index[curr_dim].size	;
+
+							if	(	size_of_curr_dim	==	0)	{	//	the	remaining	dimensions	are	pointer	dimensions.
+
+											assign_addr	=	(char*)base_addr	+	offset	*	sizeof(void*);
+
+											if	(v_tree	&&	v_tree->v_data)	{
+
+															if	((remaining_dimensions	==	1)	&&	(v_tree->v_data->type	==	TRICK_STRING))	{
+																			*(char**)assign_addr	=	mm_strdup(	vval_string(v_tree->v_data));
+															}	else	{
+																			*(void**)assign_addr	=	vval_voidp(v_tree->v_data);
+															}
+
+											}	else	{
+															*(void**)assign_addr	=	0;
+											}
+
+											if	(debug_level)	{
+															std::cout	<<	std::endl	<<	"Assignment:	*(void**)"	<<	(void*)assign_addr
+																									<<	"	=	"	<<	*(void**)assign_addr	<<	";"	<<	std::endl;
+															std::cout.flush();
+											}
+
+							}	else	{	//	next	dimension	is	fixed.
+
+											if	((attr->type	==	TRICK_CHARACTER)	&&
+															(remaining_dimensions	==	1)	&&
+															(v_tree)	&&
+															(v_tree->v_data)
+														)	{
+
+															assign_addr	=	(char*)base_addr	+	offset	*	size_of_curr_dim	*	sizeof(char);
+
+															if	((v_tree->v_data->type	==	TRICK_STRING)	&&
+																			(v_tree->v_data->value.cp	!=	NULL))	{
+
+																			int	rhs_len	=	(int)strlen(v_tree->v_data->value.cp)	+	1;
+																			if	(rhs_len	<=	size_of_curr_dim	)	{
+																							strcpy((char*)assign_addr,	v_tree->v_data->value.cp);
+																			}	else	{
+																							emitError("Memory	Manager:	char	array	is	too	small	for	the	attempted	string	assignment.");
+																							return	(1);
+																			}
+															}	else	{
+																			*(char*)assign_addr	=	'\0';
+															}
+
+											}	else	if	(	(attr->type	==	TRICK_WCHAR)	&&
+																							(remaining_dimensions	==	1))	{
+
+															assign_addr	=	(char*)base_addr	+	offset	*	size_of_curr_dim	*	sizeof(wchar_t);
+
+															if	((v_tree)	&&
+																			(v_tree->v_data->type	==	TRICK_WSTRING)	&&
+																			(v_tree->v_data->value.wcp	!=	NULL))	{
+
+																							int	rhs_len	=	(int)wcslen(v_tree->v_data->value.wcp)	+	1;
+																							if	(rhs_len	<=	size_of_curr_dim	)	{
+																											wcscpy((wchar_t*)assign_addr,	v_tree->v_data->value.wcp);
+																							}	else	{
+																											std::stringstream	message;
+																											message	<<	"wchar_t	array	at	["	<<	(void*)assign_addr
+																																			<<	"]	is	to	small	for	the	attempted	string	assignment."	;
+																											emitError(message.str());
+																											return	(1);
+																							}
+															}	else	if	((v_tree)	&&
+																										(v_tree->v_data->type	==	TRICK_STRING)	&&
+																										(v_tree->v_data->value.cp	!=	NULL))	{
+
+																							int	rhs_len	=	(int)ncs_to_wcs_len(v_tree->v_data->value.cp)	+	1;
+																							if	(rhs_len	<=	size_of_curr_dim	)	{
+																											ncs_to_wcs(	v_tree->v_data->value.cp,	(wchar_t*)assign_addr,	rhs_len);
+																							}	else	{
+																											std::stringstream	message;
+																											message	<<	"wchar_t	array	at	["	<<	(void*)assign_addr
+																																			<<	"]	is	too	small	for	the	attempted	string	assignment."	;
+																											emitError(message.str());
+																											return	(1);
+																							}
+															}	else	{
+																			*(wchar_t*)assign_addr	=	(wchar_t)	NULL;
+															}
+
+											}	else	{
+															int	ii;
+															V_TREE*	curr_vt_node;
+															if	(v_tree)	{
+																			curr_vt_node	=	v_tree->down;
+															}	else	{
+																			curr_vt_node	=		NULL;
+															}
+
+															for	(ii=0;	ii	<	size_of_curr_dim;	ii++)	{
+																			int	ret;
+																			ret	=	assign_recursive	(base_addr,
+																																											attr,
+																																											curr_dim+1,
+																																											offset	*	size_of_curr_dim	+	ii,
+																																											curr_vt_node,
+																																											cf);
+
+																			if	(ret	!=0)	{
+																							return(1);
+																			}
+
+																			if	(curr_vt_node)	{
+																					curr_vt_node	=	curr_vt_node->next;
+																			}
+															}
+											}
+							}
+			}	else	{
+								emitError("This	is	bad.	In	assign_recursive(),	remaining_dimensions	is	negative.");
+								return	(1);
+			}
+			return	(0);
 }
 
-#ifdef TRICK_VER
-#include "trick/UdUnits.hh"
+#ifdef	TRICK_VER
+#include	"trick/UdUnits.hh"
 #else
-static ut_system * u_system ;
+static	ut_system	*	u_system	;
 #endif
-ut_system * Trick::MemoryManager::get_unit_system() {
-#ifdef TRICK_VER
-    return Trick::UdUnits::get_u_system() ;
+ut_system	*	Trick::MemoryManager::get_unit_system()	{
+#ifdef	TRICK_VER
+				return	Trick::UdUnits::get_u_system()	;
 #else
-    /* Initialize the udunits-2 library */
-    ut_set_error_message_handler(ut_ignore) ;
-    if( (u_system = ut_read_xml( NULL )) == NULL ) {
-        std::cerr << "Error initializing udunits-2 unit system" << std::endl ;
-        return -1 ;
-    }
-    ut_set_error_message_handler(ut_write_to_stderr) ;
-    return u_system ;
+				/*	Initialize	the	udunits-2	library	*/
+				ut_set_error_message_handler(ut_ignore)	;
+				if(	(u_system	=	ut_read_xml(	NULL	))	==	NULL	)	{
+								std::cerr	<<	"Error	initializing	udunits-2	unit	system"	<<	std::endl	;
+								return	-1	;
+				}
+				ut_set_error_message_handler(ut_write_to_stderr)	;
+				return	u_system	;
 #endif
 }
 
-// MEMBER FUNCTION
-int Trick::MemoryManager::ref_assignment( REF2* R, V_TREE* V) {
-
-    int ret = 0;
-    cv_converter * cf = NULL ;
-
-    // Create a units conversion function if necessary.
-    if (R->units) {
-        ut_unit * from = ut_parse(get_unit_system(), R->units, UT_ASCII) ;
-        ut_unit * to = ut_parse(get_unit_system(), R->attr->units, UT_ASCII) ;
-        if ( !from or !to ) {
-            std::stringstream message;
-            message << "Can't convert \"" << R->units << "\" to \"" << R->attr->units << "\".";
-            emitError(message.str());
-            return TRICK_UNITS_CONVERSION_ERROR ;
-        }
-        cf = ut_get_converter(from,to) ;
-        if ( !cf ) {
-            std::stringstream message;
-            message << "Can't convert \"" << R->units << "\" to \"" << R->attr->units << "\".";
-            emitError(message.str());
-            return TRICK_UNITS_CONVERSION_ERROR ;
-        }
-    }
-
-    // R->num_index is badly named. It is really the current dimension
-    ret = assign_recursive( R->address, R->attr, R->num_index, 0, V, cf);
-    if ( cf ) cv_free(cf) ;
-
-    return ( ret);
+//	MEMBER	FUNCTION
+int	Trick::MemoryManager::ref_assignment(	REF2*	R,	V_TREE*	V)	{
+
+				int	ret	=	0;
+				cv_converter	*	cf	=	NULL	;
+
+				//	Create	a	units	conversion	function	if	necessary.
+				if	(R->units)	{
+								ut_unit	*	from	=	ut_parse(get_unit_system(),	R->units,	UT_ASCII)	;
+								ut_unit	*	to	=	ut_parse(get_unit_system(),	R->attr->units,	UT_ASCII)	;
+								if	(	!from	or	!to	)	{
+												std::stringstream	message;
+												message	<<	"Can't	convert	\""	<<	R->units	<<	"\"	to	\""	<<	R->attr->units	<<	"\".";
+												emitError(message.str());
+												return	TRICK_UNITS_CONVERSION_ERROR	;
+								}
+								cf	=	ut_get_converter(from,to)	;
+								if	(	!cf	)	{
+												std::stringstream	message;
+												message	<<	"Can't	convert	\""	<<	R->units	<<	"\"	to	\""	<<	R->attr->units	<<	"\".";
+												emitError(message.str());
+												return	TRICK_UNITS_CONVERSION_ERROR	;
+								}
+				}
+
+				//	R->num_index	is	badly	named.	It	is	really	the	current	dimension
+				ret	=	assign_recursive(	R->address,	R->attr,	R->num_index,	0,	V,	cf);
+				if	(	cf	)	cv_free(cf)	;
+
+				return	(	ret);
 
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp
index 8a1d65c07..dbb65a9db 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_attributes.cpp
@@ -1,43 +1,43 @@
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sstream>
-#include "trick/MemoryManager.hh"
-#include "trick/RefParseContext.hh"
-
-extern int REF_debug;
-
-REF2 *Trick::MemoryManager::ref_attributes(const char* name) {
-
-    std::stringstream reference_sstream;
-    REF2 * result = NULL;
-    RefParseContext* context = NULL;
-
-    /** @par Design Details: */
-    reference_sstream << name;
-
-    REF_debug = 0;
-
-    /** @li Create a parse context. */
-    context = new RefParseContext(this, &reference_sstream);
-
-    /** @li Call REF_parse to parse the variable reference. */
-    if (context != NULL) {
-        if ( REF_parse( context) == 0) {
-            /* throw away the reference returned by the ref_parser, it isn't the same
-               name as requested as "name" */
-            if ( context->result->reference ) {
-                free(context->result->reference) ;
-            }
-            context->result->reference = strdup(name);
-            result = context->result;
-        }
-        /** @li Delete the parse context. */
-        delete( context);
-    }
-
-    /** @li Return the the REF2 object.*/
-    return ( result);
+#include	<string.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<sstream>
+#include	"trick/MemoryManager.hh"
+#include	"trick/RefParseContext.hh"
+
+extern	int	REF_debug;
+
+REF2	*Trick::MemoryManager::ref_attributes(const	char*	name)	{
+
+				std::stringstream	reference_sstream;
+				REF2	*	result	=	NULL;
+				RefParseContext*	context	=	NULL;
+
+				/**	@par	Design	Details:	*/
+				reference_sstream	<<	name;
+
+				REF_debug	=	0;
+
+				/**	@li	Create	a	parse	context.	*/
+				context	=	new	RefParseContext(this,	&reference_sstream);
+
+				/**	@li	Call	REF_parse	to	parse	the	variable	reference.	*/
+				if	(context	!=	NULL)	{
+								if	(	REF_parse(	context)	==	0)	{
+												/*	throw	away	the	reference	returned	by	the	ref_parser,	it	isn't	the	same
+															name	as	requested	as	"name"	*/
+												if	(	context->result->reference	)	{
+																free(context->result->reference)	;
+												}
+												context->result->reference	=	strdup(name);
+												result	=	context->result;
+								}
+								/**	@li	Delete	the	parse	context.	*/
+								delete(	context);
+				}
+
+				/**	@li	Return	the	the	REF2	object.*/
+				return	(	result);
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp
index 800975c34..052bf534a 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_dim.cpp
@@ -1,101 +1,101 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#include <sstream>
+#include	<stdio.h>
+#include	<sys/types.h>
+#include	<string.h>
+#include	<sstream>
 
-#include "trick/MemoryManager.hh"
-#include "trick/vval.h"
-#include "trick/attributes.h"
-#include "trick/reference.h"
-#include "trick/parameter_types.h"
+#include	"trick/MemoryManager.hh"
+#include	"trick/vval.h"
+#include	"trick/attributes.h"
+#include	"trick/reference.h"
+#include	"trick/parameter_types.h"
 
 /*
- Updates R, a reference to an arrayed object, to a reference to the indexed sub-element of that arrayed object.
+	Updates	R,	a	reference	to	an	arrayed	object,	to	a	reference	to	the	indexed	sub-element	of	that	arrayed	object.
 */
-int Trick::MemoryManager::ref_dim( REF2* R, V_DATA* V) {
-
-    int jj;
-    int item_size;
-
-    if (R->ref_type != REF_ADDRESS) {
-        emitError("Attempt to index into a non-address reference is bogus in ref_dim.") ;
-        return (1);
-    }
-
-    R->num_index_left--;
-    if (R->num_index_left < 0) {
-        /* if we have too many dimensions, flag an error */
-        emitError("Too many dimensions in ref_dim.\n") ;
-        return (TRICK_PARAMETER_ARRAY_SIZE);
-    }
-
-    /*Calculate the size of the items in this array. */
-    item_size =  R->attr->size;
-    for (jj = (R->attr->num_index - 1); jj > R->num_index; jj--) {
-        if (R->attr->index[jj].size > 0) {
-            item_size *= R->attr->index[jj].size;
-        } else {
-            item_size = sizeof(void *);
-            R->pointer_present = 1 ;
-        }
-    }
-
-    /* if current dimension is a constrained ... */
-    if (R->attr->index[R->num_index].size != 0) {
-
-        /* for constrained dimensions, we can check the validity of the index value */
-        if (vval_int(V) >= R->attr->index[R->num_index].size || vval_int(V) < 0) {
-            emitError("Memory Manager ERROR: Array index out of bounds.") ;
-            return (TRICK_PARAMETER_ARRAY_SIZE);
-        }
-
-    } else {
-
-        R->pointer_present = 1 ;
-        if ( R->create_add_path ) {
-            ADDRESS_NODE * address_node ;
-
-            address_node = new ADDRESS_NODE ;
-            address_node->operator_ = AO_DEREFERENCE ;
-            address_node->operand.address = NULL ;
-            DLL_AddTail(address_node , R->address_path) ;
-        }
-
-        // Dereference the pointer.
-        R->address = *(void**)R->address;
-        if ( R->address == NULL) {
-            std::stringstream message;
-            message << "Reference (" << R->reference << ") address is NULL in ref_dim.";
-            emitError(message.str());
-            return(TRICK_PARAMETER_ADDRESS_NULL) ;
-        }
-    }
-
-    if ( R->create_add_path ) {
-
-        ADDRESS_NODE * address_node ;
-
-        if ( vval_int(V) > 0 ) {
-            address_node = (ADDRESS_NODE *)DLL_GetAt(DLL_GetTailPosition(R->address_path), R->address_path) ;
-            switch ( address_node->operator_ ) {
-                case AO_ADDRESS:
-                    address_node->operand.address = (void *)((char *)address_node->operand.address +  vval_int(V) * item_size) ;
-                    break ;
-                case AO_DEREFERENCE:
-                    address_node = new ADDRESS_NODE ;
-                    address_node->operator_ = AO_OFFSET ;
-                    address_node->operand.offset = vval_int(V) * item_size ;
-                    DLL_AddTail(address_node , R->address_path) ;
-                    break ;
-                case AO_OFFSET:
-                    address_node->operand.offset += vval_int(V) * item_size ;
-                    break ;
-            }
-        }
-    }
-
-    R->address =  (void*)((char*)R->address + vval_int(V) * item_size);
-    R->num_index++;
-
-    return (TRICK_NO_ERROR);
+int	Trick::MemoryManager::ref_dim(	REF2*	R,	V_DATA*	V)	{
+
+				int	jj;
+				int	item_size;
+
+				if	(R->ref_type	!=	REF_ADDRESS)	{
+								emitError("Attempt	to	index	into	a	non-address	reference	is	bogus	in	ref_dim.")	;
+								return	(1);
+				}
+
+				R->num_index_left--;
+				if	(R->num_index_left	<	0)	{
+								/*	if	we	have	too	many	dimensions,	flag	an	error	*/
+								emitError("Too	many	dimensions	in	ref_dim.\n")	;
+								return	(TRICK_PARAMETER_ARRAY_SIZE);
+				}
+
+				/*Calculate	the	size	of	the	items	in	this	array.	*/
+				item_size	=		R->attr->size;
+				for	(jj	=	(R->attr->num_index	-	1);	jj	>	R->num_index;	jj--)	{
+								if	(R->attr->index[jj].size	>	0)	{
+												item_size	*=	R->attr->index[jj].size;
+								}	else	{
+												item_size	=	sizeof(void	*);
+												R->pointer_present	=	1	;
+								}
+				}
+
+				/*	if	current	dimension	is	a	constrained	...	*/
+				if	(R->attr->index[R->num_index].size	!=	0)	{
+
+								/*	for	constrained	dimensions,	we	can	check	the	validity	of	the	index	value	*/
+								if	(vval_int(V)	>=	R->attr->index[R->num_index].size	||	vval_int(V)	<	0)	{
+												emitError("Memory	Manager	ERROR:	Array	index	out	of	bounds.")	;
+												return	(TRICK_PARAMETER_ARRAY_SIZE);
+								}
+
+				}	else	{
+
+								R->pointer_present	=	1	;
+								if	(	R->create_add_path	)	{
+												ADDRESS_NODE	*	address_node	;
+
+												address_node	=	new	ADDRESS_NODE	;
+												address_node->operator_	=	AO_DEREFERENCE	;
+												address_node->operand.address	=	NULL	;
+												DLL_AddTail(address_node	,	R->address_path)	;
+								}
+
+								//	Dereference	the	pointer.
+								R->address	=	*(void**)R->address;
+								if	(	R->address	==	NULL)	{
+												std::stringstream	message;
+												message	<<	"Reference	("	<<	R->reference	<<	")	address	is	NULL	in	ref_dim.";
+												emitError(message.str());
+												return(TRICK_PARAMETER_ADDRESS_NULL)	;
+								}
+				}
+
+				if	(	R->create_add_path	)	{
+
+								ADDRESS_NODE	*	address_node	;
+
+								if	(	vval_int(V)	>	0	)	{
+												address_node	=	(ADDRESS_NODE	*)DLL_GetAt(DLL_GetTailPosition(R->address_path),	R->address_path)	;
+												switch	(	address_node->operator_	)	{
+																case	AO_ADDRESS:
+																				address_node->operand.address	=	(void	*)((char	*)address_node->operand.address	+		vval_int(V)	*	item_size)	;
+																				break	;
+																case	AO_DEREFERENCE:
+																				address_node	=	new	ADDRESS_NODE	;
+																				address_node->operator_	=	AO_OFFSET	;
+																				address_node->operand.offset	=	vval_int(V)	*	item_size	;
+																				DLL_AddTail(address_node	,	R->address_path)	;
+																				break	;
+																case	AO_OFFSET:
+																				address_node->operand.offset	+=	vval_int(V)	*	item_size	;
+																				break	;
+												}
+								}
+				}
+
+				R->address	=		(void*)((char*)R->address	+	vval_int(V)	*	item_size);
+				R->num_index++;
+
+				return	(TRICK_NO_ERROR);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
index f22143ab3..3e11d530d 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name.cpp
@@ -1,124 +1,124 @@
 /*
-   PURPOSE: (Construct a parse tree representation of a parameter reference name from the input file.)
-
-   PROGRAMMERS: (((Robert W. Bailey) (LinCom) (7/95) (CR#600) (--)) ((Robert W. Bailey) (LinCom Corp) (Feb 1991) (v1.0)
-   (Initial Release.))) */
-
-#include <string.h>
-#include <sstream>
-
-#include "trick/MemoryManager.hh"
-#include "trick/attributes.h"
-#include "trick/reference.h"
-#include "trick/parameter_types.h"
-#include "trick/mm_error.h"
-#include <stdlib.h>
-
-//FIXME TODO make a error file
-/////// MM_NO_ERROR 0
-#define MM_PARAMETER_NAME 1
-#define MM_INPUT_NOT_ALLOWED 2
-
-
-int Trick::MemoryManager::ref_name(REF2 * R, char *name) {
-
-    int ii;
-    char *addr;
-    ATTRIBUTES *attr;
-
-    attr = (ATTRIBUTES*)(R->attr->attr);
-
-    if (attr == NULL) {
-        return (MM_PARAMETER_NAME);
-    }
-
-    if (R->address == NULL) {
-        std::stringstream message;
-        message << "ref_name: Because the address of \"" << R->reference
-                << "\" is NULL, a legitimate address can't be calculated for \""
-                << R->reference << "." << name << "\".";
-        emitError(message.str());
-        return (MM_PARAMETER_NAME);
-    }
-
-    /* Find the parameter name at this level in the parameter list, 'ii' is the index to the parameter in the list. */
-    ii = 0;
-    while (strcmp(name, attr[ii].name)) {
-        if (attr[ii].name[0] == '\0')
-            return (MM_PARAMETER_NAME);
-        ii++;
-    }
-
-    attr = &(attr[ii]);
-
-//    R->deprecated |= (attr->mods & 0x80000000);
-
-/* Set error_attr just in case we have an error */
-//    R->error_attr = attr;
-
-    /* If the variable is a static var, offset is the absolute address */
-    if (attr->mods & 2) {
-        addr = (char *) attr->offset;
-        if ( R->create_add_path ) {
-            DLLPOS list_pos ;
-            ADDRESS_NODE * address_node ;
-            list_pos = DLL_GetHeadPosition(R->address_path) ;
-            while ( (list_pos != NULL) && (address_node = (ADDRESS_NODE *)DLL_GetNext(&list_pos, R->address_path)) != NULL ) {
-                if ( (list_pos != NULL) && (list_pos->info != NULL) ) {
-                    delete (ADDRESS_NODE *)(list_pos->info) ;
-                }
-            }
-            DLL_RemoveAll(R->address_path) ;
-            address_node = new ADDRESS_NODE ;
-            address_node->operator_ = AO_ADDRESS ;
-            address_node->operand.address = addr ;
-            DLL_AddTail(address_node , R->address_path) ;
-        }
-    } else {
-        addr = (char *)R->address + attr->offset;
-        if ( R->create_add_path ) {
-            ADDRESS_NODE * address_node ;
-
-            if ( attr->offset != 0 ) {
-                address_node = (ADDRESS_NODE *)DLL_GetAt(DLL_GetTailPosition(R->address_path), R->address_path) ;
-                switch ( address_node->operator_ ) {
-                    case AO_ADDRESS:
-                        address_node->operand.address = (void *)((char *)address_node->operand.address +  attr->offset) ;
-                        break ;
-                    case AO_DEREFERENCE:
-                        address_node = new ADDRESS_NODE ;
-                        address_node->operator_ = AO_OFFSET ;
-                        address_node->operand.offset = attr->offset ;
-                        DLL_AddTail(address_node , R->address_path) ;
-                        break ;
-                    case AO_OFFSET:
-                        address_node->operand.offset += attr->offset ;
-                        break ;
-                }
-            }
-        }
-    }
-
-    if (attr->mods & 1) {
-            ADDRESS_NODE * address_node = new ADDRESS_NODE ;
-            address_node->operator_ = AO_DEREFERENCE ;
-            address_node->operand.address = NULL ;
-            DLL_AddTail(address_node , R->address_path) ;
-
-            addr = *(char**)addr;
-    }
-
-    /* Save the address and next attributes in the REF structure.
-       If the attributes are dynamically-allocated, reference attributes
-       then free them so we don't leak memory.
-    */
-    if (R->attr == R->ref_attr) {
-        free(R->ref_attr);
-        R->ref_attr = NULL;
-    }
-    R->attr = attr;
-    R->address = addr;
-
-
-    return (MM_OK);
+			PURPOSE:	(Construct	a	parse	tree	representation	of	a	parameter	reference	name	from	the	input	file.)
+
+			PROGRAMMERS:	(((Robert	W.	Bailey)	(LinCom)	(7/95)	(CR#600)	(--))	((Robert	W.	Bailey)	(LinCom	Corp)	(Feb	1991)	(v1.0)
+			(Initial	Release.)))	*/
+
+#include	<string.h>
+#include	<sstream>
+
+#include	"trick/MemoryManager.hh"
+#include	"trick/attributes.h"
+#include	"trick/reference.h"
+#include	"trick/parameter_types.h"
+#include	"trick/mm_error.h"
+#include	<stdlib.h>
+
+//FIXME	TODO	make	a	error	file
+///////	MM_NO_ERROR	0
+#define	MM_PARAMETER_NAME	1
+#define	MM_INPUT_NOT_ALLOWED	2
+
+
+int	Trick::MemoryManager::ref_name(REF2	*	R,	char	*name)	{
+
+				int	ii;
+				char	*addr;
+				ATTRIBUTES	*attr;
+
+				attr	=	(ATTRIBUTES*)(R->attr->attr);
+
+				if	(attr	==	NULL)	{
+								return	(MM_PARAMETER_NAME);
+				}
+
+				if	(R->address	==	NULL)	{
+								std::stringstream	message;
+								message	<<	"ref_name:	Because	the	address	of	\""	<<	R->reference
+																<<	"\"	is	NULL,	a	legitimate	address	can't	be	calculated	for	\""
+																<<	R->reference	<<	"."	<<	name	<<	"\".";
+								emitError(message.str());
+								return	(MM_PARAMETER_NAME);
+				}
+
+				/*	Find	the	parameter	name	at	this	level	in	the	parameter	list,	'ii'	is	the	index	to	the	parameter	in	the	list.	*/
+				ii	=	0;
+				while	(strcmp(name,	attr[ii].name))	{
+								if	(attr[ii].name[0]	==	'\0')
+												return	(MM_PARAMETER_NAME);
+								ii++;
+				}
+
+				attr	=	&(attr[ii]);
+
+//				R->deprecated	|=	(attr->mods	&	0x80000000);
+
+/*	Set	error_attr	just	in	case	we	have	an	error	*/
+//				R->error_attr	=	attr;
+
+				/*	If	the	variable	is	a	static	var,	offset	is	the	absolute	address	*/
+				if	(attr->mods	&	2)	{
+								addr	=	(char	*)	attr->offset;
+								if	(	R->create_add_path	)	{
+												DLLPOS	list_pos	;
+												ADDRESS_NODE	*	address_node	;
+												list_pos	=	DLL_GetHeadPosition(R->address_path)	;
+												while	(	(list_pos	!=	NULL)	&&	(address_node	=	(ADDRESS_NODE	*)DLL_GetNext(&list_pos,	R->address_path))	!=	NULL	)	{
+																if	(	(list_pos	!=	NULL)	&&	(list_pos->info	!=	NULL)	)	{
+																				delete	(ADDRESS_NODE	*)(list_pos->info)	;
+																}
+												}
+												DLL_RemoveAll(R->address_path)	;
+												address_node	=	new	ADDRESS_NODE	;
+												address_node->operator_	=	AO_ADDRESS	;
+												address_node->operand.address	=	addr	;
+												DLL_AddTail(address_node	,	R->address_path)	;
+								}
+				}	else	{
+								addr	=	(char	*)R->address	+	attr->offset;
+								if	(	R->create_add_path	)	{
+												ADDRESS_NODE	*	address_node	;
+
+												if	(	attr->offset	!=	0	)	{
+																address_node	=	(ADDRESS_NODE	*)DLL_GetAt(DLL_GetTailPosition(R->address_path),	R->address_path)	;
+																switch	(	address_node->operator_	)	{
+																				case	AO_ADDRESS:
+																								address_node->operand.address	=	(void	*)((char	*)address_node->operand.address	+		attr->offset)	;
+																								break	;
+																				case	AO_DEREFERENCE:
+																								address_node	=	new	ADDRESS_NODE	;
+																								address_node->operator_	=	AO_OFFSET	;
+																								address_node->operand.offset	=	attr->offset	;
+																								DLL_AddTail(address_node	,	R->address_path)	;
+																								break	;
+																				case	AO_OFFSET:
+																								address_node->operand.offset	+=	attr->offset	;
+																								break	;
+																}
+												}
+								}
+				}
+
+				if	(attr->mods	&	1)	{
+												ADDRESS_NODE	*	address_node	=	new	ADDRESS_NODE	;
+												address_node->operator_	=	AO_DEREFERENCE	;
+												address_node->operand.address	=	NULL	;
+												DLL_AddTail(address_node	,	R->address_path)	;
+
+												addr	=	*(char**)addr;
+				}
+
+				/*	Save	the	address	and	next	attributes	in	the	REF	structure.
+							If	the	attributes	are	dynamically-allocated,	reference	attributes
+							then	free	them	so	we	don't	leak	memory.
+				*/
+				if	(R->attr	==	R->ref_attr)	{
+								free(R->ref_attr);
+								R->ref_attr	=	NULL;
+				}
+				R->attr	=	attr;
+				R->address	=	addr;
+
+
+				return	(MM_OK);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp
index b625cf22e..e0ead7ce0 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_name_from_address.cpp
@@ -1,18 +1,18 @@
-#include "trick/MemoryManager.hh"
-#include "trick/ClassicCheckPointAgent.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/ClassicCheckPointAgent.hh"
 
 /**
- @par Detailed Description:
- */
-std::string Trick::MemoryManager::ref_name_from_address( void* address) {
+	@par	Detailed	Description:
+	*/
+std::string	Trick::MemoryManager::ref_name_from_address(	void*	address)	{
 
-    std::string result;
+				std::string	result;
 
-    Trick::ClassicCheckPointAgent* agent = dynamic_cast<Trick::ClassicCheckPointAgent*>(defaultCheckPointAgent);
-    if (agent) {
-        result = agent->ref_string_from_ptr( address, NULL, 0);
-    } else {
-        result.clear();
-    }
-    return (result);
+				Trick::ClassicCheckPointAgent*	agent	=	dynamic_cast<Trick::ClassicCheckPointAgent*>(defaultCheckPointAgent);
+				if	(agent)	{
+								result	=	agent->ref_string_from_ptr(	address,	NULL,	0);
+				}	else	{
+								result.clear();
+				}
+				return	(result);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
index b4ab59442..5e76f285c 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_ref_var.cpp
@@ -1,38 +1,38 @@
-#include <string.h>
-#include <stdio.h>
-#include "trick/MemoryManager.hh"
-#include "trick/value.h"
-#include "trick/vval.h"
+#include	<string.h>
+#include	<stdio.h>
+#include	"trick/MemoryManager.hh"
+#include	"trick/value.h"
+#include	"trick/vval.h"
 
-int Trick::MemoryManager::ref_var( REF2* R,
-                                   char* name) {
+int	Trick::MemoryManager::ref_var(	REF2*	R,
+																																			char*	name)	{
 
-    ALLOC_INFO *alloc_info;
-    VARIABLE_MAP::iterator pos;
+				ALLOC_INFO	*alloc_info;
+				VARIABLE_MAP::iterator	pos;
 
-    pthread_mutex_lock(&mm_mutex);
-    pos = variable_map.find( name);
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
-        R->attr = make_reference_attr( alloc_info);
-        R->ref_attr = R->attr;
-        R->address = alloc_info->start;
+				pthread_mutex_lock(&mm_mutex);
+				pos	=	variable_map.find(	name);
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
+								R->attr	=	make_reference_attr(	alloc_info);
+								R->ref_attr	=	R->attr;
+								R->address	=	alloc_info->start;
 
-        if ( R->create_add_path ) {
-            ADDRESS_NODE * address_node ;
+								if	(	R->create_add_path	)	{
+												ADDRESS_NODE	*	address_node	;
 
-            address_node = new ADDRESS_NODE ;
-            address_node->operator_ = AO_ADDRESS ;
-            address_node->operand.address = R->address ;
-            DLL_AddTail(address_node , R->address_path) ;
-        }
+												address_node	=	new	ADDRESS_NODE	;
+												address_node->operator_	=	AO_ADDRESS	;
+												address_node->operand.address	=	R->address	;
+												DLL_AddTail(address_node	,	R->address_path)	;
+								}
 
-        pthread_mutex_unlock(&mm_mutex);
-        return (MM_OK);
-    } else {
-        // ERROR.
-    }
-    pthread_mutex_unlock(&mm_mutex);
+								pthread_mutex_unlock(&mm_mutex);
+								return	(MM_OK);
+				}	else	{
+								//	ERROR.
+				}
+				pthread_mutex_unlock(&mm_mutex);
 
-    return (MM_UNDEFINED_REFERENCE);
+				return	(MM_UNDEFINED_REFERENCE);
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
index c1077b536..bf8727177 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_restore.cpp
@@ -1,144 +1,144 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sstream>
-#include <fstream>
-
-#include "trick/MemoryManager.hh"
-#include "trick/ClassicCheckPointAgent.hh"
-
-int Trick::MemoryManager::set_restore_stls_default (bool on_off) {
-    restore_stls_default = on_off;
-    return 0;
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<sstream>
+#include	<fstream>
+
+#include	"trick/MemoryManager.hh"
+#include	"trick/ClassicCheckPointAgent.hh"
+
+int	Trick::MemoryManager::set_restore_stls_default	(bool	on_off)	{
+				restore_stls_default	=	on_off;
+				return	0;
 }
 
-int Trick::MemoryManager::read_checkpoint( std::istream *is, bool do_restore_stl) {
+int	Trick::MemoryManager::read_checkpoint(	std::istream	*is,	bool	do_restore_stl)	{
 
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
 
-    if (debug_level) {
-        std::cout << std::endl << "- Reading checkpoint." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"-	Reading	checkpoint."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    if (currentCheckPointAgent->restore( is) !=0 ) {
-       emitError("Checkpoint restore failed.") ;
-    }
+				if	(currentCheckPointAgent->restore(	is)	!=0	)	{
+							emitError("Checkpoint	restore	failed.")	;
+				}
 
 
-    // Search for stls and restore them
-    if(do_restore_stl) {
-        for ( pos=alloc_info_map.begin() ; pos!=alloc_info_map.end() ; pos++ ) {
-            restore_stls(pos->second) ;
-        }
-    }
+				//	Search	for	stls	and	restore	them
+				if(do_restore_stl)	{
+								for	(	pos=alloc_info_map.begin()	;	pos!=alloc_info_map.end()	;	pos++	)	{
+												restore_stls(pos->second)	;
+								}
+				}
 
-    // Go through all of the allocations that have been created looking
-    // for those whose names start with the temporary-variable prefix and:
-    pthread_mutex_lock(&mm_mutex);
-    for ( pos=alloc_info_map.begin() ; pos!=alloc_info_map.end() ; pos++ ) {
+				//	Go	through	all	of	the	allocations	that	have	been	created	looking
+				//	for	those	whose	names	start	with	the	temporary-variable	prefix	and:
+				pthread_mutex_lock(&mm_mutex);
+				for	(	pos=alloc_info_map.begin()	;	pos!=alloc_info_map.end()	;	pos++	)	{
 
-        alloc_info = pos->second;
+								alloc_info	=	pos->second;
 
 
-        if ( alloc_info->stcl == TRICK_LOCAL) {
+								if	(	alloc_info->stcl	==	TRICK_LOCAL)	{
 
-            // If the temporary-variable prefix occurs at the beginning of the name ...
-            if ( (alloc_info->name !=NULL) &&
-                 ((strstr( alloc_info->name, local_anon_var_prefix)) == alloc_info->name )) {
+												//	If	the	temporary-variable	prefix	occurs	at	the	beginning	of	the	name	...
+												if	(	(alloc_info->name	!=NULL)	&&
+																	((strstr(	alloc_info->name,	local_anon_var_prefix))	==	alloc_info->name	))	{
 
-                std::string name = alloc_info->name;
+																std::string	name	=	alloc_info->name;
 
-                // 1) Unregister the associated variable.
-                variable_map.erase( name);
+																//	1)	Unregister	the	associated	variable.
+																variable_map.erase(	name);
 
-                // 2) free the name
-                free( alloc_info->name);
-                alloc_info->name = NULL;
+																//	2)	free	the	name
+																free(	alloc_info->name);
+																alloc_info->name	=	NULL;
 
-            }
-        }
-    }
-    pthread_mutex_unlock(&mm_mutex);
-    return(0);
+												}
+								}
+				}
+				pthread_mutex_unlock(&mm_mutex);
+				return(0);
 }
 
-int Trick::MemoryManager::read_checkpoint( const char* filename, bool restore_stls ) {
-
-    // Create a stream from the named file.
-    std::ifstream infile(filename , std::ios::in);
-    if (infile.is_open()) {
-        return ( read_checkpoint( &infile, restore_stls )) ;
-    } else {
-        std::stringstream message;
-        message << "Couldn't open \"" << filename << "\"." ;
-        emitError(message.str());
-    }
-    return 1;
+int	Trick::MemoryManager::read_checkpoint(	const	char*	filename,	bool	restore_stls	)	{
+
+				//	Create	a	stream	from	the	named	file.
+				std::ifstream	infile(filename	,	std::ios::in);
+				if	(infile.is_open())	{
+								return	(	read_checkpoint(	&infile,	restore_stls	))	;
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Couldn't	open	\""	<<	filename	<<	"\"."	;
+								emitError(message.str());
+				}
+				return	1;
 }
 
-int Trick::MemoryManager::read_checkpoint_from_string(const char* s, bool restore_stls ) {
-
-    // Create a stream from the string argument.
-    std::stringstream ss;
-
-    if ( s!= NULL) {
-        ss << s;
-        if ( ss.str().find(';') == std::string::npos ) {
-            /* Unlike python, the old Trick input parser requires a semicolon
-             * after each input file assignment command. Append one if missing.
-             */
-            ss << ";" ;
-        }
-        return ( read_checkpoint( &ss, restore_stls));
-    } else {
-        emitError("Checkpoint string is NULL.") ;
-    }
-    return 1;
+int	Trick::MemoryManager::read_checkpoint_from_string(const	char*	s,	bool	restore_stls	)	{
+
+				//	Create	a	stream	from	the	string	argument.
+				std::stringstream	ss;
+
+				if	(	s!=	NULL)	{
+								ss	<<	s;
+								if	(	ss.str().find(';')	==	std::string::npos	)	{
+												/*	Unlike	python,	the	old	Trick	input	parser	requires	a	semicolon
+													*	after	each	input	file	assignment	command.	Append	one	if	missing.
+													*/
+												ss	<<	";"	;
+								}
+								return	(	read_checkpoint(	&ss,	restore_stls));
+				}	else	{
+								emitError("Checkpoint	string	is	NULL.")	;
+				}
+				return	1;
 }
 
-int Trick::MemoryManager::init_from_checkpoint(const char* filename, bool restore_stls ) {
+int	Trick::MemoryManager::init_from_checkpoint(const	char*	filename,	bool	restore_stls	)	{
 
-    if (debug_level) {
-        std::cout << std::endl << "Initializing from checkpoint" << std::endl;
-        std::cout << std::endl << "- Resetting managed memory." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"Initializing	from	checkpoint"	<<	std::endl;
+								std::cout	<<	std::endl	<<	"-	Resetting	managed	memory."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    reset_memory();
+				reset_memory();
 
-    if (debug_level) {
-        std::cout << std::endl << "- Reading checkpoint." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"-	Reading	checkpoint."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    read_checkpoint( filename, restore_stls);
+				read_checkpoint(	filename,	restore_stls);
 
-    if (debug_level) {
-        std::cout << std::endl << "Initialization from checkpoint finished." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"Initialization	from	checkpoint	finished."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::MemoryManager::init_from_checkpoint( std::istream *is, bool restore_stls) {
+int	Trick::MemoryManager::init_from_checkpoint(	std::istream	*is,	bool	restore_stls)	{
 
-    if (debug_level) {
-        std::cout << std::endl << "Initializing from checkpoint" << std::endl;
-        std::cout << std::endl << "- Resetting managed memory." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"Initializing	from	checkpoint"	<<	std::endl;
+								std::cout	<<	std::endl	<<	"-	Resetting	managed	memory."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    reset_memory();
+				reset_memory();
 
-    read_checkpoint( is, restore_stls );
+				read_checkpoint(	is,	restore_stls	);
 
-    if (debug_level) {
-        std::cout << std::endl << "Initialization from checkpoint finished." << std::endl;
-        std::cout.flush();
-    }
+				if	(debug_level)	{
+								std::cout	<<	std::endl	<<	"Initialization	from	checkpoint	finished."	<<	std::endl;
+								std::cout.flush();
+				}
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_restore_stls.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_restore_stls.cpp
index 49d0c8012..8e3943e93 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_restore_stls.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_restore_stls.cpp
@@ -1,197 +1,197 @@
 
-#include <algorithm>
+#include	<algorithm>
 
-#include "trick/MemoryManager.hh"
-#include "trick/attributes.h"
+#include	"trick/MemoryManager.hh"
+#include	"trick/attributes.h"
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::restore_stls( ALLOC_INFO* alloc_info ) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::restore_stls(	ALLOC_INFO*	alloc_info	)	{
 
-    ATTRIBUTES* reference_attr;
+				ATTRIBUTES*	reference_attr;
 
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
 
-    if (alloc_info == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::restore_stls called with alloc_info == NULL." << std::endl;
-        std::cout.flush();
-        return;
-    }
+				if	(alloc_info	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::restore_stls	called	with	alloc_info	==	NULL."	<<	std::endl;
+								std::cout.flush();
+								return;
+				}
 
-    // If there is no name associated with this alloc_info, we won't be able to find any stls associated with it.
-    if (alloc_info->name == NULL) {
-        return;
-    }
+				//	If	there	is	no	name	associated	with	this	alloc_info,	we	won't	be	able	to	find	any	stls	associated	with	it.
+				if	(alloc_info->name	==	NULL)	{
+								return;
+				}
 
-    if (debug_level) {
-        std::cout << __FUNCTION__ <<  ": Begin scan of allocation @" << (void*)alloc_info->start << " for dependencies." << std::endl;
-    }
+				if	(debug_level)	{
+								std::cout	<<	__FUNCTION__	<<		":	Begin	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"	for	dependencies."	<<	std::endl;
+				}
 
-    reference_attr = make_reference_attr( alloc_info );
+				reference_attr	=	make_reference_attr(	alloc_info	);
 
-    // Get the dependencies of the allocation
-    if (alloc_info->type == TRICK_STRUCTURED) {
-        if (reference_attr->num_index > 0) {
-            restore_stls_in_arrayed_class(alloc_info->name, (char*)(alloc_info->start), reference_attr, 0, 0) ;
-        } else {
-            restore_stls_in_class(alloc_info->name, (char*)(alloc_info->start), alloc_info->attr) ;
-        }
-    } else {
-        restore_stls_in_intrinsic(alloc_info->name, alloc_info->start, reference_attr, 0, 0 );
-    }
+				//	Get	the	dependencies	of	the	allocation
+				if	(alloc_info->type	==	TRICK_STRUCTURED)	{
+								if	(reference_attr->num_index	>	0)	{
+												restore_stls_in_arrayed_class(alloc_info->name,	(char*)(alloc_info->start),	reference_attr,	0,	0)	;
+								}	else	{
+												restore_stls_in_class(alloc_info->name,	(char*)(alloc_info->start),	alloc_info->attr)	;
+								}
+				}	else	{
+								restore_stls_in_intrinsic(alloc_info->name,	alloc_info->start,	reference_attr,	0,	0	);
+				}
 
-    if (debug_level) {
-        std::cout <<  __FUNCTION__ << ": End scan of allocation @" << (void*)alloc_info->start << "." << std::endl;
-    }
+				if	(debug_level)	{
+								std::cout	<<		__FUNCTION__	<<	":	End	scan	of	allocation	@"	<<	(void*)alloc_info->start	<<	"."	<<	std::endl;
+				}
 
-    free_reference_attr( reference_attr );
+				free_reference_attr(	reference_attr	);
 
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::restore_stls_in_class( std::string name, char* address, ATTRIBUTES* attr) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "ERROR: Trick::MemoryManager::restore_stls called with name = " << name << " and attr = NULL." << std::endl;
-        return;
-    }
-
-    for (ii = 0; attr[ii].name[0] != '\0'; ii++) {
-        if (currentCheckPointAgent->input_perm_check(&attr[ii])) {
-            char *elem_addr;
-            if (attr[ii].mods & 2) {
-                elem_addr = (char *) attr[ii].offset;
-            } else {
-                elem_addr = address + attr[ii].offset;
-            }
-
-            if (attr[ii].type == TRICK_STRUCTURED) {
-                if (attr[ii].num_index != 0) {
-                    restore_stls_in_arrayed_class( name + "." + attr[ii].name, elem_addr, &attr[ii], 0, 0);
-                } else {
-                    restore_stls_in_class( name + "." + attr[ii].name, elem_addr, (ATTRIBUTES*)(attr[ii].attr));
-                }
-            } else if (attr[ii].type == TRICK_STL) {
-                (*attr[ii].restore_stl)(elem_addr, name.c_str(), attr[ii].name) ;
-            } else {
-                restore_stls_in_intrinsic( name + "." + attr[ii].name , elem_addr, &(attr[ii]), 0, 0);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::restore_stls_in_class(	std::string	name,	char*	address,	ATTRIBUTES*	attr)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"ERROR:	Trick::MemoryManager::restore_stls	called	with	name	=	"	<<	name	<<	"	and	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				for	(ii	=	0;	attr[ii].name[0]	!=	'\0';	ii++)	{
+								if	(currentCheckPointAgent->input_perm_check(&attr[ii]))	{
+												char	*elem_addr;
+												if	(attr[ii].mods	&	2)	{
+																elem_addr	=	(char	*)	attr[ii].offset;
+												}	else	{
+																elem_addr	=	address	+	attr[ii].offset;
+												}
+
+												if	(attr[ii].type	==	TRICK_STRUCTURED)	{
+																if	(attr[ii].num_index	!=	0)	{
+																				restore_stls_in_arrayed_class(	name	+	"."	+	attr[ii].name,	elem_addr,	&attr[ii],	0,	0);
+																}	else	{
+																				restore_stls_in_class(	name	+	"."	+	attr[ii].name,	elem_addr,	(ATTRIBUTES*)(attr[ii].attr));
+																}
+												}	else	if	(attr[ii].type	==	TRICK_STL)	{
+																(*attr[ii].restore_stl)(elem_addr,	name.c_str(),	attr[ii].name)	;
+												}	else	{
+																restore_stls_in_intrinsic(	name	+	"."	+	attr[ii].name	,	elem_addr,	&(attr[ii]),	0,	0);
+												}
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::restore_stls_in_arrayed_class(
-                                                std::string name,
-                                                char*       address,
-                                                ATTRIBUTES* attr,
-                                                int         curr_dim,
-                                                int         offset) {
-    int ii;
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    if (attr == NULL) {
-        std::cerr << "Trick::MemoryManager::restore_stls_in_arrayed_class: ERROR: attr = NULL." << std::endl;
-        return;
-    }
-
-    if (attr->index[curr_dim].size == 0) {
-
-        void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-        if (pointer != NULL) {
-            ALLOC_INFO *alloc_info;
-            alloc_info = get_alloc_info_of( pointer);
-            if (alloc_info != NULL) {
-
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                }
-                //restore_stls(alloc_info);
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ << ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                    std::cout.flush();
-                }
-            }
-        } else {
-            if (debug_level) {
-                std::cout << __FUNCTION__ << ": Allocation reference is NULL." << std::endl;
-                std::cout.flush();
-            }
-        }
-
-    } else {
-        int curr_dim_size;
-        curr_dim_size = attr->index[curr_dim].size;
-        for (ii = 0; ii < curr_dim_size; ii++) {
-            char index[16] ;
-            snprintf(index, sizeof(index), "[%d]", ii) ;
-            if (curr_dim < attr->num_index - 1) {
-                restore_stls_in_arrayed_class( name + index, address, attr, curr_dim + 1, offset * curr_dim_size + ii);
-            } else {
-                char* elem_addr;
-                elem_addr = address + (offset * curr_dim + ii) * attr->size ;
-                restore_stls_in_class( name + index, elem_addr, (ATTRIBUTES*)attr->attr );
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::restore_stls_in_arrayed_class(
+																																																std::string	name,
+																																																char*							address,
+																																																ATTRIBUTES*	attr,
+																																																int									curr_dim,
+																																																int									offset)	{
+				int	ii;
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				if	(attr	==	NULL)	{
+								std::cerr	<<	"Trick::MemoryManager::restore_stls_in_arrayed_class:	ERROR:	attr	=	NULL."	<<	std::endl;
+								return;
+				}
+
+				if	(attr->index[curr_dim].size	==	0)	{
+
+								void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+								if	(pointer	!=	NULL)	{
+												ALLOC_INFO	*alloc_info;
+												alloc_info	=	get_alloc_info_of(	pointer);
+												if	(alloc_info	!=	NULL)	{
+
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																}
+																//restore_stls(alloc_info);
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<	":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+								}	else	{
+												if	(debug_level)	{
+																std::cout	<<	__FUNCTION__	<<	":	Allocation	reference	is	NULL."	<<	std::endl;
+																std::cout.flush();
+												}
+								}
+
+				}	else	{
+								int	curr_dim_size;
+								curr_dim_size	=	attr->index[curr_dim].size;
+								for	(ii	=	0;	ii	<	curr_dim_size;	ii++)	{
+												char	index[16]	;
+												snprintf(index,	sizeof(index),	"[%d]",	ii)	;
+												if	(curr_dim	<	attr->num_index	-	1)	{
+																restore_stls_in_arrayed_class(	name	+	index,	address,	attr,	curr_dim	+	1,	offset	*	curr_dim_size	+	ii);
+												}	else	{
+																char*	elem_addr;
+																elem_addr	=	address	+	(offset	*	curr_dim	+	ii)	*	attr->size	;
+																restore_stls_in_class(	name	+	index,	elem_addr,	(ATTRIBUTES*)attr->attr	);
+												}
+								}
+				}
 }
 
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::restore_stls_in_intrinsic( std::string name , void* address, ATTRIBUTES* attr, int curr_dim, int offset) {
-
-    if (debug_level > 1) {
-          std::cout << "DEBUG: Entered function:" <<  __FUNCTION__ << std::endl;
-    }
-
-    // If the variable that we are pointing to is an arrayed
-    if (curr_dim < attr->num_index) {
-
-        // If it is an unconstrained array (a pointer)
-        if (attr->index[curr_dim].size == 0) {
-
-            void* pointer = *(void**)((char*)address + offset * sizeof(void*));
-
-            if (pointer != NULL) {
-                ALLOC_INFO *alloc_info;
-                alloc_info = get_alloc_info_of( pointer);
-                if (alloc_info != NULL) {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": @" << (void*)address << "." << attr->name << "[" << offset << "] points to @" << (void*)pointer << std::endl;
-                    }
-                    //restore_stls(alloc_info);
-                } else {
-                    if (debug_level) {
-                        std::cout << __FUNCTION__ <<  ": Pointer ("<< (void*)pointer <<") refers to memory that the MemoryManager doesn't know about." << std::endl;
-                        std::cout.flush();
-                    }
-                }
-            } else {
-                if (debug_level) {
-                    std::cout << __FUNCTION__ <<  ": Allocation reference is NULL." << std::endl;
-                    std::cout.flush();
-                }
-            }
-
-        } else { // otherwise its a constrained array.
-            int ii;
-            for (ii=0 ; ii< attr->index[curr_dim].size ; ii++) {
-                char index[16] ;
-                snprintf(index, sizeof(index), "[%d]", ii) ;
-                //restore_stls_in_intrinsic( name + index , address, attr, curr_dim + 1, offset * attr->index[curr_dim].size + ii);
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::restore_stls_in_intrinsic(	std::string	name	,	void*	address,	ATTRIBUTES*	attr,	int	curr_dim,	int	offset)	{
+
+				if	(debug_level	>	1)	{
+										std::cout	<<	"DEBUG:	Entered	function:"	<<		__FUNCTION__	<<	std::endl;
+				}
+
+				//	If	the	variable	that	we	are	pointing	to	is	an	arrayed
+				if	(curr_dim	<	attr->num_index)	{
+
+								//	If	it	is	an	unconstrained	array	(a	pointer)
+								if	(attr->index[curr_dim].size	==	0)	{
+
+												void*	pointer	=	*(void**)((char*)address	+	offset	*	sizeof(void*));
+
+												if	(pointer	!=	NULL)	{
+																ALLOC_INFO	*alloc_info;
+																alloc_info	=	get_alloc_info_of(	pointer);
+																if	(alloc_info	!=	NULL)	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	@"	<<	(void*)address	<<	"."	<<	attr->name	<<	"["	<<	offset	<<	"]	points	to	@"	<<	(void*)pointer	<<	std::endl;
+																				}
+																				//restore_stls(alloc_info);
+																}	else	{
+																				if	(debug_level)	{
+																								std::cout	<<	__FUNCTION__	<<		":	Pointer	("<<	(void*)pointer	<<")	refers	to	memory	that	the	MemoryManager	doesn't	know	about."	<<	std::endl;
+																								std::cout.flush();
+																				}
+																}
+												}	else	{
+																if	(debug_level)	{
+																				std::cout	<<	__FUNCTION__	<<		":	Allocation	reference	is	NULL."	<<	std::endl;
+																				std::cout.flush();
+																}
+												}
+
+								}	else	{	//	otherwise	its	a	constrained	array.
+												int	ii;
+												for	(ii=0	;	ii<	attr->index[curr_dim].size	;	ii++)	{
+																char	index[16]	;
+																snprintf(index,	sizeof(index),	"[%d]",	ii)	;
+																//restore_stls_in_intrinsic(	name	+	index	,	address,	attr,	curr_dim	+	1,	offset	*	attr->index[curr_dim].size	+	ii);
+												}
+								}
+				}
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp
index 3b2beaecc..9face09e9 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_set_checkpointagent.cpp
@@ -1,22 +1,22 @@
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
-Trick::CheckPointAgent * Trick::MemoryManager::get_CheckPointAgent() {
-    return currentCheckPointAgent ;
+Trick::CheckPointAgent	*	Trick::MemoryManager::get_CheckPointAgent()	{
+				return	currentCheckPointAgent	;
 }
 
-void Trick::MemoryManager::set_CheckPointAgent(CheckPointAgent* agent) {
+void	Trick::MemoryManager::set_CheckPointAgent(CheckPointAgent*	agent)	{
 
-    if (agent != NULL) {
-        currentCheckPointAgent = agent;
-    } else {
-        emitError("Attempt to set CheckPointAgent to NULL.\n") ;
-    }
-    return;
+				if	(agent	!=	NULL)	{
+								currentCheckPointAgent	=	agent;
+				}	else	{
+								emitError("Attempt	to	set	CheckPointAgent	to	NULL.\n")	;
+				}
+				return;
 }
 
-void Trick::MemoryManager::reset_CheckPointAgent() {
+void	Trick::MemoryManager::reset_CheckPointAgent()	{
 
-    currentCheckPointAgent = defaultCheckPointAgent;
-    return;
+				currentCheckPointAgent	=	defaultCheckPointAgent;
+				return;
 }
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp
index 90c5e7f9d..40f613724 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_set_debug_level.cpp
@@ -1,24 +1,24 @@
-#include "trick/MemoryManager.hh"
+#include	"trick/MemoryManager.hh"
 
-void Trick::MemoryManager::set_debug_level(int level) {
-    debug_level = level;
-    currentCheckPointAgent->set_debug_level(level);
-    defaultCheckPointAgent->set_debug_level(level);
-    return;
+void	Trick::MemoryManager::set_debug_level(int	level)	{
+				debug_level	=	level;
+				currentCheckPointAgent->set_debug_level(level);
+				defaultCheckPointAgent->set_debug_level(level);
+				return;
 }
 
-void Trick::MemoryManager::set_reduced_checkpoint(bool flag) {
-    reduced_checkpoint = flag;
-    currentCheckPointAgent->set_reduced_checkpoint(flag);
-    defaultCheckPointAgent->set_reduced_checkpoint(flag);
+void	Trick::MemoryManager::set_reduced_checkpoint(bool	flag)	{
+				reduced_checkpoint	=	flag;
+				currentCheckPointAgent->set_reduced_checkpoint(flag);
+				defaultCheckPointAgent->set_reduced_checkpoint(flag);
 }
 
-void Trick::MemoryManager::set_hexfloat_checkpoint(bool flag) {
-    hexfloat_checkpoint = flag;
-    currentCheckPointAgent->set_hexfloat_checkpoint(flag);
-    defaultCheckPointAgent->set_hexfloat_checkpoint(flag);
+void	Trick::MemoryManager::set_hexfloat_checkpoint(bool	flag)	{
+				hexfloat_checkpoint	=	flag;
+				currentCheckPointAgent->set_hexfloat_checkpoint(flag);
+				defaultCheckPointAgent->set_hexfloat_checkpoint(flag);
 }
 
-void Trick::MemoryManager::set_expanded_arrays(bool flag) {
-    expanded_arrays = flag;
+void	Trick::MemoryManager::set_expanded_arrays(bool	flag)	{
+				expanded_arrays	=	flag;
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
index fae4cd160..26b8a4c2e 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_strdup.cpp
@@ -1,21 +1,21 @@
-#include "trick/MemoryManager.hh"
-#include <string.h>
+#include	"trick/MemoryManager.hh"
+#include	<string.h>
 
 /**
- @par Detailed Description:
- */
-char* Trick::MemoryManager::mm_strdup( const char* s) {
-    char *allocation;
-    int extent;
+	@par	Detailed	Description:
+	*/
+char*	Trick::MemoryManager::mm_strdup(	const	char*	s)	{
+				char	*allocation;
+				int	extent;
 
-    /** @par Design: */
-    /** @li Allocate sufficient space for the duplicate character string. */
-    extent = (int)strlen(s)+1;
+				/**	@par	Design:	*/
+				/**	@li	Allocate	sufficient	space	for	the	duplicate	character	string.	*/
+				extent	=	(int)strlen(s)+1;
 
-    /** @li Allocate the duplicate character string */
-    allocation = (char*)declare_var(TRICK_CHARACTER, "", 0, "", 1, &extent);
+				/**	@li	Allocate	the	duplicate	character	string	*/
+				allocation	=	(char*)declare_var(TRICK_CHARACTER,	"",	0,	"",	1,	&extent);
 
-    /** @li Copy the contents of the original character string to the duplicate. */
-    /** @li Return the address of the new allocation.*/
-    return( strcpy(allocation, s));
+				/**	@li	Copy	the	contents	of	the	original	character	string	to	the	duplicate.	*/
+				/**	@li	Return	the	address	of	the	new	allocation.*/
+				return(	strcpy(allocation,	s));
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp
index dc2145ba8..b921be143 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_write_checkpoint.cpp
@@ -1,193 +1,193 @@
-#include <fstream>
-#include <sstream>
-#include <string.h>
-#include <stdlib.h>  // free()
-#include <algorithm> // std::sort()
-#include "trick/MemoryManager.hh"
-
-// GreenHills stuff
-#if ( __ghs )
-#include "ghs_stubs.h"
+#include	<fstream>
+#include	<sstream>
+#include	<string.h>
+#include	<stdlib.h>		//	free()
+#include	<algorithm>	//	std::sort()
+#include	"trick/MemoryManager.hh"
+
+//	GreenHills	stuff
+#if	(	__ghs	)
+#include	"ghs_stubs.h"
 #endif
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::execute_checkpoint( std::ostream& out_s ) {
-
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
-    char name[256];
-    int local_anon_var_number;
-    int extern_anon_var_number;
-
-    // 1) Generate declaration statements for each the allocations that we are managing.
-    out_s << "// Variable Declarations." << std::endl;
-    out_s.flush();
-
-    local_anon_var_number = 0;
-    extern_anon_var_number = 0;
-
-    // Give names to the anonymous declarations
-    // Also search each allocation for STLs.
-    // STLs will be added to the dependencies vector.
-    int n_depends = dependencies.size();
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        alloc_info = dependencies[ii];
-        /** Generate temporary names for anonymous variables. */
-        if (alloc_info->name == NULL) {
-            if ( alloc_info->stcl == TRICK_LOCAL) {
-                snprintf( name, sizeof(name), "%s%d", local_anon_var_prefix, local_anon_var_number++);
-                alloc_info->name = strdup( name);
-            } else if (alloc_info->stcl == TRICK_EXTERN) {
-                snprintf( name, sizeof(name), "%s%d", extern_anon_var_prefix, extern_anon_var_number++);
-                alloc_info->name = strdup( name);
-                /** @b NOTE: We should not write declarations for external
-                    anonymous variables, because we should not reload them.*/
-            } else {
-                emitError("write_checkpoint: This is bad. ALLOC_INFO object is messed up.\n") ;
-            }
-        }
-        get_stl_dependencies(alloc_info);
-    }
-
-    // Write a declaration statement for all of the LOCAL variables,
-    n_depends = dependencies.size();
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        alloc_info = dependencies[ii];
-        if ( alloc_info->stcl == TRICK_LOCAL) {
-            currentCheckPointAgent->write_decl( out_s, alloc_info);
-        }
-    }
-
-    // Write a "clear_all_vars" command.
-    if (reduced_checkpoint) {
-        out_s << std::endl << std::endl << "// Clear all allocations to 0." << std::endl;
-        out_s << "clear_all_vars();" << std::endl;
-    }
-
-    // 2) Dump the contents of each of the dynamic and mapped allocations.
-    out_s << std::endl << std::endl << "// Variable Assignments." << std::endl;
-    out_s.flush();
-
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        alloc_info = dependencies[ii];
-        write_var( out_s, alloc_info);
-        out_s << std::endl;
-    }
-
-    // Free all of the temporary names that were created for the checkpoint.
-
-    for (int ii = 0 ; ii < n_depends ; ii ++) {
-        alloc_info = dependencies[ii];
-        // If the temporary-variable prefix occurs at the beginning of the name ...
-        if ((alloc_info->name != NULL) &&
-            (( strstr( alloc_info->name, local_anon_var_prefix ) == alloc_info->name ) ||
-             ( strstr( alloc_info->name, extern_anon_var_prefix) == alloc_info->name ))) {
-                free( alloc_info->name);
-                alloc_info->name = NULL;
-        }
-    }
-
-    // Delete the variables created by STLs. Remove memory in reverse order.
-    std::vector<ALLOC_INFO*>::reverse_iterator it ;
-    for ( it = stl_dependencies.rbegin() ; it != stl_dependencies.rend() ; it++ ) {
-        delete_var((*it)->start) ;
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::execute_checkpoint(	std::ostream&	out_s	)	{
+
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
+				char	name[256];
+				int	local_anon_var_number;
+				int	extern_anon_var_number;
+
+				//	1)	Generate	declaration	statements	for	each	the	allocations	that	we	are	managing.
+				out_s	<<	"//	Variable	Declarations."	<<	std::endl;
+				out_s.flush();
+
+				local_anon_var_number	=	0;
+				extern_anon_var_number	=	0;
+
+				//	Give	names	to	the	anonymous	declarations
+				//	Also	search	each	allocation	for	STLs.
+				//	STLs	will	be	added	to	the	dependencies	vector.
+				int	n_depends	=	dependencies.size();
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								alloc_info	=	dependencies[ii];
+								/**	Generate	temporary	names	for	anonymous	variables.	*/
+								if	(alloc_info->name	==	NULL)	{
+												if	(	alloc_info->stcl	==	TRICK_LOCAL)	{
+																snprintf(	name,	sizeof(name),	"%s%d",	local_anon_var_prefix,	local_anon_var_number++);
+																alloc_info->name	=	strdup(	name);
+												}	else	if	(alloc_info->stcl	==	TRICK_EXTERN)	{
+																snprintf(	name,	sizeof(name),	"%s%d",	extern_anon_var_prefix,	extern_anon_var_number++);
+																alloc_info->name	=	strdup(	name);
+																/**	@b	NOTE:	We	should	not	write	declarations	for	external
+																				anonymous	variables,	because	we	should	not	reload	them.*/
+												}	else	{
+																emitError("write_checkpoint:	This	is	bad.	ALLOC_INFO	object	is	messed	up.\n")	;
+												}
+								}
+								get_stl_dependencies(alloc_info);
+				}
+
+				//	Write	a	declaration	statement	for	all	of	the	LOCAL	variables,
+				n_depends	=	dependencies.size();
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								alloc_info	=	dependencies[ii];
+								if	(	alloc_info->stcl	==	TRICK_LOCAL)	{
+												currentCheckPointAgent->write_decl(	out_s,	alloc_info);
+								}
+				}
+
+				//	Write	a	"clear_all_vars"	command.
+				if	(reduced_checkpoint)	{
+								out_s	<<	std::endl	<<	std::endl	<<	"//	Clear	all	allocations	to	0."	<<	std::endl;
+								out_s	<<	"clear_all_vars();"	<<	std::endl;
+				}
+
+				//	2)	Dump	the	contents	of	each	of	the	dynamic	and	mapped	allocations.
+				out_s	<<	std::endl	<<	std::endl	<<	"//	Variable	Assignments."	<<	std::endl;
+				out_s.flush();
+
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								alloc_info	=	dependencies[ii];
+								write_var(	out_s,	alloc_info);
+								out_s	<<	std::endl;
+				}
+
+				//	Free	all	of	the	temporary	names	that	were	created	for	the	checkpoint.
+
+				for	(int	ii	=	0	;	ii	<	n_depends	;	ii	++)	{
+								alloc_info	=	dependencies[ii];
+								//	If	the	temporary-variable	prefix	occurs	at	the	beginning	of	the	name	...
+								if	((alloc_info->name	!=	NULL)	&&
+												((	strstr(	alloc_info->name,	local_anon_var_prefix	)	==	alloc_info->name	)	||
+													(	strstr(	alloc_info->name,	extern_anon_var_prefix)	==	alloc_info->name	)))	{
+																free(	alloc_info->name);
+																alloc_info->name	=	NULL;
+								}
+				}
+
+				//	Delete	the	variables	created	by	STLs.	Remove	memory	in	reverse	order.
+				std::vector<ALLOC_INFO*>::reverse_iterator	it	;
+				for	(	it	=	stl_dependencies.rbegin()	;	it	!=	stl_dependencies.rend()	;	it++	)	{
+								delete_var((*it)->start)	;
+				}
 }
 
-// Local sort function used in write_checkpoint.
-static bool alloc_info_id_compare(ALLOC_INFO * lhs, ALLOC_INFO * rhs) { return ( lhs->id < rhs->id ) ; }
+//	Local	sort	function	used	in	write_checkpoint.
+static	bool	alloc_info_id_compare(ALLOC_INFO	*	lhs,	ALLOC_INFO	*	rhs)	{	return	(	lhs->id	<	rhs->id	)	;	}
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint( std::ostream& out_s) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(	std::ostream&	out_s)	{
 
-    ALLOC_INFO_MAP::iterator pos;
-    ALLOC_INFO* alloc_info;
-    dependencies.clear();
-    stl_dependencies.clear();
+				ALLOC_INFO_MAP::iterator	pos;
+				ALLOC_INFO*	alloc_info;
+				dependencies.clear();
+				stl_dependencies.clear();
 
-    pthread_mutex_lock(&mm_mutex);
-    for ( pos=alloc_info_map.begin() ; pos!=alloc_info_map.end() ; pos++ ) {
-        alloc_info = pos->second;
-        dependencies.push_back(alloc_info);
-    }
+				pthread_mutex_lock(&mm_mutex);
+				for	(	pos=alloc_info_map.begin()	;	pos!=alloc_info_map.end()	;	pos++	)	{
+								alloc_info	=	pos->second;
+								dependencies.push_back(alloc_info);
+				}
 
-    // Sort the dependencies by ALLOC_INFO.id.
-    std::sort( dependencies.begin() , dependencies.end() , alloc_info_id_compare) ;
-    pthread_mutex_unlock(&mm_mutex);
+				//	Sort	the	dependencies	by	ALLOC_INFO.id.
+				std::sort(	dependencies.begin()	,	dependencies.end()	,	alloc_info_id_compare)	;
+				pthread_mutex_unlock(&mm_mutex);
 
-    execute_checkpoint( out_s );
+				execute_checkpoint(	out_s	);
 
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint(const char* filename) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(const	char*	filename)	{
 
-   std::ofstream outfile( filename, std::ios::out);
+			std::ofstream	outfile(	filename,	std::ios::out);
 
-    if (outfile.is_open()) {
-        write_checkpoint( outfile);
-    } else {
-        std::stringstream message;
-        message << "Couldn't open \"" << filename << "\".";
-        emitError(message.str());
-    }
+				if	(outfile.is_open())	{
+								write_checkpoint(	outfile);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Couldn't	open	\""	<<	filename	<<	"\".";
+								emitError(message.str());
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint( std::ostream& out_s, const char* var_name) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(	std::ostream&	out_s,	const	char*	var_name)	{
 
-    dependencies.clear();
-    stl_dependencies.clear();
+				dependencies.clear();
+				stl_dependencies.clear();
 
-    pthread_mutex_lock(&mm_mutex);
-    get_alloc_deps_in_allocation( var_name);
-    pthread_mutex_unlock(&mm_mutex);
+				pthread_mutex_lock(&mm_mutex);
+				get_alloc_deps_in_allocation(	var_name);
+				pthread_mutex_unlock(&mm_mutex);
 
-    execute_checkpoint( out_s );
+				execute_checkpoint(	out_s	);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint(const char* filename, const char* var_name) {
-
-    std::ofstream out_s( filename, std::ios::out);
-    if (out_s.is_open()) {
-        write_checkpoint( out_s, var_name);
-    } else {
-        std::stringstream message;
-        message << "Couldn't open \"" << filename << "\".";
-        emitError(message.str());
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(const	char*	filename,	const	char*	var_name)	{
+
+				std::ofstream	out_s(	filename,	std::ios::out);
+				if	(out_s.is_open())	{
+								write_checkpoint(	out_s,	var_name);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"Couldn't	open	\""	<<	filename	<<	"\".";
+								emitError(message.str());
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint( std::ostream& out_s, std::vector<const char*>& var_name_list) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(	std::ostream&	out_s,	std::vector<const	char*>&	var_name_list)	{
 
-    const char* var_name;
-    int n_names;
+				const	char*	var_name;
+				int	n_names;
 
-    dependencies.clear();
-    stl_dependencies.clear();
+				dependencies.clear();
+				stl_dependencies.clear();
 
-    n_names = var_name_list.size();
-    for (int ii=0; ii< n_names; ii++) {
-        var_name = var_name_list[ii];
-        pthread_mutex_lock(&mm_mutex);
-        get_alloc_deps_in_allocation(var_name);
-        pthread_mutex_unlock(&mm_mutex);
-    }
+				n_names	=	var_name_list.size();
+				for	(int	ii=0;	ii<	n_names;	ii++)	{
+								var_name	=	var_name_list[ii];
+								pthread_mutex_lock(&mm_mutex);
+								get_alloc_deps_in_allocation(var_name);
+								pthread_mutex_unlock(&mm_mutex);
+				}
 
-    execute_checkpoint( out_s );
+				execute_checkpoint(	out_s	);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_checkpoint(const char* filename, std::vector<const char*>& var_name_list) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_checkpoint(const	char*	filename,	std::vector<const	char*>&	var_name_list)	{
 
-    std::ofstream out_s( filename, std::ios::out);
+				std::ofstream	out_s(	filename,	std::ios::out);
 
-    if (out_s.is_open()) {
-        write_checkpoint( out_s, var_name_list);
-    } else {
-        std::cerr << "ERROR: Couldn't open \""<< filename <<"\"." << std::endl;
-        std::cerr.flush();
-    }
+				if	(out_s.is_open())	{
+								write_checkpoint(	out_s,	var_name_list);
+				}	else	{
+								std::cerr	<<	"ERROR:	Couldn't	open	\""<<	filename	<<"\"."	<<	std::endl;
+								std::cerr.flush();
+				}
 }
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp
index 26c4e2466..e10d270f5 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager_write_var.cpp
@@ -1,165 +1,165 @@
-#include <fstream>
-#include <sstream>
-#include <string.h>
-#include "trick/MemoryManager.hh"
-
-// GreenHills stuff
-#if ( __ghs )
-#include "ghs_stubs.h"
+#include	<fstream>
+#include	<sstream>
+#include	<string.h>
+#include	"trick/MemoryManager.hh"
+
+//	GreenHills	stuff
+#if	(	__ghs	)
+#include	"ghs_stubs.h"
 #endif
 
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_composite_var( std::ostream& out_s,
-                                                void*         address,
-                                                ATTRIBUTES*   attr_list) {
-
-    if (attr_list == NULL) {
-        emitError("write_composite_var: attr_list = NULL.") ;
-        return;
-    }
-
-    for (int ii = 0; attr_list[ii].name[0] != '\0'; ii++) {
-
-        // If it's permitted to output the data type described by this ATTRIBUTE ...
-        if (currentCheckPointAgent->output_perm_check(&attr_list[ii])) {
-            void *elem_addr;
-            if (attr_list[ii].mods & 2) { // This is a static member variable.
-                elem_addr = (void*)attr_list[ii].offset;
-            } else { // This is a normal member variable.
-                elem_addr = (char*)address + (size_t)attr_list[ii].offset;
-            }
-            // Push the element name onto the name stack.
-            currentCheckPointAgent->push_struct_elem( attr_list[ii].name);
-
-            // Write the one or more assignment statements that represent the
-            // values in this variable.
-            write_var(out_s, elem_addr, &(attr_list[ii]));
-
-            // Pop the element name from the name stack.
-            currentCheckPointAgent->pop_elem();
-        }
-    }
-    return;
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_composite_var(	std::ostream&	out_s,
+																																																void*									address,
+																																																ATTRIBUTES*			attr_list)	{
+
+				if	(attr_list	==	NULL)	{
+								emitError("write_composite_var:	attr_list	=	NULL.")	;
+								return;
+				}
+
+				for	(int	ii	=	0;	attr_list[ii].name[0]	!=	'\0';	ii++)	{
+
+								//	If	it's	permitted	to	output	the	data	type	described	by	this	ATTRIBUTE	...
+								if	(currentCheckPointAgent->output_perm_check(&attr_list[ii]))	{
+												void	*elem_addr;
+												if	(attr_list[ii].mods	&	2)	{	//	This	is	a	static	member	variable.
+																elem_addr	=	(void*)attr_list[ii].offset;
+												}	else	{	//	This	is	a	normal	member	variable.
+																elem_addr	=	(char*)address	+	(size_t)attr_list[ii].offset;
+												}
+												//	Push	the	element	name	onto	the	name	stack.
+												currentCheckPointAgent->push_struct_elem(	attr_list[ii].name);
+
+												//	Write	the	one	or	more	assignment	statements	that	represent	the
+												//	values	in	this	variable.
+												write_var(out_s,	elem_addr,	&(attr_list[ii]));
+
+												//	Pop	the	element	name	from	the	name	stack.
+												currentCheckPointAgent->pop_elem();
+								}
+				}
+				return;
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_array_var( std::ostream& out_s,
-                                            void*         address,
-                                            ATTRIBUTES*   attr,
-                                            int           curr_dim,
-                                            int           offset) {
-
-    if (attr == NULL) {
-        emitError("write_array_var: attr_list = NULL.") ;
-        return;
-    }
-
-    int array_element_count = attr->index[curr_dim].size;
-
-    if (array_element_count == 0) { // This is a pointer (a.k.a: an unconstrained array).
-        currentCheckPointAgent->assign_rvalue( out_s, address, attr, curr_dim, offset);
-    } else { // This is a contrained array.
-
-        // If this is an array of primitive-types and the user has not requested that we
-        // write array in the expanded form  then write them more compactly.
-        if ( (attr->type != TRICK_STRUCTURED ) && (expanded_arrays == false)) {
-            currentCheckPointAgent->assign_rvalue( out_s, address, attr, 0, 0 );
-        } else {
-
-            // For each of the elements in the array ...
-            for (int ii = 0; ii < array_element_count; ii++) {
-                // Push the element index onto the name stack.
-                currentCheckPointAgent->push_array_elem(ii);
-                // If the current dimension is not the final dimension ...
-                if (curr_dim < attr->num_index - 1) {
-                    // The element itself is an array.
-                    write_array_var( out_s, address, attr, curr_dim + 1, offset * array_element_count + ii);
-                } else {
-                    // The element itself is not an array.
-                    if (attr->type == TRICK_STRUCTURED) { // The element is a composite.
-                        char* elem_addr = (char*)address + (offset * array_element_count + ii) * attr->size ;
-                        write_composite_var( out_s, elem_addr, (ATTRIBUTES*)attr->attr );
-                    } else { // The element is a primitive.
-                        int elem_offset = offset * array_element_count + ii;
-                        currentCheckPointAgent->assign_rvalue( out_s, address, attr, curr_dim+1, elem_offset);
-                    }
-                }
-                // Pop the element index back off of the name stack.
-                currentCheckPointAgent->pop_elem();
-            }
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_array_var(	std::ostream&	out_s,
+																																												void*									address,
+																																												ATTRIBUTES*			attr,
+																																												int											curr_dim,
+																																												int											offset)	{
+
+				if	(attr	==	NULL)	{
+								emitError("write_array_var:	attr_list	=	NULL.")	;
+								return;
+				}
+
+				int	array_element_count	=	attr->index[curr_dim].size;
+
+				if	(array_element_count	==	0)	{	//	This	is	a	pointer	(a.k.a:	an	unconstrained	array).
+								currentCheckPointAgent->assign_rvalue(	out_s,	address,	attr,	curr_dim,	offset);
+				}	else	{	//	This	is	a	contrained	array.
+
+								//	If	this	is	an	array	of	primitive-types	and	the	user	has	not	requested	that	we
+								//	write	array	in	the	expanded	form		then	write	them	more	compactly.
+								if	(	(attr->type	!=	TRICK_STRUCTURED	)	&&	(expanded_arrays	==	false))	{
+												currentCheckPointAgent->assign_rvalue(	out_s,	address,	attr,	0,	0	);
+								}	else	{
+
+												//	For	each	of	the	elements	in	the	array	...
+												for	(int	ii	=	0;	ii	<	array_element_count;	ii++)	{
+																//	Push	the	element	index	onto	the	name	stack.
+																currentCheckPointAgent->push_array_elem(ii);
+																//	If	the	current	dimension	is	not	the	final	dimension	...
+																if	(curr_dim	<	attr->num_index	-	1)	{
+																				//	The	element	itself	is	an	array.
+																				write_array_var(	out_s,	address,	attr,	curr_dim	+	1,	offset	*	array_element_count	+	ii);
+																}	else	{
+																				//	The	element	itself	is	not	an	array.
+																				if	(attr->type	==	TRICK_STRUCTURED)	{	//	The	element	is	a	composite.
+																								char*	elem_addr	=	(char*)address	+	(offset	*	array_element_count	+	ii)	*	attr->size	;
+																								write_composite_var(	out_s,	elem_addr,	(ATTRIBUTES*)attr->attr	);
+																				}	else	{	//	The	element	is	a	primitive.
+																								int	elem_offset	=	offset	*	array_element_count	+	ii;
+																								currentCheckPointAgent->assign_rvalue(	out_s,	address,	attr,	curr_dim+1,	elem_offset);
+																				}
+																}
+																//	Pop	the	element	index	back	off	of	the	name	stack.
+																currentCheckPointAgent->pop_elem();
+												}
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_var(std::ostream& out_s, void* address, ATTRIBUTES* attr) {
-
-    if (attr->num_index > 0) {
-        // This is an arrayed object.
-        write_array_var( out_s, (char*)address, attr, 0, 0) ;
-    } else {
-        // This is not an arrayed object.
-        if ( attr->type == TRICK_STRUCTURED ) {
-            // This is a composite object.
-            write_composite_var( out_s, (char*)address, (ATTRIBUTES*)(attr->attr)) ;
-        } else {
-            // This is a primitive object.
-            currentCheckPointAgent->assign_rvalue( out_s, address, attr, 0, 0);
-        }
-    }
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_var(std::ostream&	out_s,	void*	address,	ATTRIBUTES*	attr)	{
+
+				if	(attr->num_index	>	0)	{
+								//	This	is	an	arrayed	object.
+								write_array_var(	out_s,	(char*)address,	attr,	0,	0)	;
+				}	else	{
+								//	This	is	not	an	arrayed	object.
+								if	(	attr->type	==	TRICK_STRUCTURED	)	{
+												//	This	is	a	composite	object.
+												write_composite_var(	out_s,	(char*)address,	(ATTRIBUTES*)(attr->attr))	;
+								}	else	{
+												//	This	is	a	primitive	object.
+												currentCheckPointAgent->assign_rvalue(	out_s,	address,	attr,	0,	0);
+								}
+				}
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_var(std::ostream& out_s, ALLOC_INFO* alloc_info ) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_var(std::ostream&	out_s,	ALLOC_INFO*	alloc_info	)	{
 
-    ATTRIBUTES* reference_attr;
-    reference_attr = make_reference_attr( alloc_info);
+				ATTRIBUTES*	reference_attr;
+				reference_attr	=	make_reference_attr(	alloc_info);
 
-    // Push the basename onto the left-side name stack.
-    currentCheckPointAgent->push_basename( alloc_info->name);
+				//	Push	the	basename	onto	the	left-side	name	stack.
+				currentCheckPointAgent->push_basename(	alloc_info->name);
 
-    write_var(out_s, (char*)(alloc_info->start), reference_attr);
+				write_var(out_s,	(char*)(alloc_info->start),	reference_attr);
 
-    // Pop the basename that we pushed above.
-    currentCheckPointAgent->pop_elem(); // Pop basename.
+				//	Pop	the	basename	that	we	pushed	above.
+				currentCheckPointAgent->pop_elem();	//	Pop	basename.
 
-    free_reference_attr( reference_attr);
+				free_reference_attr(	reference_attr);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_var( std::ostream& out_s, const char* var_name ) {
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_var(	std::ostream&	out_s,	const	char*	var_name	)	{
 
-    VARIABLE_MAP::iterator pos;
-    ALLOC_INFO *alloc_info;
+				VARIABLE_MAP::iterator	pos;
+				ALLOC_INFO	*alloc_info;
 
-    pthread_mutex_lock(&mm_mutex);
-    pos = variable_map.find( var_name);
+				pthread_mutex_lock(&mm_mutex);
+				pos	=	variable_map.find(	var_name);
 
-    if (pos != variable_map.end()) {
-        alloc_info = pos->second;
-        write_var( out_s, alloc_info );
-    } else {
-        std::stringstream message;
-        message << "write_var(\"" << var_name << "\") failed. No such variable is being managed.";
-        emitError(message.str());
-    }
-    pthread_mutex_unlock(&mm_mutex);
+				if	(pos	!=	variable_map.end())	{
+								alloc_info	=	pos->second;
+								write_var(	out_s,	alloc_info	);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"write_var(\""	<<	var_name	<<	"\")	failed.	No	such	variable	is	being	managed.";
+								emitError(message.str());
+				}
+				pthread_mutex_unlock(&mm_mutex);
 }
 
-// MEMBER FUNCTION
-void Trick::MemoryManager::write_var( std::ostream& out_s, void* address) {
-
-    ALLOC_INFO *alloc_info;
-    pthread_mutex_lock(&mm_mutex);
-    alloc_info = get_alloc_info_of( address);
-
-    if (alloc_info != NULL) {
-        write_var( out_s, alloc_info );
-    } else {
-        std::stringstream message;
-        message << "write_var(" << address << ") failed. No such variable is being managed.";
-        emitError(message.str());
-    }
-    pthread_mutex_unlock(&mm_mutex);
+//	MEMBER	FUNCTION
+void	Trick::MemoryManager::write_var(	std::ostream&	out_s,	void*	address)	{
+
+				ALLOC_INFO	*alloc_info;
+				pthread_mutex_lock(&mm_mutex);
+				alloc_info	=	get_alloc_info_of(	address);
+
+				if	(alloc_info	!=	NULL)	{
+								write_var(	out_s,	alloc_info	);
+				}	else	{
+								std::stringstream	message;
+								message	<<	"write_var("	<<	address	<<	")	failed.	No	such	variable	is	being	managed.";
+								emitError(message.str());
+				}
+				pthread_mutex_unlock(&mm_mutex);
 }
diff --git a/trick_source/sim_services/MemoryManager/RefParseContext.cpp b/trick_source/sim_services/MemoryManager/RefParseContext.cpp
index df5362a96..0feeb9173 100644
--- a/trick_source/sim_services/MemoryManager/RefParseContext.cpp
+++ b/trick_source/sim_services/MemoryManager/RefParseContext.cpp
@@ -1,27 +1,27 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "trick/RefParseContext.hh"
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	"trick/RefParseContext.hh"
 
 /**
- Constructor
- */ RefParseContext::RefParseContext( Trick::MemoryManager *in_mem_mgr, std::istream* in_is = &std::cin ) {
+	Constructor
+	*/	RefParseContext::RefParseContext(	Trick::MemoryManager	*in_mem_mgr,	std::istream*	in_is	=	&std::cin	)	{
 
-   // Set verif input and echo input flags.
-   verify_input = 0;
-   echo_input = 1;
+			//	Set	verif	input	and	echo	input	flags.
+			verify_input	=	0;
+			echo_input	=	1;
 
-   // Initialize the scanner
-   init_scanner();
+			//	Initialize	the	scanner
+			init_scanner();
 
-   this->is = in_is;
-   this->mem_mgr = in_mem_mgr;
+			this->is	=	in_is;
+			this->mem_mgr	=	in_mem_mgr;
 
 }
 
 /**
- Destructor
- */
-RefParseContext::~RefParseContext() {
-    destroy_scanner();
+	Destructor
+	*/
+RefParseContext::~RefParseContext()	{
+				destroy_scanner();
 }
 
diff --git a/trick_source/sim_services/MemoryManager/ref_free.cpp b/trick_source/sim_services/MemoryManager/ref_free.cpp
index 4623c1d3d..8ac384a67 100644
--- a/trick_source/sim_services/MemoryManager/ref_free.cpp
+++ b/trick_source/sim_services/MemoryManager/ref_free.cpp
@@ -1,31 +1,31 @@
 /*
-   PURPOSE: (Frees allocated memory within a REF2 structure. Does not free the REF2 itself)
-   PROGRAMMERS: (((Alex Lin) (NASA) (5/13)))
+			PURPOSE:	(Frees	allocated	memory	within	a	REF2	structure.	Does	not	free	the	REF2	itself)
+			PROGRAMMERS:	(((Alex	Lin)	(NASA)	(5/13)))
 */
 
-#include <stdlib.h>
+#include	<stdlib.h>
 
-#include "trick/reference.h"
-#include "trick/dllist.h"
+#include	"trick/reference.h"
+#include	"trick/dllist.h"
 
-extern "C" void ref_free(REF2 * ref) {
-    if ( ref ) {
-        if ( ref->address_path ) {
-            DLLPOS pos = DLL_GetHeadPosition(ref->address_path);
-            DLLPOS prev = NULL;
-            while (pos != NULL) {
-                prev = pos;
-                // The address nodes were allocated with "new"
-                delete (ADDRESS_NODE *)DLL_GetNext(&pos, ref->address_path);
-                DLL_RemoveAt(prev, ref->address_path);
-            }
-            DLL_Delete(ref->address_path) ;
-        }
+extern	"C"	void	ref_free(REF2	*	ref)	{
+				if	(	ref	)	{
+								if	(	ref->address_path	)	{
+												DLLPOS	pos	=	DLL_GetHeadPosition(ref->address_path);
+												DLLPOS	prev	=	NULL;
+												while	(pos	!=	NULL)	{
+																prev	=	pos;
+																//	The	address	nodes	were	allocated	with	"new"
+																delete	(ADDRESS_NODE	*)DLL_GetNext(&pos,	ref->address_path);
+																DLL_RemoveAt(prev,	ref->address_path);
+												}
+												DLL_Delete(ref->address_path)	;
+								}
 
-        // The reference string was allocated with strdup.
-        if ( ref->reference ) {
-            free(ref->reference) ;
-        }
-    }
-    return ;
+								//	The	reference	string	was	allocated	with	strdup.
+								if	(	ref->reference	)	{
+												free(ref->reference)	;
+								}
+				}
+				return	;
 }
diff --git a/trick_source/sim_services/Message/MessageCout.cpp b/trick_source/sim_services/Message/MessageCout.cpp
index 8e115634e..5434b729d 100644
--- a/trick_source/sim_services/Message/MessageCout.cpp
+++ b/trick_source/sim_services/Message/MessageCout.cpp
@@ -1,54 +1,54 @@
 
-#include "trick/MessageCout.hh"
-#include "trick/message_type.h"
+#include	"trick/MessageCout.hh"
+#include	"trick/message_type.h"
 
-#include <sstream>
+#include	<sstream>
 
-Trick::MessageCout::MessageCout() {
-    /** By default, this subscriber is enabled when it is created. */
-    enabled = 1 ;
-    color = 1 ;
-    name = "cout" ;
+Trick::MessageCout::MessageCout()	{
+				/**	By	default,	this	subscriber	is	enabled	when	it	is	created.	*/
+				enabled	=	1	;
+				color	=	1	;
+				name	=	"cout"	;
 }
 
-void Trick::MessageCout::update( unsigned int level , std::string header , std::string message ) {
-
-    /** @par Design Details: */
-    std::string color_code ;
-
-    switch (level) {
-        case MSG_NORMAL :
-            color_code = "\033[00m" ; // normal
-            break ;
-        case MSG_INFO :
-            color_code = "\033[32m" ; // green
-            break ;
-        case MSG_WARNING :
-            color_code = "\033[33m" ; // yellow
-            break ;
-        case MSG_ERROR :
-            color_code = "\033[31m" ; // red
-            break ;
-        case MSG_DEBUG :
-            color_code = "\033[36m" ; // cyan
-            break ;
-        default :
-            color_code = "\033[00m" ; // normal
-            break ;
-    }
-
-    /** @li Prints the received message to the standard output stream. */
-    if (enabled && level < 100 ) {
-
-        // Building the final string in a temporary stream ensures an automic call to cout, which prevents
-        // multithreaded sims from interleaving header and message elements.
-        std::ostringstream oss;
-        if ( color ) {
-            oss << header << color_code << message << "\033[00m" ;
-        } else {
-            oss << header << message ;
-        }
-        std::cout << oss.str() << std::flush;
-    }
+void	Trick::MessageCout::update(	unsigned	int	level	,	std::string	header	,	std::string	message	)	{
+
+				/**	@par	Design	Details:	*/
+				std::string	color_code	;
+
+				switch	(level)	{
+								case	MSG_NORMAL	:
+												color_code	=	"\033[00m"	;	//	normal
+												break	;
+								case	MSG_INFO	:
+												color_code	=	"\033[32m"	;	//	green
+												break	;
+								case	MSG_WARNING	:
+												color_code	=	"\033[33m"	;	//	yellow
+												break	;
+								case	MSG_ERROR	:
+												color_code	=	"\033[31m"	;	//	red
+												break	;
+								case	MSG_DEBUG	:
+												color_code	=	"\033[36m"	;	//	cyan
+												break	;
+								default	:
+												color_code	=	"\033[00m"	;	//	normal
+												break	;
+				}
+
+				/**	@li	Prints	the	received	message	to	the	standard	output	stream.	*/
+				if	(enabled	&&	level	<	100	)	{
+
+								//	Building	the	final	string	in	a	temporary	stream	ensures	an	automic	call	to	cout,	which	prevents
+								//	multithreaded	sims	from	interleaving	header	and	message	elements.
+								std::ostringstream	oss;
+								if	(	color	)	{
+												oss	<<	header	<<	color_code	<<	message	<<	"\033[00m"	;
+								}	else	{
+												oss	<<	header	<<	message	;
+								}
+								std::cout	<<	oss.str()	<<	std::flush;
+				}
 }
 
diff --git a/trick_source/sim_services/Message/MessageCustomFile.cpp b/trick_source/sim_services/Message/MessageCustomFile.cpp
index db17ab6b4..c8764f181 100644
--- a/trick_source/sim_services/Message/MessageCustomFile.cpp
+++ b/trick_source/sim_services/Message/MessageCustomFile.cpp
@@ -1,51 +1,51 @@
 
-#include <iostream>
-#include <unistd.h>
+#include	<iostream>
+#include	<unistd.h>
 
 
-#include "trick/MessageCustomFile.hh"
-#include "trick/Message_proto.hh"
+#include	"trick/MessageCustomFile.hh"
+#include	"trick/Message_proto.hh"
 
 
-int Trick::MessageCustomFile::level_counter = 200;
+int	Trick::MessageCustomFile::level_counter	=	200;
 
 /**
 @details
--# Initializes everything
+-#	Initializes	everything
 */
-Trick::MessageCustomFile::MessageCustomFile() : _this_level(level_counter++) {
+Trick::MessageCustomFile::MessageCustomFile()	:	_this_level(level_counter++)	{
 }
 
 /**
 @details
--# If enabled and level is this file's level
-    -# Write the header and message to the file stream
--# Flush the stream
+-#	If	enabled	and	level	is	this	file's	level
+				-#	Write	the	header	and	message	to	the	file	stream
+-#	Flush	the	stream
 */
-void Trick::MessageCustomFile::update( unsigned int level , std::string header, std::string message ) {
-    if ( enabled && level == _this_level ) {
-        out_stream << header << message ;
-        out_stream.flush() ;
-    }
+void	Trick::MessageCustomFile::update(	unsigned	int	level	,	std::string	header,	std::string	message	)	{
+				if	(	enabled	&&	level	==	_this_level	)	{
+								out_stream	<<	header	<<	message	;
+								out_stream.flush()	;
+				}
 }
 
-int Trick::MessageCustomFile::get_level() const {
-    return _this_level;
+int	Trick::MessageCustomFile::get_level()	const	{
+				return	_this_level;
 }
 
-void Trick::MessageCustomFile::set_level(int level) {
-    if (level >= 0)
-        _this_level = level;
+void	Trick::MessageCustomFile::set_level(int	level)	{
+				if	(level	>=	0)
+								_this_level	=	level;
 }
 
-void Trick::MessageCustomFile::set_name(std::string name) {
-    if (name == "") {
-        name = "CustomLog" + std::to_string(_this_level);
-    }    
-    this->name = name;
+void	Trick::MessageCustomFile::set_name(std::string	name)	{
+				if	(name	==	"")	{
+								name	=	"CustomLog"	+	std::to_string(_this_level);
+				}				
+				this->name	=	name;
 }
-void Trick::MessageCustomFile::set_file_name(std::string file_name) {
-    this->file_name = file_name;
+void	Trick::MessageCustomFile::set_file_name(std::string	file_name)	{
+				this->file_name	=	file_name;
 }
 
 
diff --git a/trick_source/sim_services/Message/MessageCustomManager.cpp b/trick_source/sim_services/Message/MessageCustomManager.cpp
index dbeda119b..8b14bb237 100644
--- a/trick_source/sim_services/Message/MessageCustomManager.cpp
+++ b/trick_source/sim_services/Message/MessageCustomManager.cpp
@@ -1,59 +1,59 @@
-#include "trick/MessageCustomManager.hh"
-#include "trick/Message_proto.hh"
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/MessageCustomManager.hh"
+#include	"trick/Message_proto.hh"
+#include	"trick/memorymanager_c_intf.h"
 
-Trick::MessageCustomManager * the_message_custom_manager ;
+Trick::MessageCustomManager	*	the_message_custom_manager	;
 
-int open_custom_message_file(std::string file_name, std::string subscriber_name, int level) {
-    if (the_message_custom_manager == NULL) {
-        std::cout << "Problem: custom_message_manager not yet instantiated" << std::endl;
-        return -1;
-    }
+int	open_custom_message_file(std::string	file_name,	std::string	subscriber_name,	int	level)	{
+				if	(the_message_custom_manager	==	NULL)	{
+								std::cout	<<	"Problem:	custom_message_manager	not	yet	instantiated"	<<	std::endl;
+								return	-1;
+				}
 
-    return the_message_custom_manager->open_custom_message_file(file_name, subscriber_name, level);
+				return	the_message_custom_manager->open_custom_message_file(file_name,	subscriber_name,	level);
 }
 
 /**
- @brief The constructor.
-    */
-Trick::MessageCustomManager::MessageCustomManager() {
-    the_message_custom_manager = this;
+	@brief	The	constructor.
+				*/
+Trick::MessageCustomManager::MessageCustomManager()	{
+				the_message_custom_manager	=	this;
 }
 
-Trick::MessageCustomManager::~MessageCustomManager() {
-    the_message_custom_manager = NULL;
-    
-    for (Trick::MessageCustomFile *  message_file : _custom_message_files) {
-        TMM_delete_var_a(message_file);
-    }
+Trick::MessageCustomManager::~MessageCustomManager()	{
+				the_message_custom_manager	=	NULL;
+				
+				for	(Trick::MessageCustomFile	*		message_file	:	_custom_message_files)	{
+								TMM_delete_var_a(message_file);
+				}
 }
 
-int Trick::MessageCustomManager::open_custom_message_file(std::string file_name, std::string subscriber_name, int level) {
-    Trick::MessageCustomFile * new_message_file = (Trick::MessageCustomFile *) TMM_declare_var_s("Trick::MessageCustomFile");
+int	Trick::MessageCustomManager::open_custom_message_file(std::string	file_name,	std::string	subscriber_name,	int	level)	{
+				Trick::MessageCustomFile	*	new_message_file	=	(Trick::MessageCustomFile	*)	TMM_declare_var_s("Trick::MessageCustomFile");
 
-    new_message_file->set_level(level);
-    new_message_file->set_file_name(file_name);
-    new_message_file->set_name(subscriber_name);
-    new_message_file->init();
+				new_message_file->set_level(level);
+				new_message_file->set_file_name(file_name);
+				new_message_file->set_name(subscriber_name);
+				new_message_file->init();
 
-    _custom_message_files.push_back(new_message_file);
+				_custom_message_files.push_back(new_message_file);
 
-    return new_message_file->get_level();
+				return	new_message_file->get_level();
 }
 
 /**
- @brief Output message to the file.
-    */
-void Trick::MessageCustomManager::update( unsigned int level , std::string header , std::string message ) {
-    for (auto message_file : _custom_message_files) {
-        message_file->update(level, header, message);
-    }
+	@brief	Output	message	to	the	file.
+				*/
+void	Trick::MessageCustomManager::update(	unsigned	int	level	,	std::string	header	,	std::string	message	)	{
+				for	(auto	message_file	:	_custom_message_files)	{
+								message_file->update(level,	header,	message);
+				}
 }
 
-int Trick::MessageCustomManager::restart( ) {
-    for (auto message_file : _custom_message_files) {
-        message_file->restart();
-    }
+int	Trick::MessageCustomManager::restart(	)	{
+				for	(auto	message_file	:	_custom_message_files)	{
+								message_file->restart();
+				}
 
-    return 0;
+				return	0;
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/Message/MessageFile.cpp b/trick_source/sim_services/Message/MessageFile.cpp
index 6411cca34..374ca1390 100644
--- a/trick_source/sim_services/Message/MessageFile.cpp
+++ b/trick_source/sim_services/Message/MessageFile.cpp
@@ -1,83 +1,83 @@
 
-#include <iostream>
-#include <unistd.h>
-#include <string>
+#include	<iostream>
+#include	<unistd.h>
+#include	<string>
 
-#include "trick/MessageFile.hh"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/MessageFile.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 
 
 /**
 @details
--# Initializes everything
+-#	Initializes	everything
 */
-Trick::MessageFile::MessageFile() {
-    enabled = 1 ;
-    color = 0 ;
+Trick::MessageFile::MessageFile()	{
+				enabled	=	1	;
+				color	=	0	;
 }
 
 /**
 @details
--# Overwrites the file name
+-#	Overwrites	the	file	name
 */
-int Trick::MessageFile::set_file_name(std::string in_name) {
+int	Trick::MessageFile::set_file_name(std::string	in_name)	{
 
-    file_name = in_name ;
-    return(0) ;
+				file_name	=	in_name	;
+				return(0)	;
 
 }
 
 /**
 @details
--# If enabled and level < 100
-    -# Write the header and message to the file stream
-    -# Flush the stream
+-#	If	enabled	and	level	<	100
+				-#	Write	the	header	and	message	to	the	file	stream
+				-#	Flush	the	stream
 */
-void Trick::MessageFile::update( unsigned int level , std::string header, std::string message ) {
+void	Trick::MessageFile::update(	unsigned	int	level	,	std::string	header,	std::string	message	)	{
 
-    if ( enabled && level < 100 ) {
-        out_stream << header << message ;
-        out_stream.flush() ;
-    }
+				if	(	enabled	&&	level	<	100	)	{
+								out_stream	<<	header	<<	message	;
+								out_stream.flush()	;
+				}
 
 }
 
 /**
 @details
--# Deletes the current output file
--# Opens a new file with the name "file_name"
+-#	Deletes	the	current	output	file
+-#	Opens	a	new	file	with	the	name	"file_name"
 */
-int Trick::MessageFile::init() {
-
-    unlink((std::string(command_line_args_get_output_dir()) + "/" + file_name).c_str()) ;
-
-    // Create the directory if we need to
-    int pos = file_name.find_last_of("/");
-    if (pos != std::string::npos) {
-        std::string dir = std::string(command_line_args_get_output_dir()) + "/" + file_name.substr(0, pos);
-        create_path(dir.c_str());
-    }
-
-    out_stream.open((std::string(command_line_args_get_output_dir()) + "/" + file_name).c_str() , std::fstream::out | std::fstream::app ) ;
-    if (!out_stream.is_open()) {
-        message_publish(MSG_ERROR, "Failed to open message file %s\n",file_name.c_str());
-    }
-    return(0) ;
+int	Trick::MessageFile::init()	{
+
+				unlink((std::string(command_line_args_get_output_dir())	+	"/"	+	file_name).c_str())	;
+
+				//	Create	the	directory	if	we	need	to
+				int	pos	=	file_name.find_last_of("/");
+				if	(pos	!=	std::string::npos)	{
+								std::string	dir	=	std::string(command_line_args_get_output_dir())	+	"/"	+	file_name.substr(0,	pos);
+								create_path(dir.c_str());
+				}
+
+				out_stream.open((std::string(command_line_args_get_output_dir())	+	"/"	+	file_name).c_str()	,	std::fstream::out	|	std::fstream::app	)	;
+				if	(!out_stream.is_open())	{
+								message_publish(MSG_ERROR,	"Failed	to	open	message	file	%s\n",file_name.c_str());
+				}
+				return(0)	;
 }
 
-int Trick::MessageFile::restart() {
-    out_stream.open((std::string(command_line_args_get_output_dir()) + "/" + file_name).c_str() , std::fstream::out | std::fstream::app ) ;
-    return(0) ;
+int	Trick::MessageFile::restart()	{
+				out_stream.open((std::string(command_line_args_get_output_dir())	+	"/"	+	file_name).c_str()	,	std::fstream::out	|	std::fstream::app	)	;
+				return(0)	;
 }
 
 /**
 @details
--# Close the file stream
+-#	Close	the	file	stream
 */
-Trick::MessageFile::~MessageFile() {
-    out_stream.close() ;
+Trick::MessageFile::~MessageFile()	{
+				out_stream.close()	;
 }
 
diff --git a/trick_source/sim_services/Message/MessageHSFile.cpp b/trick_source/sim_services/Message/MessageHSFile.cpp
index 7643d81dc..fdb1d71df 100644
--- a/trick_source/sim_services/Message/MessageHSFile.cpp
+++ b/trick_source/sim_services/Message/MessageHSFile.cpp
@@ -1,31 +1,31 @@
 
-#include <iostream>
-#include <unistd.h>
+#include	<iostream>
+#include	<unistd.h>
 
-#include "trick/MessageHSFile.hh"
-#include "trick/command_line_protos.h"
+#include	"trick/MessageHSFile.hh"
+#include	"trick/command_line_protos.h"
 
 /**
 @details
--# Initializes everything
+-#	Initializes	everything
 */
-Trick::MessageHSFile::MessageHSFile() {
-    name = "file";
-    file_name = "send_hs";
+Trick::MessageHSFile::MessageHSFile()	{
+				name	=	"file";
+				file_name	=	"send_hs";
 }
 
 /**
 @details
--# If enabled and level < 100
-    -# Write the header and message to the file stream
-    -# Flush the stream
+-#	If	enabled	and	level	<	100
+				-#	Write	the	header	and	message	to	the	file	stream
+				-#	Flush	the	stream
 */
-void Trick::MessageHSFile::update( unsigned int level , std::string header, std::string message ) {
+void	Trick::MessageHSFile::update(	unsigned	int	level	,	std::string	header,	std::string	message	)	{
 
-    if ( enabled && level < 100 ) {
-        out_stream << header << message ;
-        out_stream.flush() ;
-    }
+				if	(	enabled	&&	level	<	100	)	{
+								out_stream	<<	header	<<	message	;
+								out_stream.flush()	;
+				}
 
 }
 
diff --git a/trick_source/sim_services/Message/MessageLCout.cpp b/trick_source/sim_services/Message/MessageLCout.cpp
index a8c5f9584..36a7a2e76 100644
--- a/trick_source/sim_services/Message/MessageLCout.cpp
+++ b/trick_source/sim_services/Message/MessageLCout.cpp
@@ -1,70 +1,70 @@
 
-#include <string.h>
-#include <sstream>
+#include	<string.h>
+#include	<sstream>
 
-#include "trick/MessageLCout.hh"
+#include	"trick/MessageLCout.hh"
 
-Trick::MessageLCout::MessageLCout() {
-    enabled = 1 ;
-    subs['a'] = "4" ;
-    subs['e'] = "3" ;
-    subs['f'] = "ph" ;
-    subs['g'] = "9" ;
-    subs['l'] = "1" ;
-    subs['o'] = "0" ;
-    subs['s'] = "5" ;
-    subs['t'] = "7" ;
+Trick::MessageLCout::MessageLCout()	{
+				enabled	=	1	;
+				subs['a']	=	"4"	;
+				subs['e']	=	"3"	;
+				subs['f']	=	"ph"	;
+				subs['g']	=	"9"	;
+				subs['l']	=	"1"	;
+				subs['o']	=	"0"	;
+				subs['s']	=	"5"	;
+				subs['t']	=	"7"	;
 
-    seed = 0 ;
+				seed	=	0	;
 
-    name = "lcout" ;
+				name	=	"lcout"	;
 }
 
-void Trick::MessageLCout::update( unsigned int level , std::string header , std::string message ) {
-    if (!enabled) {
-        return;
-    }
-    if ( level == 1337 ) {
-        std::string in_string ;
-        std::string temp_string ;
-        unsigned int ii , jj ;
+void	Trick::MessageLCout::update(	unsigned	int	level	,	std::string	header	,	std::string	message	)	{
+				if	(!enabled)	{
+								return;
+				}
+				if	(	level	==	1337	)	{
+								std::string	in_string	;
+								std::string	temp_string	;
+								unsigned	int	ii	,	jj	;
 
-        in_string = header + message ;
+								in_string	=	header	+	message	;
 
-        for ( ii = 0 ; ii < in_string.size() ; ii++ ) {
-            seed += in_string[ii] * ii ;
-        }
-        srandom(seed) ;
-        for ( ii = 0 ; ii < in_string.size() ; ii++ ) {
-            if ( random() < RAND_MAX * 0.3 ) {
-                if ( subs.find((char)tolower(in_string[ii])) != subs.end()) {
-                    //temp_string += subs[(char)tolower(in_string[ii])] ;
-                    std::string replace_str = subs[(char)tolower(in_string[ii])] ;
-                    for ( jj = 0 ; jj < replace_str.size() ; jj++ ) {
-                        if ( random() < RAND_MAX * 0.5 ) {
-                            temp_string += toupper(replace_str[jj]) ;
-                        } else {
-                            temp_string += tolower(replace_str[jj]) ;
-                        }
-                    }
-                } else {
-                    temp_string += in_string[ii] ;
-                }
-            } else {
-                if ( random() < RAND_MAX * 0.3 ) {
-                    temp_string += toupper(in_string[ii]) ;
-                } else {
-                    temp_string += tolower(in_string[ii]) ;
-                }
-            }
-        }
-        std::cout << temp_string << std::flush ;
-    } else if ( level < 100 ) {
-        // Building the final string in a temporary stream ensures an automic call to cout, which prevents
-        // multithreaded sims from interleaving header and message elements.
-        std::ostringstream oss;
-        oss << header << message ;
-        std::cout << oss.str() << std::flush ;
-    }
+								for	(	ii	=	0	;	ii	<	in_string.size()	;	ii++	)	{
+												seed	+=	in_string[ii]	*	ii	;
+								}
+								srandom(seed)	;
+								for	(	ii	=	0	;	ii	<	in_string.size()	;	ii++	)	{
+												if	(	random()	<	RAND_MAX	*	0.3	)	{
+																if	(	subs.find((char)tolower(in_string[ii]))	!=	subs.end())	{
+																				//temp_string	+=	subs[(char)tolower(in_string[ii])]	;
+																				std::string	replace_str	=	subs[(char)tolower(in_string[ii])]	;
+																				for	(	jj	=	0	;	jj	<	replace_str.size()	;	jj++	)	{
+																								if	(	random()	<	RAND_MAX	*	0.5	)	{
+																												temp_string	+=	toupper(replace_str[jj])	;
+																								}	else	{
+																												temp_string	+=	tolower(replace_str[jj])	;
+																								}
+																				}
+																}	else	{
+																				temp_string	+=	in_string[ii]	;
+																}
+												}	else	{
+																if	(	random()	<	RAND_MAX	*	0.3	)	{
+																				temp_string	+=	toupper(in_string[ii])	;
+																}	else	{
+																				temp_string	+=	tolower(in_string[ii])	;
+																}
+												}
+								}
+								std::cout	<<	temp_string	<<	std::flush	;
+				}	else	if	(	level	<	100	)	{
+								//	Building	the	final	string	in	a	temporary	stream	ensures	an	automic	call	to	cout,	which	prevents
+								//	multithreaded	sims	from	interleaving	header	and	message	elements.
+								std::ostringstream	oss;
+								oss	<<	header	<<	message	;
+								std::cout	<<	oss.str()	<<	std::flush	;
+				}
 }
 
diff --git a/trick_source/sim_services/Message/MessagePublisher.cpp b/trick_source/sim_services/Message/MessagePublisher.cpp
index d208e41ae..e32263340 100644
--- a/trick_source/sim_services/Message/MessagePublisher.cpp
+++ b/trick_source/sim_services/Message/MessagePublisher.cpp
@@ -1,90 +1,90 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-#include <math.h>
-#include <unistd.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdio.h>
+#include	<stdarg.h>
+#include	<time.h>
+#include	<math.h>
+#include	<unistd.h>
 
-#include "trick/MessagePublisher.hh"
-#include "trick/message_proto.h"
-#include "trick/exec_proto.h"
+#include	"trick/MessagePublisher.hh"
+#include	"trick/message_proto.h"
+#include	"trick/exec_proto.h"
 
-#define MAX_MSG_HEADER_SIZE 256
+#define	MAX_MSG_HEADER_SIZE	256
 
-Trick::MessagePublisher * the_message_publisher ;
+Trick::MessagePublisher	*	the_message_publisher	;
 
-Trick::MessagePublisher::MessagePublisher() {
+Trick::MessagePublisher::MessagePublisher()	{
 
-    sim_name = " " ;
-    the_message_publisher = this ;
+				sim_name	=	"	"	;
+				the_message_publisher	=	this	;
 
-    tics_per_sec = 1000000 ;
-    set_print_format() ;
+				tics_per_sec	=	1000000	;
+				set_print_format()	;
 
 }
 
-Trick::MessagePublisher::~MessagePublisher() {
-    the_message_publisher = NULL;
+Trick::MessagePublisher::~MessagePublisher()	{
+				the_message_publisher	=	NULL;
 }
 
-void Trick::MessagePublisher::set_print_format() {
-    num_digits = (int)round(log10((double)tics_per_sec)) ;
-    snprintf(print_format, sizeof(print_format), "|L %%3d|%%s|%%s|%%s|T %%d|%%lld.%%0%dlld| ", num_digits) ;
+void	Trick::MessagePublisher::set_print_format()	{
+				num_digits	=	(int)round(log10((double)tics_per_sec))	;
+				snprintf(print_format,	sizeof(print_format),	"|L	%%3d|%%s|%%s|%%s|T	%%d|%%lld.%%0%dlld|	",	num_digits)	;
 }
 
-int Trick::MessagePublisher::init() {
-    tics_per_sec = exec_get_time_tic_value() ;
-    set_print_format() ;
-    return 0 ;
+int	Trick::MessagePublisher::init()	{
+				tics_per_sec	=	exec_get_time_tic_value()	;
+				set_print_format()	;
+				return	0	;
 }
 
-int Trick::MessagePublisher::publish(int level , std::string message) {
-
-    /** @par Design Details: */
-    std::list<Trick::MessageSubscriber *>::iterator p ;
-
-    char date_buf[MAX_MSG_HEADER_SIZE];
-    char header_buf[MAX_MSG_HEADER_SIZE];
-    char hostname[64];
-    time_t date ;
-    std::string header ;
-    long long tics = exec_get_time_tics() ;
-
-    /** @li Create message header with level, date, host, sim name, process id, sim time. */
-    date = time(NULL) ;
-    strftime(date_buf, (size_t) 20, "%Y/%m/%d,%H:%M:%S", localtime(&date));
-    (void) gethostname(hostname, (size_t) 48);
-    snprintf(header_buf, sizeof(header_buf), print_format , level, date_buf, hostname,
-            sim_name.c_str(), exec_get_process_id(), tics/tics_per_sec ,
-            (long long)((double)(tics % tics_per_sec) * (double)(pow(10 , num_digits)/tics_per_sec)) ) ;
-    header = header_buf ;
-
-    /** @li Go through all its subscribers and send a message update to the subscriber that is enabled. */
-    if ( ! subscribers.empty() ) {
-        for ( p = subscribers.begin() ; p != subscribers.end() ; ++p ) {
-            if ( (*p)->enabled ) {
-                (*p)->update(level , header , message) ;
-            }
-        }
-    } else {
-        // If there are no subscribers, that probably means things have not been inited yet... just print message only
-
-        // Building the final string in a temporary stream ensures an automic call to cout, which prevents
-        // multithreaded sims from interleaving header and message elements.
-        std::ostringstream oss;
-        oss << header << message ;
-        std::cout << oss.str() << std::flush ; } return(0) ;
+int	Trick::MessagePublisher::publish(int	level	,	std::string	message)	{
+
+				/**	@par	Design	Details:	*/
+				std::list<Trick::MessageSubscriber	*>::iterator	p	;
+
+				char	date_buf[MAX_MSG_HEADER_SIZE];
+				char	header_buf[MAX_MSG_HEADER_SIZE];
+				char	hostname[64];
+				time_t	date	;
+				std::string	header	;
+				long	long	tics	=	exec_get_time_tics()	;
+
+				/**	@li	Create	message	header	with	level,	date,	host,	sim	name,	process	id,	sim	time.	*/
+				date	=	time(NULL)	;
+				strftime(date_buf,	(size_t)	20,	"%Y/%m/%d,%H:%M:%S",	localtime(&date));
+				(void)	gethostname(hostname,	(size_t)	48);
+				snprintf(header_buf,	sizeof(header_buf),	print_format	,	level,	date_buf,	hostname,
+												sim_name.c_str(),	exec_get_process_id(),	tics/tics_per_sec	,
+												(long	long)((double)(tics	%	tics_per_sec)	*	(double)(pow(10	,	num_digits)/tics_per_sec))	)	;
+				header	=	header_buf	;
+
+				/**	@li	Go	through	all	its	subscribers	and	send	a	message	update	to	the	subscriber	that	is	enabled.	*/
+				if	(	!	subscribers.empty()	)	{
+								for	(	p	=	subscribers.begin()	;	p	!=	subscribers.end()	;	++p	)	{
+												if	(	(*p)->enabled	)	{
+																(*p)->update(level	,	header	,	message)	;
+												}
+								}
+				}	else	{
+								//	If	there	are	no	subscribers,	that	probably	means	things	have	not	been	inited	yet...	just	print	message	only
+
+								//	Building	the	final	string	in	a	temporary	stream	ensures	an	automic	call	to	cout,	which	prevents
+								//	multithreaded	sims	from	interleaving	header	and	message	elements.
+								std::ostringstream	oss;
+								oss	<<	header	<<	message	;
+								std::cout	<<	oss.str()	<<	std::flush	;	}	return(0)	;
 
 }
 
-Trick::MessageSubscriber * Trick::MessagePublisher::getSubscriber( std::string sub_name ) {
-    std::list<Trick::MessageSubscriber *>::iterator lit ;
-    for ( lit = subscribers.begin() ; lit != subscribers.end() ; ++lit ) {
-        if ( ! (*lit)->name.compare(sub_name) ) {
-            return *lit ;
-        }
-    }
-    return NULL ;
+Trick::MessageSubscriber	*	Trick::MessagePublisher::getSubscriber(	std::string	sub_name	)	{
+				std::list<Trick::MessageSubscriber	*>::iterator	lit	;
+				for	(	lit	=	subscribers.begin()	;	lit	!=	subscribers.end()	;	++lit	)	{
+								if	(	!	(*lit)->name.compare(sub_name)	)	{
+												return	*lit	;
+								}
+				}
+				return	NULL	;
 }
diff --git a/trick_source/sim_services/Message/MessageSubscriber.cpp b/trick_source/sim_services/Message/MessageSubscriber.cpp
index 7bbac82c1..925fb3d96 100644
--- a/trick_source/sim_services/Message/MessageSubscriber.cpp
+++ b/trick_source/sim_services/Message/MessageSubscriber.cpp
@@ -1,16 +1,16 @@
 
-#include "trick/MessageSubscriber.hh"
+#include	"trick/MessageSubscriber.hh"
 
-Trick::MessageSubscriber::MessageSubscriber() :
- enabled(true) ,
- color(1) {}
+Trick::MessageSubscriber::MessageSubscriber()	:
+	enabled(true)	,
+	color(1)	{}
 
-int Trick::MessageSubscriber::set_enabled(bool yes_no) {
-    enabled = yes_no ;
-    return(0) ;
+int	Trick::MessageSubscriber::set_enabled(bool	yes_no)	{
+				enabled	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::MessageSubscriber::set_color(bool yes_no) {
-    color = yes_no ;
-    return(0) ;
+int	Trick::MessageSubscriber::set_color(bool	yes_no)	{
+				color	=	yes_no	;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/Message/MessageTCDevice.cpp b/trick_source/sim_services/Message/MessageTCDevice.cpp
index e0c0fde36..c92bf2bf5 100644
--- a/trick_source/sim_services/Message/MessageTCDevice.cpp
+++ b/trick_source/sim_services/Message/MessageTCDevice.cpp
@@ -1,237 +1,237 @@
 
-#include <string.h>
-#include <stdlib.h>
+#include	<string.h>
+#include	<stdlib.h>
 
-#include "trick/MessageTCDevice.hh"
-#include "trick/message_type.h"
-#include "trick/montecarlo_c_intf.h"
-#include "trick/tc_proto.h"
+#include	"trick/MessageTCDevice.hh"
+#include	"trick/message_type.h"
+#include	"trick/montecarlo_c_intf.h"
+#include	"trick/tc_proto.h"
 
-Trick::MessageTCDeviceListenThread::MessageTCDeviceListenThread(MessageTCDevice * in_mtcd) :
- Trick::SysThread("MessageListen"),
- mtcd(in_mtcd) ,
- listen_dev() {
-    /* And a TCDevice for message server @e listen_device is configured. */
-    listen_dev.disabled = TC_COMM_FALSE ;
-    listen_dev.disable_handshaking = TC_COMM_TRUE ;
-    listen_dev.blockio_limit = 0.0 ;
-    listen_dev.blockio_type = TC_COMM_BLOCKIO ;
-    listen_dev.client_id = 0 ;
-    listen_dev.port = 0 ;
-    strcpy(listen_dev.client_tag, "") ;
-    listen_dev.error_handler = (TrickErrorHndlr *) calloc(1, (int)sizeof(TrickErrorHndlr));
-    listen_dev.error_handler->report_level = TRICK_ERROR_CAUTION;
+Trick::MessageTCDeviceListenThread::MessageTCDeviceListenThread(MessageTCDevice	*	in_mtcd)	:
+	Trick::SysThread("MessageListen"),
+	mtcd(in_mtcd)	,
+	listen_dev()	{
+				/*	And	a	TCDevice	for	message	server	@e	listen_device	is	configured.	*/
+				listen_dev.disabled	=	TC_COMM_FALSE	;
+				listen_dev.disable_handshaking	=	TC_COMM_TRUE	;
+				listen_dev.blockio_limit	=	0.0	;
+				listen_dev.blockio_type	=	TC_COMM_BLOCKIO	;
+				listen_dev.client_id	=	0	;
+				listen_dev.port	=	0	;
+				strcpy(listen_dev.client_tag,	"")	;
+				listen_dev.error_handler	=	(TrickErrorHndlr	*)	calloc(1,	(int)sizeof(TrickErrorHndlr));
+				listen_dev.error_handler->report_level	=	TRICK_ERROR_CAUTION;
 }
 
-Trick::MessageTCDeviceListenThread::~MessageTCDeviceListenThread() {
-    free(listen_dev.error_handler) ;
-    listen_dev.error_handler = NULL;
-    if ( listen_dev.hostname ) {
-       free((char*)listen_dev.hostname) ;
-    }
-    close(listen_dev.socket) ;
+Trick::MessageTCDeviceListenThread::~MessageTCDeviceListenThread()	{
+				free(listen_dev.error_handler)	;
+				listen_dev.error_handler	=	NULL;
+				if	(	listen_dev.hostname	)	{
+							free((char*)listen_dev.hostname)	;
+				}
+				close(listen_dev.socket)	;
 }
 
-int Trick::MessageTCDeviceListenThread::get_port() {
-    return listen_dev.port ;
+int	Trick::MessageTCDeviceListenThread::get_port()	{
+				return	listen_dev.port	;
 }
 
-int Trick::MessageTCDeviceListenThread::init_listen_device() {
-    return tc_init(&listen_dev);
+int	Trick::MessageTCDeviceListenThread::init_listen_device()	{
+				return	tc_init(&listen_dev);
 }
 
-int Trick::MessageTCDeviceListenThread::restart() {
-    struct sockaddr_in s_in;
-    int s_in_size =  sizeof(s_in) ;
-    getsockname( listen_dev.socket , (struct sockaddr *)&s_in, (socklen_t *)&s_in_size) ;
-    printf("restart message port = %d\n" , ntohs(s_in.sin_port)) ;
-    return 0;
+int	Trick::MessageTCDeviceListenThread::restart()	{
+				struct	sockaddr_in	s_in;
+				int	s_in_size	=		sizeof(s_in)	;
+				getsockname(	listen_dev.socket	,	(struct	sockaddr	*)&s_in,	(socklen_t	*)&s_in_size)	;
+				printf("restart	message	port	=	%d\n"	,	ntohs(s_in.sin_port))	;
+				return	0;
 }
 
-void * Trick::MessageTCDeviceListenThread::thread_body() {
+void	*	Trick::MessageTCDeviceListenThread::thread_body()	{
 
-	/** @par Design Details: */
-    int status ;
-    fd_set rfds;
-    struct timeval timeout_time = { 2, 0 };
-    TCDevice * new_connection ;
+	/**	@par	Design	Details:	*/
+				int	status	;
+				fd_set	rfds;
+				struct	timeval	timeout_time	=	{	2,	0	};
+				TCDevice	*	new_connection	;
 
-    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+				pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,	NULL);
 
-    /** @li If a proper port is found, make a new connection to the message server that is listening if possible.
-     *      Once the connection is established, the new connection is added to the subscriber connection list.
-     */
-    while (1) {
-        FD_ZERO(&rfds);
-        FD_SET(listen_dev.socket, &rfds);
-        timeout_time.tv_sec = 2 ;
-        select(listen_dev.socket + 1, &rfds, NULL, NULL, &timeout_time);
+				/**	@li	If	a	proper	port	is	found,	make	a	new	connection	to	the	message	server	that	is	listening	if	possible.
+					*						Once	the	connection	is	established,	the	new	connection	is	added	to	the	subscriber	connection	list.
+					*/
+				while	(1)	{
+								FD_ZERO(&rfds);
+								FD_SET(listen_dev.socket,	&rfds);
+								timeout_time.tv_sec	=	2	;
+								select(listen_dev.socket	+	1,	&rfds,	NULL,	NULL,	&timeout_time);
 
-        if (FD_ISSET(listen_dev.socket, &rfds)) {
-            new_connection = new TCDevice() ;
-            new_connection->disabled = TC_COMM_FALSE ;
-            new_connection->disable_handshaking = TC_COMM_TRUE ;
-            new_connection->blockio_limit = 0.0 ;
-            new_connection->blockio_type = TC_COMM_BLOCKIO ;
-            new_connection->client_id = 0 ;
-            strcpy(new_connection->client_tag, "") ;
-            new_connection->error_handler = (TrickErrorHndlr *) calloc(1, (int)sizeof(TrickErrorHndlr));
-            new_connection->error_handler->report_level = TRICK_ERROR_CAUTION;
+								if	(FD_ISSET(listen_dev.socket,	&rfds))	{
+												new_connection	=	new	TCDevice()	;
+												new_connection->disabled	=	TC_COMM_FALSE	;
+												new_connection->disable_handshaking	=	TC_COMM_TRUE	;
+												new_connection->blockio_limit	=	0.0	;
+												new_connection->blockio_type	=	TC_COMM_BLOCKIO	;
+												new_connection->client_id	=	0	;
+												strcpy(new_connection->client_tag,	"")	;
+												new_connection->error_handler	=	(TrickErrorHndlr	*)	calloc(1,	(int)sizeof(TrickErrorHndlr));
+												new_connection->error_handler->report_level	=	TRICK_ERROR_CAUTION;
 
-            status = tc_accept(&listen_dev, new_connection);
+												status	=	tc_accept(&listen_dev,	new_connection);
 
-            if (status == TC_SUCCESS) {
-                mtcd->add_connection(new_connection) ;
-            } 
-        }
-    }
+												if	(status	==	TC_SUCCESS)	{
+																mtcd->add_connection(new_connection)	;
+												}	
+								}
+				}
 
-    return NULL ;
+				return	NULL	;
 
 }
 
-void Trick::MessageTCDeviceListenThread::dump( std::ostream & oss ) {
-    oss << "Trick::MessageTCDeviceListenThread (" << name << ")\n";
-    oss << "    port = " << get_port() << std::endl ;
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::MessageTCDeviceListenThread::dump(	std::ostream	&	oss	)	{
+				oss	<<	"Trick::MessageTCDeviceListenThread	("	<<	name	<<	")\n";
+				oss	<<	"				port	=	"	<<	get_port()	<<	std::endl	;
+				Trick::ThreadBase::dump(oss)	;
 }
 
-/* --------------------------------------------------------------------------- */
+/*	---------------------------------------------------------------------------	*/
 
-Trick::MessageTCDevice::MessageTCDevice() :
- listen_thread(this)
+Trick::MessageTCDevice::MessageTCDevice()	:
+	listen_thread(this)
 {
-    combined_message = new char[20480] ;
-    name = "tcdevice" ;
-    return ;
+				combined_message	=	new	char[20480]	;
+				name	=	"tcdevice"	;
+				return	;
 }
 
-// DESTRUCTOR
-Trick::MessageTCDevice::~MessageTCDevice() {
-    delete[] combined_message ;
+//	DESTRUCTOR
+Trick::MessageTCDevice::~MessageTCDevice()	{
+				delete[]	combined_message	;
 }
 
-Trick::MessageTCDeviceListenThread & Trick::MessageTCDevice::get_listen_thread() {
-    return listen_thread ;
+Trick::MessageTCDeviceListenThread	&	Trick::MessageTCDevice::get_listen_thread()	{
+				return	listen_thread	;
 }
 
-void Trick::MessageTCDevice::add_connection( TCDevice * new_conn ) {
-    connections.push_back(new_conn) ;
+void	Trick::MessageTCDevice::add_connection(	TCDevice	*	new_conn	)	{
+				connections.push_back(new_conn)	;
 }
 
-int Trick::MessageTCDevice::shutdown() {
-    listen_thread.cancel_thread() ;
-    return 0 ;
+int	Trick::MessageTCDevice::shutdown()	{
+				listen_thread.cancel_thread()	;
+				return	0	;
 }
 
-int Trick::MessageTCDevice::default_data() {
+int	Trick::MessageTCDevice::default_data()	{
 
-    int ret ;
+				int	ret	;
 
-    if ( mc_is_slave() ) {
-        enabled = false ;
-    }
-    /** @par Design Details: */
-    /** @li Reserve a listen socket */
-    if ( enabled ) {
-        ret = listen_thread.init_listen_device() ;
-        if ( ret == TC_SUCCESS ) {
-            port = listen_thread.get_port() ;
-        } else {
-            fprintf(stderr, "ERROR: Could not create listen port for message server.  Aborting.\n");
-            return (-1);
-        }
-    }
+				if	(	mc_is_slave()	)	{
+								enabled	=	false	;
+				}
+				/**	@par	Design	Details:	*/
+				/**	@li	Reserve	a	listen	socket	*/
+				if	(	enabled	)	{
+								ret	=	listen_thread.init_listen_device()	;
+								if	(	ret	==	TC_SUCCESS	)	{
+												port	=	listen_thread.get_port()	;
+								}	else	{
+												fprintf(stderr,	"ERROR:	Could	not	create	listen	port	for	message	server.		Aborting.\n");
+												return	(-1);
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
 @details
--# If this subscriber is enabled, creates a thread for a new socket connection
+-#	If	this	subscriber	is	enabled,	creates	a	thread	for	a	new	socket	connection
 */
-int Trick::MessageTCDevice::init() {
-    if ( enabled ) {
-        listen_thread.create_thread() ;
-    }
-    return(0) ;
+int	Trick::MessageTCDevice::init()	{
+				if	(	enabled	)	{
+								listen_thread.create_thread()	;
+				}
+				return(0)	;
 }
 
 /**
 @details
--# Call the listen thread restart routine
--# Get the port number from the listen thread
--# If the listen thread has not been created, call the listen thread create thread method
+-#	Call	the	listen	thread	restart	routine
+-#	Get	the	port	number	from	the	listen	thread
+-#	If	the	listen	thread	has	not	been	created,	call	the	listen	thread	create	thread	method
 */
-int Trick::MessageTCDevice::restart() {
-    if ( enabled ) {
-        listen_thread.restart() ;
-        port = listen_thread.get_port() ;
-        if ( listen_thread.get_pthread_id() == 0 ) {
-            listen_thread.create_thread() ;
-        }
-    }
-    return 0 ;
-}
-
-
-// MEMBER FUNCTION
-void Trick::MessageTCDevice::update( unsigned int level , std::string header , std::string message ) {
-
-    std::vector < TCDevice *>::iterator it ;
-    int nbytes ;
-    int length ;
-    std::string color_code ;
-
-    /** @par Design Details: */
-
-    switch (level) {
-        case MSG_NORMAL :
-            color_code = "\033[00m" ; // normal
-            break ;
-        case MSG_INFO :
-            color_code = "\033[32m" ; // green
-            break ;
-        case MSG_WARNING :
-            color_code = "\033[33m" ; // yellow
-            break ;
-        case MSG_ERROR :
-            color_code = "\033[31m" ; // red
-            break ;
-        case MSG_DEBUG :
-            color_code = "\033[36m" ; // cyan
-            break ;
-        default :
-            color_code = "\033[00m" ; // normal
-            break ;
-    }
-
-    /** @li If this subscriber is not enabled, do nothing. Otherwise, it gets the update. */
-    if ( enabled && level < 100 ) {
-
-    	 /** @li The message is composed as message header + message text */
-        if ( color ) {
-            snprintf( combined_message , 20480 , "%s%s%s\033[00m" , header.c_str() , color_code.c_str() , message.c_str()) ;
-        } else {
-            snprintf( combined_message , 20480 , "%s%s" , header.c_str() , message.c_str()) ;
-        }
-        length = (int)strlen(combined_message) ;
-
-        /** @li The message is broadcast to all socket connection this subscriber has. */
-        it = connections.begin() ;
-        while ( it != connections.end() ) {
-            nbytes = tc_write( *it, combined_message, length) ;
-
-            /** @li All those connections that can not receive the message get disconnected.  */
-            if ( nbytes != length ) {
-                tc_disconnect(*it) ;
-                it = connections.erase(it) ;
-            } else {
-                it++ ;
-            }
-        }
-    }
-
-    return ;
+int	Trick::MessageTCDevice::restart()	{
+				if	(	enabled	)	{
+								listen_thread.restart()	;
+								port	=	listen_thread.get_port()	;
+								if	(	listen_thread.get_pthread_id()	==	0	)	{
+												listen_thread.create_thread()	;
+								}
+				}
+				return	0	;
+}
+
+
+//	MEMBER	FUNCTION
+void	Trick::MessageTCDevice::update(	unsigned	int	level	,	std::string	header	,	std::string	message	)	{
+
+				std::vector	<	TCDevice	*>::iterator	it	;
+				int	nbytes	;
+				int	length	;
+				std::string	color_code	;
+
+				/**	@par	Design	Details:	*/
+
+				switch	(level)	{
+								case	MSG_NORMAL	:
+												color_code	=	"\033[00m"	;	//	normal
+												break	;
+								case	MSG_INFO	:
+												color_code	=	"\033[32m"	;	//	green
+												break	;
+								case	MSG_WARNING	:
+												color_code	=	"\033[33m"	;	//	yellow
+												break	;
+								case	MSG_ERROR	:
+												color_code	=	"\033[31m"	;	//	red
+												break	;
+								case	MSG_DEBUG	:
+												color_code	=	"\033[36m"	;	//	cyan
+												break	;
+								default	:
+												color_code	=	"\033[00m"	;	//	normal
+												break	;
+				}
+
+				/**	@li	If	this	subscriber	is	not	enabled,	do	nothing.	Otherwise,	it	gets	the	update.	*/
+				if	(	enabled	&&	level	<	100	)	{
+
+						/**	@li	The	message	is	composed	as	message	header	+	message	text	*/
+								if	(	color	)	{
+												snprintf(	combined_message	,	20480	,	"%s%s%s\033[00m"	,	header.c_str()	,	color_code.c_str()	,	message.c_str())	;
+								}	else	{
+												snprintf(	combined_message	,	20480	,	"%s%s"	,	header.c_str()	,	message.c_str())	;
+								}
+								length	=	(int)strlen(combined_message)	;
+
+								/**	@li	The	message	is	broadcast	to	all	socket	connection	this	subscriber	has.	*/
+								it	=	connections.begin()	;
+								while	(	it	!=	connections.end()	)	{
+												nbytes	=	tc_write(	*it,	combined_message,	length)	;
+
+												/**	@li	All	those	connections	that	can	not	receive	the	message	get	disconnected.		*/
+												if	(	nbytes	!=	length	)	{
+																tc_disconnect(*it)	;
+																it	=	connections.erase(it)	;
+												}	else	{
+																it++	;
+												}
+								}
+				}
+
+				return	;
 }
 
diff --git a/trick_source/sim_services/Message/MessageThreadedCout.cpp b/trick_source/sim_services/Message/MessageThreadedCout.cpp
index 99fe0c3e0..89e146d95 100644
--- a/trick_source/sim_services/Message/MessageThreadedCout.cpp
+++ b/trick_source/sim_services/Message/MessageThreadedCout.cpp
@@ -1,103 +1,103 @@
 
-#include "trick/MessageThreadedCout.hh"
-#include "trick/message_type.h"
-#include "trick/release.h"
-
-#include <sstream>
-
-Trick::MessageThreadedCout::MessageThreadedCout() :
- max_buffer_items(400),
- max_buffer_size(4000) ,
- print_immediate(false) ,
- copy_ptr(NULL),
- write_ptr(NULL),
- SysThread("threadedcout") {
-    /** By default, this subscriber is enabled when it is created. */
-    Trick::MessageSubscriber::name = "threadedcout" ;
-    color_code.reserve(6) ;
-    StringNode * temp = new StringNode(max_buffer_size) ;
-    write_ptr = copy_ptr = temp ;
-    for ( unsigned int ii = 1 ; ii < max_buffer_items ; ii++ ) {
-        temp = new StringNode(max_buffer_size) ;
-        copy_ptr->next = temp ;
-        copy_ptr = temp ;
-    }
-    copy_ptr->next = write_ptr ;
-    copy_ptr = write_ptr ;
-
-    pthread_mutex_init(&write_mutex, NULL);
+#include	"trick/MessageThreadedCout.hh"
+#include	"trick/message_type.h"
+#include	"trick/release.h"
+
+#include	<sstream>
+
+Trick::MessageThreadedCout::MessageThreadedCout()	:
+	max_buffer_items(400),
+	max_buffer_size(4000)	,
+	print_immediate(false)	,
+	copy_ptr(NULL),
+	write_ptr(NULL),
+	SysThread("threadedcout")	{
+				/**	By	default,	this	subscriber	is	enabled	when	it	is	created.	*/
+				Trick::MessageSubscriber::name	=	"threadedcout"	;
+				color_code.reserve(6)	;
+				StringNode	*	temp	=	new	StringNode(max_buffer_size)	;
+				write_ptr	=	copy_ptr	=	temp	;
+				for	(	unsigned	int	ii	=	1	;	ii	<	max_buffer_items	;	ii++	)	{
+								temp	=	new	StringNode(max_buffer_size)	;
+								copy_ptr->next	=	temp	;
+								copy_ptr	=	temp	;
+				}
+				copy_ptr->next	=	write_ptr	;
+				copy_ptr	=	write_ptr	;
+
+				pthread_mutex_init(&write_mutex,	NULL);
 }
 
-int Trick::MessageThreadedCout::init() {
-    create_thread() ;
-    return 0 ;
+int	Trick::MessageThreadedCout::init()	{
+				create_thread()	;
+				return	0	;
 }
 
-void Trick::MessageThreadedCout::update( unsigned int level , std::string header , std::string message ) {
-
-    /** @li Prints the received message to the standard output stream. */
-    if (enabled && level < 100 ) {
-        switch (level) {
-            case MSG_NORMAL :
-                color_code = "\033[00m" ; // normal
-                break ;
-            case MSG_INFO :
-                color_code = "\033[32m" ; // green
-                break ;
-            case MSG_WARNING :
-                color_code = "\033[33m" ; // yellow
-                break ;
-            case MSG_ERROR :
-                color_code = "\033[31m" ; // red
-                break ;
-            case MSG_DEBUG :
-                color_code = "\033[36m" ; // cyan
-                break ;
-            default :
-                color_code = "\033[00m" ; // normal
-                break ;
-        }
-
-        if ( copy_ptr->next != write_ptr ) {
-            copy_ptr->copy(header, color_code, message) ;
-            copy_ptr = copy_ptr->next ;
-            // After shutdown the sim sends a termination message. print it now.
-            if ( print_immediate ) {
-                write_pending_messages() ;
-            }
-        }
-    }
+void	Trick::MessageThreadedCout::update(	unsigned	int	level	,	std::string	header	,	std::string	message	)	{
+
+				/**	@li	Prints	the	received	message	to	the	standard	output	stream.	*/
+				if	(enabled	&&	level	<	100	)	{
+								switch	(level)	{
+												case	MSG_NORMAL	:
+																color_code	=	"\033[00m"	;	//	normal
+																break	;
+												case	MSG_INFO	:
+																color_code	=	"\033[32m"	;	//	green
+																break	;
+												case	MSG_WARNING	:
+																color_code	=	"\033[33m"	;	//	yellow
+																break	;
+												case	MSG_ERROR	:
+																color_code	=	"\033[31m"	;	//	red
+																break	;
+												case	MSG_DEBUG	:
+																color_code	=	"\033[36m"	;	//	cyan
+																break	;
+												default	:
+																color_code	=	"\033[00m"	;	//	normal
+																break	;
+								}
+
+								if	(	copy_ptr->next	!=	write_ptr	)	{
+												copy_ptr->copy(header,	color_code,	message)	;
+												copy_ptr	=	copy_ptr->next	;
+												//	After	shutdown	the	sim	sends	a	termination	message.	print	it	now.
+												if	(	print_immediate	)	{
+																write_pending_messages()	;
+												}
+								}
+				}
 }
 
-void * Trick::MessageThreadedCout::thread_body() {
-    while(1) {
-        write_pending_messages() ;
-        RELEASE() ;
-    }
-    return (void*)0;
+void	*	Trick::MessageThreadedCout::thread_body()	{
+				while(1)	{
+								write_pending_messages()	;
+								RELEASE()	;
+				}
+				return	(void*)0;
 }
 
-void Trick::MessageThreadedCout::write_pending_messages() {
-    pthread_mutex_lock(&write_mutex) ;
-    while ( write_ptr != copy_ptr ) {
-        std::cout << write_ptr->buffer << std::flush ;
-        write_ptr = write_ptr->next ;
-    }
-    pthread_mutex_unlock(&write_mutex) ;
+void	Trick::MessageThreadedCout::write_pending_messages()	{
+				pthread_mutex_lock(&write_mutex)	;
+				while	(	write_ptr	!=	copy_ptr	)	{
+								std::cout	<<	write_ptr->buffer	<<	std::flush	;
+								write_ptr	=	write_ptr->next	;
+				}
+				pthread_mutex_unlock(&write_mutex)	;
 }
 
-int Trick::MessageThreadedCout::shutdown() {
+int	Trick::MessageThreadedCout::shutdown()	{
 
-    write_pending_messages() ;
-    // After shutdown print any late incoming messages immediately.
-    print_immediate = true ;
+				write_pending_messages()	;
+				//	After	shutdown	print	any	late	incoming	messages	immediately.
+				print_immediate	=	true	;
 
-    //TODO: delete memory
+				//TODO:	delete	memory
 
-    return 0 ;
+				return	0	;
 }
 
-void Trick::MessageThreadedCout::dump( std::ostream & oss ) {
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::MessageThreadedCout::dump(	std::ostream	&	oss	)	{
+				Trick::ThreadBase::dump(oss)	;
 }
 
diff --git a/trick_source/sim_services/Message/Message_c_intf.cpp b/trick_source/sim_services/Message/Message_c_intf.cpp
index 60aec2d2d..09881815a 100644
--- a/trick_source/sim_services/Message/Message_c_intf.cpp
+++ b/trick_source/sim_services/Message/Message_c_intf.cpp
@@ -1,138 +1,138 @@
 
-#include <iostream>
-#include <stdio.h>
-#include <stdarg.h>
+#include	<iostream>
+#include	<stdio.h>
+#include	<stdarg.h>
 
-#include "trick/MessagePublisher.hh"
-#include "trick/MessageCout.hh"
-#include "trick/MessageFile.hh"
-#include "trick/MessageCustomFile.hh"
-#include "trick/MessageTCDevice.hh"
-#include "trick/message_proto.h"
+#include	"trick/MessagePublisher.hh"
+#include	"trick/MessageCout.hh"
+#include	"trick/MessageFile.hh"
+#include	"trick/MessageCustomFile.hh"
+#include	"trick/MessageTCDevice.hh"
+#include	"trick/message_proto.h"
 
-#define MAX_MSG_HEADER_SIZE 256
-#define MAX_MSG_SIZE 20480
+#define	MAX_MSG_HEADER_SIZE	256
+#define	MAX_MSG_SIZE	20480
 
-/** Global pointer to the MessagePubliser. */
-extern Trick::MessagePublisher * the_message_publisher ;
+/**	Global	pointer	to	the	MessagePubliser.	*/
+extern	Trick::MessagePublisher	*	the_message_publisher	;
 
 /**
- @relates Trick::MessagePublisher
- @copydoc Trick::MessagePublisher::subscribe
- */
-int message_subscribe( Trick::MessageSubscriber * in_ms ) {
-    the_message_publisher->subscribe(in_ms) ;
-    return(0) ;
+	@relates	Trick::MessagePublisher
+	@copydoc	Trick::MessagePublisher::subscribe
+	*/
+int	message_subscribe(	Trick::MessageSubscriber	*	in_ms	)	{
+				the_message_publisher->subscribe(in_ms)	;
+				return(0)	;
 }
- 
+	
 /**
- @relates Trick::MessagePublisher
- @copydoc Trick::MessagePublisher::unsubscribe
- */
-int message_unsubscribe( Trick::MessageSubscriber * in_ms ) {
-    the_message_publisher->unsubscribe(in_ms) ;
-    return(0) ;
+	@relates	Trick::MessagePublisher
+	@copydoc	Trick::MessagePublisher::unsubscribe
+	*/
+int	message_unsubscribe(	Trick::MessageSubscriber	*	in_ms	)	{
+				the_message_publisher->unsubscribe(in_ms)	;
+				return(0)	;
 }
 
 
 /**
- @relates Trick::MessagePublisher
- @copydoc Trick::MessagePublisher::subscribe
- */
-extern "C" int message_add_subscriber( void * in_ms ) {
-    the_message_publisher->subscribe((Trick::MessageSubscriber *)in_ms) ;
-    return(0) ;
+	@relates	Trick::MessagePublisher
+	@copydoc	Trick::MessagePublisher::subscribe
+	*/
+extern	"C"	int	message_add_subscriber(	void	*	in_ms	)	{
+				the_message_publisher->subscribe((Trick::MessageSubscriber	*)in_ms)	;
+				return(0)	;
 }
- 
+	
 /**
- @relates Trick::MessagePublisher
- @copydoc Trick::MessagePublisher::unsubscribe
- */
-extern "C" int message_remove_subscriber( void * in_ms ) {
-    the_message_publisher->unsubscribe((Trick::MessageSubscriber *)in_ms) ;
-    return(0) ;
+	@relates	Trick::MessagePublisher
+	@copydoc	Trick::MessagePublisher::unsubscribe
+	*/
+extern	"C"	int	message_remove_subscriber(	void	*	in_ms	)	{
+				the_message_publisher->unsubscribe((Trick::MessageSubscriber	*)in_ms)	;
+				return(0)	;
 }
 
 /**
- @relates Trick::MessagePublisher
- @copydoc Trick::MessagePublisher::getSubscriber
- */
-extern "C" void * message_get_subscriber( const char * sub_name ) {
-    return (void *)the_message_publisher->getSubscriber(sub_name) ;
+	@relates	Trick::MessagePublisher
+	@copydoc	Trick::MessagePublisher::getSubscriber
+	*/
+extern	"C"	void	*	message_get_subscriber(	const	char	*	sub_name	)	{
+				return	(void	*)the_message_publisher->getSubscriber(sub_name)	;
 }
 
 /**
- @relates Trick::MessagePublisher
- @userdesc Command to publish a message, which sends the message to all subscribers.
- Creates a header that is prepended to the message, so that the output looks like this:
- @code |L <level>|<date>|<hostname>|<Trick::MessagePublisher::sim_name>|T <process id>|<sim time>| <format_msg> @endcode
- Calls Trick::MessagePublisher::publish.
- @par Python Usage:
- @code trick.message_publish(<level>, "<format_msg>") @endcode
- @param level - the published message level
- @param format_msg - the published message C format message string
- @return always 0
- */
-extern "C" int message_publish(int level, const char * format_msg, ...) {
-
-    char msg_buf[MAX_MSG_SIZE];
-    va_list args;
-
-    va_start(args, format_msg);
-    (void) vsnprintf(msg_buf, MAX_MSG_SIZE, format_msg, args);
-    va_end(args);
-
-    if (the_message_publisher != NULL) {
-        the_message_publisher->publish(level, msg_buf) ;
-    } else {
-        // if we don't have a message publisher, simply print message to terminal
-        message_publish_standalone(level, msg_buf) ;
-    }
-
-    return (0);
+	@relates	Trick::MessagePublisher
+	@userdesc	Command	to	publish	a	message,	which	sends	the	message	to	all	subscribers.
+	Creates	a	header	that	is	prepended	to	the	message,	so	that	the	output	looks	like	this:
+	@code	|L	<level>|<date>|<hostname>|<Trick::MessagePublisher::sim_name>|T	<process	id>|<sim	time>|	<format_msg>	@endcode
+	Calls	Trick::MessagePublisher::publish.
+	@par	Python	Usage:
+	@code	trick.message_publish(<level>,	"<format_msg>")	@endcode
+	@param	level	-	the	published	message	level
+	@param	format_msg	-	the	published	message	C	format	message	string
+	@return	always	0
+	*/
+extern	"C"	int	message_publish(int	level,	const	char	*	format_msg,	...)	{
+
+				char	msg_buf[MAX_MSG_SIZE];
+				va_list	args;
+
+				va_start(args,	format_msg);
+				(void)	vsnprintf(msg_buf,	MAX_MSG_SIZE,	format_msg,	args);
+				va_end(args);
+
+				if	(the_message_publisher	!=	NULL)	{
+								the_message_publisher->publish(level,	msg_buf)	;
+				}	else	{
+								//	if	we	don't	have	a	message	publisher,	simply	print	message	to	terminal
+								message_publish_standalone(level,	msg_buf)	;
+				}
+
+				return	(0);
 }
 
-extern "C" int vmessage_publish(int level, const char * format_msg, va_list args) {
+extern	"C"	int	vmessage_publish(int	level,	const	char	*	format_msg,	va_list	args)	{
 
-    char msg_buf[MAX_MSG_SIZE];
+				char	msg_buf[MAX_MSG_SIZE];
 
-    (void) vsnprintf(msg_buf, MAX_MSG_SIZE, format_msg, args);
+				(void)	vsnprintf(msg_buf,	MAX_MSG_SIZE,	format_msg,	args);
 
-    if (the_message_publisher != NULL) {
-        the_message_publisher->publish(level, msg_buf) ;
-    } else {
-        // if we don't have a message publisher, simply print message to terminal
-        message_publish_standalone(level, msg_buf) ;
-    }
+				if	(the_message_publisher	!=	NULL)	{
+								the_message_publisher->publish(level,	msg_buf)	;
+				}	else	{
+								//	if	we	don't	have	a	message	publisher,	simply	print	message	to	terminal
+								message_publish_standalone(level,	msg_buf)	;
+				}
 
-    return (0);
+				return	(0);
 }
 /**
- @relates Trick::MessagePublisher
- @userdesc A send health & status routine provided for backwards compatibility; simply calls message_publish with level 0.
- @par Python Usage:
- @code trick.send_hs(None, "<format_msg>") @endcode
- @param fp - the file which the published message goes to (this is ignored, message goes to all subscribers)
- @param format_msg - the published message C format message string
- @return always 0
- */
-extern "C" int send_hs(FILE * fp __attribute__ ((unused)), const char * format_msg, ...) {
-
-    char msg_buf[MAX_MSG_SIZE];
-    va_list args;
-
-    va_start(args, format_msg);
-    (void) vsnprintf(msg_buf, MAX_MSG_SIZE, format_msg, args);
-    va_end(args);
-
-    message_publish(0, msg_buf) ;
-
-    return (0);
+	@relates	Trick::MessagePublisher
+	@userdesc	A	send	health	&	status	routine	provided	for	backwards	compatibility;	simply	calls	message_publish	with	level	0.
+	@par	Python	Usage:
+	@code	trick.send_hs(None,	"<format_msg>")	@endcode
+	@param	fp	-	the	file	which	the	published	message	goes	to	(this	is	ignored,	message	goes	to	all	subscribers)
+	@param	format_msg	-	the	published	message	C	format	message	string
+	@return	always	0
+	*/
+extern	"C"	int	send_hs(FILE	*	fp	__attribute__	((unused)),	const	char	*	format_msg,	...)	{
+
+				char	msg_buf[MAX_MSG_SIZE];
+				va_list	args;
+
+				va_start(args,	format_msg);
+				(void)	vsnprintf(msg_buf,	MAX_MSG_SIZE,	format_msg,	args);
+				va_end(args);
+
+				message_publish(0,	msg_buf)	;
+
+				return	(0);
 }
 
-extern "C" int vsend_hs(FILE * fp __attribute__ ((unused)), const char * format_msg, va_list args) {
+extern	"C"	int	vsend_hs(FILE	*	fp	__attribute__	((unused)),	const	char	*	format_msg,	va_list	args)	{
 
-    vmessage_publish(0, format_msg, args) ;
-    return (0);
+				vmessage_publish(0,	format_msg,	args)	;
+				return	(0);
 }
 
diff --git a/trick_source/sim_services/Message/PlaybackFile.cpp b/trick_source/sim_services/Message/PlaybackFile.cpp
index 76d1c9aaf..827140928 100644
--- a/trick_source/sim_services/Message/PlaybackFile.cpp
+++ b/trick_source/sim_services/Message/PlaybackFile.cpp
@@ -1,21 +1,21 @@
 
-#include <iostream>
-#include <unistd.h>
+#include	<iostream>
+#include	<unistd.h>
 
-#include "trick/PlaybackFile.hh"
-#include "trick/message_type.h"
+#include	"trick/PlaybackFile.hh"
+#include	"trick/message_type.h"
 
-Trick::PlaybackFile::PlaybackFile() {
-    file_name = "varserver_log" ;
-    name = "varserver_log" ;
+Trick::PlaybackFile::PlaybackFile()	{
+				file_name	=	"varserver_log"	;
+				name	=	"varserver_log"	;
 }
 
-void Trick::PlaybackFile::update( unsigned int level , std::string header __attribute__ ((unused)) , std::string message ) {
+void	Trick::PlaybackFile::update(	unsigned	int	level	,	std::string	header	__attribute__	((unused))	,	std::string	message	)	{
 
-    if ( enabled && level == MSG_PLAYBACK ) {
-        out_stream << message ;
-        out_stream.flush() ;
-    }
+				if	(	enabled	&&	level	==	MSG_PLAYBACK	)	{
+								out_stream	<<	message	;
+								out_stream.flush()	;
+				}
 
 }
 
diff --git a/trick_source/sim_services/Message/message_publish_standalone.cpp b/trick_source/sim_services/Message/message_publish_standalone.cpp
index 4d9a32965..ec5a34ee8 100644
--- a/trick_source/sim_services/Message/message_publish_standalone.cpp
+++ b/trick_source/sim_services/Message/message_publish_standalone.cpp
@@ -1,31 +1,31 @@
 
-#include <unistd.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
+#include	<unistd.h>
+#include	<stdio.h>
+#include	<stdarg.h>
+#include	<time.h>
 
-// message_publish when you don't have a message publisher class
-#define MAX_MSG_HEADER_SIZE 256
-#define MAX_MSG_SIZE 20480
-extern "C" int message_publish_standalone(int level, const char * format_msg, ...) {
+//	message_publish	when	you	don't	have	a	message	publisher	class
+#define	MAX_MSG_HEADER_SIZE	256
+#define	MAX_MSG_SIZE	20480
+extern	"C"	int	message_publish_standalone(int	level,	const	char	*	format_msg,	...)	{
 
-    char msg_buf[MAX_MSG_SIZE];
-    char date_buf[MAX_MSG_HEADER_SIZE];
-    char hostname[64];
-    time_t date ;
-    va_list args;
+				char	msg_buf[MAX_MSG_SIZE];
+				char	date_buf[MAX_MSG_HEADER_SIZE];
+				char	hostname[64];
+				time_t	date	;
+				va_list	args;
 
-    va_start(args, format_msg);
-    (void) vsnprintf(msg_buf, MAX_MSG_SIZE, format_msg, args);
-    va_end(args);
+				va_start(args,	format_msg);
+				(void)	vsnprintf(msg_buf,	MAX_MSG_SIZE,	format_msg,	args);
+				va_end(args);
 
-    date = time(NULL) ;
-    strftime(date_buf, (size_t) 20, "%Y/%m/%d,%H:%M:%S", localtime(&date));
-    (void) gethostname(hostname, (size_t) 48);
-    fprintf(stdout, "|L %d|%s|  |%s|T %d|%.2f| %s" , level,
-            // so that we don't call any exec routines, use process id 0 and sim time 0.0
-            date_buf, hostname , 0, 0.0, msg_buf) ;
-    fflush(stdout) ;
+				date	=	time(NULL)	;
+				strftime(date_buf,	(size_t)	20,	"%Y/%m/%d,%H:%M:%S",	localtime(&date));
+				(void)	gethostname(hostname,	(size_t)	48);
+				fprintf(stdout,	"|L	%d|%s|		|%s|T	%d|%.2f|	%s"	,	level,
+												//	so	that	we	don't	call	any	exec	routines,	use	process	id	0	and	sim	time	0.0
+												date_buf,	hostname	,	0,	0.0,	msg_buf)	;
+				fflush(stdout)	;
 
-    return (0);
+				return	(0);
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp
index e1785f08c..17f43dca3 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo.cpp
@@ -1,79 +1,79 @@
-#include "trick/MonteCarlo.hh"
-#include "trick/tc_proto.h"
-
-Trick::MonteCarlo * the_mc ;
-
-Trick::MonteCarlo::MonteCarlo() :
-    enabled(false),
-    dry_run(false),
-    localhost_as_remote(false),
-    custom_slave_dispatch(false),
-    timeout(120),
-    max_tries(2),
-    verbosity(MC_INFORMATIONAL),
-    num_runs(0),
-    actual_num_runs(0),
-    num_results(0),
-    slave_id(0),
-    except_return(0)
+#include	"trick/MonteCarlo.hh"
+#include	"trick/tc_proto.h"
+
+Trick::MonteCarlo	*	the_mc	;
+
+Trick::MonteCarlo::MonteCarlo()	:
+				enabled(false),
+				dry_run(false),
+				localhost_as_remote(false),
+				custom_slave_dispatch(false),
+				timeout(120),
+				max_tries(2),
+				verbosity(MC_INFORMATIONAL),
+				num_runs(0),
+				actual_num_runs(0),
+				num_results(0),
+				slave_id(0),
+				except_return(0)
 {
-    the_mc = this;
+				the_mc	=	this;
 
-    slaves_head = NULL;
+				slaves_head	=	NULL;
 
-    char hostname[_POSIX_HOST_NAME_MAX + 1];
-    gethostname(hostname, _POSIX_HOST_NAME_MAX);
-    machine_name = hostname;
+				char	hostname[_POSIX_HOST_NAME_MAX	+	1];
+				gethostname(hostname,	_POSIX_HOST_NAME_MAX);
+				machine_name	=	hostname;
 
-    memset(&listen_device, 0, sizeof(TCDevice)) ;
-    memset(&connection_device, 0, sizeof(TCDevice)) ;
+				memset(&listen_device,	0,	sizeof(TCDevice))	;
+				memset(&connection_device,	0,	sizeof(TCDevice))	;
 
-    listen_device.port = 0;
-    connection_device.port = 0;
+				listen_device.port	=	0;
+				connection_device.port	=	0;
 
-    listen_device.disable_handshaking = TC_COMM_TRUE;
-    connection_device.disable_handshaking = TC_COMM_TRUE;
+				listen_device.disable_handshaking	=	TC_COMM_TRUE;
+				connection_device.disable_handshaking	=	TC_COMM_TRUE;
 
-    tc_error(&listen_device, 0);
-    tc_error(&connection_device, 0);
+				tc_error(&listen_device,	0);
+				tc_error(&connection_device,	0);
 
-    int num_classes = 0;
-    class_map["monte_master_init"] = num_classes;
-    class_to_queue[num_classes++] = &master_init_queue;
+				int	num_classes	=	0;
+				class_map["monte_master_init"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&master_init_queue;
 
-    class_map["monte_master_pre"] = num_classes;
-    class_to_queue[num_classes++] = &master_pre_queue;
+				class_map["monte_master_pre"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&master_pre_queue;
 
-    class_map["monte_master_post"] = num_classes;
-    class_to_queue[num_classes++] = &master_post_queue;
+				class_map["monte_master_post"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&master_post_queue;
 
-    class_map["monte_master_shutdown"] = num_classes;
-    class_to_queue[num_classes++] = &master_shutdown_queue;
+				class_map["monte_master_shutdown"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&master_shutdown_queue;
 
-    class_map["monte_slave_init"] = num_classes;
-    class_to_queue[num_classes++] = &slave_init_queue;
+				class_map["monte_slave_init"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&slave_init_queue;
 
-    class_map["monte_slave_pre"] = num_classes;
-    class_to_queue[num_classes++] = &slave_pre_queue;
+				class_map["monte_slave_pre"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&slave_pre_queue;
 
-    class_map["monte_slave_post"] = num_classes;
-    class_to_queue[num_classes++] = &slave_post_queue;
+				class_map["monte_slave_post"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&slave_post_queue;
 
-    class_map["monte_slave_shutdown"] = num_classes;
-    class_to_queue[num_classes++] = &slave_shutdown_queue;
+				class_map["monte_slave_shutdown"]	=	num_classes;
+				class_to_queue[num_classes++]	=	&slave_shutdown_queue;
 
 }
 
-Trick::MonteCarlo::~MonteCarlo() {
-    /* tc_error allocates memory in the constructor */
-    free(listen_device.error_handler) ;
-    free(connection_device.error_handler) ;
-    listen_device.error_handler = NULL ;
-    connection_device.error_handler = NULL ;
+Trick::MonteCarlo::~MonteCarlo()	{
+				/*	tc_error	allocates	memory	in	the	constructor	*/
+				free(listen_device.error_handler)	;
+				free(connection_device.error_handler)	;
+				listen_device.error_handler	=	NULL	;
+				connection_device.error_handler	=	NULL	;
 }
 
-const char* Trick::MonteRun::exit_status_string() const {
-    return MC_exit_status_string[exit_status];
+const	char*	Trick::MonteRun::exit_status_string()	const	{
+				return	MC_exit_status_string[exit_status];
 }
 
 
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp
index 7f793b768..e66a89a7a 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_c_intf.cpp
@@ -1,265 +1,265 @@
 
-#include "trick/MonteCarlo.hh"
-#include "trick/CommandLineArguments.hh"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/CommandLineArguments.hh"
+#include	"trick/tc_proto.h"
 
-extern Trick::MonteCarlo *the_mc;
-extern Trick::CommandLineArguments *the_cmd_args;
+extern	Trick::MonteCarlo	*the_mc;
+extern	Trick::CommandLineArguments	*the_cmd_args;
 
-extern "C" void mc_set_enabled(int enabled) {
-    if ( the_mc != NULL ) {
-        the_mc->set_enabled(enabled);
-    }
+extern	"C"	void	mc_set_enabled(int	enabled)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_enabled(enabled);
+				}
 }
 
-extern "C" int mc_get_enabled(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_enabled();
-    }
-    return 0 ; 
+extern	"C"	int	mc_get_enabled(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_enabled();
+				}
+				return	0	;	
 }
 
-extern "C" void mc_set_dry_run(int dry_run) {
-    if ( the_mc != NULL ) {
-        the_mc->set_dry_run(dry_run);
-    }
+extern	"C"	void	mc_set_dry_run(int	dry_run)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_dry_run(dry_run);
+				}
 }
 
-extern "C" int mc_get_dry_run(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_dry_run();
-    }
-    return 0 ;
+extern	"C"	int	mc_get_dry_run(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_dry_run();
+				}
+				return	0	;
 }
 
-extern "C" int mc_is_slave(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->is_slave();
-    }
-    return 0 ;
+extern	"C"	int	mc_is_slave(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->is_slave();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_localhost_as_remote(int localhost_as_remote) {
-    if ( the_mc != NULL ) {
-        the_mc->set_localhost_as_remote(localhost_as_remote);
-    }
+extern	"C"	void	mc_set_localhost_as_remote(int	localhost_as_remote)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_localhost_as_remote(localhost_as_remote);
+				}
 }
 
-extern "C" int mc_get_localhost_as_remote(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_localhost_as_remote();
-    }
-    return 0 ;
+extern	"C"	int	mc_get_localhost_as_remote(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_localhost_as_remote();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_custom_slave_dispatch(int custom_slave_dispatch) {
-    if ( the_mc != NULL ) {
-        the_mc->set_custom_slave_dispatch(custom_slave_dispatch);
-    }
+extern	"C"	void	mc_set_custom_slave_dispatch(int	custom_slave_dispatch)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_custom_slave_dispatch(custom_slave_dispatch);
+				}
 }
 
-extern "C" int mc_get_custom_slave_dispatch(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_custom_slave_dispatch();
-    }
-    return 0 ;
+extern	"C"	int	mc_get_custom_slave_dispatch(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_custom_slave_dispatch();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_timeout(double timeout) {
-    if ( the_mc != NULL ) {
-        the_mc->set_timeout(timeout);
-    }
+extern	"C"	void	mc_set_timeout(double	timeout)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_timeout(timeout);
+				}
 }
 
-extern "C" double mc_get_timeout(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_timeout();
-    }
-    return 0.0 ;
+extern	"C"	double	mc_get_timeout(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_timeout();
+				}
+				return	0.0	;
 }
 
-extern "C" void mc_set_max_tries(unsigned int max_tries) {
-    if ( the_mc != NULL ) {
-        the_mc->set_max_tries(max_tries);
-    }
+extern	"C"	void	mc_set_max_tries(unsigned	int	max_tries)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_max_tries(max_tries);
+				}
 }
 
-extern "C" unsigned int mc_get_max_tries(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_max_tries();
-    }
-    return 0 ;
+extern	"C"	unsigned	int	mc_get_max_tries(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_max_tries();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_user_cmd_string(const char *user_cmd_string) {
-    if ( the_mc != NULL ) {
-        the_mc->set_user_cmd_string(std::string(user_cmd_string ? user_cmd_string : ""));
-    }
+extern	"C"	void	mc_set_user_cmd_string(const	char	*user_cmd_string)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_user_cmd_string(std::string(user_cmd_string	?	user_cmd_string	:	""));
+				}
 }
 
-extern "C" const char *mc_get_user_cmd_string(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_user_cmd_string_c_str();
-    }
-    return NULL ;
+extern	"C"	const	char	*mc_get_user_cmd_string(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_user_cmd_string_c_str();
+				}
+				return	NULL	;
 }
 
-extern "C" void mc_set_slave_sim_options(const char *slave_sim_options) {
-    if ( the_mc != NULL ) {
-        the_mc->slave_sim_options = std::string(slave_sim_options ? slave_sim_options : "");
-    }
+extern	"C"	void	mc_set_slave_sim_options(const	char	*slave_sim_options)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->slave_sim_options	=	std::string(slave_sim_options	?	slave_sim_options	:	"");
+				}
 }
 
-extern "C" void mc_set_slave_output_directory(const char *slave_output_directory) {
-    if ( the_mc != NULL ) {
-        the_mc->slave_output_directory = std::string(slave_output_directory ? slave_output_directory : "");
-    }
+extern	"C"	void	mc_set_slave_output_directory(const	char	*slave_output_directory)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->slave_output_directory	=	std::string(slave_output_directory	?	slave_output_directory	:	"");
+				}
 }
 
-extern "C" const char *mc_get_slave_sim_options(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->slave_sim_options.c_str();
-    }
-    return NULL ;
+extern	"C"	const	char	*mc_get_slave_sim_options(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->slave_sim_options.c_str();
+				}
+				return	NULL	;
 }
 
-extern "C" void mc_set_custom_pre_text(const char *custom_pre_text) {
-    if ( the_mc != NULL ) {
-        the_mc->set_custom_pre_text(std::string(custom_pre_text ? custom_pre_text : ""));
-    }
+extern	"C"	void	mc_set_custom_pre_text(const	char	*custom_pre_text)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_custom_pre_text(std::string(custom_pre_text	?	custom_pre_text	:	""));
+				}
 }
 
-extern "C" const char *mc_get_custom_pre_text(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_custom_pre_text_c_str();
-    }
-    return NULL ;
+extern	"C"	const	char	*mc_get_custom_pre_text(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_custom_pre_text_c_str();
+				}
+				return	NULL	;
 }
 
-extern "C" void mc_set_custom_post_text(const char *custom_post_text) {
-    if ( the_mc != NULL ) {
-        the_mc->set_custom_post_text(std::string(custom_post_text ? custom_post_text : ""));
-    }
+extern	"C"	void	mc_set_custom_post_text(const	char	*custom_post_text)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_custom_post_text(std::string(custom_post_text	?	custom_post_text	:	""));
+				}
 }
 
-extern "C" const char *mc_get_custom_post_text(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_custom_post_text_c_str();
-    }
-    return NULL ;
+extern	"C"	const	char	*mc_get_custom_post_text(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_custom_post_text_c_str();
+				}
+				return	NULL	;
 }
 
-extern "C" void mc_set_verbosity(int verbosity) {
-    if ( the_mc != NULL ) {
-        the_mc->set_verbosity((Trick::MonteCarlo::Verbosity)verbosity);
-    }
+extern	"C"	void	mc_set_verbosity(int	verbosity)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_verbosity((Trick::MonteCarlo::Verbosity)verbosity);
+				}
 }
 
-extern "C" int mc_get_verbosity(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_verbosity();
-    }
-    return 0 ;
+extern	"C"	int	mc_get_verbosity(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_verbosity();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_num_runs(unsigned int num_runs) {
-    if ( the_mc != NULL ) {
-        the_mc->set_num_runs(num_runs);
-    }
+extern	"C"	void	mc_set_num_runs(unsigned	int	num_runs)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_num_runs(num_runs);
+				}
 }
 
-extern "C" unsigned int mc_get_num_runs(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_num_runs();
-    }
-    return 0 ;
+extern	"C"	unsigned	int	mc_get_num_runs(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_num_runs();
+				}
+				return	0	;
 }
 
-extern "C" unsigned int mc_get_num_results(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_num_results();
-    }
-    return 0 ;
+extern	"C"	unsigned	int	mc_get_num_results(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_num_results();
+				}
+				return	0	;
 }
 
-extern "C" unsigned int mc_get_slave_id(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_slave_id();
-    }
-    return 0 ;
+extern	"C"	unsigned	int	mc_get_slave_id(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_slave_id();
+				}
+				return	0	;
 }
 
-extern "C" void mc_add_range(unsigned int start, unsigned int end) {
-    if ( the_mc != NULL ) {
-        the_mc->add_range(start, end);
-    }
+extern	"C"	void	mc_add_range(unsigned	int	start,	unsigned	int	end)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->add_range(start,	end);
+				}
 }
 
-extern "C" void mc_add_slave(const char *machine_name) {
-    if ( the_mc != NULL ) {
-        the_mc->add_slave(std::string(machine_name ? machine_name : ""));
-    }
+extern	"C"	void	mc_add_slave(const	char	*machine_name)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->add_slave(std::string(machine_name	?	machine_name	:	""));
+				}
 }
 
-extern "C" void mc_start_slave(unsigned int id) {
-    if ( the_mc != NULL ) {
-        the_mc->start_slave(id);
-    }
+extern	"C"	void	mc_start_slave(unsigned	int	id)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->start_slave(id);
+				}
 }
 
-extern "C" void mc_stop_slave(unsigned int id) {
-    if ( the_mc != NULL ) {
-        the_mc->stop_slave(id);
-    }
+extern	"C"	void	mc_stop_slave(unsigned	int	id)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->stop_slave(id);
+				}
 }
 
-extern "C" void mc_write(char *buffer, int size) {
-    if ( the_mc != NULL ) {
-        the_mc->write(buffer, size) ;
-    }
+extern	"C"	void	mc_write(char	*buffer,	int	size)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->write(buffer,	size)	;
+				}
 }
 
-extern "C" void mc_read(char *buffer, int size) {
-    if ( the_mc != NULL ) {
-        the_mc->read(buffer, size) ;
-    }
+extern	"C"	void	mc_read(char	*buffer,	int	size)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->read(buffer,	size)	;
+				}
 }
 
-extern "C" unsigned int mc_get_current_run(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_current_run();
-    }
-    return 0 ;
+extern	"C"	unsigned	int	mc_get_current_run(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_current_run();
+				}
+				return	0	;
 }
 
-extern "C" void mc_set_current_run(int run_num) {
-    if ( the_mc != NULL ) {
-        the_mc->set_current_run(run_num);
-    }
+extern	"C"	void	mc_set_current_run(int	run_num)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_current_run(run_num);
+				}
 }
 
-extern "C" void mc_set_listen_device_port(int port_number) {
-    if ( the_mc != NULL ) {
-        the_mc->set_listen_device_port(port_number);
-    }
+extern	"C"	void	mc_set_listen_device_port(int	port_number)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_listen_device_port(port_number);
+				}
 }
 
-extern "C" void mc_set_connection_device_port(int port_number) {
-    if ( the_mc != NULL ) {
-        the_mc->set_connection_device_port(port_number);
-    }
+extern	"C"	void	mc_set_connection_device_port(int	port_number)	{
+				if	(	the_mc	!=	NULL	)	{
+								the_mc->set_connection_device_port(port_number);
+				}
 }
 
-extern "C" int mc_get_listen_device_port(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_listen_device_port();
-    }
-    return -1 ;
+extern	"C"	int	mc_get_listen_device_port(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_listen_device_port();
+				}
+				return	-1	;
 }
 
-extern "C" int mc_get_connection_device_port(void) {
-    if ( the_mc != NULL ) {
-        return the_mc->get_connection_device_port();
-    }
-    return -1 ;
+extern	"C"	int	mc_get_connection_device_port(void)	{
+				if	(	the_mc	!=	NULL	)	{
+								return	the_mc->get_connection_device_port();
+				}
+				return	-1	;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp
index ec7303f81..8577087ba 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_dispatch_run_to_slave.cpp
@@ -1,64 +1,64 @@
 
-#include <iomanip>
-#include <sstream>
-#include <sys/time.h>
+#include	<iomanip>
+#include	<sstream>
+#include	<sys/time.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/tc_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/tc_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-void Trick::MonteCarlo::dispatch_run_to_slave(MonteRun *run, MonteSlave *slave) {
-    if (slave && run) {
-        current_run = run->id;
-        if (prepare_run(run) == -1) {
-            return;
-        }
-        slave->state = MonteSlave::MC_RUNNING;
-        connection_device.hostname = (char*)slave->machine_name.c_str();
-        connection_device.port = slave->port;
-        if (tc_connect(&connection_device) == TC_SUCCESS) {
-            std::stringstream buffer_stream;
-            buffer_stream << slave_output_directory << "/RUN_" << std::setw(5) << std::setfill('0') << run->id;
-            std::string buffer = "";
-            for (std::vector<std::string>::size_type j = 0; j < run->variables.size(); ++j) {
-                buffer += run->variables[j] + "\n";
-            }
-            buffer += std::string("trick.set_output_dir(\"") + buffer_stream.str() + std::string("\")\n");
-            buffer_stream.str("");
-            buffer_stream << run->id ;
-            buffer += std::string("trick.mc_set_current_run(") + buffer_stream.str() + std::string(")\n");
+void	Trick::MonteCarlo::dispatch_run_to_slave(MonteRun	*run,	MonteSlave	*slave)	{
+				if	(slave	&&	run)	{
+								current_run	=	run->id;
+								if	(prepare_run(run)	==	-1)	{
+												return;
+								}
+								slave->state	=	MonteSlave::MC_RUNNING;
+								connection_device.hostname	=	(char*)slave->machine_name.c_str();
+								connection_device.port	=	slave->port;
+								if	(tc_connect(&connection_device)	==	TC_SUCCESS)	{
+												std::stringstream	buffer_stream;
+												buffer_stream	<<	slave_output_directory	<<	"/RUN_"	<<	std::setw(5)	<<	std::setfill('0')	<<	run->id;
+												std::string	buffer	=	"";
+												for	(std::vector<std::string>::size_type	j	=	0;	j	<	run->variables.size();	++j)	{
+																buffer	+=	run->variables[j]	+	"\n";
+												}
+												buffer	+=	std::string("trick.set_output_dir(\"")	+	buffer_stream.str()	+	std::string("\")\n");
+												buffer_stream.str("");
+												buffer_stream	<<	run->id	;
+												buffer	+=	std::string("trick.mc_set_current_run(")	+	buffer_stream.str()	+	std::string(")\n");
 
-            if (verbosity >= MC_INFORMATIONAL) {
-                message_publish(MSG_INFO, "Monte [Master] Dispatching run %d to %s:%d.\n",
-		     run->id, slave->machine_name.c_str(), slave->id) ;
-            }
+												if	(verbosity	>=	MC_INFORMATIONAL)	{
+																message_publish(MSG_INFO,	"Monte	[Master]	Dispatching	run	%d	to	%s:%d.\n",
+							run->id,	slave->machine_name.c_str(),	slave->id)	;
+												}
 
-            int command = htonl(MonteSlave::MC_PROCESS_RUN);
-            tc_write(&connection_device, (char *)&command, (int)sizeof(command));
-            int num_bytes = htonl(buffer.length());
-            tc_write(&connection_device, (char*)&num_bytes, (int)sizeof(num_bytes));
-            tc_write(&connection_device, (char*)buffer.c_str(), (int)buffer.length());
+												int	command	=	htonl(MonteSlave::MC_PROCESS_RUN);
+												tc_write(&connection_device,	(char	*)&command,	(int)sizeof(command));
+												int	num_bytes	=	htonl(buffer.length());
+												tc_write(&connection_device,	(char*)&num_bytes,	(int)sizeof(num_bytes));
+												tc_write(&connection_device,	(char*)buffer.c_str(),	(int)buffer.length());
 
-            if (verbosity >= MC_ALL) {
-                message_publish(MSG_INFO, "Parameterization of run %d :\n%s\n", run->id, buffer.c_str()) ;
-            }
+												if	(verbosity	>=	MC_ALL)	{
+																message_publish(MSG_INFO,	"Parameterization	of	run	%d	:\n%s\n",	run->id,	buffer.c_str())	;
+												}
 
-            tc_disconnect(&connection_device);
+												tc_disconnect(&connection_device);
 
-            ++slave->num_dispatches;
-            slave->current_run = run;
+												++slave->num_dispatches;
+												slave->current_run	=	run;
 
-            struct timeval time_val;
-            gettimeofday(&time_val, NULL);
-            run->start_time = time_val.tv_sec + (double)time_val.tv_usec / 1000000;
-            ++run->num_tries;
-        } else {
-            slave->state = Trick::MonteSlave::MC_DISCONNECTED;
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [Master] Failed to connect to %s:%d to dispatch run.\n",
-                                slave->machine_name.c_str(), slave->id) ;
-            }
-        }
-    }
+												struct	timeval	time_val;
+												gettimeofday(&time_val,	NULL);
+												run->start_time	=	time_val.tv_sec	+	(double)time_val.tv_usec	/	1000000;
+												++run->num_tries;
+								}	else	{
+												slave->state	=	Trick::MonteSlave::MC_DISCONNECTED;
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[Master]	Failed	to	connect	to	%s:%d	to	dispatch	run.\n",
+																																slave->machine_name.c_str(),	slave->id)	;
+												}
+								}
+				}
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp
index b043f1b56..d0cf36b35 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_dryrun.cpp
@@ -1,49 +1,49 @@
 
-#include <sstream>
-#include <iomanip>
-#include <fstream>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/command_line_protos.h"
-
-/** @par Detailed Design: */
-void Trick::MonteCarlo::dryrun() {
-
-    /** <ul><li> For all runs: run the pre run jobs. */
-    MonteRun * curr_run;
-    while ((curr_run = get_next_dispatch())) {
-        prepare_run(curr_run);
-
-        // Write out the input file for this run.
-        std::stringstream buffer_stream;
-        buffer_stream << run_directory << "/RUN_" << std::setw(5) << std::setfill('0') << curr_run->id;
-        std::ofstream of ;
-        if ( (access(buffer_stream.str().c_str(), F_OK) == 0) or (mkdir(buffer_stream.str().c_str(), 0755) == 0) ) {
-            of.open(std::string(buffer_stream.str() + "/monte_input").c_str()) ;
-            of << "# This run can be executed in stand alone (non-Monte Carlo) mode by running\n"
-             "# the S_main executable with this file specified as the input file.\n\n" ;
-            of << "if (sys.version_info > (3, 0)):\n";
-            of << "    exec(open(\"" << command_line_args_get_input_file() << "\").read())\n";
-            of << "else:\n";
-            of << "    execfile(\"" << command_line_args_get_input_file() << "\")\n\n";
-            of << "trick.mc_set_enabled(0)\n";
-            for (std::vector<std::string>::size_type j = 0; j < curr_run->variables.size(); ++j) {
-                of << curr_run->variables[j] << "\n";
-            }
-            of << "trick.set_output_dir(\"" << buffer_stream.str() << "\")\n";
-            of << "trick.mc_set_current_run(" << curr_run->id << ")" << std::endl ;
-            of.close() ;
-        }
-    }
-
-    /** <ul><li> Run the master shutdown jobs */
-    run_queue(&master_shutdown_queue, "in master_shutdown queue") ;
-
-    message_publish(MSG_INFO, "Monte [Master] Dry run complete.\n") ;
-
-    exit(0) ;
+#include	<sstream>
+#include	<iomanip>
+#include	<fstream>
+#include	<sys/stat.h>
+#include	<unistd.h>
+
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/command_line_protos.h"
+
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::dryrun()	{
+
+				/**	<ul><li>	For	all	runs:	run	the	pre	run	jobs.	*/
+				MonteRun	*	curr_run;
+				while	((curr_run	=	get_next_dispatch()))	{
+								prepare_run(curr_run);
+
+								//	Write	out	the	input	file	for	this	run.
+								std::stringstream	buffer_stream;
+								buffer_stream	<<	run_directory	<<	"/RUN_"	<<	std::setw(5)	<<	std::setfill('0')	<<	curr_run->id;
+								std::ofstream	of	;
+								if	(	(access(buffer_stream.str().c_str(),	F_OK)	==	0)	or	(mkdir(buffer_stream.str().c_str(),	0755)	==	0)	)	{
+												of.open(std::string(buffer_stream.str()	+	"/monte_input").c_str())	;
+												of	<<	"#	This	run	can	be	executed	in	stand	alone	(non-Monte	Carlo)	mode	by	running\n"
+													"#	the	S_main	executable	with	this	file	specified	as	the	input	file.\n\n"	;
+												of	<<	"if	(sys.version_info	>	(3,	0)):\n";
+												of	<<	"				exec(open(\""	<<	command_line_args_get_input_file()	<<	"\").read())\n";
+												of	<<	"else:\n";
+												of	<<	"				execfile(\""	<<	command_line_args_get_input_file()	<<	"\")\n\n";
+												of	<<	"trick.mc_set_enabled(0)\n";
+												for	(std::vector<std::string>::size_type	j	=	0;	j	<	curr_run->variables.size();	++j)	{
+																of	<<	curr_run->variables[j]	<<	"\n";
+												}
+												of	<<	"trick.set_output_dir(\""	<<	buffer_stream.str()	<<	"\")\n";
+												of	<<	"trick.mc_set_current_run("	<<	curr_run->id	<<	")"	<<	std::endl	;
+												of.close()	;
+								}
+				}
+
+				/**	<ul><li>	Run	the	master	shutdown	jobs	*/
+				run_queue(&master_shutdown_queue,	"in	master_shutdown	queue")	;
+
+				message_publish(MSG_INFO,	"Monte	[Master]	Dry	run	complete.\n")	;
+
+				exit(0)	;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp
index 5c3819c55..f74fdca0f 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_execute_monte.cpp
@@ -1,24 +1,24 @@
 
-#include <sys/resource.h>
+#include	<sys/resource.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::execute_monte() {
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::execute_monte()	{
 
-    if (enabled) {
-        if (is_master()) {
-            if (master_init() != 0) {
-                message_publish(MSG_ERROR, "Monte : An error occurred during Monte Carlo initialization. Exiting.\n") ;
-                exit(0);
-            }
-            master();
-        } else {
-            slave_init();
-            execute_as_slave();
-        }
-    }
-    return(0);
+				if	(enabled)	{
+								if	(is_master())	{
+												if	(master_init()	!=	0)	{
+																message_publish(MSG_ERROR,	"Monte	:	An	error	occurred	during	Monte	Carlo	initialization.	Exiting.\n")	;
+																exit(0);
+												}
+												master();
+								}	else	{
+												slave_init();
+												execute_as_slave();
+								}
+				}
+				return(0);
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
index 1af2fe3dc..10e371b6c 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
@@ -1,630 +1,630 @@
 
-#include <sys/time.h>
+#include	<sys/time.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/command_line_protos.h"
-#include "trick/tc_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/exec_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/tc_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/exec_proto.h"
 
-extern Trick::Executive * the_exec ;
+extern	Trick::Executive	*	the_exec	;
 
-void Trick::MonteCarlo::set_enabled(bool in_enabled) {
-    this->enabled = in_enabled;
+void	Trick::MonteCarlo::set_enabled(bool	in_enabled)	{
+				this->enabled	=	in_enabled;
 }
 
-bool Trick::MonteCarlo::get_enabled() {
-    return enabled;
+bool	Trick::MonteCarlo::get_enabled()	{
+				return	enabled;
 }
 
-void Trick::MonteCarlo::set_dry_run(bool in_dry_run) {
-    this->dry_run = in_dry_run;
+void	Trick::MonteCarlo::set_dry_run(bool	in_dry_run)	{
+				this->dry_run	=	in_dry_run;
 }
 
-bool Trick::MonteCarlo::get_dry_run() {
-    return dry_run;
+bool	Trick::MonteCarlo::get_dry_run()	{
+				return	dry_run;
 }
 
-bool Trick::MonteCarlo::is_slave() {
-    if (slave_id == 0) {
-       return false;
-    }
-    return true;
+bool	Trick::MonteCarlo::is_slave()	{
+				if	(slave_id	==	0)	{
+							return	false;
+				}
+				return	true;
 }
 
-bool Trick::MonteCarlo::is_master() {
-    if (slave_id == 0) {
-       return true;
-    }
-    return false;
+bool	Trick::MonteCarlo::is_master()	{
+				if	(slave_id	==	0)	{
+							return	true;
+				}
+				return	false;
 }
 
-void Trick::MonteCarlo::set_localhost_as_remote(bool in_localhost_as_remote) {
-    this->localhost_as_remote = in_localhost_as_remote;
+void	Trick::MonteCarlo::set_localhost_as_remote(bool	in_localhost_as_remote)	{
+				this->localhost_as_remote	=	in_localhost_as_remote;
 }
 
-bool Trick::MonteCarlo::get_localhost_as_remote() {
-    return localhost_as_remote;
+bool	Trick::MonteCarlo::get_localhost_as_remote()	{
+				return	localhost_as_remote;
 }
 
-void Trick::MonteCarlo::set_custom_slave_dispatch(bool in_custom_slave_dispatch) {
-    this->custom_slave_dispatch = in_custom_slave_dispatch;
+void	Trick::MonteCarlo::set_custom_slave_dispatch(bool	in_custom_slave_dispatch)	{
+				this->custom_slave_dispatch	=	in_custom_slave_dispatch;
 }
 
-bool Trick::MonteCarlo::get_custom_slave_dispatch() {
-    return custom_slave_dispatch;
+bool	Trick::MonteCarlo::get_custom_slave_dispatch()	{
+				return	custom_slave_dispatch;
 }
 
-void Trick::MonteCarlo::set_timeout(double in_timeout) {
-    this->timeout = in_timeout;
+void	Trick::MonteCarlo::set_timeout(double	in_timeout)	{
+				this->timeout	=	in_timeout;
 }
 
-double Trick::MonteCarlo::get_timeout() {
-    return timeout;
+double	Trick::MonteCarlo::get_timeout()	{
+				return	timeout;
 }
 
-void Trick::MonteCarlo::set_max_tries(unsigned int in_max_tries) {
-    this->max_tries = in_max_tries;
+void	Trick::MonteCarlo::set_max_tries(unsigned	int	in_max_tries)	{
+				this->max_tries	=	in_max_tries;
 }
 
-unsigned int Trick::MonteCarlo::get_max_tries() {
-    return max_tries;
+unsigned	int	Trick::MonteCarlo::get_max_tries()	{
+				return	max_tries;
 }
 
-void Trick::MonteCarlo::set_user_cmd_string(std::string in_user_cmd_string) {
-    this->user_cmd_string = in_user_cmd_string;
+void	Trick::MonteCarlo::set_user_cmd_string(std::string	in_user_cmd_string)	{
+				this->user_cmd_string	=	in_user_cmd_string;
 }
 
-std::string Trick::MonteCarlo::get_user_cmd_string() {
-    return user_cmd_string;
+std::string	Trick::MonteCarlo::get_user_cmd_string()	{
+				return	user_cmd_string;
 }
 
-const char* Trick::MonteCarlo::get_user_cmd_string_c_str() {
-    return user_cmd_string.c_str();
+const	char*	Trick::MonteCarlo::get_user_cmd_string_c_str()	{
+				return	user_cmd_string.c_str();
 }
 
-void Trick::MonteCarlo::set_custom_pre_text(std::string in_custom_pre_text) {
-    this->custom_pre_text = in_custom_pre_text;
+void	Trick::MonteCarlo::set_custom_pre_text(std::string	in_custom_pre_text)	{
+				this->custom_pre_text	=	in_custom_pre_text;
 }
 
-std::string Trick::MonteCarlo::get_custom_pre_text() {
-    return custom_pre_text;
+std::string	Trick::MonteCarlo::get_custom_pre_text()	{
+				return	custom_pre_text;
 }
 
-const char* Trick::MonteCarlo::get_custom_pre_text_c_str() {
-    return custom_pre_text.c_str();
+const	char*	Trick::MonteCarlo::get_custom_pre_text_c_str()	{
+				return	custom_pre_text.c_str();
 }
 
-void Trick::MonteCarlo::set_custom_post_text(std::string in_custom_post_text) {
-    this->custom_post_text = in_custom_post_text;
+void	Trick::MonteCarlo::set_custom_post_text(std::string	in_custom_post_text)	{
+				this->custom_post_text	=	in_custom_post_text;
 }
 
-std::string Trick::MonteCarlo::get_custom_post_text() {
-    return custom_post_text;
+std::string	Trick::MonteCarlo::get_custom_post_text()	{
+				return	custom_post_text;
 }
 
-const char* Trick::MonteCarlo::get_custom_post_text_c_str() {
-    return custom_post_text.c_str();
+const	char*	Trick::MonteCarlo::get_custom_post_text_c_str()	{
+				return	custom_post_text.c_str();
 }
 
-void Trick::MonteCarlo::set_verbosity(Trick::MonteCarlo::Verbosity in_verbosity) {
-    this->verbosity = in_verbosity;
+void	Trick::MonteCarlo::set_verbosity(Trick::MonteCarlo::Verbosity	in_verbosity)	{
+				this->verbosity	=	in_verbosity;
 }
 
-Trick::MonteCarlo::Verbosity Trick::MonteCarlo::get_verbosity() {
-    return verbosity;
+Trick::MonteCarlo::Verbosity	Trick::MonteCarlo::get_verbosity()	{
+				return	verbosity;
 }
 
-void Trick::MonteCarlo::set_num_runs(unsigned int in_num_runs) {
-    while (this->num_runs < in_num_runs) {
-        runs.push_back(new Trick::MonteRun(this->num_runs++));
-    }
-    while ( (this->num_runs > in_num_runs) && !runs.empty() ) {
-        delete runs.back();
-        runs.pop_back();
-        --this->num_runs;
-    }
-    update_actual_num_runs();
+void	Trick::MonteCarlo::set_num_runs(unsigned	int	in_num_runs)	{
+				while	(this->num_runs	<	in_num_runs)	{
+								runs.push_back(new	Trick::MonteRun(this->num_runs++));
+				}
+				while	(	(this->num_runs	>	in_num_runs)	&&	!runs.empty()	)	{
+								delete	runs.back();
+								runs.pop_back();
+								--this->num_runs;
+				}
+				update_actual_num_runs();
 }
 
-unsigned int Trick::MonteCarlo::get_num_runs() {
-    return num_runs;
+unsigned	int	Trick::MonteCarlo::get_num_runs()	{
+				return	num_runs;
 }
 
-unsigned int Trick::MonteCarlo::get_num_results() {
-    return num_results;
+unsigned	int	Trick::MonteCarlo::get_num_results()	{
+				return	num_results;
 }
 
-unsigned int Trick::MonteCarlo::get_slave_id() {
-    return slave_id;
+unsigned	int	Trick::MonteCarlo::get_slave_id()	{
+				return	slave_id;
 }
 
-void Trick::MonteCarlo::add_range(unsigned int start, unsigned int end) {
-    run_ranges.push_back(new MonteRange(start, end));
-    update_actual_num_runs();
+void	Trick::MonteCarlo::add_range(unsigned	int	start,	unsigned	int	end)	{
+				run_ranges.push_back(new	MonteRange(start,	end));
+				update_actual_num_runs();
 }
 
 /**
- * @par Detailed Design:
- * If there are no ranges specified, all runs are in range.
- */
-bool Trick::MonteCarlo::in_range(Trick::MonteRun *in_run) {
-     if (run_ranges.size() == 0) {
-         return true;
-     }
-     for (std::vector<Trick::MonteRange>::size_type i = 0; i < run_ranges.size(); ++i) {
-         if (in_run->id >= run_ranges[i]->get_start() && in_run->id <= run_ranges[i]->get_end()) {
-             return true;
-         }
-     }
-     return false;
-}
-
-void Trick::MonteCarlo::get_ranges(std::vector<MonteRange *> &ranges) {
-    ranges = run_ranges;
-}
-
-void Trick::MonteCarlo::add_variable(Trick::MonteVar *variable) {
-    for (std::vector<Trick::MonteVar *>::const_iterator i = variables.begin(); i != variables.end(); ++i) {
-        if ( (*i)->name.compare(variable->name) == 0 ) {
-            message_publish(MSG_WARNING, "Monte WARNING: Cannot add new MonteVar \"%s\", variable of that name already exists.\n",
-                    variable->name.c_str() );
-            return;
-        }
-    }
-    variables.push_back(variable);
+	*	@par	Detailed	Design:
+	*	If	there	are	no	ranges	specified,	all	runs	are	in	range.
+	*/
+bool	Trick::MonteCarlo::in_range(Trick::MonteRun	*in_run)	{
+					if	(run_ranges.size()	==	0)	{
+									return	true;
+					}
+					for	(std::vector<Trick::MonteRange>::size_type	i	=	0;	i	<	run_ranges.size();	++i)	{
+									if	(in_run->id	>=	run_ranges[i]->get_start()	&&	in_run->id	<=	run_ranges[i]->get_end())	{
+													return	true;
+									}
+					}
+					return	false;
+}
+
+void	Trick::MonteCarlo::get_ranges(std::vector<MonteRange	*>	&ranges)	{
+				ranges	=	run_ranges;
+}
+
+void	Trick::MonteCarlo::add_variable(Trick::MonteVar	*variable)	{
+				for	(std::vector<Trick::MonteVar	*>::const_iterator	i	=	variables.begin();	i	!=	variables.end();	++i)	{
+								if	(	(*i)->name.compare(variable->name)	==	0	)	{
+												message_publish(MSG_WARNING,	"Monte	WARNING:	Cannot	add	new	MonteVar	\"%s\",	variable	of	that	name	already	exists.\n",
+																				variable->name.c_str()	);
+												return;
+								}
+				}
+				variables.push_back(variable);
 }
 
 /**
- * @par Detailed Design:
- * Get a pointer to a MonteVar by name. Note this is used in conjunction with
- * %factory so that swig produces methods returning all derived types
- */
-Trick::MonteVar * Trick::MonteCarlo::get_variable(std::string variable_name) {
+	*	@par	Detailed	Design:
+	*	Get	a	pointer	to	a	MonteVar	by	name.	Note	this	is	used	in	conjunction	with
+	*	%factory	so	that	swig	produces	methods	returning	all	derived	types
+	*/
+Trick::MonteVar	*	Trick::MonteCarlo::get_variable(std::string	variable_name)	{
 
-    for (std::vector<Trick::MonteVar *>::const_iterator i = variables.begin(); i != variables.end(); ++i) {
-        if ( (*i) and (*i)->name.compare(variable_name) == 0 ) {
-            return (*i);
-        }
-    }
-    return (NULL);
+				for	(std::vector<Trick::MonteVar	*>::const_iterator	i	=	variables.begin();	i	!=	variables.end();	++i)	{
+								if	(	(*i)	and	(*i)->name.compare(variable_name)	==	0	)	{
+												return	(*i);
+								}
+				}
+				return	(NULL);
 }
 
-const std::vector<Trick::MonteVar*>& Trick::MonteCarlo::get_variables() {
-    return variables;
+const	std::vector<Trick::MonteVar*>&	Trick::MonteCarlo::get_variables()	{
+				return	variables;
 }
 
-void Trick::MonteCarlo::add_slave(std::string in_machine_name) {
-    add_slave(new MonteSlave(in_machine_name));
+void	Trick::MonteCarlo::add_slave(std::string	in_machine_name)	{
+				add_slave(new	MonteSlave(in_machine_name));
 }
 
 /**
- * @par Detailed Design:
- * The first slave added is assigned an id of one. Additional slaves receive ids of one plus the id of the last slave on
- * the list, ensuring that every slave has a unique id. This function has no effect if the slave has been previously added.
- */
-void Trick::MonteCarlo::add_slave(Trick::MonteSlave *in_slave) {
-    if (get_slave_index(in_slave->id) == -1) {
-        if (slaves.empty()) {
-            in_slave->id = 1;
-        } else {
-            in_slave->id = slaves.back()->id + 1;
-        }
-        slaves.push_back(in_slave);
-        sync_slaves_head();
-    }
+	*	@par	Detailed	Design:
+	*	The	first	slave	added	is	assigned	an	id	of	one.	Additional	slaves	receive	ids	of	one	plus	the	id	of	the	last	slave	on
+	*	the	list,	ensuring	that	every	slave	has	a	unique	id.	This	function	has	no	effect	if	the	slave	has	been	previously	added.
+	*/
+void	Trick::MonteCarlo::add_slave(Trick::MonteSlave	*in_slave)	{
+				if	(get_slave_index(in_slave->id)	==	-1)	{
+								if	(slaves.empty())	{
+												in_slave->id	=	1;
+								}	else	{
+												in_slave->id	=	slaves.back()->id	+	1;
+								}
+								slaves.push_back(in_slave);
+								sync_slaves_head();
+				}
 }
 
 /**
- * @par Detailed Design:
- * This function has an effect only if the slave exists and is in the MC_STOPPING, MC_UNRESPONSIVE_STOPPING, or MC_STOPPED state.
- */
-void Trick::MonteCarlo::start_slave(unsigned int id) {
-    if (MonteSlave *slave = get_slave(id)) {
-        if (verbosity >= MC_ALL) {
-            message_publish(MSG_INFO, "Monte [Master] Starting %s:%d.\n", slave->machine_name.c_str(), slave->id) ;
-        }
-        if (slave->state == Trick::MonteSlave::MC_STOPPING) {
-            slave->state = Trick::MonteSlave::MC_RUNNING;
-        } else if (slave->state == Trick::MonteSlave::MC_UNRESPONSIVE_STOPPING) {
-            slave->state = Trick::MonteSlave::MC_UNRESPONSIVE_RUNNING;
-        } else if (slave->state == Trick::MonteSlave::MC_STOPPED) {
-            slave->state = Trick::MonteSlave::MC_READY;
-        }
-    }
+	*	@par	Detailed	Design:
+	*	This	function	has	an	effect	only	if	the	slave	exists	and	is	in	the	MC_STOPPING,	MC_UNRESPONSIVE_STOPPING,	or	MC_STOPPED	state.
+	*/
+void	Trick::MonteCarlo::start_slave(unsigned	int	id)	{
+				if	(MonteSlave	*slave	=	get_slave(id))	{
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(MSG_INFO,	"Monte	[Master]	Starting	%s:%d.\n",	slave->machine_name.c_str(),	slave->id)	;
+								}
+								if	(slave->state	==	Trick::MonteSlave::MC_STOPPING)	{
+												slave->state	=	Trick::MonteSlave::MC_RUNNING;
+								}	else	if	(slave->state	==	Trick::MonteSlave::MC_UNRESPONSIVE_STOPPING)	{
+												slave->state	=	Trick::MonteSlave::MC_UNRESPONSIVE_RUNNING;
+								}	else	if	(slave->state	==	Trick::MonteSlave::MC_STOPPED)	{
+												slave->state	=	Trick::MonteSlave::MC_READY;
+								}
+				}
 }
 
 /**
- * @par Detailed Design:
- * This function has an effect only if the slave exists and is in the MC_READY, MC_RUNNING, or MC_UNRESPONSIVE_RUNNING state.
- */
-void Trick::MonteCarlo::stop_slave(unsigned int id) {
-    if (MonteSlave *slave = get_slave(id)) {
-        if (verbosity >= MC_ALL) {
-            message_publish(MSG_INFO, "Monte [Master] Stopping %s:%d.\n", slave->machine_name.c_str(), slave->id) ;
-        }
-        if (slave->state == Trick::MonteSlave::MC_READY) {
-            slave->state = Trick::MonteSlave::MC_STOPPED;
-        } else if (slave->state == Trick::MonteSlave::MC_RUNNING) {
-            slave->state = Trick::MonteSlave::MC_STOPPING;
-        } else if (slave->state == Trick::MonteSlave::MC_UNRESPONSIVE_RUNNING) {
-            slave->state = Trick::MonteSlave::MC_UNRESPONSIVE_STOPPING;
-        }
-    }
+	*	@par	Detailed	Design:
+	*	This	function	has	an	effect	only	if	the	slave	exists	and	is	in	the	MC_READY,	MC_RUNNING,	or	MC_UNRESPONSIVE_RUNNING	state.
+	*/
+void	Trick::MonteCarlo::stop_slave(unsigned	int	id)	{
+				if	(MonteSlave	*slave	=	get_slave(id))	{
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(MSG_INFO,	"Monte	[Master]	Stopping	%s:%d.\n",	slave->machine_name.c_str(),	slave->id)	;
+								}
+								if	(slave->state	==	Trick::MonteSlave::MC_READY)	{
+												slave->state	=	Trick::MonteSlave::MC_STOPPED;
+								}	else	if	(slave->state	==	Trick::MonteSlave::MC_RUNNING)	{
+												slave->state	=	Trick::MonteSlave::MC_STOPPING;
+								}	else	if	(slave->state	==	Trick::MonteSlave::MC_UNRESPONSIVE_RUNNING)	{
+												slave->state	=	Trick::MonteSlave::MC_UNRESPONSIVE_STOPPING;
+								}
+				}
 }
 
 /**
- * @par Detailed Design:
- * This function will only disable the slave when called from the input file at initialization.
- */
-void Trick::MonteCarlo::disable_slave(std::string name, bool disabled){
-    for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        if (equals_ignore_case(slaves[i]->machine_name, name)) {
-            if (disabled) {
-                slaves[i]->state = Trick::MonteSlave::MC_STOPPED;
-            } else {
-                slaves[i]->state = Trick::MonteSlave::MC_UNINITIALIZED;
-            }
-            return;
-        }
-    }
-}
-
-int Trick::MonteCarlo::process_sim_args() {
-    int argc = command_line_args_get_argc() ;
-    char **argv = command_line_args_get_argv() ;
-
-    if (argc > 2) {
-        for (int i = 2; i < argc; ++i) {
-            if (!strncmp("--monte_host", argv[i], 12)) {
-                connection_device.hostname = strdup(argv[++i]);
-            } else if (!strncmp("--monte_sync_port", argv[i], 17)) {
-                sscanf(argv[++i], "%d", &master_port);
-            } else if (!strncmp("--monte_client_id", argv[i], 12)) {
-                sscanf(argv[++i], "%d", &slave_id);
-            }
-        }
-    }
-    return 0;
-}
-
-/** @par Detailed Design: */
-int Trick::MonteCarlo::shutdown() {
-    /** <ul><li> If this is a slave, run the shutdown jobs. */
-    if (enabled && is_slave()) {
-        connection_device.port = master_port;
-        if (tc_connect(&connection_device) == TC_SUCCESS) {
-            int exit_status = the_exec->get_except_return() ? MonteRun::MC_RUN_FAILED : MonteRun::MC_RUN_COMPLETE;
-            if (verbosity >= MC_ALL) {
-                message_publish(MSG_INFO, "Monte [%s:%d] Sending run exit status to master: %d\n",
-                                machine_name.c_str(), slave_id, exit_status) ;
-            }
-            int id = htonl(slave_id);
-            tc_write(&connection_device, (char*)&id, (int)sizeof(id));
-            exit_status = htonl(exit_status);
-            tc_write(&connection_device, (char*)&exit_status, (int)sizeof(exit_status));
-            run_queue(&slave_post_queue, "in slave_post queue");
-            tc_disconnect(&connection_device);
-        } else {
-            if (verbosity >= MC_ERROR)
-                message_publish(
-                  MSG_ERROR,
-                  "Monte [%s:%d] Failed to connect to master.\n",
-                  machine_name.c_str(), slave_id);
-        }
-    }
-    return 0;
-}
-
-void Trick::MonteCarlo::handle_retry(MonteSlave& slave, MonteRun::ExitStatus exit_status) {
-    if (max_tries <= 0 || slave.current_run->num_tries < max_tries) {
-        // Add the run to the retry queue.
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [Master] Queueing run %d for retry.\n", slave.current_run->id) ;
-        }
-        runs.push_back(slave.current_run);
-    } else {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [Master] Run %d has reached its maximum allowed tries and has been skipped.\n",
-                            slave.current_run->id) ;
-        }
-        resolve_run(slave, exit_status);
-    }
-}
-
-/** @par Detailed Design: */
-void Trick::MonteCarlo::resolve_run(MonteSlave& slave, MonteRun::ExitStatus exit_status) {
-    if (exit_status == MonteRun::MC_RUN_FAILED) {
-        failed_runs.push_back(slave.current_run);
-    }
-    else if (exit_status != MonteRun::MC_RUN_COMPLETE) {
-        error_runs.push_back(slave.current_run);
-    }
-
-    /** <li> Update the bookkeeping. */
-    struct timeval time_val;
-    gettimeofday(&time_val, NULL);
-    slave.current_run->end_time = time_val.tv_sec + (double)time_val.tv_usec / 1000000;
-    slave.current_run->exit_status = exit_status;
-
-    ++slave.num_results;
-    slave.cpu_time += slave.current_run->end_time - slave.current_run->start_time;
-
-    ++num_results;
-
-    if (verbosity >= MC_ALL) {
-        message_publish(MSG_INFO, "Monte [Master] Run %d has been resolved as: %d.\n",slave.current_run->id, exit_status) ;
-    }
-}
-
-/** @par Detailed Design: */
-void Trick::MonteCarlo::check_timeouts() {
-    struct timeval time_val;
-    gettimeofday(&time_val, NULL);
-    /** <ul><li> For every slave: */
-    for (std::vector<Trick::MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        /** <ul><li> If the slave has timed out: */
-        if ((slaves[i]->state == MonteSlave::MC_RUNNING || slaves[i]->state == MonteSlave::MC_STOPPING) &&
-          (time_val.tv_sec + (double)time_val.tv_usec / 1000000 - slaves[i]->current_run->start_time) *
-          slaves[i]->multiplier > timeout) {
-            /**
-             * <ul><li> This run might have been redispatched due to a previous timeout for which the slave actually returned
-             * data later. Only process this timeout if the run hasn't been resolved yet.
-             */
-            if (slaves[i]->current_run->exit_status == MonteRun::MC_RUN_INCOMPLETE) {
-                if (verbosity >= MC_ERROR) {
-                    message_publish(MSG_ERROR, "Monte [Master] %s:%d has not responded for run %d.\n",
-                                    slaves[i]->machine_name.c_str(), slaves[i]->id, slaves[i]->current_run->id) ;
-                }
-                handle_retry(*slaves[i], MonteRun::MC_RUN_TIMED_OUT);
-            }
-            /** </ul><li> Update the slave's state. */
-            slaves[i]->state = slaves[i]->state == MonteSlave::MC_RUNNING ?
-               MonteSlave::MC_UNRESPONSIVE_RUNNING : MonteSlave::MC_UNRESPONSIVE_STOPPING;
-        }
-    }
-}
-
-Trick::MonteSlave * Trick::MonteCarlo::get_ready_slave() {
-    for (std::vector<Trick::MonteSlave>::size_type i = 0; i < slaves.size(); ++i) {
-        if (slaves[i]->state == Trick::MonteSlave::MC_READY) {
-            return slaves[i];
-        }
-    }
-    return NULL;
-}
-
-Trick::MonteSlave* Trick::MonteCarlo::get_slave(unsigned int id) {
-    int i = get_slave_index(id);
-    if (i > -1) {
-        return slaves[i];
-    }
-    return NULL;
-}
-
-int Trick::MonteCarlo::get_slave_index(unsigned int id) {
-    for (std::vector<std::string>::size_type i = 0; i < slaves.size(); i++) {
-        if (slaves[i]->id == id) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-/** @par Detailed Design: */
-Trick::MonteRun *Trick::MonteCarlo::get_next_dispatch() {
-    /** <ul><li> While there are remaining runs: */
-    while (!runs.empty()) {
-        MonteRun *curr_run = runs.front();
-        /** <li> If it is in range, return it. </ul>*/
-        if (in_range(curr_run)) {
-            return curr_run;
-        /** <li> Otherwise, run the pre run jobs and dequeue it. */
-        } else {
-            if (verbosity >= MC_ALL) {
-                message_publish(MSG_WARNING, "Monte [Master] Run %d is out of range and has been skipped.\n", curr_run->id) ;
-            }
-            prepare_run(curr_run);
-        }
-    }
-    return NULL;
-}
-
-/** @par Detailed Design: */
-int  Trick::MonteCarlo::prepare_run(MonteRun *curr_run) {
-    current_run = curr_run->id;
-    /** <ul><li> If this run has never been dispatched: */
-    if (curr_run->num_tries == 0) {
-        /** <ul><li> Run the pre run jobs. */
-        run_queue(&master_pre_queue, "in master_pre queue") ;
-        /** <li> Add the variables to the curr_run and check for end of file and value generation failures. */
-        for (std::vector<std::string>::size_type i = 0; i < variables.size(); ++i) {
-            curr_run->variables.push_back(variables[i]->get_next_value());
-            if (curr_run->variables.back() == "EOF") {
-                if (verbosity >= MC_ALL) {
-                    message_publish(MSG_WARNING, "Monte [Master] File variable '%s' reached end-of-file. Reducing number of runs to %d.\n",
-                                    variables[i]->name.c_str(), curr_run->id) ;
-                }
-                set_num_runs(curr_run->id);
-                return -1;
-            }
-        }
-        /** <li> Create the data file </ul>*/
-        fprintf(run_data_file, "%05u\t", curr_run->id);
-        for (std::vector<std::string>::size_type i = 0; i < variables.size(); ++i) {
-            if (i>0) {
-                fprintf(run_data_file, "\t");
-            }
-            fprintf(run_data_file, "%s", variables[i]->value.c_str());
-        }
-        fprintf(run_data_file, "\n");
-    }
-    /** <li> Dequeue the run. */
-    dequeue_run(curr_run);
-    return 0;
-}
-
-void Trick::MonteCarlo::dequeue_run(MonteRun *curr_run) {
-    for (std::deque<MonteRun *>::size_type i = 0; i < runs.size(); ++i) {
-        if (curr_run == runs[i]) {
-            runs.erase(runs.begin() + i);
-        }
-    }
+	*	@par	Detailed	Design:
+	*	This	function	will	only	disable	the	slave	when	called	from	the	input	file	at	initialization.
+	*/
+void	Trick::MonteCarlo::disable_slave(std::string	name,	bool	disabled){
+				for	(std::vector<MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								if	(equals_ignore_case(slaves[i]->machine_name,	name))	{
+												if	(disabled)	{
+																slaves[i]->state	=	Trick::MonteSlave::MC_STOPPED;
+												}	else	{
+																slaves[i]->state	=	Trick::MonteSlave::MC_UNINITIALIZED;
+												}
+												return;
+								}
+				}
+}
+
+int	Trick::MonteCarlo::process_sim_args()	{
+				int	argc	=	command_line_args_get_argc()	;
+				char	**argv	=	command_line_args_get_argv()	;
+
+				if	(argc	>	2)	{
+								for	(int	i	=	2;	i	<	argc;	++i)	{
+												if	(!strncmp("--monte_host",	argv[i],	12))	{
+																connection_device.hostname	=	strdup(argv[++i]);
+												}	else	if	(!strncmp("--monte_sync_port",	argv[i],	17))	{
+																sscanf(argv[++i],	"%d",	&master_port);
+												}	else	if	(!strncmp("--monte_client_id",	argv[i],	12))	{
+																sscanf(argv[++i],	"%d",	&slave_id);
+												}
+								}
+				}
+				return	0;
+}
+
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::shutdown()	{
+				/**	<ul><li>	If	this	is	a	slave,	run	the	shutdown	jobs.	*/
+				if	(enabled	&&	is_slave())	{
+								connection_device.port	=	master_port;
+								if	(tc_connect(&connection_device)	==	TC_SUCCESS)	{
+												int	exit_status	=	the_exec->get_except_return()	?	MonteRun::MC_RUN_FAILED	:	MonteRun::MC_RUN_COMPLETE;
+												if	(verbosity	>=	MC_ALL)	{
+																message_publish(MSG_INFO,	"Monte	[%s:%d]	Sending	run	exit	status	to	master:	%d\n",
+																																machine_name.c_str(),	slave_id,	exit_status)	;
+												}
+												int	id	=	htonl(slave_id);
+												tc_write(&connection_device,	(char*)&id,	(int)sizeof(id));
+												exit_status	=	htonl(exit_status);
+												tc_write(&connection_device,	(char*)&exit_status,	(int)sizeof(exit_status));
+												run_queue(&slave_post_queue,	"in	slave_post	queue");
+												tc_disconnect(&connection_device);
+								}	else	{
+												if	(verbosity	>=	MC_ERROR)
+																message_publish(
+																		MSG_ERROR,
+																		"Monte	[%s:%d]	Failed	to	connect	to	master.\n",
+																		machine_name.c_str(),	slave_id);
+								}
+				}
+				return	0;
+}
+
+void	Trick::MonteCarlo::handle_retry(MonteSlave&	slave,	MonteRun::ExitStatus	exit_status)	{
+				if	(max_tries	<=	0	||	slave.current_run->num_tries	<	max_tries)	{
+								//	Add	the	run	to	the	retry	queue.
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[Master]	Queueing	run	%d	for	retry.\n",	slave.current_run->id)	;
+								}
+								runs.push_back(slave.current_run);
+				}	else	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[Master]	Run	%d	has	reached	its	maximum	allowed	tries	and	has	been	skipped.\n",
+																												slave.current_run->id)	;
+								}
+								resolve_run(slave,	exit_status);
+				}
+}
+
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::resolve_run(MonteSlave&	slave,	MonteRun::ExitStatus	exit_status)	{
+				if	(exit_status	==	MonteRun::MC_RUN_FAILED)	{
+								failed_runs.push_back(slave.current_run);
+				}
+				else	if	(exit_status	!=	MonteRun::MC_RUN_COMPLETE)	{
+								error_runs.push_back(slave.current_run);
+				}
+
+				/**	<li>	Update	the	bookkeeping.	*/
+				struct	timeval	time_val;
+				gettimeofday(&time_val,	NULL);
+				slave.current_run->end_time	=	time_val.tv_sec	+	(double)time_val.tv_usec	/	1000000;
+				slave.current_run->exit_status	=	exit_status;
+
+				++slave.num_results;
+				slave.cpu_time	+=	slave.current_run->end_time	-	slave.current_run->start_time;
+
+				++num_results;
+
+				if	(verbosity	>=	MC_ALL)	{
+								message_publish(MSG_INFO,	"Monte	[Master]	Run	%d	has	been	resolved	as:	%d.\n",slave.current_run->id,	exit_status)	;
+				}
+}
+
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::check_timeouts()	{
+				struct	timeval	time_val;
+				gettimeofday(&time_val,	NULL);
+				/**	<ul><li>	For	every	slave:	*/
+				for	(std::vector<Trick::MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								/**	<ul><li>	If	the	slave	has	timed	out:	*/
+								if	((slaves[i]->state	==	MonteSlave::MC_RUNNING	||	slaves[i]->state	==	MonteSlave::MC_STOPPING)	&&
+										(time_val.tv_sec	+	(double)time_val.tv_usec	/	1000000	-	slaves[i]->current_run->start_time)	*
+										slaves[i]->multiplier	>	timeout)	{
+												/**
+													*	<ul><li>	This	run	might	have	been	redispatched	due	to	a	previous	timeout	for	which	the	slave	actually	returned
+													*	data	later.	Only	process	this	timeout	if	the	run	hasn't	been	resolved	yet.
+													*/
+												if	(slaves[i]->current_run->exit_status	==	MonteRun::MC_RUN_INCOMPLETE)	{
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(MSG_ERROR,	"Monte	[Master]	%s:%d	has	not	responded	for	run	%d.\n",
+																																				slaves[i]->machine_name.c_str(),	slaves[i]->id,	slaves[i]->current_run->id)	;
+																}
+																handle_retry(*slaves[i],	MonteRun::MC_RUN_TIMED_OUT);
+												}
+												/**	</ul><li>	Update	the	slave's	state.	*/
+												slaves[i]->state	=	slaves[i]->state	==	MonteSlave::MC_RUNNING	?
+															MonteSlave::MC_UNRESPONSIVE_RUNNING	:	MonteSlave::MC_UNRESPONSIVE_STOPPING;
+								}
+				}
+}
+
+Trick::MonteSlave	*	Trick::MonteCarlo::get_ready_slave()	{
+				for	(std::vector<Trick::MonteSlave>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								if	(slaves[i]->state	==	Trick::MonteSlave::MC_READY)	{
+												return	slaves[i];
+								}
+				}
+				return	NULL;
+}
+
+Trick::MonteSlave*	Trick::MonteCarlo::get_slave(unsigned	int	id)	{
+				int	i	=	get_slave_index(id);
+				if	(i	>	-1)	{
+								return	slaves[i];
+				}
+				return	NULL;
+}
+
+int	Trick::MonteCarlo::get_slave_index(unsigned	int	id)	{
+				for	(std::vector<std::string>::size_type	i	=	0;	i	<	slaves.size();	i++)	{
+								if	(slaves[i]->id	==	id)	{
+												return	i;
+								}
+				}
+				return	-1;
+}
+
+/**	@par	Detailed	Design:	*/
+Trick::MonteRun	*Trick::MonteCarlo::get_next_dispatch()	{
+				/**	<ul><li>	While	there	are	remaining	runs:	*/
+				while	(!runs.empty())	{
+								MonteRun	*curr_run	=	runs.front();
+								/**	<li>	If	it	is	in	range,	return	it.	</ul>*/
+								if	(in_range(curr_run))	{
+												return	curr_run;
+								/**	<li>	Otherwise,	run	the	pre	run	jobs	and	dequeue	it.	*/
+								}	else	{
+												if	(verbosity	>=	MC_ALL)	{
+																message_publish(MSG_WARNING,	"Monte	[Master]	Run	%d	is	out	of	range	and	has	been	skipped.\n",	curr_run->id)	;
+												}
+												prepare_run(curr_run);
+								}
+				}
+				return	NULL;
+}
+
+/**	@par	Detailed	Design:	*/
+int		Trick::MonteCarlo::prepare_run(MonteRun	*curr_run)	{
+				current_run	=	curr_run->id;
+				/**	<ul><li>	If	this	run	has	never	been	dispatched:	*/
+				if	(curr_run->num_tries	==	0)	{
+								/**	<ul><li>	Run	the	pre	run	jobs.	*/
+								run_queue(&master_pre_queue,	"in	master_pre	queue")	;
+								/**	<li>	Add	the	variables	to	the	curr_run	and	check	for	end	of	file	and	value	generation	failures.	*/
+								for	(std::vector<std::string>::size_type	i	=	0;	i	<	variables.size();	++i)	{
+												curr_run->variables.push_back(variables[i]->get_next_value());
+												if	(curr_run->variables.back()	==	"EOF")	{
+																if	(verbosity	>=	MC_ALL)	{
+																				message_publish(MSG_WARNING,	"Monte	[Master]	File	variable	'%s'	reached	end-of-file.	Reducing	number	of	runs	to	%d.\n",
+																																				variables[i]->name.c_str(),	curr_run->id)	;
+																}
+																set_num_runs(curr_run->id);
+																return	-1;
+												}
+								}
+								/**	<li>	Create	the	data	file	</ul>*/
+								fprintf(run_data_file,	"%05u\t",	curr_run->id);
+								for	(std::vector<std::string>::size_type	i	=	0;	i	<	variables.size();	++i)	{
+												if	(i>0)	{
+																fprintf(run_data_file,	"\t");
+												}
+												fprintf(run_data_file,	"%s",	variables[i]->value.c_str());
+								}
+								fprintf(run_data_file,	"\n");
+				}
+				/**	<li>	Dequeue	the	run.	*/
+				dequeue_run(curr_run);
+				return	0;
+}
+
+void	Trick::MonteCarlo::dequeue_run(MonteRun	*curr_run)	{
+				for	(std::deque<MonteRun	*>::size_type	i	=	0;	i	<	runs.size();	++i)	{
+								if	(curr_run	==	runs[i])	{
+												runs.erase(runs.begin()	+	i);
+								}
+				}
 }
 
 /**
- * @par Detailed Design:
- * Since the Variable Server is unable to access elements within the standard template objects, the data contained in
- * #slaves must be duplicated here for applications that wish to query the Variable Server for information on slaves,
- * such as @ref MonteMonitor and @ref TrickView. This function ensures that the slave pointers within #slaves_head point
- * to the same memory addresses that the slave pointers in #slaves do.
- */
-void Trick::MonteCarlo::sync_slaves_head() {
-    num_slaves = slaves.size();
-    if (!slaves_head) {
-        slaves_head = (MonteSlave**)TMM_declare_var_s("Trick::MonteSlave*[1]");
-    } else {
-        slaves_head = (MonteSlave**)TMM_resize_array_1d_a(slaves_head, num_slaves);
-    }
-    for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        slaves_head[i] = slaves[i];
-    }
+	*	@par	Detailed	Design:
+	*	Since	the	Variable	Server	is	unable	to	access	elements	within	the	standard	template	objects,	the	data	contained	in
+	*	#slaves	must	be	duplicated	here	for	applications	that	wish	to	query	the	Variable	Server	for	information	on	slaves,
+	*	such	as	@ref	MonteMonitor	and	@ref	TrickView.	This	function	ensures	that	the	slave	pointers	within	#slaves_head	point
+	*	to	the	same	memory	addresses	that	the	slave	pointers	in	#slaves	do.
+	*/
+void	Trick::MonteCarlo::sync_slaves_head()	{
+				num_slaves	=	slaves.size();
+				if	(!slaves_head)	{
+								slaves_head	=	(MonteSlave**)TMM_declare_var_s("Trick::MonteSlave*[1]");
+				}	else	{
+								slaves_head	=	(MonteSlave**)TMM_resize_array_1d_a(slaves_head,	num_slaves);
+				}
+				for	(std::vector<MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								slaves_head[i]	=	slaves[i];
+				}
 }
 
-/** @par Detailed Design: */
-void Trick::MonteCarlo::update_actual_num_runs() {
-    /** <ul><li> Start with the number of results obtained so far. */
-    actual_num_runs = num_results;
-    /** <li> Add the number of runs still on the queue that are in range. */
-    for (std::vector<MonteRun *>::size_type i = 0; i < runs.size(); ++i) {
-        if (in_range(runs[i])) {
-            ++actual_num_runs;
-        }
-    }
-    /** <li> Add one for every currently dispatched run. */
-    for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        if (slaves[i]->state == MonteSlave::MC_RUNNING || slaves[i]->state == MonteSlave::MC_STOPPING) {
-            ++actual_num_runs;
-        }
-    }
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::update_actual_num_runs()	{
+				/**	<ul><li>	Start	with	the	number	of	results	obtained	so	far.	*/
+				actual_num_runs	=	num_results;
+				/**	<li>	Add	the	number	of	runs	still	on	the	queue	that	are	in	range.	*/
+				for	(std::vector<MonteRun	*>::size_type	i	=	0;	i	<	runs.size();	++i)	{
+								if	(in_range(runs[i]))	{
+												++actual_num_runs;
+								}
+				}
+				/**	<li>	Add	one	for	every	currently	dispatched	run.	*/
+				for	(std::vector<MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								if	(slaves[i]->state	==	MonteSlave::MC_RUNNING	||	slaves[i]->state	==	MonteSlave::MC_STOPPING)	{
+												++actual_num_runs;
+								}
+				}
 }
 
-bool Trick::MonteCarlo::equals_ignore_case(std::string string1, std::string string2) {
-    if (string1.length() != string2.length()) {
-        return false;
-    }
-    for (size_t i = 0; i < string1.length(); ++i) {
-        if (tolower(string1[i]) != tolower(string2[i])) {
-            return false;
-        }
-    }
-    return true;
+bool	Trick::MonteCarlo::equals_ignore_case(std::string	string1,	std::string	string2)	{
+				if	(string1.length()	!=	string2.length())	{
+								return	false;
+				}
+				for	(size_t	i	=	0;	i	<	string1.length();	++i)	{
+								if	(tolower(string1[i])	!=	tolower(string2[i]))	{
+												return	false;
+								}
+				}
+				return	true;
 }
 
-unsigned int Trick::MonteCarlo::get_current_run() {
-    return (current_run) ;
+unsigned	int	Trick::MonteCarlo::get_current_run()	{
+				return	(current_run)	;
 }
 
-void Trick::MonteCarlo::set_current_run(int run_num) {
-    current_run = run_num ;
+void	Trick::MonteCarlo::set_current_run(int	run_num)	{
+				current_run	=	run_num	;
 }
 
-void Trick::MonteCarlo::set_listen_device_port(int port_number) {
-        listen_device.port = port_number ;
+void	Trick::MonteCarlo::set_listen_device_port(int	port_number)	{
+								listen_device.port	=	port_number	;
 }
 
-void Trick::MonteCarlo::set_connection_device_port(int port_number) {
-    // This port is passed to slave as an argument, do not override
-    if (is_master()) {
-        connection_device.port = port_number ;
-    }
+void	Trick::MonteCarlo::set_connection_device_port(int	port_number)	{
+				//	This	port	is	passed	to	slave	as	an	argument,	do	not	override
+				if	(is_master())	{
+								connection_device.port	=	port_number	;
+				}
 }
 
-int Trick::MonteCarlo::get_listen_device_port() {
-    return listen_device.port ;
+int	Trick::MonteCarlo::get_listen_device_port()	{
+				return	listen_device.port	;
 }
 
-int Trick::MonteCarlo::get_connection_device_port() {
-    return connection_device.port ;
+int	Trick::MonteCarlo::get_connection_device_port()	{
+				return	connection_device.port	;
 }
 
-int Trick::MonteCarlo::instrument_job_before( Trick::JobData* instrument_job) {
+int	Trick::MonteCarlo::instrument_job_before(	Trick::JobData*	instrument_job)	{
 
-    int count = 0 ;
+				int	count	=	0	;
 
-    count += master_init_queue.instrument_before(instrument_job) ;
-    count += master_pre_queue.instrument_before(instrument_job) ;
-    count += master_post_queue.instrument_before(instrument_job) ;
-    count += master_shutdown_queue.instrument_before(instrument_job) ;
-    count += slave_init_queue.instrument_before(instrument_job) ;
-    count += slave_pre_queue.instrument_before(instrument_job) ;
-    count += slave_post_queue.instrument_before(instrument_job) ;
-    count += slave_shutdown_queue.instrument_before(instrument_job) ;
+				count	+=	master_init_queue.instrument_before(instrument_job)	;
+				count	+=	master_pre_queue.instrument_before(instrument_job)	;
+				count	+=	master_post_queue.instrument_before(instrument_job)	;
+				count	+=	master_shutdown_queue.instrument_before(instrument_job)	;
+				count	+=	slave_init_queue.instrument_before(instrument_job)	;
+				count	+=	slave_pre_queue.instrument_before(instrument_job)	;
+				count	+=	slave_post_queue.instrument_before(instrument_job)	;
+				count	+=	slave_shutdown_queue.instrument_before(instrument_job)	;
 
-    /** @li Return how many insertions were done. */
-    return(count) ;
+				/**	@li	Return	how	many	insertions	were	done.	*/
+				return(count)	;
 }
 
-int Trick::MonteCarlo::instrument_job_after( Trick::JobData* instrument_job) {
+int	Trick::MonteCarlo::instrument_job_after(	Trick::JobData*	instrument_job)	{
 
-    unsigned int count ;
+				unsigned	int	count	;
 
-    count = 0 ;
+				count	=	0	;
 
-    count += master_init_queue.instrument_after(instrument_job) ;
-    count += master_pre_queue.instrument_after(instrument_job) ;
-    count += master_post_queue.instrument_after(instrument_job) ;
-    count += master_shutdown_queue.instrument_after(instrument_job) ;
-    count += slave_init_queue.instrument_after(instrument_job) ;
-    count += slave_pre_queue.instrument_after(instrument_job) ;
-    count += slave_post_queue.instrument_after(instrument_job) ;
-    count += slave_shutdown_queue.instrument_after(instrument_job) ;
+				count	+=	master_init_queue.instrument_after(instrument_job)	;
+				count	+=	master_pre_queue.instrument_after(instrument_job)	;
+				count	+=	master_post_queue.instrument_after(instrument_job)	;
+				count	+=	master_shutdown_queue.instrument_after(instrument_job)	;
+				count	+=	slave_init_queue.instrument_after(instrument_job)	;
+				count	+=	slave_pre_queue.instrument_after(instrument_job)	;
+				count	+=	slave_post_queue.instrument_after(instrument_job)	;
+				count	+=	slave_shutdown_queue.instrument_after(instrument_job)	;
 
-    /** @li Return how many insertions were done. */
-    return(count) ;
+				/**	@li	Return	how	many	insertions	were	done.	*/
+				return(count)	;
 
 }
 
 
-int Trick::MonteCarlo::instrument_job_remove( std::string in_job) {
+int	Trick::MonteCarlo::instrument_job_remove(	std::string	in_job)	{
 
-    master_init_queue.instrument_remove(in_job) ;
-    master_pre_queue.instrument_remove(in_job) ;
-    master_post_queue.instrument_remove(in_job) ;
-    master_shutdown_queue.instrument_remove(in_job) ;
-    slave_init_queue.instrument_remove(in_job) ;
-    slave_pre_queue.instrument_remove(in_job) ;
-    slave_post_queue.instrument_remove(in_job) ;
-    slave_shutdown_queue.instrument_remove(in_job) ;
+				master_init_queue.instrument_remove(in_job)	;
+				master_pre_queue.instrument_remove(in_job)	;
+				master_post_queue.instrument_remove(in_job)	;
+				master_shutdown_queue.instrument_remove(in_job)	;
+				slave_init_queue.instrument_remove(in_job)	;
+				slave_pre_queue.instrument_remove(in_job)	;
+				slave_post_queue.instrument_remove(in_job)	;
+				slave_shutdown_queue.instrument_remove(in_job)	;
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::MonteCarlo::write_s_job_execution(FILE *fp) {
-    if (fp == NULL) {
-        return(0);
-    }
+int	Trick::MonteCarlo::write_s_job_execution(FILE	*fp)	{
+				if	(fp	==	NULL)	{
+								return(0);
+				}
 
-    fprintf(fp, "\n===================================================================================================\n") ;
-    fprintf(fp, "MonteCarlo Loop:\n\n") ;
-    master_init_queue.write_sched_queue(fp) ;
-    master_pre_queue.write_sched_queue(fp) ;
-    master_post_queue.write_sched_queue(fp) ;
-    master_shutdown_queue.write_sched_queue(fp) ;
-    slave_init_queue.write_sched_queue(fp) ;
-    slave_pre_queue.write_sched_queue(fp) ;
-    slave_post_queue.write_sched_queue(fp) ;
-    slave_shutdown_queue.write_sched_queue(fp) ;
+				fprintf(fp,	"\n===================================================================================================\n")	;
+				fprintf(fp,	"MonteCarlo	Loop:\n\n")	;
+				master_init_queue.write_sched_queue(fp)	;
+				master_pre_queue.write_sched_queue(fp)	;
+				master_post_queue.write_sched_queue(fp)	;
+				master_shutdown_queue.write_sched_queue(fp)	;
+				slave_init_queue.write_sched_queue(fp)	;
+				slave_pre_queue.write_sched_queue(fp)	;
+				slave_post_queue.write_sched_queue(fp)	;
+				slave_shutdown_queue.write_sched_queue(fp)	;
 
-    return 0;
+				return	0;
 }
 
-int Trick::MonteCarlo::write(char* data, int size) {
-    return tc_write(&connection_device, data, size);
+int	Trick::MonteCarlo::write(char*	data,	int	size)	{
+				return	tc_write(&connection_device,	data,	size);
 }
 
-int Trick::MonteCarlo::read(char* data, int size) {
-    return tc_read(&connection_device, data, size);
+int	Trick::MonteCarlo::read(char*	data,	int	size)	{
+				return	tc_read(&connection_device,	data,	size);
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp
index fac7325da..7cfac97c6 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_initialize_sockets.cpp
@@ -1,35 +1,35 @@
 
-#include <sys/stat.h>
-#include <libgen.h>
+#include	<sys/stat.h>
+#include	<libgen.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::initialize_sockets() {
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::initialize_sockets()	{
 
-    /** set tc_error to zero for TCDevices to turn off advisory messages. */
-    tc_error(&listen_device, 0);
-    tc_error(&connection_device, 0);
+				/**	set	tc_error	to	zero	for	TCDevices	to	turn	off	advisory	messages.	*/
+				tc_error(&listen_device,	0);
+				tc_error(&connection_device,	0);
 
-    /** <ul><li> Initialize the sockets for communication with slaves. */
-    int return_value = tc_init(&listen_device);
-    if (return_value != TC_SUCCESS) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [Master] Failed to initialize status communication socket.\n") ;
-        }
-        return return_value;
-    }
-    tc_blockio(&listen_device, TC_COMM_NOBLOCKIO);
+				/**	<ul><li>	Initialize	the	sockets	for	communication	with	slaves.	*/
+				int	return_value	=	tc_init(&listen_device);
+				if	(return_value	!=	TC_SUCCESS)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[Master]	Failed	to	initialize	status	communication	socket.\n")	;
+								}
+								return	return_value;
+				}
+				tc_blockio(&listen_device,	TC_COMM_NOBLOCKIO);
 
-    /** <li> If no slaves were specified, add one on localhost. */
-    if (slaves.empty()) {
-        if (verbosity >= MC_ALL) {
-            message_publish(MSG_WARNING, "Monte [Master] No slaves specified. Adding localhost as the sole slave.\n") ;
-        }
-        add_slave(new MonteSlave());
-    }
-    return TC_SUCCESS ;
+				/**	<li>	If	no	slaves	were	specified,	add	one	on	localhost.	*/
+				if	(slaves.empty())	{
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(MSG_WARNING,	"Monte	[Master]	No	slaves	specified.	Adding	localhost	as	the	sole	slave.\n")	;
+								}
+								add_slave(new	MonteSlave());
+				}
+				return	TC_SUCCESS	;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp
index 3507842c1..fc9edcc56 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master.cpp
@@ -1,64 +1,64 @@
 
-#include <sys/time.h>
+#include	<sys/time.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/ExecutiveException.hh"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/ExecutiveException.hh"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::master() {
-    struct timeval time_val;
-    gettimeofday(&time_val, NULL);
-    start_time = time_val.tv_sec + (double)time_val.tv_usec / 1000000;
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::master()	{
+				struct	timeval	time_val;
+				gettimeofday(&time_val,	NULL);
+				start_time	=	time_val.tv_sec	+	(double)time_val.tv_usec	/	1000000;
 
-    /** <ul><li> Run the Phase 0 master initialization jobs. */
-    run_queue(&master_init_queue, "in master_initialization queue") ;
+				/**	<ul><li>	Run	the	Phase	0	master	initialization	jobs.	*/
+				run_queue(&master_init_queue,	"in	master_initialization	queue")	;
 
-    /** <li> If this is a dry run: */
-    if (dry_run) dryrun() ;
+				/**	<li>	If	this	is	a	dry	run:	*/
+				if	(dry_run)	dryrun()	;
 
-    try {
-        /** <li> While we do not have a result for every run: */
-        while (num_results < actual_num_runs) {
+				try	{
+								/**	<li>	While	we	do	not	have	a	result	for	every	run:	*/
+								while	(num_results	<	actual_num_runs)	{
 
-            /**
-             * <ul><li> Spawn any uninitialized slaves.
-             */
-            spawn_slaves();
+												/**
+													*	<ul><li>	Spawn	any	uninitialized	slaves.
+													*/
+												spawn_slaves();
 
-            /** <li> Receive any finished runs. */
-            receive_results();
+												/**	<li>	Receive	any	finished	runs.	*/
+												receive_results();
 
-            /** <li> Check to see if any dispatched units have timed out. */
-            check_timeouts();
+												/**	<li>	Check	to	see	if	any	dispatched	units	have	timed	out.	*/
+												check_timeouts();
 
-            /** <li> Dispatch the next run to a ready slave. </ul> */
-            dispatch_run_to_slave(get_next_dispatch(), get_ready_slave());
-        }
-    } catch (Trick::ExecutiveException & ex ) {
+												/**	<li>	Dispatch	the	next	run	to	a	ready	slave.	</ul>	*/
+												dispatch_run_to_slave(get_next_dispatch(),	get_ready_slave());
+								}
+				}	catch	(Trick::ExecutiveException	&	ex	)	{
 
-        /* Handle exception type Trick::ExecutiveException.  Set the file name and error message.
-           Return the exception return code. */
-        except_return = ex.ret_code ;
-        except_file = ex.file ;
-        except_message = ex.message ;
-    } catch (const std::exception &ex) {
-        except_return = -1;
-        if ( curr_job != NULL ) {
-            except_file = curr_job->name ;
-        } else {
-            except_file = "somewhere in Trick::MonteCarlo::master" ;
-        }
-        except_message = ex.what();
-    } catch (...) {
-        /* Handle unknown exceptions.  Set the file name and error message to unknown. Return -1. */
-        except_return = -1 ;
-        except_file = "somewhere in Trick::MonteCarlo::master" ;
-        except_message = "unknown error" ;
-    }
+								/*	Handle	exception	type	Trick::ExecutiveException.		Set	the	file	name	and	error	message.
+											Return	the	exception	return	code.	*/
+								except_return	=	ex.ret_code	;
+								except_file	=	ex.file	;
+								except_message	=	ex.message	;
+				}	catch	(const	std::exception	&ex)	{
+								except_return	=	-1;
+								if	(	curr_job	!=	NULL	)	{
+												except_file	=	curr_job->name	;
+								}	else	{
+												except_file	=	"somewhere	in	Trick::MonteCarlo::master"	;
+								}
+								except_message	=	ex.what();
+				}	catch	(...)	{
+								/*	Handle	unknown	exceptions.		Set	the	file	name	and	error	message	to	unknown.	Return	-1.	*/
+								except_return	=	-1	;
+								except_file	=	"somewhere	in	Trick::MonteCarlo::master"	;
+								except_message	=	"unknown	error"	;
+				}
 
 
-    /** <li> Shutdown. */
-    master_shutdown();
+				/**	<li>	Shutdown.	*/
+				master_shutdown();
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp
index e3787ded0..0b43e42ec 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_file_io.cpp
@@ -1,97 +1,97 @@
-#include <sys/stat.h>
-#include <libgen.h>
+#include	<sys/stat.h>
+#include	<libgen.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/command_line_protos.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/command_line_protos.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::construct_run_directory() {
-    /** <ul><li> Construct the run directory. */
-    run_directory = command_line_args_get_user_output_dir();
-    if (run_directory.empty()) {
-        std::string run_base_directory = command_line_args_get_output_dir();
-        if (run_base_directory.empty()) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [Master] Could not get the output directory.\n") ;
-            }
-            return -1;
-        }
-        std::size_t path_separator_pos = run_base_directory.find_last_of("/");
-        if (path_separator_pos != std::string::npos) {
-            // "/" is included
-            run_base_directory = run_base_directory.substr(0, path_separator_pos + 1);
-        } else {
-            run_base_directory = "";
-        }
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::construct_run_directory()	{
+				/**	<ul><li>	Construct	the	run	directory.	*/
+				run_directory	=	command_line_args_get_user_output_dir();
+				if	(run_directory.empty())	{
+								std::string	run_base_directory	=	command_line_args_get_output_dir();
+								if	(run_base_directory.empty())	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[Master]	Could	not	get	the	output	directory.\n")	;
+												}
+												return	-1;
+								}
+								std::size_t	path_separator_pos	=	run_base_directory.find_last_of("/");
+								if	(path_separator_pos	!=	std::string::npos)	{
+												//	"/"	is	included
+												run_base_directory	=	run_base_directory.substr(0,	path_separator_pos	+	1);
+								}	else	{
+												run_base_directory	=	"";
+								}
 
-        run_directory = basename((char *)command_line_args_get_output_dir());
-        if (run_directory.empty()) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [Master] Could not get the run directory name.\n") ;
-            }
-            return -1;
-        }
-        run_directory = run_base_directory + "MONTE_" + run_directory;
-    }
+								run_directory	=	basename((char	*)command_line_args_get_output_dir());
+								if	(run_directory.empty())	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[Master]	Could	not	get	the	run	directory	name.\n")	;
+												}
+												return	-1;
+								}
+								run_directory	=	run_base_directory	+	"MONTE_"	+	run_directory;
+				}
 
-    // If the user hasn't set an output directory for slaves, default to
-    // the same location as the master's output.
-    if (slave_output_directory.empty()) {
-        slave_output_directory = run_directory;
-    }
+				//	If	the	user	hasn't	set	an	output	directory	for	slaves,	default	to
+				//	the	same	location	as	the	master's	output.
+				if	(slave_output_directory.empty())	{
+								slave_output_directory	=	run_directory;
+				}
 
-    if  (access(run_directory.c_str(), F_OK) != 0) {
-        if (mkdir(run_directory.c_str(), 0775) != 0) {
-            message_publish(MSG_ERROR, "Monte Error while trying to create directory %s.\n", run_directory.c_str()) ;
-            return -1;
-        }
-    }
-    return 0 ;
+				if		(access(run_directory.c_str(),	F_OK)	!=	0)	{
+								if	(mkdir(run_directory.c_str(),	0775)	!=	0)	{
+												message_publish(MSG_ERROR,	"Monte	Error	while	trying	to	create	directory	%s.\n",	run_directory.c_str())	;
+												return	-1;
+								}
+				}
+				return	0	;
 }
 
-int Trick::MonteCarlo::open_file(std::string file_name, FILE** file_ptr) {
+int	Trick::MonteCarlo::open_file(std::string	file_name,	FILE**	file_ptr)	{
 
-    if ((*file_ptr = fopen(file_name.c_str(), "w")) == NULL) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [Master] Could not open %s for writing.\n", file_name.c_str()) ;
-        }
-        return -1;
-    }
-    return 0;
+				if	((*file_ptr	=	fopen(file_name.c_str(),	"w"))	==	NULL)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[Master]	Could	not	open	%s	for	writing.\n",	file_name.c_str())	;
+								}
+								return	-1;
+				}
+				return	0;
 }
 
-void Trick::MonteCarlo::write_to_run_files(std::string file_name)
+void	Trick::MonteCarlo::write_to_run_files(std::string	file_name)
 {
-    // Write a description of each variable.
-    for(std::vector<std::string>::size_type i = 0; i < variables.size(); ++i)
-    {
-        fprintf(run_data_file, "%s\n", variables[i]->describe_variable().c_str());
-    }
+				//	Write	a	description	of	each	variable.
+				for(std::vector<std::string>::size_type	i	=	0;	i	<	variables.size();	++i)
+				{
+								fprintf(run_data_file,	"%s\n",	variables[i]->describe_variable().c_str());
+				}
 
-    // Data file header.
-    fprintf(run_data_file, "# RUN\t");
-    for(std::vector<std::string>::size_type i = 0; i < variables.size(); ++i)
-    {
-        fprintf(run_data_file, "%s\t", variables[i]->name.c_str());
-    }
-    fprintf(run_data_file, "\n");
+				//	Data	file	header.
+				fprintf(run_data_file,	"#	RUN\t");
+				for(std::vector<std::string>::size_type	i	=	0;	i	<	variables.size();	++i)
+				{
+								fprintf(run_data_file,	"%s\t",	variables[i]->name.c_str());
+				}
+				fprintf(run_data_file,	"\n");
 
-    // Write the input file lines that configured the initial state of the Monte Carlo simulation.
-    fprintf(run_header_file, "trick.mc_set_num_runs(%d)\n", num_runs);
-    for (std::vector<std::string>::size_type i = 0; i < variables.size(); ++i)
-    {
-        if (variables[i]->unit.empty())
-        {
-            fprintf(run_header_file, "\nvar%zu = trick.MonteVarFile(\"%s\", \"%s\", %zu)\n",
-            i, variables[i]->name.c_str(), file_name.c_str(), i + 2);
-        }
-        else
-        {
-            fprintf(run_header_file, "\nvar%zu = trick.MonteVarFile(\"%s\", \"%s\", %zu, \"%s\")\n",
-            i, variables[i]->name.c_str(), file_name.c_str(), i + 2, variables[i]->unit.c_str());
-        }
-        fprintf(run_header_file, "trick_mc.mc.add_variable(var%zu)\n", i);
-    }
+				//	Write	the	input	file	lines	that	configured	the	initial	state	of	the	Monte	Carlo	simulation.
+				fprintf(run_header_file,	"trick.mc_set_num_runs(%d)\n",	num_runs);
+				for	(std::vector<std::string>::size_type	i	=	0;	i	<	variables.size();	++i)
+				{
+								if	(variables[i]->unit.empty())
+								{
+												fprintf(run_header_file,	"\nvar%zu	=	trick.MonteVarFile(\"%s\",	\"%s\",	%zu)\n",
+												i,	variables[i]->name.c_str(),	file_name.c_str(),	i	+	2);
+								}
+								else
+								{
+												fprintf(run_header_file,	"\nvar%zu	=	trick.MonteVarFile(\"%s\",	\"%s\",	%zu,	\"%s\")\n",
+												i,	variables[i]->name.c_str(),	file_name.c_str(),	i	+	2,	variables[i]->unit.c_str());
+								}
+								fprintf(run_header_file,	"trick_mc.mc.add_variable(var%zu)\n",	i);
+				}
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp
index ad120446f..163705202 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_init.cpp
@@ -1,29 +1,29 @@
 
-#include <sys/stat.h>
-#include <libgen.h>
+#include	<sys/stat.h>
+#include	<libgen.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::master_init() {
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::master_init()	{
 
-    /** <ul><li> Construct the run directory. */
-    if (construct_run_directory() == -1) return -1 ;
+				/**	<ul><li>	Construct	the	run	directory.	*/
+				if	(construct_run_directory()	==	-1)	return	-1	;
 
-    /** <ul><li> Create the runs and header files and open them for writing. */
-    std::string file_name = run_directory+"/monte_header" ;
-    if (open_file(file_name, &run_header_file)==-1) return -1 ;
+				/**	<ul><li>	Create	the	runs	and	header	files	and	open	them	for	writing.	*/
+				std::string	file_name	=	run_directory+"/monte_header"	;
+				if	(open_file(file_name,	&run_header_file)==-1)	return	-1	;
 
-    file_name = run_directory+"/monte_runs" ;
-    if (open_file(file_name, &run_data_file)==-1) return -1 ;
+				file_name	=	run_directory+"/monte_runs"	;
+				if	(open_file(file_name,	&run_data_file)==-1)	return	-1	;
 
-    write_to_run_files(file_name) ;
+				write_to_run_files(file_name)	;
 
-    /** <li> If this is a dry run return else initialize sockets: */
-    if (dry_run) {
-       return 0 ;
-    }
+				/**	<li>	If	this	is	a	dry	run	return	else	initialize	sockets:	*/
+				if	(dry_run)	{
+							return	0	;
+				}
 
-    return initialize_sockets() ;
+				return	initialize_sockets()	;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
index 1b53cb750..e2789da11 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_master_shutdown.cpp
@@ -1,116 +1,116 @@
-#include <sys/time.h>
-
-#include "trick/MonteCarlo.hh"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
-#include "trick/exec_proto.h"
-#include "trick/SysThread.hh"
-
-/** @par Detailed Design: */
-void Trick::MonteCarlo::master_shutdown() {
-
-    /** <ul><li> Run the user-defined shutdown jobs. */
-    run_queue(&master_shutdown_queue, "in master_shutdown queue") ;
-
-    /** <ul><li> Shutdown the active slaves. */
-    shutdown_slaves() ;
-
-    /** <li> Shut down the sockets. */
-    tc_disconnect(&listen_device);
-    tc_disconnect(&connection_device);
-
-    struct timeval time_val;
-    gettimeofday(&time_val, NULL) ;
-    end_time = time_val.tv_sec + (double)time_val.tv_usec / 1000000;
-
-    /** <li> Print the statistics. */
-    if (!except_file.empty()) {
-        message_publish(MSG_INFO, "SIMULATION TERMINATED IN\n");
-        message_publish(MSG_INFO, "  PROCESS: %d\n", exec_get_process_id());
-        message_publish(MSG_INFO, "  ROUTINE: %s\n", except_file.c_str());
-        message_publish(MSG_INFO, "  DIAGNOSTIC: %s\n\n", except_message.c_str());
-    }
-    FILE *file_ptr;
-    if (open_file(run_directory + std::string("/run_summary"), &file_ptr) == -1) exit(-2) ;
-    print_statistics(&file_ptr) ;
-    print_statistics(&stdout) ;
-    fclose(file_ptr) ;
-
-    if ( !except_return and failed_runs.size() > 0 ) {
-        except_return = -2 ;
-    }
-
-    SysThread::ensureAllShutdown();
-
-    exit(except_return);
+#include	<sys/time.h>
+
+#include	"trick/MonteCarlo.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
+#include	"trick/exec_proto.h"
+#include	"trick/SysThread.hh"
+
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::master_shutdown()	{
+
+				/**	<ul><li>	Run	the	user-defined	shutdown	jobs.	*/
+				run_queue(&master_shutdown_queue,	"in	master_shutdown	queue")	;
+
+				/**	<ul><li>	Shutdown	the	active	slaves.	*/
+				shutdown_slaves()	;
+
+				/**	<li>	Shut	down	the	sockets.	*/
+				tc_disconnect(&listen_device);
+				tc_disconnect(&connection_device);
+
+				struct	timeval	time_val;
+				gettimeofday(&time_val,	NULL)	;
+				end_time	=	time_val.tv_sec	+	(double)time_val.tv_usec	/	1000000;
+
+				/**	<li>	Print	the	statistics.	*/
+				if	(!except_file.empty())	{
+								message_publish(MSG_INFO,	"SIMULATION	TERMINATED	IN\n");
+								message_publish(MSG_INFO,	"		PROCESS:	%d\n",	exec_get_process_id());
+								message_publish(MSG_INFO,	"		ROUTINE:	%s\n",	except_file.c_str());
+								message_publish(MSG_INFO,	"		DIAGNOSTIC:	%s\n\n",	except_message.c_str());
+				}
+				FILE	*file_ptr;
+				if	(open_file(run_directory	+	std::string("/run_summary"),	&file_ptr)	==	-1)	exit(-2)	;
+				print_statistics(&file_ptr)	;
+				print_statistics(&stdout)	;
+				fclose(file_ptr)	;
+
+				if	(	!except_return	and	failed_runs.size()	>	0	)	{
+								except_return	=	-2	;
+				}
+
+				SysThread::ensureAllShutdown();
+
+				exit(except_return);
 }
 
-void Trick::MonteCarlo::shutdown_slaves() {
-
-    if (verbosity >= MC_INFORMATIONAL) {
-        message_publish(MSG_INFO, "Monte [Master] Simulation complete. Shutting down slaves.\n\n") ;
-    }
-
-    for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size() ; ++i) {
-        slaves[i]->state = MonteSlave::MC_FINISHED;
-        connection_device.hostname = (char*)slaves[i]->machine_name.c_str();
-        connection_device.port = slaves[i]->port;
-        if (tc_connect(&connection_device) == TC_SUCCESS) {
-            int command = htonl(MonteSlave::MC_SHUTDOWN);
-            tc_write(&connection_device, (char*)&command, sizeof(command));
-        }
-    }
+void	Trick::MonteCarlo::shutdown_slaves()	{
+
+				if	(verbosity	>=	MC_INFORMATIONAL)	{
+								message_publish(MSG_INFO,	"Monte	[Master]	Simulation	complete.	Shutting	down	slaves.\n\n")	;
+				}
+
+				for	(std::vector<MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size()	;	++i)	{
+								slaves[i]->state	=	MonteSlave::MC_FINISHED;
+								connection_device.hostname	=	(char*)slaves[i]->machine_name.c_str();
+								connection_device.port	=	slaves[i]->port;
+								if	(tc_connect(&connection_device)	==	TC_SUCCESS)	{
+												int	command	=	htonl(MonteSlave::MC_SHUTDOWN);
+												tc_write(&connection_device,	(char*)&command,	sizeof(command));
+								}
+				}
 }
 
-void Trick::MonteCarlo::print_statistics(FILE** fp) {
-
-    fprintf(*fp,
-      "\nMonte Carlo complete: %u runs (%zu successful) (%zu non-zero exit status) (%zu errors) (%u out of range)\n",
-      num_runs, num_results - failed_runs.size() - error_runs.size(), failed_runs.size(),
-      error_runs.size(), num_runs - num_results);
-
-    fprintf(*fp, "\nMachine work unit breakdown:\n");
-    fprintf(*fp, "----------------------------------------------------------------------\n");
-    fprintf(*fp, "%25s  %7s  (%7s)  %12s  %12s\n",
-        "machine", "units", "units %", "cpu_time (s)", "cpu/unit (s)");
-    fprintf(*fp, "----------------------------------------------------------------------\n");
-
-    double total_time = 0.0;
-    for (std::vector<MonteSlave *>::size_type j = 0; j < slaves.size(); ++j) {
-        fprintf(*fp, "%3d.  %20s %7u  (%6.2f%%)  %12.2lf  %12.2lf\n",
-          slaves[j]->id, slaves[j]->machine_name.c_str(),
-          slaves[j]->num_results,
-          num_results ? slaves[j]->num_results / (float)num_results * 100 : 0,
-          slaves[j]->cpu_time,
-          slaves[j]->num_results ? slaves[j]->cpu_time / slaves[j]->num_results : 0);
-        total_time += slaves[j]->cpu_time;
-    }
-    double monte_time = end_time - start_time;
-    double average_time = actual_num_runs ? total_time / actual_num_runs : 0;
-    double effective_time = actual_num_runs ? monte_time / actual_num_runs : 0;
-    double speed_up = total_time / monte_time;
-    double efficency = speed_up * 100.0 / slaves.size();
-
-    fprintf(*fp, "\nTotal monte carlo time taken: %.2lf\n", monte_time);
-    fprintf(*fp, "Actual average time per unit (sum of CPU time / number of runs): %.2lf\n", average_time);
-    fprintf(*fp, "Effective average time per unit (total time / number of runs): %.2lf\n", effective_time);
-    fprintf(*fp, "Speedup (sum of CPU time / total time): %.2lf\n", speed_up);
-    fprintf(*fp, "Efficency (speedup / num slaves): %.2lf%%\n", efficency);
-
-    if (failed_runs.size()) {
-        fprintf(*fp, "\nThe following runs completed with a non-zero process exit status:\n");
-        for (const MonteRun* run : failed_runs) {
-            fprintf(*fp, "RUN_%05d\n", run->id);
-        }
-    }
-
-    if (error_runs.size()) {
-        fprintf(*fp, "\nThe following runs failed to complete:\n");
-        for (const MonteRun* run : error_runs) {
-            fprintf(*fp, "RUN_%05d MonteRun::ExitStatus = %s (%d)\n", run->id,
-              run->exit_status_string(), run->exit_status);
-        }
-    }
+void	Trick::MonteCarlo::print_statistics(FILE**	fp)	{
+
+				fprintf(*fp,
+						"\nMonte	Carlo	complete:	%u	runs	(%zu	successful)	(%zu	non-zero	exit	status)	(%zu	errors)	(%u	out	of	range)\n",
+						num_runs,	num_results	-	failed_runs.size()	-	error_runs.size(),	failed_runs.size(),
+						error_runs.size(),	num_runs	-	num_results);
+
+				fprintf(*fp,	"\nMachine	work	unit	breakdown:\n");
+				fprintf(*fp,	"----------------------------------------------------------------------\n");
+				fprintf(*fp,	"%25s		%7s		(%7s)		%12s		%12s\n",
+								"machine",	"units",	"units	%",	"cpu_time	(s)",	"cpu/unit	(s)");
+				fprintf(*fp,	"----------------------------------------------------------------------\n");
+
+				double	total_time	=	0.0;
+				for	(std::vector<MonteSlave	*>::size_type	j	=	0;	j	<	slaves.size();	++j)	{
+								fprintf(*fp,	"%3d.		%20s	%7u		(%6.2f%%)		%12.2lf		%12.2lf\n",
+										slaves[j]->id,	slaves[j]->machine_name.c_str(),
+										slaves[j]->num_results,
+										num_results	?	slaves[j]->num_results	/	(float)num_results	*	100	:	0,
+										slaves[j]->cpu_time,
+										slaves[j]->num_results	?	slaves[j]->cpu_time	/	slaves[j]->num_results	:	0);
+								total_time	+=	slaves[j]->cpu_time;
+				}
+				double	monte_time	=	end_time	-	start_time;
+				double	average_time	=	actual_num_runs	?	total_time	/	actual_num_runs	:	0;
+				double	effective_time	=	actual_num_runs	?	monte_time	/	actual_num_runs	:	0;
+				double	speed_up	=	total_time	/	monte_time;
+				double	efficency	=	speed_up	*	100.0	/	slaves.size();
+
+				fprintf(*fp,	"\nTotal	monte	carlo	time	taken:	%.2lf\n",	monte_time);
+				fprintf(*fp,	"Actual	average	time	per	unit	(sum	of	CPU	time	/	number	of	runs):	%.2lf\n",	average_time);
+				fprintf(*fp,	"Effective	average	time	per	unit	(total	time	/	number	of	runs):	%.2lf\n",	effective_time);
+				fprintf(*fp,	"Speedup	(sum	of	CPU	time	/	total	time):	%.2lf\n",	speed_up);
+				fprintf(*fp,	"Efficency	(speedup	/	num	slaves):	%.2lf%%\n",	efficency);
+
+				if	(failed_runs.size())	{
+								fprintf(*fp,	"\nThe	following	runs	completed	with	a	non-zero	process	exit	status:\n");
+								for	(const	MonteRun*	run	:	failed_runs)	{
+												fprintf(*fp,	"RUN_%05d\n",	run->id);
+								}
+				}
+
+				if	(error_runs.size())	{
+								fprintf(*fp,	"\nThe	following	runs	failed	to	complete:\n");
+								for	(const	MonteRun*	run	:	error_runs)	{
+												fprintf(*fp,	"RUN_%05d	MonteRun::ExitStatus	=	%s	(%d)\n",	run->id,
+														run->exit_status_string(),	run->exit_status);
+								}
+				}
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
index 3823ae4ab..16f91ecc5 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
@@ -1,193 +1,193 @@
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
 /**
- * @par Detailed Design:
- * This function performs a non-blocking accept on the listening socket.
- */
-void Trick::MonteCarlo::receive_results() {
-
-    /** <li> While there are pending connections: */
-    while (tc_accept(&listen_device, &connection_device) == TC_SUCCESS) {
-
-        /** <ul><li> Read the slave id. */
-        int id;
-        tc_read(&connection_device, (char*)&id, (int)sizeof(id));
-        id = ntohl(id);
-        MonteSlave* slave = get_slave(id);
-        if (!slave) {
-            message_publish(
-              MSG_ERROR,
-              "Monte [Master] Slave returned an invalid id (%d)\n",
-              id) ;
-            tc_disconnect(&connection_device);
-            return;
-        }
-
-        /**
-         * <li> If the slave is in the MC_INITIALIZING state, it is sending us the
-         * machine name and port over which it is listening for new runs.
-         */
-        if (slave->state == MonteSlave::MC_INITIALIZING) {
-            handle_initialization(*slave);
-        }
-        /** <li> Otherwise, it's sending us run data. */
-        else {
-            handle_run_data(*slave);
-        }
-    }
+	*	@par	Detailed	Design:
+	*	This	function	performs	a	non-blocking	accept	on	the	listening	socket.
+	*/
+void	Trick::MonteCarlo::receive_results()	{
+
+				/**	<li>	While	there	are	pending	connections:	*/
+				while	(tc_accept(&listen_device,	&connection_device)	==	TC_SUCCESS)	{
+
+								/**	<ul><li>	Read	the	slave	id.	*/
+								int	id;
+								tc_read(&connection_device,	(char*)&id,	(int)sizeof(id));
+								id	=	ntohl(id);
+								MonteSlave*	slave	=	get_slave(id);
+								if	(!slave)	{
+												message_publish(
+														MSG_ERROR,
+														"Monte	[Master]	Slave	returned	an	invalid	id	(%d)\n",
+														id)	;
+												tc_disconnect(&connection_device);
+												return;
+								}
+
+								/**
+									*	<li>	If	the	slave	is	in	the	MC_INITIALIZING	state,	it	is	sending	us	the
+									*	machine	name	and	port	over	which	it	is	listening	for	new	runs.
+									*/
+								if	(slave->state	==	MonteSlave::MC_INITIALIZING)	{
+												handle_initialization(*slave);
+								}
+								/**	<li>	Otherwise,	it's	sending	us	run	data.	*/
+								else	{
+												handle_run_data(*slave);
+								}
+				}
 }
 
-void Trick::MonteCarlo::handle_initialization(Trick::MonteSlave& slave) {
-        if (verbosity >= MC_ALL) {
-            message_publish(
-              MSG_INFO,
-              "Monte [Master] Receiving initialization information from %s:%d.\n",
-              slave.machine_name.c_str(), slave.id);
-        }
-
-        int size;
-        if (tc_read(&connection_device, (char*)&size, (int)sizeof(size)) != (int)sizeof(size)) {
-            set_disconnected_state(slave);
-            return;
-        }
-        size = ntohl(size);
-
-        char name[size + 1];
-        name[size] = '\0';
-        if (tc_read(&connection_device, name, size) != size) {
-            set_disconnected_state(slave);
-            return;
-        }
-        slave.machine_name = std::string(name);
-
-        size = (int)sizeof(slave.port);
-        if (tc_read(&connection_device, (char*)&slave.port, size) != size) {
-            set_disconnected_state(slave) ;
-            return;
-        }
-        slave.port = ntohl(slave.port);
-
-        slave.state = MonteSlave::MC_READY;
-        tc_disconnect(&connection_device);
+void	Trick::MonteCarlo::handle_initialization(Trick::MonteSlave&	slave)	{
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(
+														MSG_INFO,
+														"Monte	[Master]	Receiving	initialization	information	from	%s:%d.\n",
+														slave.machine_name.c_str(),	slave.id);
+								}
+
+								int	size;
+								if	(tc_read(&connection_device,	(char*)&size,	(int)sizeof(size))	!=	(int)sizeof(size))	{
+												set_disconnected_state(slave);
+												return;
+								}
+								size	=	ntohl(size);
+
+								char	name[size	+	1];
+								name[size]	=	'\0';
+								if	(tc_read(&connection_device,	name,	size)	!=	size)	{
+												set_disconnected_state(slave);
+												return;
+								}
+								slave.machine_name	=	std::string(name);
+
+								size	=	(int)sizeof(slave.port);
+								if	(tc_read(&connection_device,	(char*)&slave.port,	size)	!=	size)	{
+												set_disconnected_state(slave)	;
+												return;
+								}
+								slave.port	=	ntohl(slave.port);
+
+								slave.state	=	MonteSlave::MC_READY;
+								tc_disconnect(&connection_device);
 }
 
-void Trick::MonteCarlo::handle_run_data(Trick::MonteSlave& slave) {
-    if (verbosity >= MC_INFORMATIONAL) {
-        message_publish(MSG_INFO, "Monte [Master] Receiving results for run %d from %s:%d.\n",
-             slave.current_run->id, slave.machine_name.c_str(), slave.id) ;
-    }
-
-    /**
-     * <ul><li> Try to remove this run from the queue in case it was requeued by #check_timeouts.
-     * This covers the case in which the master determines that a slave has timed out, requeues
-     * the run, and then the slave reports results.
-     */
-    dequeue_run(slave.current_run);
-
-    /**
-     * <li> This run may have already been resolved by another slave if
-     * this slave was marked as having timed out. If that is the case,
-     * discard these results.
-     */
-    if (slave.current_run->exit_status != MonteRun::MC_RUN_INCOMPLETE) {
-        // TODO: If a slave times out or core dumps in it's monte_slave_post
-        // jobs, the master will receive a MC_RUN_COMPLETE status from the slave's
-        // child process and then an error status from the parent, rendering
-        // this message incorrect.
-        if (verbosity >= MC_ALL) {
-            message_publish(
-              MSG_INFO,
-              "Monte [Master] Run %d has already been resolved. Discarding results.\n",
-              slave.current_run->id) ;
-        }
-    } else {
-        /** <li> Otherwise, check the exit status: */
-        int exit_status;
-        int size = sizeof(exit_status);
-        if (tc_read(&connection_device, (char*)&exit_status, size) != size) {
-            set_disconnected_state(slave) ;
-            return;
-        }
-        exit_status = ntohl(exit_status);
-
-        switch (exit_status) {
-
-            case MonteRun::MC_RUN_COMPLETE:
-            case MonteRun::MC_RUN_FAILED:
-                resolve_run(slave, static_cast<MonteRun::ExitStatus>(exit_status));
-                run_queue(&master_post_queue, "in master_post queue") ;
-                break;
-
-            case MonteRun::MC_PROBLEM_PARSING_INPUT:
-                if (verbosity >= MC_ERROR) {
-                    message_publish(
-                      MSG_ERROR,
-                      "Monte [Master] %s:%d reported bad input for run %d. Skipping.\n",
-                      slave.machine_name.c_str(), slave.id, slave.current_run->id) ;
-                }
-                resolve_run(slave, MonteRun::MC_PROBLEM_PARSING_INPUT);
-                break;
-
-            case MonteRun::MC_RUN_DUMPED_CORE:
-                if (verbosity >= MC_ERROR) {
-                    message_publish(
-                      MSG_ERROR,
-                      "Monte [Master] %s:%d reported core dump for run %d. Skipping.\n",
-                      slave.machine_name.c_str(), slave.id, slave.current_run->id) ;
-                }
-                resolve_run(slave, MonteRun::MC_RUN_DUMPED_CORE);
-                break;
-
-            case MonteRun::MC_CANT_CREATE_OUTPUT_DIR:
-                if (verbosity >= MC_ERROR) {
-                    message_publish(
-                      MSG_ERROR,
-                      "Monte [Master] %s:%d reported a failure to create output directories for run %d.\n",
-                      slave.machine_name.c_str(), slave.id, slave.current_run->id);
-                }
-                handle_retry(slave, MonteRun::MC_CANT_CREATE_OUTPUT_DIR);
-                break;
-
-            case MonteRun::MC_RUN_TIMED_OUT:
-                if (verbosity >= MC_ERROR) {
-                    message_publish(
-                      MSG_ERROR,
-                      "Monte [Master] %s:%d reported a timeout for run %d.\n",
-                      slave.machine_name.c_str(), slave.id, slave.current_run->id);
-                }
-                handle_retry(slave, MonteRun::MC_RUN_TIMED_OUT);
-                break;
-
-            default:
-                if (verbosity >= MC_ERROR) {
-                    message_publish(
-                      MSG_ERROR,
-                      "Monte [Master] %s:%d reported unrecognized exit status (%d) for run %d. Skipping.\n",
-                      slave.machine_name.c_str(), slave.id, exit_status, slave.current_run->id);
-                }
-                resolve_run(slave, MonteRun::MC_UNRECOGNIZED_RETURN_CODE);
-                break;
-        }
-    }
-    
-    tc_disconnect(&connection_device);
-
-    /** <li> Update the slave's state. */
-    if (slave.state == MonteSlave::MC_RUNNING || slave.state == MonteSlave::MC_UNRESPONSIVE_RUNNING) {
-        slave.state = MonteSlave::MC_READY;
-    } else if (slave.state == MonteSlave::MC_STOPPING || slave.state == MonteSlave::MC_UNRESPONSIVE_STOPPING) {
-        slave.state = MonteSlave::MC_STOPPED;
-    }
+void	Trick::MonteCarlo::handle_run_data(Trick::MonteSlave&	slave)	{
+				if	(verbosity	>=	MC_INFORMATIONAL)	{
+								message_publish(MSG_INFO,	"Monte	[Master]	Receiving	results	for	run	%d	from	%s:%d.\n",
+													slave.current_run->id,	slave.machine_name.c_str(),	slave.id)	;
+				}
+
+				/**
+					*	<ul><li>	Try	to	remove	this	run	from	the	queue	in	case	it	was	requeued	by	#check_timeouts.
+					*	This	covers	the	case	in	which	the	master	determines	that	a	slave	has	timed	out,	requeues
+					*	the	run,	and	then	the	slave	reports	results.
+					*/
+				dequeue_run(slave.current_run);
+
+				/**
+					*	<li>	This	run	may	have	already	been	resolved	by	another	slave	if
+					*	this	slave	was	marked	as	having	timed	out.	If	that	is	the	case,
+					*	discard	these	results.
+					*/
+				if	(slave.current_run->exit_status	!=	MonteRun::MC_RUN_INCOMPLETE)	{
+								//	TODO:	If	a	slave	times	out	or	core	dumps	in	it's	monte_slave_post
+								//	jobs,	the	master	will	receive	a	MC_RUN_COMPLETE	status	from	the	slave's
+								//	child	process	and	then	an	error	status	from	the	parent,	rendering
+								//	this	message	incorrect.
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(
+														MSG_INFO,
+														"Monte	[Master]	Run	%d	has	already	been	resolved.	Discarding	results.\n",
+														slave.current_run->id)	;
+								}
+				}	else	{
+								/**	<li>	Otherwise,	check	the	exit	status:	*/
+								int	exit_status;
+								int	size	=	sizeof(exit_status);
+								if	(tc_read(&connection_device,	(char*)&exit_status,	size)	!=	size)	{
+												set_disconnected_state(slave)	;
+												return;
+								}
+								exit_status	=	ntohl(exit_status);
+
+								switch	(exit_status)	{
+
+												case	MonteRun::MC_RUN_COMPLETE:
+												case	MonteRun::MC_RUN_FAILED:
+																resolve_run(slave,	static_cast<MonteRun::ExitStatus>(exit_status));
+																run_queue(&master_post_queue,	"in	master_post	queue")	;
+																break;
+
+												case	MonteRun::MC_PROBLEM_PARSING_INPUT:
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(
+																						MSG_ERROR,
+																						"Monte	[Master]	%s:%d	reported	bad	input	for	run	%d.	Skipping.\n",
+																						slave.machine_name.c_str(),	slave.id,	slave.current_run->id)	;
+																}
+																resolve_run(slave,	MonteRun::MC_PROBLEM_PARSING_INPUT);
+																break;
+
+												case	MonteRun::MC_RUN_DUMPED_CORE:
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(
+																						MSG_ERROR,
+																						"Monte	[Master]	%s:%d	reported	core	dump	for	run	%d.	Skipping.\n",
+																						slave.machine_name.c_str(),	slave.id,	slave.current_run->id)	;
+																}
+																resolve_run(slave,	MonteRun::MC_RUN_DUMPED_CORE);
+																break;
+
+												case	MonteRun::MC_CANT_CREATE_OUTPUT_DIR:
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(
+																						MSG_ERROR,
+																						"Monte	[Master]	%s:%d	reported	a	failure	to	create	output	directories	for	run	%d.\n",
+																						slave.machine_name.c_str(),	slave.id,	slave.current_run->id);
+																}
+																handle_retry(slave,	MonteRun::MC_CANT_CREATE_OUTPUT_DIR);
+																break;
+
+												case	MonteRun::MC_RUN_TIMED_OUT:
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(
+																						MSG_ERROR,
+																						"Monte	[Master]	%s:%d	reported	a	timeout	for	run	%d.\n",
+																						slave.machine_name.c_str(),	slave.id,	slave.current_run->id);
+																}
+																handle_retry(slave,	MonteRun::MC_RUN_TIMED_OUT);
+																break;
+
+												default:
+																if	(verbosity	>=	MC_ERROR)	{
+																				message_publish(
+																						MSG_ERROR,
+																						"Monte	[Master]	%s:%d	reported	unrecognized	exit	status	(%d)	for	run	%d.	Skipping.\n",
+																						slave.machine_name.c_str(),	slave.id,	exit_status,	slave.current_run->id);
+																}
+																resolve_run(slave,	MonteRun::MC_UNRECOGNIZED_RETURN_CODE);
+																break;
+								}
+				}
+				
+				tc_disconnect(&connection_device);
+
+				/**	<li>	Update	the	slave's	state.	*/
+				if	(slave.state	==	MonteSlave::MC_RUNNING	||	slave.state	==	MonteSlave::MC_UNRESPONSIVE_RUNNING)	{
+								slave.state	=	MonteSlave::MC_READY;
+				}	else	if	(slave.state	==	MonteSlave::MC_STOPPING	||	slave.state	==	MonteSlave::MC_UNRESPONSIVE_STOPPING)	{
+								slave.state	=	MonteSlave::MC_STOPPED;
+				}
 }
 
-void Trick::MonteCarlo::set_disconnected_state(Trick::MonteSlave& slave) {
-    slave.state = Trick::MonteSlave::MC_DISCONNECTED;
-    if (verbosity >= MC_ERROR) {
-        message_publish(MSG_ERROR, "Monte [Master] Lost connection to %s:%d.\n",
-                        slave.machine_name.c_str(), slave.id) ;
-    }
-    tc_disconnect(&connection_device);
+void	Trick::MonteCarlo::set_disconnected_state(Trick::MonteSlave&	slave)	{
+				slave.state	=	Trick::MonteSlave::MC_DISCONNECTED;
+				if	(verbosity	>=	MC_ERROR)	{
+								message_publish(MSG_ERROR,	"Monte	[Master]	Lost	connection	to	%s:%d.\n",
+																								slave.machine_name.c_str(),	slave.id)	;
+				}
+				tc_disconnect(&connection_device);
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
index c5e2a9c51..1335831a5 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_run_queue.cpp
@@ -1,33 +1,33 @@
 
-#include <iostream>
-#include <sys/resource.h>
+#include	<iostream>
+#include	<sys/resource.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.hh"
 
 /**
 @details
--# Call the monte_carlo jobs
-   -# The scheduler will immediately return if the job returns a
-      non-zero return code.  The return code of the job will be
-      returned from Trick::Executive::init().
--# If no execption is thrown return 0
+-#	Call	the	monte_carlo	jobs
+			-#	The	scheduler	will	immediately	return	if	the	job	returns	a
+						non-zero	return	code.		The	return	code	of	the	job	will	be
+						returned	from	Trick::Executive::init().
+-#	If	no	execption	is	thrown	return	0
 */
-int Trick::MonteCarlo::run_queue(Trick::ScheduledJobQueue* queue, std::string in_string) {
-    int ret = 0 ;
+int	Trick::MonteCarlo::run_queue(Trick::ScheduledJobQueue*	queue,	std::string	in_string)	{
+				int	ret	=	0	;
 
-    queue->reset_curr_index() ;
-    while ( (curr_job = queue->get_next_job()) != NULL ) {
-        ret = curr_job->call() ;
-        if ( ret != 0 ) {
-            except_file = in_string ;
-            throw Trick::ExecutiveException(ret , curr_job->name.c_str() , 0 ,
-                                        curr_job->job_class_name + " job did not return 0") ;
-        }
-    }
+				queue->reset_curr_index()	;
+				while	(	(curr_job	=	queue->get_next_job())	!=	NULL	)	{
+								ret	=	curr_job->call()	;
+								if	(	ret	!=	0	)	{
+												except_file	=	in_string	;
+												throw	Trick::ExecutiveException(ret	,	curr_job->name.c_str()	,	0	,
+																																								curr_job->job_class_name	+	"	job	did	not	return	0")	;
+								}
+				}
 
-    /* return 0 if there are no errors. */
-    return ret ;
+				/*	return	0	if	there	are	no	errors.	*/
+				return	ret	;
 }
 
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp
index 718515e67..f6c195df1 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave.cpp
@@ -1,70 +1,70 @@
 
-#include "trick/MonteCarlo.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::execute_as_slave() {
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::execute_as_slave()	{
 
-    /** <li> Forever: */
-    while (true) {
-        if (verbosity >= MC_ALL) {
-            message_publish(MSG_INFO, "Monte [%s:%d] Waiting for new run.\n",
-                            machine_name.c_str(), slave_id) ;
-        }
-        /** <ul><li> On a blocking read, wait for a MonteSlave::Command from the master. */
-        if (tc_accept(&listen_device, &connection_device) != TC_SUCCESS) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Lost connection to Master. Shutting down.\n",
-                                machine_name.c_str(), slave_id) ;
-            }
-            slave_shutdown();
-        }
-        int command;
-        if (tc_read(&connection_device, (char *)&command, (int)sizeof(command)) != (int)sizeof(command)) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Lost connection to Master while receiving instructions. Shutting down.\n",
-                                machine_name.c_str(), slave_id) ;
-            }
-            slave_shutdown();
-        }
-        switch (command = ntohl(command)) {
-            int return_value;
-            case MonteSlave::MC_PROCESS_RUN:
-                /**
-                 * <ul><li> MonteSlave::MC_PROCESS_RUN: Call #slave_process_run. This will return a non-zero value when run in a
-                 * child process to indicate that this function should return so that the sim can complete.
-                 */
-                return_value = slave_process_run();
-                if (return_value != 0) {
-                    return return_value;
-                }
-                break;
-            case MonteSlave::MC_SHUTDOWN:
-                /** <li> MonteSlave::MC_SHUTDOWN: Call #slave_shutdown. */
-                if (verbosity >= MC_INFORMATIONAL) {
-                    message_publish(MSG_INFO, "Monte [%s:%d] Shutdown command received from Master. Shutting down.\n",
-                                    machine_name.c_str(), slave_id) ;
-                }
-                slave_shutdown();
-                break;
-            case MonteSlave::MC_DIE:
-                /** <li> MonteSlave::DIE: Call #slave_die. */
-                if (verbosity >= MC_INFORMATIONAL) {
-                    message_publish(MSG_INFO, "Monte [%s:%d] Killed by Master.\n",
-                                    machine_name.c_str(), slave_id) ;
-                }
-                slave_die();
-                break;
-            default:
-                /** <li> default: Call #slave_shutdown. */
-                if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Unrecognized command %d received from Master. Shutting down.\n",
-                                machine_name.c_str(), slave_id, command) ;
-                }
-                slave_shutdown();
-                break;
-        }
-    }
+				/**	<li>	Forever:	*/
+				while	(true)	{
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(MSG_INFO,	"Monte	[%s:%d]	Waiting	for	new	run.\n",
+																												machine_name.c_str(),	slave_id)	;
+								}
+								/**	<ul><li>	On	a	blocking	read,	wait	for	a	MonteSlave::Command	from	the	master.	*/
+								if	(tc_accept(&listen_device,	&connection_device)	!=	TC_SUCCESS)	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Lost	connection	to	Master.	Shutting	down.\n",
+																																machine_name.c_str(),	slave_id)	;
+												}
+												slave_shutdown();
+								}
+								int	command;
+								if	(tc_read(&connection_device,	(char	*)&command,	(int)sizeof(command))	!=	(int)sizeof(command))	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Lost	connection	to	Master	while	receiving	instructions.	Shutting	down.\n",
+																																machine_name.c_str(),	slave_id)	;
+												}
+												slave_shutdown();
+								}
+								switch	(command	=	ntohl(command))	{
+												int	return_value;
+												case	MonteSlave::MC_PROCESS_RUN:
+																/**
+																	*	<ul><li>	MonteSlave::MC_PROCESS_RUN:	Call	#slave_process_run.	This	will	return	a	non-zero	value	when	run	in	a
+																	*	child	process	to	indicate	that	this	function	should	return	so	that	the	sim	can	complete.
+																	*/
+																return_value	=	slave_process_run();
+																if	(return_value	!=	0)	{
+																				return	return_value;
+																}
+																break;
+												case	MonteSlave::MC_SHUTDOWN:
+																/**	<li>	MonteSlave::MC_SHUTDOWN:	Call	#slave_shutdown.	*/
+																if	(verbosity	>=	MC_INFORMATIONAL)	{
+																				message_publish(MSG_INFO,	"Monte	[%s:%d]	Shutdown	command	received	from	Master.	Shutting	down.\n",
+																																				machine_name.c_str(),	slave_id)	;
+																}
+																slave_shutdown();
+																break;
+												case	MonteSlave::MC_DIE:
+																/**	<li>	MonteSlave::DIE:	Call	#slave_die.	*/
+																if	(verbosity	>=	MC_INFORMATIONAL)	{
+																				message_publish(MSG_INFO,	"Monte	[%s:%d]	Killed	by	Master.\n",
+																																				machine_name.c_str(),	slave_id)	;
+																}
+																slave_die();
+																break;
+												default:
+																/**	<li>	default:	Call	#slave_shutdown.	*/
+																if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Unrecognized	command	%d	received	from	Master.	Shutting	down.\n",
+																																machine_name.c_str(),	slave_id,	command)	;
+																}
+																slave_shutdown();
+																break;
+								}
+				}
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp
index 8fd5bf194..deff96e08 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_funcs.cpp
@@ -1,44 +1,44 @@
 
-#include "trick/MonteCarlo.hh"
-#include "trick/SysThread.hh"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/SysThread.hh"
 
 
-/** @par Detailed Design: */
-void Trick::MonteCarlo::slave_shutdown() {
-    /** <ul><li> Kill any active child process executing a run. */
-    slave_kill_run();
-    /** <li> Run the shutdown jobs and exit. */
-    run_queue(&slave_shutdown_queue, "in slave_shutdown queue") ;
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::slave_shutdown()	{
+				/**	<ul><li>	Kill	any	active	child	process	executing	a	run.	*/
+				slave_kill_run();
+				/**	<li>	Run	the	shutdown	jobs	and	exit.	*/
+				run_queue(&slave_shutdown_queue,	"in	slave_shutdown	queue")	;
 
-    SysThread::ensureAllShutdown();
+				SysThread::ensureAllShutdown();
 
-    exit(0);
+				exit(0);
 }
 
-/** @par Detailed Design: */
-void Trick::MonteCarlo::slave_die() {
-    /** <ul><li> Kill any active child process executing a run and exit immediately. */
-    slave_kill_run();
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::slave_die()	{
+				/**	<ul><li>	Kill	any	active	child	process	executing	a	run	and	exit	immediately.	*/
+				slave_kill_run();
 
-    SysThread::ensureAllShutdown();
+				SysThread::ensureAllShutdown();
 
-    exit(1);
+				exit(1);
 }
 
-/** @par Detailed Design: */
-void Trick::MonteCarlo::slave_kill_run() {
-    /**
-     * The child process, if running, has a group ID equal to the parent's process ID. Sending a kill signal to this ID will
-     * signal both the child and the parent, so ignore it in the parent, and restore the current signal handler afterward.
-     */
-    struct sigaction ignore, restore;
-    ignore.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &ignore, &restore);
-    kill(getpid(), SIGTERM);
-    sigaction(SIGTERM, &restore, NULL);
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteCarlo::slave_kill_run()	{
+				/**
+					*	The	child	process,	if	running,	has	a	group	ID	equal	to	the	parent's	process	ID.	Sending	a	kill	signal	to	this	ID	will
+					*	signal	both	the	child	and	the	parent,	so	ignore	it	in	the	parent,	and	restore	the	current	signal	handler	afterward.
+					*/
+				struct	sigaction	ignore,	restore;
+				ignore.sa_handler	=	SIG_IGN;
+				sigaction(SIGTERM,	&ignore,	&restore);
+				kill(getpid(),	SIGTERM);
+				sigaction(SIGTERM,	&restore,	NULL);
 }
 
-/** @par Detailed Design: */
-void Trick::MonteSlave::set_S_main_name(std::string name) {
-    S_main_name = name;
+/**	@par	Detailed	Design:	*/
+void	Trick::MonteSlave::set_S_main_name(std::string	name)	{
+				S_main_name	=	name;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp
index 78a2bc5bd..21e7249f4 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_init.cpp
@@ -1,64 +1,64 @@
 
-#include <sys/stat.h>
-#include <libgen.h>
+#include	<sys/stat.h>
+#include	<libgen.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::slave_init() {
-    /** <ul><li> Construct the run directory. */
-    run_directory = std::string(command_line_args_get_output_dir());
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::slave_init()	{
+				/**	<ul><li>	Construct	the	run	directory.	*/
+				run_directory	=	std::string(command_line_args_get_output_dir());
 
-    if (access(run_directory.c_str(), F_OK) != 0) {
-        if (mkdir(run_directory.c_str(), 0775) == -1) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Unable to create directory %s.\nTerminating.\n",
-                            run_directory.c_str(), machine_name.c_str(), slave_id) ;
-            }
-            exit(-1);
-        }
-    }
+				if	(access(run_directory.c_str(),	F_OK)	!=	0)	{
+								if	(mkdir(run_directory.c_str(),	0775)	==	-1)	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Unable	to	create	directory	%s.\nTerminating.\n",
+																												run_directory.c_str(),	machine_name.c_str(),	slave_id)	;
+												}
+												exit(-1);
+								}
+				}
 
-    /** <li> Run the slave initialization jobs. */
-    run_queue(&slave_init_queue, "in slave_init queue") ;
+				/**	<li>	Run	the	slave	initialization	jobs.	*/
+				run_queue(&slave_init_queue,	"in	slave_init	queue")	;
 
-    /** <li> Initialize the sockets. */
-    tc_error(&listen_device, 0);
-    tc_error(&connection_device, 0);
-    tc_init(&listen_device);
-    listen_device.disable_handshaking = TC_COMM_TRUE;
+				/**	<li>	Initialize	the	sockets.	*/
+				tc_error(&listen_device,	0);
+				tc_error(&connection_device,	0);
+				tc_init(&listen_device);
+				listen_device.disable_handshaking	=	TC_COMM_TRUE;
 
-    /** <li> Connect to the master and write the port over which we are listening for new runs. */
-    connection_device.port = master_port;
-    if (tc_connect(&connection_device) != TC_SUCCESS) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [%s:%d] Failed to initialize communication sockets.\nTerminating.\n",
-                            machine_name.c_str(), slave_id) ;
-        }
-        exit(-1);
-    }
+				/**	<li>	Connect	to	the	master	and	write	the	port	over	which	we	are	listening	for	new	runs.	*/
+				connection_device.port	=	master_port;
+				if	(tc_connect(&connection_device)	!=	TC_SUCCESS)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[%s:%d]	Failed	to	initialize	communication	sockets.\nTerminating.\n",
+																												machine_name.c_str(),	slave_id)	;
+								}
+								exit(-1);
+				}
 
-    if (verbosity >= MC_ALL) {
-        message_publish(MSG_INFO, "Monte [%s:%d] Making initial connection with Master.\n",
-                        machine_name.c_str(), slave_id) ;
-    }
+				if	(verbosity	>=	MC_ALL)	{
+								message_publish(MSG_INFO,	"Monte	[%s:%d]	Making	initial	connection	with	Master.\n",
+																								machine_name.c_str(),	slave_id)	;
+				}
 
-    int id = htonl(slave_id);
-    tc_write(&connection_device, (char *)&id, (int)sizeof(id));
+				int	id	=	htonl(slave_id);
+				tc_write(&connection_device,	(char	*)&id,	(int)sizeof(id));
 
-    char hostname[_POSIX_HOST_NAME_MAX] = {};
-    gethostname(hostname, sizeof(hostname)-1);
+				char	hostname[_POSIX_HOST_NAME_MAX]	=	{};
+				gethostname(hostname,	sizeof(hostname)-1);
 
-    int num_bytes = htonl(strlen(hostname));
-    tc_write(&connection_device, (char *)&num_bytes, (int)sizeof(num_bytes));
-    tc_write(&connection_device, hostname, strlen(hostname));
-    int listen_port = htonl(listen_device.port);
-    tc_write(&connection_device, (char *)&listen_port, (int)sizeof(listen_port));
-    tc_disconnect(&connection_device);
+				int	num_bytes	=	htonl(strlen(hostname));
+				tc_write(&connection_device,	(char	*)&num_bytes,	(int)sizeof(num_bytes));
+				tc_write(&connection_device,	hostname,	strlen(hostname));
+				int	listen_port	=	htonl(listen_device.port);
+				tc_write(&connection_device,	(char	*)&listen_port,	(int)sizeof(listen_port));
+				tc_disconnect(&connection_device);
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
index 9767f0a05..e4eaa5187 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_slave_process_run.cpp
@@ -1,153 +1,153 @@
 
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <sstream>
+#include	<sys/stat.h>
+#include	<sys/wait.h>
+#include	<stdio.h>
+#include	<sstream>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/command_line_protos.h"
-#include "trick/input_processor_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/input_processor_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
-/** @par Detailed Design: */
-int Trick::MonteCarlo::slave_process_run() {
-    int size;
-    /** <ul><li> Read the length of the incoming message. */
-    if (tc_read(&connection_device, (char *)&size, (int)sizeof(size)) != (int)sizeof(size) || (size = ntohl(size)) < 0) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [%s:%d] Lost connection to Master while receiving new run.\nShutting down.\n",
-                            machine_name.c_str(), slave_id) ;
-        }
-        slave_shutdown();
-    }
-    char *input = new char[size + 1];
-    /** <li> Read the incoming message. */
-    if (tc_read(&connection_device, input, size) != size) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [%s:%d] Lost connection to Master while receiving new run.\nShutting down.\n",
-                            machine_name.c_str(), slave_id) ;
-        }
-        slave_shutdown();
-    }
-    tc_disconnect(&connection_device);
+/**	@par	Detailed	Design:	*/
+int	Trick::MonteCarlo::slave_process_run()	{
+				int	size;
+				/**	<ul><li>	Read	the	length	of	the	incoming	message.	*/
+				if	(tc_read(&connection_device,	(char	*)&size,	(int)sizeof(size))	!=	(int)sizeof(size)	||	(size	=	ntohl(size))	<	0)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[%s:%d]	Lost	connection	to	Master	while	receiving	new	run.\nShutting	down.\n",
+																												machine_name.c_str(),	slave_id)	;
+								}
+								slave_shutdown();
+				}
+				char	*input	=	new	char[size	+	1];
+				/**	<li>	Read	the	incoming	message.	*/
+				if	(tc_read(&connection_device,	input,	size)	!=	size)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[%s:%d]	Lost	connection	to	Master	while	receiving	new	run.\nShutting	down.\n",
+																												machine_name.c_str(),	slave_id)	;
+								}
+								slave_shutdown();
+				}
+				tc_disconnect(&connection_device);
 
-    /**
-     * <li> fork() a child process to execute the simulation.
-     * This allows the slave to monitor the child and continue running
-     * if it crashes or times out.
-     */
-    pid_t pid = fork();
-    if (pid == -1) {
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [%s:%d] Unable to fork new process for run.\nShutting down.\n",
-                            machine_name.c_str(), slave_id) ;
-        }
-        slave_shutdown();
-    /** <li>Parent process: */
-    } else if (pid != 0) {
-        int return_value = 0 ;
-        /** <li> Wait for the child to finish. */
-        if (waitpid(pid, &return_value, 0) == -1) {
-            /* (Alex) On the Mac this check gives a lot of false positives.  I've commented out the code for now. */
-            /*
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Error while waiting for run to finish.\nShutting down.\n",
-                                machine_name.c_str(), slave_id) ;
-            }
-            slave_shutdown();
-            */
-        }
+				/**
+					*	<li>	fork()	a	child	process	to	execute	the	simulation.
+					*	This	allows	the	slave	to	monitor	the	child	and	continue	running
+					*	if	it	crashes	or	times	out.
+					*/
+				pid_t	pid	=	fork();
+				if	(pid	==	-1)	{
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[%s:%d]	Unable	to	fork	new	process	for	run.\nShutting	down.\n",
+																												machine_name.c_str(),	slave_id)	;
+								}
+								slave_shutdown();
+				/**	<li>Parent	process:	*/
+				}	else	if	(pid	!=	0)	{
+								int	return_value	=	0	;
+								/**	<li>	Wait	for	the	child	to	finish.	*/
+								if	(waitpid(pid,	&return_value,	0)	==	-1)	{
+												/*	(Alex)	On	the	Mac	this	check	gives	a	lot	of	false	positives.		I've	commented	out	the	code	for	now.	*/
+												/*
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Error	while	waiting	for	run	to	finish.\nShutting	down.\n",
+																																machine_name.c_str(),	slave_id)	;
+												}
+												slave_shutdown();
+												*/
+								}
 
-        if (WIFEXITED(return_value)) {
-            // A successful sim sends its exit status to the master itself in
-            // its shutdown job. Users can subvert this by calling exit, in
-            // which case the master will eventually deem this run to have
-            // timed out. But who would do that?!
-            return 0;
-        }
+								if	(WIFEXITED(return_value))	{
+												//	A	successful	sim	sends	its	exit	status	to	the	master	itself	in
+												//	its	shutdown	job.	Users	can	subvert	this	by	calling	exit,	in
+												//	which	case	the	master	will	eventually	deem	this	run	to	have
+												//	timed	out.	But	who	would	do	that?!
+												return	0;
+								}
 
-        int signal = WTERMSIG(return_value);
-        /** <li> Extract the exit status of the child. */
-        MonteRun::ExitStatus exit_status = signal == SIGALRM ? MonteRun::MC_RUN_TIMED_OUT : MonteRun::MC_RUN_DUMPED_CORE;
-        if (verbosity >= MC_ERROR) {
-            message_publish(MSG_ERROR, "Monte [%s:%d] Run killed by signal %d: %s\n",
-                            machine_name.c_str(), slave_id, signal, strsignal(signal)) ;
-        }
-        connection_device.port = master_port;
-        if (tc_connect(&connection_device) != TC_SUCCESS) {
-            if (verbosity >= MC_ERROR) {
-                message_publish(MSG_ERROR, "Monte [%s:%d] Lost connection to Master before results could be returned.\nShutting down.\n",
-                                machine_name.c_str(), slave_id) ;
-            }
-            slave_shutdown();
-        }
-        if (verbosity >= MC_ALL) {
-            message_publish(MSG_INFO, "Monte [%s:%d] Sending run exit status to master %d.\n",
-                            machine_name.c_str(), slave_id, exit_status) ;
-        }
-        /** <li> Write the slaves id to the master. </ul> */
-        int id = htonl(slave_id);
-        tc_write(&connection_device, (char *)&id, (int)sizeof(id));
-        /** <li> Write the child's exit status to the master. </ul> */
-        return_value = htonl(exit_status);
-        tc_write(&connection_device, (char *)&return_value, (int)sizeof(return_value));
-        tc_disconnect(&connection_device);
-        return 0;
-    /** <li> Child process: */
-    } else {
-        input[size] = '\0';
-        if ( ip_parse(input) != 0 ) {
-            exit(MonteRun::MC_PROBLEM_PARSING_INPUT);
-        }
+								int	signal	=	WTERMSIG(return_value);
+								/**	<li>	Extract	the	exit	status	of	the	child.	*/
+								MonteRun::ExitStatus	exit_status	=	signal	==	SIGALRM	?	MonteRun::MC_RUN_TIMED_OUT	:	MonteRun::MC_RUN_DUMPED_CORE;
+								if	(verbosity	>=	MC_ERROR)	{
+												message_publish(MSG_ERROR,	"Monte	[%s:%d]	Run	killed	by	signal	%d:	%s\n",
+																												machine_name.c_str(),	slave_id,	signal,	strsignal(signal))	;
+								}
+								connection_device.port	=	master_port;
+								if	(tc_connect(&connection_device)	!=	TC_SUCCESS)	{
+												if	(verbosity	>=	MC_ERROR)	{
+																message_publish(MSG_ERROR,	"Monte	[%s:%d]	Lost	connection	to	Master	before	results	could	be	returned.\nShutting	down.\n",
+																																machine_name.c_str(),	slave_id)	;
+												}
+												slave_shutdown();
+								}
+								if	(verbosity	>=	MC_ALL)	{
+												message_publish(MSG_INFO,	"Monte	[%s:%d]	Sending	run	exit	status	to	master	%d.\n",
+																												machine_name.c_str(),	slave_id,	exit_status)	;
+								}
+								/**	<li>	Write	the	slaves	id	to	the	master.	</ul>	*/
+								int	id	=	htonl(slave_id);
+								tc_write(&connection_device,	(char	*)&id,	(int)sizeof(id));
+								/**	<li>	Write	the	child's	exit	status	to	the	master.	</ul>	*/
+								return_value	=	htonl(exit_status);
+								tc_write(&connection_device,	(char	*)&return_value,	(int)sizeof(return_value));
+								tc_disconnect(&connection_device);
+								return	0;
+				/**	<li>	Child	process:	*/
+				}	else	{
+								input[size]	=	'\0';
+								if	(	ip_parse(input)	!=	0	)	{
+												exit(MonteRun::MC_PROBLEM_PARSING_INPUT);
+								}
 
-        /** <ul><li> Create the run directory. */
-        std::string output_dir = command_line_args_get_output_dir();
-        if (access(output_dir.c_str(), F_OK) != 0) {
-            if (mkdir(output_dir.c_str(), 0775) == -1) {
-                exit(MonteRun::MC_CANT_CREATE_OUTPUT_DIR);
-            }
-        }
+								/**	<ul><li>	Create	the	run	directory.	*/
+								std::string	output_dir	=	command_line_args_get_output_dir();
+								if	(access(output_dir.c_str(),	F_OK)	!=	0)	{
+												if	(mkdir(output_dir.c_str(),	0775)	==	-1)	{
+																exit(MonteRun::MC_CANT_CREATE_OUTPUT_DIR);
+												}
+								}
 
-        std::stringstream ss_monte_input;
-        ss_monte_input << output_dir << "/monte_input";
-        FILE *fp = fopen(ss_monte_input.str().c_str(), "w");
+								std::stringstream	ss_monte_input;
+								ss_monte_input	<<	output_dir	<<	"/monte_input";
+								FILE	*fp	=	fopen(ss_monte_input.str().c_str(),	"w");
 
-        fprintf(fp,
-          "# This run can be executed in stand alone (non-Monte Carlo) mode by running\n"
-          "# the S_main executable with this file specified as the input file.\n\n");
-        fprintf(fp, "if (sys.version_info > (3, 0)):\n");
-        fprintf(fp, "    exec(open(\"%s\").read())\n", command_line_args_get_input_file());
-        fprintf(fp, "else:\n");
-        fprintf(fp, "    execfile(\"%s\")\n\n", command_line_args_get_input_file());
-        fprintf(fp, "trick.mc_set_enabled(0)\n");
-        fprintf(fp, "%s" , input);
-        fclose(fp);
-        delete [] input;
+								fprintf(fp,
+										"#	This	run	can	be	executed	in	stand	alone	(non-Monte	Carlo)	mode	by	running\n"
+										"#	the	S_main	executable	with	this	file	specified	as	the	input	file.\n\n");
+								fprintf(fp,	"if	(sys.version_info	>	(3,	0)):\n");
+								fprintf(fp,	"				exec(open(\"%s\").read())\n",	command_line_args_get_input_file());
+								fprintf(fp,	"else:\n");
+								fprintf(fp,	"				execfile(\"%s\")\n\n",	command_line_args_get_input_file());
+								fprintf(fp,	"trick.mc_set_enabled(0)\n");
+								fprintf(fp,	"%s"	,	input);
+								fclose(fp);
+								delete	[]	input;
 
-        /** <li> redirect stdout and stderr to files in the run directory */
-        std::stringstream ss_stdout;
-        ss_stdout << output_dir << "/stdout";
-        freopen(ss_stdout.str().c_str(), "w", stdout);
-        std::stringstream ss_stderr;
-        ss_stderr << output_dir << "/stderr";
-        freopen(ss_stderr.str().c_str(), "w", stderr);
+								/**	<li>	redirect	stdout	and	stderr	to	files	in	the	run	directory	*/
+								std::stringstream	ss_stdout;
+								ss_stdout	<<	output_dir	<<	"/stdout";
+								freopen(ss_stdout.str().c_str(),	"w",	stdout);
+								std::stringstream	ss_stderr;
+								ss_stderr	<<	output_dir	<<	"/stderr";
+								freopen(ss_stderr.str().c_str(),	"w",	stderr);
 
-        /** <li> Run the pre run jobs. */
-        run_queue(&slave_pre_queue, "in slave_pre queue") ;
+								/**	<li>	Run	the	pre	run	jobs.	*/
+								run_queue(&slave_pre_queue,	"in	slave_pre	queue")	;
 
-        /** <li> Set a timer to interrupt us after the timeout value. */
-        struct sigaction default_alarm;
-        default_alarm.sa_handler = SIG_DFL;
-        sigaction(SIGALRM, &default_alarm, NULL);
-        alarm((unsigned int)timeout);
+								/**	<li>	Set	a	timer	to	interrupt	us	after	the	timeout	value.	*/
+								struct	sigaction	default_alarm;
+								default_alarm.sa_handler	=	SIG_DFL;
+								sigaction(SIGALRM,	&default_alarm,	NULL);
+								alarm((unsigned	int)timeout);
 
-        /**
-         * <li> Return a non-zero result so the calling function (#slave)
-         * will return, allowing the slave sim to complete.
-         */
-        return 1;
-    }
-    return 0;
+								/**
+									*	<li>	Return	a	non-zero	result	so	the	calling	function	(#slave)
+									*	will	return,	allowing	the	slave	sim	to	complete.
+									*/
+								return	1;
+				}
+				return	0;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
index 0e16c1e5d..bcc2fc6ad 100644
--- a/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteCarlo_spawn_slaves.cpp
@@ -1,125 +1,125 @@
 
-#include <sstream>
-#include <stdlib.h>
+#include	<sstream>
+#include	<stdlib.h>
 
-#include "trick/MonteCarlo.hh"
-#include "trick/command_line_protos.h"
-#include "trick/unix_commands.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/unix_commands.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 /**
- * @par Detailed Design:
- * This function is responsible for actually issuing the system call that
- * will create the slave simulations on the appropriate machines.
- */
-void Trick::MonteCarlo::spawn_slaves() {
-    /** <ul><li> For all slaves: */
-    for (std::vector<MonteSlave *>::size_type i = 0; i < slaves.size(); ++i) {
-        /** <ul><li> If the slave is in the UNINITIALZED state, then
-          * set up the command string for starting the slave.
-          */
-        if (slaves[i]->state == MonteSlave::MC_UNINITIALIZED) {
-            initialize_slave(slaves[i]) ;
-        }
-    }
+	*	@par	Detailed	Design:
+	*	This	function	is	responsible	for	actually	issuing	the	system	call	that
+	*	will	create	the	slave	simulations	on	the	appropriate	machines.
+	*/
+void	Trick::MonteCarlo::spawn_slaves()	{
+				/**	<ul><li>	For	all	slaves:	*/
+				for	(std::vector<MonteSlave	*>::size_type	i	=	0;	i	<	slaves.size();	++i)	{
+								/**	<ul><li>	If	the	slave	is	in	the	UNINITIALZED	state,	then
+										*	set	up	the	command	string	for	starting	the	slave.
+										*/
+								if	(slaves[i]->state	==	MonteSlave::MC_UNINITIALIZED)	{
+												initialize_slave(slaves[i])	;
+								}
+				}
 }
 
-void Trick::MonteCarlo::initialize_slave(Trick::MonteSlave* slave_to_init) {
-    std::stringstream ss;
-    if (slave_to_init->remote_shell_args.empty()) {
-        slave_to_init->remote_shell_args = "";
-    }
-    std::string buffer;
-    /** <li> If this is a custom slave dispatch: add the #custom_pre_text. */
-    if (custom_slave_dispatch) {
-        buffer = custom_pre_text;
-    /** <li> Otherwise add the default pre text.     */
-    } else {
-        default_slave_dispatch_pre_text(slave_to_init, buffer) ;
-    }
+void	Trick::MonteCarlo::initialize_slave(Trick::MonteSlave*	slave_to_init)	{
+				std::stringstream	ss;
+				if	(slave_to_init->remote_shell_args.empty())	{
+								slave_to_init->remote_shell_args	=	"";
+				}
+				std::string	buffer;
+				/**	<li>	If	this	is	a	custom	slave	dispatch:	add	the	#custom_pre_text.	*/
+				if	(custom_slave_dispatch)	{
+								buffer	=	custom_pre_text;
+				/**	<li>	Otherwise	add	the	default	pre	text.					*/
+				}	else	{
+								default_slave_dispatch_pre_text(slave_to_init,	buffer)	;
+				}
 
-    if (!slave_to_init->S_main_name.compare("")) {
-        slave_to_init->S_main_name = "./S_main_*.exe";
-    }
+				if	(!slave_to_init->S_main_name.compare(""))	{
+								slave_to_init->S_main_name	=	"./S_main_*.exe";
+				}
 
-    /** <li> Append the S_main executable and slave-specific arguments. */
-    ss << slave_to_init->S_main_name
-       << " " << command_line_args_get_input_file()
-       << " --monte_host " << machine_name
-       << " --monte_sync_port " << listen_device.port
-       << " --monte_client_id " << slave_to_init->id
-       << " -O " << slave_output_directory;
-    buffer += ss.str();
+				/**	<li>	Append	the	S_main	executable	and	slave-specific	arguments.	*/
+				ss	<<	slave_to_init->S_main_name
+							<<	"	"	<<	command_line_args_get_input_file()
+							<<	"	--monte_host	"	<<	machine_name
+							<<	"	--monte_sync_port	"	<<	listen_device.port
+							<<	"	--monte_client_id	"	<<	slave_to_init->id
+							<<	"	-O	"	<<	slave_output_directory;
+				buffer	+=	ss.str();
 
-    /** <li> Append user sim options. */
-    if (!slave_sim_options.empty()) {
-        buffer += " " + slave_sim_options;
-    }
+				/**	<li>	Append	user	sim	options.	*/
+				if	(!slave_sim_options.empty())	{
+								buffer	+=	"	"	+	slave_sim_options;
+				}
 
-    /** <li> if this is a custom slave dispatch, append the #custom_post_text. */
-    if (custom_slave_dispatch) {
-        buffer += custom_post_text;
-    } else {
-        buffer += std::string("' &");
-    }
+				/**	<li>	if	this	is	a	custom	slave	dispatch,	append	the	#custom_post_text.	*/
+				if	(custom_slave_dispatch)	{
+								buffer	+=	custom_post_text;
+				}	else	{
+								buffer	+=	std::string("'	&");
+				}
 
-    if (verbosity >= MC_INFORMATIONAL) {
-        message_publish(MSG_INFO, "Monte: Spawning Slave %s:%d :\n%s\n",
-                        slave_to_init->machine_name.c_str(), slave_to_init->id, buffer.c_str()) ;
-    }
-    /** <li> Set the slave's state to MC_INITIALIZING. */
-    slave_to_init->state = MonteSlave::MC_INITIALIZING;
-    /** <li> Make the system call to execute the shell. */
-    system(buffer.c_str());
+				if	(verbosity	>=	MC_INFORMATIONAL)	{
+								message_publish(MSG_INFO,	"Monte:	Spawning	Slave	%s:%d	:\n%s\n",
+																								slave_to_init->machine_name.c_str(),	slave_to_init->id,	buffer.c_str())	;
+				}
+				/**	<li>	Set	the	slave's	state	to	MC_INITIALIZING.	*/
+				slave_to_init->state	=	MonteSlave::MC_INITIALIZING;
+				/**	<li>	Make	the	system	call	to	execute	the	shell.	*/
+				system(buffer.c_str());
 }
 
-void Trick::MonteCarlo::default_slave_dispatch_pre_text(Trick::MonteSlave* slave_to_init, std::string &buffer) {
-    /** <ul><li> If the slave is running locally, use a local shell. */
-    if (!localhost_as_remote &&
-        (equals_ignore_case(slave_to_init->machine_name, machine_name) ||
-         equals_ignore_case(slave_to_init->machine_name, std::string("localhost")))) {
-        buffer = "/bin/sh -c '";
-    /** <li> Otherwise, use the appropriate remote shell. */
-    } else {
-        switch (slave_to_init->remote_shell) {
-            case TRICK_RSH:
-                buffer = unix_rsh;
-            break;
-            case TRICK_USER_REMOTE_SH:
-                if (slave_to_init->user_remote_shell.empty()) {
-                    slave_to_init->user_remote_shell = unix_ssh;
-                    if (verbosity >= MC_ERROR) {
-                        message_publish(MSG_WARNING, "Monte: TRICK_USER_REMOTE_SH specified for Slave %s:%d, but no shell given.\n"
-                                                     "Defaulting to %s.\n",
-                                        machine_name.c_str(), slave_to_init->id, slave_to_init->user_remote_shell.c_str()) ;
-                    }
-                }
-                buffer = slave_to_init->user_remote_shell;
-            break;
-            default:
-                buffer = unix_ssh;
-            break;
-        }
-        /** <ul><li> Add the user-specified remote shell arguments and the remote machine name. </ul> */
-        buffer += " " + slave_to_init->remote_shell_args + " " + slave_to_init->machine_name + " '";
-    }
+void	Trick::MonteCarlo::default_slave_dispatch_pre_text(Trick::MonteSlave*	slave_to_init,	std::string	&buffer)	{
+				/**	<ul><li>	If	the	slave	is	running	locally,	use	a	local	shell.	*/
+				if	(!localhost_as_remote	&&
+								(equals_ignore_case(slave_to_init->machine_name,	machine_name)	||
+									equals_ignore_case(slave_to_init->machine_name,	std::string("localhost"))))	{
+								buffer	=	"/bin/sh	-c	'";
+				/**	<li>	Otherwise,	use	the	appropriate	remote	shell.	*/
+				}	else	{
+								switch	(slave_to_init->remote_shell)	{
+												case	TRICK_RSH:
+																buffer	=	unix_rsh;
+												break;
+												case	TRICK_USER_REMOTE_SH:
+																if	(slave_to_init->user_remote_shell.empty())	{
+																				slave_to_init->user_remote_shell	=	unix_ssh;
+																				if	(verbosity	>=	MC_ERROR)	{
+																								message_publish(MSG_WARNING,	"Monte:	TRICK_USER_REMOTE_SH	specified	for	Slave	%s:%d,	but	no	shell	given.\n"
+																																																					"Defaulting	to	%s.\n",
+																																								machine_name.c_str(),	slave_to_init->id,	slave_to_init->user_remote_shell.c_str())	;
+																				}
+																}
+																buffer	=	slave_to_init->user_remote_shell;
+												break;
+												default:
+																buffer	=	unix_ssh;
+												break;
+								}
+								/**	<ul><li>	Add	the	user-specified	remote	shell	arguments	and	the	remote	machine	name.	</ul>	*/
+								buffer	+=	"	"	+	slave_to_init->remote_shell_args	+	"	"	+	slave_to_init->machine_name	+	"	'";
+				}
 
-    /** <li> Add the user command string to allow passing
-     * of environment variables and such to the slave.
-     */
-    if (!user_cmd_string.empty()) {
-        buffer += user_cmd_string + "; ";
-    }
+				/**	<li>	Add	the	user	command	string	to	allow	passing
+					*	of	environment	variables	and	such	to	the	slave.
+					*/
+				if	(!user_cmd_string.empty())	{
+								buffer	+=	user_cmd_string	+	";	";
+				}
 
-    /** <li> Add the command to switch to the appropriate directory. */
-    if (slave_to_init->remote_shell != TRICK_USER_REMOTE_SH) {
-        buffer += "cd ";
-        if (!slave_to_init->sim_path.empty()) {
-            buffer += slave_to_init->sim_path;
-        } else {
-            buffer += std::string(command_line_args_get_default_dir());
-        }
-        buffer += std::string("; ");
-    }
+				/**	<li>	Add	the	command	to	switch	to	the	appropriate	directory.	*/
+				if	(slave_to_init->remote_shell	!=	TRICK_USER_REMOTE_SH)	{
+								buffer	+=	"cd	";
+								if	(!slave_to_init->sim_path.empty())	{
+												buffer	+=	slave_to_init->sim_path;
+								}	else	{
+												buffer	+=	std::string(command_line_args_get_default_dir());
+								}
+								buffer	+=	std::string(";	");
+				}
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp b/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp
index 18bba5fb5..b5079a908 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarCalculated.cpp
@@ -1,80 +1,80 @@
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include "trick/MonteVarCalculated.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/MonteVarCalculated.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-Trick::MonteVarCalculated::MonteVarCalculated(std::string in_name, std::string in_unit) {
-    this->name = in_name;
-    this->unit = in_unit;
+Trick::MonteVarCalculated::MonteVarCalculated(std::string	in_name,	std::string	in_unit)	{
+				this->name	=	in_name;
+				this->unit	=	in_unit;
 
-    ref2 = ref_attributes(name.c_str());
-    if (ref2 == NULL) {
-        message_publish(MSG_ERROR, "Monte : MonteVarCalculated could not find parameter %s.\n", name.c_str()) ;
-    }
+				ref2	=	ref_attributes(name.c_str());
+				if	(ref2	==	NULL)	{
+								message_publish(MSG_ERROR,	"Monte	:	MonteVarCalculated	could	not	find	parameter	%s.\n",	name.c_str())	;
+				}
 }
 
-// Composite the various properties of this MonteVarCalculated.
-std::string Trick::MonteVarCalculated::describe_variable()
+//	Composite	the	various	properties	of	this	MonteVarCalculated.
+std::string	Trick::MonteVarCalculated::describe_variable()
 {
-    std::stringstream ss;
+				std::stringstream	ss;
 
-    ss << "#NAME:\t" << this->name << "\n"
-       << "#TYPE:\tCALCULATED\n" 
-       << "#UNIT:\t" << this->unit << "\n";
+				ss	<<	"#NAME:\t"	<<	this->name	<<	"\n"
+							<<	"#TYPE:\tCALCULATED\n"	
+							<<	"#UNIT:\t"	<<	this->unit	<<	"\n";
 
-    return ss.str();
+				return	ss.str();
 }
 
-std::string Trick::MonteVarCalculated::get_next_value() {
-    char buffer[128];
-    if (ref2 != NULL) {
-        switch (ref2->attr->type) {
-            case TRICK_CHARACTER:
-            case TRICK_UNSIGNED_CHARACTER:
-                snprintf(buffer, sizeof(buffer), "%d", *(char *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_SHORT:
-            case TRICK_UNSIGNED_SHORT:
-                snprintf(buffer, sizeof(buffer), "%d", *(short *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_INTEGER:
-            case TRICK_UNSIGNED_INTEGER:
-                snprintf(buffer, sizeof(buffer), "%d", *(int *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_LONG:
-            case TRICK_UNSIGNED_LONG:
-                snprintf(buffer, sizeof(buffer), "%ld", *(long *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_LONG_LONG:
-            case TRICK_UNSIGNED_LONG_LONG:
-                snprintf(buffer, sizeof(buffer), "%lld", *(long long *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_FLOAT:
-                snprintf(buffer, sizeof(buffer), "%.15g", *(float *)ref2->address);
-                value = buffer;
-                break;
-            case TRICK_DOUBLE:
-                snprintf(buffer, sizeof(buffer), "%.15g", *(double *)ref2->address);
-                value = buffer;
-                break;
-            default:
-                snprintf(buffer, sizeof(buffer), "#Unsupported value type %d", ref2->attr->type) ;
-                break ;
-        }
+std::string	Trick::MonteVarCalculated::get_next_value()	{
+				char	buffer[128];
+				if	(ref2	!=	NULL)	{
+								switch	(ref2->attr->type)	{
+												case	TRICK_CHARACTER:
+												case	TRICK_UNSIGNED_CHARACTER:
+																snprintf(buffer,	sizeof(buffer),	"%d",	*(char	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_SHORT:
+												case	TRICK_UNSIGNED_SHORT:
+																snprintf(buffer,	sizeof(buffer),	"%d",	*(short	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_INTEGER:
+												case	TRICK_UNSIGNED_INTEGER:
+																snprintf(buffer,	sizeof(buffer),	"%d",	*(int	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_LONG:
+												case	TRICK_UNSIGNED_LONG:
+																snprintf(buffer,	sizeof(buffer),	"%ld",	*(long	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_LONG_LONG:
+												case	TRICK_UNSIGNED_LONG_LONG:
+																snprintf(buffer,	sizeof(buffer),	"%lld",	*(long	long	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_FLOAT:
+																snprintf(buffer,	sizeof(buffer),	"%.15g",	*(float	*)ref2->address);
+																value	=	buffer;
+																break;
+												case	TRICK_DOUBLE:
+																snprintf(buffer,	sizeof(buffer),	"%.15g",	*(double	*)ref2->address);
+																value	=	buffer;
+																break;
+												default:
+																snprintf(buffer,	sizeof(buffer),	"#Unsupported	value	type	%d",	ref2->attr->type)	;
+																break	;
+								}
 
-        if (unit.empty()) {
-            return name + std::string(" = ") + value;
-        } else {
-            return name + std::string(" = trick.attach_units(\"") + unit + std::string("\", ") + value + std::string(")");
-        }
-    }
-    return NULL;
+								if	(unit.empty())	{
+												return	name	+	std::string("	=	")	+	value;
+								}	else	{
+												return	name	+	std::string("	=	trick.attach_units(\"")	+	unit	+	std::string("\",	")	+	value	+	std::string(")");
+								}
+				}
+				return	NULL;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
index ee0e1c79c..269fea950 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
@@ -1,132 +1,132 @@
-#include <sstream>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits>
-
-#include "trick/MonteVarFile.hh"
-#include "trick/message_proto.h"
-#include "trick/exec_proto.h"
-
-Trick::MonteVarFile::MonteVarFile(std::string in_name, std::string in_file_name, unsigned int in_column, std::string in_unit) : input_file_stream(NULL) {
-    name = in_name;
-    column = in_column;
-    unit = in_unit;
-
-    set_file_name(in_file_name);
+#include	<sstream>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<limits>
+
+#include	"trick/MonteVarFile.hh"
+#include	"trick/message_proto.h"
+#include	"trick/exec_proto.h"
+
+Trick::MonteVarFile::MonteVarFile(std::string	in_name,	std::string	in_file_name,	unsigned	int	in_column,	std::string	in_unit)	:	input_file_stream(NULL)	{
+				name	=	in_name;
+				column	=	in_column;
+				unit	=	in_unit;
+
+				set_file_name(in_file_name);
 }
 
-Trick::MonteVarFile::~MonteVarFile() {
-    delete input_file_stream;
+Trick::MonteVarFile::~MonteVarFile()	{
+				delete	input_file_stream;
 }
 
-// Composite the various properties of this MonteVarFile.
-std::string Trick::MonteVarFile::describe_variable() {
-    std::stringstream ss;
+//	Composite	the	various	properties	of	this	MonteVarFile.
+std::string	Trick::MonteVarFile::describe_variable()	{
+				std::stringstream	ss;
 
-    ss << "#NAME:\t\t" << name << "\n"
-       << "#TYPE:\t\tFILE\n"
-       << "#UNIT:\t\t" << unit << "\n"
-       << "#FILE:\t\t" << file_name << "\n"
-       << "#COLUMN:\t" << column << "\n";
+				ss	<<	"#NAME:\t\t"	<<	name	<<	"\n"
+							<<	"#TYPE:\t\tFILE\n"
+							<<	"#UNIT:\t\t"	<<	unit	<<	"\n"
+							<<	"#FILE:\t\t"	<<	file_name	<<	"\n"
+							<<	"#COLUMN:\t"	<<	column	<<	"\n";
 
-    return ss.str();
+				return	ss.str();
 }
 
-std::string Trick::MonteVarFile::get_next_value() {
-    // Open the file and seek to the previous position.
-    input_file_stream->open(file_name.c_str(), std::ifstream::in);
-    input_file_stream->seekg(stream_position);
-
-    if (input_file_stream->good()) {
-        std::string line;
-        // Skip the comments and empty lines in the data file.
-        do {
-            std::getline(*input_file_stream, line);
-
-            if(input_file_stream->eof()) {
-                if (line.empty()) {
-                    input_file_stream->close();
-                    return "EOF";
-                } else {
-                    input_file_stream->seekg(0, input_file_stream->end);
-                }
-            }
-        }
-        while(line[0] == '#' || line[0] == '\0');
-
-        // Store the current stream position and close the file.
-        stream_position = input_file_stream->tellg();
-        input_file_stream->close();
-
-        // Count the number of columns in the input file.
-        char *token;
-        unsigned int ntokens = 0;
-        char* temp_str = strdup(line.c_str());
-        token = strtok(temp_str, " \t");
-        while (token != NULL) {
-            token = strtok(NULL, " \t");
-            ntokens++;
-        }
-
-        // Verify the input column number is valid.
-        if ((column == 0) || (column > ntokens)) {
-            char string[100];
-            snprintf(string, sizeof(string), "Trick:MonteVarFile An invalid column number %u, valid column numbers are 1 - %u", column, ntokens);
-            exec_terminate_with_return(-1, __FILE__, __LINE__, string);
-        }
-
-        // Get the next value.
-        if(temp_str) {
-            free(temp_str);
-        }
-        temp_str = strdup(line.c_str());
-        token = strtok(temp_str, " \t");
-
-        for(unsigned int i = 1; i < column; i++) {
-            // Iterate through each token in the temp_str.
-            if(token != NULL)
-                token = strtok(NULL, " \t");
-        }
-
-        // Return the value as a string.
-        value = token;
-        std::stringstream ss;
-
-        if(unit.empty())
-            ss << name << " = " << token;
-        else
-            ss << name << " = " << "trick.attach_units(\"" << unit << "\", " << token << ")";
-        if(temp_str) {
-            free(temp_str);
-            temp_str = nullptr;
-        }
-        return ss.str();
-
-    }
-    char string[100];
-    snprintf(string, sizeof(string), "Trick:MonteVarFile the input file \"%s\" is not open for reading", file_name.c_str());
-    exec_terminate_with_return(-1, __FILE__, __LINE__, string);
-
-    return NULL;
+std::string	Trick::MonteVarFile::get_next_value()	{
+				//	Open	the	file	and	seek	to	the	previous	position.
+				input_file_stream->open(file_name.c_str(),	std::ifstream::in);
+				input_file_stream->seekg(stream_position);
+
+				if	(input_file_stream->good())	{
+								std::string	line;
+								//	Skip	the	comments	and	empty	lines	in	the	data	file.
+								do	{
+												std::getline(*input_file_stream,	line);
+
+												if(input_file_stream->eof())	{
+																if	(line.empty())	{
+																				input_file_stream->close();
+																				return	"EOF";
+																}	else	{
+																				input_file_stream->seekg(0,	input_file_stream->end);
+																}
+												}
+								}
+								while(line[0]	==	'#'	||	line[0]	==	'\0');
+
+								//	Store	the	current	stream	position	and	close	the	file.
+								stream_position	=	input_file_stream->tellg();
+								input_file_stream->close();
+
+								//	Count	the	number	of	columns	in	the	input	file.
+								char	*token;
+								unsigned	int	ntokens	=	0;
+								char*	temp_str	=	strdup(line.c_str());
+								token	=	strtok(temp_str,	"	\t");
+								while	(token	!=	NULL)	{
+												token	=	strtok(NULL,	"	\t");
+												ntokens++;
+								}
+
+								//	Verify	the	input	column	number	is	valid.
+								if	((column	==	0)	||	(column	>	ntokens))	{
+												char	string[100];
+												snprintf(string,	sizeof(string),	"Trick:MonteVarFile	An	invalid	column	number	%u,	valid	column	numbers	are	1	-	%u",	column,	ntokens);
+												exec_terminate_with_return(-1,	__FILE__,	__LINE__,	string);
+								}
+
+								//	Get	the	next	value.
+								if(temp_str)	{
+												free(temp_str);
+								}
+								temp_str	=	strdup(line.c_str());
+								token	=	strtok(temp_str,	"	\t");
+
+								for(unsigned	int	i	=	1;	i	<	column;	i++)	{
+												//	Iterate	through	each	token	in	the	temp_str.
+												if(token	!=	NULL)
+																token	=	strtok(NULL,	"	\t");
+								}
+
+								//	Return	the	value	as	a	string.
+								value	=	token;
+								std::stringstream	ss;
+
+								if(unit.empty())
+												ss	<<	name	<<	"	=	"	<<	token;
+								else
+												ss	<<	name	<<	"	=	"	<<	"trick.attach_units(\""	<<	unit	<<	"\",	"	<<	token	<<	")";
+								if(temp_str)	{
+												free(temp_str);
+												temp_str	=	nullptr;
+								}
+								return	ss.str();
+
+				}
+				char	string[100];
+				snprintf(string,	sizeof(string),	"Trick:MonteVarFile	the	input	file	\"%s\"	is	not	open	for	reading",	file_name.c_str());
+				exec_terminate_with_return(-1,	__FILE__,	__LINE__,	string);
+
+				return	NULL;
 }
 
-void Trick::MonteVarFile::set_file_name(std::string in_file_name) {
-    delete input_file_stream;
+void	Trick::MonteVarFile::set_file_name(std::string	in_file_name)	{
+				delete	input_file_stream;
 
-    input_file_stream = new std::ifstream(in_file_name.c_str(), std::ifstream::in);
-    if (input_file_stream->fail()) {
-        std::stringstream string_stream;
+				input_file_stream	=	new	std::ifstream(in_file_name.c_str(),	std::ifstream::in);
+				if	(input_file_stream->fail())	{
+								std::stringstream	string_stream;
 
-        string_stream << "Error: " << strerror(errno) << std::endl
-                      << "       Trick:MonteVarFile input file \"" << in_file_name << "\" failed to open";
+								string_stream	<<	"Error:	"	<<	strerror(errno)	<<	std::endl
+																						<<	"							Trick:MonteVarFile	input	file	\""	<<	in_file_name	<<	"\"	failed	to	open";
 
-        exec_terminate_with_return(-1, __FILE__, __LINE__, string_stream.str().c_str());
-    }
-    input_file_stream->close();
-    file_name = in_file_name;
+								exec_terminate_with_return(-1,	__FILE__,	__LINE__,	string_stream.str().c_str());
+				}
+				input_file_stream->close();
+				file_name	=	in_file_name;
 }
 
-void Trick::MonteVarFile::set_column(unsigned int in_column) {
-    column = in_column;
+void	Trick::MonteVarFile::set_column(unsigned	int	in_column)	{
+				column	=	in_column;
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp
index 7b927c0de..1a33a6707 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarFixed.cpp
@@ -1,40 +1,40 @@
-#include <sstream>
-#include <iomanip>
+#include	<sstream>
+#include	<iomanip>
 
-#include "trick/MonteVarFixed.hh"
+#include	"trick/MonteVarFixed.hh"
 
-Trick::MonteVarFixed::MonteVarFixed(std::string in_name, double in_value, std::string in_unit) {
-    this->name = in_name;
-    set_value(in_value);
-    this->unit = in_unit;
+Trick::MonteVarFixed::MonteVarFixed(std::string	in_name,	double	in_value,	std::string	in_unit)	{
+				this->name	=	in_name;
+				set_value(in_value);
+				this->unit	=	in_unit;
 }
 
-// Composite the various properties of this MonteVarFixed.
-std::string Trick::MonteVarFixed::describe_variable()
+//	Composite	the	various	properties	of	this	MonteVarFixed.
+std::string	Trick::MonteVarFixed::describe_variable()
 {
-    std::stringstream ss;
+				std::stringstream	ss;
 
-    ss << "#NAME:\t\t" << this->name << "\n"
-       << "#TYPE:\t\tFIXED\n" 
-       << "#UNIT:\t\t" << this->unit << "\n"
-       << "#VALUE:\t\t" << this->value << "\n";
+				ss	<<	"#NAME:\t\t"	<<	this->name	<<	"\n"
+							<<	"#TYPE:\t\tFIXED\n"	
+							<<	"#UNIT:\t\t"	<<	this->unit	<<	"\n"
+							<<	"#VALUE:\t\t"	<<	this->value	<<	"\n";
 
-    return ss.str();
+				return	ss.str();
 }
 
-void Trick::MonteVarFixed::set_value(double in_value) {
-    std::ostringstream string_stream;
-    string_stream << std::setprecision(15) << in_value ;
-    this->value = string_stream.str();
+void	Trick::MonteVarFixed::set_value(double	in_value)	{
+				std::ostringstream	string_stream;
+				string_stream	<<	std::setprecision(15)	<<	in_value	;
+				this->value	=	string_stream.str();
 }
 
-std::string Trick::MonteVarFixed::get_next_value() {
-    std::ostringstream string_stream;
-    if (unit.empty()) {
-        string_stream << name << " = " << value;
-    }
-    else {
-        string_stream << name << " = trick.attach_units(\"" << unit << "\", " << value << ")";
-    }
-    return string_stream.str();
+std::string	Trick::MonteVarFixed::get_next_value()	{
+				std::ostringstream	string_stream;
+				if	(unit.empty())	{
+								string_stream	<<	name	<<	"	=	"	<<	value;
+				}
+				else	{
+								string_stream	<<	name	<<	"	=	trick.attach_units(\""	<<	unit	<<	"\",	"	<<	value	<<	")";
+				}
+				return	string_stream.str();
 }
diff --git a/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
index 3c36f07af..c5bd87f32 100644
--- a/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
+++ b/trick_source/sim_services/MonteCarlo/MonteVarRandom.cpp
@@ -1,246 +1,246 @@
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
-#include <cmath>
-#include <limits>
-
-#include "trick/MonteVar.hh"
-#include "trick/MonteVarRandom.hh"
-#include "trick/exec_proto.h"
-
-Trick::MonteVarRandom::MonteVarRandom(std::string in_name, Distribution in_distribution, std::string in_unit, StlEngine in_engine) : engineType(in_engine), randist(), stlGenPtr(0) {
-    this->name = in_name;
-    this->distribution = in_distribution;
-    this->unit = in_unit;
-
-    // perform this init in all cases, in case fall back to Trick-coded distributions
-    trick_gsl_rand_init(&randist);
-
-    if (NO_ENGINE != engineType) {
-        // minimum set of randist defaults when using C++11 distributions
-        randist.mu = 0.0;
-        randist.sigma = 1.0;
-        randist.max = std::numeric_limits<double>::max();
-        randist.min = - randist.max;
-        randist.rel_min = 1;
-        randist.rel_max = 1;
-        randist.sigma_range = 0.0;
-    }
-    randist.type = (TRICK_GSL_TYPE) distribution;
-    randist.sigma_range = 1;
-
-#if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM))
-    unsigned long seed = randist.seed;
-    double unused = 0.0;
-    StlRandomGenerator::StlDistribution stlDist =
-        static_cast<StlRandomGenerator::StlDistribution>(distribution);
-    StlRandomGenerator::StlEngine stlEngine =
-        static_cast<StlRandomGenerator::StlEngine>(engineType);
-    if (engineType != NO_ENGINE) {
-        // note: in practice, these will have to be changed by calling set_mu, etc,
-        // in the input file after construction.
-
-        switch (randist.type) {
-        case GAUSSIAN:
-            stlGenPtr = StlRandomGeneratorFactory::newGenerator(randist.mu, randist.sigma,
-                        seed, stlDist, stlEngine);
-            break;
-        case FLAT:
-            // StlRandomGenerator min,max are always absolute
-            stlGenPtr = StlRandomGeneratorFactory::newGenerator(
-                        get_absolute_min(), get_absolute_max(),
-                        seed, stlDist, stlEngine);
-            break;
-        case POISSON:
-            stlGenPtr = StlRandomGeneratorFactory::newGenerator(randist.mu, unused,
-                        seed, stlDist, stlEngine);
-            break;
-        default:
-            break;
-        }
-    }
+#include	<iostream>
+#include	<sstream>
+#include	<stdio.h>
+#include	<cmath>
+#include	<limits>
+
+#include	"trick/MonteVar.hh"
+#include	"trick/MonteVarRandom.hh"
+#include	"trick/exec_proto.h"
+
+Trick::MonteVarRandom::MonteVarRandom(std::string	in_name,	Distribution	in_distribution,	std::string	in_unit,	StlEngine	in_engine)	:	engineType(in_engine),	randist(),	stlGenPtr(0)	{
+				this->name	=	in_name;
+				this->distribution	=	in_distribution;
+				this->unit	=	in_unit;
+
+				//	perform	this	init	in	all	cases,	in	case	fall	back	to	Trick-coded	distributions
+				trick_gsl_rand_init(&randist);
+
+				if	(NO_ENGINE	!=	engineType)	{
+								//	minimum	set	of	randist	defaults	when	using	C++11	distributions
+								randist.mu	=	0.0;
+								randist.sigma	=	1.0;
+								randist.max	=	std::numeric_limits<double>::max();
+								randist.min	=	-	randist.max;
+								randist.rel_min	=	1;
+								randist.rel_max	=	1;
+								randist.sigma_range	=	0.0;
+				}
+				randist.type	=	(TRICK_GSL_TYPE)	distribution;
+				randist.sigma_range	=	1;
+
+#if	(defined(_HAVE_TR1_RANDOM)	||	defined(_HAVE_STL_RANDOM))
+				unsigned	long	seed	=	randist.seed;
+				double	unused	=	0.0;
+				StlRandomGenerator::StlDistribution	stlDist	=
+								static_cast<StlRandomGenerator::StlDistribution>(distribution);
+				StlRandomGenerator::StlEngine	stlEngine	=
+								static_cast<StlRandomGenerator::StlEngine>(engineType);
+				if	(engineType	!=	NO_ENGINE)	{
+								//	note:	in	practice,	these	will	have	to	be	changed	by	calling	set_mu,	etc,
+								//	in	the	input	file	after	construction.
+
+								switch	(randist.type)	{
+								case	GAUSSIAN:
+												stlGenPtr	=	StlRandomGeneratorFactory::newGenerator(randist.mu,	randist.sigma,
+																								seed,	stlDist,	stlEngine);
+												break;
+								case	FLAT:
+												//	StlRandomGenerator	min,max	are	always	absolute
+												stlGenPtr	=	StlRandomGeneratorFactory::newGenerator(
+																								get_absolute_min(),	get_absolute_max(),
+																								seed,	stlDist,	stlEngine);
+												break;
+								case	POISSON:
+												stlGenPtr	=	StlRandomGeneratorFactory::newGenerator(randist.mu,	unused,
+																								seed,	stlDist,	stlEngine);
+												break;
+								default:
+												break;
+								}
+				}
 #endif
 }
 
 Trick::MonteVarRandom::~MonteVarRandom()
 {
-    delete stlGenPtr;
+				delete	stlGenPtr;
 }
 
-// Composite the various properties of this MonteVarRandom.
-std::string Trick::MonteVarRandom::describe_variable()
+//	Composite	the	various	properties	of	this	MonteVarRandom.
+std::string	Trick::MonteVarRandom::describe_variable()
 {
-    std::string dist_list[] = {"GAUSSIAN", "FLAT", "POISSON"};
-    std::stringstream ss;
-
-    ss << "#NAME:\t\t\t" << this->name << "\n"
-       << "#TYPE:\t\t\tRANDOM\n" 
-       << "#UNIT:\t\t\t" << this->unit << "\n"
-       << "#DISTRIBUTION:\t" << dist_list[this->randist.type] << "\n"
-       << "#SEED:\t\t\t" << this->randist.seed << "\n"
-       << "#SIGMA:\t\t\t" << this->randist.sigma << "\n"
-       << "#MU:\t\t\t" << this->randist.mu << "\n"
-       << "#MIN:\t\t\t" << this->randist.min << "\n"
-       << "#MAX:\t\t\t" << this->randist.max << "\n"
-       << "#REL_MIN:\t\t" << this->randist.rel_min << "\n"
-       << "#REL_MAX:\t\t" << this->randist.rel_max << "\n";
-
-    return ss.str();
+				std::string	dist_list[]	=	{"GAUSSIAN",	"FLAT",	"POISSON"};
+				std::stringstream	ss;
+
+				ss	<<	"#NAME:\t\t\t"	<<	this->name	<<	"\n"
+							<<	"#TYPE:\t\t\tRANDOM\n"	
+							<<	"#UNIT:\t\t\t"	<<	this->unit	<<	"\n"
+							<<	"#DISTRIBUTION:\t"	<<	dist_list[this->randist.type]	<<	"\n"
+							<<	"#SEED:\t\t\t"	<<	this->randist.seed	<<	"\n"
+							<<	"#SIGMA:\t\t\t"	<<	this->randist.sigma	<<	"\n"
+							<<	"#MU:\t\t\t"	<<	this->randist.mu	<<	"\n"
+							<<	"#MIN:\t\t\t"	<<	this->randist.min	<<	"\n"
+							<<	"#MAX:\t\t\t"	<<	this->randist.max	<<	"\n"
+							<<	"#REL_MIN:\t\t"	<<	this->randist.rel_min	<<	"\n"
+							<<	"#REL_MAX:\t\t"	<<	this->randist.rel_max	<<	"\n";
+
+				return	ss.str();
 }
 
-void Trick::MonteVarRandom::set_seed(unsigned long seed) {
-    randist.seed = seed;
-    if (engineType != NO_ENGINE && stlGenPtr) {
-        stlGenPtr->set_seed(seed);
-    } else {
-        trick_gsl_rand_seed(&randist);
-    }
+void	Trick::MonteVarRandom::set_seed(unsigned	long	seed)	{
+				randist.seed	=	seed;
+				if	(engineType	!=	NO_ENGINE	&&	stlGenPtr)	{
+								stlGenPtr->set_seed(seed);
+				}	else	{
+								trick_gsl_rand_seed(&randist);
+				}
 }
 
-void Trick::MonteVarRandom::set_sigma(double sigma) {
-    if (engineType != NO_ENGINE && TRICK_GSL_GAUSS == randist.type && stlGenPtr) {
-        randist.sigma = sigma;
-        updateStlRandom();
-    } else {
-        randist.sigma = sigma;
-    }
+void	Trick::MonteVarRandom::set_sigma(double	sigma)	{
+				if	(engineType	!=	NO_ENGINE	&&	TRICK_GSL_GAUSS	==	randist.type	&&	stlGenPtr)	{
+								randist.sigma	=	sigma;
+								updateStlRandom();
+				}	else	{
+								randist.sigma	=	sigma;
+				}
 }
 
-void Trick::MonteVarRandom::set_sigma_range(int sigma_range) {
-    randist.sigma_range = sigma_range;
+void	Trick::MonteVarRandom::set_sigma_range(int	sigma_range)	{
+				randist.sigma_range	=	sigma_range;
 }
 
-void Trick::MonteVarRandom::set_mu(double mu) {
-    if (engineType != NO_ENGINE && stlGenPtr) {
-        randist.mu = mu;
-        updateStlRandom();
-    } else {
-        randist.mu = mu;
-    }
+void	Trick::MonteVarRandom::set_mu(double	mu)	{
+				if	(engineType	!=	NO_ENGINE	&&	stlGenPtr)	{
+								randist.mu	=	mu;
+								updateStlRandom();
+				}	else	{
+								randist.mu	=	mu;
+				}
 }
 
-void Trick::MonteVarRandom::set_min(double min) {
-    if (engineType != NO_ENGINE && stlGenPtr) {
-        randist.min = min;
-        updateStlRandom();
-    } else {
-        randist.min = min;
-    }
+void	Trick::MonteVarRandom::set_min(double	min)	{
+				if	(engineType	!=	NO_ENGINE	&&	stlGenPtr)	{
+								randist.min	=	min;
+								updateStlRandom();
+				}	else	{
+								randist.min	=	min;
+				}
 }
 
-void Trick::MonteVarRandom::set_max(double max) {
-    if (engineType != NO_ENGINE && stlGenPtr) {
-        randist.max = max;
-        updateStlRandom();
-    } else {
-        randist.max = max;
-    }
+void	Trick::MonteVarRandom::set_max(double	max)	{
+				if	(engineType	!=	NO_ENGINE	&&	stlGenPtr)	{
+								randist.max	=	max;
+								updateStlRandom();
+				}	else	{
+								randist.max	=	max;
+				}
 }
 
-void Trick::MonteVarRandom::set_min_is_relative(bool relative) {
-    randist.rel_min = (int)relative;
-    updateStlRandom();
+void	Trick::MonteVarRandom::set_min_is_relative(bool	relative)	{
+				randist.rel_min	=	(int)relative;
+				updateStlRandom();
 }
 
-void Trick::MonteVarRandom::set_max_is_relative(bool relative) {
-    randist.rel_max = (int)relative;
-    updateStlRandom();
+void	Trick::MonteVarRandom::set_max_is_relative(bool	relative)	{
+				randist.rel_max	=	(int)relative;
+				updateStlRandom();
 }
 
-void Trick::MonteVarRandom::set_uniform_generator(uniform_generator uniform) {
-    randist.uniform = uniform;
+void	Trick::MonteVarRandom::set_uniform_generator(uniform_generator	uniform)	{
+				randist.uniform	=	uniform;
 }
 
-std::string Trick::MonteVarRandom::get_next_value() {
-    TRICK_GSL_RETURN_TYPE return_value;
-    char buffer[128];
-
-    return_value.d = 0;
-    if (stlGenPtr) {
-        double sigma_range = static_cast<double>(randist.sigma_range) * randist.sigma;
-        double min = get_absolute_min();
-        double max = get_absolute_max();
-
-        unsigned int count = 0;
-        while (count < 100) {
-            return_value = (*stlGenPtr)();
-            count++;
-
-            if (return_value.d < min || return_value.d > max) {
-                continue;
-            } else {
-
-                if (0 == randist.sigma_range // 0== means sigma_range algorithm is turned off
-                    || std::fabs(return_value.d - randist.mu) <= sigma_range) {
-                    break;
-                }
-            }
-        }
-        if (count >= 100) {
-            char string[100];
-            snprintf(string, sizeof(string), "Trick:MonteVarRandom failed to generate a random value for variable \"%s\"\n", name.c_str());
-            exec_terminate_with_return(-1, __FILE__, __LINE__, string);
-        }
-
-    } else {
-        if (trick_gsl_rand(&randist, &return_value) != 0) {
-            char string[100];
-            snprintf(string, sizeof(string), "Trick:MonteVarRandom failed to generate a random value for variable \"%s\"\n", name.c_str());
-            exec_terminate_with_return(-1, __FILE__, __LINE__, string);
-        }
-    }
-
-    switch (randist.type) {
-        case TRICK_GSL_POISSON:
-            // STL returns int, GSL returns unsigned int
-            if (stlGenPtr) {
-                snprintf(buffer, sizeof(buffer), " %d", return_value.ii);
-            } else {
-                snprintf(buffer, sizeof(buffer), " %u", return_value.ui);
-            }
-            value = buffer;
-            break;
-        case TRICK_GSL_GAUSS:
-        case TRICK_GSL_FLAT:
-        default:
-            snprintf(buffer, sizeof(buffer), "%.15g", return_value.d);
-            value = buffer;
-            break;
-    }
-
-    if (unit.empty()) {
-        return name + std::string(" = ") + value ;
-    } else {
-        return name + std::string(" = trick.attach_units(\"") + unit + std::string("\", ")  + value +
-               std::string(")") ;
-    }
+std::string	Trick::MonteVarRandom::get_next_value()	{
+				TRICK_GSL_RETURN_TYPE	return_value;
+				char	buffer[128];
+
+				return_value.d	=	0;
+				if	(stlGenPtr)	{
+								double	sigma_range	=	static_cast<double>(randist.sigma_range)	*	randist.sigma;
+								double	min	=	get_absolute_min();
+								double	max	=	get_absolute_max();
+
+								unsigned	int	count	=	0;
+								while	(count	<	100)	{
+												return_value	=	(*stlGenPtr)();
+												count++;
+
+												if	(return_value.d	<	min	||	return_value.d	>	max)	{
+																continue;
+												}	else	{
+
+																if	(0	==	randist.sigma_range	//	0==	means	sigma_range	algorithm	is	turned	off
+																				||	std::fabs(return_value.d	-	randist.mu)	<=	sigma_range)	{
+																				break;
+																}
+												}
+								}
+								if	(count	>=	100)	{
+												char	string[100];
+												snprintf(string,	sizeof(string),	"Trick:MonteVarRandom	failed	to	generate	a	random	value	for	variable	\"%s\"\n",	name.c_str());
+												exec_terminate_with_return(-1,	__FILE__,	__LINE__,	string);
+								}
+
+				}	else	{
+								if	(trick_gsl_rand(&randist,	&return_value)	!=	0)	{
+												char	string[100];
+												snprintf(string,	sizeof(string),	"Trick:MonteVarRandom	failed	to	generate	a	random	value	for	variable	\"%s\"\n",	name.c_str());
+												exec_terminate_with_return(-1,	__FILE__,	__LINE__,	string);
+								}
+				}
+
+				switch	(randist.type)	{
+								case	TRICK_GSL_POISSON:
+												//	STL	returns	int,	GSL	returns	unsigned	int
+												if	(stlGenPtr)	{
+																snprintf(buffer,	sizeof(buffer),	"	%d",	return_value.ii);
+												}	else	{
+																snprintf(buffer,	sizeof(buffer),	"	%u",	return_value.ui);
+												}
+												value	=	buffer;
+												break;
+								case	TRICK_GSL_GAUSS:
+								case	TRICK_GSL_FLAT:
+								default:
+												snprintf(buffer,	sizeof(buffer),	"%.15g",	return_value.d);
+												value	=	buffer;
+												break;
+				}
+
+				if	(unit.empty())	{
+								return	name	+	std::string("	=	")	+	value	;
+				}	else	{
+								return	name	+	std::string("	=	trick.attach_units(\"")	+	unit	+	std::string("\",	")		+	value	+
+															std::string(")")	;
+				}
 }
 
-///@details Update the full set of STL random settings
-/// (Call after any of the settings: randist.mu .set_min, max, min_is_relative, max_is_relative
-/// are called.)
+///@details	Update	the	full	set	of	STL	random	settings
+///	(Call	after	any	of	the	settings:	randist.mu	.set_min,	max,	min_is_relative,	max_is_relative
+///	are	called.)
 void
-Trick::MonteVarRandom::updateStlRandom() {
-
-    if (stlGenPtr) {
-
-        switch (randist.type) {
-        case GAUSSIAN:
-            stlGenPtr->set_param(randist.mu, randist.sigma);
-            break;
-        case FLAT:
-            // StlRandomGenerator min,max are always absolute
-            stlGenPtr->set_param(get_absolute_min(), get_absolute_max());
-            break;
-        case POISSON:
-            stlGenPtr->set_param(randist.mu);
-            break;
-        default:
-            break;
-        }
-    }
+Trick::MonteVarRandom::updateStlRandom()	{
+
+				if	(stlGenPtr)	{
+
+								switch	(randist.type)	{
+								case	GAUSSIAN:
+												stlGenPtr->set_param(randist.mu,	randist.sigma);
+												break;
+								case	FLAT:
+												//	StlRandomGenerator	min,max	are	always	absolute
+												stlGenPtr->set_param(get_absolute_min(),	get_absolute_max());
+												break;
+								case	POISSON:
+												stlGenPtr->set_param(randist.mu);
+												break;
+								default:
+												break;
+								}
+				}
 }
 
-const TRICK_GSL_RANDIST& Trick::MonteVarRandom::get_random_distribution() {
-    return randist;
+const	TRICK_GSL_RANDIST&	Trick::MonteVarRandom::get_random_distribution()	{
+				return	randist;
 }
diff --git a/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
index 6cc51d0de..7a779e7e9 100644
--- a/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
+++ b/trick_source/sim_services/MonteCarlo/StlRandomGenerator.cpp
@@ -1,15 +1,15 @@
 
-#include <stdexcept>
-#include "trick/StlRandomGenerator.hh"
-
-StlRandomGenerator::StlRandomGenerator(double          in_param_a,
-                                       double          in_param_b,
-                                       unsigned long   in_seed,
-                                       StlDistribution in_dist_type,
-                                       StlEngine       in_engine_type)
-:   initialSeed(in_seed),
-    engineEnum(in_engine_type),
-    distEnum(in_dist_type)
+#include	<stdexcept>
+#include	"trick/StlRandomGenerator.hh"
+
+StlRandomGenerator::StlRandomGenerator(double										in_param_a,
+																																							double										in_param_b,
+																																							unsigned	long			in_seed,
+																																							StlDistribution	in_dist_type,
+																																							StlEngine							in_engine_type)
+:			initialSeed(in_seed),
+				engineEnum(in_engine_type),
+				distEnum(in_dist_type)
 {
 }
 
@@ -18,279 +18,279 @@ StlRandomGenerator::~StlRandomGenerator()
 }
 
 
-///@details return a pointer-to-base-class for a new StlRandomGeneratorSub object
-///         of the input-specified type
+///@details	return	a	pointer-to-base-class	for	a	new	StlRandomGeneratorSub	object
+///									of	the	input-specified	type
 StlRandomGenerator*
 StlRandomGeneratorFactory::newGenerator(
-    double        in_param_a,
-    double        in_param_b,
-    unsigned long in_seed,
-    StlRandomGenerator::StlDistribution in_dist_type,
-    StlRandomGenerator::StlEngine       in_engine_type)
+				double								in_param_a,
+				double								in_param_b,
+				unsigned	long	in_seed,
+				StlRandomGenerator::StlDistribution	in_dist_type,
+				StlRandomGenerator::StlEngine							in_engine_type)
 {
 
-#if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM))
+#if	(defined(_HAVE_TR1_RANDOM)	||	defined(_HAVE_STL_RANDOM))
 
-#ifdef _HAVE_STL_RANDOM
-#define UNIFORM_INT_DIST   std::uniform_int_distribution
-#define UNIFORM_REAL_DIST  std::uniform_real_distribution
-#define TRICK_DEFAULT_ENGINE_CLASS std::mt19937
+#ifdef	_HAVE_STL_RANDOM
+#define	UNIFORM_INT_DIST			std::uniform_int_distribution
+#define	UNIFORM_REAL_DIST		std::uniform_real_distribution
+#define	TRICK_DEFAULT_ENGINE_CLASS	std::mt19937
 #else
-#define UNIFORM_INT_DIST   std::uniform_int
-#define UNIFORM_REAL_DIST  std::uniform_real
-#define TRICK_DEFAULT_ENGINE_CLASS std::ranlux_base_01 // because mt19937 doesnt return within canonical range for GCC 4.4.7
+#define	UNIFORM_INT_DIST			std::uniform_int
+#define	UNIFORM_REAL_DIST		std::uniform_real
+#define	TRICK_DEFAULT_ENGINE_CLASS	std::ranlux_base_01	//	because	mt19937	doesnt	return	within	canonical	range	for	GCC	4.4.7
 #endif
 
-    switch (in_engine_type * 1000 + in_dist_type) {
-
-    // ------------- TRICK_DEFAULT_ENGINE --------------------------------------
-
-    case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< TRICK_DEFAULT_ENGINE_CLASS, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-
-#ifdef _HAVE_TR1_RANDOM
-    // ------------- RANLUX_BASE_01_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- RANLUX_64_BASE_01_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux64_base_01, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
+				switch	(in_engine_type	*	1000	+	in_dist_type)	{
+
+				//	-------------	TRICK_DEFAULT_ENGINE	--------------------------------------
+
+				case	StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	TRICK_DEFAULT_ENGINE_CLASS,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	TRICK_DEFAULT_ENGINE_CLASS,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::TRICK_DEFAULT_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	TRICK_DEFAULT_ENGINE_CLASS,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+
+#ifdef	_HAVE_TR1_RANDOM
+				//	-------------	RANLUX_BASE_01_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux_base_01,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux_base_01,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_BASE_01_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux_base_01,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	RANLUX_64_BASE_01_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux64_base_01,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux64_base_01,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_64_BASE_01_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux64_base_01,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
 
 #else
 
-// std::minstd_rand and mt19937 are not provided for TR1, because GCC 4.4.7 (at least)
-// they return outside the canonical range 0 <= x < 1.
-// This causes an infinite loop in std::normal_distribution
-
-    // ------------- MINSTD_RAND_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MINSTD_RAND_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::minstd_rand, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- MT19937_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MT19937_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-// these engines are all C++11 only
-    // ------------- MT19937_64_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::MT19937_64_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::mt19937_64, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- RANLUX_24_BASE_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- RANLUX_44_BASE_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48_base, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- RANLUX_24_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_24_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux24, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- RANLUX_44_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::RANLUX_44_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::ranlux48, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-
-    // ------------- KNUTH_B_ENGINE ---------------------------------------------
-
-    case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::GAUSSIAN:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, std::normal_distribution<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::FLAT:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, UNIFORM_REAL_DIST<double> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
-    case StlRandomGenerator::KNUTH_B_ENGINE*1000 + StlRandomGenerator::POISSON:
-        return static_cast< StlRandomGenerator* > (
-            new StlRandomGeneratorSub< std::knuth_b, std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES> >
-                (in_param_a, in_param_b, in_seed, in_dist_type, in_engine_type)
-        );
-        break;
+//	std::minstd_rand	and	mt19937	are	not	provided	for	TR1,	because	GCC	4.4.7	(at	least)
+//	they	return	outside	the	canonical	range	0	<=	x	<	1.
+//	This	causes	an	infinite	loop	in	std::normal_distribution
+
+				//	-------------	MINSTD_RAND_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::MINSTD_RAND_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::minstd_rand,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MINSTD_RAND_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::minstd_rand,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MINSTD_RAND_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::minstd_rand,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	MT19937_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::MT19937_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MT19937_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MT19937_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+//	these	engines	are	all	C++11	only
+				//	-------------	MT19937_64_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::MT19937_64_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937_64,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MT19937_64_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937_64,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::MT19937_64_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::mt19937_64,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	RANLUX_24_BASE_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24_base,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24_base,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_24_BASE_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24_base,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	RANLUX_44_BASE_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48_base,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48_base,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_44_BASE_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48_base,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	RANLUX_24_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_24_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_24_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_24_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux24,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	RANLUX_44_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::RANLUX_44_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_44_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::RANLUX_44_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::ranlux48,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+
+				//	-------------	KNUTH_B_ENGINE	---------------------------------------------
+
+				case	StlRandomGenerator::KNUTH_B_ENGINE*1000	+	StlRandomGenerator::GAUSSIAN:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::knuth_b,	std::normal_distribution<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::KNUTH_B_ENGINE*1000	+	StlRandomGenerator::FLAT:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::knuth_b,	UNIFORM_REAL_DIST<double>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
+				case	StlRandomGenerator::KNUTH_B_ENGINE*1000	+	StlRandomGenerator::POISSON:
+								return	static_cast<	StlRandomGenerator*	>	(
+												new	StlRandomGeneratorSub<	std::knuth_b,	std::poisson_distribution<STL_POISSON_TEMPLATE_TYPES>	>
+																(in_param_a,	in_param_b,	in_seed,	in_dist_type,	in_engine_type)
+								);
+								break;
 #endif
 
-    default:
-        throw std::invalid_argument(std::string("error: StlRandomGeneratorFactory::newGenerator called for unimplemented std::random  (engine,distribution) combination."));
-    }
+				default:
+								throw	std::invalid_argument(std::string("error:	StlRandomGeneratorFactory::newGenerator	called	for	unimplemented	std::random		(engine,distribution)	combination."));
+				}
 
 
 #else
-    // without either _HAVE_TR1_RANDOM or _HAVE_STL_RANDOM, return null pointer.
-    return 0; // ???? what was I thinking here      static_cast< StlRandomGenerator* >( 0 );
+				//	without	either	_HAVE_TR1_RANDOM	or	_HAVE_STL_RANDOM,	return	null	pointer.
+				return	0;	//	????	what	was	I	thinking	here						static_cast<	StlRandomGenerator*	>(	0	);
 #endif
 }
diff --git a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_exceptions.cpp b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_exceptions.cpp
index ba84a5b29..254dd813a 100644
--- a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_exceptions.cpp
+++ b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_exceptions.cpp
@@ -1,85 +1,85 @@
 
-#define protected public
+#define	protected	public
 
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
 
-#include "gtest/gtest.h"
-#include "trick/MonteCarlo.hh"
-#include "trick/MonteVar.hh"
-#include "trick/MonteVarFile.hh"
-#include "trick/MonteVarRandom.hh"
-#include "trick/SimObject.hh"
-#include "trick/ExecutiveException.hh"
+#include	"gtest/gtest.h"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/MonteVar.hh"
+#include	"trick/MonteVarFile.hh"
+#include	"trick/MonteVarRandom.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/ExecutiveException.hh"
 
 
-void sig_hand(int sig) ;
-void child_handler(int sig) ;
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-void fpe_sig_handler(int sig) ;
+void	sig_hand(int	sig)	;
+void	child_handler(int	sig)	;
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+void	fpe_sig_handler(int	sig)	;
 #else
-void fpe_sig_handler(int sig, siginfo_t * sip, void *uap) ;
+void	fpe_sig_handler(int	sig,	siginfo_t	*	sip,	void	*uap)	;
 #endif
 
-namespace Trick {
+namespace	Trick	{
 
-class testSimObject : public Trick::SimObject {
-    public:
+class	testSimObject	:	public	Trick::SimObject	{
+				public:
 
-        testSimObject() {}
-} ;
+								testSimObject()	{}
+}	;
 
-class MonteCarloTest : public ::testing::Test {
+class	MonteCarloTest	:	public	::testing::Test	{
 
-    protected:
-        Trick::MonteCarlo exec;
+				protected:
+								Trick::MonteCarlo	exec;
 
-        MonteCarloTest() {}
-        ~MonteCarloTest() {}
-} ;
+								MonteCarloTest()	{}
+								~MonteCarloTest()	{}
+}	;
 
-TEST_F(MonteCarloTest, MonteVarFile_ColException) {
-    bool got_exception = false;
+TEST_F(MonteCarloTest,	MonteVarFile_ColException)	{
+				bool	got_exception	=	false;
 
-    try {
-        Trick::MonteVarFile var("time_to_fire_1", "M_jet_firings_inline", 7) ;
-        var.get_next_value();
-    } catch (Trick::ExecutiveException &e) {
-        std::cout << e.message << std::endl;
-        got_exception = true;
-    }
-    EXPECT_EQ(got_exception, true);
+				try	{
+								Trick::MonteVarFile	var("time_to_fire_1",	"M_jet_firings_inline",	7)	;
+								var.get_next_value();
+				}	catch	(Trick::ExecutiveException	&e)	{
+								std::cout	<<	e.message	<<	std::endl;
+								got_exception	=	true;
+				}
+				EXPECT_EQ(got_exception,	true);
 }
 
-TEST_F(MonteCarloTest, MonteVarFile_BadFileException) {
-    bool got_exception = false;
-
-    try {
-        Trick::MonteVarFile var("time_to_fire_1", "_M_jet_firings_inline", 1) ;
-        var.get_next_value();
-    } catch (Trick::ExecutiveException &e) {
-        std::cout << e.message << std::endl;
-        got_exception = true;
-    }
-    EXPECT_EQ(got_exception, true);
+TEST_F(MonteCarloTest,	MonteVarFile_BadFileException)	{
+				bool	got_exception	=	false;
+
+				try	{
+								Trick::MonteVarFile	var("time_to_fire_1",	"_M_jet_firings_inline",	1)	;
+								var.get_next_value();
+				}	catch	(Trick::ExecutiveException	&e)	{
+								std::cout	<<	e.message	<<	std::endl;
+								got_exception	=	true;
+				}
+				EXPECT_EQ(got_exception,	true);
 }
 
-TEST_F(MonteCarloTest, TestMonteVarRandom_Exception) {
-    bool got_exception = false;
-
-    try {
-        Trick::MonteVarRandom var1("time_to_fire_2", Trick::MonteVarRandom::GAUSSIAN) ;
-        var1.set_mu(4.0) ;
-        var1.set_min(4.0) ;
-        var1.set_max(4.000001) ;
-        exec.add_variable(&var1) ;
-        var1.get_next_value();
-    } catch (Trick::ExecutiveException &e) {
-        std::cout << e.message;
-        got_exception = true;
-    }
-    EXPECT_EQ(got_exception, true);
+TEST_F(MonteCarloTest,	TestMonteVarRandom_Exception)	{
+				bool	got_exception	=	false;
+
+				try	{
+								Trick::MonteVarRandom	var1("time_to_fire_2",	Trick::MonteVarRandom::GAUSSIAN)	;
+								var1.set_mu(4.0)	;
+								var1.set_min(4.0)	;
+								var1.set_max(4.000001)	;
+								exec.add_variable(&var1)	;
+								var1.get_next_value();
+				}	catch	(Trick::ExecutiveException	&e)	{
+								std::cout	<<	e.message;
+								got_exception	=	true;
+				}
+				EXPECT_EQ(got_exception,	true);
 }
 
 }
diff --git a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
index 3a38fee13..623ad7866 100644
--- a/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
+++ b/trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
@@ -1,886 +1,886 @@
 
-#define protected public
-
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
-#include <string>
-#include <sstream>
-#include <cmath>
-
-#include "gtest/gtest.h"
-#include "trick/ExecutiveException.hh"
-#include "trick/Executive.hh"
-#include "trick/MonteCarlo.hh"
-#include "trick/MonteVar.hh"
-#include "trick/MonteVarCalculated.hh"
-#include "trick/MonteVarFile.hh"
-#include "trick/MonteVarFixed.hh"
-#include "trick/MonteVarRandom.hh"
-#include "trick/montecarlo_c_intf.h"
-#include "trick/exec_proto.h"
-#include "trick/exec_proto.hh"
-#include "trick/SimObject.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/rand_generator.h"
-//#include "trick/RequirementScribe.hh"
-
-void sig_hand(int sig) ;
-void child_handler(int sig) ;
-#if (__APPLE__ | __CYGWIN__ | __INTERIX )
-void fpe_sig_handler(int sig) ;
+#define	protected	public
+
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
+#include	<string>
+#include	<sstream>
+#include	<cmath>
+
+#include	"gtest/gtest.h"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/Executive.hh"
+#include	"trick/MonteCarlo.hh"
+#include	"trick/MonteVar.hh"
+#include	"trick/MonteVarCalculated.hh"
+#include	"trick/MonteVarFile.hh"
+#include	"trick/MonteVarFixed.hh"
+#include	"trick/MonteVarRandom.hh"
+#include	"trick/montecarlo_c_intf.h"
+#include	"trick/exec_proto.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/rand_generator.h"
+//#include	"trick/RequirementScribe.hh"
+
+void	sig_hand(int	sig)	;
+void	child_handler(int	sig)	;
+#if	(__APPLE__	|	__CYGWIN__	|	__INTERIX	)
+void	fpe_sig_handler(int	sig)	;
 #else
-void fpe_sig_handler(int sig, siginfo_t * sip, void *uap) ;
+void	fpe_sig_handler(int	sig,	siginfo_t	*	sip,	void	*uap)	;
 #endif
 
-namespace Trick {
+namespace	Trick	{
 
-class testSimObject : public Trick::SimObject {
-    public:
+class	testSimObject	:	public	Trick::SimObject	{
+				public:
 
-        int default_data_1() {
-            return 0 ;
-        }
+								int	default_data_1()	{
+												return	0	;
+								}
 
-        int initialization_1() {
-            return 0 ;
-        }
+								int	initialization_1()	{
+												return	0	;
+								}
 
-        int return_error() {
-            return -1 ;
-        }
+								int	return_error()	{
+												return	-1	;
+								}
 
-        int throw_exception() {
-            return exec_terminate("throw_exception", "exec_terminate called") ;
-        }
+								int	throw_exception()	{
+												return	exec_terminate("throw_exception",	"exec_terminate	called")	;
+								}
 
-        testSimObject() {
-            int ii = 0 ;
-            add_job(0, ii++, "monte_master_init", NULL, 1, "master_init", "TRK") ;
-            add_job(0, ii++, "monte_master_pre", NULL, 1, "master_pre", "TRK") ;
-            add_job(0, ii++, "monte_master_post", NULL, 1, "master_post", "TRK") ;
-            add_job(0, ii++, "monte_master_shutdown", NULL, 1, "master_shutdown", "TRK") ;
-            add_job(0, ii++, "monte_slave_init", NULL, 1, "slave_init", "TRK") ;
-            add_job(0, ii++, "monte_slave_pre", NULL, 1, "slave_pre", "TRK") ;
-            add_job(0, ii++, "monte_slave_post", NULL, 1, "slave_post", "TRK") ;
-            add_job(0, ii++, "monte_slave_shutdown", NULL, 1, "slave_shutdown", "TRK") ;
-        }
+								testSimObject()	{
+												int	ii	=	0	;
+												add_job(0,	ii++,	"monte_master_init",	NULL,	1,	"master_init",	"TRK")	;
+												add_job(0,	ii++,	"monte_master_pre",	NULL,	1,	"master_pre",	"TRK")	;
+												add_job(0,	ii++,	"monte_master_post",	NULL,	1,	"master_post",	"TRK")	;
+												add_job(0,	ii++,	"monte_master_shutdown",	NULL,	1,	"master_shutdown",	"TRK")	;
+												add_job(0,	ii++,	"monte_slave_init",	NULL,	1,	"slave_init",	"TRK")	;
+												add_job(0,	ii++,	"monte_slave_pre",	NULL,	1,	"slave_pre",	"TRK")	;
+												add_job(0,	ii++,	"monte_slave_post",	NULL,	1,	"slave_post",	"TRK")	;
+												add_job(0,	ii++,	"monte_slave_shutdown",	NULL,	1,	"slave_shutdown",	"TRK")	;
+								}
 
-        virtual int call_function( Trick::JobData * curr_job ) ;
-        virtual double call_function_double( Trick::JobData * curr_job ) { (void)curr_job ; return 0.0 ; } ;
-} ;
+								virtual	int	call_function(	Trick::JobData	*	curr_job	)	;
+								virtual	double	call_function_double(	Trick::JobData	*	curr_job	)	{	(void)curr_job	;	return	0.0	;	}	;
+}	;
 
-int testSimObject::call_function( __attribute__((unused)) Trick::JobData * curr_job ) {
-    int trick_ret = 0 ;
+int	testSimObject::call_function(	__attribute__((unused))	Trick::JobData	*	curr_job	)	{
+				int	trick_ret	=	0	;
 
-    return trick_ret ;
-} ;
+				return	trick_ret	;
+}	;
 
-class MonteCarloTest : public ::testing::Test {
+class	MonteCarloTest	:	public	::testing::Test	{
 
-    protected:
-        Trick::MonteCarlo exec;
-        Trick::Executive executive;
-        testSimObject so1 ;
-        //Trick::RequirementScribe req;
-        Trick::MemoryManager mm ;
+				protected:
+								Trick::MonteCarlo	exec;
+								Trick::Executive	executive;
+								testSimObject	so1	;
+								//Trick::RequirementScribe	req;
+								Trick::MemoryManager	mm	;
 
-        MonteCarloTest() { exec_register_scheduler(&exec) ; }
-        ~MonteCarloTest() {  }
-        virtual void SetUp() {}
-        virtual void TearDown() {}
+								MonteCarloTest()	{	exec_register_scheduler(&exec)	;	}
+								~MonteCarloTest()	{		}
+								virtual	void	SetUp()	{}
+								virtual	void	TearDown()	{}
 
-        int get_class_map_value(std::string job_class) { return exec.class_map[job_class] ; }
-        Trick::ScheduledJobQueue * get_master_init_queue() { return &exec.master_init_queue ; }
-        Trick::ScheduledJobQueue * get_master_pre_queue() { return &exec.master_pre_queue ; }
-        Trick::ScheduledJobQueue * get_master_post_queue() { return &exec.master_post_queue ; }
-        Trick::ScheduledJobQueue * get_master_shutdown_queue() { return &exec.master_shutdown_queue ; }
-        Trick::ScheduledJobQueue * get_slave_init_queue() { return &exec.slave_init_queue ; }
-        Trick::ScheduledJobQueue * get_slave_pre_queue() { return &exec.slave_pre_queue ; }
-        Trick::ScheduledJobQueue * get_slave_post_queue() { return &exec.slave_post_queue ; }
-        Trick::ScheduledJobQueue * get_slave_shutdown_queue() { return &exec.slave_shutdown_queue ; }
-} ;
+								int	get_class_map_value(std::string	job_class)	{	return	exec.class_map[job_class]	;	}
+								Trick::ScheduledJobQueue	*	get_master_init_queue()	{	return	&exec.master_init_queue	;	}
+								Trick::ScheduledJobQueue	*	get_master_pre_queue()	{	return	&exec.master_pre_queue	;	}
+								Trick::ScheduledJobQueue	*	get_master_post_queue()	{	return	&exec.master_post_queue	;	}
+								Trick::ScheduledJobQueue	*	get_master_shutdown_queue()	{	return	&exec.master_shutdown_queue	;	}
+								Trick::ScheduledJobQueue	*	get_slave_init_queue()	{	return	&exec.slave_init_queue	;	}
+								Trick::ScheduledJobQueue	*	get_slave_pre_queue()	{	return	&exec.slave_pre_queue	;	}
+								Trick::ScheduledJobQueue	*	get_slave_post_queue()	{	return	&exec.slave_post_queue	;	}
+								Trick::ScheduledJobQueue	*	get_slave_shutdown_queue()	{	return	&exec.slave_shutdown_queue	;	}
+}	;
 
-TEST_F(MonteCarloTest , Job_Queue_Master_Init) {
-    //req.add_requirement("722132127");
+TEST_F(MonteCarloTest	,	Job_Queue_Master_Init)	{
+				//req.add_requirement("722132127");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_master_init_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.master_init") ;
+				curr_job	=	get_master_init_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.master_init")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Master_Pre) {
-    //req.add_requirement("587551115");
+TEST_F(MonteCarloTest	,	Job_Queue_Master_Pre)	{
+				//req.add_requirement("587551115");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_master_pre_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.master_pre") ;
+				curr_job	=	get_master_pre_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.master_pre")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Master_Post) {
-    //req.add_requirement("4165308678");
+TEST_F(MonteCarloTest	,	Job_Queue_Master_Post)	{
+				//req.add_requirement("4165308678");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_master_post_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.master_post") ;
+				curr_job	=	get_master_post_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.master_post")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Master_Shutdown) {
-    //req.add_requirement("3461634900");
+TEST_F(MonteCarloTest	,	Job_Queue_Master_Shutdown)	{
+				//req.add_requirement("3461634900");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_master_shutdown_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.master_shutdown") ;
+				curr_job	=	get_master_shutdown_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.master_shutdown")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Slave_Init) {
-    //req.add_requirement("1412318284");
+TEST_F(MonteCarloTest	,	Job_Queue_Slave_Init)	{
+				//req.add_requirement("1412318284");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_slave_init_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.slave_init") ;
+				curr_job	=	get_slave_init_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.slave_init")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Slave_Pre) {
-    //req.add_requirement("3301658297");
+TEST_F(MonteCarloTest	,	Job_Queue_Slave_Pre)	{
+				//req.add_requirement("3301658297");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_slave_pre_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.slave_pre") ;
+				curr_job	=	get_slave_pre_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.slave_pre")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Slave_Post) {
-    //req.add_requirement("3882184138");
+TEST_F(MonteCarloTest	,	Job_Queue_Slave_Post)	{
+				//req.add_requirement("3882184138");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_slave_post_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.slave_post") ;
+				curr_job	=	get_slave_post_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.slave_post")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Job_Queue_Slave_Shutdown) {
-    //req.add_requirement("350185460");
+TEST_F(MonteCarloTest	,	Job_Queue_Slave_Shutdown)	{
+				//req.add_requirement("350185460");
 
-    Trick::JobData * curr_job ;
+				Trick::JobData	*	curr_job	;
 
-    EXPECT_EQ(exec_get_time_tic_value() , 1000000) ;
+				EXPECT_EQ(exec_get_time_tic_value()	,	1000000)	;
 
-    exec_add_sim_object(&so1 , "so1") ;
+				exec_add_sim_object(&so1	,	"so1")	;
 
-    curr_job = get_slave_shutdown_queue()->get_next_job() ;
-    ASSERT_FALSE( curr_job == NULL ) ;
-    EXPECT_STREQ( curr_job->name.c_str() , "so1.slave_shutdown") ;
+				curr_job	=	get_slave_shutdown_queue()->get_next_job()	;
+				ASSERT_FALSE(	curr_job	==	NULL	)	;
+				EXPECT_STREQ(	curr_job->name.c_str()	,	"so1.slave_shutdown")	;
 
-    EXPECT_TRUE(executive.check_all_jobs_handled() == 0 ) ;
+				EXPECT_TRUE(executive.check_all_jobs_handled()	==	0	)	;
 }
 
-TEST_F(MonteCarloTest , Good_Initialization) {
-    //req.add_requirement("1452306647");
+TEST_F(MonteCarloTest	,	Good_Initialization)	{
+				//req.add_requirement("1452306647");
 
-    exec_add_sim_object(&so1 , "so1") ;
-    EXPECT_EQ(exec.execute_monte() , 0 ) ;
+				exec_add_sim_object(&so1	,	"so1")	;
+				EXPECT_EQ(exec.execute_monte()	,	0	)	;
 }
 
-TEST_F(MonteCarloTest , TestDefaultValues) {
+TEST_F(MonteCarloTest	,	TestDefaultValues)	{
 
-    EXPECT_EQ(exec.get_enabled(), false) ;
-    EXPECT_EQ(exec.get_dry_run(), false) ;
-    EXPECT_EQ(exec.get_localhost_as_remote(), false) ;
-    EXPECT_EQ(exec.get_custom_slave_dispatch(), false) ;
-    EXPECT_EQ(exec.get_timeout(), 120) ;
-    EXPECT_EQ(exec.get_max_tries(), 2) ;
-    EXPECT_EQ(exec.get_verbosity(), exec.MC_INFORMATIONAL) ;
-    EXPECT_EQ(exec.get_num_runs(), 0) ;
-    EXPECT_EQ(exec.get_slave_id(), 0) ;
-    EXPECT_EQ(exec.actual_num_runs, 0) ;
-    EXPECT_EQ(exec.num_results, 0) ;
+				EXPECT_EQ(exec.get_enabled(),	false)	;
+				EXPECT_EQ(exec.get_dry_run(),	false)	;
+				EXPECT_EQ(exec.get_localhost_as_remote(),	false)	;
+				EXPECT_EQ(exec.get_custom_slave_dispatch(),	false)	;
+				EXPECT_EQ(exec.get_timeout(),	120)	;
+				EXPECT_EQ(exec.get_max_tries(),	2)	;
+				EXPECT_EQ(exec.get_verbosity(),	exec.MC_INFORMATIONAL)	;
+				EXPECT_EQ(exec.get_num_runs(),	0)	;
+				EXPECT_EQ(exec.get_slave_id(),	0)	;
+				EXPECT_EQ(exec.actual_num_runs,	0)	;
+				EXPECT_EQ(exec.num_results,	0)	;
 
 }
 
-TEST_F(MonteCarloTest, TestSettingValues) {
-    //req.add_requirement("2840823120");
-
-    exec.set_enabled(true) ;
-    EXPECT_EQ(exec.get_enabled(), true) ;
-    exec.set_dry_run(true) ;
-    EXPECT_EQ(exec.get_dry_run(), true) ;
-    exec.set_localhost_as_remote(true) ;
-    EXPECT_EQ(exec.get_localhost_as_remote(), true) ;
-    exec.set_custom_slave_dispatch(true) ;
-    EXPECT_EQ(exec.get_custom_slave_dispatch(), true) ;
-    exec.set_timeout(60) ;
-    EXPECT_EQ(exec.get_timeout(), 60) ;
-    exec.set_max_tries(4) ;
-    EXPECT_EQ(exec.get_max_tries(), 4) ;
-    exec.set_verbosity(exec.MC_NONE) ;
-    EXPECT_EQ(exec.get_verbosity(), exec.MC_NONE) ;
-    exec.set_verbosity(exec.MC_ERROR) ;
-    EXPECT_EQ(exec.get_verbosity(), exec.MC_ERROR) ;
-    exec.set_verbosity(exec.MC_INFORMATIONAL) ;
-    EXPECT_EQ(exec.get_verbosity(), exec.MC_INFORMATIONAL) ;
-    exec.set_verbosity(exec.MC_ALL) ;
-    EXPECT_EQ(exec.get_verbosity(), exec.MC_ALL) ;
+TEST_F(MonteCarloTest,	TestSettingValues)	{
+				//req.add_requirement("2840823120");
+
+				exec.set_enabled(true)	;
+				EXPECT_EQ(exec.get_enabled(),	true)	;
+				exec.set_dry_run(true)	;
+				EXPECT_EQ(exec.get_dry_run(),	true)	;
+				exec.set_localhost_as_remote(true)	;
+				EXPECT_EQ(exec.get_localhost_as_remote(),	true)	;
+				exec.set_custom_slave_dispatch(true)	;
+				EXPECT_EQ(exec.get_custom_slave_dispatch(),	true)	;
+				exec.set_timeout(60)	;
+				EXPECT_EQ(exec.get_timeout(),	60)	;
+				exec.set_max_tries(4)	;
+				EXPECT_EQ(exec.get_max_tries(),	4)	;
+				exec.set_verbosity(exec.MC_NONE)	;
+				EXPECT_EQ(exec.get_verbosity(),	exec.MC_NONE)	;
+				exec.set_verbosity(exec.MC_ERROR)	;
+				EXPECT_EQ(exec.get_verbosity(),	exec.MC_ERROR)	;
+				exec.set_verbosity(exec.MC_INFORMATIONAL)	;
+				EXPECT_EQ(exec.get_verbosity(),	exec.MC_INFORMATIONAL)	;
+				exec.set_verbosity(exec.MC_ALL)	;
+				EXPECT_EQ(exec.get_verbosity(),	exec.MC_ALL)	;
 
 }
 
-TEST_F(MonteCarloTest, TestRanges) {
-    exec.set_num_runs(25) ;
-    EXPECT_EQ(exec.get_num_runs(), 25) ;
-    EXPECT_EQ(exec.actual_num_runs, 25) ;
-    exec.add_range(3, 5) ;
-    EXPECT_EQ(exec.actual_num_runs, 3) ;
-    exec.add_range(20) ;
-    EXPECT_EQ(exec.actual_num_runs, 4) ;
-    EXPECT_EQ(exec.in_range(exec.runs[3]) , true) ;
-    EXPECT_EQ(exec.in_range(exec.runs[10]), false) ;
+TEST_F(MonteCarloTest,	TestRanges)	{
+				exec.set_num_runs(25)	;
+				EXPECT_EQ(exec.get_num_runs(),	25)	;
+				EXPECT_EQ(exec.actual_num_runs,	25)	;
+				exec.add_range(3,	5)	;
+				EXPECT_EQ(exec.actual_num_runs,	3)	;
+				exec.add_range(20)	;
+				EXPECT_EQ(exec.actual_num_runs,	4)	;
+				EXPECT_EQ(exec.in_range(exec.runs[3])	,	true)	;
+				EXPECT_EQ(exec.in_range(exec.runs[10]),	false)	;
 }
 
-TEST_F(MonteCarloTest, TestSlaves) {
-    //req.add_requirement("1098748189");
-
-    Trick::MonteSlave slave0("localhost") ;
-    Trick::MonteSlave slave1("WonderWoman") ;
-    EXPECT_EQ(exec.slaves.empty(), true) ;
-    EXPECT_EQ(exec.get_slave_index(1), -1) ;
-    exec.add_slave(&slave0) ;
-    EXPECT_EQ(exec.slaves.empty(), false) ;
-    EXPECT_EQ(exec.slaves.size(), 1) ;
-    exec.add_slave(&slave1) ;
-    EXPECT_EQ(exec.slaves.size(), 2) ;
-    EXPECT_EQ(slave0.id, 1) ;
-    EXPECT_EQ(slave1.id, 2) ;
-    EXPECT_EQ(exec.get_slave_index(1), 0) ;
-    EXPECT_EQ(exec.get_slave_index(2), 1) ;
-    EXPECT_EQ(slave0.state, Trick::MonteSlave::MC_UNINITIALIZED) ;
-    EXPECT_EQ(slave1.state, Trick::MonteSlave::MC_UNINITIALIZED) ;
-    exec.disable_slave("WonderWoman", true) ;
-    EXPECT_EQ(slave1.state, Trick::MonteSlave::MC_STOPPED) ;
-    EXPECT_EQ(exec.slaves.size(), 2) ;
-    exec.disable_slave("WonderWoman", false) ;
-    EXPECT_EQ(slave1.state, Trick::MonteSlave::MC_UNINITIALIZED) ;
-    EXPECT_EQ(slave0.machine_name, "localhost") ;
-    EXPECT_EQ(slave1.machine_name, "WonderWoman") ;
+TEST_F(MonteCarloTest,	TestSlaves)	{
+				//req.add_requirement("1098748189");
+
+				Trick::MonteSlave	slave0("localhost")	;
+				Trick::MonteSlave	slave1("WonderWoman")	;
+				EXPECT_EQ(exec.slaves.empty(),	true)	;
+				EXPECT_EQ(exec.get_slave_index(1),	-1)	;
+				exec.add_slave(&slave0)	;
+				EXPECT_EQ(exec.slaves.empty(),	false)	;
+				EXPECT_EQ(exec.slaves.size(),	1)	;
+				exec.add_slave(&slave1)	;
+				EXPECT_EQ(exec.slaves.size(),	2)	;
+				EXPECT_EQ(slave0.id,	1)	;
+				EXPECT_EQ(slave1.id,	2)	;
+				EXPECT_EQ(exec.get_slave_index(1),	0)	;
+				EXPECT_EQ(exec.get_slave_index(2),	1)	;
+				EXPECT_EQ(slave0.state,	Trick::MonteSlave::MC_UNINITIALIZED)	;
+				EXPECT_EQ(slave1.state,	Trick::MonteSlave::MC_UNINITIALIZED)	;
+				exec.disable_slave("WonderWoman",	true)	;
+				EXPECT_EQ(slave1.state,	Trick::MonteSlave::MC_STOPPED)	;
+				EXPECT_EQ(exec.slaves.size(),	2)	;
+				exec.disable_slave("WonderWoman",	false)	;
+				EXPECT_EQ(slave1.state,	Trick::MonteSlave::MC_UNINITIALIZED)	;
+				EXPECT_EQ(slave0.machine_name,	"localhost")	;
+				EXPECT_EQ(slave1.machine_name,	"WonderWoman")	;
 }
 
-TEST_F(MonteCarloTest, MonteVarFile) {
-    //req.add_requirement("3932595803");
+TEST_F(MonteCarloTest,	MonteVarFile)	{
+				//req.add_requirement("3932595803");
 
-    // Test MonteVarFile
-    Trick::MonteVarFile var0("time_to_fire_1", "M_jet_firings_inline", 2) ;
-    EXPECT_EQ(exec.variables.size(), 0) ;
-    exec.add_variable(&var0) ;
-    EXPECT_EQ(var0.get_next_value(), "time_to_fire_1 = 1.0000") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
+				//	Test	MonteVarFile
+				Trick::MonteVarFile	var0("time_to_fire_1",	"M_jet_firings_inline",	2)	;
+				EXPECT_EQ(exec.variables.size(),	0)	;
+				exec.add_variable(&var0)	;
+				EXPECT_EQ(var0.get_next_value(),	"time_to_fire_1	=	1.0000")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
 }
 
-TEST_F(MonteCarloTest, MonteVarFileWithEOFLine) {
-    Trick::MonteVarFile var0("time_to_fire_1", "MonteCarlo_eof_line", 2) ;
-    EXPECT_EQ(exec.variables.size(), 0) ;
-    exec.add_variable(&var0) ;
-    EXPECT_EQ(var0.get_next_value(), "time_to_fire_1 = 1.0000") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
-    EXPECT_EQ(var0.get_next_value(), "EOF") ;
+TEST_F(MonteCarloTest,	MonteVarFileWithEOFLine)	{
+				Trick::MonteVarFile	var0("time_to_fire_1",	"MonteCarlo_eof_line",	2)	;
+				EXPECT_EQ(exec.variables.size(),	0)	;
+				exec.add_variable(&var0)	;
+				EXPECT_EQ(var0.get_next_value(),	"time_to_fire_1	=	1.0000")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
+				EXPECT_EQ(var0.get_next_value(),	"EOF")	;
 }
 
-TEST_F(MonteCarloTest, MonteVarFileWithLineEndedEOF) {
-    Trick::MonteVarFile var0("time_to_fire_1", "MonteCarlo_line_ended_eof", 2) ;
-    EXPECT_EQ(exec.variables.size(), 0) ;
-    exec.add_variable(&var0) ;
-    EXPECT_EQ(var0.get_next_value(), "time_to_fire_1 = 1.0000") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
-    EXPECT_EQ(var0.get_next_value(), "EOF") ;
+TEST_F(MonteCarloTest,	MonteVarFileWithLineEndedEOF)	{
+				Trick::MonteVarFile	var0("time_to_fire_1",	"MonteCarlo_line_ended_eof",	2)	;
+				EXPECT_EQ(exec.variables.size(),	0)	;
+				exec.add_variable(&var0)	;
+				EXPECT_EQ(var0.get_next_value(),	"time_to_fire_1	=	1.0000")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
+				EXPECT_EQ(var0.get_next_value(),	"EOF")	;
 }
 
-TEST_F(MonteCarloTest, MonteVarRandom_Gaussian) {
-    std::string str;
-    double value;
-    //req.add_requirement("3932595803");
-
-    // Test MonteVarRandom
-    // Gaussian
-    Trick::MonteVarRandom var1("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    var1.set_mu(4.0) ;
-    var1.set_min(-4.0) ;
-    var1.set_max(4.0) ;
-    var1.set_seed(12345);
-    var1.set_sigma_range(0) ;
-    exec.add_variable(&var1) ;
-    var1.get_next_value();
-    str = var1.value;
-
-    std::stringstream sstream(str);
-    sstream >> value;
-
-    EXPECT_LE(value, 8);
-    EXPECT_GE(value, 0);
-
-    EXPECT_EQ(var1.name, "time_to_fire_1") ;
-    EXPECT_EQ(var1.distribution, 0) ;
-    EXPECT_EQ(var1.randist.mu, 4.0) ;
-    EXPECT_EQ(var1.randist.min, -4.0) ;
-    EXPECT_EQ(var1.randist.max, 4.0) ;
-    EXPECT_EQ(var1.unit, "") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
+TEST_F(MonteCarloTest,	MonteVarRandom_Gaussian)	{
+				std::string	str;
+				double	value;
+				//req.add_requirement("3932595803");
+
+				//	Test	MonteVarRandom
+				//	Gaussian
+				Trick::MonteVarRandom	var1("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				var1.set_mu(4.0)	;
+				var1.set_min(-4.0)	;
+				var1.set_max(4.0)	;
+				var1.set_seed(12345);
+				var1.set_sigma_range(0)	;
+				exec.add_variable(&var1)	;
+				var1.get_next_value();
+				str	=	var1.value;
+
+				std::stringstream	sstream(str);
+				sstream	>>	value;
+
+				EXPECT_LE(value,	8);
+				EXPECT_GE(value,	0);
+
+				EXPECT_EQ(var1.name,	"time_to_fire_1")	;
+				EXPECT_EQ(var1.distribution,	0)	;
+				EXPECT_EQ(var1.randist.mu,	4.0)	;
+				EXPECT_EQ(var1.randist.min,	-4.0)	;
+				EXPECT_EQ(var1.randist.max,	4.0)	;
+				EXPECT_EQ(var1.unit,	"")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
 }
 
-TEST_F(MonteCarloTest, MonteVarRandom_Poisson) {
-    std::string str;
-    double value;
-    //req.add_requirement("3932595803");
-
-    // Test MonteVarRandom
-    // Poisson
-    Trick::MonteVarRandom var2("time_to_fire_1", Trick::MonteVarRandom::POISSON, "s") ;
-    var2.set_mu(4.0) ;
-    var2.set_min(-4.0) ;
-    var2.set_max(4.0) ;
-    var2.set_min_is_relative(0);
-    var2.set_max_is_relative(0);
-    var2.set_seed(12345);
-    var2.set_sigma_range(0) ;
-    exec.add_variable(&var2) ;
-    var2.get_next_value();
-    str = var2.value;
-
-    std::stringstream sstream(str);
-    sstream >> value;
-
-#if _HAVE_GSL
-    EXPECT_GE(value, 0);
-    EXPECT_LE(value, 4);
+TEST_F(MonteCarloTest,	MonteVarRandom_Poisson)	{
+				std::string	str;
+				double	value;
+				//req.add_requirement("3932595803");
+
+				//	Test	MonteVarRandom
+				//	Poisson
+				Trick::MonteVarRandom	var2("time_to_fire_1",	Trick::MonteVarRandom::POISSON,	"s")	;
+				var2.set_mu(4.0)	;
+				var2.set_min(-4.0)	;
+				var2.set_max(4.0)	;
+				var2.set_min_is_relative(0);
+				var2.set_max_is_relative(0);
+				var2.set_seed(12345);
+				var2.set_sigma_range(0)	;
+				exec.add_variable(&var2)	;
+				var2.get_next_value();
+				str	=	var2.value;
+
+				std::stringstream	sstream(str);
+				sstream	>>	value;
+
+#if	_HAVE_GSL
+				EXPECT_GE(value,	0);
+				EXPECT_LE(value,	4);
 #else
-    EXPECT_EQ(value, 0);
+				EXPECT_EQ(value,	0);
 #endif
 
-    EXPECT_EQ(var2.name, "time_to_fire_1") ;
-    EXPECT_EQ(var2.distribution, 2) ;
-    EXPECT_EQ(var2.unit, "s") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
+				EXPECT_EQ(var2.name,	"time_to_fire_1")	;
+				EXPECT_EQ(var2.distribution,	2)	;
+				EXPECT_EQ(var2.unit,	"s")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
 }
 
-TEST_F(MonteCarloTest, MonteVarRandom_Flat) {
-    std::string str;
-    double value;
-    //req.add_requirement("3932595803");
-
-    // Test MonteVarRandom
-    // Flat
-    Trick::MonteVarRandom var3("time_to_fire_4", Trick::MonteVarRandom::FLAT) ;
-    var3.set_mu(4.0) ;
-    var3.set_min(-4.0) ;
-    var3.set_max(4.0) ;
-    var3.set_seed(12345);
-    var3.set_sigma_range(0) ;
-    exec.add_variable(&var3) ;
-    var3.get_next_value();
-    str = var3.value;
-
-    std::stringstream sstream(str);
-    sstream >> value;
-
-    EXPECT_GE(value, 0);
-    EXPECT_LE(value, 8);
-
-    EXPECT_EQ(var3.name, "time_to_fire_4") ;
-    EXPECT_EQ(var3.distribution, 1) ;
-    EXPECT_EQ(var3.unit, "") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
+TEST_F(MonteCarloTest,	MonteVarRandom_Flat)	{
+				std::string	str;
+				double	value;
+				//req.add_requirement("3932595803");
+
+				//	Test	MonteVarRandom
+				//	Flat
+				Trick::MonteVarRandom	var3("time_to_fire_4",	Trick::MonteVarRandom::FLAT)	;
+				var3.set_mu(4.0)	;
+				var3.set_min(-4.0)	;
+				var3.set_max(4.0)	;
+				var3.set_seed(12345);
+				var3.set_sigma_range(0)	;
+				exec.add_variable(&var3)	;
+				var3.get_next_value();
+				str	=	var3.value;
+
+				std::stringstream	sstream(str);
+				sstream	>>	value;
+
+				EXPECT_GE(value,	0);
+				EXPECT_LE(value,	8);
+
+				EXPECT_EQ(var3.name,	"time_to_fire_4")	;
+				EXPECT_EQ(var3.distribution,	1)	;
+				EXPECT_EQ(var3.unit,	"")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
 }
 
-TEST_F(MonteCarloTest, MonteVarRandom_NonGSL) {
-    //req.add_requirement("3932595803");
-
-    Trick::MonteVarRandom var4("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    var4.set_mu(4.0) ;
-    var4.set_min(-4.0) ;
-    var4.set_max(4.0) ;
-    var4.set_seed(12345);
-    // for this test, let sigma_range default to 1   var4.set_sigma_range(0) ;
-
-    exec.add_variable(&var4) ;
-    // Test MonteVarRandom
-    // non GSL library variables
-    EXPECT_EQ(var4.randist.uniform, LCG1) ;
-    var4.set_uniform_generator(TRIPLE) ;
-    EXPECT_EQ(var4.randist.uniform, 1) ;
-    var4.set_uniform_generator(LCG1) ;
-    EXPECT_EQ(var4.randist.uniform, LCG1) ;
-    EXPECT_EQ(var4.randist.sigma_range, 1) ;
-    var4.set_sigma_range(8) ;
-    EXPECT_EQ(var4.randist.sigma_range, 8) ;
+TEST_F(MonteCarloTest,	MonteVarRandom_NonGSL)	{
+				//req.add_requirement("3932595803");
+
+				Trick::MonteVarRandom	var4("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				var4.set_mu(4.0)	;
+				var4.set_min(-4.0)	;
+				var4.set_max(4.0)	;
+				var4.set_seed(12345);
+				//	for	this	test,	let	sigma_range	default	to	1			var4.set_sigma_range(0)	;
+
+				exec.add_variable(&var4)	;
+				//	Test	MonteVarRandom
+				//	non	GSL	library	variables
+				EXPECT_EQ(var4.randist.uniform,	LCG1)	;
+				var4.set_uniform_generator(TRIPLE)	;
+				EXPECT_EQ(var4.randist.uniform,	1)	;
+				var4.set_uniform_generator(LCG1)	;
+				EXPECT_EQ(var4.randist.uniform,	LCG1)	;
+				EXPECT_EQ(var4.randist.sigma_range,	1)	;
+				var4.set_sigma_range(8)	;
+				EXPECT_EQ(var4.randist.sigma_range,	8)	;
 }
 
-TEST_F(MonteCarloTest, MonteVarFixed) {
-    //req.add_requirement("3932595803");
+TEST_F(MonteCarloTest,	MonteVarFixed)	{
+				//req.add_requirement("3932595803");
 
-    // Test MonteVarFixed
-    Trick::MonteVarFixed var5("time_to_fire_5", 3.1415) ;
-    exec.add_variable(&var5) ;
-    EXPECT_EQ(var5.get_next_value(), "time_to_fire_5 = 3.1415") ;
-    EXPECT_EQ(var5.name, "time_to_fire_5") ;
-    EXPECT_EQ(var5.unit, "") ;
-    EXPECT_EQ(exec.variables.size(), 1) ;
+				//	Test	MonteVarFixed
+				Trick::MonteVarFixed	var5("time_to_fire_5",	3.1415)	;
+				exec.add_variable(&var5)	;
+				EXPECT_EQ(var5.get_next_value(),	"time_to_fire_5	=	3.1415")	;
+				EXPECT_EQ(var5.name,	"time_to_fire_5")	;
+				EXPECT_EQ(var5.unit,	"")	;
+				EXPECT_EQ(exec.variables.size(),	1)	;
 }
 
-///@brief check that the final distribution is correct. (Bug 6950: The non-GSL was wrong for GAUSSIAN and FLAT)
-TEST_F(MonteCarloTest, MonteVarRandom_Gaussian_distributionMatchesSpec) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
-
-    Trick::MonteVarRandom var6("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var6) ;
-
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
-
-    var6.set_seed(12345) ;
-    var6.set_mu(expected_mean) ;
-    var6.set_sigma(expected_sigma) ;
-    var6.set_min(-10.0) ;
-    var6.set_max(10.0) ;
-    var6.set_sigma_range(0) ;
-
-    // maintain running sums for calculating mean and variance
-    double mean = 0.0 ;
-    double sum_variance = 0.0 ;
-    int    n = 0 ;
-    double delta = 0.0 ;
-    int    numRuns = 100 ;
-
-    for (int ii = 0; ii <= numRuns; ++ii) {
-
-        {
-            var6.get_next_value() ;
-            str = var6.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-
-        n++ ;
-        delta = value - mean ;
-        mean += delta / (double)n ;
-        sum_variance += delta * (value - mean) ;
-    }
-
-    // final statistics
-    double variance = sum_variance / (double) (n - 1) ;
-    double sigma = sqrt(variance) ;
-
-
-    EXPECT_NEAR(expected_mean,  mean,  0.05 * expected_mean) ;
-    EXPECT_NEAR(expected_sigma, sigma, 0.10 * expected_sigma) ;
+///@brief	check	that	the	final	distribution	is	correct.	(Bug	6950:	The	non-GSL	was	wrong	for	GAUSSIAN	and	FLAT)
+TEST_F(MonteCarloTest,	MonteVarRandom_Gaussian_distributionMatchesSpec)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
+
+				Trick::MonteVarRandom	var6("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var6)	;
+
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
+
+				var6.set_seed(12345)	;
+				var6.set_mu(expected_mean)	;
+				var6.set_sigma(expected_sigma)	;
+				var6.set_min(-10.0)	;
+				var6.set_max(10.0)	;
+				var6.set_sigma_range(0)	;
+
+				//	maintain	running	sums	for	calculating	mean	and	variance
+				double	mean	=	0.0	;
+				double	sum_variance	=	0.0	;
+				int				n	=	0	;
+				double	delta	=	0.0	;
+				int				numRuns	=	100	;
+
+				for	(int	ii	=	0;	ii	<=	numRuns;	++ii)	{
+
+								{
+												var6.get_next_value()	;
+												str	=	var6.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+
+								n++	;
+								delta	=	value	-	mean	;
+								mean	+=	delta	/	(double)n	;
+								sum_variance	+=	delta	*	(value	-	mean)	;
+				}
+
+				//	final	statistics
+				double	variance	=	sum_variance	/	(double)	(n	-	1)	;
+				double	sigma	=	sqrt(variance)	;
+
+
+				EXPECT_NEAR(expected_mean,		mean,		0.05	*	expected_mean)	;
+				EXPECT_NEAR(expected_sigma,	sigma,	0.10	*	expected_sigma)	;
 }
 
 
-#ifndef _HAVE_GSL
+#ifndef	_HAVE_GSL
 
-///@brief set_sigma_range(int) feature was only implemented for nonGsl with non-C++11 fallbacks
-TEST_F(MonteCarloTest, MonteVarRandom_Gaussian_nonGslSigmaRangeDefaulted_maxDeviationFromMeanIs1Sigma) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
+///@brief	set_sigma_range(int)	feature	was	only	implemented	for	nonGsl	with	non-C++11	fallbacks
+TEST_F(MonteCarloTest,	MonteVarRandom_Gaussian_nonGslSigmaRangeDefaulted_maxDeviationFromMeanIs1Sigma)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
 
-    Trick::MonteVarRandom var7("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var7) ;
+				Trick::MonteVarRandom	var7("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var7)	;
 
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
 
-    var7.set_seed(12345) ;
-    var7.set_mu(expected_mean) ;
-    var7.set_sigma(expected_sigma) ;
-    var7.set_min(-10.0) ;
-    var7.set_max(10.0) ;
+				var7.set_seed(12345)	;
+				var7.set_mu(expected_mean)	;
+				var7.set_sigma(expected_sigma)	;
+				var7.set_min(-10.0)	;
+				var7.set_max(10.0)	;
 
-    // without this call, default sigma_range is 1
-    // var7.set_sigma_range(0) ;
+				//	without	this	call,	default	sigma_range	is	1
+				//	var7.set_sigma_range(0)	;
 
-    int    num_runs = 100 ;
-    double sigmas_max_deviation_from_mean = 0.0 ;
-    double deviation_sigmas = 0.0 ;
+				int				num_runs	=	100	;
+				double	sigmas_max_deviation_from_mean	=	0.0	;
+				double	deviation_sigmas	=	0.0	;
 
-    for (int ii = 0; ii <= num_runs; ++ii) {
+				for	(int	ii	=	0;	ii	<=	num_runs;	++ii)	{
 
-        {
-            var7.get_next_value() ;
-            str = var7.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
+								{
+												var7.get_next_value()	;
+												str	=	var7.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
 
-        deviation_sigmas = fabs( (value - expected_mean) / expected_sigma ) ;
+								deviation_sigmas	=	fabs(	(value	-	expected_mean)	/	expected_sigma	)	;
 
-        if (deviation_sigmas > sigmas_max_deviation_from_mean) {
-            sigmas_max_deviation_from_mean = deviation_sigmas ;
-        }
-    }
+								if	(deviation_sigmas	>	sigmas_max_deviation_from_mean)	{
+												sigmas_max_deviation_from_mean	=	deviation_sigmas	;
+								}
+				}
 
-    // Loose constraint: anything .LE. 1 will pass.
-    // (Doesn't require the largest deviations to be around 1.
-    // In other words, even max deviations of zero would pass.)
-    //EXPECT_LE(sigmas_max_deviation_from_mean, 1.0) ;
+				//	Loose	constraint:	anything	.LE.	1	will	pass.
+				//	(Doesn't	require	the	largest	deviations	to	be	around	1.
+				//	In	other	words,	even	max	deviations	of	zero	would	pass.)
+				//EXPECT_LE(sigmas_max_deviation_from_mean,	1.0)	;
 
-    // tighter constraint: the max deviation with 100 runs
-    // should be pretty close to but still <= 1.0.
-    // This specifies the range 0.9 .. 1.0
-    EXPECT_NEAR(sigmas_max_deviation_from_mean, 0.95, 0.05) ;
+				//	tighter	constraint:	the	max	deviation	with	100	runs
+				//	should	be	pretty	close	to	but	still	<=	1.0.
+				//	This	specifies	the	range	0.9	..	1.0
+				EXPECT_NEAR(sigmas_max_deviation_from_mean,	0.95,	0.05)	;
 }
 
-///@brief test set_sigma_range feature works for STL random
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_nonGslSigmaRangeDefaulted_maxDeviationFromMeanIs1Sigma) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
+///@brief	test	set_sigma_range	feature	works	for	STL	random
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_nonGslSigmaRangeDefaulted_maxDeviationFromMeanIs1Sigma)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
 
-    Trick::MonteVarRandom var9("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN, "", Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE) ;
-    exec.add_variable(&var9) ;
+				Trick::MonteVarRandom	var9("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN,	"",	Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE)	;
+				exec.add_variable(&var9)	;
 
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
 
-    var9.set_seed(12345) ;
-    var9.set_mu(expected_mean) ;
-    var9.set_sigma(expected_sigma) ;
-    var9.set_min(-10.0) ;
-    var9.set_max(10.0) ;
+				var9.set_seed(12345)	;
+				var9.set_mu(expected_mean)	;
+				var9.set_sigma(expected_sigma)	;
+				var9.set_min(-10.0)	;
+				var9.set_max(10.0)	;
 
-    // without this call, default sigma_range is 1
-    // var9.set_sigma_range(0) ;
+				//	without	this	call,	default	sigma_range	is	1
+				//	var9.set_sigma_range(0)	;
 
-    int    num_runs = 1000 ;
-    double sigmas_max_deviation_from_mean = 0.0 ;
-    double deviation_sigmas = 0.0 ;
+				int				num_runs	=	1000	;
+				double	sigmas_max_deviation_from_mean	=	0.0	;
+				double	deviation_sigmas	=	0.0	;
 
-    for (int ii = 0; ii <= num_runs; ++ii) {
+				for	(int	ii	=	0;	ii	<=	num_runs;	++ii)	{
 
-        {
-            var9.get_next_value() ;
-            str = var9.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
+								{
+												var9.get_next_value()	;
+												str	=	var9.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
 
-        deviation_sigmas = fabs( (value - expected_mean) / expected_sigma ) ;
+								deviation_sigmas	=	fabs(	(value	-	expected_mean)	/	expected_sigma	)	;
 
-        if (deviation_sigmas > sigmas_max_deviation_from_mean) {
-            sigmas_max_deviation_from_mean = deviation_sigmas ;
-        }
-    }
+								if	(deviation_sigmas	>	sigmas_max_deviation_from_mean)	{
+												sigmas_max_deviation_from_mean	=	deviation_sigmas	;
+								}
+				}
 
-    // Loose constraint: anything .LE. 1 will pass.
-    // (Doesn't require the largest deviations to be around 1.
-    // In other words, even max deviations of zero would pass.)
-    //EXPECT_LE(sigmas_max_deviation_from_mean, 1.0) ;
+				//	Loose	constraint:	anything	.LE.	1	will	pass.
+				//	(Doesn't	require	the	largest	deviations	to	be	around	1.
+				//	In	other	words,	even	max	deviations	of	zero	would	pass.)
+				//EXPECT_LE(sigmas_max_deviation_from_mean,	1.0)	;
 
-    // tighter constraint: the max deviation with 100 runs
-    // should be pretty close to but still <= 1.0.
-    // This specifies the range 0.9 .. 1.0
-    EXPECT_NEAR(sigmas_max_deviation_from_mean, 0.95, 0.05) ;
+				//	tighter	constraint:	the	max	deviation	with	100	runs
+				//	should	be	pretty	close	to	but	still	<=	1.0.
+				//	This	specifies	the	range	0.9	..	1.0
+				EXPECT_NEAR(sigmas_max_deviation_from_mean,	0.95,	0.05)	;
 }
 
 
-#endif // not _HAVE_GSL
+#endif	//	not	_HAVE_GSL
 
-#if (defined(_HAVE_TR1_RANDOM) || defined(_HAVE_STL_RANDOM))
+#if	(defined(_HAVE_TR1_RANDOM)	||	defined(_HAVE_STL_RANDOM))
 
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_distributionMatchesSpec) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_distributionMatchesSpec)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
 
-    Trick::MonteVarRandom var8("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN, "--",
-                                Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE) ;
-    exec.add_variable(&var8) ;
+				Trick::MonteVarRandom	var8("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN,	"--",
+																																Trick::MonteVarRandom::TRICK_DEFAULT_ENGINE)	;
+				exec.add_variable(&var8)	;
 
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
 
-    var8.set_seed(12345) ;
-    var8.set_sigma_range(0) ;
-    var8.set_mu(expected_mean) ;
-    var8.set_sigma(expected_sigma) ;
-    var8.set_min(-10.0) ;
-    var8.set_max(10.0) ;
+				var8.set_seed(12345)	;
+				var8.set_sigma_range(0)	;
+				var8.set_mu(expected_mean)	;
+				var8.set_sigma(expected_sigma)	;
+				var8.set_min(-10.0)	;
+				var8.set_max(10.0)	;
 
-    // maintain running sums for calculating mean and variance
-    double mean = 0.0 ;
-    double sum_variance = 0.0 ;
-    int    n = 0 ;
-    double delta = 0.0 ;
-    int    numRuns = 100 ;
+				//	maintain	running	sums	for	calculating	mean	and	variance
+				double	mean	=	0.0	;
+				double	sum_variance	=	0.0	;
+				int				n	=	0	;
+				double	delta	=	0.0	;
+				int				numRuns	=	100	;
 
-    for (int ii = 0; ii <= numRuns; ++ii) {
+				for	(int	ii	=	0;	ii	<=	numRuns;	++ii)	{
 
-        {
-            var8.get_next_value() ;
-            str = var8.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
+								{
+												var8.get_next_value()	;
+												str	=	var8.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
 
-        n++ ;
-        delta = value - mean ;
-        mean += delta / (double)n ;
-        sum_variance += delta * (value - mean) ;
-    }
+								n++	;
+								delta	=	value	-	mean	;
+								mean	+=	delta	/	(double)n	;
+								sum_variance	+=	delta	*	(value	-	mean)	;
+				}
 
-    // final statistics
-    double variance = sum_variance / (double) (n - 1) ;
-    double sigma = sqrt(variance) ;
+				//	final	statistics
+				double	variance	=	sum_variance	/	(double)	(n	-	1)	;
+				double	sigma	=	sqrt(variance)	;
 
-    EXPECT_NEAR(expected_mean,  mean,  0.05 * expected_mean) ;
-    EXPECT_NEAR(expected_sigma, sigma, 0.10 * expected_sigma) ;
+				EXPECT_NEAR(expected_mean,		mean,		0.05	*	expected_mean)	;
+				EXPECT_NEAR(expected_sigma,	sigma,	0.10	*	expected_sigma)	;
 }
 
 
-///@breif test relative min/max work as expected for STL
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_relativeMinMaxWorks) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
-
-    Trick::MonteVarRandom var6("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var6) ;
-
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
-
-    var6.set_seed(12345) ;
-    var6.set_sigma_range(0) ;
-    var6.set_mu(expected_mean) ;
-    var6.set_sigma(expected_sigma) ;
-    var6.set_min(-1.0) ;
-    var6.set_max(1.0) ;
-    var6.set_min_is_relative(true) ;
-    var6.set_max_is_relative(true) ;
-
-    // maintain running sums for calculating mean and variance
-    int    numRuns = 100 ;
-    double saw_min =  1000.0;
-    double saw_max = -1000.0;
-
-    for (int ii = 0; ii <= numRuns; ++ii) {
-        {
-            var6.get_next_value() ;
-            str = var6.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-        if (value < saw_min) {
-            saw_min = value;
-        }
-        if (value > saw_max) {
-            saw_max = value;
-        }
-    }
-
-    // these conditions should be true if valid
-    // relative min/max range of 10 +/- 1 is being imposed
-    EXPECT_NEAR(9.05, saw_min, 0.05) ;
-    EXPECT_NEAR(10.95, saw_max, 0.05) ;
+///@breif	test	relative	min/max	work	as	expected	for	STL
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_relativeMinMaxWorks)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
+
+				Trick::MonteVarRandom	var6("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var6)	;
+
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
+
+				var6.set_seed(12345)	;
+				var6.set_sigma_range(0)	;
+				var6.set_mu(expected_mean)	;
+				var6.set_sigma(expected_sigma)	;
+				var6.set_min(-1.0)	;
+				var6.set_max(1.0)	;
+				var6.set_min_is_relative(true)	;
+				var6.set_max_is_relative(true)	;
+
+				//	maintain	running	sums	for	calculating	mean	and	variance
+				int				numRuns	=	100	;
+				double	saw_min	=		1000.0;
+				double	saw_max	=	-1000.0;
+
+				for	(int	ii	=	0;	ii	<=	numRuns;	++ii)	{
+								{
+												var6.get_next_value()	;
+												str	=	var6.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+								if	(value	<	saw_min)	{
+												saw_min	=	value;
+								}
+								if	(value	>	saw_max)	{
+												saw_max	=	value;
+								}
+				}
+
+				//	these	conditions	should	be	true	if	valid
+				//	relative	min/max	range	of	10	+/-	1	is	being	imposed
+				EXPECT_NEAR(9.05,	saw_min,	0.05)	;
+				EXPECT_NEAR(10.95,	saw_max,	0.05)	;
 }
 
-///@breif test relative min/max works after calling set_mu, as expected for STL
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
-
-    Trick::MonteVarRandom var11("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var11) ;
-
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
-
-    var11.set_seed(12345) ;
-    var11.set_sigma_range(0) ;
-    var11.set_mu(expected_mean + 100.0) ;
-    var11.set_sigma(expected_sigma) ;
-    var11.set_min(-1.0) ;
-    var11.set_max(1.0) ;
-    var11.set_min_is_relative(true) ;
-    var11.set_max_is_relative(true) ;
-    var11.set_mu(expected_mean) ;
-
-    // maintain running sums for calculating mean and variance
-    int    numRuns = 100 ;
-    double saw_min =  1000.0;
-    double saw_max = -1000.0;
-
-    for (int ii = 0; ii <= numRuns; ++ii) {
-        {
-            var11.get_next_value() ;
-            str = var11.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-        if (value < saw_min) {
-            saw_min = value;
-        }
-        if (value > saw_max) {
-            saw_max = value;
-        }
-    }
-
-    // these conditions should be true if valid
-    // relative min/max range of 10 +/- 1 is being imposed
-    EXPECT_NEAR(9.05, saw_min, 0.05) ;
-    EXPECT_NEAR(10.95, saw_max, 0.05) ;
+///@breif	test	relative	min/max	works	after	calling	set_mu,	as	expected	for	STL
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_callSetMu_relativeMinMaxWorks)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
+
+				Trick::MonteVarRandom	var11("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var11)	;
+
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
+
+				var11.set_seed(12345)	;
+				var11.set_sigma_range(0)	;
+				var11.set_mu(expected_mean	+	100.0)	;
+				var11.set_sigma(expected_sigma)	;
+				var11.set_min(-1.0)	;
+				var11.set_max(1.0)	;
+				var11.set_min_is_relative(true)	;
+				var11.set_max_is_relative(true)	;
+				var11.set_mu(expected_mean)	;
+
+				//	maintain	running	sums	for	calculating	mean	and	variance
+				int				numRuns	=	100	;
+				double	saw_min	=		1000.0;
+				double	saw_max	=	-1000.0;
+
+				for	(int	ii	=	0;	ii	<=	numRuns;	++ii)	{
+								{
+												var11.get_next_value()	;
+												str	=	var11.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+								if	(value	<	saw_min)	{
+												saw_min	=	value;
+								}
+								if	(value	>	saw_max)	{
+												saw_max	=	value;
+								}
+				}
+
+				//	these	conditions	should	be	true	if	valid
+				//	relative	min/max	range	of	10	+/-	1	is	being	imposed
+				EXPECT_NEAR(9.05,	saw_min,	0.05)	;
+				EXPECT_NEAR(10.95,	saw_max,	0.05)	;
 }
 
-///@breif test absolute min/max works after changing from relative, as expected for STL
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_changeToAbsolute_MinMaxWorks) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
-
-    Trick::MonteVarRandom var11("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var11) ;
-
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
-
-    var11.set_seed(12345) ;
-    var11.set_sigma_range(0) ;
-    var11.set_mu(expected_mean) ;
-    var11.set_sigma(expected_sigma) ;
-    var11.set_min(9.0) ;
-    var11.set_max(11.0) ;
-
-    var11.set_min_is_relative(false) ;
-    var11.set_max_is_relative(false) ;
-
-    // maintain running sums for calculating mean and variance
-    int    numRuns = 100 ;
-    double saw_min =  1000.0;
-    double saw_max = -1000.0;
-
-    for (int ii = 0; ii <= numRuns; ++ii) {
-        {
-            var11.get_next_value() ;
-            str = var11.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-        if (value < saw_min) {
-            saw_min = value;
-        }
-        if (value > saw_max) {
-            saw_max = value;
-        }
-    }
-
-    // these conditions should be true if valid
-    // relative min/max range of 10 +/- 1 is being imposed
-    EXPECT_NEAR(9.05, saw_min, 0.05) ;
-    EXPECT_NEAR(10.95, saw_max, 0.05) ;
+///@breif	test	absolute	min/max	works	after	changing	from	relative,	as	expected	for	STL
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_changeToAbsolute_MinMaxWorks)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
+
+				Trick::MonteVarRandom	var11("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var11)	;
+
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
+
+				var11.set_seed(12345)	;
+				var11.set_sigma_range(0)	;
+				var11.set_mu(expected_mean)	;
+				var11.set_sigma(expected_sigma)	;
+				var11.set_min(9.0)	;
+				var11.set_max(11.0)	;
+
+				var11.set_min_is_relative(false)	;
+				var11.set_max_is_relative(false)	;
+
+				//	maintain	running	sums	for	calculating	mean	and	variance
+				int				numRuns	=	100	;
+				double	saw_min	=		1000.0;
+				double	saw_max	=	-1000.0;
+
+				for	(int	ii	=	0;	ii	<=	numRuns;	++ii)	{
+								{
+												var11.get_next_value()	;
+												str	=	var11.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+								if	(value	<	saw_min)	{
+												saw_min	=	value;
+								}
+								if	(value	>	saw_max)	{
+												saw_max	=	value;
+								}
+				}
+
+				//	these	conditions	should	be	true	if	valid
+				//	relative	min/max	range	of	10	+/-	1	is	being	imposed
+				EXPECT_NEAR(9.05,	saw_min,	0.05)	;
+				EXPECT_NEAR(10.95,	saw_max,	0.05)	;
 }
 
-///@brief test that the sequence repeats after calling set_seed
-TEST_F(MonteCarloTest, MonteVarRandom_StlGaussian_setSeed_TakesEffect) {
-    //req.add_requirement("3932595803");
-    std::string str ;
-    double      value ;
-
-    Trick::MonteVarRandom var10("time_to_fire_1", Trick::MonteVarRandom::GAUSSIAN) ;
-    exec.add_variable(&var10) ;
-
-    double expected_mean  = 10.0 ;
-    double expected_sigma = 2.0 ;
-
-    var10.set_seed(12345) ;
-    var10.set_sigma_range(0) ;
-    var10.set_mu(expected_mean) ;
-    var10.set_sigma(expected_sigma) ;
-    var10.set_min(-10.0) ;
-    var10.set_max(10.0) ;
-    var10.set_min_is_relative(true) ;
-    var10.set_max_is_relative(true) ;
-
-    int numRuns = 10;
-
-    for (int ii = 0; ii < numRuns; ++ii) {
-        {
-            var10.get_next_value() ;
-            str = var10.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-    }
-    double first_value = value;
-
-    var10.set_seed(12345) ;
-
-    for (int ii = 0; ii < numRuns; ++ii) {
-        {
-            var10.get_next_value() ;
-            str = var10.value ;
-            std::stringstream sstream(str) ;
-            sstream >> value ;
-        }
-    }
-    double second_value = value;
-
-    EXPECT_NEAR(first_value, second_value, 0.000001) ;
+///@brief	test	that	the	sequence	repeats	after	calling	set_seed
+TEST_F(MonteCarloTest,	MonteVarRandom_StlGaussian_setSeed_TakesEffect)	{
+				//req.add_requirement("3932595803");
+				std::string	str	;
+				double						value	;
+
+				Trick::MonteVarRandom	var10("time_to_fire_1",	Trick::MonteVarRandom::GAUSSIAN)	;
+				exec.add_variable(&var10)	;
+
+				double	expected_mean		=	10.0	;
+				double	expected_sigma	=	2.0	;
+
+				var10.set_seed(12345)	;
+				var10.set_sigma_range(0)	;
+				var10.set_mu(expected_mean)	;
+				var10.set_sigma(expected_sigma)	;
+				var10.set_min(-10.0)	;
+				var10.set_max(10.0)	;
+				var10.set_min_is_relative(true)	;
+				var10.set_max_is_relative(true)	;
+
+				int	numRuns	=	10;
+
+				for	(int	ii	=	0;	ii	<	numRuns;	++ii)	{
+								{
+												var10.get_next_value()	;
+												str	=	var10.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+				}
+				double	first_value	=	value;
+
+				var10.set_seed(12345)	;
+
+				for	(int	ii	=	0;	ii	<	numRuns;	++ii)	{
+								{
+												var10.get_next_value()	;
+												str	=	var10.value	;
+												std::stringstream	sstream(str)	;
+												sstream	>>	value	;
+								}
+				}
+				double	second_value	=	value;
+
+				EXPECT_NEAR(first_value,	second_value,	0.000001)	;
 }
 
-#endif // _HAVE_TR1_RANDOM or _HAVE_STL_RANDOM
+#endif	//	_HAVE_TR1_RANDOM	or	_HAVE_STL_RANDOM
 
 }
diff --git a/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp b/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp
index bfa232e03..52370b0c3 100644
--- a/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp
+++ b/trick_source/sim_services/RealtimeInjector/RtiEvent.cpp
@@ -1,24 +1,24 @@
-#include <stdio.h>
+#include	<stdio.h>
 
-#include "trick/RtiEvent.hh"
-#include "trick/message_proto.h"
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/RtiEvent.hh"
+#include	"trick/message_proto.h"
+#include	"trick/memorymanager_c_intf.h"
 
-void Trick::RtiEventBase::print_rti () {
+void	Trick::RtiEventBase::print_rti	()	{
 
-    message_publish (MSG_NORMAL, "----------------------------------------\n");
-    message_publish (MSG_NORMAL, "           reference: %s\n", ref->reference);
-    message_publish (MSG_NORMAL, "           num_index: %d\n", ref->num_index);
-    message_publish (MSG_NORMAL, "               units: %s\n", ref->units);
-    message_publish (MSG_NORMAL, "     pointer_present: %d\n", ref->pointer_present);
-    message_publish (MSG_NORMAL, "             address: %x\n", ref->address);
-    message_publish (MSG_NORMAL, "                type: %s\n", ref->attr->type_name);
-    message_publish (MSG_NORMAL, "               value: %s\n", print_val().c_str());
-    message_publish (MSG_NORMAL, "--====================================--\n");
+				message_publish	(MSG_NORMAL,	"----------------------------------------\n");
+				message_publish	(MSG_NORMAL,	"											reference:	%s\n",	ref->reference);
+				message_publish	(MSG_NORMAL,	"											num_index:	%d\n",	ref->num_index);
+				message_publish	(MSG_NORMAL,	"															units:	%s\n",	ref->units);
+				message_publish	(MSG_NORMAL,	"					pointer_present:	%d\n",	ref->pointer_present);
+				message_publish	(MSG_NORMAL,	"													address:	%x\n",	ref->address);
+				message_publish	(MSG_NORMAL,	"																type:	%s\n",	ref->attr->type_name);
+				message_publish	(MSG_NORMAL,	"															value:	%s\n",	print_val().c_str());
+				message_publish	(MSG_NORMAL,	"--====================================--\n");
 }
 
-void Trick::RtiEventBase::check_address() {
-    if ( ref->pointer_present ) {
-        ref->address = follow_address_path(ref) ;
-    }
+void	Trick::RtiEventBase::check_address()	{
+				if	(	ref->pointer_present	)	{
+								ref->address	=	follow_address_path(ref)	;
+				}
 }
diff --git a/trick_source/sim_services/RealtimeInjector/RtiExec.cpp b/trick_source/sim_services/RealtimeInjector/RtiExec.cpp
index 2ee9d0f6f..52bad3715 100644
--- a/trick_source/sim_services/RealtimeInjector/RtiExec.cpp
+++ b/trick_source/sim_services/RealtimeInjector/RtiExec.cpp
@@ -1,73 +1,73 @@
 
-#include "trick/RtiExec.hh"
-#include "trick/message_proto.h"
-#include "trick/exec_proto.h"
+#include	"trick/RtiExec.hh"
+#include	"trick/message_proto.h"
+#include	"trick/exec_proto.h"
 
-Trick::RtiExec::RtiExec() :
- frame_multiple(1) ,
- frame_offset(0) ,
- debug(false) {
-    pthread_mutex_init(&list_mutex, NULL) ;
+Trick::RtiExec::RtiExec()	:
+	frame_multiple(1)	,
+	frame_offset(0)	,
+	debug(false)	{
+				pthread_mutex_init(&list_mutex,	NULL)	;
 }
 
-Trick::RtiExec::~RtiExec() {}
+Trick::RtiExec::~RtiExec()	{}
 
 /**
 @details
--# lock the file_list mutex
--# add the new list to the fire_list
--# unlock the file_list mutex
+-#	lock	the	file_list	mutex
+-#	add	the	new	list	to	the	fire_list
+-#	unlock	the	file_list	mutex
 */
-void Trick::RtiExec::AddToFireList( RtiList * rti_list ) {
-    pthread_mutex_lock(&list_mutex) ;
-    fire_list.push_back(rti_list) ;
-    pthread_mutex_unlock(&list_mutex) ;
+void	Trick::RtiExec::AddToFireList(	RtiList	*	rti_list	)	{
+				pthread_mutex_lock(&list_mutex)	;
+				fire_list.push_back(rti_list)	;
+				pthread_mutex_unlock(&list_mutex)	;
 }
 
 /**
 @details
--# If the current frame is the correct frame multiple and offset
--# If there is a list of injections in the fire_list
--# Try to unlock the file_list mutex
--# If successful, execute the fire_list and clear the list
--# unlock the mutex
+-#	If	the	current	frame	is	the	correct	frame	multiple	and	offset
+-#	If	there	is	a	list	of	injections	in	the	fire_list
+-#	Try	to	unlock	the	file_list	mutex
+-#	If	successful,	execute	the	fire_list	and	clear	the	list
+-#	unlock	the	mutex
 */
-int Trick::RtiExec::Exec () {
-    long long curr_frame = exec_get_frame_count() ;
-    curr_frame %= frame_multiple ;
-    if ( curr_frame == frame_offset ) {
-        if ( ! fire_list.empty() ) {
-            // use trylock so we don't block if the mutex is in use.
-            if ( pthread_mutex_trylock(&list_mutex) == 0 ) {
-                std::vector < RtiList * >::iterator rlit ;
-                for ( rlit = fire_list.begin() ; rlit != fire_list.end() ; ++rlit ) {
-                    (*rlit)->execute(debug) ;
-                    delete (*rlit) ;
-                }
-                fire_list.clear() ;
-                pthread_mutex_unlock(&list_mutex) ;
-            }
-        }
-    }
-    return (0);
+int	Trick::RtiExec::Exec	()	{
+				long	long	curr_frame	=	exec_get_frame_count()	;
+				curr_frame	%=	frame_multiple	;
+				if	(	curr_frame	==	frame_offset	)	{
+								if	(	!	fire_list.empty()	)	{
+												//	use	trylock	so	we	don't	block	if	the	mutex	is	in	use.
+												if	(	pthread_mutex_trylock(&list_mutex)	==	0	)	{
+																std::vector	<	RtiList	*	>::iterator	rlit	;
+																for	(	rlit	=	fire_list.begin()	;	rlit	!=	fire_list.end()	;	++rlit	)	{
+																				(*rlit)->execute(debug)	;
+																				delete	(*rlit)	;
+																}
+																fire_list.clear()	;
+																pthread_mutex_unlock(&list_mutex)	;
+												}
+								}
+				}
+				return	(0);
 }
 
-void Trick::RtiExec::SetDebug( bool on_off ) {
-    debug = on_off ;
+void	Trick::RtiExec::SetDebug(	bool	on_off	)	{
+				debug	=	on_off	;
 }
 
-int Trick::RtiExec::SetFrameMultiple( unsigned int mult ) {
-    frame_multiple = mult ;
-    return 0 ;
+int	Trick::RtiExec::SetFrameMultiple(	unsigned	int	mult	)	{
+				frame_multiple	=	mult	;
+				return	0	;
 }
 
-int Trick::RtiExec::SetFrameOffset( unsigned int offset ) {
-    if ( offset >= frame_multiple ) {
-        message_publish(MSG_ERROR, "RTI frame offset must be less than frame_multiple\n") ;
-        return -1 ;
-    }
-    frame_offset = offset ;
-    return 0 ;
+int	Trick::RtiExec::SetFrameOffset(	unsigned	int	offset	)	{
+				if	(	offset	>=	frame_multiple	)	{
+								message_publish(MSG_ERROR,	"RTI	frame	offset	must	be	less	than	frame_multiple\n")	;
+								return	-1	;
+				}
+				frame_offset	=	offset	;
+				return	0	;
 }
 
 
diff --git a/trick_source/sim_services/RealtimeInjector/RtiList.cpp b/trick_source/sim_services/RealtimeInjector/RtiList.cpp
index 1adea7de1..260a79c39 100644
--- a/trick_source/sim_services/RealtimeInjector/RtiList.cpp
+++ b/trick_source/sim_services/RealtimeInjector/RtiList.cpp
@@ -1,26 +1,26 @@
 /*
 ********************************
-** PURPOSE: (communications)
+**	PURPOSE:	(communications)
 ********************************/
-#include "trick/RtiList.hh"
-#include "trick/message_proto.h"
+#include	"trick/RtiList.hh"
+#include	"trick/message_proto.h"
 
-void Trick::RtiList::execute( bool debug ) {
-    std::vector<RtiEventBase * >::iterator rebit ;
-    for ( rebit = event_list.begin() ; rebit != event_list.end() ; ++rebit ) {
-        if ( debug ) {
-            message_publish(MSG_DEBUG, "Executing RTI: %s = %s\n",
-             (*rebit)->ref->reference , (*rebit)->print_val().c_str() );
-        }
-        (*rebit)->do_assignment() ;
-        delete (*rebit) ;
-    }
+void	Trick::RtiList::execute(	bool	debug	)	{
+				std::vector<RtiEventBase	*	>::iterator	rebit	;
+				for	(	rebit	=	event_list.begin()	;	rebit	!=	event_list.end()	;	++rebit	)	{
+								if	(	debug	)	{
+												message_publish(MSG_DEBUG,	"Executing	RTI:	%s	=	%s\n",
+													(*rebit)->ref->reference	,	(*rebit)->print_val().c_str()	);
+								}
+								(*rebit)->do_assignment()	;
+								delete	(*rebit)	;
+				}
 }
 
 
-void Trick::RtiList::print_list() {
-    std::vector<RtiEventBase * >::iterator rebit ;
-    for ( rebit = event_list.begin() ; rebit != event_list.end() ; ++rebit ) {
-        (*rebit)->print_rti() ;
-    }
+void	Trick::RtiList::print_list()	{
+				std::vector<RtiEventBase	*	>::iterator	rebit	;
+				for	(	rebit	=	event_list.begin()	;	rebit	!=	event_list.end()	;	++rebit	)	{
+								(*rebit)->print_rti()	;
+				}
 }
diff --git a/trick_source/sim_services/RealtimeInjector/RtiStager.cpp b/trick_source/sim_services/RealtimeInjector/RtiStager.cpp
index 2e5c2bed8..4e2f6d23d 100644
--- a/trick_source/sim_services/RealtimeInjector/RtiStager.cpp
+++ b/trick_source/sim_services/RealtimeInjector/RtiStager.cpp
@@ -1,128 +1,128 @@
 
-#include "trick/RtiStager.hh"
-#include "trick/message_proto.h"
-#include "trick/exec_proto.h"
+#include	"trick/RtiStager.hh"
+#include	"trick/message_proto.h"
+#include	"trick/exec_proto.h"
 
-#include "trick/memorymanager_c_intf.h"
+#include	"trick/memorymanager_c_intf.h"
 
-Trick::RtiStager * the_rtis ;
+Trick::RtiStager	*	the_rtis	;
 
-Trick::RtiStager::RtiStager() : debug(false) {
-    the_rtis = this ;
+Trick::RtiStager::RtiStager()	:	debug(false)	{
+				the_rtis	=	this	;
 }
 
-Trick::RtiStager::~RtiStager() {
-    the_rtis = NULL ;
+Trick::RtiStager::~RtiStager()	{
+				the_rtis	=	NULL	;
 }
 
-int Trick::RtiStager::Add (char *variable, double value ) {
-    Trick::RtiEventBase *rei = Trick::createRtiEvent < double > (variable , value ) ;
-    AddtoList(rei) ;
-    return 0 ;
+int	Trick::RtiStager::Add	(char	*variable,	double	value	)	{
+				Trick::RtiEventBase	*rei	=	Trick::createRtiEvent	<	double	>	(variable	,	value	)	;
+				AddtoList(rei)	;
+				return	0	;
 }
 
-int Trick::RtiStager::Add (char *variable, long long value ) {
-    Trick::RtiEventBase *rei = Trick::createRtiEvent < long long > (variable , value ) ;
-    AddtoList(rei) ;
-    return 0 ;
+int	Trick::RtiStager::Add	(char	*variable,	long	long	value	)	{
+				Trick::RtiEventBase	*rei	=	Trick::createRtiEvent	<	long	long	>	(variable	,	value	)	;
+				AddtoList(rei)	;
+				return	0	;
 }
 
-int Trick::RtiStager::Fire (unsigned int thread_id) {
+int	Trick::RtiStager::Fire	(unsigned	int	thread_id)	{
 
-    pthread_t pid = pthread_self() ;
-    std::map < pthread_t, RtiList * >::iterator it ;
+				pthread_t	pid	=	pthread_self()	;
+				std::map	<	pthread_t,	RtiList	*	>::iterator	it	;
 
-    if ( thread_id >= executors.size() ) {
-        message_publish(MSG_ERROR, "%s:%s:%d RTI Fire failed, thread %d out of range\n",
-         __FILE__, __func__, __LINE__, thread_id ) ;
-        return -1 ;
-    }
+				if	(	thread_id	>=	executors.size()	)	{
+								message_publish(MSG_ERROR,	"%s:%s:%d	RTI	Fire	failed,	thread	%d	out	of	range\n",
+									__FILE__,	__func__,	__LINE__,	thread_id	)	;
+								return	-1	;
+				}
 
-    if ( debug ) {
-        message_publish(MSG_DEBUG, "%s:%s:%d firing rti\n",
-         __FILE__, __func__, __LINE__);
-    }
+				if	(	debug	)	{
+								message_publish(MSG_DEBUG,	"%s:%s:%d	firing	rti\n",
+									__FILE__,	__func__,	__LINE__);
+				}
 
-    it = list_map.find(pid) ;
-    if ( it != list_map.end() ) {
-        executors[thread_id]->AddToFireList(list_map[pid]) ;
-        list_map.erase(it) ;
-    } else {
-        message_publish(MSG_ERROR, "%s:%s:%d no list to fire\n",
-         __FILE__, __func__, __LINE__);
-    }
+				it	=	list_map.find(pid)	;
+				if	(	it	!=	list_map.end()	)	{
+								executors[thread_id]->AddToFireList(list_map[pid])	;
+								list_map.erase(it)	;
+				}	else	{
+								message_publish(MSG_ERROR,	"%s:%s:%d	no	list	to	fire\n",
+									__FILE__,	__func__,	__LINE__);
+				}
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::RtiStager::List () {
+int	Trick::RtiStager::List	()	{
 
-    unsigned int ii ;
-    RtiList * temp_list ;
-    std::map < pthread_t, RtiList * >::iterator it ;
+				unsigned	int	ii	;
+				RtiList	*	temp_list	;
+				std::map	<	pthread_t,	RtiList	*	>::iterator	it	;
 
-    it = list_map.find(pthread_self()) ;
+				it	=	list_map.find(pthread_self())	;
 
-    if ( it != list_map.end() ) {
-        temp_list = list_map[pthread_self()] ;
-        for ( ii = 0 ; ii < temp_list->event_list.size() ; ii++ ) {
-            temp_list->event_list[ii]->print_rti() ;
-        }
-    }
+				if	(	it	!=	list_map.end()	)	{
+								temp_list	=	list_map[pthread_self()]	;
+								for	(	ii	=	0	;	ii	<	temp_list->event_list.size()	;	ii++	)	{
+												temp_list->event_list[ii]->print_rti()	;
+								}
+				}
 
-    return (0);
+				return	(0);
 }
 
-int Trick::RtiStager::SetDebug( bool on_off ) {
-    debug = on_off ;
-    std::vector < RtiExec * >::iterator reit ;
-    for ( reit = executors.begin() ; reit != executors.end() ; ++reit ) {
-        (*reit)->SetDebug(on_off) ;
-    }
-    return 0 ;
+int	Trick::RtiStager::SetDebug(	bool	on_off	)	{
+				debug	=	on_off	;
+				std::vector	<	RtiExec	*	>::iterator	reit	;
+				for	(	reit	=	executors.begin()	;	reit	!=	executors.end()	;	++reit	)	{
+								(*reit)->SetDebug(on_off)	;
+				}
+				return	0	;
 }
 
-int Trick::RtiStager::SetFrameMultiple( unsigned int thread_id , unsigned int mult ) {
-    if ( thread_id >= executors.size() ) {
-        return -1 ;
-    }
-    return executors[thread_id]->SetFrameMultiple(mult) ;
+int	Trick::RtiStager::SetFrameMultiple(	unsigned	int	thread_id	,	unsigned	int	mult	)	{
+				if	(	thread_id	>=	executors.size()	)	{
+								return	-1	;
+				}
+				return	executors[thread_id]->SetFrameMultiple(mult)	;
 }
 
-int Trick::RtiStager::SetFrameOffset( unsigned int thread_id , unsigned int offset ) {
-    if ( thread_id >= executors.size() ) {
-        return -1 ;
-    }
-    return executors[thread_id]->SetFrameOffset(offset) ;
+int	Trick::RtiStager::SetFrameOffset(	unsigned	int	thread_id	,	unsigned	int	offset	)	{
+				if	(	thread_id	>=	executors.size()	)	{
+								return	-1	;
+				}
+				return	executors[thread_id]->SetFrameOffset(offset)	;
 }
 
 
-void Trick::RtiStager::AddInjectorExecutor ( Trick::RtiExec *rtie ) {
-    executors.push_back(rtie) ;
+void	Trick::RtiStager::AddInjectorExecutor	(	Trick::RtiExec	*rtie	)	{
+				executors.push_back(rtie)	;
 }
 
-Trick::RtiExec * Trick::RtiStager::GetRtiExecutor( unsigned int thread_id ) {
-    if ( thread_id >= executors.size() ) {
-        return NULL ;
-    }
-    return executors[thread_id] ;
+Trick::RtiExec	*	Trick::RtiStager::GetRtiExecutor(	unsigned	int	thread_id	)	{
+				if	(	thread_id	>=	executors.size()	)	{
+								return	NULL	;
+				}
+				return	executors[thread_id]	;
 }
 
-int Trick::RtiStager::AddtoList (Trick::RtiEventBase *rei ) {
-    if (rei != NULL) {
-        pthread_t pid = pthread_self() ;
-
-        std::map < pthread_t, RtiList * >::iterator it ;
-
-        it = list_map.find(pid) ;
-        if ( it == list_map.end() ) {
-            list_map[pid] = new RtiList() ;
-        }
-        list_map[pid]->event_list.push_back(rei) ;
-        if ( debug ) {
-            message_publish(MSG_DEBUG, "%s:%s:%d Event List Size (%d)\n",
-             __FILE__, __func__, __LINE__, list_map[pid]->event_list.size());
-        }
-    }
-    return 0 ;
+int	Trick::RtiStager::AddtoList	(Trick::RtiEventBase	*rei	)	{
+				if	(rei	!=	NULL)	{
+								pthread_t	pid	=	pthread_self()	;
+
+								std::map	<	pthread_t,	RtiList	*	>::iterator	it	;
+
+								it	=	list_map.find(pid)	;
+								if	(	it	==	list_map.end()	)	{
+												list_map[pid]	=	new	RtiList()	;
+								}
+								list_map[pid]->event_list.push_back(rei)	;
+								if	(	debug	)	{
+												message_publish(MSG_DEBUG,	"%s:%s:%d	Event	List	Size	(%d)\n",
+													__FILE__,	__func__,	__LINE__,	list_map[pid]->event_list.size());
+								}
+				}
+				return	0	;
 }
diff --git a/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp b/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp
index 22bd8cbf2..782f86cb4 100644
--- a/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp
+++ b/trick_source/sim_services/RealtimeSync/RealtimeSync.cpp
@@ -1,546 +1,546 @@
 /*
 PURPOSE:
-    ( RealtimeSync )
+				(	RealtimeSync	)
 PROGRAMMERS:
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include <stdio.h>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <cmath>
-#include "trick/RealtimeSync.hh"
-#include "trick/exec_proto.h"
-#include "trick/sim_mode.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/TrickConstant.hh"
+#include	<stdio.h>
+#include	<iostream>
+#include	<sstream>
+#include	<iomanip>
+#include	<cmath>
+#include	"trick/RealtimeSync.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/sim_mode.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/TrickConstant.hh"
 
-Trick::RealtimeSync * the_rts = NULL ;
+Trick::RealtimeSync	*	the_rts	=	NULL	;
 
 /**
 @details
--# Start disabled (non-real-time).  Requirement [@ref non-real-time]
+-#	Start	disabled	(non-real-time).		Requirement	[@ref	non-real-time]
 */
-Trick::RealtimeSync::RealtimeSync( Trick::Clock * in_clock , Trick::Timer * in_timer ) {
+Trick::RealtimeSync::RealtimeSync(	Trick::Clock	*	in_clock	,	Trick::Timer	*	in_timer	)	{
 
-    /* Start disabled (non-real-time). */
-    enable_flag = false ;
-    disable_flag = false ;
+				/*	Start	disabled	(non-real-time).	*/
+				enable_flag	=	false	;
+				disable_flag	=	false	;
 
-    active = false ;
+				active	=	false	;
 
-    rt_max_overrun_cnt = 100000000;
-    rt_max_overrun_time = 1.0e37;
-    rt_overrun_freeze = false ;
+				rt_max_overrun_cnt	=	100000000;
+				rt_max_overrun_time	=	1.0e37;
+				rt_overrun_freeze	=	false	;
 
-    freeze_shutdown = false ;
+				freeze_shutdown	=	false	;
 
-    default_clock = in_clock ;
+				default_clock	=	in_clock	;
 
-    change_clock(in_clock) ;
-    change_timer(in_timer) ;
+				change_clock(in_clock)	;
+				change_timer(in_timer)	;
 
-    align_sim_to_wall_clock = false ;
-    align_tic_mult = 1.0 ;
+				align_sim_to_wall_clock	=	false	;
+				align_tic_mult	=	1.0	;
 
-    sim_start_time = 0 ;
-    sim_end_init_time = 0 ;
-    sim_end_time = 0 ;
+				sim_start_time	=	0	;
+				sim_end_init_time	=	0	;
+				sim_end_time	=	0	;
 
-    actual_run_ratio = 0.0;
+				actual_run_ratio	=	0.0;
 
-    the_rts = this ;
+				the_rts	=	this	;
 
 }
 
 /**
 @details
--# Sets real-time enable flag to true. Requirement [@ref enable]
+-#	Sets	real-time	enable	flag	to	true.	Requirement	[@ref	enable]
 */
-int Trick::RealtimeSync::enable() {
-    enable_flag = true ;
-    return(0) ;
+int	Trick::RealtimeSync::enable()	{
+				enable_flag	=	true	;
+				return(0)	;
 }
 
 /**
 @details
--# Sets real-time disabled flag to true. Requirement [@ref disable]
+-#	Sets	real-time	disabled	flag	to	true.	Requirement	[@ref	disable]
 */
-int Trick::RealtimeSync::disable() {
-    disable_flag = true ;
-    return(0) ;
+int	Trick::RealtimeSync::disable()	{
+				disable_flag	=	true	;
+				return(0)	;
 }
 
 /**
 @details
--# Sets the real_time clock to the incoming class [@ref disable]
+-#	Sets	the	real_time	clock	to	the	incoming	class	[@ref	disable]
 */
-int Trick::RealtimeSync::change_clock(Trick::Clock * in_clock) {
-    int ret ;
-    ret = in_clock->clock_init() ;
-    if ( ret == 0 ) {
-        rt_clock = in_clock ;
-    }
-    return ret ;
+int	Trick::RealtimeSync::change_clock(Trick::Clock	*	in_clock)	{
+				int	ret	;
+				ret	=	in_clock->clock_init()	;
+				if	(	ret	==	0	)	{
+								rt_clock	=	in_clock	;
+				}
+				return	ret	;
 }
 
 /**
 @details
--# Sets the real_time clock to the incoming class [@ref disable]
+-#	Sets	the	real_time	clock	to	the	incoming	class	[@ref	disable]
 */
-const char * Trick::RealtimeSync::clock_get_name() {
-    return rt_clock->get_name() ;
+const	char	*	Trick::RealtimeSync::clock_get_name()	{
+				return	rt_clock->get_name()	;
 }
 
 /**
 @details
--# Sets the sleep timer to the incoming class [@ref disable]
+-#	Sets	the	sleep	timer	to	the	incoming	class	[@ref	disable]
 */
-int Trick::RealtimeSync::change_timer(Trick::Timer * in_sleep_timer) {
-    sleep_timer = in_sleep_timer ;
-    return 0 ;
+int	Trick::RealtimeSync::change_timer(Trick::Timer	*	in_sleep_timer)	{
+				sleep_timer	=	in_sleep_timer	;
+				return	0	;
 }
 
 /**
 @details
--# Calls Trick::Clock::set_rt_clock_ratio
--# Set the sleep timer to inactive for this frame as the ratio changes.
+-#	Calls	Trick::Clock::set_rt_clock_ratio
+-#	Set	the	sleep	timer	to	inactive	for	this	frame	as	the	ratio	changes.
 */
-int Trick::RealtimeSync::set_rt_clock_ratio(double in_clock_ratio) {
-    rt_clock->set_rt_clock_ratio(in_clock_ratio) ;
-    sleep_timer->set_active(false) ;
-    return 0 ;
+int	Trick::RealtimeSync::set_rt_clock_ratio(double	in_clock_ratio)	{
+				rt_clock->set_rt_clock_ratio(in_clock_ratio)	;
+				sleep_timer->set_active(false)	;
+				return	0	;
 }
 
-void Trick::RealtimeSync::get_sim_start_time() {
-    sim_start_time = default_clock->wall_clock_time() ;
+void	Trick::RealtimeSync::get_sim_start_time()	{
+				sim_start_time	=	default_clock->wall_clock_time()	;
 }
 
-void Trick::RealtimeSync::get_sim_end_init_time() {
-    sim_end_init_time = default_clock->wall_clock_time() ;
+void	Trick::RealtimeSync::get_sim_end_init_time()	{
+				sim_end_init_time	=	default_clock->wall_clock_time()	;
 }
 
-void Trick::RealtimeSync::get_sim_end_time() {
-    sim_end_time = default_clock->wall_clock_time() ;
+void	Trick::RealtimeSync::get_sim_end_time()	{
+				sim_end_time	=	default_clock->wall_clock_time()	;
 }
 
 /**
 @details
--# If real-time synchronization has been enabled:
-   -# Set the active flag to true.
--# If real-time synchronization has been disabled set the active flag to false.
+-#	If	real-time	synchronization	has	been	enabled:
+			-#	Set	the	active	flag	to	true.
+-#	If	real-time	synchronization	has	been	disabled	set	the	active	flag	to	false.
 */
-int Trick::RealtimeSync::initialize() {
-
-    if ( enable_flag ) {
-        active = true ;
-        enable_flag = false ;
-    }
-
-    if ( disable_flag ) {
-        active = false ;
-        disable_flag = false ;
-    }
-
-    tics_per_sec =  exec_get_time_tic_value();
-
-    /* Start the sleep timer hardware if realtime is active */
-    start_sleep_timer();
-
-    if ( align_sim_to_wall_clock ) {
-        rt_clock->clock_reset(0) ;
-        rt_clock->sync_to_wall_clock( align_tic_mult , tics_per_sec ) ;
-        message_publish(MSG_INFO, "Syncing sim to %f second wall clock interval\n", align_tic_mult ) ;
-        rt_clock->clock_spin(0) ;
-        if ( exec_get_mode() == Freeze ) {
-            rt_clock->clock_reset(exec_get_freeze_time_tics()) ;
-        } else {
-            rt_clock->clock_reset(exec_get_time_tics()) ;
-        }
-    }
-
-    return(0) ;
+int	Trick::RealtimeSync::initialize()	{
+
+				if	(	enable_flag	)	{
+								active	=	true	;
+								enable_flag	=	false	;
+				}
+
+				if	(	disable_flag	)	{
+								active	=	false	;
+								disable_flag	=	false	;
+				}
+
+				tics_per_sec	=		exec_get_time_tic_value();
+
+				/*	Start	the	sleep	timer	hardware	if	realtime	is	active	*/
+				start_sleep_timer();
+
+				if	(	align_sim_to_wall_clock	)	{
+								rt_clock->clock_reset(0)	;
+								rt_clock->sync_to_wall_clock(	align_tic_mult	,	tics_per_sec	)	;
+								message_publish(MSG_INFO,	"Syncing	sim	to	%f	second	wall	clock	interval\n",	align_tic_mult	)	;
+								rt_clock->clock_spin(0)	;
+								if	(	exec_get_mode()	==	Freeze	)	{
+												rt_clock->clock_reset(exec_get_freeze_time_tics())	;
+								}	else	{
+												rt_clock->clock_reset(exec_get_time_tics())	;
+								}
+				}
+
+				return(0)	;
 }
 
 /**
 @details
--# If real-time synchronization is active
-   -# Call the real-time clock initialization routine [@ref clock_init]
-   -# Call the sleep timer initialization
-   -# Set the sleep timer frame period to software frame period
-   -# Calculate the maximum overrun time in simulation tics.
+-#	If	real-time	synchronization	is	active
+			-#	Call	the	real-time	clock	initialization	routine	[@ref	clock_init]
+			-#	Call	the	sleep	timer	initialization
+			-#	Set	the	sleep	timer	frame	period	to	software	frame	period
+			-#	Calculate	the	maximum	overrun	time	in	simulation	tics.
 */
-int Trick::RealtimeSync::start_sleep_timer() {
+int	Trick::RealtimeSync::start_sleep_timer()	{
 
-    if ( active && (exec_get_time_tics() >= 0.0)) {
-        /* Call sleep timer init to start sleep timer hardware */
-        sleep_timer->init() ;
+				if	(	active	&&	(exec_get_time_tics()	>=	0.0))	{
+								/*	Call	sleep	timer	init	to	start	sleep	timer	hardware	*/
+								sleep_timer->init()	;
 
-        if ( rt_max_overrun_time > 1e36 ) {
-            rt_max_overrun_time_tics = TRICK_MAX_LONG_LONG ;
-        } else {
-            rt_max_overrun_time_tics = (long long)(rt_max_overrun_time * tics_per_sec) ;
-        }
+								if	(	rt_max_overrun_time	>	1e36	)	{
+												rt_max_overrun_time_tics	=	TRICK_MAX_LONG_LONG	;
+								}	else	{
+												rt_max_overrun_time_tics	=	(long	long)(rt_max_overrun_time	*	tics_per_sec)	;
+								}
 
-    }
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
 @details
--# Get the sim_mode
--# Reset the real-time clock reference
--# If sim_mode is Run
-   -# Call start_realtime to start the real time clock
--# Else if sim_mode is Freeze
-   -# Call freeze init to set the sleep timer to freeze mode.
+-#	Get	the	sim_mode
+-#	Reset	the	real-time	clock	reference
+-#	If	sim_mode	is	Run
+			-#	Call	start_realtime	to	start	the	real	time	clock
+-#	Else	if	sim_mode	is	Freeze
+			-#	Call	freeze	init	to	set	the	sleep	timer	to	freeze	mode.
 */
-int Trick::RealtimeSync::restart(long long ref_time) {
+int	Trick::RealtimeSync::restart(long	long	ref_time)	{
 
-    SIM_MODE sim_mode = exec_get_mode() ;
+				SIM_MODE	sim_mode	=	exec_get_mode()	;
 
-    rt_clock->clock_reset(ref_time) ;
-    if ( sim_mode == Run ) {
-        start_realtime(exec_get_software_frame() , ref_time) ;
-    } else if ( sim_mode == Freeze ) {
-        freeze_init(exec_get_freeze_frame()) ;
-    }
+				rt_clock->clock_reset(ref_time)	;
+				if	(	sim_mode	==	Run	)	{
+								start_realtime(exec_get_software_frame()	,	ref_time)	;
+				}	else	if	(	sim_mode	==	Freeze	)	{
+								freeze_init(exec_get_freeze_frame())	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# If real-time synchronization is active
-   -# If the sim time is 0 or higher (do not run in real time for negative sim time)
-      -# Reset the real-time clock to the incoming reference time
-      -# Save the current real-time as the start of the frame reference
-      -# Start the sleep timer
-   -# Else reset active to false and enable_flag to true
+-#	If	real-time	synchronization	is	active
+			-#	If	the	sim	time	is	0	or	higher	(do	not	run	in	real	time	for	negative	sim	time)
+						-#	Reset	the	real-time	clock	to	the	incoming	reference	time
+						-#	Save	the	current	real-time	as	the	start	of	the	frame	reference
+						-#	Start	the	sleep	timer
+			-#	Else	reset	active	to	false	and	enable_flag	to	true
 */
-int Trick::RealtimeSync::start_realtime(double in_frame_time , long long ref_time) {
+int	Trick::RealtimeSync::start_realtime(double	in_frame_time	,	long	long	ref_time)	{
 
-    if ( active ) {
+				if	(	active	)	{
 
-        /* Only run in real time when sim time reaches 0.0 */
-        if (ref_time >= 0) {
+								/*	Only	run	in	real	time	when	sim	time	reaches	0.0	*/
+								if	(ref_time	>=	0)	{
 
-            /* Reset the clock reference time to the desired reference time */
-            rt_clock->clock_reset(ref_time) ;
+												/*	Reset	the	clock	reference	time	to	the	desired	reference	time	*/
+												rt_clock->clock_reset(ref_time)	;
 
-            /* Start the sleep timer hardware */
-            start_sleep_timer();
+												/*	Start	the	sleep	timer	hardware	*/
+												start_sleep_timer();
 
-            /* Start the sleep timer */
-            sleep_timer->start(in_frame_time / rt_clock->get_rt_clock_ratio()) ;
+												/*	Start	the	sleep	timer	*/
+												sleep_timer->start(in_frame_time	/	rt_clock->get_rt_clock_ratio())	;
 
-        } else {
+								}	else	{
 
-            /* Reset active and enable_flag so rt_monitor will try and start
-               real time at the end of next software frame                   */
-            active = false;
-            enable_flag = true;
-        }
+												/*	Reset	active	and	enable_flag	so	rt_monitor	will	try	and	start
+															real	time	at	the	end	of	next	software	frame																			*/
+												active	=	false;
+												enable_flag	=	true;
+								}
 
-    }
+				}
 
-    /* Set top of frame time for 1st frame (used in frame logging). */
-    last_clock_time = rt_clock->clock_time() ;
+				/*	Set	top	of	frame	time	for	1st	frame	(used	in	frame	logging).	*/
+				last_clock_time	=	rt_clock->clock_time()	;
 
-    return(0) ;
+				return(0)	;
 }
 
-template <size_t N>
-class Run_Ratio {
-  public:
-    Run_Ratio() : num_samples(0) {}
-    Run_Ratio& operator()(long long sample, double in_rt_ratio)
-    {
-        samples[num_samples++ % N] = sample;
-        rt_ratio = in_rt_ratio;
-        return *this;
-    }
-
-    operator double() const {
-        if ( num_samples <= 1 ) {
-            return 0.0 ;
-        } else if ( num_samples < N ) {
-            return round(exec_get_software_frame() * (num_samples-1) * exec_get_time_tic_value() * rt_ratio / (double)(samples[num_samples - 1] - samples[0])*100.0)/100.0 ;
-        } else {
-            return round(exec_get_software_frame() * (N-1) * exec_get_time_tic_value() * rt_ratio / (double)(samples[(num_samples - 1) % N] - samples[num_samples % N])*100.0)/100.0 ;
-        }
-    }
-
-  private:
-    long long samples[N];
-    size_t num_samples;
-    double rt_ratio;
+template	<size_t	N>
+class	Run_Ratio	{
+		public:
+				Run_Ratio()	:	num_samples(0)	{}
+				Run_Ratio&	operator()(long	long	sample,	double	in_rt_ratio)
+				{
+								samples[num_samples++	%	N]	=	sample;
+								rt_ratio	=	in_rt_ratio;
+								return	*this;
+				}
+
+				operator	double()	const	{
+								if	(	num_samples	<=	1	)	{
+												return	0.0	;
+								}	else	if	(	num_samples	<	N	)	{
+												return	round(exec_get_software_frame()	*	(num_samples-1)	*	exec_get_time_tic_value()	*	rt_ratio	/	(double)(samples[num_samples	-	1]	-	samples[0])*100.0)/100.0	;
+								}	else	{
+												return	round(exec_get_software_frame()	*	(N-1)	*	exec_get_time_tic_value()	*	rt_ratio	/	(double)(samples[(num_samples	-	1)	%	N]	-	samples[num_samples	%	N])*100.0)/100.0	;
+								}
+				}
+
+		private:
+				long	long	samples[N];
+				size_t	num_samples;
+				double	rt_ratio;
 };
 
 /**
 @details
--# If real-time is not active:
-   -# If real-time synchronization has been enabled:
-      -# Set the active flag to true.
-      -# Start real-time setting the real-time clock to the current simulation time.
-   -# exit end of frame routine
--# If real-time is active:
-   -# If real-time synchronization has been disabled:
-      -# Set the active flag to false.
--# Get the current real-time.
--# Calculate the real-time taken for the last frame of execution.
--# if the frame has overrun
-   -# Increment the number of consecutive overruns
-   -# If the maximum number of consecutive overrun frames has
-      been reached or the maximum single overrun time has been exceeded
-      -# If the freeze/terminate action was set
-         -# set the freeze_terminate flag
-         -# freeze the simulation
-      -# Else terminate the simulation
-   -# Stop the sleep timer.
--# Else the frame has underrun
-   -# Reset the number of consecutive overruns to 0.
-   -# Pause for the sleep timer to expire
-   -# Spin for the real-time clock to match the simulation time
-   -# Reset the sleep timer for the next frame
--# Save the current real-time as the start of the frame reference
+-#	If	real-time	is	not	active:
+			-#	If	real-time	synchronization	has	been	enabled:
+						-#	Set	the	active	flag	to	true.
+						-#	Start	real-time	setting	the	real-time	clock	to	the	current	simulation	time.
+			-#	exit	end	of	frame	routine
+-#	If	real-time	is	active:
+			-#	If	real-time	synchronization	has	been	disabled:
+						-#	Set	the	active	flag	to	false.
+-#	Get	the	current	real-time.
+-#	Calculate	the	real-time	taken	for	the	last	frame	of	execution.
+-#	if	the	frame	has	overrun
+			-#	Increment	the	number	of	consecutive	overruns
+			-#	If	the	maximum	number	of	consecutive	overrun	frames	has
+						been	reached	or	the	maximum	single	overrun	time	has	been	exceeded
+						-#	If	the	freeze/terminate	action	was	set
+									-#	set	the	freeze_terminate	flag
+									-#	freeze	the	simulation
+						-#	Else	terminate	the	simulation
+			-#	Stop	the	sleep	timer.
+-#	Else	the	frame	has	underrun
+			-#	Reset	the	number	of	consecutive	overruns	to	0.
+			-#	Pause	for	the	sleep	timer	to	expire
+			-#	Spin	for	the	real-time	clock	to	match	the	simulation	time
+			-#	Reset	the	sleep	timer	for	the	next	frame
+-#	Save	the	current	real-time	as	the	start	of	the	frame	reference
 */
-int Trick::RealtimeSync::rt_monitor(long long sim_time_tics) {
-
-    long long curr_clock_time ;
-    char buf[512];
-    static Run_Ratio<100> run_ratio ;
-
-    /* calculate the current underrun/overrun */
-    curr_clock_time = rt_clock->clock_time() ;
-    frame_sched_time = curr_clock_time - last_clock_time ;
-    frame_time = frame_sched_time * (1.0/tics_per_sec);
-
-    /* Set the next frame overrun/underrun reference time to the current time */
-    last_clock_time = curr_clock_time ;
-
-    /* determine if the state of real-time has changed this frame */
-    if ( ! active ) {
-        if ( enable_flag ) {
-            active = true ;
-            enable_flag = false ;
-            start_realtime(exec_get_software_frame() , sim_time_tics) ;
-        }
-        if ( disable_flag ) {
-            disable_flag = false ;
-        }
-        /* calculate run ratio in non-realtime mode */
-        actual_run_ratio = run_ratio(curr_clock_time, 1.0);
-        return(0) ;
-    }
-    if ( enable_flag ) {
-        enable_flag = false ;
-    }
-    if ( disable_flag ) {
-        active = false ;
-        disable_flag = false ;
-    }
-
-    frame_overrun_time = curr_clock_time - sim_time_tics ;
-
-    frame_overrun = frame_overrun_time * (1.0/tics_per_sec);
-
-    /* If the wall clock time is greater than the sim time an overrun occurred. */
-    if (curr_clock_time > sim_time_tics) {
-
-        /* Update the overrun counter and current overrun time */
-        frame_overrun_cnt++;
-        total_overrun++;
-
-        /* If the number overruns surpass the maximum allowed freeze or shutdown. */
-        if (frame_overrun_cnt >= rt_max_overrun_cnt || frame_overrun_time >= rt_max_overrun_time_tics) {
-
-            /* If the rt_overrun_freeze flag is set, enter freeze mode else terminate the simulation. */
-            if (rt_overrun_freeze == true) {
-                freeze_shutdown = true ;
-                message_publish(MSG_ERROR, "\nMaximum overrun condition exceeded:\n"
-                    "consecutive overruns/allowed overruns: %d/%d\n"
-                    "total overrun time/allowed time: %f/%g\n"
-                    "Entering Freeze-Shutdown Mode\n" ,
-                    frame_overrun_cnt, rt_max_overrun_cnt,
-                    (double)(frame_overrun_time/tics_per_sec), rt_max_overrun_time);
-                exec_freeze() ;
-            } else {
-                snprintf(buf, sizeof(buf), "\nMaximum overrun condition exceeded:\n"
-                    "consecutive overruns/allowed overruns: %d/%d\n"
-                    "total overrun time/allowed time: %f/%g\n",
-                    frame_overrun_cnt, rt_max_overrun_cnt,
-                    (double)(frame_overrun_time/tics_per_sec), rt_max_overrun_time);
-                exec_terminate_with_return(-1 , __FILE__ , __LINE__ , buf);
-            }
-        }
-
-        /* stop the sleep timer in an overrun condition */
-        sleep_timer->stop() ;
-
-        /* Call clock_spin to allow interrupt driven clocks to service their interrupts */
-        curr_clock_time = rt_clock->clock_spin(sim_time_tics) ;
-
-    } else {
-
-        /* Else an underrun condition occurred. */
-
-        /* Reset consecutive overrun counter frame_overrun_cnt */
-        frame_overrun_cnt = 0;
-
-        /* pause for the timer to signal the end of frame */
-        sleep_timer->pause() ;
-
-        /* Spin to make sure that we are at the top of the frame */
-        curr_clock_time = rt_clock->clock_spin(sim_time_tics) ;
-
-        /* If the timer requires to be reset at the end of each frame, reset it here. */
-        sleep_timer->reset(exec_get_software_frame() / rt_clock->get_rt_clock_ratio()) ;
-
-        /* Calculate the run ratio after sleeping */
-        actual_run_ratio = run_ratio(curr_clock_time, rt_clock->get_rt_clock_ratio());
-    }
-
-    return(0) ;
+int	Trick::RealtimeSync::rt_monitor(long	long	sim_time_tics)	{
+
+				long	long	curr_clock_time	;
+				char	buf[512];
+				static	Run_Ratio<100>	run_ratio	;
+
+				/*	calculate	the	current	underrun/overrun	*/
+				curr_clock_time	=	rt_clock->clock_time()	;
+				frame_sched_time	=	curr_clock_time	-	last_clock_time	;
+				frame_time	=	frame_sched_time	*	(1.0/tics_per_sec);
+
+				/*	Set	the	next	frame	overrun/underrun	reference	time	to	the	current	time	*/
+				last_clock_time	=	curr_clock_time	;
+
+				/*	determine	if	the	state	of	real-time	has	changed	this	frame	*/
+				if	(	!	active	)	{
+								if	(	enable_flag	)	{
+												active	=	true	;
+												enable_flag	=	false	;
+												start_realtime(exec_get_software_frame()	,	sim_time_tics)	;
+								}
+								if	(	disable_flag	)	{
+												disable_flag	=	false	;
+								}
+								/*	calculate	run	ratio	in	non-realtime	mode	*/
+								actual_run_ratio	=	run_ratio(curr_clock_time,	1.0);
+								return(0)	;
+				}
+				if	(	enable_flag	)	{
+								enable_flag	=	false	;
+				}
+				if	(	disable_flag	)	{
+								active	=	false	;
+								disable_flag	=	false	;
+				}
+
+				frame_overrun_time	=	curr_clock_time	-	sim_time_tics	;
+
+				frame_overrun	=	frame_overrun_time	*	(1.0/tics_per_sec);
+
+				/*	If	the	wall	clock	time	is	greater	than	the	sim	time	an	overrun	occurred.	*/
+				if	(curr_clock_time	>	sim_time_tics)	{
+
+								/*	Update	the	overrun	counter	and	current	overrun	time	*/
+								frame_overrun_cnt++;
+								total_overrun++;
+
+								/*	If	the	number	overruns	surpass	the	maximum	allowed	freeze	or	shutdown.	*/
+								if	(frame_overrun_cnt	>=	rt_max_overrun_cnt	||	frame_overrun_time	>=	rt_max_overrun_time_tics)	{
+
+												/*	If	the	rt_overrun_freeze	flag	is	set,	enter	freeze	mode	else	terminate	the	simulation.	*/
+												if	(rt_overrun_freeze	==	true)	{
+																freeze_shutdown	=	true	;
+																message_publish(MSG_ERROR,	"\nMaximum	overrun	condition	exceeded:\n"
+																				"consecutive	overruns/allowed	overruns:	%d/%d\n"
+																				"total	overrun	time/allowed	time:	%f/%g\n"
+																				"Entering	Freeze-Shutdown	Mode\n"	,
+																				frame_overrun_cnt,	rt_max_overrun_cnt,
+																				(double)(frame_overrun_time/tics_per_sec),	rt_max_overrun_time);
+																exec_freeze()	;
+												}	else	{
+																snprintf(buf,	sizeof(buf),	"\nMaximum	overrun	condition	exceeded:\n"
+																				"consecutive	overruns/allowed	overruns:	%d/%d\n"
+																				"total	overrun	time/allowed	time:	%f/%g\n",
+																				frame_overrun_cnt,	rt_max_overrun_cnt,
+																				(double)(frame_overrun_time/tics_per_sec),	rt_max_overrun_time);
+																exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	buf);
+												}
+								}
+
+								/*	stop	the	sleep	timer	in	an	overrun	condition	*/
+								sleep_timer->stop()	;
+
+								/*	Call	clock_spin	to	allow	interrupt	driven	clocks	to	service	their	interrupts	*/
+								curr_clock_time	=	rt_clock->clock_spin(sim_time_tics)	;
+
+				}	else	{
+
+								/*	Else	an	underrun	condition	occurred.	*/
+
+								/*	Reset	consecutive	overrun	counter	frame_overrun_cnt	*/
+								frame_overrun_cnt	=	0;
+
+								/*	pause	for	the	timer	to	signal	the	end	of	frame	*/
+								sleep_timer->pause()	;
+
+								/*	Spin	to	make	sure	that	we	are	at	the	top	of	the	frame	*/
+								curr_clock_time	=	rt_clock->clock_spin(sim_time_tics)	;
+
+								/*	If	the	timer	requires	to	be	reset	at	the	end	of	each	frame,	reset	it	here.	*/
+								sleep_timer->reset(exec_get_software_frame()	/	rt_clock->get_rt_clock_ratio())	;
+
+								/*	Calculate	the	run	ratio	after	sleeping	*/
+								actual_run_ratio	=	run_ratio(curr_clock_time,	rt_clock->get_rt_clock_ratio());
+				}
+
+				return(0)	;
 }
 
 /**
 @details
--# If real-time synchronization is active
-   -# Set the sleep timer frame period to freeze frame period
-   -# Start real-time setting the real-time clock at 0.
+-#	If	real-time	synchronization	is	active
+			-#	Set	the	sleep	timer	frame	period	to	freeze	frame	period
+			-#	Start	real-time	setting	the	real-time	clock	at	0.
 */
-int Trick::RealtimeSync::freeze_init(double freeze_frame_sec) {
-
-    if ( active ) {
-        sleep_timer->start( freeze_frame_sec / rt_clock->get_rt_clock_ratio()) ;
-    }
-    freeze_frame = (long long)(freeze_frame_sec * tics_per_sec) ;
-    freeze_time_tics = exec_get_time_tics() ;
-    return 0  ;
+int	Trick::RealtimeSync::freeze_init(double	freeze_frame_sec)	{
+
+				if	(	active	)	{
+								sleep_timer->start(	freeze_frame_sec	/	rt_clock->get_rt_clock_ratio())	;
+				}
+				freeze_frame	=	(long	long)(freeze_frame_sec	*	tics_per_sec)	;
+				freeze_time_tics	=	exec_get_time_tics()	;
+				return	0		;
 }
 
 /**
 @details
--# If real-time is not active:
-   -# If real-time synchronization has been enabled:
-      -# Set the active flag to true.
-      -# Set the sleep timer frame period to freeze frame period
-      -# Start real-time setting the real-time clock at currnent freeze time.
-   -# exit end of frame routine
-# If real-time synchronization has been disabled:
-  -# Set the active flag to false.
--# Pause for the sleep timer to expire
--# Spin for the real-time clock to match the simulation time
--# Advanced freeze time.
+-#	If	real-time	is	not	active:
+			-#	If	real-time	synchronization	has	been	enabled:
+						-#	Set	the	active	flag	to	true.
+						-#	Set	the	sleep	timer	frame	period	to	freeze	frame	period
+						-#	Start	real-time	setting	the	real-time	clock	at	currnent	freeze	time.
+			-#	exit	end	of	frame	routine
+#	If	real-time	synchronization	has	been	disabled:
+		-#	Set	the	active	flag	to	false.
+-#	Pause	for	the	sleep	timer	to	expire
+-#	Spin	for	the	real-time	clock	to	match	the	simulation	time
+-#	Advanced	freeze	time.
 */
-int Trick::RealtimeSync::freeze_pause(double freeze_frame_sec) {
-
-    /* Determine if the state of real-time has changed this frame */
-    if ( ! active ) {
-        if ( enable_flag ) {
-            active = true ;
-            enable_flag = false ;
-            start_realtime(freeze_frame_sec , freeze_time_tics) ;
-        }
-        if ( disable_flag ) {
-            disable_flag = false ;
-        }
-        return(0) ;
-    }
-
-    if ( enable_flag ) {
-        enable_flag = false ;
-    }
-    if ( disable_flag ) {
-        active = false ;
-        disable_flag = false ;
-    }
-
-    /* If a sleep timer has been defined pause for the timer to signal the end of frame */
-    sleep_timer->pause() ;
-
-    /* Spin to make sure that we are at the top of the frame */
-    rt_clock->clock_spin(freeze_time_tics + freeze_frame) ;
-
-    /* If the timer requires to be reset at the end of each frame, reset it here. */
-    sleep_timer->reset(freeze_frame_sec / rt_clock->get_rt_clock_ratio()) ;
-
-    freeze_time_tics += freeze_frame ;
-
-    return(0) ;
+int	Trick::RealtimeSync::freeze_pause(double	freeze_frame_sec)	{
+
+				/*	Determine	if	the	state	of	real-time	has	changed	this	frame	*/
+				if	(	!	active	)	{
+								if	(	enable_flag	)	{
+												active	=	true	;
+												enable_flag	=	false	;
+												start_realtime(freeze_frame_sec	,	freeze_time_tics)	;
+								}
+								if	(	disable_flag	)	{
+												disable_flag	=	false	;
+								}
+								return(0)	;
+				}
+
+				if	(	enable_flag	)	{
+								enable_flag	=	false	;
+				}
+				if	(	disable_flag	)	{
+								active	=	false	;
+								disable_flag	=	false	;
+				}
+
+				/*	If	a	sleep	timer	has	been	defined	pause	for	the	timer	to	signal	the	end	of	frame	*/
+				sleep_timer->pause()	;
+
+				/*	Spin	to	make	sure	that	we	are	at	the	top	of	the	frame	*/
+				rt_clock->clock_spin(freeze_time_tics	+	freeze_frame)	;
+
+				/*	If	the	timer	requires	to	be	reset	at	the	end	of	each	frame,	reset	it	here.	*/
+				sleep_timer->reset(freeze_frame_sec	/	rt_clock->get_rt_clock_ratio())	;
+
+				freeze_time_tics	+=	freeze_frame	;
+
+				return(0)	;
 
 }
 
 /**
 @details
--# If real-time is active:
-   -# If the freeze_terminate flag is set, terminate the simulation
--# Set the sleep timer frame period to software frame period
--# Start real-time setting the real-time clock to the current simulation time.
+-#	If	real-time	is	active:
+			-#	If	the	freeze_terminate	flag	is	set,	terminate	the	simulation
+-#	Set	the	sleep	timer	frame	period	to	software	frame	period
+-#	Start	real-time	setting	the	real-time	clock	to	the	current	simulation	time.
 */
-int Trick::RealtimeSync::unfreeze(long long sim_time_tics, double software_frame_sec) {
+int	Trick::RealtimeSync::unfreeze(long	long	sim_time_tics,	double	software_frame_sec)	{
 
-    if ( active ) {
+				if	(	active	)	{
 
-        /* If the overrun freeze_shutdown condition was met terminate the simulation */
-        if (freeze_shutdown) {
-            exec_terminate_with_return(-1 , __FILE__ , __LINE__ , "Freeze-Shutdown condition reached.");
-        }
+								/*	If	the	overrun	freeze_shutdown	condition	was	met	terminate	the	simulation	*/
+								if	(freeze_shutdown)	{
+												exec_terminate_with_return(-1	,	__FILE__	,	__LINE__	,	"Freeze-Shutdown	condition	reached.");
+								}
 
-        /* Adjust the real-time clock reference by the amount of time we were frozen */
-        rt_clock->adjust_ref_time(freeze_time_tics - sim_time_tics) ;
+								/*	Adjust	the	real-time	clock	reference	by	the	amount	of	time	we	were	frozen	*/
+								rt_clock->adjust_ref_time(freeze_time_tics	-	sim_time_tics)	;
 
-        /* Start the sleep timer with the software frame expiration */
-        sleep_timer->start(software_frame_sec / rt_clock->get_rt_clock_ratio()) ;
+								/*	Start	the	sleep	timer	with	the	software	frame	expiration	*/
+								sleep_timer->start(software_frame_sec	/	rt_clock->get_rt_clock_ratio())	;
 
-    }
+				}
 
-    /* Set top of frame time for 1st frame (used in frame logging). */
-    last_clock_time = rt_clock->clock_time() ;
+				/*	Set	top	of	frame	time	for	1st	frame	(used	in	frame	logging).	*/
+				last_clock_time	=	rt_clock->clock_time()	;
 
-    return(0) ;
+				return(0)	;
 }
 
 /**
 @details
--# If real-time is active:
-   -# Stop the real-time clock hardware
-   -# Stop the sleep timer hardware
-   -# Print the overrun count
+-#	If	real-time	is	active:
+			-#	Stop	the	real-time	clock	hardware
+			-#	Stop	the	sleep	timer	hardware
+			-#	Print	the	overrun	count
 */
-int Trick::RealtimeSync::shutdown() {
-
-    if ( active ) {
-        /* Stop the clock */
-        rt_clock->clock_stop() ;
-
-        /* If a sleep timer has been defined, stop the timer */
-        sleep_timer->shutdown() ;
-    }
-
-    std::stringstream os ;
-    double actual_time = (sim_end_time - sim_start_time) / (double)default_clock->clock_tics_per_sec ;
-    os << "\n" <<
-     "     REALTIME SHUTDOWN STATS:\n" ;
-    if ( active ) {
-        os << "     REALTIME TOTAL OVERRUNS: " << std::setw(12) << total_overrun << "\n" ;
-    }
-    if ( sim_end_init_time != 0 ) {
-        double init_time = (sim_end_init_time - sim_start_time) / (double)default_clock->clock_tics_per_sec ;
-        os <<  "            ACTUAL INIT TIME: " ;
-        os <<  std::fixed << std::setw(12) << std::setprecision(3) << init_time << "\n" ;
-    }
-    os <<  "         ACTUAL ELAPSED TIME: " ;
-    os << std::fixed << std::setw(12) << std::setprecision(3) << actual_time << "\n" ;
-    message_publish(MSG_NORMAL,os.str().c_str()) ;
-
-    return(0) ;
+int	Trick::RealtimeSync::shutdown()	{
+
+				if	(	active	)	{
+								/*	Stop	the	clock	*/
+								rt_clock->clock_stop()	;
+
+								/*	If	a	sleep	timer	has	been	defined,	stop	the	timer	*/
+								sleep_timer->shutdown()	;
+				}
+
+				std::stringstream	os	;
+				double	actual_time	=	(sim_end_time	-	sim_start_time)	/	(double)default_clock->clock_tics_per_sec	;
+				os	<<	"\n"	<<
+					"					REALTIME	SHUTDOWN	STATS:\n"	;
+				if	(	active	)	{
+								os	<<	"					REALTIME	TOTAL	OVERRUNS:	"	<<	std::setw(12)	<<	total_overrun	<<	"\n"	;
+				}
+				if	(	sim_end_init_time	!=	0	)	{
+								double	init_time	=	(sim_end_init_time	-	sim_start_time)	/	(double)default_clock->clock_tics_per_sec	;
+								os	<<		"												ACTUAL	INIT	TIME:	"	;
+								os	<<		std::fixed	<<	std::setw(12)	<<	std::setprecision(3)	<<	init_time	<<	"\n"	;
+				}
+				os	<<		"									ACTUAL	ELAPSED	TIME:	"	;
+				os	<<	std::fixed	<<	std::setw(12)	<<	std::setprecision(3)	<<	actual_time	<<	"\n"	;
+				message_publish(MSG_NORMAL,os.str().c_str())	;
+
+				return(0)	;
 }
 
-bool Trick::RealtimeSync::is_active() {
-    return active;
+bool	Trick::RealtimeSync::is_active()	{
+				return	active;
 }
diff --git a/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
index b473b96bd..b38980d21 100644
--- a/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
+++ b/trick_source/sim_services/RealtimeSync/RealtimeSync_c_intf.cpp
@@ -1,134 +1,134 @@
 
-#include <stdio.h>
-#include "trick/RealtimeSync.hh"
-#include "trick/realtimesync_proto.h"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	<stdio.h>
+#include	"trick/RealtimeSync.hh"
+#include	"trick/realtimesync_proto.h"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
 
-/* Global singleton pointer to the real-time synchronization */
-extern Trick::RealtimeSync * the_rts ;
+/*	Global	singleton	pointer	to	the	real-time	synchronization	*/
+extern	Trick::RealtimeSync	*	the_rts	;
 
 /*************************************************************************/
-/* These routines are the "C" interface to the real-time synchronization */
+/*	These	routines	are	the	"C"	interface	to	the	real-time	synchronization	*/
 /*************************************************************************/
 
 /**
- * @relates Trick::RealtimeSync
- * @copydoc Trick::RealtimeSync::enable
- * C wrapper for Trick::RealtimeSync::enable
- */
-extern "C" int real_time_enable() {
-    if ( the_rts != NULL ) {
-        return the_rts->enable() ;
-    }
-    return(0) ;
+	*	@relates	Trick::RealtimeSync
+	*	@copydoc	Trick::RealtimeSync::enable
+	*	C	wrapper	for	Trick::RealtimeSync::enable
+	*/
+extern	"C"	int	real_time_enable()	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->enable()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::RealtimeSync
- * @copydoc Trick::RealtimeSync::disable
- * C wrapper for Trick::RealtimeSync::disable
- */
-extern "C" int real_time_disable() {
-    if ( the_rts != NULL ) {
-        return the_rts->disable() ;
-    }
-    return(0) ;
+	*	@relates	Trick::RealtimeSync
+	*	@copydoc	Trick::RealtimeSync::disable
+	*	C	wrapper	for	Trick::RealtimeSync::disable
+	*/
+extern	"C"	int	real_time_disable()	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->disable()	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::RealtimeSync
- * @copydoc Trick::RealtimeSync::start_realtime
- * C wrapper for Trick::RealtimeSync::start_realtime
- */
-extern "C" int real_time_restart(long long ref_time ) {
-    if ( the_rts != NULL ) {
-        return the_rts->start_realtime(exec_get_software_frame() , ref_time) ;
-    }
-    return(0) ;
+	*	@relates	Trick::RealtimeSync
+	*	@copydoc	Trick::RealtimeSync::start_realtime
+	*	C	wrapper	for	Trick::RealtimeSync::start_realtime
+	*/
+extern	"C"	int	real_time_restart(long	long	ref_time	)	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->start_realtime(exec_get_software_frame()	,	ref_time)	;
+				}
+				return(0)	;
 }
 
 /**
- * @relates Trick::RealtimeSync
-   @userdesc Return whether real-time synchronization is currently active.
-   @par Python Usage:
-   @code <my_int> = trick.is_real_time() @endcode
-   @return Trick::RealtimeSync::active (integer converted from boolean)
- */
-extern "C" int is_real_time() {
-    if ( the_rts != NULL ) {
-        return((int)(the_rts->is_active())) ;
-    }
-    return(0) ;
+	*	@relates	Trick::RealtimeSync
+			@userdesc	Return	whether	real-time	synchronization	is	currently	active.
+			@par	Python	Usage:
+			@code	<my_int>	=	trick.is_real_time()	@endcode
+			@return	Trick::RealtimeSync::active	(integer	converted	from	boolean)
+	*/
+extern	"C"	int	is_real_time()	{
+				if	(	the_rts	!=	NULL	)	{
+								return((int)(the_rts->is_active()))	;
+				}
+				return(0)	;
 }
 
-int real_time_change_clock(Trick::Clock * in_clock ) {
-    if ( the_rts != NULL ) {
-        return the_rts->change_clock(in_clock) ;
-    }
-    return -1 ;
+int	real_time_change_clock(Trick::Clock	*	in_clock	)	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->change_clock(in_clock)	;
+				}
+				return	-1	;
 }
 
-const char * real_time_clock_get_name() {
-    if ( the_rts != NULL ) {
-        return the_rts->clock_get_name() ;
-    }
-    return NULL ;
+const	char	*	real_time_clock_get_name()	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->clock_get_name()	;
+				}
+				return	NULL	;
 }
 
-int real_time_change_timer(Trick::Timer * in_sleep_timer ) {
-    if ( the_rts != NULL ) {
-        return the_rts->change_timer(in_sleep_timer) ;
-    }
-    return -1 ;
+int	real_time_change_timer(Trick::Timer	*	in_sleep_timer	)	{
+				if	(	the_rts	!=	NULL	)	{
+								return	the_rts->change_timer(in_sleep_timer)	;
+				}
+				return	-1	;
 }
 
-extern "C" int real_time_set_rt_clock_ratio(double in_clock_ratio) {
-    return the_rts->set_rt_clock_ratio(in_clock_ratio) ;
+extern	"C"	int	real_time_set_rt_clock_ratio(double	in_clock_ratio)	{
+				return	the_rts->set_rt_clock_ratio(in_clock_ratio)	;
 }
 
-// The lock memory functions are most closely related to real-time but are
-// not required for syncing.  Therefore keep the routines as stand
-// alone C functions.
+//	The	lock	memory	functions	are	most	closely	related	to	real-time	but	are
+//	not	required	for	syncing.		Therefore	keep	the	routines	as	stand
+//	alone	C	functions.
 
-#if __linux
-#include <sys/mman.h>
-#include <errno.h>
+#if	__linux
+#include	<sys/mman.h>
+#include	<errno.h>
 #endif
 
-extern "C" int real_time_lock_memory(int yes_no) {
-    /* lock or unlock memory based on yes_no parameter */
-    int ret = 0 ;
-#if __linux
-    if ( yes_no ) {
-        if ((ret = mlockall(MCL_CURRENT | MCL_FUTURE)) != 0 ) {
-            perror("Error locking memory.");
-            message_publish(MSG_ERROR, "Error %d when requesting memory lock.\n", errno);
-        } else {
-            message_publish(MSG_INFO, "Sim locked memory\n");
-        }
-    } else {
-        if ( (ret = munlockall()) != 0 ) {
-            perror("Error unlocking memory.");
-            message_publish(MSG_ERROR, "Error %d when requesting memory unlock.\n", errno);
-        } else {
-            message_publish(MSG_INFO, "Sim unlocked memory\n");
-        }
-
-    }
+extern	"C"	int	real_time_lock_memory(int	yes_no)	{
+				/*	lock	or	unlock	memory	based	on	yes_no	parameter	*/
+				int	ret	=	0	;
+#if	__linux
+				if	(	yes_no	)	{
+								if	((ret	=	mlockall(MCL_CURRENT	|	MCL_FUTURE))	!=	0	)	{
+												perror("Error	locking	memory.");
+												message_publish(MSG_ERROR,	"Error	%d	when	requesting	memory	lock.\n",	errno);
+								}	else	{
+												message_publish(MSG_INFO,	"Sim	locked	memory\n");
+								}
+				}	else	{
+								if	(	(ret	=	munlockall())	!=	0	)	{
+												perror("Error	unlocking	memory.");
+												message_publish(MSG_ERROR,	"Error	%d	when	requesting	memory	unlock.\n",	errno);
+								}	else	{
+												message_publish(MSG_INFO,	"Sim	unlocked	memory\n");
+								}
+
+				}
 #endif
-#if __APPLE__
-    (void)yes_no ;
-    message_publish(MSG_WARNING, "Warning: Trick on Darwin does not yet support memory locking.\n");
+#if	__APPLE__
+				(void)yes_no	;
+				message_publish(MSG_WARNING,	"Warning:	Trick	on	Darwin	does	not	yet	support	memory	locking.\n");
 #endif
-    return ret ;
+				return	ret	;
 }
 
 
-extern "C" int exec_set_lock_memory(int yes_no) {
-    message_publish(MSG_WARNING, "Warning: exec_set_lock_memory deprecated.  Use real_time_lock_memory (auto-called)\n");
-    return real_time_lock_memory(yes_no) ;
+extern	"C"	int	exec_set_lock_memory(int	yes_no)	{
+				message_publish(MSG_WARNING,	"Warning:	exec_set_lock_memory	deprecated.		Use	real_time_lock_memory	(auto-called)\n");
+				return	real_time_lock_memory(yes_no)	;
 }
 
diff --git a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
index 85824cf89..8a8568106 100644
--- a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
+++ b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
@@ -1,516 +1,516 @@
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include	<algorithm>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<stdio.h>
+#include	<string.h>
 
-#include "trick/ScheduledJobQueue.hh"
-#include "trick/ScheduledJobQueueInstrument.hh"
-#include "trick/TrickConstant.hh"
+#include	"trick/ScheduledJobQueue.hh"
+#include	"trick/ScheduledJobQueueInstrument.hh"
+#include	"trick/TrickConstant.hh"
 
 /**
 @design
--# Set #list to NULL
--# Set #list_list to 0
--# Set #curr_index to 0
--# Set #next_job_time to TRICK_MAX_LONG_LONG
+-#	Set	#list	to	NULL
+-#	Set	#list_list	to	0
+-#	Set	#curr_index	to	0
+-#	Set	#next_job_time	to	TRICK_MAX_LONG_LONG
 */
-Trick::ScheduledJobQueue::ScheduledJobQueue( ) {
+Trick::ScheduledJobQueue::ScheduledJobQueue(	)	{
 
-    list = NULL ;
-    list_size = 0 ;
-    curr_index = 0 ;
-    next_job_time = TRICK_MAX_LONG_LONG ;
+				list	=	NULL	;
+				list_size	=	0	;
+				curr_index	=	0	;
+				next_job_time	=	TRICK_MAX_LONG_LONG	;
 
 }
 
 /**
 @design
--# free list if it is not empty
+-#	free	list	if	it	is	not	empty
 */
-Trick::ScheduledJobQueue::~ScheduledJobQueue( ) {
-    if (list  != NULL ) {
-        free(list) ;
-    }
+Trick::ScheduledJobQueue::~ScheduledJobQueue(	)	{
+				if	(list		!=	NULL	)	{
+								free(list)	;
+				}
 }
 
-static bool compare_job_data(const Trick::JobData *a, const Trick::JobData *b) {
-    {
-        int ajc = a->job_class;
-        int bjc = b->job_class;
-        if (ajc < bjc)
-            return true;
-        if (ajc > bjc)
-            return false;
-    }
-    {
-        unsigned short ap = a->phase;
-        unsigned short bp = b->phase;
-        if (ap < bp)
-            return true;
-        if (ap > bp)
-            return false;
-    }
-    {
-        int asoi = a->sim_object_id;
-        int bsoi = b->sim_object_id;
-        if (asoi < bsoi)
-            return true;
-        if (asoi > bsoi)
-            return false;
-    }
-    return a->id < b->id;
+static	bool	compare_job_data(const	Trick::JobData	*a,	const	Trick::JobData	*b)	{
+				{
+								int	ajc	=	a->job_class;
+								int	bjc	=	b->job_class;
+								if	(ajc	<	bjc)
+												return	true;
+								if	(ajc	>	bjc)
+												return	false;
+				}
+				{
+								unsigned	short	ap	=	a->phase;
+								unsigned	short	bp	=	b->phase;
+								if	(ap	<	bp)
+												return	true;
+								if	(ap	>	bp)
+												return	false;
+				}
+				{
+								int	asoi	=	a->sim_object_id;
+								int	bsoi	=	b->sim_object_id;
+								if	(asoi	<	bsoi)
+												return	true;
+								if	(asoi	>	bsoi)
+												return	false;
+				}
+				return	a->id	<	b->id;
 }
 
 /**
 @design
--# Allocate additional memory for the incoming job
--# Find the insertion point in the queue based on the job_class, the phase,
-   the sim_object id, and the job_id
--# Move the jobs after the insertion point to the right by one.
--# Insert the new job at the insertion point.
--# Increment the size of the queue.
+-#	Allocate	additional	memory	for	the	incoming	job
+-#	Find	the	insertion	point	in	the	queue	based	on	the	job_class,	the	phase,
+			the	sim_object	id,	and	the	job_id
+-#	Move	the	jobs	after	the	insertion	point	to	the	right	by	one.
+-#	Insert	the	new	job	at	the	insertion	point.
+-#	Increment	the	size	of	the	queue.
 */
-int Trick::ScheduledJobQueue::push( JobData * new_job ) {
+int	Trick::ScheduledJobQueue::push(	JobData	*	new_job	)	{
 
-    /* Allocate additional memory for the additional job in the queue */
-    JobData ** new_list = (JobData **)realloc(list, (list_size + 1) * sizeof(JobData *)) ;
-    if (!new_list) {
-        abort();
-    }
-    list = new_list;
-    JobData ** list_end = list + list_size;
-    JobData ** insert_pt = std::upper_bound(list, list_end, new_job, compare_job_data);
-    if (insert_pt != list_end) {
-        memmove(insert_pt + 1, insert_pt, (list_end - insert_pt) * sizeof(JobData *));
-    }
-    *insert_pt = new_job;
+				/*	Allocate	additional	memory	for	the	additional	job	in	the	queue	*/
+				JobData	**	new_list	=	(JobData	**)realloc(list,	(list_size	+	1)	*	sizeof(JobData	*))	;
+				if	(!new_list)	{
+								abort();
+				}
+				list	=	new_list;
+				JobData	**	list_end	=	list	+	list_size;
+				JobData	**	insert_pt	=	std::upper_bound(list,	list_end,	new_job,	compare_job_data);
+				if	(insert_pt	!=	list_end)	{
+								memmove(insert_pt	+	1,	insert_pt,	(list_end	-	insert_pt)	*	sizeof(JobData	*));
+				}
+				*insert_pt	=	new_job;
 
-    new_job->set_handled(true) ;
+				new_job->set_handled(true)	;
 
-    /* Increment the size of the queue */
-    list_size++ ;
+				/*	Increment	the	size	of	the	queue	*/
+				list_size++	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
 /**
 @design
--# Temporarily assign a high sim_object id to the incoming job.  This
-   effectively removes the sim_object_id as an ordering field
--# Call Trick::ScheduledJobQueue::push( JobData * ) to add the job to the queue.
--# Restore the original sim_object id.
+-#	Temporarily	assign	a	high	sim_object	id	to	the	incoming	job.		This
+			effectively	removes	the	sim_object_id	as	an	ordering	field
+-#	Call	Trick::ScheduledJobQueue::push(	JobData	*	)	to	add	the	job	to	the	queue.
+-#	Restore	the	original	sim_object	id.
 */
-int Trick::ScheduledJobQueue::push_ignore_sim_object( JobData * new_job ) {
-
-    int save_sim_object_id ;
-    int ret ;
-
-    /* Temorarily assign a really high sim_object id  */
-    save_sim_object_id = new_job->sim_object_id ;
-    new_job->sim_object_id = 1000000 ;
-    /* push the job onto the scheduling queue as normal */
-    ret = push(new_job) ;
-    /* restore the original sim_object id */
-    new_job->sim_object_id = save_sim_object_id ;
-    return(ret) ;
+int	Trick::ScheduledJobQueue::push_ignore_sim_object(	JobData	*	new_job	)	{
+
+				int	save_sim_object_id	;
+				int	ret	;
+
+				/*	Temorarily	assign	a	really	high	sim_object	id		*/
+				save_sim_object_id	=	new_job->sim_object_id	;
+				new_job->sim_object_id	=	1000000	;
+				/*	push	the	job	onto	the	scheduling	queue	as	normal	*/
+				ret	=	push(new_job)	;
+				/*	restore	the	original	sim_object	id	*/
+				new_job->sim_object_id	=	save_sim_object_id	;
+				return(ret)	;
 }
 
 /**
 @design
--# Traverse the list of jobs looking for the job to delete.
- -# If the job to delete is found
-  -# Allocate a new list that holds 1 less job than the current list
-  -# Copy all of the jobs that precede the deleted job to the new list
-  -# Copy all of the jobs that are after the delete job to the new list
-  -# Decrement the size of the list
-  -# Free the memory associated with the current list
-  -# Point the current list to the newly allocated list
+-#	Traverse	the	list	of	jobs	looking	for	the	job	to	delete.
+	-#	If	the	job	to	delete	is	found
+		-#	Allocate	a	new	list	that	holds	1	less	job	than	the	current	list
+		-#	Copy	all	of	the	jobs	that	precede	the	deleted	job	to	the	new	list
+		-#	Copy	all	of	the	jobs	that	are	after	the	delete	job	to	the	new	list
+		-#	Decrement	the	size	of	the	list
+		-#	Free	the	memory	associated	with	the	current	list
+		-#	Point	the	current	list	to	the	newly	allocated	list
 */
-int Trick::ScheduledJobQueue::remove( JobData * delete_job ) {
-
-    unsigned int ii , jj ;
-
-    /* Find the job to delete in the queue. */
-    for ( ii = 0 ; ii < list_size ; ii++ ) {
-        if ( list[ii] == delete_job ) {
-            /* allocate a new list that holds one less element than the current list. */
-            JobData ** new_list = (JobData **)calloc( list_size - 1 , sizeof(JobData *)) ;
-            /* copy all of the jobs that are before the deleted job to the new list */
-            for ( jj = 0 ; jj < ii ; jj++ ) {
-                new_list[jj] = list[jj] ;
-            }
-            /* copy all of the jobs that are after the deleted job to the new list */
-            for ( jj = ii + 1 ; jj < list_size ; jj++ ) {
-                new_list[jj-1] = list[jj] ;
-            }
-            if ( ii <= curr_index ) {
-                curr_index-- ;
-            }
-            /* Decrement the size of the queue */
-            list_size-- ;
-            /* Free the old queue space */
-            free(list) ;
-            /* Assign the queue pointer to the new space */
-            list = new_list ;
-            return 0 ;
-        }
-    }
-    return -1 ;
+int	Trick::ScheduledJobQueue::remove(	JobData	*	delete_job	)	{
+
+				unsigned	int	ii	,	jj	;
+
+				/*	Find	the	job	to	delete	in	the	queue.	*/
+				for	(	ii	=	0	;	ii	<	list_size	;	ii++	)	{
+								if	(	list[ii]	==	delete_job	)	{
+												/*	allocate	a	new	list	that	holds	one	less	element	than	the	current	list.	*/
+												JobData	**	new_list	=	(JobData	**)calloc(	list_size	-	1	,	sizeof(JobData	*))	;
+												/*	copy	all	of	the	jobs	that	are	before	the	deleted	job	to	the	new	list	*/
+												for	(	jj	=	0	;	jj	<	ii	;	jj++	)	{
+																new_list[jj]	=	list[jj]	;
+												}
+												/*	copy	all	of	the	jobs	that	are	after	the	deleted	job	to	the	new	list	*/
+												for	(	jj	=	ii	+	1	;	jj	<	list_size	;	jj++	)	{
+																new_list[jj-1]	=	list[jj]	;
+												}
+												if	(	ii	<=	curr_index	)	{
+																curr_index--	;
+												}
+												/*	Decrement	the	size	of	the	queue	*/
+												list_size--	;
+												/*	Free	the	old	queue	space	*/
+												free(list)	;
+												/*	Assign	the	queue	pointer	to	the	new	space	*/
+												list	=	new_list	;
+												return	0	;
+								}
+				}
+				return	-1	;
 }
 
 /**
 @design
--# Returns the #curr_index of the queue.
+-#	Returns	the	#curr_index	of	the	queue.
 */
-unsigned int Trick::ScheduledJobQueue::get_curr_index() {
-    return curr_index ;
+unsigned	int	Trick::ScheduledJobQueue::get_curr_index()	{
+				return	curr_index	;
 }
 
 /**
 @design
--# Sets #curr_index to the incoming value.
+-#	Sets	#curr_index	to	the	incoming	value.
 */
-int Trick::ScheduledJobQueue::set_curr_index(unsigned int value ) {
+int	Trick::ScheduledJobQueue::set_curr_index(unsigned	int	value	)	{
 
-    if ( value < list_size ) {
-        curr_index = value ;
-    }
-    return 0 ;
+				if	(	value	<	list_size	)	{
+								curr_index	=	value	;
+				}
+				return	0	;
 }
 
 /**
 @design
--# Sets #curr_index to 0.
+-#	Sets	#curr_index	to	0.
 */
-int Trick::ScheduledJobQueue::reset_curr_index() {
+int	Trick::ScheduledJobQueue::reset_curr_index()	{
 
-    curr_index = 0 ;
-    return(0) ;
+				curr_index	=	0	;
+				return(0)	;
 }
 
 /**
 @design
--# Returns #list_size
+-#	Returns	#list_size
 */
-unsigned int Trick::ScheduledJobQueue::size() {
-    return(list_size) ;
+unsigned	int	Trick::ScheduledJobQueue::size()	{
+				return(list_size)	;
 }
 
 /**
 @design
--# Returns !(#list_size)
+-#	Returns	!(#list_size)
 */
-bool Trick::ScheduledJobQueue::empty() {
-    return(!list_size) ;
+bool	Trick::ScheduledJobQueue::empty()	{
+				return(!list_size)	;
 }
 
 /**
 @design
--# If #list is not NULL free it.
--# Set #list to NULL
--# Set #list_list to 0
--# Set #curr_index to 0
--# Set #next_job_time to TRICK_MAX_LONG_LONG
+-#	If	#list	is	not	NULL	free	it.
+-#	Set	#list	to	NULL
+-#	Set	#list_list	to	0
+-#	Set	#curr_index	to	0
+-#	Set	#next_job_time	to	TRICK_MAX_LONG_LONG
 */
-int Trick::ScheduledJobQueue::clear() {
-
-    /* free job list if one exists  */
-    if (list != NULL ) {
-        free(list) ;
-    }
-    /* set all list variables to initial cleared values */
-    list = NULL ;
-    list_size = 0 ;
-    curr_index = 0 ;
-    next_job_time = TRICK_MAX_LONG_LONG ;
-    return(0) ;
+int	Trick::ScheduledJobQueue::clear()	{
+
+				/*	free	job	list	if	one	exists		*/
+				if	(list	!=	NULL	)	{
+								free(list)	;
+				}
+				/*	set	all	list	variables	to	initial	cleared	values	*/
+				list	=	NULL	;
+				list_size	=	0	;
+				curr_index	=	0	;
+				next_job_time	=	TRICK_MAX_LONG_LONG	;
+				return(0)	;
 }
 
 /**
 @design
--# If the list is empty return NULL
--# Else return the current job without incrementing the #curr_index index.
+-#	If	the	list	is	empty	return	NULL
+-#	Else	return	the	current	job	without	incrementing	the	#curr_index	index.
 */
-Trick::JobData * Trick::ScheduledJobQueue::top() {
-    /* return NULL if list is empty  */
-    if ( list_size == 0 ) {
-        return(NULL) ;
-    }
-    /* else return current list item  */
-    return(list[curr_index]) ;
+Trick::JobData	*	Trick::ScheduledJobQueue::top()	{
+				/*	return	NULL	if	list	is	empty		*/
+				if	(	list_size	==	0	)	{
+								return(NULL)	;
+				}
+				/*	else	return	current	list	item		*/
+				return(list[curr_index])	;
 }
 
 
 /**
 @design
--# If the #curr_index is greater than or equal to the #list_size
-    -# Set the #curr_index to the #list_size
-    -# Return NULL
--# Else while the list #curr_list is less than the list size
-    -# Increment the #curr_index.
-    -# Return the current job if the job is enabled.
+-#	If	the	#curr_index	is	greater	than	or	equal	to	the	#list_size
+				-#	Set	the	#curr_index	to	the	#list_size
+				-#	Return	NULL
+-#	Else	while	the	list	#curr_list	is	less	than	the	list	size
+				-#	Increment	the	#curr_index.
+				-#	Return	the	current	job	if	the	job	is	enabled.
 */
-Trick::JobData * Trick::ScheduledJobQueue::get_next_job() {
-
-    JobData * curr_job ;
-
-    /* return NULL if we are at the end of the list  */
-    if ( curr_index >= list_size ) {
-        curr_index = list_size ;
-        return(NULL) ;
-    } else {
-        /* return the next enabled job, or NULL if we reach the end of the list */
-        while (curr_index < list_size ) {
-            curr_job = list[curr_index++] ;
-            if ( !curr_job->disabled ) {
-                return(curr_job) ;
-            }
-        }
-    }
-    return(NULL) ;
+Trick::JobData	*	Trick::ScheduledJobQueue::get_next_job()	{
+
+				JobData	*	curr_job	;
+
+				/*	return	NULL	if	we	are	at	the	end	of	the	list		*/
+				if	(	curr_index	>=	list_size	)	{
+								curr_index	=	list_size	;
+								return(NULL)	;
+				}	else	{
+								/*	return	the	next	enabled	job,	or	NULL	if	we	reach	the	end	of	the	list	*/
+								while	(curr_index	<	list_size	)	{
+												curr_job	=	list[curr_index++]	;
+												if	(	!curr_job->disabled	)	{
+																return(curr_job)	;
+												}
+								}
+				}
+				return(NULL)	;
 }
 
 /**
 @design
--# While the list #curr_list is less than the list size
-    -# If the current queue job next call matches the incoming simulation time
-        -# If the job class is not a system class job, calculate the next
-           time it will be called by current time + job cycle.
-        -# Set the next job call time to TRICK_MAX_LONG_LONG if the next job call time
-           is greater than the stop time.
-        -# If the job's next job call time is lower than the overall next job call time
-           set the overall job call time to the current job's next job call time.
-        -# Increment the #curr_index.
-        -# Return the current job if the job is enabled.
-    -# Else
-        -# If the job's next job call time is lower than the overall next job call time
-           set the overall job call time to the current job's next job call time.
-        -# Increment the #curr_index.
--# Return NULL when the end of the list is reached.
+-#	While	the	list	#curr_list	is	less	than	the	list	size
+				-#	If	the	current	queue	job	next	call	matches	the	incoming	simulation	time
+								-#	If	the	job	class	is	not	a	system	class	job,	calculate	the	next
+											time	it	will	be	called	by	current	time	+	job	cycle.
+								-#	Set	the	next	job	call	time	to	TRICK_MAX_LONG_LONG	if	the	next	job	call	time
+											is	greater	than	the	stop	time.
+								-#	If	the	job's	next	job	call	time	is	lower	than	the	overall	next	job	call	time
+											set	the	overall	job	call	time	to	the	current	job's	next	job	call	time.
+								-#	Increment	the	#curr_index.
+								-#	Return	the	current	job	if	the	job	is	enabled.
+				-#	Else
+								-#	If	the	job's	next	job	call	time	is	lower	than	the	overall	next	job	call	time
+											set	the	overall	job	call	time	to	the	current	job's	next	job	call	time.
+								-#	Increment	the	#curr_index.
+-#	Return	NULL	when	the	end	of	the	list	is	reached.
 */
-Trick::JobData * Trick::ScheduledJobQueue::find_next_job(long long time_tics ) {
-
-    JobData * curr_job ;
-    long long next_call ;
-
-    /* Search through the rest of the queue starting at curr_index looking for
-       the next job with it's next execution time is equal to the current simulation time. */
-    while (curr_index < list_size ) {
-
-        curr_job = list[curr_index] ;
-
-        if ( curr_job->next_tics == time_tics ) {
-
-            /* If the job does not reschedule itself (system_job_classes), calculate the next time it will be called. */
-            if ( ! curr_job->system_job_class ) {
-                // calculate the next job call time
-                next_call = curr_job->next_tics + curr_job->cycle_tics ;
-                /* If the next time does not exceed the stop time, set the next call time for the module */
-                if (next_call > curr_job->stop_tics) {
-                    curr_job->next_tics = TRICK_MAX_LONG_LONG ;
-                } else {
-                    curr_job->next_tics = next_call;
-                }
-                /* Track next lowest job call time after the current time for jobs that match the current time. */
-                if ( curr_job->next_tics <  next_job_time ) {
-                    next_job_time = curr_job->next_tics ;
-                }
-            }
-            curr_index++ ;
-            if ( !curr_job->disabled ) {
-                return(curr_job) ;
-            }
-        } else {
-            /* Track next lowest job call time after the current time for jobs that do not match the current time */
-            if ( curr_job->next_tics > time_tics && curr_job->next_tics < next_job_time ) {
-                next_job_time = curr_job->next_tics ;
-            }
-            curr_index++ ;
-        }
-    }
-    return(NULL) ;
+Trick::JobData	*	Trick::ScheduledJobQueue::find_next_job(long	long	time_tics	)	{
+
+				JobData	*	curr_job	;
+				long	long	next_call	;
+
+				/*	Search	through	the	rest	of	the	queue	starting	at	curr_index	looking	for
+							the	next	job	with	it's	next	execution	time	is	equal	to	the	current	simulation	time.	*/
+				while	(curr_index	<	list_size	)	{
+
+								curr_job	=	list[curr_index]	;
+
+								if	(	curr_job->next_tics	==	time_tics	)	{
+
+												/*	If	the	job	does	not	reschedule	itself	(system_job_classes),	calculate	the	next	time	it	will	be	called.	*/
+												if	(	!	curr_job->system_job_class	)	{
+																//	calculate	the	next	job	call	time
+																next_call	=	curr_job->next_tics	+	curr_job->cycle_tics	;
+																/*	If	the	next	time	does	not	exceed	the	stop	time,	set	the	next	call	time	for	the	module	*/
+																if	(next_call	>	curr_job->stop_tics)	{
+																				curr_job->next_tics	=	TRICK_MAX_LONG_LONG	;
+																}	else	{
+																				curr_job->next_tics	=	next_call;
+																}
+																/*	Track	next	lowest	job	call	time	after	the	current	time	for	jobs	that	match	the	current	time.	*/
+																if	(	curr_job->next_tics	<		next_job_time	)	{
+																				next_job_time	=	curr_job->next_tics	;
+																}
+												}
+												curr_index++	;
+												if	(	!curr_job->disabled	)	{
+																return(curr_job)	;
+												}
+								}	else	{
+												/*	Track	next	lowest	job	call	time	after	the	current	time	for	jobs	that	do	not	match	the	current	time	*/
+												if	(	curr_job->next_tics	>	time_tics	&&	curr_job->next_tics	<	next_job_time	)	{
+																next_job_time	=	curr_job->next_tics	;
+												}
+												curr_index++	;
+								}
+				}
+				return(NULL)	;
 }
 
 /**
 @design
--# While the list #curr_list is less than the list size
-    -# If the current queue job next call matches the incoming simulation time
-        -# Increment the #curr_index.
-        -# Return the current job if the job is enabled.
-    -# Increment the #curr_index.
--# Return NULL when the end of the list is reached.
+-#	While	the	list	#curr_list	is	less	than	the	list	size
+				-#	If	the	current	queue	job	next	call	matches	the	incoming	simulation	time
+								-#	Increment	the	#curr_index.
+								-#	Return	the	current	job	if	the	job	is	enabled.
+				-#	Increment	the	#curr_index.
+-#	Return	NULL	when	the	end	of	the	list	is	reached.
 */
-Trick::JobData* Trick::ScheduledJobQueue::find_job(long long time_tics) {
-    JobData * curr_job ;
-
-    /* Search through the rest of the queue starting at curr_index looking for             */
-    /* the next job with it's next execution time is equal to the current simulation time. */
-    while (curr_index < list_size) {
-        curr_job = list[curr_index] ;
-
-        if (curr_job->next_tics == time_tics ) {
-            if (!curr_job->disabled) {
-                curr_index++ ;
-                return(curr_job) ;
-            }
-        }
-        curr_index++ ;
-    }
-    return(NULL) ;
+Trick::JobData*	Trick::ScheduledJobQueue::find_job(long	long	time_tics)	{
+				JobData	*	curr_job	;
+
+				/*	Search	through	the	rest	of	the	queue	starting	at	curr_index	looking	for													*/
+				/*	the	next	job	with	it's	next	execution	time	is	equal	to	the	current	simulation	time.	*/
+				while	(curr_index	<	list_size)	{
+								curr_job	=	list[curr_index]	;
+
+								if	(curr_job->next_tics	==	time_tics	)	{
+												if	(!curr_job->disabled)	{
+																curr_index++	;
+																return(curr_job)	;
+												}
+								}
+								curr_index++	;
+				}
+				return(NULL)	;
 }
 
 /**
 @details
--# Sets #next_job_time to the incoming time
+-#	Sets	#next_job_time	to	the	incoming	time
 */
-int Trick::ScheduledJobQueue::set_next_job_call_time(long long in_time) {
-    next_job_time = in_time ;
-    return(0) ;
+int	Trick::ScheduledJobQueue::set_next_job_call_time(long	long	in_time)	{
+				next_job_time	=	in_time	;
+				return(0)	;
 }
 
 /**
 @details
--# Return the next_job_call_time in counts of tics/second
-   Requirement [@ref r_exec_time_0]
+-#	Return	the	next_job_call_time	in	counts	of	tics/second
+			Requirement	[@ref	r_exec_time_0]
 */
-long long Trick::ScheduledJobQueue::get_next_job_call_time() {
-    unsigned int temp_index = curr_index ;
-    while (temp_index < list_size ) {
-        if ( list[temp_index]->next_tics <  next_job_time ) {
-            next_job_time = list[temp_index]->next_tics ;
-        }
-        temp_index++ ;
-    }
-    return(next_job_time) ;
+long	long	Trick::ScheduledJobQueue::get_next_job_call_time()	{
+				unsigned	int	temp_index	=	curr_index	;
+				while	(temp_index	<	list_size	)	{
+								if	(	list[temp_index]->next_tics	<		next_job_time	)	{
+												next_job_time	=	list[temp_index]->next_tics	;
+								}
+								temp_index++	;
+				}
+				return(next_job_time)	;
 }
 
 /**
 @details
--# If the current job next call time is less than the overall next job call time, and is
-   greater than the current simulation time, set the overall next job call time to be the
-   job next call time.
+-#	If	the	current	job	next	call	time	is	less	than	the	overall	next	job	call	time,	and	is
+			greater	than	the	current	simulation	time,	set	the	overall	next	job	call	time	to	be	the
+			job	next	call	time.
 */
-int Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData * curr_job, long long time_tics) {
-    if ( curr_job->next_tics > time_tics && curr_job->next_tics < next_job_time ) {
-        next_job_time = curr_job->next_tics ;
-    }
-    return(0) ;
+int	Trick::ScheduledJobQueue::test_next_job_call_time(Trick::JobData	*	curr_job,	long	long	time_tics)	{
+				if	(	curr_job->next_tics	>	time_tics	&&	curr_job->next_tics	<	next_job_time	)	{
+								next_job_time	=	curr_job->next_tics	;
+				}
+				return(0)	;
 }
 
-// Executes the jobs in a queue.  saves and restores Trick::Executive::curr_job
-int Trick::ScheduledJobQueue::execute_all_jobs() {
-    Trick::JobData * curr_job ;
-    int ret ;
-
-    reset_curr_index() ;
-    while ( (curr_job = get_next_job()) != NULL ) {
-        ret = curr_job->call() ;
-        if ( ret != 0 ) {
-            return ret ;
-        }
-    }
-    /* return 0 if there are no errors. */
-    return 0 ;
+//	Executes	the	jobs	in	a	queue.		saves	and	restores	Trick::Executive::curr_job
+int	Trick::ScheduledJobQueue::execute_all_jobs()	{
+				Trick::JobData	*	curr_job	;
+				int	ret	;
+
+				reset_curr_index()	;
+				while	(	(curr_job	=	get_next_job())	!=	NULL	)	{
+								ret	=	curr_job->call()	;
+								if	(	ret	!=	0	)	{
+												return	ret	;
+								}
+				}
+				/*	return	0	if	there	are	no	errors.	*/
+				return	0	;
 }
 
-int Trick::ScheduledJobQueue::write_sched_queue( FILE * fp ) {
-
-    Trick::JobData * curr_job ;
-    unsigned int save_index ;
-
-    save_index = get_curr_index() ;
-    reset_curr_index() ;
-    while ( (curr_job = get_next_job()) != NULL ) {
-        if ( curr_job->job_class_name.compare("instrumentation") ) {
-            /* for each non instrumentation job write the job information to the open file pointer "fp" */
-            fprintf(fp, "%7d | %3d |%-25s| %-5d | %08.6f | %8.6g | %8g | %5.02f | %s\n",
-                    !curr_job->disabled, curr_job->thread, curr_job->job_class_name.c_str(), curr_job->phase,
-                    curr_job->start, curr_job->cycle, curr_job->stop, curr_job->frame_id,
-                    curr_job->name.c_str());
-        }
-    }
-    set_curr_index(save_index) ;
-    return(0) ;
+int	Trick::ScheduledJobQueue::write_sched_queue(	FILE	*	fp	)	{
+
+				Trick::JobData	*	curr_job	;
+				unsigned	int	save_index	;
+
+				save_index	=	get_curr_index()	;
+				reset_curr_index()	;
+				while	(	(curr_job	=	get_next_job())	!=	NULL	)	{
+								if	(	curr_job->job_class_name.compare("instrumentation")	)	{
+												/*	for	each	non	instrumentation	job	write	the	job	information	to	the	open	file	pointer	"fp"	*/
+												fprintf(fp,	"%7d	|	%3d	|%-25s|	%-5d	|	%08.6f	|	%8.6g	|	%8g	|	%5.02f	|	%s\n",
+																				!curr_job->disabled,	curr_job->thread,	curr_job->job_class_name.c_str(),	curr_job->phase,
+																				curr_job->start,	curr_job->cycle,	curr_job->stop,	curr_job->frame_id,
+																				curr_job->name.c_str());
+								}
+				}
+				set_curr_index(save_index)	;
+				return(0)	;
 }
 
-int Trick::ScheduledJobQueue::write_non_sched_queue( FILE * fp ) {
+int	Trick::ScheduledJobQueue::write_non_sched_queue(	FILE	*	fp	)	{
 
-    Trick::JobData * curr_job ;
-    unsigned int save_index ;
+				Trick::JobData	*	curr_job	;
+				unsigned	int	save_index	;
 
-    save_index = get_curr_index() ;
-    reset_curr_index() ;
-    while ( (curr_job = get_next_job()) != NULL ) {
-        if ( curr_job->job_class_name.compare("instrumentation") ) {
-            /* for each non instrumentation job write the job information to the open file pointer "fp" */
-            fprintf(fp, "%7d | %3d |%-25s| %-5d |          |          |          | %5.02f | %s\n",
-                    !curr_job->disabled, curr_job->thread, curr_job->job_class_name.c_str(), curr_job->phase,
-                    curr_job->frame_id, curr_job->name.c_str());
-        }
-    }
+				save_index	=	get_curr_index()	;
+				reset_curr_index()	;
+				while	(	(curr_job	=	get_next_job())	!=	NULL	)	{
+								if	(	curr_job->job_class_name.compare("instrumentation")	)	{
+												/*	for	each	non	instrumentation	job	write	the	job	information	to	the	open	file	pointer	"fp"	*/
+												fprintf(fp,	"%7d	|	%3d	|%-25s|	%-5d	|										|										|										|	%5.02f	|	%s\n",
+																				!curr_job->disabled,	curr_job->thread,	curr_job->job_class_name.c_str(),	curr_job->phase,
+																				curr_job->frame_id,	curr_job->name.c_str());
+								}
+				}
 
-    set_curr_index(save_index) ;
-    return(0) ;
+				set_curr_index(save_index)	;
+				return(0)	;
 }
 
 /**
 @details
--# For all jobs in the queue
-    -# Create a new ScheduledJobQueueInstrument instance
-    -# Add the new instrumentation job to the "before" instrumentation job list
--# Return 0
+-#	For	all	jobs	in	the	queue
+				-#	Create	a	new	ScheduledJobQueueInstrument	instance
+				-#	Add	the	new	instrumentation	job	to	the	"before"	instrumentation	job	list
+-#	Return	0
 */
-int Trick::ScheduledJobQueue::instrument_before(Trick::JobData * instrumentation_job) {
+int	Trick::ScheduledJobQueue::instrument_before(Trick::JobData	*	instrumentation_job)	{
 
-    unsigned int ii ;
-    ScheduledJobQueueInstrument * new_job ;
+				unsigned	int	ii	;
+				ScheduledJobQueueInstrument	*	new_job	;
 
-    for ( ii = 0 ; ii < list_size ; ii++ ) {
-        new_job = new ScheduledJobQueueInstrument( instrumentation_job, list[ii] );
-        list[ii]->add_inst_before(new_job) ;
-    }
+				for	(	ii	=	0	;	ii	<	list_size	;	ii++	)	{
+								new_job	=	new	ScheduledJobQueueInstrument(	instrumentation_job,	list[ii]	);
+								list[ii]->add_inst_before(new_job)	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# For all jobs in the queue
-    -# Create a new ScheduledJobQueueInstrument instance
-    -# Add the new instrumentation job to the "after" instrumentation job list
--# Return 0
+-#	For	all	jobs	in	the	queue
+				-#	Create	a	new	ScheduledJobQueueInstrument	instance
+				-#	Add	the	new	instrumentation	job	to	the	"after"	instrumentation	job	list
+-#	Return	0
 */
-int Trick::ScheduledJobQueue::instrument_after(Trick::JobData * instrumentation_job) {
+int	Trick::ScheduledJobQueue::instrument_after(Trick::JobData	*	instrumentation_job)	{
 
-    unsigned int ii ;
-    ScheduledJobQueueInstrument * new_job ;
+				unsigned	int	ii	;
+				ScheduledJobQueueInstrument	*	new_job	;
 
-    /* Count the number of non-instrumentation jobs in the current queue. */
-    for ( ii = 0 ; ii < list_size ; ii++ ) {
-        new_job = new ScheduledJobQueueInstrument( instrumentation_job, list[ii] );
-        list[ii]->add_inst_after(new_job) ;
-    }
+				/*	Count	the	number	of	non-instrumentation	jobs	in	the	current	queue.	*/
+				for	(	ii	=	0	;	ii	<	list_size	;	ii++	)	{
+								new_job	=	new	ScheduledJobQueueInstrument(	instrumentation_job,	list[ii]	);
+								list[ii]->add_inst_after(new_job)	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
 /**
 @details
--# For all jobs in the queue
-    -# Create a new ScheduledJobQueueInstrument instance
-    -# Add the new instrumentation job to the list
--# Return 0
+-#	For	all	jobs	in	the	queue
+				-#	Create	a	new	ScheduledJobQueueInstrument	instance
+				-#	Add	the	new	instrumentation	job	to	the	list
+-#	Return	0
 */
-int Trick::ScheduledJobQueue::instrument_remove(std::string job_name) {
+int	Trick::ScheduledJobQueue::instrument_remove(std::string	job_name)	{
 
-    unsigned int ii ;
+				unsigned	int	ii	;
 
-    for ( ii = 0 ; ii < list_size ; ii++ ) {
-        list[ii]->remove_inst(job_name) ;
-    }
+				for	(	ii	=	0	;	ii	<	list_size	;	ii++	)	{
+								list[ii]->remove_inst(job_name)	;
+				}
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp
index 4d0233621..b131f108b 100644
--- a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp
+++ b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueueInstrument.cpp
@@ -1,36 +1,36 @@
 
-#include "trick/ScheduledJobQueueInstrument.hh"
-#include "trick/SimObject.hh"
+#include	"trick/ScheduledJobQueueInstrument.hh"
+#include	"trick/SimObject.hh"
 
 /**
 @details
--# Copy name from the instrumentation S_define job.
--# Make a copy of the instrumentation job
--# Save pointer to the target job.
+-#	Copy	name	from	the	instrumentation	S_define	job.
+-#	Make	a	copy	of	the	instrumentation	job
+-#	Save	pointer	to	the	target	job.
 */
-Trick::ScheduledJobQueueInstrument::ScheduledJobQueueInstrument( Trick::JobData* in_inst_job,
-                                                       Trick::JobData* in_targ_job ) {
-    name = in_inst_job->name;
-    instru_job = new JobData(*in_inst_job) ;
-    target_job = in_targ_job;
-    instru_job->sup_class_data = target_job ;
-    phase = in_inst_job->phase ;
+Trick::ScheduledJobQueueInstrument::ScheduledJobQueueInstrument(	Trick::JobData*	in_inst_job,
+																																																							Trick::JobData*	in_targ_job	)	{
+				name	=	in_inst_job->name;
+				instru_job	=	new	JobData(*in_inst_job)	;
+				target_job	=	in_targ_job;
+				instru_job->sup_class_data	=	target_job	;
+				phase	=	in_inst_job->phase	;
 }
 
 /**
 @details
--# Delete the instru_job allocated in the constructor.
+-#	Delete	the	instru_job	allocated	in	the	constructor.
 */
-Trick::ScheduledJobQueueInstrument::~ScheduledJobQueueInstrument() {
-    delete instru_job ;
+Trick::ScheduledJobQueueInstrument::~ScheduledJobQueueInstrument()	{
+				delete	instru_job	;
 }
 
 /**
 @details
--# Copy the target job into the sup_class_data pointer.  This is available from in the insturmentation job.
--# Call the instrumentation function directly to save a bit of time
+-#	Copy	the	target	job	into	the	sup_class_data	pointer.		This	is	available	from	in	the	insturmentation	job.
+-#	Call	the	instrumentation	function	directly	to	save	a	bit	of	time
 */
-int Trick::ScheduledJobQueueInstrument::call() {
-    return instru_job->parent_object->call_function(instru_job) ;
+int	Trick::ScheduledJobQueueInstrument::call()	{
+				return	instru_job->parent_object->call_function(instru_job)	;
 }
 
diff --git a/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp b/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
index ba1c3cc51..0db1d73b3 100644
--- a/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
+++ b/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
@@ -1,548 +1,548 @@
 
-#include <iostream>
-#include <sys/types.h>
-#include <signal.h>
+#include	<iostream>
+#include	<sys/types.h>
+#include	<signal.h>
 
-#include "gtest/gtest.h"
-#include "trick/ScheduledJobQueue.hh"
-//#include "trick/RequirementScribe.hh"
+#include	"gtest/gtest.h"
+#include	"trick/ScheduledJobQueue.hh"
+//#include	"trick/RequirementScribe.hh"
 
-namespace Trick {
+namespace	Trick	{
 
-class ScheduledJobQueueTest : public ::testing::Test {
+class	ScheduledJobQueueTest	:	public	::testing::Test	{
 
-    protected:
-        Trick::ScheduledJobQueue sjq;
-		//Trick::RequirementScribe req;
+				protected:
+								Trick::ScheduledJobQueue	sjq;
+		//Trick::RequirementScribe	req;
 
-        ScheduledJobQueueTest() {}
-        ~ScheduledJobQueueTest() {}
-        virtual void SetUp() {}
-        virtual void TearDown() {}
+								ScheduledJobQueueTest()	{}
+								~ScheduledJobQueueTest()	{}
+								virtual	void	SetUp()	{}
+								virtual	void	TearDown()	{}
 
-} ;
+}	;
 
-TEST_F( ScheduledJobQueueTest , PushJobsbyJobOrder ) {
+TEST_F(	ScheduledJobQueueTest	,	PushJobsbyJobOrder	)	{
 	//req.add_requirement("815793485");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
-    EXPECT_TRUE( sjq.empty() ) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
+				EXPECT_TRUE(	sjq.empty()	)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
-    EXPECT_FALSE( sjq.empty() ) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)4)	;
+				EXPECT_FALSE(	sjq.empty()	)	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_4")	;
 
-    sjq.clear() ;
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
-    EXPECT_TRUE( sjq.empty() ) ;
+				sjq.clear()	;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
+				EXPECT_TRUE(	sjq.empty()	)	;
 }
 
-TEST_F( ScheduledJobQueueTest , PushJobsbySimObjectOrder ) {
+TEST_F(	ScheduledJobQueueTest	,	PushJobsbySimObjectOrder	)	{
 	//req.add_requirement("512154259");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
-    job_ptr->sim_object_id = 3 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	3	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
-    job_ptr->sim_object_id = 4 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4")	;
+				job_ptr->sim_object_id	=	4	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
-    job_ptr->sim_object_id = 2 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	2	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)4)	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_4")	;
 
 }
 
-TEST_F( ScheduledJobQueueTest , PushJobsbyPhaseOrder ) {
+TEST_F(	ScheduledJobQueueTest	,	PushJobsbyPhaseOrder	)	{
 	//req.add_requirement("3144632784");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3", "", 3) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_3",	"",	3)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 4) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4",	"",	4)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 2) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2",	"",	2)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)4)	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_4")	;
 
 }
 
-TEST_F( ScheduledJobQueueTest , PushJobsbyJobClassOrder ) {
+TEST_F(	ScheduledJobQueueTest	,	PushJobsbyJobClassOrder	)	{
 	//req.add_requirement("925196430");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_3", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 103 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_103",	NULL,	1.0	,	"job_3",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	103	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_4", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 104 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_101",	NULL,	1.0	,	"job_4",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	104	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_1", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 101 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_102",	NULL,	1.0	,	"job_1",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	101	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 102 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	102	;
+				sjq.push(job_ptr)	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)4)	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_4")	;
 
 }
 
-TEST_F( ScheduledJobQueueTest , PushJobsIgnoreSimObject ) {
+TEST_F(	ScheduledJobQueueTest	,	PushJobsIgnoreSimObject	)	{
 	//req.add_requirement("815793485");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)0)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_103", NULL, 1.0 , "job_1", "", 1) ;
-    job_ptr->sim_object_id = 3 ;
-    job_ptr->job_class = 100 ;
-    sjq.push_ignore_sim_object(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_103",	NULL,	1.0	,	"job_1",	"",	1)	;
+				job_ptr->sim_object_id	=	3	;
+				job_ptr->job_class	=	100	;
+				sjq.push_ignore_sim_object(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_101", NULL, 1.0 , "job_2", "", 1) ;
-    job_ptr->sim_object_id = 4 ;
-    job_ptr->job_class = 100 ;
-    sjq.push_ignore_sim_object(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_101",	NULL,	1.0	,	"job_2",	"",	1)	;
+				job_ptr->sim_object_id	=	4	;
+				job_ptr->job_class	=	100	;
+				sjq.push_ignore_sim_object(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_102", NULL, 1.0 , "job_3", "", 1) ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push_ignore_sim_object(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_102",	NULL,	1.0	,	"job_3",	"",	1)	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push_ignore_sim_object(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4", "", 1) ;
-    job_ptr->sim_object_id = 2 ;
-    job_ptr->job_class = 100 ;
-    sjq.push_ignore_sim_object(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4",	"",	1)	;
+				job_ptr->sim_object_id	=	2	;
+				job_ptr->job_class	=	100	;
+				sjq.push_ignore_sim_object(job_ptr)	;
 
-    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+				EXPECT_EQ(	sjq.size()	,	(unsigned	int)4)	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.get_next_job() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+				job_ptr	=	sjq.get_next_job()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_4")	;
 
 }
 
-TEST_F( ScheduledJobQueueTest , TopJob ) {
+TEST_F(	ScheduledJobQueueTest	,	TopJob	)	{
 	//req.add_requirement("");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    EXPECT_TRUE( sjq.top() == NULL ) ;
+				EXPECT_TRUE(	sjq.top()	==	NULL	)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = sjq.top() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.top()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.top() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.top()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    sjq.get_next_job() ;
-    job_ptr = sjq.top() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				sjq.get_next_job()	;
+				job_ptr	=	sjq.top()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    sjq.reset_curr_index() ;
-    job_ptr = sjq.top() ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				sjq.reset_curr_index()	;
+				job_ptr	=	sjq.top()	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 }
 
-TEST_F( ScheduledJobQueueTest , FindNextJob ) {
-	//req.add_requirement("3664773300 1758653947");
+TEST_F(	ScheduledJobQueueTest	,	FindNextJob	)	{
+	//req.add_requirement("3664773300	1758653947");
 
-    Trick::JobData * job_ptr ;
-    long long curr_time ;
+				Trick::JobData	*	job_ptr	;
+				long	long	curr_time	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_2") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	2.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 4.0 , "job_3") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	4.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				sjq.push(job_ptr)	;
 
-    // Time = 0.0
-    curr_time = 0 ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
+				//	Time	=	0.0
+				curr_time	=	0	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 
-    // Time = 1.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 1000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
+				//	Time	=	1.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	1000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 
-    // Time = 2.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 2000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
+				//	Time	=	2.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	2000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 
-    // Time = 3.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 3000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
+				//	Time	=	3.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	3000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 
-    // Time = 4.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 4000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
+				//	Time	=	4.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	4000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
-
-    // Time = 5.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 5000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
+
+				//	Time	=	5.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	5000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
 
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 }
 
-TEST_F( ScheduledJobQueueTest , TestNextJob ) {
-	//req.add_requirement("1758653947 3664773300");
-
-    Trick::JobData * job_ptr ;
-    long long curr_time ;
-
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 3.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    job_ptr->system_job_class = true ;
-    sjq.push(job_ptr) ;
-
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    job_ptr->system_job_class = true ;
-    sjq.push(job_ptr) ;
-
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 2.0 , "job_3") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    job_ptr->cycle_tics = (long long)(job_ptr->cycle * 1000000) ;
-    job_ptr->stop_tics = 1000000000 ;
-    job_ptr->system_job_class = true ;
-    sjq.push(job_ptr) ;
-
-    // Time = 0.0
-    curr_time = 0 ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 0 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 0 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 0 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
-
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 1000000 ) ;
-
-    // Time = 1.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 1000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 2000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
-
-    // Time = 2.0
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 2000000 ) ;
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 2000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 2000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
-
-    // Time = 3.0
-    sjq.reset_curr_index() ;
-    sjq.set_next_job_call_time(1000000000) ;
-    curr_time = sjq.get_next_job_call_time() ;
-    EXPECT_EQ( curr_time , 3000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 3000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
-    job_ptr->next_tics += job_ptr->cycle_tics ;
-    sjq.test_next_job_call_time(job_ptr , curr_time) ;
-    EXPECT_EQ( sjq.get_next_job_call_time() , 3000000 ) ;
-
-    job_ptr = sjq.find_next_job(curr_time) ;
-    EXPECT_TRUE( job_ptr == NULL ) ;
+TEST_F(	ScheduledJobQueueTest	,	TestNextJob	)	{
+	//req.add_requirement("1758653947	3664773300");
+
+				Trick::JobData	*	job_ptr	;
+				long	long	curr_time	;
+
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	3.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				job_ptr->system_job_class	=	true	;
+				sjq.push(job_ptr)	;
+
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				job_ptr->system_job_class	=	true	;
+				sjq.push(job_ptr)	;
+
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	2.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				job_ptr->cycle_tics	=	(long	long)(job_ptr->cycle	*	1000000)	;
+				job_ptr->stop_tics	=	1000000000	;
+				job_ptr->system_job_class	=	true	;
+				sjq.push(job_ptr)	;
+
+				//	Time	=	0.0
+				curr_time	=	0	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	0	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	0	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	0	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
+
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	1000000	)	;
+
+				//	Time	=	1.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	1000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	2000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
+
+				//	Time	=	2.0
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	2000000	)	;
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	2000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_3")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	2000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
+
+				//	Time	=	3.0
+				sjq.reset_curr_index()	;
+				sjq.set_next_job_call_time(1000000000)	;
+				curr_time	=	sjq.get_next_job_call_time()	;
+				EXPECT_EQ(	curr_time	,	3000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_1")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	3000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_STREQ(	job_ptr->name.c_str()	,	"job_2")	;
+				job_ptr->next_tics	+=	job_ptr->cycle_tics	;
+				sjq.test_next_job_call_time(job_ptr	,	curr_time)	;
+				EXPECT_EQ(	sjq.get_next_job_call_time()	,	3000000	)	;
+
+				job_ptr	=	sjq.find_next_job(curr_time)	;
+				EXPECT_TRUE(	job_ptr	==	NULL	)	;
 }
 
-TEST_F( ScheduledJobQueueTest , InstrumentBeforeAll ) {
+TEST_F(	ScheduledJobQueueTest	,	InstrumentBeforeAll	)	{
 	//req.add_requirement("3990429752");
 
-    Trick::JobData * job_ptr ;
+				Trick::JobData	*	job_ptr	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_1")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_2")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_3")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
-    job_ptr->sim_object_id = 1 ;
-    job_ptr->job_class = 100 ;
-    sjq.push(job_ptr) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"class_100",	NULL,	1.0	,	"job_4")	;
+				job_ptr->sim_object_id	=	1	;
+				job_ptr->job_class	=	100	;
+				sjq.push(job_ptr)	;
 
-    job_ptr = new Trick::JobData(0, 2 , "instrumentation", NULL, 1.0 , "instrument_1") ;
-    sjq.instrument_before( job_ptr ) ;
+				job_ptr	=	new	Trick::JobData(0,	2	,	"instrumentation",	NULL,	1.0	,	"instrument_1")	;
+				sjq.instrument_before(	job_ptr	)	;
 
 }
 
diff --git a/trick_source/sim_services/Scheduler/Scheduler.cpp b/trick_source/sim_services/Scheduler/Scheduler.cpp
index 8fe17bfbb..76a716f07 100644
--- a/trick_source/sim_services/Scheduler/Scheduler.cpp
+++ b/trick_source/sim_services/Scheduler/Scheduler.cpp
@@ -1,61 +1,61 @@
 
-#include "trick/Scheduler.hh"
-
-Trick::Scheduler::~Scheduler() {}
-
-// Default implementation of add_sim_object adds sim_object jobs to the scheduler queues
-// if this scheduler handles that job type
-int Trick::Scheduler::add_sim_object( Trick::SimObject * in_object ) {
-
-    unsigned int jj ;
-    std::map<std::string, int>::iterator class_id_it ;
-    JobData * job ;
-    std::map<int, Trick::ScheduledJobQueue *>::iterator queue_it ;
-    Trick::ScheduledJobQueue * curr_queue ;
-
-    for ( jj = 0 ; jj < in_object->jobs.size() ; jj++ ) {
-        job = in_object->jobs[jj] ;
-        if ( (class_id_it = class_map.find(job->job_class_name)) != class_map.end() ) {
-            job->job_class = class_id_it->second ;
-            if ( (queue_it = class_to_queue.find(job->job_class)) != class_to_queue.end() ) {
-                 curr_queue = queue_it->second ;
-                 curr_queue->push( job ) ;
-            }
-        }
-    }
-
-    return 0 ;
+#include	"trick/Scheduler.hh"
+
+Trick::Scheduler::~Scheduler()	{}
+
+//	Default	implementation	of	add_sim_object	adds	sim_object	jobs	to	the	scheduler	queues
+//	if	this	scheduler	handles	that	job	type
+int	Trick::Scheduler::add_sim_object(	Trick::SimObject	*	in_object	)	{
+
+				unsigned	int	jj	;
+				std::map<std::string,	int>::iterator	class_id_it	;
+				JobData	*	job	;
+				std::map<int,	Trick::ScheduledJobQueue	*>::iterator	queue_it	;
+				Trick::ScheduledJobQueue	*	curr_queue	;
+
+				for	(	jj	=	0	;	jj	<	in_object->jobs.size()	;	jj++	)	{
+								job	=	in_object->jobs[jj]	;
+								if	(	(class_id_it	=	class_map.find(job->job_class_name))	!=	class_map.end()	)	{
+												job->job_class	=	class_id_it->second	;
+												if	(	(queue_it	=	class_to_queue.find(job->job_class))	!=	class_to_queue.end()	)	{
+																	curr_queue	=	queue_it->second	;
+																	curr_queue->push(	job	)	;
+												}
+								}
+				}
+
+				return	0	;
 }
 
-// Default implementation of delete_sim_object removes all jobs associated with the incoming
-// sim_object from the queues in this scheduler.
-int Trick::Scheduler::delete_sim_object( Trick::SimObject * in_object ) {
-
-    unsigned int jj ;
-    std::map<std::string, int>::iterator class_id_it ;
-    JobData * job ;
-    std::map<int, Trick::ScheduledJobQueue *>::iterator queue_it ;
-    Trick::ScheduledJobQueue * curr_queue ;
-
-    for ( jj = 0 ; jj < in_object->jobs.size() ; jj++ ) {
-        job = in_object->jobs[jj] ;
-        if ( (class_id_it = class_map.find(job->job_class_name)) != class_map.end() ) {
-            if ( (queue_it = class_to_queue.find(class_id_it->second)) != class_to_queue.end() ) {
-                 curr_queue = queue_it->second ;
-                 curr_queue->remove( job ) ;
-            }
-        }
-    }
-
-    return 0 ;
+//	Default	implementation	of	delete_sim_object	removes	all	jobs	associated	with	the	incoming
+//	sim_object	from	the	queues	in	this	scheduler.
+int	Trick::Scheduler::delete_sim_object(	Trick::SimObject	*	in_object	)	{
+
+				unsigned	int	jj	;
+				std::map<std::string,	int>::iterator	class_id_it	;
+				JobData	*	job	;
+				std::map<int,	Trick::ScheduledJobQueue	*>::iterator	queue_it	;
+				Trick::ScheduledJobQueue	*	curr_queue	;
+
+				for	(	jj	=	0	;	jj	<	in_object->jobs.size()	;	jj++	)	{
+								job	=	in_object->jobs[jj]	;
+								if	(	(class_id_it	=	class_map.find(job->job_class_name))	!=	class_map.end()	)	{
+												if	(	(queue_it	=	class_to_queue.find(class_id_it->second))	!=	class_to_queue.end()	)	{
+																	curr_queue	=	queue_it->second	;
+																	curr_queue->remove(	job	)	;
+												}
+								}
+				}
+
+				return	0	;
 }
 
-// These 2 routines should no longer be needed.  (Alex 9/12/12)
-int Trick::Scheduler::write_sched_queue( FILE * fp , Trick::ScheduledJobQueue * curr_queue ) {
-    return curr_queue->write_sched_queue(fp) ;
+//	These	2	routines	should	no	longer	be	needed.		(Alex	9/12/12)
+int	Trick::Scheduler::write_sched_queue(	FILE	*	fp	,	Trick::ScheduledJobQueue	*	curr_queue	)	{
+				return	curr_queue->write_sched_queue(fp)	;
 }
 
-int Trick::Scheduler::write_non_sched_queue( FILE * fp , Trick::ScheduledJobQueue * curr_queue ) {
-    return curr_queue->write_non_sched_queue(fp) ;
+int	Trick::Scheduler::write_non_sched_queue(	FILE	*	fp	,	Trick::ScheduledJobQueue	*	curr_queue	)	{
+				return	curr_queue->write_non_sched_queue(fp)	;
 }
 
diff --git a/trick_source/sim_services/Sie/AttributesMap.cpp b/trick_source/sim_services/Sie/AttributesMap.cpp
index 649ce3dd3..7b76c94d0 100644
--- a/trick_source/sim_services/Sie/AttributesMap.cpp
+++ b/trick_source/sim_services/Sie/AttributesMap.cpp
@@ -1,161 +1,161 @@
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-#include "trick/AttributesMap.hh"
-#include "trick/attributes.h"
-#include "trick/command_line_protos.h"
+#include	<iostream>
+#include	<fstream>
+#include	<algorithm>
+#include	"trick/AttributesMap.hh"
+#include	"trick/attributes.h"
+#include	"trick/command_line_protos.h"
 
-// Instantiate static variables for template types for ATTRIBUTES * and ENUM_ATTR *
-namespace Trick {
-AttributesMap * AttributesMap::pInstance = NULL ;
+//	Instantiate	static	variables	for	template	types	for	ATTRIBUTES	*	and	ENUM_ATTR	*
+namespace	Trick	{
+AttributesMap	*	AttributesMap::pInstance	=	NULL	;
 }
 
-std::string & Trick::AttributesMap::replace_special_chars( std::string & str) {
+std::string	&	Trick::AttributesMap::replace_special_chars(	std::string	&	str)	{
 
-    // escape &
-    size_t index = 0;
-    while (index != std::string::npos) {
-        index = str.find("&" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 1, "&amp;") ;
-            index += 5;
-        }
-    }
+				//	escape	&
+				size_t	index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("&"	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	1,	"&amp;")	;
+												index	+=	5;
+								}
+				}
 
-    // escape "
-    index = 0;
-    while (index != std::string::npos) {
-        index = str.find("\"" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 1, "&quot;") ;
-        }
-    }
+				//	escape	"
+				index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("\""	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	1,	"&quot;")	;
+								}
+				}
 
-    // escape <
-    index = 0;
-    while (index != std::string::npos) {
-        index = str.find("<" , index) ;
-        if ( index != std::string::npos ) {
-            str.replace(index, 1, "&lt;") ;
-        }
-    }
+				//	escape	<
+				index	=	0;
+				while	(index	!=	std::string::npos)	{
+								index	=	str.find("<"	,	index)	;
+								if	(	index	!=	std::string::npos	)	{
+												str.replace(index,	1,	"&lt;")	;
+								}
+				}
 
-    return str;
+				return	str;
 }
 
-std::string & Trick::AttributesMap::type_remove_dims( std::string & type ) {
-    size_t index = type.find_first_of("*[");
-    if (index != std::string::npos) {
-        type.erase(index);
-    }
-    index = type.find_last_not_of(" ");
-    if (index != std::string::npos) {
-        type.erase(index + 1);
-    }
+std::string	&	Trick::AttributesMap::type_remove_dims(	std::string	&	type	)	{
+				size_t	index	=	type.find_first_of("*[");
+				if	(index	!=	std::string::npos)	{
+								type.erase(index);
+				}
+				index	=	type.find_last_not_of("	");
+				if	(index	!=	std::string::npos)	{
+								type.erase(index	+	1);
+				}
 
-    return replace_special_chars(type) ;
+				return	replace_special_chars(type)	;
 }
 
-void Trick::AttributesMap::print_xml(std::ofstream & sie_out ) {
-    std::map<std::string, ATTRIBUTES *>::iterator it ;
-    int jj ;
+void	Trick::AttributesMap::print_xml(std::ofstream	&	sie_out	)	{
+				std::map<std::string,	ATTRIBUTES	*>::iterator	it	;
+				int	jj	;
 
-    for ( it = name_to_attr_map.begin() ; it != name_to_attr_map.end() ; ++it ) {
-        ATTRIBUTES * attr = (*it).second ;
-        std::string class_name = (*it).first;
-        std::replace(class_name.begin(), class_name.end(), ':', '_');
-        sie_out << "  <class name=\"" <<  class_name << "\">\n" ;
-        while ( attr->name[0] != '\0' and (attr->type_name != NULL)) {
-            sie_out << "    <member" ;
-            sie_out << "\n      name=\"" << attr->name << "\"" ;
-            std::string type_name = attr->type_name;
-            std::replace(type_name.begin(), type_name.end(), ':', '_');
-            sie_out << "\n      type=\"" << type_remove_dims(type_name) << "\"" ;
-            sie_out << "\n      io_attributes=\"" << attr->io << "\"" ;
-            sie_out << "\n      units=\"" ;
-            // If the mods bit is set for using -- as the units
-            if ( attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-                sie_out << "--" ;
-            } else {
-                sie_out << attr->units ;
-            }
-            sie_out << "\"" ;
+				for	(	it	=	name_to_attr_map.begin()	;	it	!=	name_to_attr_map.end()	;	++it	)	{
+								ATTRIBUTES	*	attr	=	(*it).second	;
+								std::string	class_name	=	(*it).first;
+								std::replace(class_name.begin(),	class_name.end(),	':',	'_');
+								sie_out	<<	"		<class	name=\""	<<		class_name	<<	"\">\n"	;
+								while	(	attr->name[0]	!=	'\0'	and	(attr->type_name	!=	NULL))	{
+												sie_out	<<	"				<member"	;
+												sie_out	<<	"\n						name=\""	<<	attr->name	<<	"\""	;
+												std::string	type_name	=	attr->type_name;
+												std::replace(type_name.begin(),	type_name.end(),	':',	'_');
+												sie_out	<<	"\n						type=\""	<<	type_remove_dims(type_name)	<<	"\""	;
+												sie_out	<<	"\n						io_attributes=\""	<<	attr->io	<<	"\""	;
+												sie_out	<<	"\n						units=\""	;
+												//	If	the	mods	bit	is	set	for	using	--	as	the	units
+												if	(	attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+																sie_out	<<	"--"	;
+												}	else	{
+																sie_out	<<	attr->units	;
+												}
+												sie_out	<<	"\""	;
 
-            std::string description = attr->des;
-            if ( ! description.empty() ) {
-                sie_out << "\n      description=\"" << replace_special_chars(description) << "\"" ;
-            }
-            sie_out << ">\n" ;
-            if ( attr->num_index > 0 ) {
-                for (jj = 0; jj < attr->num_index; jj++) {
-                    sie_out << "      <dimension>" << attr->index[jj].size << "</dimension>\n" ;
-                }
-            }
-            sie_out << "    </member>\n" ;
-            attr++ ;
-        }
-        sie_out << "  </class>\n\n" ;
-    }
+												std::string	description	=	attr->des;
+												if	(	!	description.empty()	)	{
+																sie_out	<<	"\n						description=\""	<<	replace_special_chars(description)	<<	"\""	;
+												}
+												sie_out	<<	">\n"	;
+												if	(	attr->num_index	>	0	)	{
+																for	(jj	=	0;	jj	<	attr->num_index;	jj++)	{
+																				sie_out	<<	"						<dimension>"	<<	attr->index[jj].size	<<	"</dimension>\n"	;
+																}
+												}
+												sie_out	<<	"				</member>\n"	;
+												attr++	;
+								}
+								sie_out	<<	"		</class>\n\n"	;
+				}
 }
 
-void Trick::AttributesMap::print_json(std::ofstream & sie_out ) {
-    std::map<std::string, ATTRIBUTES *>::iterator it ;
-    int jj ;
-    sie_out << "  \"classes\": [\n" ;
-    for ( it = name_to_attr_map.begin() ; it != name_to_attr_map.end() ; ++it ) {
-        ATTRIBUTES * attr = (*it).second ;
-        std::string class_name = (*it).first;
-        std::replace(class_name.begin(), class_name.end(), ':', '_');
-        sie_out << "    {\n";
-        sie_out << "      \"name\": \"" <<  class_name << "\",\n" ;
-        if(attr->name[0] == '\0' || (attr->type_name == NULL)) {
-            sie_out << "      \"members\": []\n" ;
-        } else {
-            sie_out << "      \"members\": [\n" ;
-            while ( attr->name[0] != '\0' and (attr->type_name != NULL)) {
-                sie_out << "        {\n";
-                sie_out << "          \"name\": \"" << attr->name << "\",\n" ;
-                std::string type_name = attr->type_name;
-                std::replace(type_name.begin(), type_name.end(), ':', '_');
-                sie_out << "          \"type\": \"" << type_remove_dims(type_name) << "\",\n" ;
-                sie_out << "          \"io_attributes\": \"" << attr->io << "\",\n" ;
-                sie_out << "          \"units\": \"" ;
-                // If the mods bit is set for using -- as the units
-                if ( attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-                    sie_out << "--" ;
-                } else {
-                    sie_out << attr->units ;
-                }
-                sie_out << "\"" ;
+void	Trick::AttributesMap::print_json(std::ofstream	&	sie_out	)	{
+				std::map<std::string,	ATTRIBUTES	*>::iterator	it	;
+				int	jj	;
+				sie_out	<<	"		\"classes\":	[\n"	;
+				for	(	it	=	name_to_attr_map.begin()	;	it	!=	name_to_attr_map.end()	;	++it	)	{
+								ATTRIBUTES	*	attr	=	(*it).second	;
+								std::string	class_name	=	(*it).first;
+								std::replace(class_name.begin(),	class_name.end(),	':',	'_');
+								sie_out	<<	"				{\n";
+								sie_out	<<	"						\"name\":	\""	<<		class_name	<<	"\",\n"	;
+								if(attr->name[0]	==	'\0'	||	(attr->type_name	==	NULL))	{
+												sie_out	<<	"						\"members\":	[]\n"	;
+								}	else	{
+												sie_out	<<	"						\"members\":	[\n"	;
+												while	(	attr->name[0]	!=	'\0'	and	(attr->type_name	!=	NULL))	{
+																sie_out	<<	"								{\n";
+																sie_out	<<	"										\"name\":	\""	<<	attr->name	<<	"\",\n"	;
+																std::string	type_name	=	attr->type_name;
+																std::replace(type_name.begin(),	type_name.end(),	':',	'_');
+																sie_out	<<	"										\"type\":	\""	<<	type_remove_dims(type_name)	<<	"\",\n"	;
+																sie_out	<<	"										\"io_attributes\":	\""	<<	attr->io	<<	"\",\n"	;
+																sie_out	<<	"										\"units\":	\""	;
+																//	If	the	mods	bit	is	set	for	using	--	as	the	units
+																if	(	attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+																				sie_out	<<	"--"	;
+																}	else	{
+																				sie_out	<<	attr->units	;
+																}
+																sie_out	<<	"\""	;
 
-                std::string description = attr->des;
-                if ( ! description.empty() ) {
-                    sie_out << ",\n          \"description\": \"" << replace_special_chars(description) << "\"" ;
-                }
-                if ( attr->num_index > 0 ) {
-                    sie_out << ",\n          \"dimensions\": [" ;
-                    for (jj = 0; jj < attr->num_index - 1; jj++) {
-                        sie_out << " \"" << attr->index[jj].size << "\"," ;
-                    }
-                    sie_out << " \"" << attr->index[attr->num_index - 1].size << "\" " ;
-                    sie_out << "]\n" ;
-                } else {
-                    sie_out << '\n' ;
-                }
-                sie_out << "        }" ;
-                if((attr + 1)->name[0] != '\0') {
-                    sie_out << ',';
-                }
-                sie_out << '\n';
-                attr++ ;
-            }
-            sie_out << "      ]\n" ;
-        }
-        sie_out << "    }" ;
-        if(std::next(it, 1) != name_to_attr_map.end()) {
-            sie_out << ',' ;
-        }
-        sie_out << "\n" ;
-    }
-    sie_out << "  ],\n" ;
+																std::string	description	=	attr->des;
+																if	(	!	description.empty()	)	{
+																				sie_out	<<	",\n										\"description\":	\""	<<	replace_special_chars(description)	<<	"\""	;
+																}
+																if	(	attr->num_index	>	0	)	{
+																				sie_out	<<	",\n										\"dimensions\":	["	;
+																				for	(jj	=	0;	jj	<	attr->num_index	-	1;	jj++)	{
+																								sie_out	<<	"	\""	<<	attr->index[jj].size	<<	"\","	;
+																				}
+																				sie_out	<<	"	\""	<<	attr->index[attr->num_index	-	1].size	<<	"\"	"	;
+																				sie_out	<<	"]\n"	;
+																}	else	{
+																				sie_out	<<	'\n'	;
+																}
+																sie_out	<<	"								}"	;
+																if((attr	+	1)->name[0]	!=	'\0')	{
+																				sie_out	<<	',';
+																}
+																sie_out	<<	'\n';
+																attr++	;
+												}
+												sie_out	<<	"						]\n"	;
+								}
+								sie_out	<<	"				}"	;
+								if(std::next(it,	1)	!=	name_to_attr_map.end())	{
+												sie_out	<<	','	;
+								}
+								sie_out	<<	"\n"	;
+				}
+				sie_out	<<	"		],\n"	;
 }
diff --git a/trick_source/sim_services/Sie/EnumAttributesMap.cpp b/trick_source/sim_services/Sie/EnumAttributesMap.cpp
index 59005d159..695a964d3 100644
--- a/trick_source/sim_services/Sie/EnumAttributesMap.cpp
+++ b/trick_source/sim_services/Sie/EnumAttributesMap.cpp
@@ -1,68 +1,68 @@
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-#include "trick/EnumAttributesMap.hh"
-#include "trick/attributes.h"
-#include "trick/command_line_protos.h"
+#include	<iostream>
+#include	<fstream>
+#include	<algorithm>
+#include	"trick/EnumAttributesMap.hh"
+#include	"trick/attributes.h"
+#include	"trick/command_line_protos.h"
 
-// Instantiate static variables for template types for ATTRIBUTES * and ENUM_ATTR *
-namespace Trick {
-EnumAttributesMap * EnumAttributesMap::pInstance = NULL ;
+//	Instantiate	static	variables	for	template	types	for	ATTRIBUTES	*	and	ENUM_ATTR	*
+namespace	Trick	{
+EnumAttributesMap	*	EnumAttributesMap::pInstance	=	NULL	;
 }
 
-void Trick::EnumAttributesMap::print_xml(std::ofstream & sie_out ) {
-    std::map<std::string, ENUM_ATTR *>::iterator it ;
-    ENUM_ATTR * enum_attr ;
+void	Trick::EnumAttributesMap::print_xml(std::ofstream	&	sie_out	)	{
+				std::map<std::string,	ENUM_ATTR	*>::iterator	it	;
+				ENUM_ATTR	*	enum_attr	;
 
-    for ( it = name_to_attr_map.begin() ; it != name_to_attr_map.end() ; ++it ) {
-        enum_attr = (*it).second ;
+				for	(	it	=	name_to_attr_map.begin()	;	it	!=	name_to_attr_map.end()	;	++it	)	{
+								enum_attr	=	(*it).second	;
 
-        if ( enum_attr != NULL ) {
-            std::string name = it->first;
-            std::replace(name.begin(), name.end(), ':', '_');
-            sie_out << "  <enumeration name=\"" << name << "\">\n" ;
-            while ( enum_attr->label[0] != '\0' ) {
-                sie_out << "      <pair label=\"" << enum_attr->label << "\"" ;
-                sie_out << " value=\"" << enum_attr->value << "\"/>\n" ;
-                enum_attr++ ;
-            }
-            sie_out << "  </enumeration>\n\n" ;
-        }
-    }
+								if	(	enum_attr	!=	NULL	)	{
+												std::string	name	=	it->first;
+												std::replace(name.begin(),	name.end(),	':',	'_');
+												sie_out	<<	"		<enumeration	name=\""	<<	name	<<	"\">\n"	;
+												while	(	enum_attr->label[0]	!=	'\0'	)	{
+																sie_out	<<	"						<pair	label=\""	<<	enum_attr->label	<<	"\""	;
+																sie_out	<<	"	value=\""	<<	enum_attr->value	<<	"\"/>\n"	;
+																enum_attr++	;
+												}
+												sie_out	<<	"		</enumeration>\n\n"	;
+								}
+				}
 }
 
-void Trick::EnumAttributesMap::print_json(std::ofstream & sie_out ) {
-    std::map<std::string, ENUM_ATTR *>::iterator it ;
-    ENUM_ATTR * enum_attr ;
-    sie_out << "  \"enumerations\": [\n" ; 
-    for ( it = name_to_attr_map.begin() ; it != name_to_attr_map.end() ; ++it ) {
-        enum_attr = (*it).second ;
+void	Trick::EnumAttributesMap::print_json(std::ofstream	&	sie_out	)	{
+				std::map<std::string,	ENUM_ATTR	*>::iterator	it	;
+				ENUM_ATTR	*	enum_attr	;
+				sie_out	<<	"		\"enumerations\":	[\n"	;	
+				for	(	it	=	name_to_attr_map.begin()	;	it	!=	name_to_attr_map.end()	;	++it	)	{
+								enum_attr	=	(*it).second	;
 
-        if ( enum_attr != NULL ) {
-            sie_out << "    {\n";
-            std::string name = it->first;
-            std::replace(name.begin(), name.end(), ':', '_');
-            sie_out << "      \"name\": \"" <<  name << "\",\n" ;
-            sie_out << "      \"pairs\": [\n";
-            while ( enum_attr->label[0] != '\0' ) {
-                sie_out << "        {\n" ;
-                sie_out << "          \"label\": \"" << enum_attr->label << "\",\n" ;
-                sie_out << "          \"value\": \"" << enum_attr->value << "\"\n" ;
-                sie_out << "        }" ;
-                if((enum_attr + 1)->label[0] != '\0') {
-                    sie_out << ',';
-                }
-                sie_out << "\n";
-                enum_attr++ ;
-            }
-            sie_out << "      ]\n" ;
-            sie_out << "    }" ;
-            if(std::next(it, 1) != name_to_attr_map.end()) {
-                sie_out << ',' ;
-            }
-            sie_out << '\n';
-        }
-    }
-    sie_out << "  ],\n";
+								if	(	enum_attr	!=	NULL	)	{
+												sie_out	<<	"				{\n";
+												std::string	name	=	it->first;
+												std::replace(name.begin(),	name.end(),	':',	'_');
+												sie_out	<<	"						\"name\":	\""	<<		name	<<	"\",\n"	;
+												sie_out	<<	"						\"pairs\":	[\n";
+												while	(	enum_attr->label[0]	!=	'\0'	)	{
+																sie_out	<<	"								{\n"	;
+																sie_out	<<	"										\"label\":	\""	<<	enum_attr->label	<<	"\",\n"	;
+																sie_out	<<	"										\"value\":	\""	<<	enum_attr->value	<<	"\"\n"	;
+																sie_out	<<	"								}"	;
+																if((enum_attr	+	1)->label[0]	!=	'\0')	{
+																				sie_out	<<	',';
+																}
+																sie_out	<<	"\n";
+																enum_attr++	;
+												}
+												sie_out	<<	"						]\n"	;
+												sie_out	<<	"				}"	;
+												if(std::next(it,	1)	!=	name_to_attr_map.end())	{
+																sie_out	<<	','	;
+												}
+												sie_out	<<	'\n';
+								}
+				}
+				sie_out	<<	"		],\n";
 }
 
diff --git a/trick_source/sim_services/Sie/Sie.cpp b/trick_source/sim_services/Sie/Sie.cpp
index c5d869ef1..2090d237d 100644
--- a/trick_source/sim_services/Sie/Sie.cpp
+++ b/trick_source/sim_services/Sie/Sie.cpp
@@ -1,307 +1,307 @@
 
-#include <iostream>
-#include <algorithm>
-#include <fstream>
-#include <string.h>
-#include <cstring>
-
-#include "trick/Sie.hh"
-#include "trick/SimObject.hh"
-#include "trick/attributes.h"
-#include "trick/reference.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.hh"
-#include "trick/command_line_protos.h"
-#include "trick/MemoryManager.hh"
-#include "trick/parameter_types.h"
-
-Trick::Sie * the_sie = NULL ;
-
-Trick::Sie::Sie() {
-    // Call the attribute_map function which will instantiate the singleton maps
-    class_attr_map = Trick::AttributesMap::attributes_map() ;
-    enum_attr_map = Trick::EnumAttributesMap::attributes_map() ;
-
-    move_runtime_generation = false;
-
-    the_sie = this ;
+#include	<iostream>
+#include	<algorithm>
+#include	<fstream>
+#include	<string.h>
+#include	<cstring>
+
+#include	"trick/Sie.hh"
+#include	"trick/SimObject.hh"
+#include	"trick/attributes.h"
+#include	"trick/reference.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/MemoryManager.hh"
+#include	"trick/parameter_types.h"
+
+Trick::Sie	*	the_sie	=	NULL	;
+
+Trick::Sie::Sie()	{
+				//	Call	the	attribute_map	function	which	will	instantiate	the	singleton	maps
+				class_attr_map	=	Trick::AttributesMap::attributes_map()	;
+				enum_attr_map	=	Trick::EnumAttributesMap::attributes_map()	;
+
+				move_runtime_generation	=	false;
+
+				the_sie	=	this	;
 }
 
-void copy_file (const std::string& original_filename, const std::string& copy_filename) {
-    std::ifstream original;
-    std::ofstream copy;
+void	copy_file	(const	std::string&	original_filename,	const	std::string&	copy_filename)	{
+				std::ifstream	original;
+				std::ofstream	copy;
 
-    original.open(original_filename.c_str(), std::ios::binary);
-    copy.open(copy_filename.c_str(), std::ios::binary);
+				original.open(original_filename.c_str(),	std::ios::binary);
+				copy.open(copy_filename.c_str(),	std::ios::binary);
 
-    copy << original.rdbuf();
+				copy	<<	original.rdbuf();
 
-    original.close();
-    copy.close();
+				original.close();
+				copy.close();
 }
 
-// Helper function for copying S_sie.resource from default dir to output dir
-void copy_sie_resource() {
-    std::string original_sie_filename = std::string(command_line_args_get_default_dir()) + "/" + "S_sie.resource";
-    std::string copy_sie_filename = std::string(command_line_args_get_output_dir()) + "/" + "S_sie.resource";
-    copy_file(original_sie_filename, copy_sie_filename);
+//	Helper	function	for	copying	S_sie.resource	from	default	dir	to	output	dir
+void	copy_sie_resource()	{
+				std::string	original_sie_filename	=	std::string(command_line_args_get_default_dir())	+	"/"	+	"S_sie.resource";
+				std::string	copy_sie_filename	=	std::string(command_line_args_get_output_dir())	+	"/"	+	"S_sie.resource";
+				copy_file(original_sie_filename,	copy_sie_filename);
 }
 
-int Trick::Sie::process_sim_args() {
-
-    int argc ;
-    char ** argv ;
-
-    argc = command_line_args_get_argc() ;
-    argv = command_line_args_get_argv() ;
-
-    if (argc >= 2) {
-        if (!strcmp(argv[1], "sie")) {
-            /* If main is being invoked by the configuration processor (cp) to generate the sie resource file... */
-            /* Generate the sie resource file */
-            sie_print_xml();
-            sie_print_json();
-
-            // Silently exit the sim without printing the termination message
-            exit(0) ;
-        }
-
-        bool read_only = false;
-        bool oo_dir = false;
-        bool o_dir = false;
-
-        // Otherwise, go through the rest of the sim args and look for --read-only-sim
-        for (int i = 1; i < argc; i++) {
-            if ((strcmp("--read-only-sim", argv[i]) == 0))  {
-                // Set this flag to move runtime generation of sie into the output directory 
-                move_runtime_generation = true;
-                read_only = true;
-                break;
-            }
-        }
-
-        // Set oo_dir and o_dir flags accordingly
-        for (int i = 1; i < argc; i++) {
-            if (strncmp("-OO", argv[i], (size_t) 3) == 0) {
-                oo_dir = true;
-            } else if (strncmp("-O", argv[i], (size_t) 2) == 0) {
-                o_dir = true;
-            }
-        }
-
-        // If --read-only-sim is provided without either -OO or -O, exit with error message
-        // For -OO, save S_sie.resource to the output directory with runtime jobs data
-        if (read_only && !oo_dir && !o_dir) {
-            std::cerr << "\nERROR: Missing -O or -OO argument with --read-only-sim flag" << std::endl;
-            exit(1);
-        } else if (oo_dir) {
-            copy_sie_resource();
-            move_runtime_generation = true;
-        }
-    }
-
-    return(0) ;
+int	Trick::Sie::process_sim_args()	{
+
+				int	argc	;
+				char	**	argv	;
+
+				argc	=	command_line_args_get_argc()	;
+				argv	=	command_line_args_get_argv()	;
+
+				if	(argc	>=	2)	{
+								if	(!strcmp(argv[1],	"sie"))	{
+												/*	If	main	is	being	invoked	by	the	configuration	processor	(cp)	to	generate	the	sie	resource	file...	*/
+												/*	Generate	the	sie	resource	file	*/
+												sie_print_xml();
+												sie_print_json();
+
+												//	Silently	exit	the	sim	without	printing	the	termination	message
+												exit(0)	;
+								}
+
+								bool	read_only	=	false;
+								bool	oo_dir	=	false;
+								bool	o_dir	=	false;
+
+								//	Otherwise,	go	through	the	rest	of	the	sim	args	and	look	for	--read-only-sim
+								for	(int	i	=	1;	i	<	argc;	i++)	{
+												if	((strcmp("--read-only-sim",	argv[i])	==	0))		{
+																//	Set	this	flag	to	move	runtime	generation	of	sie	into	the	output	directory	
+																move_runtime_generation	=	true;
+																read_only	=	true;
+																break;
+												}
+								}
+
+								//	Set	oo_dir	and	o_dir	flags	accordingly
+								for	(int	i	=	1;	i	<	argc;	i++)	{
+												if	(strncmp("-OO",	argv[i],	(size_t)	3)	==	0)	{
+																oo_dir	=	true;
+												}	else	if	(strncmp("-O",	argv[i],	(size_t)	2)	==	0)	{
+																o_dir	=	true;
+												}
+								}
+
+								//	If	--read-only-sim	is	provided	without	either	-OO	or	-O,	exit	with	error	message
+								//	For	-OO,	save	S_sie.resource	to	the	output	directory	with	runtime	jobs	data
+								if	(read_only	&&	!oo_dir	&&	!o_dir)	{
+												std::cerr	<<	"\nERROR:	Missing	-O	or	-OO	argument	with	--read-only-sim	flag"	<<	std::endl;
+												exit(1);
+								}	else	if	(oo_dir)	{
+												copy_sie_resource();
+												move_runtime_generation	=	true;
+								}
+				}
+
+				return(0)	;
 }
 
-void Trick::Sie::top_level_objects_print(std::ofstream & sie_out) {
-    Trick::VARIABLE_MAP_ITER vit ;
-    int jj ;
-
-    for ( vit = trick_MM->variable_map_begin() ; vit != trick_MM->variable_map_end() ; ++vit ) {
-        ALLOC_INFO * alloc_info = (*vit).second ;
-
-        if ( alloc_info != NULL ) {
-            sie_out << "  <top_level_object" ;
-            sie_out << "\n   name=\"" << vit->first << "\"" ;
-            sie_out << "\n   type=\"" ;
-            std::string type = trickTypeCharString(alloc_info->type, alloc_info->user_type_name );
-            std::replace(type.begin(), type.end(), ':', '_');
-            sie_out <<  type << "\"\n" ;
-            sie_out << "   alloc_memory_init=\"" << alloc_info->alloced_in_memory_init << "\"";
-            sie_out << ">\n" ;
-            if ( alloc_info->num_index > 0 ) {
-                for (jj = 0; jj < alloc_info->num_index; jj++) {
-                    sie_out << "        <dimension>" << alloc_info->index[jj] << "</dimension>\n" ;
-                }
-            }
-            sie_out << "  </top_level_object>\n\n" ;
-        }
-    }
+void	Trick::Sie::top_level_objects_print(std::ofstream	&	sie_out)	{
+				Trick::VARIABLE_MAP_ITER	vit	;
+				int	jj	;
+
+				for	(	vit	=	trick_MM->variable_map_begin()	;	vit	!=	trick_MM->variable_map_end()	;	++vit	)	{
+								ALLOC_INFO	*	alloc_info	=	(*vit).second	;
+
+								if	(	alloc_info	!=	NULL	)	{
+												sie_out	<<	"		<top_level_object"	;
+												sie_out	<<	"\n			name=\""	<<	vit->first	<<	"\""	;
+												sie_out	<<	"\n			type=\""	;
+												std::string	type	=	trickTypeCharString(alloc_info->type,	alloc_info->user_type_name	);
+												std::replace(type.begin(),	type.end(),	':',	'_');
+												sie_out	<<		type	<<	"\"\n"	;
+												sie_out	<<	"			alloc_memory_init=\""	<<	alloc_info->alloced_in_memory_init	<<	"\"";
+												sie_out	<<	">\n"	;
+												if	(	alloc_info->num_index	>	0	)	{
+																for	(jj	=	0;	jj	<	alloc_info->num_index;	jj++)	{
+																				sie_out	<<	"								<dimension>"	<<	alloc_info->index[jj]	<<	"</dimension>\n"	;
+																}
+												}
+												sie_out	<<	"		</top_level_object>\n\n"	;
+								}
+				}
 }
 
-void Trick::Sie::runtime_objects_print(std::fstream & sie_out) {
-    Trick::VARIABLE_MAP_ITER vit ;
-    int jj ;
-
-    for ( vit = trick_MM->variable_map_begin() ; vit != trick_MM->variable_map_end() ; ++vit ) {
-        ALLOC_INFO * alloc_info = (*vit).second ;
-
-        if ( alloc_info != NULL && alloc_info->alloced_in_memory_init == 0) {
-            sie_out << "  <top_level_object" ;
-            sie_out << "\n   name=\"" << vit->first << "\"" ;
-            sie_out << "\n   type=\"" ;
-            std::string type = trickTypeCharString(alloc_info->type, alloc_info->user_type_name );
-            std::replace(type.begin(), type.end(), ':', '_');
-            sie_out <<  type << "\"\n" ;
-            sie_out << "   alloc_memory_init=\"" << alloc_info->alloced_in_memory_init << "\"";
-            sie_out << ">\n" ;
-            if ( alloc_info->num_index > 0 ) {
-                for (jj = 0; jj < alloc_info->num_index; jj++) {
-                    sie_out << "        <dimension>" << alloc_info->index[jj] << "</dimension>\n" ;
-                }
-            }
-            sie_out << "  </top_level_object>\n\n" ;
-        }
-    }
+void	Trick::Sie::runtime_objects_print(std::fstream	&	sie_out)	{
+				Trick::VARIABLE_MAP_ITER	vit	;
+				int	jj	;
+
+				for	(	vit	=	trick_MM->variable_map_begin()	;	vit	!=	trick_MM->variable_map_end()	;	++vit	)	{
+								ALLOC_INFO	*	alloc_info	=	(*vit).second	;
+
+								if	(	alloc_info	!=	NULL	&&	alloc_info->alloced_in_memory_init	==	0)	{
+												sie_out	<<	"		<top_level_object"	;
+												sie_out	<<	"\n			name=\""	<<	vit->first	<<	"\""	;
+												sie_out	<<	"\n			type=\""	;
+												std::string	type	=	trickTypeCharString(alloc_info->type,	alloc_info->user_type_name	);
+												std::replace(type.begin(),	type.end(),	':',	'_');
+												sie_out	<<		type	<<	"\"\n"	;
+												sie_out	<<	"			alloc_memory_init=\""	<<	alloc_info->alloced_in_memory_init	<<	"\"";
+												sie_out	<<	">\n"	;
+												if	(	alloc_info->num_index	>	0	)	{
+																for	(jj	=	0;	jj	<	alloc_info->num_index;	jj++)	{
+																				sie_out	<<	"								<dimension>"	<<	alloc_info->index[jj]	<<	"</dimension>\n"	;
+																}
+												}
+												sie_out	<<	"		</top_level_object>\n\n"	;
+								}
+				}
 }
 
-void Trick::Sie::top_level_objects_json(std::ofstream & sie_out) {
-    Trick::VARIABLE_MAP_ITER vit ;
-    int jj ;
-    sie_out << "  \"top_level_objects\": [\n";
-    for ( vit = trick_MM->variable_map_begin() ; vit != trick_MM->variable_map_end() ; ++vit ) {
-        ALLOC_INFO * alloc_info = (*vit).second ;
-
-        if ( alloc_info != NULL ) {
-            sie_out << "    {\n" ;
-            sie_out << "      \"name\": \"" << vit->first << "\",\n" ;
-            sie_out << "      \"type\": \"" ;
-            std::string type = trickTypeCharString(alloc_info->type, alloc_info->user_type_name );
-            std::replace(type.begin(), type.end(), ':', '_') ;
-            sie_out <<  type << "\",\n" ;
-            sie_out << "      \"alloc_memory_init\": \"" << alloc_info->alloced_in_memory_init << "\"";
-            if ( alloc_info->num_index > 0 ) {
-                sie_out << ",\n        \"dimensions\": [" ;
-                for (jj = 0; jj < alloc_info->num_index - 1; jj++) {
-                    sie_out << " \"" << alloc_info->index[jj] << "\"," ;
-                }
-                sie_out << " \"" << alloc_info->index[alloc_info->num_index - 1] << "\" " ;
-                sie_out << "]\n" ;
-                } else {
-                    sie_out << '\n' ;
-                }
-            sie_out << "    }" ;
-            if(std::next(vit, 1) != trick_MM->variable_map_end()) {
-                sie_out << ',' ;
-            }
-            sie_out << '\n';
-        }
-    }
-    sie_out << "  ]\n";
+void	Trick::Sie::top_level_objects_json(std::ofstream	&	sie_out)	{
+				Trick::VARIABLE_MAP_ITER	vit	;
+				int	jj	;
+				sie_out	<<	"		\"top_level_objects\":	[\n";
+				for	(	vit	=	trick_MM->variable_map_begin()	;	vit	!=	trick_MM->variable_map_end()	;	++vit	)	{
+								ALLOC_INFO	*	alloc_info	=	(*vit).second	;
+
+								if	(	alloc_info	!=	NULL	)	{
+												sie_out	<<	"				{\n"	;
+												sie_out	<<	"						\"name\":	\""	<<	vit->first	<<	"\",\n"	;
+												sie_out	<<	"						\"type\":	\""	;
+												std::string	type	=	trickTypeCharString(alloc_info->type,	alloc_info->user_type_name	);
+												std::replace(type.begin(),	type.end(),	':',	'_')	;
+												sie_out	<<		type	<<	"\",\n"	;
+												sie_out	<<	"						\"alloc_memory_init\":	\""	<<	alloc_info->alloced_in_memory_init	<<	"\"";
+												if	(	alloc_info->num_index	>	0	)	{
+																sie_out	<<	",\n								\"dimensions\":	["	;
+																for	(jj	=	0;	jj	<	alloc_info->num_index	-	1;	jj++)	{
+																				sie_out	<<	"	\""	<<	alloc_info->index[jj]	<<	"\","	;
+																}
+																sie_out	<<	"	\""	<<	alloc_info->index[alloc_info->num_index	-	1]	<<	"\"	"	;
+																sie_out	<<	"]\n"	;
+																}	else	{
+																				sie_out	<<	'\n'	;
+																}
+												sie_out	<<	"				}"	;
+												if(std::next(vit,	1)	!=	trick_MM->variable_map_end())	{
+																sie_out	<<	','	;
+												}
+												sie_out	<<	'\n';
+								}
+				}
+				sie_out	<<	"		]\n";
 }
 
-void Trick::Sie::sie_print_xml() {
-    std::ofstream sie_out ;
-    std::string file_name = std::string(get_runtime_sie_dir()) + "/" + "S_sie.resource" ;
-    sie_out.open(file_name.c_str()) ;
-    sie_out << "<?xml version=\"1.0\"?>\n\n" ;
-    sie_out << "<sie>\n\n" ;
-    class_attr_map->print_xml(sie_out) ;
-    enum_attr_map->print_xml(sie_out) ;
-    top_level_objects_print(sie_out) ;
-    sie_out << "</sie>\n" ;
-    sie_out.close() ;
+void	Trick::Sie::sie_print_xml()	{
+				std::ofstream	sie_out	;
+				std::string	file_name	=	std::string(get_runtime_sie_dir())	+	"/"	+	"S_sie.resource"	;
+				sie_out.open(file_name.c_str())	;
+				sie_out	<<	"<?xml	version=\"1.0\"?>\n\n"	;
+				sie_out	<<	"<sie>\n\n"	;
+				class_attr_map->print_xml(sie_out)	;
+				enum_attr_map->print_xml(sie_out)	;
+				top_level_objects_print(sie_out)	;
+				sie_out	<<	"</sie>\n"	;
+				sie_out.close()	;
 }
 
-void Trick::Sie::sie_append_runtime_objs() {
-    std::fstream sie_out ;
-
-    if (move_runtime_generation) {
-        copy_sie_resource();
-    }
-
-    std::string sie_filename = get_runtime_sie_dir() + "/" + "S_sie.resource" ;
-    sie_out.open(sie_filename.c_str(), std::fstream::in | std::fstream::out) ;
-
-    const char * comment = "<!--\nRuntime Allocations\nDo not edit this comment or file content past this point\n-->\n";
-    int comment_len = strlen(comment);
-
-    int curr_offset = 1;
-    int mem_size = 1000000;
-    char * buff = new char[mem_size + 1];
-    char * find_str = NULL;
-
-    // initial read use the whole buffer
-    sie_out.get(buff, mem_size, '\0');
-    find_str = strstr(buff, comment);
-
-    // loop through the file looking for the marker comment.  The comment could straddle 2 reads.  Copy the last bytes of
-    // the previous read to start the next search.
-    while ( !find_str && !sie_out.eof() ) {
-        curr_offset += mem_size - comment_len - 1;
-        strncpy(buff, &buff[mem_size-comment_len-1], comment_len);
-        sie_out.get(&buff[comment_len], mem_size-comment_len, '\0');
-        find_str = strstr(buff, comment);
-    }
-
-    if ( !find_str ) {
-        std::cerr << "Warning: Cannot add runtime/dynamic allocations to S_sie.resource. S_sie.resource is corrupted, outdated, or missing. Please be sure that SIM_*/S_sie.resource is preserved after build time if needed at runtime for trick-tv or other variable server clients. Please also rerun trick-CP." << std::endl;
-        delete[] buff;
-        return;
-    }
-
-    // calculate the position of the marker in the file and jump to the point after the comment ends.
-    int pos = curr_offset + (find_str - buff) + comment_len - 1;
-    sie_out.clear();
-    sie_out.seekp(pos);
-
-    runtime_objects_print(sie_out);
-    sie_out << "</sie>\n";
-    sie_out.close();
-    delete[] buff;
+void	Trick::Sie::sie_append_runtime_objs()	{
+				std::fstream	sie_out	;
+
+				if	(move_runtime_generation)	{
+								copy_sie_resource();
+				}
+
+				std::string	sie_filename	=	get_runtime_sie_dir()	+	"/"	+	"S_sie.resource"	;
+				sie_out.open(sie_filename.c_str(),	std::fstream::in	|	std::fstream::out)	;
+
+				const	char	*	comment	=	"<!--\nRuntime	Allocations\nDo	not	edit	this	comment	or	file	content	past	this	point\n-->\n";
+				int	comment_len	=	strlen(comment);
+
+				int	curr_offset	=	1;
+				int	mem_size	=	1000000;
+				char	*	buff	=	new	char[mem_size	+	1];
+				char	*	find_str	=	NULL;
+
+				//	initial	read	use	the	whole	buffer
+				sie_out.get(buff,	mem_size,	'\0');
+				find_str	=	strstr(buff,	comment);
+
+				//	loop	through	the	file	looking	for	the	marker	comment.		The	comment	could	straddle	2	reads.		Copy	the	last	bytes	of
+				//	the	previous	read	to	start	the	next	search.
+				while	(	!find_str	&&	!sie_out.eof()	)	{
+								curr_offset	+=	mem_size	-	comment_len	-	1;
+								strncpy(buff,	&buff[mem_size-comment_len-1],	comment_len);
+								sie_out.get(&buff[comment_len],	mem_size-comment_len,	'\0');
+								find_str	=	strstr(buff,	comment);
+				}
+
+				if	(	!find_str	)	{
+								std::cerr	<<	"Warning:	Cannot	add	runtime/dynamic	allocations	to	S_sie.resource.	S_sie.resource	is	corrupted,	outdated,	or	missing.	Please	be	sure	that	SIM_*/S_sie.resource	is	preserved	after	build	time	if	needed	at	runtime	for	trick-tv	or	other	variable	server	clients.	Please	also	rerun	trick-CP."	<<	std::endl;
+								delete[]	buff;
+								return;
+				}
+
+				//	calculate	the	position	of	the	marker	in	the	file	and	jump	to	the	point	after	the	comment	ends.
+				int	pos	=	curr_offset	+	(find_str	-	buff)	+	comment_len	-	1;
+				sie_out.clear();
+				sie_out.seekp(pos);
+
+				runtime_objects_print(sie_out);
+				sie_out	<<	"</sie>\n";
+				sie_out.close();
+				delete[]	buff;
 }
 
-std::string Trick::Sie::get_runtime_sie_dir() {
-    if (move_runtime_generation) {
-        return std::string(command_line_args_get_output_dir());
-    } else {
-        return std::string(command_line_args_get_default_dir());
-    }
+std::string	Trick::Sie::get_runtime_sie_dir()	{
+				if	(move_runtime_generation)	{
+								return	std::string(command_line_args_get_output_dir());
+				}	else	{
+								return	std::string(command_line_args_get_default_dir());
+				}
 }
 
-void Trick::Sie::sie_print_json() {
-    std::ofstream sie_out ;
-    std::string file_name = std::string(get_runtime_sie_dir()) + "/" + "S_sie.json" ;
-    sie_out.open(file_name.c_str()) ;
-    sie_out << "{\n" ;
-    class_attr_map->print_json(sie_out) ;
-    enum_attr_map->print_json(sie_out) ;
-    top_level_objects_json(sie_out) ;
-    sie_out << "}\n" ;
-    sie_out.close() ;
+void	Trick::Sie::sie_print_json()	{
+				std::ofstream	sie_out	;
+				std::string	file_name	=	std::string(get_runtime_sie_dir())	+	"/"	+	"S_sie.json"	;
+				sie_out.open(file_name.c_str())	;
+				sie_out	<<	"{\n"	;
+				class_attr_map->print_json(sie_out)	;
+				enum_attr_map->print_json(sie_out)	;
+				top_level_objects_json(sie_out)	;
+				sie_out	<<	"}\n"	;
+				sie_out.close()	;
 }
 
 
-void Trick::Sie::class_attr_map_print_xml() {
-    std::ofstream sie_out ;
-    std::string file_name = std::string(get_runtime_sie_dir()) + "/" + "S_sie_class.xml" ;
-    sie_out.open(file_name.c_str()) ;
-    sie_out << "<?xml version=\"1.0\"?>\n\n" ;
-    sie_out << "<sie>\n" ;
-    class_attr_map->print_xml(sie_out) ;
-    sie_out << "</sie>\n" ;
-    sie_out.close() ;
+void	Trick::Sie::class_attr_map_print_xml()	{
+				std::ofstream	sie_out	;
+				std::string	file_name	=	std::string(get_runtime_sie_dir())	+	"/"	+	"S_sie_class.xml"	;
+				sie_out.open(file_name.c_str())	;
+				sie_out	<<	"<?xml	version=\"1.0\"?>\n\n"	;
+				sie_out	<<	"<sie>\n"	;
+				class_attr_map->print_xml(sie_out)	;
+				sie_out	<<	"</sie>\n"	;
+				sie_out.close()	;
 }
 
-void Trick::Sie::enum_attr_map_print_xml() {
-    std::ofstream sie_out ;
-    std::string file_name = std::string(get_runtime_sie_dir()) + "/" + "S_sie_enum.xml" ;
-    sie_out.open(file_name.c_str()) ;
-    sie_out << "<?xml version=\"1.0\"?>\n\n" ;
-    sie_out << "<sie>\n" ;
-    enum_attr_map->print_xml(sie_out) ;
-    sie_out << "</sie>\n" ;
-    sie_out.close() ;
+void	Trick::Sie::enum_attr_map_print_xml()	{
+				std::ofstream	sie_out	;
+				std::string	file_name	=	std::string(get_runtime_sie_dir())	+	"/"	+	"S_sie_enum.xml"	;
+				sie_out.open(file_name.c_str())	;
+				sie_out	<<	"<?xml	version=\"1.0\"?>\n\n"	;
+				sie_out	<<	"<sie>\n"	;
+				enum_attr_map->print_xml(sie_out)	;
+				sie_out	<<	"</sie>\n"	;
+				sie_out.close()	;
 }
 
-void Trick::Sie::top_level_objects_print_xml() {
-    std::ofstream sie_out ;
-    std::string file_name = std::string(get_runtime_sie_dir()) + "/" + "S_sie_top_level_objects.xml" ;
-    sie_out.open(file_name.c_str()) ;
-    sie_out << "<?xml version=\"1.0\"?>\n\n" ;
-    sie_out << "<sie>\n" ;
-    top_level_objects_print(sie_out) ;
-    sie_out << "</sie>\n" ;
-    sie_out.close() ;
+void	Trick::Sie::top_level_objects_print_xml()	{
+				std::ofstream	sie_out	;
+				std::string	file_name	=	std::string(get_runtime_sie_dir())	+	"/"	+	"S_sie_top_level_objects.xml"	;
+				sie_out.open(file_name.c_str())	;
+				sie_out	<<	"<?xml	version=\"1.0\"?>\n\n"	;
+				sie_out	<<	"<sie>\n"	;
+				top_level_objects_print(sie_out)	;
+				sie_out	<<	"</sie>\n"	;
+				sie_out.close()	;
 }
 
diff --git a/trick_source/sim_services/Sie/sie_c_intf.cpp b/trick_source/sim_services/Sie/sie_c_intf.cpp
index f865b1bfc..b264ea99b 100644
--- a/trick_source/sim_services/Sie/sie_c_intf.cpp
+++ b/trick_source/sim_services/Sie/sie_c_intf.cpp
@@ -1,42 +1,42 @@
 
-#include "trick/Sie.hh"
-#include "trick/sie_c_intf.h"
+#include	"trick/Sie.hh"
+#include	"trick/sie_c_intf.h"
 
-extern Trick::Sie * the_sie ;
+extern	Trick::Sie	*	the_sie	;
 
-extern "C" void sie_print_xml(void) {
-    if ( the_sie != NULL ) {
-        the_sie->sie_print_xml() ;
-    }
+extern	"C"	void	sie_print_xml(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								the_sie->sie_print_xml()	;
+				}
 }
 
-extern "C" void sie_class_attr_map_print_xml(void) {
-    if ( the_sie != NULL ) {
-        the_sie->class_attr_map_print_xml() ;
-    }
+extern	"C"	void	sie_class_attr_map_print_xml(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								the_sie->class_attr_map_print_xml()	;
+				}
 }
 
-extern "C" void sie_enum_attr_map_print_xml(void) {
-    if ( the_sie != NULL ) {
-        the_sie->enum_attr_map_print_xml() ;
-    }
+extern	"C"	void	sie_enum_attr_map_print_xml(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								the_sie->enum_attr_map_print_xml()	;
+				}
 }
 
-extern "C" void sie_top_level_objects_print_xml(void) {
-    if ( the_sie != NULL ) {
-        the_sie->top_level_objects_print_xml() ;
-    }
+extern	"C"	void	sie_top_level_objects_print_xml(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								the_sie->top_level_objects_print_xml()	;
+				}
 }
 
-extern "C" void sie_append_runtime_objs(void) {
-    if ( the_sie != NULL ) {
-        the_sie->sie_append_runtime_objs() ;
-    }
+extern	"C"	void	sie_append_runtime_objs(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								the_sie->sie_append_runtime_objs()	;
+				}
 }
 
-extern "C" std::string sie_get_runtime_sie_dir(void) {
-    if ( the_sie != NULL ) {
-        return the_sie->get_runtime_sie_dir() ;
-    }
+extern	"C"	std::string	sie_get_runtime_sie_dir(void)	{
+				if	(	the_sie	!=	NULL	)	{
+								return	the_sie->get_runtime_sie_dir()	;
+				}
 }
 
diff --git a/trick_source/sim_services/SimObject/JobData.cpp b/trick_source/sim_services/SimObject/JobData.cpp
index 1aaeb45d2..9c01a7f74 100644
--- a/trick_source/sim_services/SimObject/JobData.cpp
+++ b/trick_source/sim_services/SimObject/JobData.cpp
@@ -1,245 +1,245 @@
 
-#include <math.h>
+#include	<math.h>
 
-#include "trick/JobData.hh"
-#include "trick/SimObject.hh"
+#include	"trick/JobData.hh"
+#include	"trick/SimObject.hh"
 
-long long Trick::JobData::time_tic_value = 0 ;
+long	long	Trick::JobData::time_tic_value	=	0	;
 
-Trick::JobData::JobData() {
+Trick::JobData::JobData()	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li initializes the job as enabled with 0 cycle rate. */
-    disabled = false ;
-    handled = false ;
-    thread = 0 ;
-    id = 0 ;
-    sim_object_id = -1 ;
-    job_class = -1 ;
-    sup_class_data = NULL ;
-    cycle = 0.0 ;
-    start = 0.0 ;
-    stop = 0.0 ;
-    complete = false ;
-    rt_start_time = -1;
-    phase = 60000 ;
-    system_job_class = 0 ;
+				/**	@li	initializes	the	job	as	enabled	with	0	cycle	rate.	*/
+				disabled	=	false	;
+				handled	=	false	;
+				thread	=	0	;
+				id	=	0	;
+				sim_object_id	=	-1	;
+				job_class	=	-1	;
+				sup_class_data	=	NULL	;
+				cycle	=	0.0	;
+				start	=	0.0	;
+				stop	=	0.0	;
+				complete	=	false	;
+				rt_start_time	=	-1;
+				phase	=	60000	;
+				system_job_class	=	0	;
 
-    cycle_tics = 0 ;
-    start_tics = 0 ;
-    stop_tics = 0 ;
-    next_tics = 0 ;
+				cycle_tics	=	0	;
+				start_tics	=	0	;
+				stop_tics	=	0	;
+				next_tics	=	0	;
 
-    frame_time = 0 ;
-    frame_time_seconds = 0.0;
+				frame_time	=	0	;
+				frame_time_seconds	=	0.0;
 }
 
-Trick::JobData::JobData(int in_thread, int in_id, std::string in_job_class_name , void* in_sup_class_data,
-                        double in_cycle, std::string in_name, std::string in_tag, int in_phase,
-                        double in_start, double in_stop) {
+Trick::JobData::JobData(int	in_thread,	int	in_id,	std::string	in_job_class_name	,	void*	in_sup_class_data,
+																								double	in_cycle,	std::string	in_name,	std::string	in_tag,	int	in_phase,
+																								double	in_start,	double	in_stop)	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li initializes the job according to arguments */
-    disabled = false ;
-    handled = false ;
-    thread = in_thread ;
-    id = in_id ;
-    sim_object_id = -1 ;
-    job_class = -1 ;
-    job_class_name = in_job_class_name ;
-    sup_class_data = in_sup_class_data ;
-    cycle = in_cycle ;
-    start = in_start ;
-    stop = in_stop ;
-    complete = false ;
-    name = in_name ;
-    add_tag(in_tag) ;
-    rt_start_time = -1;
-    phase = in_phase ;
-    system_job_class = 0 ;
+				/**	@li	initializes	the	job	according	to	arguments	*/
+				disabled	=	false	;
+				handled	=	false	;
+				thread	=	in_thread	;
+				id	=	in_id	;
+				sim_object_id	=	-1	;
+				job_class	=	-1	;
+				job_class_name	=	in_job_class_name	;
+				sup_class_data	=	in_sup_class_data	;
+				cycle	=	in_cycle	;
+				start	=	in_start	;
+				stop	=	in_stop	;
+				complete	=	false	;
+				name	=	in_name	;
+				add_tag(in_tag)	;
+				rt_start_time	=	-1;
+				phase	=	in_phase	;
+				system_job_class	=	0	;
 
-    cycle_tics = 0 ;
-    start_tics = 0 ;
-    stop_tics = 0 ;
-    next_tics = 0 ;
+				cycle_tics	=	0	;
+				start_tics	=	0	;
+				stop_tics	=	0	;
+				next_tics	=	0	;
 
-    frame_time = 0 ;
-    frame_time_seconds = 0.0 ;
+				frame_time	=	0	;
+				frame_time_seconds	=	0.0	;
 }
 
-void Trick::JobData::enable() {
-    disabled = false ;
+void	Trick::JobData::enable()	{
+				disabled	=	false	;
 }
 
-void Trick::JobData::disable() {
-    disabled = true ;
+void	Trick::JobData::disable()	{
+				disabled	=	true	;
 }
 
-bool Trick::JobData::get_handled() {
-    return(handled) ;
+bool	Trick::JobData::get_handled()	{
+				return(handled)	;
 }
 
-int Trick::JobData::set_handled(bool yes_no) {
-    handled = yes_no ;
-    return(0) ;
+int	Trick::JobData::set_handled(bool	yes_no)	{
+				handled	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::JobData::set_time_tic_value(long long in_time_tic_value) {
-    time_tic_value = in_time_tic_value ;
-    return 0 ;
+int	Trick::JobData::set_time_tic_value(long	long	in_time_tic_value)	{
+				time_tic_value	=	in_time_tic_value	;
+				return	0	;
 }
 
-int Trick::JobData::set_cycle(double in_cycle) {
-    cycle = in_cycle ;
-    calc_cycle_tics() ;
-    return 0 ;
+int	Trick::JobData::set_cycle(double	in_cycle)	{
+				cycle	=	in_cycle	;
+				calc_cycle_tics()	;
+				return	0	;
 }
 
-int Trick::JobData::calc_cycle_tics() {
-    cycle_tics  = (long long)round(cycle * time_tic_value) ;
-    return 0 ;
+int	Trick::JobData::calc_cycle_tics()	{
+				cycle_tics		=	(long	long)round(cycle	*	time_tic_value)	;
+				return	0	;
 }
 
-int Trick::JobData::set_next_call_time(long long time_tics) {
-    if ( next_tics > time_tics  ) {
-        next_tics = time_tics - ( time_tics % cycle_tics ) + cycle_tics ;
-    } else {
-        next_tics = time_tics ;
-    }
-    return 0 ;
+int	Trick::JobData::set_next_call_time(long	long	time_tics)	{
+				if	(	next_tics	>	time_tics		)	{
+								next_tics	=	time_tics	-	(	time_tics	%	cycle_tics	)	+	cycle_tics	;
+				}	else	{
+								next_tics	=	time_tics	;
+				}
+				return	0	;
 }
 
 
-int Trick::JobData::set_system_job_class(bool yes_no) {
-    system_job_class = yes_no ;
-    return(0) ;
+int	Trick::JobData::set_system_job_class(bool	yes_no)	{
+				system_job_class	=	yes_no	;
+				return(0)	;
 }
 
-int Trick::JobData::add_tag( std::string in_tag ) {
-    if ( ! in_tag.empty() ) {
-        tags.insert(in_tag) ;
-    }
-    return(0) ;
+int	Trick::JobData::add_tag(	std::string	in_tag	)	{
+				if	(	!	in_tag.empty()	)	{
+								tags.insert(in_tag)	;
+				}
+				return(0)	;
 }
 
-int Trick::JobData::add_depend( JobData * depend_job ) {
-    depends.push_back(depend_job) ;
-    return(0) ;
+int	Trick::JobData::add_depend(	JobData	*	depend_job	)	{
+				depends.push_back(depend_job)	;
+				return(0)	;
 }
 
-int Trick::JobData::add_inst_before( InstrumentBase * in_job ) {
-    std::vector<Trick::InstrumentBase*>::size_type ii ;
-    for ( ii = 0 ; ii < inst_before.size() ; ++ii ) {
-        if ( in_job->phase < inst_before[ii]->phase ) {
-            break ;
-        }
-    }
-    inst_before.insert( inst_before.begin() + ii, in_job ) ;
-    return 0 ;
+int	Trick::JobData::add_inst_before(	InstrumentBase	*	in_job	)	{
+				std::vector<Trick::InstrumentBase*>::size_type	ii	;
+				for	(	ii	=	0	;	ii	<	inst_before.size()	;	++ii	)	{
+								if	(	in_job->phase	<	inst_before[ii]->phase	)	{
+												break	;
+								}
+				}
+				inst_before.insert(	inst_before.begin()	+	ii,	in_job	)	;
+				return	0	;
 }
 
-int Trick::JobData::add_inst_after( InstrumentBase * in_job ) {
-    std::vector<Trick::InstrumentBase*>::size_type ii ;
-    for ( ii = 0 ; ii < inst_after.size() ; ++ii ) {
-        if ( in_job->phase < inst_after[ii]->phase ) {
-            break ;
-        }
-    }
-    inst_after.insert( inst_after.begin() + ii, in_job ) ;
-    return 0 ;
+int	Trick::JobData::add_inst_after(	InstrumentBase	*	in_job	)	{
+				std::vector<Trick::InstrumentBase*>::size_type	ii	;
+				for	(	ii	=	0	;	ii	<	inst_after.size()	;	++ii	)	{
+								if	(	in_job->phase	<	inst_after[ii]->phase	)	{
+												break	;
+								}
+				}
+				inst_after.insert(	inst_after.begin()	+	ii,	in_job	)	;
+				return	0	;
 }
 
-int Trick::JobData::remove_inst( std::string job_name ) {
-    int ii , size ;
+int	Trick::JobData::remove_inst(	std::string	job_name	)	{
+				int	ii	,	size	;
 
-    size = inst_before.size() ;
-    for ( ii = size - 1 ; ii >= 0 ; ii-- ) {
-        if ( ! inst_before[ii]->name.compare(job_name) ) {
-            inst_before.erase( inst_before.begin() + ii ) ;
-        }
-    }
+				size	=	inst_before.size()	;
+				for	(	ii	=	size	-	1	;	ii	>=	0	;	ii--	)	{
+								if	(	!	inst_before[ii]->name.compare(job_name)	)	{
+												inst_before.erase(	inst_before.begin()	+	ii	)	;
+								}
+				}
 
-    size = inst_after.size() ;
-    for ( ii = size - 1 ; ii >= 0 ; ii-- ) {
-        if ( ! inst_after[ii]->name.compare(job_name) ) {
-            inst_after.erase( inst_after.begin() + ii ) ;
-        }
-    }
-    return 0 ;
+				size	=	inst_after.size()	;
+				for	(	ii	=	size	-	1	;	ii	>=	0	;	ii--	)	{
+								if	(	!	inst_after[ii]->name.compare(job_name)	)	{
+												inst_after.erase(	inst_after.begin()	+	ii	)	;
+								}
+				}
+				return	0	;
 }
 
-int Trick::JobData::call() {
-    int ret ;
-    unsigned int ii , size ;
-    InstrumentBase * curr_job ;
+int	Trick::JobData::call()	{
+				int	ret	;
+				unsigned	int	ii	,	size	;
+				InstrumentBase	*	curr_job	;
 
-    size = inst_before.size() ;
-    for ( ii = 0 ; ii < size ; ii++ ) {
-        curr_job = inst_before[ii] ;
-        curr_job->call() ;
-    }
+				size	=	inst_before.size()	;
+				for	(	ii	=	0	;	ii	<	size	;	ii++	)	{
+								curr_job	=	inst_before[ii]	;
+								curr_job->call()	;
+				}
 
-    ret = parent_object->call_function(this) ;
+				ret	=	parent_object->call_function(this)	;
 
-    size = inst_after.size() ;
-    for ( ii = 0 ; ii < size ; ii++ ) {
-        curr_job = inst_after[ii] ;
-        curr_job->call() ;
-    }
+				size	=	inst_after.size()	;
+				for	(	ii	=	0	;	ii	<	size	;	ii++	)	{
+								curr_job	=	inst_after[ii]	;
+								curr_job->call()	;
+				}
 
-    return ret ;
+				return	ret	;
 }
 
-double Trick::JobData::call_double() {
-    double ret ;
-    unsigned int ii , size ;
-    InstrumentBase * curr_job ;
+double	Trick::JobData::call_double()	{
+				double	ret	;
+				unsigned	int	ii	,	size	;
+				InstrumentBase	*	curr_job	;
 
-    size = inst_before.size() ;
-    for ( ii = 0 ; ii < size ; ii++ ) {
-        curr_job = inst_before[ii] ;
-        curr_job->call() ;
-    }
+				size	=	inst_before.size()	;
+				for	(	ii	=	0	;	ii	<	size	;	ii++	)	{
+								curr_job	=	inst_before[ii]	;
+								curr_job->call()	;
+				}
 
-    ret = parent_object->call_function_double(this) ;
+				ret	=	parent_object->call_function_double(this)	;
 
-    size = inst_after.size() ;
-    for ( ii = 0 ; ii < size ; ii++ ) {
-        curr_job = inst_after[ii] ;
-        curr_job->call() ;
-    }
+				size	=	inst_after.size()	;
+				for	(	ii	=	0	;	ii	<	size	;	ii++	)	{
+								curr_job	=	inst_after[ii]	;
+								curr_job->call()	;
+				}
 
-    return ret ;
+				return	ret	;
 }
 
-int Trick::JobData::copy_from_checkpoint( JobData * in_job ) {
+int	Trick::JobData::copy_from_checkpoint(	JobData	*	in_job	)	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li resets the current job disabled, cycle rate, and job class name and phase from
-            incoming job data */
+				/**	@li	resets	the	current	job	disabled,	cycle	rate,	and	job	class	name	and	phase	from
+												incoming	job	data	*/
 
-    disabled = in_job->disabled ;
-    complete = in_job->complete ;
+				disabled	=	in_job->disabled	;
+				complete	=	in_job->complete	;
 
-    handled = in_job->handled ;
+				handled	=	in_job->handled	;
 
-    cycle = in_job->cycle ;
-    start = in_job->start ;
-    stop = in_job->stop ;
+				cycle	=	in_job->cycle	;
+				start	=	in_job->start	;
+				stop	=	in_job->stop	;
 
-    job_class_name = in_job->job_class_name ;
-    phase = in_job->phase ;
-    system_job_class = in_job->system_job_class ;
+				job_class_name	=	in_job->job_class_name	;
+				phase	=	in_job->phase	;
+				system_job_class	=	in_job->system_job_class	;
 
-    thread = in_job->thread ;
+				thread	=	in_job->thread	;
 
-    cycle_tics = in_job->cycle_tics ;
-    start_tics = in_job->start_tics ;
-    stop_tics = in_job->stop_tics ;
-    next_tics = in_job->next_tics ;
+				cycle_tics	=	in_job->cycle_tics	;
+				start_tics	=	in_job->start_tics	;
+				stop_tics	=	in_job->stop_tics	;
+				next_tics	=	in_job->next_tics	;
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/SimObject/SimObject.cpp b/trick_source/sim_services/SimObject/SimObject.cpp
index bdf92c0cc..a8ef45d89 100644
--- a/trick_source/sim_services/SimObject/SimObject.cpp
+++ b/trick_source/sim_services/SimObject/SimObject.cpp
@@ -1,127 +1,127 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/SimObject.hh"
-#include "trick/message_proto.h"
+#include	"trick/SimObject.hh"
+#include	"trick/message_proto.h"
 
-Trick::SimObject::~SimObject() {
-    while ( !jobs.empty() ) {
-        delete jobs.back() ;
-        jobs.pop_back() ;
-    }
+Trick::SimObject::~SimObject()	{
+				while	(	!jobs.empty()	)	{
+								delete	jobs.back()	;
+								jobs.pop_back()	;
+				}
 }
 
-int Trick::SimObject::add_tag( std::string job_tag ) {
-    std::vector <Trick::JobData *>::iterator it ;
-    for ( it = jobs.begin() ; it != jobs.end() ; ++it ) {
-        (*it)->add_tag(job_tag) ;
-    }
-    return(0) ;
+int	Trick::SimObject::add_tag(	std::string	job_tag	)	{
+				std::vector	<Trick::JobData	*>::iterator	it	;
+				for	(	it	=	jobs.begin()	;	it	!=	jobs.end()	;	++it	)	{
+								(*it)->add_tag(job_tag)	;
+				}
+				return(0)	;
 
 }
 
-int Trick::SimObject::add_tag_to_job( std::string job_tag , std::string job_name ) {
-    Trick::JobData * jd ;
-    if ( (jd = get_job(name + "." + job_name)) != NULL ) {
-        return jd->add_tag(job_tag) ;
-    }
-    return -1 ;
+int	Trick::SimObject::add_tag_to_job(	std::string	job_tag	,	std::string	job_name	)	{
+				Trick::JobData	*	jd	;
+				if	(	(jd	=	get_job(name	+	"."	+	job_name))	!=	NULL	)	{
+								return	jd->add_tag(job_tag)	;
+				}
+				return	-1	;
 
 }
 
-int Trick::SimObject::add_pre_component_object( SimObject * in_object , std::string in_name ) {
+int	Trick::SimObject::add_pre_component_object(	SimObject	*	in_object	,	std::string	in_name	)	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li push the component object onto the vector of pre_component objects */
-    in_object->name = in_name ;
-    pre_component_objects.push_back(in_object) ;
+				/**	@li	push	the	component	object	onto	the	vector	of	pre_component	objects	*/
+				in_object->name	=	in_name	;
+				pre_component_objects.push_back(in_object)	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::SimObject::add_post_component_object( SimObject * in_object , std::string in_name ) {
+int	Trick::SimObject::add_post_component_object(	SimObject	*	in_object	,	std::string	in_name	)	{
 
-    /** @par Detailed Design */
+				/**	@par	Detailed	Design	*/
 
-    /** @li push the component object onto the vector of post_component objects */
-    in_object->name = in_name ;
-    post_component_objects.push_back(in_object) ;
+				/**	@li	push	the	component	object	onto	the	vector	of	post_component	objects	*/
+				in_object->name	=	in_name	;
+				post_component_objects.push_back(in_object)	;
 
-    return(0) ;
+				return(0)	;
 
 }
 
-Trick::JobData * Trick::SimObject::add_job(int in_thread, int in_id, const char * in_job_class_name ,void* sup_class_data,
-                              double in_cycle, const char * in_name, const char * in_tag, int in_phase ,
-                              double in_start , double in_stop) {
+Trick::JobData	*	Trick::SimObject::add_job(int	in_thread,	int	in_id,	const	char	*	in_job_class_name	,void*	sup_class_data,
+																														double	in_cycle,	const	char	*	in_name,	const	char	*	in_tag,	int	in_phase	,
+																														double	in_start	,	double	in_stop)	{
 
-    /** @par Detailed Design */
-    /** @li create a new job with the incoming characteristics */
-    Trick::JobData * job_ptr ;
-    job_ptr = new Trick::JobData(in_thread,in_id,in_job_class_name,sup_class_data,in_cycle,in_name,in_tag,in_phase,in_start,in_stop) ;
-    jobs.push_back(job_ptr) ;
+				/**	@par	Detailed	Design	*/
+				/**	@li	create	a	new	job	with	the	incoming	characteristics	*/
+				Trick::JobData	*	job_ptr	;
+				job_ptr	=	new	Trick::JobData(in_thread,in_id,in_job_class_name,sup_class_data,in_cycle,in_name,in_tag,in_phase,in_start,in_stop)	;
+				jobs.push_back(job_ptr)	;
 
-    return(job_ptr) ;
+				return(job_ptr)	;
 
 }
 
-Trick::JobData * Trick::SimObject::get_job( std::string job_name, unsigned int j_instance ) {
-
-    std::vector <Trick::JobData *>::iterator it ;
-
-    // Look for the name
-    for ( it = jobs.begin() ; it != jobs.end() ; ++it ) {
-        if ( ! (*it)->name.compare(job_name) ) {
-            if ( j_instance == 1 ) {
-                return *it ;
-            } else {
-                j_instance-- ;
-            }
-        }
-    }
-
-    // We mess with the job name and prepend the sim_object name. :(
-    if ( job_name.find(name + ".") != 0 ) {
-        job_name = name + "." + job_name ;
-    }
-    // Look for the job with the sim object name prepended.
-    for ( it = jobs.begin() ; it != jobs.end() ; ++it ) {
-        if ( ! (*it)->name.compare(job_name) ) {
-            if ( j_instance == 1 ) {
-                return *it ;
-            } else {
-                j_instance-- ;
-            }
-        }
-    }
-
-    return NULL ;
+Trick::JobData	*	Trick::SimObject::get_job(	std::string	job_name,	unsigned	int	j_instance	)	{
+
+				std::vector	<Trick::JobData	*>::iterator	it	;
+
+				//	Look	for	the	name
+				for	(	it	=	jobs.begin()	;	it	!=	jobs.end()	;	++it	)	{
+								if	(	!	(*it)->name.compare(job_name)	)	{
+												if	(	j_instance	==	1	)	{
+																return	*it	;
+												}	else	{
+																j_instance--	;
+												}
+								}
+				}
+
+				//	We	mess	with	the	job	name	and	prepend	the	sim_object	name.	:(
+				if	(	job_name.find(name	+	".")	!=	0	)	{
+								job_name	=	name	+	"."	+	job_name	;
+				}
+				//	Look	for	the	job	with	the	sim	object	name	prepended.
+				for	(	it	=	jobs.begin()	;	it	!=	jobs.end()	;	++it	)	{
+								if	(	!	(*it)->name.compare(job_name)	)	{
+												if	(	j_instance	==	1	)	{
+																return	*it	;
+												}	else	{
+																j_instance--	;
+												}
+								}
+				}
+
+				return	NULL	;
 }
 
-void Trick::SimObject::enable_all_jobs() {
-    std::vector <Trick::JobData *>::iterator it ;
-    for ( it = jobs.begin() ; it != jobs.end() ; ++it ) {
-       (*it)->enable() ;
-    }
+void	Trick::SimObject::enable_all_jobs()	{
+				std::vector	<Trick::JobData	*>::iterator	it	;
+				for	(	it	=	jobs.begin()	;	it	!=	jobs.end()	;	++it	)	{
+							(*it)->enable()	;
+				}
 }
 
-void Trick::SimObject::enable() {
-    message_publish(MSG_WARNING,"SimObject::enable has been deprecated, use SimObject::enable_all_jobs instead\n") ;
-    enable_all_jobs();
+void	Trick::SimObject::enable()	{
+				message_publish(MSG_WARNING,"SimObject::enable	has	been	deprecated,	use	SimObject::enable_all_jobs	instead\n")	;
+				enable_all_jobs();
 }
 
 
-void Trick::SimObject::disable_all_jobs() {
-    std::vector <Trick::JobData *>::iterator it ;
-    for ( it = jobs.begin() ; it != jobs.end() ; ++it ) {
-       (*it)->disable() ;
-    }
+void	Trick::SimObject::disable_all_jobs()	{
+				std::vector	<Trick::JobData	*>::iterator	it	;
+				for	(	it	=	jobs.begin()	;	it	!=	jobs.end()	;	++it	)	{
+							(*it)->disable()	;
+				}
 }
 
-void Trick::SimObject::disable() {
-    message_publish(MSG_WARNING,"SimObject::disable has been deprecated, use SimObject::disable_all_jobs instead\n") ;
-    disable_all_jobs();
+void	Trick::SimObject::disable()	{
+				message_publish(MSG_WARNING,"SimObject::disable	has	been	deprecated,	use	SimObject::disable_all_jobs	instead\n")	;
+				disable_all_jobs();
 }
 
diff --git a/trick_source/sim_services/SimTime/SimTime.cpp b/trick_source/sim_services/SimTime/SimTime.cpp
index fb439c5a1..664b37bd7 100644
--- a/trick_source/sim_services/SimTime/SimTime.cpp
+++ b/trick_source/sim_services/SimTime/SimTime.cpp
@@ -1,89 +1,89 @@
 
-#include "trick/exec_proto.h"
-#include "trick/SimTime.hh"
-
-#define GET_TIME( GMT , offset ) \
- { \
-  double temp ; \
- \
-  /* Convert the met to a gmt format */ \
-  temp = ( exec_get_sim_time() + offset ) / 86400.0 ; \
-  GMT.day  = (int)temp ; \
-  temp = (temp - (double)(GMT.day)) * 24.0 ; \
-  GMT.hour = (int)temp ; \
-  temp = (temp - (double)(GMT.hour)) * 60.0 ; \
-  GMT.min  = (int)temp ; \
-  GMT.sec = (temp - (double)(GMT.min)) * 60.0 ; \
+#include	"trick/exec_proto.h"
+#include	"trick/SimTime.hh"
+
+#define	GET_TIME(	GMT	,	offset	)	\
+	{	\
+		double	temp	;	\
+	\
+		/*	Convert	the	met	to	a	gmt	format	*/	\
+		temp	=	(	exec_get_sim_time()	+	offset	)	/	86400.0	;	\
+		GMT.day		=	(int)temp	;	\
+		temp	=	(temp	-	(double)(GMT.day))	*	24.0	;	\
+		GMT.hour	=	(int)temp	;	\
+		temp	=	(temp	-	(double)(GMT.hour))	*	60.0	;	\
+		GMT.min		=	(int)temp	;	\
+		GMT.sec	=	(temp	-	(double)(GMT.min))	*	60.0	;	\
 }
 
-Trick::SimTime * the_simtime ;
+Trick::SimTime	*	the_simtime	;
 
-Trick::SimTime::SimTime() {
+Trick::SimTime::SimTime()	{
 
-    gmt_ref.day = 0 ;
-    gmt_ref.hour = 0 ;
-    gmt_ref.min = 0 ;
-    gmt_ref.sec = 0 ;
+				gmt_ref.day	=	0	;
+				gmt_ref.hour	=	0	;
+				gmt_ref.min	=	0	;
+				gmt_ref.sec	=	0	;
 
-    met_ref.day = 0 ;
-    met_ref.hour = 0 ;
-    met_ref.min = 0 ;
-    met_ref.sec = 0 ;
+				met_ref.day	=	0	;
+				met_ref.hour	=	0	;
+				met_ref.min	=	0	;
+				met_ref.sec	=	0	;
 
-    the_simtime = this ;
+				the_simtime	=	this	;
 }
 
-int Trick::SimTime::init_times() {
+int	Trick::SimTime::init_times()	{
 
-    gmt_sec_ref = gmt_ref.day * 86400
-                + gmt_ref.hour * 3600
-                + gmt_ref.min * 60
-                + gmt_ref.sec;
+				gmt_sec_ref	=	gmt_ref.day	*	86400
+																+	gmt_ref.hour	*	3600
+																+	gmt_ref.min	*	60
+																+	gmt_ref.sec;
 
-    met_sec_ref = met_ref.day * 86400
-                + met_ref.hour * 3600
-                + met_ref.min * 60
-                + met_ref.sec;
+				met_sec_ref	=	met_ref.day	*	86400
+																+	met_ref.hour	*	3600
+																+	met_ref.min	*	60
+																+	met_ref.sec;
 
-    return 0 ;
+				return	0	;
 }
 
-double Trick::SimTime::get_rettime() {
+double	Trick::SimTime::get_rettime()	{
 
-    return(exec_get_sim_time());
+				return(exec_get_sim_time());
 
 }
 
-double Trick::SimTime::get_gmttime() {
+double	Trick::SimTime::get_gmttime()	{
 
-    return(exec_get_sim_time() + gmt_sec_ref);
+				return(exec_get_sim_time()	+	gmt_sec_ref);
 
 }
 
-double Trick::SimTime::get_mettime() {
+double	Trick::SimTime::get_mettime()	{
 
-    return(exec_get_sim_time() + met_sec_ref);
+				return(exec_get_sim_time()	+	met_sec_ref);
 
 }
 
-TIME_OFFSET * Trick::SimTime::get_rettime_struct() {
+TIME_OFFSET	*	Trick::SimTime::get_rettime_struct()	{
 
-    GET_TIME(ret_time, 0.0);
+				GET_TIME(ret_time,	0.0);
 
-    return(&ret_time) ;
+				return(&ret_time)	;
 }
 
-TIME_OFFSET * Trick::SimTime::get_gmttime_struct() {
+TIME_OFFSET	*	Trick::SimTime::get_gmttime_struct()	{
 
-    GET_TIME(gmt_time, gmt_sec_ref);
+				GET_TIME(gmt_time,	gmt_sec_ref);
 
-    return(&gmt_time) ;
+				return(&gmt_time)	;
 }
 
-TIME_OFFSET * Trick::SimTime::get_mettime_struct() {
+TIME_OFFSET	*	Trick::SimTime::get_mettime_struct()	{
 
-    GET_TIME(met_time, met_sec_ref);
+				GET_TIME(met_time,	met_sec_ref);
 
-    return(&met_time) ;
+				return(&met_time)	;
 }
 
diff --git a/trick_source/sim_services/SimTime/SimTime_c_intf.cpp b/trick_source/sim_services/SimTime/SimTime_c_intf.cpp
index 660dab26f..400e7c41a 100644
--- a/trick_source/sim_services/SimTime/SimTime_c_intf.cpp
+++ b/trick_source/sim_services/SimTime/SimTime_c_intf.cpp
@@ -1,30 +1,30 @@
 
-#include "trick/SimTime.hh"
-#include "trick/simtime_proto.h"
+#include	"trick/SimTime.hh"
+#include	"trick/simtime_proto.h"
 
-extern Trick::SimTime * the_simtime ;
+extern	Trick::SimTime	*	the_simtime	;
 
-extern "C" double get_rettime(void) {
-    return (the_simtime->get_rettime()) ;
+extern	"C"	double	get_rettime(void)	{
+				return	(the_simtime->get_rettime())	;
 }
 
-extern "C" double get_gmttime(void) {
-    return (the_simtime->get_gmttime()) ;
+extern	"C"	double	get_gmttime(void)	{
+				return	(the_simtime->get_gmttime())	;
 }
 
-extern "C" double get_mettime(void) {
-    return (the_simtime->get_mettime()) ;
+extern	"C"	double	get_mettime(void)	{
+				return	(the_simtime->get_mettime())	;
 }
 
-extern "C" GMTTIME * get_rettime_struct(void) {
-    return (the_simtime->get_rettime_struct()) ;
+extern	"C"	GMTTIME	*	get_rettime_struct(void)	{
+				return	(the_simtime->get_rettime_struct())	;
 }
 
-extern "C" GMTTIME * get_gmttime_struct(void) {
-    return (the_simtime->get_gmttime_struct()) ;
+extern	"C"	GMTTIME	*	get_gmttime_struct(void)	{
+				return	(the_simtime->get_gmttime_struct())	;
 }
 
-extern "C" GMTTIME * get_mettime_struct(void) {
-    return (the_simtime->get_mettime_struct()) ;
+extern	"C"	GMTTIME	*	get_mettime_struct(void)	{
+				return	(the_simtime->get_mettime_struct())	;
 }
 
diff --git a/trick_source/sim_services/ThreadBase/SysThread.cpp b/trick_source/sim_services/ThreadBase/SysThread.cpp
index 704843386..b01bc9c1c 100644
--- a/trick_source/sim_services/ThreadBase/SysThread.cpp
+++ b/trick_source/sim_services/ThreadBase/SysThread.cpp
@@ -1,112 +1,112 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
-#if __linux
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sched.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdio.h>
+#if	__linux
+#include	<sys/syscall.h>
+#include	<sys/types.h>
+#include	<sched.h>
 #endif
-#include <signal.h>
-#include <algorithm>
-#include <time.h>
+#include	<signal.h>
+#include	<algorithm>
+#include	<time.h>
 
-#include "trick/SysThread.hh"
+#include	"trick/SysThread.hh"
 
-bool Trick::SysThread::shutdown_finished = false;
+bool	Trick::SysThread::shutdown_finished	=	false;
 
-// Construct On First Use to avoid the Static Initialization Fiasco
-pthread_mutex_t& Trick::SysThread::list_mutex() {
-    static pthread_mutex_t list_mutex = PTHREAD_MUTEX_INITIALIZER;
-    return list_mutex;
-} 
+//	Construct	On	First	Use	to	avoid	the	Static	Initialization	Fiasco
+pthread_mutex_t&	Trick::SysThread::list_mutex()	{
+				static	pthread_mutex_t	list_mutex	=	PTHREAD_MUTEX_INITIALIZER;
+				return	list_mutex;
+}	
 
-pthread_cond_t& Trick::SysThread::list_empty_cv() {
-    static pthread_cond_t list_empty_cv = PTHREAD_COND_INITIALIZER;
-    return list_empty_cv;
-} 
+pthread_cond_t&	Trick::SysThread::list_empty_cv()	{
+				static	pthread_cond_t	list_empty_cv	=	PTHREAD_COND_INITIALIZER;
+				return	list_empty_cv;
+}	
 
-std::vector<Trick::SysThread *>& Trick::SysThread::all_sys_threads() {
-    static std::vector<SysThread *> all_sys_threads;
-    return all_sys_threads;
+std::vector<Trick::SysThread	*>&	Trick::SysThread::all_sys_threads()	{
+				static	std::vector<SysThread	*>	all_sys_threads;
+				return	all_sys_threads;
 }
 
-Trick::SysThread::SysThread(std::string in_name) : ThreadBase(in_name) {
-    pthread_mutex_init(&_restart_pause_mutex, NULL);
-    pthread_cond_init(&_thread_has_paused_cv, NULL);
-    pthread_cond_init(&_thread_wakeup_cv, NULL);
-    _thread_has_paused = true;
-    _thread_should_pause = false;
+Trick::SysThread::SysThread(std::string	in_name)	:	ThreadBase(in_name)	{
+				pthread_mutex_init(&_restart_pause_mutex,	NULL);
+				pthread_cond_init(&_thread_has_paused_cv,	NULL);
+				pthread_cond_init(&_thread_wakeup_cv,	NULL);
+				_thread_has_paused	=	true;
+				_thread_should_pause	=	false;
 
-    pthread_mutex_lock(&(list_mutex()));
-    all_sys_threads().push_back(this);
-    pthread_mutex_unlock(&(list_mutex()));
+				pthread_mutex_lock(&(list_mutex()));
+				all_sys_threads().push_back(this);
+				pthread_mutex_unlock(&(list_mutex()));
 }
 
 
-Trick::SysThread::~SysThread() {
-    pthread_mutex_lock(&(list_mutex()));
-    if (!shutdown_finished) {
-        all_sys_threads().erase(std::remove(all_sys_threads().begin(), all_sys_threads().end(), this), all_sys_threads().end());
-    }
-    pthread_mutex_unlock(&(list_mutex()));
+Trick::SysThread::~SysThread()	{
+				pthread_mutex_lock(&(list_mutex()));
+				if	(!shutdown_finished)	{
+								all_sys_threads().erase(std::remove(all_sys_threads().begin(),	all_sys_threads().end(),	this),	all_sys_threads().end());
+				}
+				pthread_mutex_unlock(&(list_mutex()));
 }
 
-int Trick::SysThread::ensureAllShutdown() {
-    pthread_mutex_lock(&(list_mutex()));
+int	Trick::SysThread::ensureAllShutdown()	{
+				pthread_mutex_lock(&(list_mutex()));
 
-    // Cancel all threads
-    for (SysThread * thread : all_sys_threads()) {
-        thread->cancel_thread();
-    }
+				//	Cancel	all	threads
+				for	(SysThread	*	thread	:	all_sys_threads())	{
+								thread->cancel_thread();
+				}
 
-    // Join all threads
-    for (SysThread * thread : all_sys_threads()) {
-        thread->join_thread();
-    }
+				//	Join	all	threads
+				for	(SysThread	*	thread	:	all_sys_threads())	{
+								thread->join_thread();
+				}
 
-    // Success!
-    shutdown_finished = true;
-    pthread_mutex_unlock(&(list_mutex()));
+				//	Success!
+				shutdown_finished	=	true;
+				pthread_mutex_unlock(&(list_mutex()));
 
-    return 0;
+				return	0;
 }
 
-// To be called from main thread
-void Trick::SysThread::force_thread_to_pause() {
-    pthread_mutex_lock(&_restart_pause_mutex);
-    // Tell thread to pause, and wait for it to signal that it has
-    _thread_should_pause = true;
-    while (!_thread_has_paused) {
-        pthread_cond_wait(&_thread_has_paused_cv, &_restart_pause_mutex);
-    }
-    pthread_mutex_unlock(&_restart_pause_mutex);
+//	To	be	called	from	main	thread
+void	Trick::SysThread::force_thread_to_pause()	{
+				pthread_mutex_lock(&_restart_pause_mutex);
+				//	Tell	thread	to	pause,	and	wait	for	it	to	signal	that	it	has
+				_thread_should_pause	=	true;
+				while	(!_thread_has_paused)	{
+								pthread_cond_wait(&_thread_has_paused_cv,	&_restart_pause_mutex);
+				}
+				pthread_mutex_unlock(&_restart_pause_mutex);
 }
 
-// To be called from main thread
-void Trick::SysThread::unpause_thread() {
-    pthread_mutex_lock(&_restart_pause_mutex);
-    // Tell thread to wake up
-    _thread_should_pause = false;
-    pthread_cond_signal(&_thread_wakeup_cv);
-    pthread_mutex_unlock(&_restart_pause_mutex);
+//	To	be	called	from	main	thread
+void	Trick::SysThread::unpause_thread()	{
+				pthread_mutex_lock(&_restart_pause_mutex);
+				//	Tell	thread	to	wake	up
+				_thread_should_pause	=	false;
+				pthread_cond_signal(&_thread_wakeup_cv);
+				pthread_mutex_unlock(&_restart_pause_mutex);
 }
 
 
-// To be called from this thread
-void Trick::SysThread::test_pause() {
-    pthread_mutex_lock(&_restart_pause_mutex) ;
-    if (_thread_should_pause) {
-        // Tell main thread that we're pausing
-        _thread_has_paused = true;
-        pthread_cond_signal(&_thread_has_paused_cv);
-        
-        // Wait until we're told to wake up
-        while (_thread_should_pause) {
-            pthread_cond_wait(&_thread_wakeup_cv, &_restart_pause_mutex);
-        }
-    }
-
-    _thread_has_paused = false;
-    pthread_mutex_unlock(&_restart_pause_mutex) ;
+//	To	be	called	from	this	thread
+void	Trick::SysThread::test_pause()	{
+				pthread_mutex_lock(&_restart_pause_mutex)	;
+				if	(_thread_should_pause)	{
+								//	Tell	main	thread	that	we're	pausing
+								_thread_has_paused	=	true;
+								pthread_cond_signal(&_thread_has_paused_cv);
+								
+								//	Wait	until	we're	told	to	wake	up
+								while	(_thread_should_pause)	{
+												pthread_cond_wait(&_thread_wakeup_cv,	&_restart_pause_mutex);
+								}
+				}
+
+				_thread_has_paused	=	false;
+				pthread_mutex_unlock(&_restart_pause_mutex)	;
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/ThreadBase/ThreadBase.cpp b/trick_source/sim_services/ThreadBase/ThreadBase.cpp
index 8a1a5ba04..54c35e1a4 100644
--- a/trick_source/sim_services/ThreadBase/ThreadBase.cpp
+++ b/trick_source/sim_services/ThreadBase/ThreadBase.cpp
@@ -1,406 +1,406 @@
-#include <iostream>
-#include <stdio.h>
-#include <signal.h>
-#include <cstring>
-
-#if __linux
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sched.h>
+#include	<iostream>
+#include	<stdio.h>
+#include	<signal.h>
+#include	<cstring>
+
+#if	__linux
+#include	<sys/syscall.h>
+#include	<sys/types.h>
+#include	<sched.h>
 #endif
 
-#include "trick/ThreadBase.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-Trick::ThreadBase::ThreadBase(std::string in_name) :
- name(in_name) ,
- pthread_id(0) ,
- pid(0) ,
- rt_priority(0),
- created(false),
- should_shutdown(false),
- cancellable(true)
+#include	"trick/ThreadBase.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+Trick::ThreadBase::ThreadBase(std::string	in_name)	:
+	name(in_name)	,
+	pthread_id(0)	,
+	pid(0)	,
+	rt_priority(0),
+	created(false),
+	should_shutdown(false),
+	cancellable(true)
 {
-    pthread_mutex_init(&shutdown_mutex, NULL);
-#if __linux
-    max_cpu = sysconf( _SC_NPROCESSORS_ONLN ) ;
-#ifdef CPU_ALLOC
-    cpus = CPU_ALLOC(max_cpu) ;
-    CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu), cpus) ;
+				pthread_mutex_init(&shutdown_mutex,	NULL);
+#if	__linux
+				max_cpu	=	sysconf(	_SC_NPROCESSORS_ONLN	)	;
+#ifdef	CPU_ALLOC
+				cpus	=	CPU_ALLOC(max_cpu)	;
+				CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu),	cpus)	;
 #else
-    cpus = (cpu_set_t *)calloc(1, sizeof(cpu_set_t)) ;
+				cpus	=	(cpu_set_t	*)calloc(1,	sizeof(cpu_set_t))	;
 #endif
 #endif
-#if __APPLE__
-    max_cpu = 0 ;
+#if	__APPLE__
+				max_cpu	=	0	;
 #endif
 }
 
-Trick::ThreadBase::~ThreadBase() {
-#if __linux
-#ifdef CPU_FREE
-    CPU_FREE(cpus) ;
+Trick::ThreadBase::~ThreadBase()	{
+#if	__linux
+#ifdef	CPU_FREE
+				CPU_FREE(cpus)	;
 #endif
 #endif
 }
 
-std::string Trick::ThreadBase::get_name() {
-    return name ;
+std::string	Trick::ThreadBase::get_name()	{
+				return	name	;
 }
 
-void Trick::ThreadBase::set_name(std::string in_name) {
-    name = in_name ;
+void	Trick::ThreadBase::set_name(std::string	in_name)	{
+				name	=	in_name	;
 }
 
-pthread_t Trick::ThreadBase::get_pthread_id() {
-    return pthread_id ;
+pthread_t	Trick::ThreadBase::get_pthread_id()	{
+				return	pthread_id	;
 }
 
-pid_t Trick::ThreadBase::get_pid() {
-    return pid ;
+pid_t	Trick::ThreadBase::get_pid()	{
+				return	pid	;
 }
 
-void Trick::ThreadBase::set_pid() {
-#if __linux
-    pid = syscall( __NR_gettid ) ;
+void	Trick::ThreadBase::set_pid()	{
+#if	__linux
+				pid	=	syscall(	__NR_gettid	)	;
 #else
-    pid = getpid() ;
+				pid	=	getpid()	;
 #endif
 }
 
-int Trick::ThreadBase::cpu_set(unsigned int cpu __attribute__((unused))) {
-    int ret =  0 ;
-#if __linux
-    if ( cpu < max_cpu ) {
-#ifdef CPU_SET_S
-        CPU_SET_S(cpu, CPU_ALLOC_SIZE(max_cpu), cpus) ;
+int	Trick::ThreadBase::cpu_set(unsigned	int	cpu	__attribute__((unused)))	{
+				int	ret	=		0	;
+#if	__linux
+				if	(	cpu	<	max_cpu	)	{
+#ifdef	CPU_SET_S
+								CPU_SET_S(cpu,	CPU_ALLOC_SIZE(max_cpu),	cpus)	;
 #else
-        CPU_SET(cpu, cpus) ;
+								CPU_SET(cpu,	cpus)	;
 #endif
-    } else {
-        message_publish(MSG_WARNING, "CPU value %d is out of range (0 through %d)", cpu, max_cpu - 1) ;
-        ret = -1 ;
-    }
+				}	else	{
+								message_publish(MSG_WARNING,	"CPU	value	%d	is	out	of	range	(0	through	%d)",	cpu,	max_cpu	-	1)	;
+								ret	=	-1	;
+				}
 #endif
-#if __APPLE__
-    message_publish(MSG_WARNING, "Warning: Trick on Darwin does not yet support processor assignment.\n");
+#if	__APPLE__
+				message_publish(MSG_WARNING,	"Warning:	Trick	on	Darwin	does	not	yet	support	processor	assignment.\n");
 #endif
-    return ret ;
+				return	ret	;
 }
 
-int Trick::ThreadBase::cpu_clr(unsigned int cpu __attribute__((unused))) {
-    int ret =  0 ;
-#if __linux
-    if ( cpu < max_cpu ) {
-#ifdef CPU_CLR_S
-        CPU_CLR_S(cpu, CPU_ALLOC_SIZE(max_cpu), cpus) ;
+int	Trick::ThreadBase::cpu_clr(unsigned	int	cpu	__attribute__((unused)))	{
+				int	ret	=		0	;
+#if	__linux
+				if	(	cpu	<	max_cpu	)	{
+#ifdef	CPU_CLR_S
+								CPU_CLR_S(cpu,	CPU_ALLOC_SIZE(max_cpu),	cpus)	;
 #else
-        CPU_CLR(cpu, cpus) ;
+								CPU_CLR(cpu,	cpus)	;
 #endif
-    } else {
-        message_publish(MSG_WARNING, "CPU value %d is out of range (0 through %d)", cpu, max_cpu - 1) ;
-        ret = -1 ;
-    }
+				}	else	{
+								message_publish(MSG_WARNING,	"CPU	value	%d	is	out	of	range	(0	through	%d)",	cpu,	max_cpu	-	1)	;
+								ret	=	-1	;
+				}
 #endif
-#if __APPLE__
-    message_publish(MSG_WARNING, "Warning: Trick on Darwin does not yet support processor assignment.\n");
+#if	__APPLE__
+				message_publish(MSG_WARNING,	"Warning:	Trick	on	Darwin	does	not	yet	support	processor	assignment.\n");
 #endif
-    return ret ;
+				return	ret	;
 }
 
-#if __linux
-cpu_set_t * Trick::ThreadBase::get_cpus() {
-    return cpus ;
+#if	__linux
+cpu_set_t	*	Trick::ThreadBase::get_cpus()	{
+				return	cpus	;
 }
 
-void Trick::ThreadBase::copy_cpus(cpu_set_t * in_cpus) {
-#ifdef CPU_OR_S
-    CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu), cpus) ;
-    CPU_OR_S(CPU_ALLOC_SIZE(max_cpu), cpus, cpus, in_cpus) ;
+void	Trick::ThreadBase::copy_cpus(cpu_set_t	*	in_cpus)	{
+#ifdef	CPU_OR_S
+				CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu),	cpus)	;
+				CPU_OR_S(CPU_ALLOC_SIZE(max_cpu),	cpus,	cpus,	in_cpus)	;
 #else
-    *cpus = *in_cpus ;
+				*cpus	=	*in_cpus	;
 #endif
 }
 #endif
-#if __APPLE__
-void * Trick::ThreadBase::get_cpus() {
-    return NULL ;
+#if	__APPLE__
+void	*	Trick::ThreadBase::get_cpus()	{
+				return	NULL	;
 }
 
-void Trick::ThreadBase::copy_cpus(void * in_cpus __attribute__((unused))) {
+void	Trick::ThreadBase::copy_cpus(void	*	in_cpus	__attribute__((unused)))	{
 }
 #endif
 
-int Trick::ThreadBase::execute_cpu_affinity() {
-#if __linux
-#ifdef CPU_ALLOC_SIZE
-    sched_setaffinity(pid, CPU_ALLOC_SIZE(max_cpu), cpus) ;
+int	Trick::ThreadBase::execute_cpu_affinity()	{
+#if	__linux
+#ifdef	CPU_ALLOC_SIZE
+				sched_setaffinity(pid,	CPU_ALLOC_SIZE(max_cpu),	cpus)	;
 #else
-    sched_setaffinity(pid, sizeof(cpu_set_t), cpus) ;
+				sched_setaffinity(pid,	sizeof(cpu_set_t),	cpus)	;
 #endif
 #endif
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::ThreadBase::set_priority(unsigned int req_priority) {
-    rt_priority = req_priority ;
-    return 0 ;
+int	Trick::ThreadBase::set_priority(unsigned	int	req_priority)	{
+				rt_priority	=	req_priority	;
+				return	0	;
 }
 
-#if __linux
+#if	__linux
 
-#include <sched.h>
-#include <errno.h>
+#include	<sched.h>
+#include	<errno.h>
 
-int Trick::ThreadBase::execute_priority() {
+int	Trick::ThreadBase::execute_priority()	{
 
-    int max_priority;
-    int min_priority;
-    int proc_priority;
-    struct sched_param sparams;
-    int sched_policy = SCHED_FIFO;
+				int	max_priority;
+				int	min_priority;
+				int	proc_priority;
+				struct	sched_param	sparams;
+				int	sched_policy	=	SCHED_FIFO;
 
-    if ( rt_priority > 0 ) {
-        if (sched_getparam((pid_t) 0, &sparams)) {
-            message_publish(MSG_ERROR, "Failed to get process scheduling parameters: %s\n", std::strerror(errno));
-        } else {
+				if	(	rt_priority	>	0	)	{
+								if	(sched_getparam((pid_t)	0,	&sparams))	{
+												message_publish(MSG_ERROR,	"Failed	to	get	process	scheduling	parameters:	%s\n",	std::strerror(errno));
+								}	else	{
 
-            /* Get maximum and minimum RT priority */
-            max_priority = sched_get_priority_max(SCHED_FIFO);
-            min_priority = sched_get_priority_min(SCHED_FIFO);
+												/*	Get	maximum	and	minimum	RT	priority	*/
+												max_priority	=	sched_get_priority_max(SCHED_FIFO);
+												min_priority	=	sched_get_priority_min(SCHED_FIFO);
 
-            /* Since Trick's max priority starts at 1 and moves to lower priorties as the number goes up and Linux's
-               priorities goes up as the number goes up and maxes out at "max_priority", we need to offset as follows:
-             */
-            proc_priority = max_priority - (rt_priority - 1);
+												/*	Since	Trick's	max	priority	starts	at	1	and	moves	to	lower	priorties	as	the	number	goes	up	and	Linux's
+															priorities	goes	up	as	the	number	goes	up	and	maxes	out	at	"max_priority",	we	need	to	offset	as	follows:
+													*/
+												proc_priority	=	max_priority	-	(rt_priority	-	1);
 
-            /* Make sure priority is in bounds. */
-            if (proc_priority < min_priority) {
+												/*	Make	sure	priority	is	in	bounds.	*/
+												if	(proc_priority	<	min_priority)	{
 
-                message_publish(MSG_WARNING, "Warning: Linux process %d priority at %d is too low.  Minimum Trick \npriority is %d.\n",
-                         pid, rt_priority, (max_priority - min_priority) + 2);
+																message_publish(MSG_WARNING,	"Warning:	Linux	process	%d	priority	at	%d	is	too	low.		Minimum	Trick	\npriority	is	%d.\n",
+																									pid,	rt_priority,	(max_priority	-	min_priority)	+	2);
 
-                proc_priority = min_priority;
-            }
+																proc_priority	=	min_priority;
+												}
 
-            if (pthread_getschedparam(pthread_self(), &sched_policy, &sparams)) {
+												if	(pthread_getschedparam(pthread_self(),	&sched_policy,	&sparams))	{
 
-                message_publish(MSG_ERROR, "Failed to get process scheduling parameters: %s\n", std::strerror(errno));
-            }
+																message_publish(MSG_ERROR,	"Failed	to	get	process	scheduling	parameters:	%s\n",	std::strerror(errno));
+												}
 
-            /* Set the process priority. */
-            sparams.sched_priority = proc_priority;
-            if (pthread_setschedparam(pthread_self(), SCHED_FIFO, &sparams)) {
-                message_publish(MSG_ERROR, "Failed to set thread priority: %s\n", std::strerror(errno));
-            }
-        }
-    }
+												/*	Set	the	process	priority.	*/
+												sparams.sched_priority	=	proc_priority;
+												if	(pthread_setschedparam(pthread_self(),	SCHED_FIFO,	&sparams))	{
+																message_publish(MSG_ERROR,	"Failed	to	set	thread	priority:	%s\n",	std::strerror(errno));
+												}
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 #endif
 
-#if __APPLE__
+#if	__APPLE__
 
-#include <sched.h>
-#include <errno.h>
+#include	<sched.h>
+#include	<errno.h>
 
-int Trick::ThreadBase::execute_priority() {
+int	Trick::ThreadBase::execute_priority()	{
 
-    int ret;
+				int	ret;
 
-    /* Declare scheduling paramters. */
-    int max_priority;
-    int min_priority;
-    int prev_priority;
-    int proc_priority;
-    int sched_policy = SCHED_FIFO;
-    struct sched_param param;
+				/*	Declare	scheduling	paramters.	*/
+				int	max_priority;
+				int	min_priority;
+				int	prev_priority;
+				int	proc_priority;
+				int	sched_policy	=	SCHED_FIFO;
+				struct	sched_param	param;
 
-    if ( rt_priority > 0 ) {
-        /* Get maximum and minimum RT priority, and current parameters. */
-        max_priority = sched_get_priority_max(sched_policy);
-        min_priority = sched_get_priority_min(sched_policy);
-        pthread_getschedparam(pthread_self(), &sched_policy, &param);
-        prev_priority = param.sched_priority;
+				if	(	rt_priority	>	0	)	{
+								/*	Get	maximum	and	minimum	RT	priority,	and	current	parameters.	*/
+								max_priority	=	sched_get_priority_max(sched_policy);
+								min_priority	=	sched_get_priority_min(sched_policy);
+								pthread_getschedparam(pthread_self(),	&sched_policy,	&param);
+								prev_priority	=	param.sched_priority;
 
-        /* Trick's max priority starts at 1 and moves to lower priorities as the number goes up.  Darwin's thread
-           priorities range between 15 to 47 (observed). The default priority is 31 (observed); higher priorities
-           cause more favorable scheduling. */
-        proc_priority = max_priority - (rt_priority - 1);
+								/*	Trick's	max	priority	starts	at	1	and	moves	to	lower	priorities	as	the	number	goes	up.		Darwin's	thread
+											priorities	range	between	15	to	47	(observed).	The	default	priority	is	31	(observed);	higher	priorities
+											cause	more	favorable	scheduling.	*/
+								proc_priority	=	max_priority	-	(rt_priority	-	1);
 
-        /* Make sure priority is in bounds. */
-        if (proc_priority < min_priority) {
+								/*	Make	sure	priority	is	in	bounds.	*/
+								if	(proc_priority	<	min_priority)	{
 
-            message_publish(MSG_WARNING, "Warning: Trick CPU priority at %d is too low.\n", rt_priority);
-            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority);
-            message_publish(MSG_WARNING, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
-            message_publish(MSG_WARNING, "The corresponding minimum Trick priority is %d.\n", (max_priority - min_priority) + 1);
-            message_publish(MSG_WARNING, "Setting Trick priority to minimum!\n");
-            proc_priority = min_priority;
+												message_publish(MSG_WARNING,	"Warning:	Trick	CPU	priority	at	%d	is	too	low.\n",	rt_priority);
+												message_publish(MSG_WARNING,	"This	corresponds	to	a	Darwin	thread	priority	of	%d.\n",	proc_priority);
+												message_publish(MSG_WARNING,	"The	Darwin	thread	priority	range	is	%d:%d	(min:max).\n",	min_priority,	max_priority);
+												message_publish(MSG_WARNING,	"The	corresponding	minimum	Trick	priority	is	%d.\n",	(max_priority	-	min_priority)	+	1);
+												message_publish(MSG_WARNING,	"Setting	Trick	priority	to	minimum!\n");
+												proc_priority	=	min_priority;
 
-        } else if (proc_priority > max_priority) {
+								}	else	if	(proc_priority	>	max_priority)	{
 
-            message_publish(MSG_WARNING, "Warning: Trick CPU priority at %d is too high.\n", rt_priority);
-            message_publish(MSG_WARNING, "This corresponds to a Darwin thread priority of %d.\n", proc_priority);
-            message_publish(MSG_WARNING, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
-            message_publish(MSG_WARNING, "The maximum Trick priority is 1. Setting to maximum!\n");
-            proc_priority = max_priority;
-        }
+												message_publish(MSG_WARNING,	"Warning:	Trick	CPU	priority	at	%d	is	too	high.\n",	rt_priority);
+												message_publish(MSG_WARNING,	"This	corresponds	to	a	Darwin	thread	priority	of	%d.\n",	proc_priority);
+												message_publish(MSG_WARNING,	"The	Darwin	thread	priority	range	is	%d:%d	(min:max).\n",	min_priority,	max_priority);
+												message_publish(MSG_WARNING,	"The	maximum	Trick	priority	is	1.	Setting	to	maximum!\n");
+												proc_priority	=	max_priority;
+								}
 
-        /* Set the process priority. */
-        param.sched_priority = proc_priority;
+								/*	Set	the	process	priority.	*/
+								param.sched_priority	=	proc_priority;
 
-        ret = pthread_setschedparam(pthread_self(), sched_policy, &param);
-        if (ret != 0) {
+								ret	=	pthread_setschedparam(pthread_self(),	sched_policy,	&param);
+								if	(ret	!=	0)	{
 
-            message_publish(MSG_ERROR, "Failed to set Darwin thread priority to %d: %s\n", param.sched_priority, std::strerror(errno));
-            message_publish(MSG_ERROR, "This should correspond to a Trick CPU priority of %d.\n", (max_priority - proc_priority) + 1);
-            message_publish(MSG_ERROR, "The current Darwin thread priority is %d.\n", prev_priority);
-            message_publish(MSG_ERROR, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
+												message_publish(MSG_ERROR,	"Failed	to	set	Darwin	thread	priority	to	%d:	%s\n",	param.sched_priority,	std::strerror(errno));
+												message_publish(MSG_ERROR,	"This	should	correspond	to	a	Trick	CPU	priority	of	%d.\n",	(max_priority	-	proc_priority)	+	1);
+												message_publish(MSG_ERROR,	"The	current	Darwin	thread	priority	is	%d.\n",	prev_priority);
+												message_publish(MSG_ERROR,	"The	Darwin	thread	priority	range	is	%d:%d	(min:max).\n",	min_priority,	max_priority);
 
-        } else {
+								}	else	{
 
-            message_publish(MSG_INFO, "Info: Trick CPU priority set to %d.\n", (max_priority - proc_priority) + 1);
-            message_publish(MSG_INFO, "This corresponds to a Darwin thread priority of %d.\n", param.sched_priority);
-            message_publish(MSG_INFO, "The previous Darwin thread priority was %d.\n", prev_priority);
-            message_publish(MSG_INFO, "The Darwin thread priority range is %d:%d (min:max).\n", min_priority, max_priority);
-        }
-    }
+												message_publish(MSG_INFO,	"Info:	Trick	CPU	priority	set	to	%d.\n",	(max_priority	-	proc_priority)	+	1);
+												message_publish(MSG_INFO,	"This	corresponds	to	a	Darwin	thread	priority	of	%d.\n",	param.sched_priority);
+												message_publish(MSG_INFO,	"The	previous	Darwin	thread	priority	was	%d.\n",	prev_priority);
+												message_publish(MSG_INFO,	"The	Darwin	thread	priority	range	is	%d:%d	(min:max).\n",	min_priority,	max_priority);
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
 #endif
 
-int Trick::ThreadBase::create_thread() {
+int	Trick::ThreadBase::create_thread()	{
 
-    if (created) {
-        message_publish(MSG_ERROR, "create_thread called on thread %s (%p) which has already been started.\n", name.c_str(), this);
-        return 0;
-    }
+				if	(created)	{
+								message_publish(MSG_ERROR,	"create_thread	called	on	thread	%s	(%p)	which	has	already	been	started.\n",	name.c_str(),	this);
+								return	0;
+				}
 
-    pthread_attr_t attr;
+				pthread_attr_t	attr;
 
-    pthread_attr_init(&attr);
-    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
-    pthread_create(&pthread_id, &attr, Trick::ThreadBase::thread_helper , (void *)this);
-    created = true;
+				pthread_attr_init(&attr);
+				pthread_attr_setscope(&attr,	PTHREAD_SCOPE_SYSTEM);
+				pthread_create(&pthread_id,	&attr,	Trick::ThreadBase::thread_helper	,	(void	*)this);
+				created	=	true;
 
-#if __linux
-#ifdef __GNUC__
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-    if ( ! name.empty() ) {
-       std::string short_str = name.substr(0,15) ;
-       pthread_setname_np(pthread_id, short_str.c_str()) ;
-    }
+#if	__linux
+#ifdef	__GNUC__
+#if	__GNUC__	>=	4	&&	__GNUC_MINOR__	>=	2
+				if	(	!	name.empty()	)	{
+							std::string	short_str	=	name.substr(0,15)	;
+							pthread_setname_np(pthread_id,	short_str.c_str())	;
+				}
 #endif
 #endif
 #endif
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::ThreadBase::cancel_thread() {
-    pthread_mutex_lock(&shutdown_mutex);
-    should_shutdown = true;
-    pthread_mutex_unlock(&shutdown_mutex);
+int	Trick::ThreadBase::cancel_thread()	{
+				pthread_mutex_lock(&shutdown_mutex);
+				should_shutdown	=	true;
+				pthread_mutex_unlock(&shutdown_mutex);
 
-    if ( pthread_id != 0 ) {
-        if (cancellable)
-            pthread_cancel(pthread_id) ;
-    }
-    return(0) ;
+				if	(	pthread_id	!=	0	)	{
+								if	(cancellable)
+												pthread_cancel(pthread_id)	;
+				}
+				return(0)	;
 }
 
-int Trick::ThreadBase::join_thread() {
-    if ( pthread_id != 0 ) {
-        if ((errno = pthread_join(pthread_id, NULL)) != 0) {
-            std::string msg = "Thread " + name + " had an error in join";
-            perror(msg.c_str());
-        } else {
-            pthread_id = 0;
-        }
-    }
-    return(0) ;
+int	Trick::ThreadBase::join_thread()	{
+				if	(	pthread_id	!=	0	)	{
+								if	((errno	=	pthread_join(pthread_id,	NULL))	!=	0)	{
+												std::string	msg	=	"Thread	"	+	name	+	"	had	an	error	in	join";
+												perror(msg.c_str());
+								}	else	{
+												pthread_id	=	0;
+								}
+				}
+				return(0)	;
 }
 
-void Trick::ThreadBase::test_shutdown() {
-    test_shutdown (NULL, NULL);
+void	Trick::ThreadBase::test_shutdown()	{
+				test_shutdown	(NULL,	NULL);
 }
 
-void Trick::ThreadBase::test_shutdown(void (*exit_handler) (void *), void * exit_arg) {
-    pthread_mutex_lock(&shutdown_mutex);
-    if (should_shutdown) {
-        pthread_mutex_unlock(&shutdown_mutex);
+void	Trick::ThreadBase::test_shutdown(void	(*exit_handler)	(void	*),	void	*	exit_arg)	{
+				pthread_mutex_lock(&shutdown_mutex);
+				if	(should_shutdown)	{
+								pthread_mutex_unlock(&shutdown_mutex);
 
-        thread_shutdown(exit_handler, exit_arg);
-    }
-    pthread_mutex_unlock(&shutdown_mutex);
+								thread_shutdown(exit_handler,	exit_arg);
+				}
+				pthread_mutex_unlock(&shutdown_mutex);
 }
 
 
-void Trick::ThreadBase::thread_shutdown() {
-    thread_shutdown (NULL, NULL);
+void	Trick::ThreadBase::thread_shutdown()	{
+				thread_shutdown	(NULL,	NULL);
 }
 
-void Trick::ThreadBase::thread_shutdown(void (*exit_handler) (void *), void * exit_arg) {
-    if (exit_handler != NULL) {
-        exit_handler(exit_arg);
-    }
+void	Trick::ThreadBase::thread_shutdown(void	(*exit_handler)	(void	*),	void	*	exit_arg)	{
+				if	(exit_handler	!=	NULL)	{
+								exit_handler(exit_arg);
+				}
 
-    pthread_exit(0); 
+				pthread_exit(0);	
 }
 
-void * Trick::ThreadBase::thread_helper( void * context ) {
+void	*	Trick::ThreadBase::thread_helper(	void	*	context	)	{
 
-    sigset_t sigs;
-    Trick::ThreadBase * tb = (Trick::ThreadBase *)context ;
+				sigset_t	sigs;
+				Trick::ThreadBase	*	tb	=	(Trick::ThreadBase	*)context	;
 
-    /* block out all signals on this thread */
-    sigfillset(&sigs);
-    pthread_sigmask(SIG_BLOCK, &sigs, NULL);
+				/*	block	out	all	signals	on	this	thread	*/
+				sigfillset(&sigs);
+				pthread_sigmask(SIG_BLOCK,	&sigs,	NULL);
 
-    /* Set the cancel type to deffered, the thread will be cancelled at next cancellation point */
-    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+				/*	Set	the	cancel	type	to	deffered,	the	thread	will	be	cancelled	at	next	cancellation	point	*/
+				pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED,	NULL);
 
-    tb->set_pid() ;
+				tb->set_pid()	;
 
-    /* Set thread priority and CPU affinity */
-    tb->execute_priority() ;
-    tb->execute_cpu_affinity() ;
+				/*	Set	thread	priority	and	CPU	affinity	*/
+				tb->execute_priority()	;
+				tb->execute_cpu_affinity()	;
 
-    return tb->thread_body() ;
+				return	tb->thread_body()	;
 }
 
-void Trick::ThreadBase::dump( std::ostream & oss ) {
-    oss << "    from Trick::ThreadBase\n";
-    oss << "    pthread_id = " << pthread_id << "\n";
-    oss << "    process_id = " << pid << "\n";
-    oss << "    rt_priority = " << rt_priority << "\n";
-#if __linux
-    oss << "    cpus = " ;
-    bool first_print = true ;
-    for ( unsigned int ii = 0 ; ii < max_cpu ; ii++ ) {
-#ifdef CPU_ISSET_S
-        if ( CPU_ISSET_S(ii, CPU_ALLOC_SIZE(max_cpu), cpus) ) {
+void	Trick::ThreadBase::dump(	std::ostream	&	oss	)	{
+				oss	<<	"				from	Trick::ThreadBase\n";
+				oss	<<	"				pthread_id	=	"	<<	pthread_id	<<	"\n";
+				oss	<<	"				process_id	=	"	<<	pid	<<	"\n";
+				oss	<<	"				rt_priority	=	"	<<	rt_priority	<<	"\n";
+#if	__linux
+				oss	<<	"				cpus	=	"	;
+				bool	first_print	=	true	;
+				for	(	unsigned	int	ii	=	0	;	ii	<	max_cpu	;	ii++	)	{
+#ifdef	CPU_ISSET_S
+								if	(	CPU_ISSET_S(ii,	CPU_ALLOC_SIZE(max_cpu),	cpus)	)	{
 #else
-        if ( CPU_ISSET(ii, cpus) ) {
+								if	(	CPU_ISSET(ii,	cpus)	)	{
 #endif
-            if ( first_print == true ) {
-                first_print = false ;
-            } else {
-                oss << "," ;
-            }
-            oss << ii ;
-        }
-    }
-    if ( first_print ) {
-        oss << "none assigned" ;
-    }
-    oss << std::endl ;
+												if	(	first_print	==	true	)	{
+																first_print	=	false	;
+												}	else	{
+																oss	<<	","	;
+												}
+												oss	<<	ii	;
+								}
+				}
+				if	(	first_print	)	{
+								oss	<<	"none	assigned"	;
+				}
+				oss	<<	std::endl	;
 #endif
 }
 
diff --git a/trick_source/sim_services/Timer/ITimer.cpp b/trick_source/sim_services/Timer/ITimer.cpp
index 597f9d7da..9c2c7ea14 100644
--- a/trick_source/sim_services/Timer/ITimer.cpp
+++ b/trick_source/sim_services/Timer/ITimer.cpp
@@ -1,203 +1,203 @@
 /*
 PURPOSE:
-    ( gettimeofday clock )
+				(	gettimeofday	clock	)
 PROGRAMMERS:
-    (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime.))
-     ((Robert W. Bailey) (LinCom) (7/22/92) (--) (--))
-     ((Eddie J. Paddock) (MDSSC) (Oct 1992) (--) (Realtime.)))
-     ((Alex Lin) (NASA) (April 2009) (--) (c++ port)))
+				(((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime.))
+					((Robert	W.	Bailey)	(LinCom)	(7/22/92)	(--)	(--))
+					((Eddie	J.	Paddock)	(MDSSC)	(Oct	1992)	(--)	(Realtime.)))
+					((Alex	Lin)	(NASA)	(April	2009)	(--)	(c++	port)))
 */
 
-#include <iostream>
-#include <sstream>
+#include	<iostream>
+#include	<sstream>
 
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <math.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include	<fcntl.h>
+#include	<stdio.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<math.h>
+#include	<signal.h>
+#include	<sys/types.h>
+#include	<unistd.h>
 
-#include "trick/ITimer.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
+#include	"trick/ITimer.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
 
-Trick::ITimer * the_itimer ;
+Trick::ITimer	*	the_itimer	;
 
-Trick::ITimer::ITimer() : Timer() {
+Trick::ITimer::ITimer()	:	Timer()	{
 
-    the_itimer = this ;
+				the_itimer	=	this	;
 
-#if ! ( __APPLE__ | __INTERIX )
-    clock_getres(CLOCK_REALTIME, &res);
+#if	!	(	__APPLE__	|	__INTERIX	)
+				clock_getres(CLOCK_REALTIME,	&res);
 #else
-    res.tv_nsec = 10000000;
-    res.tv_sec = 0;
+				res.tv_nsec	=	10000000;
+				res.tv_sec	=	0;
 #endif
 
-    return ;
+				return	;
 }
 
-Trick::ITimer::~ITimer() {
-    return ;
+Trick::ITimer::~ITimer()	{
+				return	;
 }
 
-void Trick::ITimer::semaphore_post() {
-    sem_post(semaphore) ;
+void	Trick::ITimer::semaphore_post()	{
+				sem_post(semaphore)	;
 }
 
 /**
 @details
--# Set the SIGALRM signal handler to the ITimer signal handler routine.
--# Open a unique named semaphore
+-#	Set	the	SIGALRM	signal	handler	to	the	ITimer	signal	handler	routine.
+-#	Open	a	unique	named	semaphore
 */
-int Trick::ITimer::init() {
+int	Trick::ITimer::init()	{
 
-    static struct sigaction sigact;
-    std::stringstream sem_name_stream ;
+				static	struct	sigaction	sigact;
+				std::stringstream	sem_name_stream	;
 
-    sigact.sa_handler = (void (*)(int)) it_handler;
-    if (sigaction(SIGALRM, &sigact, NULL) < 0) {
-        perror("sigaction() failed for SIGALRM");
-    }
+				sigact.sa_handler	=	(void	(*)(int))	it_handler;
+				if	(sigaction(SIGALRM,	&sigact,	NULL)	<	0)	{
+								perror("sigaction()	failed	for	SIGALRM");
+				}
 
-    // Initialize the itimer semaphore used by SIGALRM handler to
-    // wake up the sim_exec_loop from its underrun sleepy time.
+				//	Initialize	the	itimer	semaphore	used	by	SIGALRM	handler	to
+				//	wake	up	the	sim_exec_loop	from	its	underrun	sleepy	time.
 
-    sem_name_stream << "itimersepmaphore_" << getpid() ;
-    sem_name = sem_name_stream.str() ;
+				sem_name_stream	<<	"itimersepmaphore_"	<<	getpid()	;
+				sem_name	=	sem_name_stream.str()	;
 
-    semaphore = sem_open(sem_name.c_str(), O_CREAT, S_IRWXU , 0);
+				semaphore	=	sem_open(sem_name.c_str(),	O_CREAT,	S_IRWXU	,	0);
 
-    return (0) ;
+				return	(0)	;
 }
 
 /**
 @details
--# If the timer is enabled
-   -# If the frame time is valid
-      -# Set the system itimer to expire one time at the desired frame period.
-   -# Else termiate the simulation with the error message stating that the
-      itimer frame period is invalid.
+-#	If	the	timer	is	enabled
+			-#	If	the	frame	time	is	valid
+						-#	Set	the	system	itimer	to	expire	one	time	at	the	desired	frame	period.
+			-#	Else	termiate	the	simulation	with	the	error	message	stating	that	the
+						itimer	frame	period	is	invalid.
 */
-int Trick::ITimer::start(double in_frame_time) {
-
-    struct itimerval ivalue;
-    int ret ;
-    unsigned long long frame_sec ;
-    unsigned int frame_usec ;
-
-    if ( enabled ) {
-
-        // clear out any built up signals.
-        while ( (ret = sem_trywait(semaphore)) == 0 ) ;
-
-        frame_sec = ( unsigned long long )in_frame_time ;
-        frame_usec = (unsigned int)((in_frame_time - frame_sec) * 1000000) ;
-
-        // check minimum time > 10ms
-        if ( frame_sec == 0 && frame_usec < 10000 ) {
-            active = false ;
-            return(0) ;
-        } else if ( frame_usec < 2000 && frame_sec > 0 ) {
-            // adjust times with usec < 2000 , we'll be subtracting 2ms from the frame_usec
-            frame_sec  -= 1 ;
-            frame_usec += 1000000 ;
-        }
-        frame_usec -= 2000 ;
-
-        if ( in_frame_time > 0 ) {
-            /* Set timer interval in micro-seconds */
-            ivalue.it_interval.tv_sec = 0;
-            ivalue.it_interval.tv_usec = 0;
-            ivalue.it_value.tv_sec = frame_sec;
-            ivalue.it_value.tv_usec = (long) frame_usec;
-
-            setitimer(ITIMER_REAL, &ivalue, NULL);
-            active = true ;
-        } else {
-            char error_message[256];
-            snprintf(error_message, sizeof(error_message), "itimer frame_time is not set\n" ) ;
-            exec_terminate_with_return(-1, __FILE__, __LINE__ , error_message);
-        }
-    }
-    return (0) ;
+int	Trick::ITimer::start(double	in_frame_time)	{
+
+				struct	itimerval	ivalue;
+				int	ret	;
+				unsigned	long	long	frame_sec	;
+				unsigned	int	frame_usec	;
+
+				if	(	enabled	)	{
+
+								//	clear	out	any	built	up	signals.
+								while	(	(ret	=	sem_trywait(semaphore))	==	0	)	;
+
+								frame_sec	=	(	unsigned	long	long	)in_frame_time	;
+								frame_usec	=	(unsigned	int)((in_frame_time	-	frame_sec)	*	1000000)	;
+
+								//	check	minimum	time	>	10ms
+								if	(	frame_sec	==	0	&&	frame_usec	<	10000	)	{
+												active	=	false	;
+												return(0)	;
+								}	else	if	(	frame_usec	<	2000	&&	frame_sec	>	0	)	{
+												//	adjust	times	with	usec	<	2000	,	we'll	be	subtracting	2ms	from	the	frame_usec
+												frame_sec		-=	1	;
+												frame_usec	+=	1000000	;
+								}
+								frame_usec	-=	2000	;
+
+								if	(	in_frame_time	>	0	)	{
+												/*	Set	timer	interval	in	micro-seconds	*/
+												ivalue.it_interval.tv_sec	=	0;
+												ivalue.it_interval.tv_usec	=	0;
+												ivalue.it_value.tv_sec	=	frame_sec;
+												ivalue.it_value.tv_usec	=	(long)	frame_usec;
+
+												setitimer(ITIMER_REAL,	&ivalue,	NULL);
+												active	=	true	;
+								}	else	{
+												char	error_message[256];
+												snprintf(error_message,	sizeof(error_message),	"itimer	frame_time	is	not	set\n"	)	;
+												exec_terminate_with_return(-1,	__FILE__,	__LINE__	,	error_message);
+								}
+				}
+				return	(0)	;
 
 }
 
 /*
 @details
--# Call the start function
+-#	Call	the	start	function
 */
-int Trick::ITimer::reset(double in_frame_time) {
-    start(in_frame_time) ;
-    return (0) ;
+int	Trick::ITimer::reset(double	in_frame_time)	{
+				start(in_frame_time)	;
+				return	(0)	;
 }
 
 /**
 @details
--# Set the system itimer with the expiriation time of 0.
+-#	Set	the	system	itimer	with	the	expiriation	time	of	0.
 */
-int Trick::ITimer::stop() {
+int	Trick::ITimer::stop()	{
 
-    static struct itimerval ivalue, ovalue;
+				static	struct	itimerval	ivalue,	ovalue;
 
-    /* Turn off itimer */
-    ivalue.it_interval.tv_usec = 0;
-    ivalue.it_interval.tv_sec = 0;
+				/*	Turn	off	itimer	*/
+				ivalue.it_interval.tv_usec	=	0;
+				ivalue.it_interval.tv_sec	=	0;
 
-    ivalue.it_value.tv_usec = 0;
-    ivalue.it_value.tv_sec = 0;
+				ivalue.it_value.tv_usec	=	0;
+				ivalue.it_value.tv_sec	=	0;
 
-    (void) setitimer(ITIMER_REAL, &ivalue, &ovalue);
+				(void)	setitimer(ITIMER_REAL,	&ivalue,	&ovalue);
 
-    active = false ;
+				active	=	false	;
 
-    return (0) ;
+				return	(0)	;
 
 }
 
 /**
 @details
--# If the timer is enabled
-   -# Call sem_wait to decrement the semaphore.  sem_wait will sleep and wait
-      for the semaphore to be posted from the signal handler.
-   -# If sem_wait returns an error, write an error message
+-#	If	the	timer	is	enabled
+			-#	Call	sem_wait	to	decrement	the	semaphore.		sem_wait	will	sleep	and	wait
+						for	the	semaphore	to	be	posted	from	the	signal	handler.
+			-#	If	sem_wait	returns	an	error,	write	an	error	message
 */
-int Trick::ITimer::pause() {
+int	Trick::ITimer::pause()	{
 
-    int sem_ret;
+				int	sem_ret;
 
-    if ( enabled and active ) {
+				if	(	enabled	and	active	)	{
 
-        do {
-            sem_ret = sem_wait(semaphore);
-            //TODO: I'd like to use sem_timedwait
-            //sem_ret = sem_timedwait(semaphore, &timeout);
-        } while ((sem_ret < 0 && errno == EINTR) && (errno != EDEADLK));
+								do	{
+												sem_ret	=	sem_wait(semaphore);
+												//TODO:	I'd	like	to	use	sem_timedwait
+												//sem_ret	=	sem_timedwait(semaphore,	&timeout);
+								}	while	((sem_ret	<	0	&&	errno	==	EINTR)	&&	(errno	!=	EDEADLK));
 
-        if (sem_ret != 0) {
-            // Prepend info to the error message string (given by errno)
-            perror( "ITimer call to sem_wait()" );
-        }
+								if	(sem_ret	!=	0)	{
+												//	Prepend	info	to	the	error	message	string	(given	by	errno)
+												perror(	"ITimer	call	to	sem_wait()"	);
+								}
 
-    }
+				}
 
-    return (0) ;
+				return	(0)	;
 
 }
 
 /**
 @details
--# Unlink the semaphore
+-#	Unlink	the	semaphore
 */
-int Trick::ITimer::shutdown() {
-    sem_unlink(sem_name.c_str()) ;
-    return(0) ;
+int	Trick::ITimer::shutdown()	{
+				sem_unlink(sem_name.c_str())	;
+				return(0)	;
 }
 
-Trick::ITimer * get_itimer() {
-    return (the_itimer) ;
+Trick::ITimer	*	get_itimer()	{
+				return	(the_itimer)	;
 }
diff --git a/trick_source/sim_services/Timer/Timer.cpp b/trick_source/sim_services/Timer/Timer.cpp
index e2c29154f..6e309c1f7 100644
--- a/trick_source/sim_services/Timer/Timer.cpp
+++ b/trick_source/sim_services/Timer/Timer.cpp
@@ -1,28 +1,28 @@
 /*
 PURPOSE:
-    ( Base Timer class )
+				(	Base	Timer	class	)
 PROGRAMMERS:
-     ((Alex Lin) (NASA) (August 2010) (--) (c++ port)))
+					((Alex	Lin)	(NASA)	(August	2010)	(--)	(c++	port)))
 */
 
-#include "trick/Timer.hh"
+#include	"trick/Timer.hh"
 
-Trick::Timer::Timer() : enabled(false) , active(false) {}
+Trick::Timer::Timer()	:	enabled(false)	,	active(false)	{}
 
-int Trick::Timer::enable() {
-    enabled = true ;
-    return(0) ;
+int	Trick::Timer::enable()	{
+				enabled	=	true	;
+				return(0)	;
 }
 
-int Trick::Timer::disable() {
-    enabled = false ;
-    return(0) ;
+int	Trick::Timer::disable()	{
+				enabled	=	false	;
+				return(0)	;
 }
 
-bool Trick::Timer::get_enabled() {
-    return(enabled) ;
+bool	Trick::Timer::get_enabled()	{
+				return(enabled)	;
 }
 
-void Trick::Timer::set_active(bool in_active) {
-    active = in_active ;
+void	Trick::Timer::set_active(bool	in_active)	{
+				active	=	in_active	;
 }
diff --git a/trick_source/sim_services/Timer/it_handler.cpp b/trick_source/sim_services/Timer/it_handler.cpp
index 935e839ea..a094a2ae5 100644
--- a/trick_source/sim_services/Timer/it_handler.cpp
+++ b/trick_source/sim_services/Timer/it_handler.cpp
@@ -1,19 +1,19 @@
 /*
-   PURPOSE: ( Interval timer/external interrupt alarm signal handler )
+			PURPOSE:	(	Interval	timer/external	interrupt	alarm	signal	handler	)
 
-   PROGRAMMERS: (((Robert W. Bailey) (LinCom) (April 1992) (--) (Realtime)))
+			PROGRAMMERS:	(((Robert	W.	Bailey)	(LinCom)	(April	1992)	(--)	(Realtime)))
 */
 
-#include "trick/ITimer.hh"
+#include	"trick/ITimer.hh"
 
 /**
-@relates Trick::ITimer
-@brief Signal handler for itimer based sleep timer
-@param sig - signal number
+@relates	Trick::ITimer
+@brief	Signal	handler	for	itimer	based	sleep	timer
+@param	sig	-	signal	number
 @details
--# call sem_post() on the itimer semaphore
+-#	call	sem_post()	on	the	itimer	semaphore
 */
-void it_handler(int sig __attribute__ ((unused))) {
-    // Tell the scheduler to wait up from its sleepy time.
-    get_itimer()->semaphore_post() ;
+void	it_handler(int	sig	__attribute__	((unused)))	{
+				//	Tell	the	scheduler	to	wait	up	from	its	sleepy	time.
+				get_itimer()->semaphore_post()	;
 }
diff --git a/trick_source/sim_services/Timer/test/ITimer_test.cpp b/trick_source/sim_services/Timer/test/ITimer_test.cpp
index ffb7049c1..c3b3ff710 100644
--- a/trick_source/sim_services/Timer/test/ITimer_test.cpp
+++ b/trick_source/sim_services/Timer/test/ITimer_test.cpp
@@ -1,46 +1,46 @@
-/* Listed requirements are under requirement Trick-163 (3.7.5.2) */
-/*		Real-time control shall be able to use a system clock source */
+/*	Listed	requirements	are	under	requirement	Trick-163	(3.7.5.2)	*/
+/*		Real-time	control	shall	be	able	to	use	a	system	clock	source	*/
 
-#define protected public
-#define TOL 2e3
+#define	protected	public
+#define	TOL	2e3
 
-#include <iostream>
-#include <sys/types.h>
-#include <map>
-//#include <signal.h>
-#include <unistd.h>
+#include	<iostream>
+#include	<sys/types.h>
+#include	<map>
+//#include	<signal.h>
+#include	<unistd.h>
 
-#include "gtest/gtest.h"
-#include "trick/ITimer.hh"
-#include "trick/GetTimeOfDayClock.hh"
-#include "trick/SimObject.hh"
-//#include "trick/RequirementScribe.hh"
+#include	"gtest/gtest.h"
+#include	"trick/ITimer.hh"
+#include	"trick/GetTimeOfDayClock.hh"
+#include	"trick/SimObject.hh"
+//#include	"trick/RequirementScribe.hh"
 
-namespace Trick {
+namespace	Trick	{
 
-class ITimerTest : public testing::Test {
+class	ITimerTest	:	public	testing::Test	{
 
 	public:
-		Trick::GetTimeOfDayClock dClk;
-		//Trick::RequirementScribe req;
-		double sec;
-		long long tim_st, tim_elap;
-
-		ITimerTest() {}
-		~ITimerTest() {}
-		virtual void SetUp() {}
-		virtual void TearDown() {}
+		Trick::GetTimeOfDayClock	dClk;
+		//Trick::RequirementScribe	req;
+		double	sec;
+		long	long	tim_st,	tim_elap;
+
+		ITimerTest()	{}
+		~ITimerTest()	{}
+		virtual	void	SetUp()	{}
+		virtual	void	TearDown()	{}
 };
 
-/* Proper initialization of ITimer */
-TEST_F(ITimerTest, Initialize) {
+/*	Proper	initialization	of	ITimer	*/
+TEST_F(ITimerTest,	Initialize)	{
 	//req.add_requirement("timer");
-	//"The ITimer shall initialize with disabled and inactive status.");
+	//"The	ITimer	shall	initialize	with	disabled	and	inactive	status.");
 
-	Trick::ITimer *iTim;
-	iTim = new Trick::ITimer;
+	Trick::ITimer	*iTim;
+	iTim	=	new	Trick::ITimer;
 
-    iTim->init();
+				iTim->init();
 
 	EXPECT_FALSE(iTim->get_enabled());
 	EXPECT_FALSE(iTim->active);
@@ -51,145 +51,145 @@ TEST_F(ITimerTest, Initialize) {
 	iTim->disable();
 	EXPECT_FALSE(iTim->get_enabled());
 
-	delete iTim;
+	delete	iTim;
 }
 
-/* Timer not enabled; ensure no activity when starting, pausing, etc */
-TEST_F(ITimerTest, TimerNotEnabled) {
-    //req.add_requirement("timer");
-	//"The ITimer shall start if and only if the ITimer is enabled to do so.");
+/*	Timer	not	enabled;	ensure	no	activity	when	starting,	pausing,	etc	*/
+TEST_F(ITimerTest,	TimerNotEnabled)	{
+				//req.add_requirement("timer");
+	//"The	ITimer	shall	start	if	and	only	if	the	ITimer	is	enabled	to	do	so.");
 
 
-	bool active_ch;
+	bool	active_ch;
 
-    Trick::ITimer *iTim;
-	iTim = new Trick::ITimer;
+				Trick::ITimer	*iTim;
+	iTim	=	new	Trick::ITimer;
 
-	active_ch = iTim->active;
-	sec = 0.05;
+	active_ch	=	iTim->active;
+	sec	=	0.05;
 
 	iTim->init();
 
 	iTim->start(sec);
-	EXPECT_EQ(iTim->active, active_ch);
+	EXPECT_EQ(iTim->active,	active_ch);
 
 	iTim->set_active(~active_ch);
-	active_ch = iTim->active;
+	active_ch	=	iTim->active;
 	iTim->start(sec);
-	EXPECT_EQ(iTim->active, active_ch);
+	EXPECT_EQ(iTim->active,	active_ch);
 
-	delete iTim;
+	delete	iTim;
 }
 
-/* Tolerance: 2 ms */
-TEST_F(ITimerTest, TimerStartSuccess) {
-    //req.add_requirement("timer");
-	//"The ITimer shall sleep when commanded, thereby releasing the processor for a specified amount of time.");
+/*	Tolerance:	2	ms	*/
+TEST_F(ITimerTest,	TimerStartSuccess)	{
+				//req.add_requirement("timer");
+	//"The	ITimer	shall	sleep	when	commanded,	thereby	releasing	the	processor	for	a	specified	amount	of	time.");
 
-	sec = 0.05;
+	sec	=	0.05;
 
-	Trick::ITimer *iTim;
-	iTim = new Trick::ITimer;
+	Trick::ITimer	*iTim;
+	iTim	=	new	Trick::ITimer;
 
 	iTim->init();
 	iTim->enable();
 
-	tim_st = dClk.wall_clock_time();
+	tim_st	=	dClk.wall_clock_time();
 
 	iTim->start(sec);
 	ASSERT_TRUE(iTim->active);
 
-	/* Cause simulation to wait until "sec" seconds have passed */
+	/*	Cause	simulation	to	wait	until	"sec"	seconds	have	passed	*/
 	iTim->pause();
 
-	tim_elap = dClk.wall_clock_time() - tim_st;
-	EXPECT_NEAR((tim_elap+2000), sec*1e6, TOL);
+	tim_elap	=	dClk.wall_clock_time()	-	tim_st;
+	EXPECT_NEAR((tim_elap+2000),	sec*1e6,	TOL);
 
-	delete iTim;
+	delete	iTim;
 }
 
-TEST_F(ITimerTest, TimerStartReset) {
-    //req.add_requirement("timer");
-	//"The ITimer shall reset to a new alarm time when commanded if the current time until alarm has not yet expired.");
+TEST_F(ITimerTest,	TimerStartReset)	{
+				//req.add_requirement("timer");
+	//"The	ITimer	shall	reset	to	a	new	alarm	time	when	commanded	if	the	current	time	until	alarm	has	not	yet	expired.");
 
-    sec = 0.05;
+				sec	=	0.05;
 
-    Trick::ITimer *iTim;
-    iTim = new Trick::ITimer;
+				Trick::ITimer	*iTim;
+				iTim	=	new	Trick::ITimer;
 
-    iTim->init();
-    iTim->enable();
+				iTim->init();
+				iTim->enable();
 
-    iTim->start(sec);
+				iTim->start(sec);
 	usleep(40000);
 
-	/* This is equivalent to saying start(2.0*sec), both are valid */
+	/*	This	is	equivalent	to	saying	start(2.0*sec),	both	are	valid	*/
 	iTim->reset(2.0*sec);
 	//iTim->start(2.0*sec);
 
-	tim_st = dClk.wall_clock_time();
+	tim_st	=	dClk.wall_clock_time();
 	iTim->pause();
-	tim_elap = dClk.wall_clock_time() - tim_st;
+	tim_elap	=	dClk.wall_clock_time()	-	tim_st;
 
-	EXPECT_NEAR((tim_elap+2000), (2*sec*1e6), TOL);
+	EXPECT_NEAR((tim_elap+2000),	(2*sec*1e6),	TOL);
 
-    delete iTim;
+				delete	iTim;
 }
 
-TEST_F(ITimerTest, TimerStartStop) {
-    //req.add_requirement("timer");
-	//"The ITimer shall stop when commanded if the time until alarm has not yet expired.");
+TEST_F(ITimerTest,	TimerStartStop)	{
+				//req.add_requirement("timer");
+	//"The	ITimer	shall	stop	when	commanded	if	the	time	until	alarm	has	not	yet	expired.");
 
-    sec = 0.05;
+				sec	=	0.05;
 
-    Trick::ITimer *iTim;
-    iTim = new Trick::ITimer;
+				Trick::ITimer	*iTim;
+				iTim	=	new	Trick::ITimer;
 
-    iTim->init();
-    iTim->enable();
+				iTim->init();
+				iTim->enable();
 
-	tim_st = dClk.wall_clock_time();
-    iTim->start(sec);
-    usleep(40000);
+	tim_st	=	dClk.wall_clock_time();
+				iTim->start(sec);
+				usleep(40000);
 	iTim->stop();
-	tim_elap = dClk.wall_clock_time() - tim_st;
-	EXPECT_NEAR((tim_elap+2000), 40000, (TOL+4000));
+	tim_elap	=	dClk.wall_clock_time()	-	tim_st;
+	EXPECT_NEAR((tim_elap+2000),	40000,	(TOL+4000));
 
-	//std::cout << TOL+4000 << std::endl;
+	//std::cout	<<	TOL+4000	<<	std::endl;
 
-    EXPECT_FALSE(iTim->active);
-	tim_st = dClk.wall_clock_time();
+				EXPECT_FALSE(iTim->active);
+	tim_st	=	dClk.wall_clock_time();
 	iTim->pause();
-    tim_elap = dClk.wall_clock_time() - tim_st;
+				tim_elap	=	dClk.wall_clock_time()	-	tim_st;
 
-	EXPECT_NEAR(tim_elap, 0, TOL);
+	EXPECT_NEAR(tim_elap,	0,	TOL);
 
 
-    delete iTim;
+				delete	iTim;
 }
 
 
-TEST_F(ITimerTest, TimerStartFailure) {
-    //req.add_requirement("timer");
-	//"The ITimer shall not initiate with start times that are negative or less than 10 ms");
+TEST_F(ITimerTest,	TimerStartFailure)	{
+				//req.add_requirement("timer");
+	//"The	ITimer	shall	not	initiate	with	start	times	that	are	negative	or	less	than	10	ms");
 
-	sec = 0.05;
+	sec	=	0.05;
 
-    Trick::ITimer *iTim;
-    iTim = new Trick::ITimer;
+				Trick::ITimer	*iTim;
+				iTim	=	new	Trick::ITimer;
 
-    iTim->init();
-    iTim->enable();
+				iTim->init();
+				iTim->enable();
 
-	/*Passing negative time to elapse; expecting throw */
-    EXPECT_ANY_THROW(iTim->start(-sec));
+	/*Passing	negative	time	to	elapse;	expecting	throw	*/
+				EXPECT_ANY_THROW(iTim->start(-sec));
 
-	/* Cannot activate timer with < 10 ms */
-	sec = 0.005;
+	/*	Cannot	activate	timer	with	<	10	ms	*/
+	sec	=	0.005;
 	iTim->start(sec);
 	EXPECT_FALSE(iTim->active);
 
-    delete iTim;
+				delete	iTim;
 }
 
 }
diff --git a/trick_source/sim_services/UdUnits/UdUnits.cpp b/trick_source/sim_services/UdUnits/UdUnits.cpp
index 128852166..b49a4280f 100644
--- a/trick_source/sim_services/UdUnits/UdUnits.cpp
+++ b/trick_source/sim_services/UdUnits/UdUnits.cpp
@@ -1,28 +1,28 @@
 
-#include <iostream>
+#include	<iostream>
 
-#include "trick/UdUnits.hh"
+#include	"trick/UdUnits.hh"
 
-ut_system * Trick::UdUnits::u_system = NULL ;
+ut_system	*	Trick::UdUnits::u_system	=	NULL	;
 
-ut_system * Trick::UdUnits::get_u_system() {
-    return u_system ;
+ut_system	*	Trick::UdUnits::get_u_system()	{
+				return	u_system	;
 }
-int Trick::UdUnits::read_default_xml() {
-    /* Initialize the udunits-2 library */
-    ut_set_error_message_handler(ut_ignore) ;
-    if( (u_system = ut_read_xml( NULL )) == NULL ) {
-        std::cerr << "Error initializing udunits-2 unit system" << std::endl ;
-        return -1 ;
-    }
-    ut_set_error_message_handler(ut_write_to_stderr) ;
-
-    return 0 ;
+int	Trick::UdUnits::read_default_xml()	{
+				/*	Initialize	the	udunits-2	library	*/
+				ut_set_error_message_handler(ut_ignore)	;
+				if(	(u_system	=	ut_read_xml(	NULL	))	==	NULL	)	{
+								std::cerr	<<	"Error	initializing	udunits-2	unit	system"	<<	std::endl	;
+								return	-1	;
+				}
+				ut_set_error_message_handler(ut_write_to_stderr)	;
+
+				return	0	;
 }
 
-int Trick::UdUnits::read_user_xml(std::string file_name) {
-    (void)file_name;
-    return 0 ;
+int	Trick::UdUnits::read_user_xml(std::string	file_name)	{
+				(void)file_name;
+				return	0	;
 }
 
 
diff --git a/trick_source/sim_services/UdUnits/map_trick_units_to_udunits.cpp b/trick_source/sim_services/UdUnits/map_trick_units_to_udunits.cpp
index e2aad26c1..9601e4d7d 100644
--- a/trick_source/sim_services/UdUnits/map_trick_units_to_udunits.cpp
+++ b/trick_source/sim_services/UdUnits/map_trick_units_to_udunits.cpp
@@ -1,97 +1,97 @@
 
-#include <iostream>
-#include <string>
-#include <map>
-#include <vector>
-#include <numeric>
+#include	<iostream>
+#include	<string>
+#include	<map>
+#include	<vector>
+#include	<numeric>
 
-static std::map< std::string, std::string> init_map_old_to_ud() {
-    std::map< std::string, std::string> init_map ;
-    init_map["r"] = "rad" ;
-    init_map["d"] = "degree" ;
-    init_map["as"] = "arcsecond" ;
-    init_map["am"] = "arcminute" ;
-    init_map["rev"] = "revolution" ;
-    init_map["M"] = "m" ;  // really?  people still using this? (yes)
-    init_map["n.m."] = "nmile" ;
-    init_map["sl"] = "slug" ;
-    init_map["mt"] = "t" ;
-    init_map["lbm"] = "lb" ;
-    init_map["oz"] = "ozf" ;
-    init_map["v"] = "V" ;
-    init_map["F"] = "degF" ;
-    init_map["C"] = "degC" ;
-    init_map["R"] = "degR" ;
-    init_map["TNT"] = "ton_TNT" ;
-    init_map["Wh"] = "(W*h)" ;
-    init_map["kWh"] = "(kW*h)" ;
-    init_map["gal"] = "gallon" ;
-    init_map["dB"] = "1" ;
-    init_map["one"] = "1" ;
-    init_map["cnt"] = "count" ;
-    init_map["--"] = "1" ;
+static	std::map<	std::string,	std::string>	init_map_old_to_ud()	{
+				std::map<	std::string,	std::string>	init_map	;
+				init_map["r"]	=	"rad"	;
+				init_map["d"]	=	"degree"	;
+				init_map["as"]	=	"arcsecond"	;
+				init_map["am"]	=	"arcminute"	;
+				init_map["rev"]	=	"revolution"	;
+				init_map["M"]	=	"m"	;		//	really?		people	still	using	this?	(yes)
+				init_map["n.m."]	=	"nmile"	;
+				init_map["sl"]	=	"slug"	;
+				init_map["mt"]	=	"t"	;
+				init_map["lbm"]	=	"lb"	;
+				init_map["oz"]	=	"ozf"	;
+				init_map["v"]	=	"V"	;
+				init_map["F"]	=	"degF"	;
+				init_map["C"]	=	"degC"	;
+				init_map["R"]	=	"degR"	;
+				init_map["TNT"]	=	"ton_TNT"	;
+				init_map["Wh"]	=	"(W*h)"	;
+				init_map["kWh"]	=	"(kW*h)"	;
+				init_map["gal"]	=	"gallon"	;
+				init_map["dB"]	=	"1"	;
+				init_map["one"]	=	"1"	;
+				init_map["cnt"]	=	"count"	;
+				init_map["--"]	=	"1"	;
 
-    return init_map ;
+				return	init_map	;
 }
 
-static std::map< std::string, std::string> old_to_ud = init_map_old_to_ud() ;
+static	std::map<	std::string,	std::string>	old_to_ud	=	init_map_old_to_ud()	;
 
-static void tokenize_units(const std::string& str,
-                      std::vector<std::string>& tokens,
-                      const std::string& delimiters = " ")
+static	void	tokenize_units(const	std::string&	str,
+																						std::vector<std::string>&	tokens,
+																						const	std::string&	delimiters	=	"	")
 {
-    // Skip delimiters at beginning.
-    std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+				//	Skip	delimiters	at	beginning.
+				std::string::size_type	lastPos	=	str.find_first_not_of(delimiters,	0);
 
-    if ( lastPos != 0 ) {
-        tokens.push_back(str.substr(0, lastPos));
-    }
+				if	(	lastPos	!=	0	)	{
+								tokens.push_back(str.substr(0,	lastPos));
+				}
 
-    // Find first "non-delimiter".
-    std::string::size_type pos = str.find_first_of(delimiters, lastPos);
+				//	Find	first	"non-delimiter".
+				std::string::size_type	pos	=	str.find_first_of(delimiters,	lastPos);
 
-    while (std::string::npos != pos || std::string::npos != lastPos) {
-        // Found a token, add it to the vector.
-        tokens.push_back(str.substr(lastPos, pos - lastPos));
-        // Find end of delimiters.  Note the "not_of"
-        lastPos = str.find_first_not_of(delimiters, pos);
-        // Push the delimiters
-        if ( lastPos != std::string::npos ) {
-            tokens.push_back(str.substr(pos, lastPos - pos));
-        } else if ( pos != std::string::npos ) {
-            tokens.push_back(str.substr(pos));
-        }
-        // Find next "non-delimiter"
-        pos = str.find_first_of(delimiters, lastPos);
-    }
+				while	(std::string::npos	!=	pos	||	std::string::npos	!=	lastPos)	{
+								//	Found	a	token,	add	it	to	the	vector.
+								tokens.push_back(str.substr(lastPos,	pos	-	lastPos));
+								//	Find	end	of	delimiters.		Note	the	"not_of"
+								lastPos	=	str.find_first_not_of(delimiters,	pos);
+								//	Push	the	delimiters
+								if	(	lastPos	!=	std::string::npos	)	{
+												tokens.push_back(str.substr(pos,	lastPos	-	pos));
+								}	else	if	(	pos	!=	std::string::npos	)	{
+												tokens.push_back(str.substr(pos));
+								}
+								//	Find	next	"non-delimiter"
+								pos	=	str.find_first_of(delimiters,	lastPos);
+				}
 
 }
 
-// This routine (partially) tokenizes a units string.  It substitutes
-// units that need their names changed to conform to the new units system.
-std::string map_trick_units_to_udunits( std::string orig_units ) {
-    std::vector<std::string> tokens ;
-    std::vector<std::string>::iterator it ;
-    tokenize_units(orig_units, tokens, "*/^()") ;
-    for( it = tokens.begin() ; it != tokens.end() ; ++it ) {
-        char last_char = *((*it).rbegin()) ;
-        // tokens can end in powers of 2 or 3 in the old system.
-        // save the power if it is the last character
-        if(last_char == '2' || last_char == '3') {
-            (*it).erase((*it).length() -1) ;
-        }
-        // look up the unit to see if it needs to be converted.
-        std::map< std::string, std::string>::iterator mit ;
-        mit = old_to_ud.find(*it) ;
-        if ( mit != old_to_ud.end() ) {
-            *it = mit->second ;
-        }
-        // put back the power after the base unit has been tested
-        if ((last_char == '2' || last_char == '3')) {
-            *it += last_char ;
-        }
-        //std::cout << " " << *it << std::endl ;
-    }
-    std::string new_units = std::accumulate( tokens.begin(),tokens.end(), std::string("") );
-    return new_units ;
+//	This	routine	(partially)	tokenizes	a	units	string.		It	substitutes
+//	units	that	need	their	names	changed	to	conform	to	the	new	units	system.
+std::string	map_trick_units_to_udunits(	std::string	orig_units	)	{
+				std::vector<std::string>	tokens	;
+				std::vector<std::string>::iterator	it	;
+				tokenize_units(orig_units,	tokens,	"*/^()")	;
+				for(	it	=	tokens.begin()	;	it	!=	tokens.end()	;	++it	)	{
+								char	last_char	=	*((*it).rbegin())	;
+								//	tokens	can	end	in	powers	of	2	or	3	in	the	old	system.
+								//	save	the	power	if	it	is	the	last	character
+								if(last_char	==	'2'	||	last_char	==	'3')	{
+												(*it).erase((*it).length()	-1)	;
+								}
+								//	look	up	the	unit	to	see	if	it	needs	to	be	converted.
+								std::map<	std::string,	std::string>::iterator	mit	;
+								mit	=	old_to_ud.find(*it)	;
+								if	(	mit	!=	old_to_ud.end()	)	{
+												*it	=	mit->second	;
+								}
+								//	put	back	the	power	after	the	base	unit	has	been	tested
+								if	((last_char	==	'2'	||	last_char	==	'3'))	{
+												*it	+=	last_char	;
+								}
+								//std::cout	<<	"	"	<<	*it	<<	std::endl	;
+				}
+				std::string	new_units	=	std::accumulate(	tokens.begin(),tokens.end(),	std::string("")	);
+				return	new_units	;
 }
diff --git a/trick_source/sim_services/UnitTest/UnitTest.cpp b/trick_source/sim_services/UnitTest/UnitTest.cpp
index edd401c1b..d48993fff 100644
--- a/trick_source/sim_services/UnitTest/UnitTest.cpp
+++ b/trick_source/sim_services/UnitTest/UnitTest.cpp
@@ -1,167 +1,167 @@
 
-#include <iostream>
-#include <fstream>
+#include	<iostream>
+#include	<fstream>
 
-#include "trick/UnitTest.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/UnitTest.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-Trick::UnitTest * the_unit_test_output ;
+Trick::UnitTest	*	the_unit_test_output	;
 
-Trick::TestCase::TestCase(std::string in_test_case_name , std::string in_failure_string) {
-    name = in_test_case_name ;
-    status = std::string("run") ;
-    elapsed_time = 0.0 ;
-    failure_string = in_failure_string ;
+Trick::TestCase::TestCase(std::string	in_test_case_name	,	std::string	in_failure_string)	{
+				name	=	in_test_case_name	;
+				status	=	std::string("run")	;
+				elapsed_time	=	0.0	;
+				failure_string	=	in_failure_string	;
 }
 
-Trick::TestSuite::TestSuite() {
-    num_failures = 0 ;
+Trick::TestSuite::TestSuite()	{
+				num_failures	=	0	;
 }
 
-int Trick::TestSuite::add_test_results(std::string in_test_case_name , std::string in_failure_string ) {
+int	Trick::TestSuite::add_test_results(std::string	in_test_case_name	,	std::string	in_failure_string	)	{
 
-    Trick::TestCase * new_test ;
-    new_test = new TestCase(in_test_case_name , in_failure_string) ;
+				Trick::TestCase	*	new_test	;
+				new_test	=	new	TestCase(in_test_case_name	,	in_failure_string)	;
 
-    test_results.push_back(new_test) ;
-    if ( in_failure_string.compare("") ) {
-        num_failures++ ;
-    }
-    return(0) ;
+				test_results.push_back(new_test)	;
+				if	(	in_failure_string.compare("")	)	{
+								num_failures++	;
+				}
+				return(0)	;
 }
 
-int Trick::TestSuite::add_test_requirements(std::string test_case , std::string par_num) {
-    unsigned int jj;
-    TestCase * curr_case ;
-
-    for (jj = 0 ; jj != test_results.size() ; jj++ ) {
-        curr_case = test_results[jj] ;
-        if (curr_case->name == test_case) {
-            curr_case->parent = par_num;
-        }
-    }
-    return(0);
+int	Trick::TestSuite::add_test_requirements(std::string	test_case	,	std::string	par_num)	{
+				unsigned	int	jj;
+				TestCase	*	curr_case	;
+
+				for	(jj	=	0	;	jj	!=	test_results.size()	;	jj++	)	{
+								curr_case	=	test_results[jj]	;
+								if	(curr_case->name	==	test_case)	{
+												curr_case->parent	=	par_num;
+								}
+				}
+				return(0);
 }
 
-void Trick::TestSuite::delete_test_results() {
-    std::vector <Trick::TestCase *>::iterator it ;
-    for ( it = test_results.begin() ; it != test_results.end() ; ++it ) {
-        delete (*it) ;
-    }
-    test_results.clear() ;
+void	Trick::TestSuite::delete_test_results()	{
+				std::vector	<Trick::TestCase	*>::iterator	it	;
+				for	(	it	=	test_results.begin()	;	it	!=	test_results.end()	;	++it	)	{
+								delete	(*it)	;
+				}
+				test_results.clear()	;
 }
 
-Trick::UnitTest::UnitTest() {
-    the_unit_test_output = this ;
-    enabled = false ;
-    exit_code_enabled = true ;
-    file_name = std::string("test_details.xml") ;
-    name = std::string("AllTests") ;
+Trick::UnitTest::UnitTest()	{
+				the_unit_test_output	=	this	;
+				enabled	=	false	;
+				exit_code_enabled	=	true	;
+				file_name	=	std::string("test_details.xml")	;
+				name	=	std::string("AllTests")	;
 }
 
-Trick::UnitTest::~UnitTest() {
-    std::map< std::string , TestSuite >::iterator it ;
-    for ( it = test_suites.begin() ; it != test_suites.end() ; ++it ) {
-        (it->second).delete_test_results() ;
-    }
+Trick::UnitTest::~UnitTest()	{
+				std::map<	std::string	,	TestSuite	>::iterator	it	;
+				for	(	it	=	test_suites.begin()	;	it	!=	test_suites.end()	;	++it	)	{
+								(it->second).delete_test_results()	;
+				}
 }
 
-int Trick::UnitTest::add_test_results(std::string in_test_suite_name , std::string in_test_case , std::string in_failure_string ) {
+int	Trick::UnitTest::add_test_results(std::string	in_test_suite_name	,	std::string	in_test_case	,	std::string	in_failure_string	)	{
 
-    if ( enabled ) {
-        test_suites[in_test_suite_name].add_test_results(in_test_case , in_failure_string) ;
-        if ( in_failure_string.compare("") ) {
-            message_publish(MSG_ERROR, "[  FAILED  ] %s:%s %s\n",
-             in_test_suite_name.c_str() , in_test_case.c_str() , in_failure_string.c_str()) ;
-        } else {
-            message_publish(MSG_NORMAL,  "\033[32m[       OK ]\033[0m %s:%s\n", in_test_suite_name.c_str() , in_test_case.c_str() ) ;
-        }
-    }
+				if	(	enabled	)	{
+								test_suites[in_test_suite_name].add_test_results(in_test_case	,	in_failure_string)	;
+								if	(	in_failure_string.compare("")	)	{
+												message_publish(MSG_ERROR,	"[		FAILED		]	%s:%s	%s\n",
+													in_test_suite_name.c_str()	,	in_test_case.c_str()	,	in_failure_string.c_str())	;
+								}	else	{
+												message_publish(MSG_NORMAL,		"\033[32m[							OK	]\033[0m	%s:%s\n",	in_test_suite_name.c_str()	,	in_test_case.c_str()	)	;
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::UnitTest::add_test_requirements(std::string in_test_suite_name, std::string in_test_case, std::string par_num) {
-    if ( enabled ) {
-        test_suites[in_test_suite_name].add_test_requirements(in_test_case , par_num) ;
-    }
-       return 0 ;
+int	Trick::UnitTest::add_test_requirements(std::string	in_test_suite_name,	std::string	in_test_case,	std::string	par_num)	{
+				if	(	enabled	)	{
+								test_suites[in_test_suite_name].add_test_requirements(in_test_case	,	par_num)	;
+				}
+							return	0	;
 }
 
-bool Trick::UnitTest::enable() {
-    enabled = true ;
-    return(true) ;
+bool	Trick::UnitTest::enable()	{
+				enabled	=	true	;
+				return(true)	;
 }
 
-int Trick::UnitTest::set_exit_code_enabled(bool in_enable) {
-    exit_code_enabled = in_enable ;
-    return 0 ;
+int	Trick::UnitTest::set_exit_code_enabled(bool	in_enable)	{
+				exit_code_enabled	=	in_enable	;
+				return	0	;
 }
 
-int Trick::UnitTest::set_test_name(std::string in_name) {
-    name = in_name ;
-    return 0 ;
+int	Trick::UnitTest::set_test_name(std::string	in_name)	{
+				name	=	in_name	;
+				return	0	;
 }
 
-int Trick::UnitTest::set_file_name(std::string in_name) {
-    file_name = in_name ;
-    return 0 ;
+int	Trick::UnitTest::set_file_name(std::string	in_name)	{
+				file_name	=	in_name	;
+				return	0	;
 }
 
-int Trick::UnitTest::write_output() {
-
-    std::ofstream out ;
-    unsigned int num_tests = 0 ;
-    unsigned int num_failures = 0 ;
-    std::map< std::string , TestSuite >::iterator it ;
-    TestSuite * curr_suite ;
-    TestCase * curr_case ;
-    unsigned int jj ;
-
-    if ( enabled ) {
-        for ( it = test_suites.begin() ; it != test_suites.end() ; ++it ) {
-            curr_suite = &(it->second) ;
-            num_tests += curr_suite->test_results.size() ;
-            num_failures += curr_suite->num_failures ;
-        }
-        message_publish(MSG_NORMAL,  "Total tests: %d , Failures: %d\n", num_tests , num_failures ) ;
-
-        out.open(file_name.c_str()) ;
-        out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl ;
-        out << "<testsuites tests=\"" << num_tests << "\" failures=\"" << num_failures <<
-         "\" disabled=\"0\" errors=\"0\" time=\"0.0\" name=\"" << name << "\">" << std::endl ;
-
-        for ( it = test_suites.begin() ; it != test_suites.end() ; ++it ) {
-            curr_suite = &(it->second) ;
-            out << "  <testsuite name=\"" << it->first << "\" tests=\"" << curr_suite->test_results.size() ;
-            out << "\" failures=\"" << num_failures << "\" disabled=\"0\" errors=\"0\" time=\"0.0\">" << std::endl ;
-            for ( jj = 0 ; jj < curr_suite->test_results.size() ; jj++ ) {
-                curr_case = curr_suite->test_results[jj] ;
-                out << "    <testcase name=\"" << curr_case->name << "\" status=\"" << curr_case->status ;
-                out << "\" time=\"0\" classname=\"" << it->first << "\"" ;
-
-                // parent stuff goes here
-                //out << " parent=\"" << curr_case->parent << "\"" ;
-
-                if ( curr_case->failure_string.compare("") ) {
-                    out << " >" << std::endl  ;
-                    out << "       <failure message=\"" << curr_case->failure_string << "\" type=\"\"/>" << std::endl ;
-                    out << "    </testcase>" << std::endl;
-                } else {
-                    out << " />" << std::endl ;
-                }
-            }
-            out << "  </testsuite>" << std::endl  ;
-        }
-        out << "</testsuites>" << std::endl  ;
-
-        if ( exit_code_enabled && num_failures > 0 ) {
-            exec_terminate_with_return( 1 , __FILE__ , __LINE__ , "Unit Test failure detected." ) ;
-        }
-    }
-
-    return(0) ;
+int	Trick::UnitTest::write_output()	{
+
+				std::ofstream	out	;
+				unsigned	int	num_tests	=	0	;
+				unsigned	int	num_failures	=	0	;
+				std::map<	std::string	,	TestSuite	>::iterator	it	;
+				TestSuite	*	curr_suite	;
+				TestCase	*	curr_case	;
+				unsigned	int	jj	;
+
+				if	(	enabled	)	{
+								for	(	it	=	test_suites.begin()	;	it	!=	test_suites.end()	;	++it	)	{
+												curr_suite	=	&(it->second)	;
+												num_tests	+=	curr_suite->test_results.size()	;
+												num_failures	+=	curr_suite->num_failures	;
+								}
+								message_publish(MSG_NORMAL,		"Total	tests:	%d	,	Failures:	%d\n",	num_tests	,	num_failures	)	;
+
+								out.open(file_name.c_str())	;
+								out	<<	"<?xml	version=\"1.0\"	encoding=\"UTF-8\"?>"	<<	std::endl	;
+								out	<<	"<testsuites	tests=\""	<<	num_tests	<<	"\"	failures=\""	<<	num_failures	<<
+									"\"	disabled=\"0\"	errors=\"0\"	time=\"0.0\"	name=\""	<<	name	<<	"\">"	<<	std::endl	;
+
+								for	(	it	=	test_suites.begin()	;	it	!=	test_suites.end()	;	++it	)	{
+												curr_suite	=	&(it->second)	;
+												out	<<	"		<testsuite	name=\""	<<	it->first	<<	"\"	tests=\""	<<	curr_suite->test_results.size()	;
+												out	<<	"\"	failures=\""	<<	num_failures	<<	"\"	disabled=\"0\"	errors=\"0\"	time=\"0.0\">"	<<	std::endl	;
+												for	(	jj	=	0	;	jj	<	curr_suite->test_results.size()	;	jj++	)	{
+																curr_case	=	curr_suite->test_results[jj]	;
+																out	<<	"				<testcase	name=\""	<<	curr_case->name	<<	"\"	status=\""	<<	curr_case->status	;
+																out	<<	"\"	time=\"0\"	classname=\""	<<	it->first	<<	"\""	;
+
+																//	parent	stuff	goes	here
+																//out	<<	"	parent=\""	<<	curr_case->parent	<<	"\""	;
+
+																if	(	curr_case->failure_string.compare("")	)	{
+																				out	<<	"	>"	<<	std::endl		;
+																				out	<<	"							<failure	message=\""	<<	curr_case->failure_string	<<	"\"	type=\"\"/>"	<<	std::endl	;
+																				out	<<	"				</testcase>"	<<	std::endl;
+																}	else	{
+																				out	<<	"	/>"	<<	std::endl	;
+																}
+												}
+												out	<<	"		</testsuite>"	<<	std::endl		;
+								}
+								out	<<	"</testsuites>"	<<	std::endl		;
+
+								if	(	exit_code_enabled	&&	num_failures	>	0	)	{
+												exec_terminate_with_return(	1	,	__FILE__	,	__LINE__	,	"Unit	Test	failure	detected."	)	;
+								}
+				}
+
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp b/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp
index 64200e4d6..537027d7f 100644
--- a/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp
+++ b/trick_source/sim_services/UnitTest/UnitTest_c_intf.cpp
@@ -1,43 +1,43 @@
 
-#include <iostream>
-#include <fstream>
+#include	<iostream>
+#include	<fstream>
 
-#include "trick/UnitTest.hh"
+#include	"trick/UnitTest.hh"
 
-extern Trick::UnitTest * the_unit_test_output ;
+extern	Trick::UnitTest	*	the_unit_test_output	;
 
-extern "C" int trick_test_enable(void) {
-    the_unit_test_output->enable() ;
-    return(0) ;
+extern	"C"	int	trick_test_enable(void)	{
+				the_unit_test_output->enable()	;
+				return(0)	;
 }
 
-extern "C" int trick_test_set_file_name( const char * in_file_name ) {
-    the_unit_test_output->set_file_name(in_file_name) ;
-    return(0) ;
+extern	"C"	int	trick_test_set_file_name(	const	char	*	in_file_name	)	{
+				the_unit_test_output->set_file_name(in_file_name)	;
+				return(0)	;
 }
 
-extern "C" int trick_test_set_test_name( const char * in_test_name ) {
-    the_unit_test_output->set_test_name(in_test_name) ;
-    return(0) ;
+extern	"C"	int	trick_test_set_test_name(	const	char	*	in_test_name	)	{
+				the_unit_test_output->set_test_name(in_test_name)	;
+				return(0)	;
 }
 
-extern "C" int add_test_result( const char * in_test_suite_name , const char * in_test_case , const char * in_failure_string ) {
-    if ( in_failure_string == NULL ) {
-        in_failure_string = "" ;
-    }
-    the_unit_test_output->add_test_results(in_test_suite_name , in_test_case , in_failure_string ) ;
-    return(0) ;
+extern	"C"	int	add_test_result(	const	char	*	in_test_suite_name	,	const	char	*	in_test_case	,	const	char	*	in_failure_string	)	{
+				if	(	in_failure_string	==	NULL	)	{
+								in_failure_string	=	""	;
+				}
+				the_unit_test_output->add_test_results(in_test_suite_name	,	in_test_case	,	in_failure_string	)	;
+				return(0)	;
 }
 
-extern "C" int trick_test_add_parent(const char * in_test_suite_name, const char * in_test_case, const char * par_num ) {
-	the_unit_test_output->add_test_requirements(in_test_suite_name, in_test_case, par_num);
+extern	"C"	int	trick_test_add_parent(const	char	*	in_test_suite_name,	const	char	*	in_test_case,	const	char	*	par_num	)	{
+	the_unit_test_output->add_test_requirements(in_test_suite_name,	in_test_case,	par_num);
 
 	return(0);
 }
 
 
-extern "C" int call_write_output(void) {
-    the_unit_test_output->write_output() ;
-    return(0) ;
+extern	"C"	int	call_write_output(void)	{
+				the_unit_test_output->write_output()	;
+				return(0)	;
 }
 
diff --git a/trick_source/sim_services/UnitsMap/UnitsMap.cpp b/trick_source/sim_services/UnitsMap/UnitsMap.cpp
index 6d6b4b492..70e4703fe 100644
--- a/trick_source/sim_services/UnitsMap/UnitsMap.cpp
+++ b/trick_source/sim_services/UnitsMap/UnitsMap.cpp
@@ -1,53 +1,53 @@
 
-#include <iostream>
-#include <string.h>
-#include <stdlib.h>
-#include "trick/UnitsMap.hh"
+#include	<iostream>
+#include	<string.h>
+#include	<stdlib.h>
+#include	"trick/UnitsMap.hh"
 
-// Class static pointer initialization
-Trick::UnitsMap * Trick::UnitsMap::pInstance = NULL ;
+//	Class	static	pointer	initialization
+Trick::UnitsMap	*	Trick::UnitsMap::pInstance	=	NULL	;
 
-// Memeber Function
-Trick::UnitsMap * Trick::UnitsMap::units_map() {
-    if ( pInstance == NULL ) {
-        pInstance = new Trick::UnitsMap() ;
-    }
+//	Memeber	Function
+Trick::UnitsMap	*	Trick::UnitsMap::units_map()	{
+				if	(	pInstance	==	NULL	)	{
+								pInstance	=	new	Trick::UnitsMap()	;
+				}
 
-    return(pInstance) ;
-} ;
+				return(pInstance)	;
+}	;
 
-// Destructor
-Trick::UnitsMap::~UnitsMap() {
+//	Destructor
+Trick::UnitsMap::~UnitsMap()	{
 
-    std::map<std::string, char * >::iterator pit ;
+				std::map<std::string,	char	*	>::iterator	pit	;
 
-    for ( pit = param_units.begin() ; pit != param_units.end() ; ++pit ) {
-        free((*pit).second) ;
-    }
-    param_units.clear() ;
+				for	(	pit	=	param_units.begin()	;	pit	!=	param_units.end()	;	++pit	)	{
+								free((*pit).second)	;
+				}
+				param_units.clear()	;
 
 }
 
-// Member Function
-int Trick::UnitsMap::add_param(std::string param , const char * units) {
+//	Member	Function
+int	Trick::UnitsMap::add_param(std::string	param	,	const	char	*	units)	{
 	/**
-	 * @par Design Details:
-	 * @li Adds a variable with specified units to the map. The key is the name of a variable and the value is the units of the variable.
-	 */
-    param_units[param] = strdup(units) ;
-    return(0) ;
+		*	@par	Design	Details:
+		*	@li	Adds	a	variable	with	specified	units	to	the	map.	The	key	is	the	name	of	a	variable	and	the	value	is	the	units	of	the	variable.
+		*/
+				param_units[param]	=	strdup(units)	;
+				return(0)	;
 }
 
-// Memeber Function
-std::string Trick::UnitsMap::get_units( std::string param ) {
+//	Memeber	Function
+std::string	Trick::UnitsMap::get_units(	std::string	param	)	{
 	/**
-	 * @par Design Details:
-	 * @li Finds the specified variable in the map and returns the units of the found variable.
-	 *     If the variable can not be found, returns "1" (unitless).
-	 */
-    if ( param_units.find(param) != param_units.end() ) {
-        return(std::string(param_units[param])) ;
-    } else {
-        return(std::string("1")) ;
-    }
+		*	@par	Design	Details:
+		*	@li	Finds	the	specified	variable	in	the	map	and	returns	the	units	of	the	found	variable.
+		*					If	the	variable	can	not	be	found,	returns	"1"	(unitless).
+		*/
+				if	(	param_units.find(param)	!=	param_units.end()	)	{
+								return(std::string(param_units[param]))	;
+				}	else	{
+								return(std::string("1"))	;
+				}
 }
diff --git a/trick_source/sim_services/VariableServer/VariableReference.cpp b/trick_source/sim_services/VariableServer/VariableReference.cpp
index 4329dbe06..57dc3481a 100644
--- a/trick_source/sim_services/VariableServer/VariableReference.cpp
+++ b/trick_source/sim_services/VariableServer/VariableReference.cpp
@@ -1,737 +1,737 @@
-#include <stdlib.h>
-#include <iostream>
-#include <udunits2.h>
-#include <math.h> // for fpclassify
-#include <iomanip> // for setprecision
-#include <string.h>
-#include <sstream>
-
-#include "trick/VariableReference.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/wcs_ext.h"
-#include "trick/map_trick_units_to_udunits.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/UdUnits.hh"
-#include "trick/bitfield_proto.h"
-#include "trick/trick_byteswap.h"
-
-
-// Static variables to be addresses that are known to be the error ref address
-int Trick::VariableReference::_bad_ref_int = 0 ;
-int Trick::VariableReference::_do_not_resolve_bad_ref_int = 0 ;
-
-REF2* Trick::VariableReference::make_error_ref(std::string in_name) {
-    REF2* new_ref;
-    new_ref = (REF2*)calloc(1, sizeof(REF2));
-    new_ref->reference = strdup(in_name.c_str()) ;
-    new_ref->units = NULL ;
-    new_ref->address = (char *)&_bad_ref_int ;
-    new_ref->attr = (ATTRIBUTES*)calloc(1, sizeof(ATTRIBUTES)) ;
-    new_ref->attr->type = TRICK_NUMBER_OF_TYPES ;
-    new_ref->attr->units = (char *)"--" ;
-    new_ref->attr->size = sizeof(int) ;
-    return new_ref;
+#include	<stdlib.h>
+#include	<iostream>
+#include	<udunits2.h>
+#include	<math.h>	//	for	fpclassify
+#include	<iomanip>	//	for	setprecision
+#include	<string.h>
+#include	<sstream>
+
+#include	"trick/VariableReference.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/wcs_ext.h"
+#include	"trick/map_trick_units_to_udunits.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/UdUnits.hh"
+#include	"trick/bitfield_proto.h"
+#include	"trick/trick_byteswap.h"
+
+
+//	Static	variables	to	be	addresses	that	are	known	to	be	the	error	ref	address
+int	Trick::VariableReference::_bad_ref_int	=	0	;
+int	Trick::VariableReference::_do_not_resolve_bad_ref_int	=	0	;
+
+REF2*	Trick::VariableReference::make_error_ref(std::string	in_name)	{
+				REF2*	new_ref;
+				new_ref	=	(REF2*)calloc(1,	sizeof(REF2));
+				new_ref->reference	=	strdup(in_name.c_str())	;
+				new_ref->units	=	NULL	;
+				new_ref->address	=	(char	*)&_bad_ref_int	;
+				new_ref->attr	=	(ATTRIBUTES*)calloc(1,	sizeof(ATTRIBUTES))	;
+				new_ref->attr->type	=	TRICK_NUMBER_OF_TYPES	;
+				new_ref->attr->units	=	(char	*)"--"	;
+				new_ref->attr->size	=	sizeof(int)	;
+				return	new_ref;
 }
 
-REF2* Trick::VariableReference::make_do_not_resolve_ref(std::string in_name) {
-    REF2* new_ref;
-    new_ref = (REF2*)calloc(1, sizeof(REF2));
-    new_ref->reference = strdup(in_name.c_str()) ;
-    new_ref->units = NULL ;
-    new_ref->address = (char *)&_do_not_resolve_bad_ref_int ;
-    new_ref->attr = (ATTRIBUTES*)calloc(1, sizeof(ATTRIBUTES)) ;
-    new_ref->attr->type = TRICK_NUMBER_OF_TYPES ;
-    new_ref->attr->units = (char *)"--" ;
-    new_ref->attr->size = sizeof(int) ;
-    return new_ref;
+REF2*	Trick::VariableReference::make_do_not_resolve_ref(std::string	in_name)	{
+				REF2*	new_ref;
+				new_ref	=	(REF2*)calloc(1,	sizeof(REF2));
+				new_ref->reference	=	strdup(in_name.c_str())	;
+				new_ref->units	=	NULL	;
+				new_ref->address	=	(char	*)&_do_not_resolve_bad_ref_int	;
+				new_ref->attr	=	(ATTRIBUTES*)calloc(1,	sizeof(ATTRIBUTES))	;
+				new_ref->attr->type	=	TRICK_NUMBER_OF_TYPES	;
+				new_ref->attr->units	=	(char	*)"--"	;
+				new_ref->attr->size	=	sizeof(int)	;
+				return	new_ref;
 }
 
-// Helper function to deal with time variable
-REF2* make_time_ref(double * time) {
-    REF2* new_ref;
-    new_ref = (REF2*)calloc(1, sizeof(REF2));
-    new_ref->reference = strdup("time") ;
-    new_ref->units = strdup("s") ;
-    new_ref->address = (char *)time ;
-    new_ref->attr = (ATTRIBUTES*)calloc(1, sizeof(ATTRIBUTES)) ;
-    new_ref->attr->type = TRICK_DOUBLE ;
-    new_ref->attr->units = strdup("s") ;
-    new_ref->attr->size = sizeof(double) ;
-    return new_ref;
+//	Helper	function	to	deal	with	time	variable
+REF2*	make_time_ref(double	*	time)	{
+				REF2*	new_ref;
+				new_ref	=	(REF2*)calloc(1,	sizeof(REF2));
+				new_ref->reference	=	strdup("time")	;
+				new_ref->units	=	strdup("s")	;
+				new_ref->address	=	(char	*)time	;
+				new_ref->attr	=	(ATTRIBUTES*)calloc(1,	sizeof(ATTRIBUTES))	;
+				new_ref->attr->type	=	TRICK_DOUBLE	;
+				new_ref->attr->units	=	strdup("s")	;
+				new_ref->attr->size	=	sizeof(double)	;
+				return	new_ref;
 }
 
-Trick::VariableReference::VariableReference(std::string var_name, double* time) : _staged(false), _write_ready(false) {
-    if (var_name != "time") {
-        ASSERT(0);
-    }
+Trick::VariableReference::VariableReference(std::string	var_name,	double*	time)	:	_staged(false),	_write_ready(false)	{
+				if	(var_name	!=	"time")	{
+								ASSERT(0);
+				}
 
-    _var_info = make_time_ref(time);
+				_var_info	=	make_time_ref(time);
 
-    // Set up member variables
-    _address = _var_info->address;
-    _size = _var_info->attr->size ;
-    _deref = false;
+				//	Set	up	member	variables
+				_address	=	_var_info->address;
+				_size	=	_var_info->attr->size	;
+				_deref	=	false;
 
-    // Deal with weirdness around string vs wstring
-    _trick_type = _var_info->attr->type ;
+				//	Deal	with	weirdness	around	string	vs	wstring
+				_trick_type	=	_var_info->attr->type	;
 
-    // Allocate stage and write buffers
-    _stage_buffer = calloc(_size, 1) ;
-    _write_buffer = calloc(_size, 1) ;
+				//	Allocate	stage	and	write	buffers
+				_stage_buffer	=	calloc(_size,	1)	;
+				_write_buffer	=	calloc(_size,	1)	;
 
-    _conversion_factor = cv_get_trivial();
-    _base_units = _var_info->attr->units;
-    _requested_units = "s";
-    _name = _var_info->reference;
+				_conversion_factor	=	cv_get_trivial();
+				_base_units	=	_var_info->attr->units;
+				_requested_units	=	"s";
+				_name	=	_var_info->reference;
 }
 
-Trick::VariableReference::VariableReference(std::string var_name) : _staged(false), _write_ready(false) {
-
-    if (var_name == "time") {
-        ASSERT(0);
-    } else {
-        // get variable attributes from memory manager
-        _var_info = ref_attributes(var_name.c_str());
-    }
-
-    // Handle error cases
-    if ( _var_info == NULL ) {
-        // TODO: ERROR LOGGER sendErrorMessage("Variable Server could not find variable %s.\n", var_name);
-        // PRINTF IS NOT AN ERROR LOGGER @me
-        message_publish(MSG_ERROR, "Variable Server could not find variable %s.\n", var_name.c_str());
-        _var_info = make_error_ref(var_name);
-    } else if ( _var_info->attr ) {
-        if ( _var_info->attr->type == TRICK_STRUCTURED ) {
-            // sendErrorMessage("Variable Server: var_add cant add \"%s\" because its a composite variable.\n", var_name);
-            message_publish(MSG_ERROR, "Variable Server: var_add cant add \"%s\" because its a composite variable.\n", var_name.c_str());
-
-            free(_var_info);
-            _var_info = make_do_not_resolve_ref(var_name);
-
-        } else if ( _var_info->attr->type == TRICK_STL ) {
-            // sendErrorMessage("Variable Server: var_add cant add \"%s\" because its an STL variable.\n", var_name);
-            message_publish(MSG_ERROR,"Variable Server: var_add cant add \"%s\" because its an STL variable.\n", var_name.c_str());
-
-            free(_var_info);
-            _var_info = make_do_not_resolve_ref(var_name);
-        }
-    } else {
-        // sendErrorMessage("Variable Server: BAD MOJO - Missing ATTRIBUTES.");
-        message_publish(MSG_ERROR, "Variable Server: BAD MOJO - Missing ATTRIBUTES.");
-
-        free(_var_info);
-        _var_info = make_error_ref(var_name);
-    }
-
-    // Set up member variables
-    _var_info->units = NULL;
-    _address = _var_info->address;
-    _size = _var_info->attr->size ;
-    _deref = false;
-
-    // Deal with weirdness around string vs wstring
-    _trick_type = _var_info->attr->type ;
-
-    if ( _var_info->num_index == _var_info->attr->num_index ) {
-        // single value - nothing else necessary
-    } else if ( _var_info->attr->index[_var_info->attr->num_index - 1].size != 0 ) {
-        // Constrained array
-        for ( int i = _var_info->attr->num_index-1;  i > _var_info->num_index-1 ; i-- ) {
-            _size *= _var_info->attr->index[i].size ;
-        }
-    } else {
-        // Unconstrained array
-        if ((_var_info->attr->num_index - _var_info->num_index) > 1 ) {
-            message_publish(MSG_ERROR, "Variable Server Error: var_add(%s) requests more than one dimension of dynamic array.\n", _var_info->reference);
-            message_publish(MSG_ERROR, "Data is not contiguous so returned values are unpredictable.\n") ;
-        }
-        if ( _var_info->attr->type == TRICK_CHARACTER ) {
-            _trick_type = TRICK_STRING ;
-            _deref = true;
-        } else if ( _var_info->attr->type == TRICK_WCHAR ) {
-            _trick_type = TRICK_WSTRING ;
-            _deref = true;
-        } else {
-            _deref = true ;
-            _size *= get_size((char*)_address) ;
-        }
-    }
-    // handle strings: set a max buffer size, the copy size may vary so will be set in copy_sim_data
-    if (( _trick_type == TRICK_STRING ) || ( _trick_type == TRICK_WSTRING )) {
-        _size = MAX_ARRAY_LENGTH ;
-    }
-
-    // Allocate stage and write buffers
-    _stage_buffer = calloc(_size, 1) ;
-    _write_buffer = calloc(_size, 1) ;
-
-    _conversion_factor = cv_get_trivial();
-    _base_units = _var_info->attr->units;
-    _requested_units = "";
-    _name = _var_info->reference;
-
-    // Done!
+Trick::VariableReference::VariableReference(std::string	var_name)	:	_staged(false),	_write_ready(false)	{
+
+				if	(var_name	==	"time")	{
+								ASSERT(0);
+				}	else	{
+								//	get	variable	attributes	from	memory	manager
+								_var_info	=	ref_attributes(var_name.c_str());
+				}
+
+				//	Handle	error	cases
+				if	(	_var_info	==	NULL	)	{
+								//	TODO:	ERROR	LOGGER	sendErrorMessage("Variable	Server	could	not	find	variable	%s.\n",	var_name);
+								//	PRINTF	IS	NOT	AN	ERROR	LOGGER	@me
+								message_publish(MSG_ERROR,	"Variable	Server	could	not	find	variable	%s.\n",	var_name.c_str());
+								_var_info	=	make_error_ref(var_name);
+				}	else	if	(	_var_info->attr	)	{
+								if	(	_var_info->attr->type	==	TRICK_STRUCTURED	)	{
+												//	sendErrorMessage("Variable	Server:	var_add	cant	add	\"%s\"	because	its	a	composite	variable.\n",	var_name);
+												message_publish(MSG_ERROR,	"Variable	Server:	var_add	cant	add	\"%s\"	because	its	a	composite	variable.\n",	var_name.c_str());
+
+												free(_var_info);
+												_var_info	=	make_do_not_resolve_ref(var_name);
+
+								}	else	if	(	_var_info->attr->type	==	TRICK_STL	)	{
+												//	sendErrorMessage("Variable	Server:	var_add	cant	add	\"%s\"	because	its	an	STL	variable.\n",	var_name);
+												message_publish(MSG_ERROR,"Variable	Server:	var_add	cant	add	\"%s\"	because	its	an	STL	variable.\n",	var_name.c_str());
+
+												free(_var_info);
+												_var_info	=	make_do_not_resolve_ref(var_name);
+								}
+				}	else	{
+								//	sendErrorMessage("Variable	Server:	BAD	MOJO	-	Missing	ATTRIBUTES.");
+								message_publish(MSG_ERROR,	"Variable	Server:	BAD	MOJO	-	Missing	ATTRIBUTES.");
+
+								free(_var_info);
+								_var_info	=	make_error_ref(var_name);
+				}
+
+				//	Set	up	member	variables
+				_var_info->units	=	NULL;
+				_address	=	_var_info->address;
+				_size	=	_var_info->attr->size	;
+				_deref	=	false;
+
+				//	Deal	with	weirdness	around	string	vs	wstring
+				_trick_type	=	_var_info->attr->type	;
+
+				if	(	_var_info->num_index	==	_var_info->attr->num_index	)	{
+								//	single	value	-	nothing	else	necessary
+				}	else	if	(	_var_info->attr->index[_var_info->attr->num_index	-	1].size	!=	0	)	{
+								//	Constrained	array
+								for	(	int	i	=	_var_info->attr->num_index-1;		i	>	_var_info->num_index-1	;	i--	)	{
+												_size	*=	_var_info->attr->index[i].size	;
+								}
+				}	else	{
+								//	Unconstrained	array
+								if	((_var_info->attr->num_index	-	_var_info->num_index)	>	1	)	{
+												message_publish(MSG_ERROR,	"Variable	Server	Error:	var_add(%s)	requests	more	than	one	dimension	of	dynamic	array.\n",	_var_info->reference);
+												message_publish(MSG_ERROR,	"Data	is	not	contiguous	so	returned	values	are	unpredictable.\n")	;
+								}
+								if	(	_var_info->attr->type	==	TRICK_CHARACTER	)	{
+												_trick_type	=	TRICK_STRING	;
+												_deref	=	true;
+								}	else	if	(	_var_info->attr->type	==	TRICK_WCHAR	)	{
+												_trick_type	=	TRICK_WSTRING	;
+												_deref	=	true;
+								}	else	{
+												_deref	=	true	;
+												_size	*=	get_size((char*)_address)	;
+								}
+				}
+				//	handle	strings:	set	a	max	buffer	size,	the	copy	size	may	vary	so	will	be	set	in	copy_sim_data
+				if	((	_trick_type	==	TRICK_STRING	)	||	(	_trick_type	==	TRICK_WSTRING	))	{
+								_size	=	MAX_ARRAY_LENGTH	;
+				}
+
+				//	Allocate	stage	and	write	buffers
+				_stage_buffer	=	calloc(_size,	1)	;
+				_write_buffer	=	calloc(_size,	1)	;
+
+				_conversion_factor	=	cv_get_trivial();
+				_base_units	=	_var_info->attr->units;
+				_requested_units	=	"";
+				_name	=	_var_info->reference;
+
+				//	Done!
 }
 
-Trick::VariableReference::~VariableReference() {
-    if (_var_info != NULL) {
-        free( _var_info );
-        _var_info = NULL;
-    }
-    if (_stage_buffer != NULL) {
-        free (_stage_buffer);
-        _stage_buffer = NULL;
-    }
-    if (_write_buffer != NULL) {
-        free (_write_buffer);
-        _write_buffer = NULL;
-    }
-    if (_conversion_factor != NULL) {
-        cv_free(_conversion_factor);
-    }
+Trick::VariableReference::~VariableReference()	{
+				if	(_var_info	!=	NULL)	{
+								free(	_var_info	);
+								_var_info	=	NULL;
+				}
+				if	(_stage_buffer	!=	NULL)	{
+								free	(_stage_buffer);
+								_stage_buffer	=	NULL;
+				}
+				if	(_write_buffer	!=	NULL)	{
+								free	(_write_buffer);
+								_write_buffer	=	NULL;
+				}
+				if	(_conversion_factor	!=	NULL)	{
+								cv_free(_conversion_factor);
+				}
 }
 
-std::string Trick::VariableReference::getName() const {
-    return _name;
+std::string	Trick::VariableReference::getName()	const	{
+				return	_name;
 }
 
-int Trick::VariableReference::getSizeBinary() const {
-    return _size;
+int	Trick::VariableReference::getSizeBinary()	const	{
+				return	_size;
 }
 
-TRICK_TYPE Trick::VariableReference::getType() const {
-    return _trick_type;
+TRICK_TYPE	Trick::VariableReference::getType()	const	{
+				return	_trick_type;
 }
 
-std::string Trick::VariableReference::getBaseUnits() const {
-    return _base_units;
+std::string	Trick::VariableReference::getBaseUnits()	const	{
+				return	_base_units;
 }
 
-int Trick::VariableReference::setRequestedUnits(std::string units_name) {
-    // Some error logging lambdas - these should probably go somewhere else
-    // But I do kinda like them
-    auto publish = [](MESSAGE_TYPE type, const std::string& message) {
-        std::ostringstream oss;
-        oss << "Variable Server: " << message << std::endl;
-        message_publish(type, oss.str().c_str());
-    };
-
-    auto publishError = [&](const std::string& units) {
-        std::ostringstream oss;
-        oss << "units error for [" << getName() << "] [" << units << "]";
-        publish(MSG_ERROR, oss.str());
-    };
-
-    // If the units_name parameter is "xx", set it to the current units.
-    if (!units_name.compare("xx")) {
-        units_name = getBaseUnits();
-    }
-
-    // if unitless ('--') then do not convert to udunits 
-    if(units_name.compare("--")) {
-        // Check to see if this is an old style Trick unit that needs to be converted to new udunits
-        std::string new_units = map_trick_units_to_udunits(units_name) ;
-        // Warn if a conversion has taken place
-        if ( units_name.compare(new_units) ) {
-            // TODO: MAKE BETTER SYSTEM FOR ERROR LOGGING
-            std::ostringstream oss;
-            oss << "[" << getName() << "] old-style units converted from ["
-                << units_name << "] to [" << new_units << "]";
-            publish(MSG_WARNING, oss.str());
-        }
-
-        // Interpret base unit
-        ut_unit * from = ut_parse(Trick::UdUnits::get_u_system(), getBaseUnits().c_str(), UT_ASCII) ;
-        if ( !from ) {
-            std::cout << "Error in interpreting base units" << std::endl;
-            publishError(getBaseUnits());
-            ut_free(from) ;
-            return -1 ;
-        }
-
-        // Interpret requested unit
-        ut_unit * to = ut_parse(Trick::UdUnits::get_u_system(), new_units.c_str(), UT_ASCII) ;
-        if ( !to ) {
-            std::cout << "Error in interpreting requested units" << std::endl;
-            publishError(new_units);
-            ut_free(from) ;
-            ut_free(to) ;
-            return -1 ;
-        }
-
-        // Create a converter from the base to the requested
-        auto new_conversion_factor = ut_get_converter(from, to) ;
-        ut_free(from) ;
-        ut_free(to) ;
-        if ( !new_conversion_factor ) {
-            std::ostringstream oss;
-            oss << "[" << getName() << "] cannot convert units from [" << getBaseUnits()
-                << "] to [" << new_units << "]";
-            publish(MSG_ERROR, oss.str());
-            return -1 ;
-        } else {
-            _conversion_factor = new_conversion_factor;
-        }
-    
-        // Set the requested units. This will cause the unit string to be printed in write_value_ascii
-        _requested_units = new_units;
-    }
-    return 0;
+int	Trick::VariableReference::setRequestedUnits(std::string	units_name)	{
+				//	Some	error	logging	lambdas	-	these	should	probably	go	somewhere	else
+				//	But	I	do	kinda	like	them
+				auto	publish	=	[](MESSAGE_TYPE	type,	const	std::string&	message)	{
+								std::ostringstream	oss;
+								oss	<<	"Variable	Server:	"	<<	message	<<	std::endl;
+								message_publish(type,	oss.str().c_str());
+				};
+
+				auto	publishError	=	[&](const	std::string&	units)	{
+								std::ostringstream	oss;
+								oss	<<	"units	error	for	["	<<	getName()	<<	"]	["	<<	units	<<	"]";
+								publish(MSG_ERROR,	oss.str());
+				};
+
+				//	If	the	units_name	parameter	is	"xx",	set	it	to	the	current	units.
+				if	(!units_name.compare("xx"))	{
+								units_name	=	getBaseUnits();
+				}
+
+				//	if	unitless	('--')	then	do	not	convert	to	udunits	
+				if(units_name.compare("--"))	{
+								//	Check	to	see	if	this	is	an	old	style	Trick	unit	that	needs	to	be	converted	to	new	udunits
+								std::string	new_units	=	map_trick_units_to_udunits(units_name)	;
+								//	Warn	if	a	conversion	has	taken	place
+								if	(	units_name.compare(new_units)	)	{
+												//	TODO:	MAKE	BETTER	SYSTEM	FOR	ERROR	LOGGING
+												std::ostringstream	oss;
+												oss	<<	"["	<<	getName()	<<	"]	old-style	units	converted	from	["
+																<<	units_name	<<	"]	to	["	<<	new_units	<<	"]";
+												publish(MSG_WARNING,	oss.str());
+								}
+
+								//	Interpret	base	unit
+								ut_unit	*	from	=	ut_parse(Trick::UdUnits::get_u_system(),	getBaseUnits().c_str(),	UT_ASCII)	;
+								if	(	!from	)	{
+												std::cout	<<	"Error	in	interpreting	base	units"	<<	std::endl;
+												publishError(getBaseUnits());
+												ut_free(from)	;
+												return	-1	;
+								}
+
+								//	Interpret	requested	unit
+								ut_unit	*	to	=	ut_parse(Trick::UdUnits::get_u_system(),	new_units.c_str(),	UT_ASCII)	;
+								if	(	!to	)	{
+												std::cout	<<	"Error	in	interpreting	requested	units"	<<	std::endl;
+												publishError(new_units);
+												ut_free(from)	;
+												ut_free(to)	;
+												return	-1	;
+								}
+
+								//	Create	a	converter	from	the	base	to	the	requested
+								auto	new_conversion_factor	=	ut_get_converter(from,	to)	;
+								ut_free(from)	;
+								ut_free(to)	;
+								if	(	!new_conversion_factor	)	{
+												std::ostringstream	oss;
+												oss	<<	"["	<<	getName()	<<	"]	cannot	convert	units	from	["	<<	getBaseUnits()
+																<<	"]	to	["	<<	new_units	<<	"]";
+												publish(MSG_ERROR,	oss.str());
+												return	-1	;
+								}	else	{
+												_conversion_factor	=	new_conversion_factor;
+								}
+				
+								//	Set	the	requested	units.	This	will	cause	the	unit	string	to	be	printed	in	write_value_ascii
+								_requested_units	=	new_units;
+				}
+				return	0;
 }
 
-int Trick::VariableReference::stageValue(bool validate_address) {
-    _write_ready = false;
-
-    // Copy <size> bytes from <address> to staging_point.
-
-    // Try to recreate connection if it has been broken
-    if (_var_info->address == &_bad_ref_int) {
-        REF2 *new_ref = ref_attributes(_var_info->reference);
-        if (new_ref != NULL) {
-            _var_info = new_ref;
-            _address = _var_info->address;
-            // _requested_units = "";
-        }
-    }
-
-    // if there's a pointer somewhere in the address path, follow it in case pointer changed
-    if ( _var_info->pointer_present == 1 ) {
-        _address = follow_address_path(_var_info) ;
-        if (_address == NULL) {
-            tagAsInvalid();
-        } else if ( validate_address ) {
-            validate();
-        } else {
-            _var_info->address = _address ;
-        }
-    }
-
-    // if this variable is a string we need to get the raw character string out of it.
-    if (( _trick_type == TRICK_STRING ) && !_deref) {
-        std::string * str_ptr = (std::string *)_var_info->address ;
-        // Get a pointer to the internal character array
-        _address = (void *)(str_ptr->c_str()) ;
-    }
-
-    // if this variable itself is a pointer, dereference it
-    if ( _deref ) {
-        _address = *(void**)_var_info->address ;
-    }
-
-    // handle c++ string and char*
-    if ( _trick_type == TRICK_STRING ) {
-        if (_address == NULL) {
-            _size = 0 ;
-        } else {
-            _size = strlen((char*)_address) + 1 ;
-        }
-    }
-    // handle c++ wstring and wchar_t*
-    if ( _trick_type == TRICK_WSTRING ) {
-        if (_address == NULL) {
-            _size = 0 ;
-        } else {
-            _size = wcslen((wchar_t *)_address) * sizeof(wchar_t);
-        }
-    }
-    if(_address != NULL) {
-        memcpy( _stage_buffer , _address , _size ) ;
-    }
-
-    _staged = true;
-    return 0;
+int	Trick::VariableReference::stageValue(bool	validate_address)	{
+				_write_ready	=	false;
+
+				//	Copy	<size>	bytes	from	<address>	to	staging_point.
+
+				//	Try	to	recreate	connection	if	it	has	been	broken
+				if	(_var_info->address	==	&_bad_ref_int)	{
+								REF2	*new_ref	=	ref_attributes(_var_info->reference);
+								if	(new_ref	!=	NULL)	{
+												_var_info	=	new_ref;
+												_address	=	_var_info->address;
+												//	_requested_units	=	"";
+								}
+				}
+
+				//	if	there's	a	pointer	somewhere	in	the	address	path,	follow	it	in	case	pointer	changed
+				if	(	_var_info->pointer_present	==	1	)	{
+								_address	=	follow_address_path(_var_info)	;
+								if	(_address	==	NULL)	{
+												tagAsInvalid();
+								}	else	if	(	validate_address	)	{
+												validate();
+								}	else	{
+												_var_info->address	=	_address	;
+								}
+				}
+
+				//	if	this	variable	is	a	string	we	need	to	get	the	raw	character	string	out	of	it.
+				if	((	_trick_type	==	TRICK_STRING	)	&&	!_deref)	{
+								std::string	*	str_ptr	=	(std::string	*)_var_info->address	;
+								//	Get	a	pointer	to	the	internal	character	array
+								_address	=	(void	*)(str_ptr->c_str())	;
+				}
+
+				//	if	this	variable	itself	is	a	pointer,	dereference	it
+				if	(	_deref	)	{
+								_address	=	*(void**)_var_info->address	;
+				}
+
+				//	handle	c++	string	and	char*
+				if	(	_trick_type	==	TRICK_STRING	)	{
+								if	(_address	==	NULL)	{
+												_size	=	0	;
+								}	else	{
+												_size	=	strlen((char*)_address)	+	1	;
+								}
+				}
+				//	handle	c++	wstring	and	wchar_t*
+				if	(	_trick_type	==	TRICK_WSTRING	)	{
+								if	(_address	==	NULL)	{
+												_size	=	0	;
+								}	else	{
+												_size	=	wcslen((wchar_t	*)_address)	*	sizeof(wchar_t);
+								}
+				}
+				if(_address	!=	NULL)	{
+								memcpy(	_stage_buffer	,	_address	,	_size	)	;
+				}
+
+				_staged	=	true;
+				return	0;
 }
 
-bool Trick::VariableReference::validate() {
-    // The address is not NULL.
-    // Should be called by VariableServer Session if validateAddress is on.
-    // check the memory manager if the address falls into
-    // any of the memory blocks it knows of.  Don't do this if we have a std::string or
-    // wstring type, or we already are pointing to a bad ref.
-    if ( (_trick_type != TRICK_STRING) and
-            (_trick_type != TRICK_WSTRING) and
-            (_var_info->address != &_bad_ref_int) and
-            (get_alloc_info_of(_address) == NULL) ) {
-        
-        // This variable is broken, make it into an error ref
-        tagAsInvalid();
-        return false;
-    }
-
-    // Everything is fine
-    return true;
+bool	Trick::VariableReference::validate()	{
+				//	The	address	is	not	NULL.
+				//	Should	be	called	by	VariableServer	Session	if	validateAddress	is	on.
+				//	check	the	memory	manager	if	the	address	falls	into
+				//	any	of	the	memory	blocks	it	knows	of.		Don't	do	this	if	we	have	a	std::string	or
+				//	wstring	type,	or	we	already	are	pointing	to	a	bad	ref.
+				if	(	(_trick_type	!=	TRICK_STRING)	and
+												(_trick_type	!=	TRICK_WSTRING)	and
+												(_var_info->address	!=	&_bad_ref_int)	and
+												(get_alloc_info_of(_address)	==	NULL)	)	{
+								
+								//	This	variable	is	broken,	make	it	into	an	error	ref
+								tagAsInvalid();
+								return	false;
+				}
+
+				//	Everything	is	fine
+				return	true;
 }
 
-static void write_escaped_string( std::ostream& os, const char* s) {
-    for (int ii=0 ; ii<strlen(s) ; ii++) {
-        if (isprint(s[ii])) {
-            os << s[ii];
-        } else {
-            switch ((s)[ii]) {
-                case '\n': os << "\\n"; break;
-                case '\t': os << "\\t"; break;
-                case '\b': os << "\\b"; break;
-                case '\a': os << "\\a"; break;
-                case '\f': os << "\\f"; break;
-                case '\r': os << "\\n"; break;
-                case '\v': os << "\\v"; break;
-                case '\"': os << "\\\""; break;
-                default  : {
-                    // Replicating behavior from original vs_format_ascii
-                    char temp_s[6];
-                    sprintf(temp_s, "\\x%02x", s[ii]);
-                    os << temp_s ; 
-                    break;
-                }
-            }
-        }
-    }
+static	void	write_escaped_string(	std::ostream&	os,	const	char*	s)	{
+				for	(int	ii=0	;	ii<strlen(s)	;	ii++)	{
+								if	(isprint(s[ii]))	{
+												os	<<	s[ii];
+								}	else	{
+												switch	((s)[ii])	{
+																case	'\n':	os	<<	"\\n";	break;
+																case	'\t':	os	<<	"\\t";	break;
+																case	'\b':	os	<<	"\\b";	break;
+																case	'\a':	os	<<	"\\a";	break;
+																case	'\f':	os	<<	"\\f";	break;
+																case	'\r':	os	<<	"\\n";	break;
+																case	'\v':	os	<<	"\\v";	break;
+																case	'\"':	os	<<	"\\\"";	break;
+																default		:	{
+																				//	Replicating	behavior	from	original	vs_format_ascii
+																				char	temp_s[6];
+																				sprintf(temp_s,	"\\x%02x",	s[ii]);
+																				os	<<	temp_s	;	
+																				break;
+																}
+												}
+								}
+				}
 }
 
-int Trick::VariableReference::getSizeAscii() const {
-    std::stringstream ss;
-    writeValueAscii(ss);
-    return ss.str().length();
+int	Trick::VariableReference::getSizeAscii()	const	{
+				std::stringstream	ss;
+				writeValueAscii(ss);
+				return	ss.str().length();
 }
 
 
-int Trick::VariableReference::writeValueAscii( std::ostream& out ) const {
-    // This is copied and modified from vs_format_ascii
-
-    if (!isWriteReady()) {
-        return -1;
-    }
-
-    int bytes_written = 0;
-    void * buf_ptr = _write_buffer ;
-    while (bytes_written < _size) {
-        bytes_written += _var_info->attr->size ;
-
-        switch (_trick_type) {
-
-        case TRICK_CHARACTER:
-            if (_var_info->attr->num_index == _var_info->num_index) {
-                // Single char
-                out << (int)cv_convert_double(_conversion_factor, *(char *)buf_ptr);
-            } else {
-                // All but last dim specified, leaves a char array 
-                write_escaped_string(out, (const char *) buf_ptr);
-                bytes_written = _size ;
-            }
-            break;
-        case TRICK_UNSIGNED_CHARACTER:
-            if (_var_info->attr->num_index == _var_info->num_index) {
-                // Single char
-                out << (unsigned int)cv_convert_double(_conversion_factor,*(unsigned char *)buf_ptr);
-            } else {
-                // All but last dim specified, leaves a char array 
-                write_escaped_string(out, (const char *) buf_ptr);
-                bytes_written = _size ;
-            }
-            break;
-
-        case TRICK_WCHAR:{
-                if (_var_info->attr->num_index == _var_info->num_index) {
-                    out << *(wchar_t *) buf_ptr;
-                } else {
-                    // convert wide char string char string
-                    size_t len = wcs_to_ncs_len((wchar_t *)buf_ptr) + 1 ;
-
-                    char temp_buf[len];
-                    wcs_to_ncs((wchar_t *) buf_ptr, temp_buf, len);
-                    out << temp_buf;
-                    bytes_written = _size ;
-                }
-            }
-            break;
-
-        case TRICK_STRING:
-            if ((char *) buf_ptr != NULL) {
-                write_escaped_string(out, (const char *) buf_ptr);
-                bytes_written = _size ;
-            } else {
-                out << '\0';
-            }
-            break;
-
-        case TRICK_WSTRING:
-            if ((wchar_t *) buf_ptr != NULL) {
-                // convert wide char string char string
-                size_t len = wcs_to_ncs_len( (wchar_t *)buf_ptr) + 1 ;
-
-                char temp_buf[len];
-                wcs_to_ncs(  (wchar_t *) buf_ptr, temp_buf, len);
-                out << temp_buf;
-                bytes_written = _size ;
-            } else {
-                out << '\0';
-            }
-            break;
-        case TRICK_SHORT:
-            out << (short)cv_convert_double(_conversion_factor,*(short *)buf_ptr);
-            break;
-
-        case TRICK_UNSIGNED_SHORT:
-            out << (unsigned short)cv_convert_double(_conversion_factor,*(unsigned short *)buf_ptr);
-            break;
-
-        case TRICK_INTEGER:
-        case TRICK_ENUMERATED:
-            out << (int)cv_convert_double(_conversion_factor,*(int *)buf_ptr);
-            break;
-
-        case TRICK_BOOLEAN:
-            out << (int)cv_convert_double(_conversion_factor,*(bool *)buf_ptr);
-            break;
-
-        case TRICK_BITFIELD:
-            out << (GET_BITFIELD(buf_ptr, _var_info->attr->size, _var_info->attr->index[0].start, _var_info->attr->index[0].size));
-            break;
-
-        case TRICK_UNSIGNED_BITFIELD:
-            out << (GET_UNSIGNED_BITFIELD(buf_ptr, _var_info->attr->size, _var_info->attr->index[0].start, _var_info->attr->index[0].size));
-            break;
-            
-        case TRICK_UNSIGNED_INTEGER:
-            out << (unsigned int)cv_convert_double(_conversion_factor,*(unsigned int *)buf_ptr);
-            break;
-
-        case TRICK_LONG: {
-            long l = *(long *)buf_ptr;
-            if (_conversion_factor != cv_get_trivial()) {
-                l = (long)cv_convert_double(_conversion_factor, l);
-            }
-            out << l;
-            break;
-        }
-
-        case TRICK_UNSIGNED_LONG: {
-            unsigned long ul = *(unsigned long *)buf_ptr;
-            if (_conversion_factor != cv_get_trivial()) {
-                ul = (unsigned long)cv_convert_double(_conversion_factor, ul);
-            }
-            out << ul;
-            break;
-        }
-
-        case TRICK_FLOAT:
-            out << std::setprecision(8) << cv_convert_float(_conversion_factor,*(float *)buf_ptr);
-            break;
-
-        case TRICK_DOUBLE:
-            out << std::setprecision(16) << cv_convert_double(_conversion_factor,*(double *)buf_ptr);
-            break;
-
-        case TRICK_LONG_LONG: {
-            long long ll = *(long long *)buf_ptr;
-            if (_conversion_factor != cv_get_trivial()) {
-                ll = (long long)cv_convert_double(_conversion_factor, ll);
-            }
-            out << ll;
-            break;
-        }
-
-        case TRICK_UNSIGNED_LONG_LONG: {
-            unsigned long long ull = *(unsigned long long *)buf_ptr;
-            if (_conversion_factor != cv_get_trivial()) {
-                ull = (unsigned long long)cv_convert_double(_conversion_factor, ull);
-            }
-            out << ull;
-            break;
-        }
-
-        case TRICK_NUMBER_OF_TYPES:
-            out << "BAD_REF";
-            break;
-
-        default:{
-
-            break;
-        }
-        } // end switch
-
-        if (bytes_written < _size) {
-        // if returning an array, continue array as comma separated values
-            out << ",";
-            buf_ptr = (void*) ((long)buf_ptr + _var_info->attr->size) ;
-        }
-    } //end while
-
-    if (_requested_units != "") {
-        if ( _var_info->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
-            out << " {--}";
-        } else {
-            out << " {" << _requested_units << "}";
-        }
-    }
-
-    return 0;
+int	Trick::VariableReference::writeValueAscii(	std::ostream&	out	)	const	{
+				//	This	is	copied	and	modified	from	vs_format_ascii
+
+				if	(!isWriteReady())	{
+								return	-1;
+				}
+
+				int	bytes_written	=	0;
+				void	*	buf_ptr	=	_write_buffer	;
+				while	(bytes_written	<	_size)	{
+								bytes_written	+=	_var_info->attr->size	;
+
+								switch	(_trick_type)	{
+
+								case	TRICK_CHARACTER:
+												if	(_var_info->attr->num_index	==	_var_info->num_index)	{
+																//	Single	char
+																out	<<	(int)cv_convert_double(_conversion_factor,	*(char	*)buf_ptr);
+												}	else	{
+																//	All	but	last	dim	specified,	leaves	a	char	array	
+																write_escaped_string(out,	(const	char	*)	buf_ptr);
+																bytes_written	=	_size	;
+												}
+												break;
+								case	TRICK_UNSIGNED_CHARACTER:
+												if	(_var_info->attr->num_index	==	_var_info->num_index)	{
+																//	Single	char
+																out	<<	(unsigned	int)cv_convert_double(_conversion_factor,*(unsigned	char	*)buf_ptr);
+												}	else	{
+																//	All	but	last	dim	specified,	leaves	a	char	array	
+																write_escaped_string(out,	(const	char	*)	buf_ptr);
+																bytes_written	=	_size	;
+												}
+												break;
+
+								case	TRICK_WCHAR:{
+																if	(_var_info->attr->num_index	==	_var_info->num_index)	{
+																				out	<<	*(wchar_t	*)	buf_ptr;
+																}	else	{
+																				//	convert	wide	char	string	char	string
+																				size_t	len	=	wcs_to_ncs_len((wchar_t	*)buf_ptr)	+	1	;
+
+																				char	temp_buf[len];
+																				wcs_to_ncs((wchar_t	*)	buf_ptr,	temp_buf,	len);
+																				out	<<	temp_buf;
+																				bytes_written	=	_size	;
+																}
+												}
+												break;
+
+								case	TRICK_STRING:
+												if	((char	*)	buf_ptr	!=	NULL)	{
+																write_escaped_string(out,	(const	char	*)	buf_ptr);
+																bytes_written	=	_size	;
+												}	else	{
+																out	<<	'\0';
+												}
+												break;
+
+								case	TRICK_WSTRING:
+												if	((wchar_t	*)	buf_ptr	!=	NULL)	{
+																//	convert	wide	char	string	char	string
+																size_t	len	=	wcs_to_ncs_len(	(wchar_t	*)buf_ptr)	+	1	;
+
+																char	temp_buf[len];
+																wcs_to_ncs(		(wchar_t	*)	buf_ptr,	temp_buf,	len);
+																out	<<	temp_buf;
+																bytes_written	=	_size	;
+												}	else	{
+																out	<<	'\0';
+												}
+												break;
+								case	TRICK_SHORT:
+												out	<<	(short)cv_convert_double(_conversion_factor,*(short	*)buf_ptr);
+												break;
+
+								case	TRICK_UNSIGNED_SHORT:
+												out	<<	(unsigned	short)cv_convert_double(_conversion_factor,*(unsigned	short	*)buf_ptr);
+												break;
+
+								case	TRICK_INTEGER:
+								case	TRICK_ENUMERATED:
+												out	<<	(int)cv_convert_double(_conversion_factor,*(int	*)buf_ptr);
+												break;
+
+								case	TRICK_BOOLEAN:
+												out	<<	(int)cv_convert_double(_conversion_factor,*(bool	*)buf_ptr);
+												break;
+
+								case	TRICK_BITFIELD:
+												out	<<	(GET_BITFIELD(buf_ptr,	_var_info->attr->size,	_var_info->attr->index[0].start,	_var_info->attr->index[0].size));
+												break;
+
+								case	TRICK_UNSIGNED_BITFIELD:
+												out	<<	(GET_UNSIGNED_BITFIELD(buf_ptr,	_var_info->attr->size,	_var_info->attr->index[0].start,	_var_info->attr->index[0].size));
+												break;
+												
+								case	TRICK_UNSIGNED_INTEGER:
+												out	<<	(unsigned	int)cv_convert_double(_conversion_factor,*(unsigned	int	*)buf_ptr);
+												break;
+
+								case	TRICK_LONG:	{
+												long	l	=	*(long	*)buf_ptr;
+												if	(_conversion_factor	!=	cv_get_trivial())	{
+																l	=	(long)cv_convert_double(_conversion_factor,	l);
+												}
+												out	<<	l;
+												break;
+								}
+
+								case	TRICK_UNSIGNED_LONG:	{
+												unsigned	long	ul	=	*(unsigned	long	*)buf_ptr;
+												if	(_conversion_factor	!=	cv_get_trivial())	{
+																ul	=	(unsigned	long)cv_convert_double(_conversion_factor,	ul);
+												}
+												out	<<	ul;
+												break;
+								}
+
+								case	TRICK_FLOAT:
+												out	<<	std::setprecision(8)	<<	cv_convert_float(_conversion_factor,*(float	*)buf_ptr);
+												break;
+
+								case	TRICK_DOUBLE:
+												out	<<	std::setprecision(16)	<<	cv_convert_double(_conversion_factor,*(double	*)buf_ptr);
+												break;
+
+								case	TRICK_LONG_LONG:	{
+												long	long	ll	=	*(long	long	*)buf_ptr;
+												if	(_conversion_factor	!=	cv_get_trivial())	{
+																ll	=	(long	long)cv_convert_double(_conversion_factor,	ll);
+												}
+												out	<<	ll;
+												break;
+								}
+
+								case	TRICK_UNSIGNED_LONG_LONG:	{
+												unsigned	long	long	ull	=	*(unsigned	long	long	*)buf_ptr;
+												if	(_conversion_factor	!=	cv_get_trivial())	{
+																ull	=	(unsigned	long	long)cv_convert_double(_conversion_factor,	ull);
+												}
+												out	<<	ull;
+												break;
+								}
+
+								case	TRICK_NUMBER_OF_TYPES:
+												out	<<	"BAD_REF";
+												break;
+
+								default:{
+
+												break;
+								}
+								}	//	end	switch
+
+								if	(bytes_written	<	_size)	{
+								//	if	returning	an	array,	continue	array	as	comma	separated	values
+												out	<<	",";
+												buf_ptr	=	(void*)	((long)buf_ptr	+	_var_info->attr->size)	;
+								}
+				}	//end	while
+
+				if	(_requested_units	!=	"")	{
+								if	(	_var_info->attr->mods	&	TRICK_MODS_UNITSDASHDASH	)	{
+												out	<<	"	{--}";
+								}	else	{
+												out	<<	"	{"	<<	_requested_units	<<	"}";
+								}
+				}
+
+				return	0;
 }
 
-void Trick::VariableReference::tagAsInvalid () {
-    std::string save_name(getName()) ;
-    free(_var_info) ;
-    _var_info = make_error_ref(save_name) ;
-    _address = _var_info->address ;
+void	Trick::VariableReference::tagAsInvalid	()	{
+				std::string	save_name(getName())	;
+				free(_var_info)	;
+				_var_info	=	make_error_ref(save_name)	;
+				_address	=	_var_info->address	;
 }
 
 
-int Trick::VariableReference::prepareForWrite() {
-    if (!_staged) {
-        return 1;
-    }
+int	Trick::VariableReference::prepareForWrite()	{
+				if	(!_staged)	{
+								return	1;
+				}
 
-    void * temp_p = _stage_buffer;
-    _stage_buffer = _write_buffer;
-    _write_buffer = temp_p;
+				void	*	temp_p	=	_stage_buffer;
+				_stage_buffer	=	_write_buffer;
+				_write_buffer	=	temp_p;
 
-    _staged = false;
-    _write_ready = true;
-    return 0;
+				_staged	=	false;
+				_write_ready	=	true;
+				return	0;
 }
 
-bool Trick::VariableReference::isStaged() const {
-    return _staged;
+bool	Trick::VariableReference::isStaged()	const	{
+				return	_staged;
 }
 
-bool Trick::VariableReference::isWriteReady() const {
-    return _write_ready;
+bool	Trick::VariableReference::isWriteReady()	const	{
+				return	_write_ready;
 }
 
-int Trick::VariableReference::writeTypeBinary( std::ostream& out, bool byteswap ) const {
-    int local_type = _trick_type;
-    if (byteswap) {
-        local_type = trick_byteswap_int(local_type);
-    }
-    out.write(const_cast<const char *>(reinterpret_cast<char *>(&local_type)), sizeof(int));
+int	Trick::VariableReference::writeTypeBinary(	std::ostream&	out,	bool	byteswap	)	const	{
+				int	local_type	=	_trick_type;
+				if	(byteswap)	{
+								local_type	=	trick_byteswap_int(local_type);
+				}
+				out.write(const_cast<const	char	*>(reinterpret_cast<char	*>(&local_type)),	sizeof(int));
 
-    return 0;
+				return	0;
 }
 
-int Trick::VariableReference::writeSizeBinary( std::ostream& out, bool byteswap ) const {
-    int local_size = _size;
-    if (byteswap) {
-        local_size = trick_byteswap_int(local_size);
-    }
-    out.write(const_cast<const char *>(reinterpret_cast<char *>(&local_size)), sizeof(int));
+int	Trick::VariableReference::writeSizeBinary(	std::ostream&	out,	bool	byteswap	)	const	{
+				int	local_size	=	_size;
+				if	(byteswap)	{
+								local_size	=	trick_byteswap_int(local_size);
+				}
+				out.write(const_cast<const	char	*>(reinterpret_cast<char	*>(&local_size)),	sizeof(int));
 
-    return 0;
+				return	0;
 }
 
-int Trick::VariableReference::writeNameBinary( std::ostream& out, bool byteswap ) const {
-    std::string name = getName();
-    out.write(name.c_str(), name.size());
+int	Trick::VariableReference::writeNameBinary(	std::ostream&	out,	bool	byteswap	)	const	{
+				std::string	name	=	getName();
+				out.write(name.c_str(),	name.size());
 
-    return 0;
+				return	0;
 }
 
-int Trick::VariableReference::writeNameLengthBinary( std::ostream& out, bool byteswap ) const {
-    int name_size = getName().size();
-    if (byteswap) {
-        name_size = trick_byteswap_int(name_size);
-    }
+int	Trick::VariableReference::writeNameLengthBinary(	std::ostream&	out,	bool	byteswap	)	const	{
+				int	name_size	=	getName().size();
+				if	(byteswap)	{
+								name_size	=	trick_byteswap_int(name_size);
+				}
 
-    out.write(const_cast<const char *>(reinterpret_cast<char *>(&name_size)), sizeof(int));
+				out.write(const_cast<const	char	*>(reinterpret_cast<char	*>(&name_size)),	sizeof(int));
 
-    return 0;
+				return	0;
 }
 
 
-void Trick::VariableReference::byteswap_var (char * out, char * in) const {
-    byteswap_var(out, in, *this);
+void	Trick::VariableReference::byteswap_var	(char	*	out,	char	*	in)	const	{
+				byteswap_var(out,	in,	*this);
 }
 
 
-void Trick::VariableReference::byteswap_var (char * out, char * in, const VariableReference& ref) {
-    ATTRIBUTES * attr = ref._var_info->attr;
-    int array_size = 1;
-
-    // Determine how many elements are in this array if it is an array
-    for (int j = 0; j < ref._var_info->attr->num_index; j++) {
-        array_size *= attr->index[j].size;
-    }
-
-    switch (attr->size) {
-        case 1:
-            // If these are just characters, no need to byteswap
-            for (int j = 0; j < array_size; j++) {
-                out[j] = in[j];
-            }
-            break;
-
-        case 2: {
-            short * short_in = reinterpret_cast<short *> (in);
-            short * short_out = reinterpret_cast<short *> (out);
-
-            for (int j = 0; j < array_size; j++) {
-                short_out[j] = trick_byteswap_short(short_in[j]);
-            }
-            break;
-        }
-
-        case 4: {
-            int * int_in = reinterpret_cast<int *> (in);
-            int * int_out = reinterpret_cast<int *> (out);
-
-            for (int j = 0; j < array_size; j++) {
-                int_out[j] = trick_byteswap_int(int_in[j]);
-            }
-            break;
-        }
-        case 8: {
-            // We don't actually care if this is double or long, just that it's the right size
-            double * double_in = reinterpret_cast<double *> (in);
-            double * double_out = reinterpret_cast<double *> (out);
-
-            for (int j = 0; j < array_size; j++) {
-                double_out[j] = trick_byteswap_double(double_in[j]);
-            }
-            break;
-        }
-    }
+void	Trick::VariableReference::byteswap_var	(char	*	out,	char	*	in,	const	VariableReference&	ref)	{
+				ATTRIBUTES	*	attr	=	ref._var_info->attr;
+				int	array_size	=	1;
+
+				//	Determine	how	many	elements	are	in	this	array	if	it	is	an	array
+				for	(int	j	=	0;	j	<	ref._var_info->attr->num_index;	j++)	{
+								array_size	*=	attr->index[j].size;
+				}
+
+				switch	(attr->size)	{
+								case	1:
+												//	If	these	are	just	characters,	no	need	to	byteswap
+												for	(int	j	=	0;	j	<	array_size;	j++)	{
+																out[j]	=	in[j];
+												}
+												break;
+
+								case	2:	{
+												short	*	short_in	=	reinterpret_cast<short	*>	(in);
+												short	*	short_out	=	reinterpret_cast<short	*>	(out);
+
+												for	(int	j	=	0;	j	<	array_size;	j++)	{
+																short_out[j]	=	trick_byteswap_short(short_in[j]);
+												}
+												break;
+								}
+
+								case	4:	{
+												int	*	int_in	=	reinterpret_cast<int	*>	(in);
+												int	*	int_out	=	reinterpret_cast<int	*>	(out);
+
+												for	(int	j	=	0;	j	<	array_size;	j++)	{
+																int_out[j]	=	trick_byteswap_int(int_in[j]);
+												}
+												break;
+								}
+								case	8:	{
+												//	We	don't	actually	care	if	this	is	double	or	long,	just	that	it's	the	right	size
+												double	*	double_in	=	reinterpret_cast<double	*>	(in);
+												double	*	double_out	=	reinterpret_cast<double	*>	(out);
+
+												for	(int	j	=	0;	j	<	array_size;	j++)	{
+																double_out[j]	=	trick_byteswap_double(double_in[j]);
+												}
+												break;
+								}
+				}
 }
 
 
 
-int Trick::VariableReference::writeValueBinary( std::ostream& out, bool byteswap ) const {
-
-    if ( _trick_type == TRICK_BITFIELD ) {
-        int temp_i = GET_BITFIELD(_write_buffer , _var_info->attr->size ,
-            _var_info->attr->index[0].start, _var_info->attr->index[0].size) ;
-        out.write((char *)(&temp_i), _size);
-        return _size;
-    }
-
-    if ( _trick_type == TRICK_UNSIGNED_BITFIELD ) {
-        int temp_unsigned = GET_UNSIGNED_BITFIELD(_write_buffer , _var_info->attr->size ,
-                _var_info->attr->index[0].start, _var_info->attr->index[0].size) ;
-        out.write((char *)(&temp_unsigned), _size);
-        return _size;
-    }
-
-    if (_trick_type ==  TRICK_NUMBER_OF_TYPES) {
-        // TRICK_NUMBER_OF_TYPES is an error case
-        int temp_zero = 0 ;
-        out.write((char *)(&temp_zero), _size);
-        return _size;
-    }
-
-    if (byteswap) {
-        char * byteswap_buf = (char *) calloc (_size, 1);
-        byteswap_var(byteswap_buf, (char *) _write_buffer);
-        out.write(byteswap_buf, _size);
-        free (byteswap_buf);
-    }
-    else {
-        out.write((char *) _write_buffer, _size);
-    }
-
-    return _size;
-    
-}  
-
-std::ostream& Trick::operator<< (std::ostream& s, const Trick::VariableReference& ref) {
-    s << "      \"" << ref.getName() << "\"";
-    return s;
+int	Trick::VariableReference::writeValueBinary(	std::ostream&	out,	bool	byteswap	)	const	{
+
+				if	(	_trick_type	==	TRICK_BITFIELD	)	{
+								int	temp_i	=	GET_BITFIELD(_write_buffer	,	_var_info->attr->size	,
+												_var_info->attr->index[0].start,	_var_info->attr->index[0].size)	;
+								out.write((char	*)(&temp_i),	_size);
+								return	_size;
+				}
+
+				if	(	_trick_type	==	TRICK_UNSIGNED_BITFIELD	)	{
+								int	temp_unsigned	=	GET_UNSIGNED_BITFIELD(_write_buffer	,	_var_info->attr->size	,
+																_var_info->attr->index[0].start,	_var_info->attr->index[0].size)	;
+								out.write((char	*)(&temp_unsigned),	_size);
+								return	_size;
+				}
+
+				if	(_trick_type	==		TRICK_NUMBER_OF_TYPES)	{
+								//	TRICK_NUMBER_OF_TYPES	is	an	error	case
+								int	temp_zero	=	0	;
+								out.write((char	*)(&temp_zero),	_size);
+								return	_size;
+				}
+
+				if	(byteswap)	{
+								char	*	byteswap_buf	=	(char	*)	calloc	(_size,	1);
+								byteswap_var(byteswap_buf,	(char	*)	_write_buffer);
+								out.write(byteswap_buf,	_size);
+								free	(byteswap_buf);
+				}
+				else	{
+								out.write((char	*)	_write_buffer,	_size);
+				}
+
+				return	_size;
+				
+}		
+
+std::ostream&	Trick::operator<<	(std::ostream&	s,	const	Trick::VariableReference&	ref)	{
+				s	<<	"						\""	<<	ref.getName()	<<	"\"";
+				return	s;
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/VariableServer/VariableServer.cpp b/trick_source/sim_services/VariableServer/VariableServer.cpp
index 7d212e92f..b338fa5fc 100644
--- a/trick_source/sim_services/VariableServer/VariableServer.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer.cpp
@@ -1,173 +1,173 @@
 
-#include <netdb.h>
-#include <iostream>
-#include "trick/VariableServer.hh"
-#include "trick/tc_proto.h"
+#include	<netdb.h>
+#include	<iostream>
+#include	"trick/VariableServer.hh"
+#include	"trick/tc_proto.h"
 
-Trick::VariableServer * the_vs ;
+Trick::VariableServer	*	the_vs	;
 
-Trick::VariableServer::VariableServer() :
- enabled(true) ,
- info_msg(false),
- log(false)
+Trick::VariableServer::VariableServer()	:
+	enabled(true)	,
+	info_msg(false),
+	log(false)
 {
-    the_vs = this ;
-    pthread_mutex_init(&map_mutex, NULL);
+				the_vs	=	this	;
+				pthread_mutex_init(&map_mutex,	NULL);
 }
 
-Trick::VariableServer::~VariableServer() {
-    the_vs = NULL;
+Trick::VariableServer::~VariableServer()	{
+				the_vs	=	NULL;
 }
 
-void Trick::VariableServer::shutdownConnections() {
-    listen_thread.shutdownConnections();
+void	Trick::VariableServer::shutdownConnections()	{
+				listen_thread.shutdownConnections();
 }
 
-std::ostream& Trick::operator<< (std::ostream& s, Trick::VariableServer& vs) {
-    std::map < pthread_t , VariableServerSessionThread * >::iterator it ;
+std::ostream&	Trick::operator<<	(std::ostream&	s,	Trick::VariableServer&	vs)	{
+				std::map	<	pthread_t	,	VariableServerSessionThread	*	>::iterator	it	;
 
-    s << "{\"variable_server_connections\":[\n";
-    int count = 0;
-    int n_connections = (int)vs.var_server_threads.size();
-    for ( it = vs.var_server_threads.begin() ; it != vs.var_server_threads.end() ; ++it ) {
-        s << "{\n";
-        s << *(*it).second;
-        s << "}";
-        if ((n_connections-count)>1) {
-            s << "," ;
-        }
-        s << "\n";
-        count ++;
-    }
-    s << "]}" << std::endl;
-    return s;
+				s	<<	"{\"variable_server_connections\":[\n";
+				int	count	=	0;
+				int	n_connections	=	(int)vs.var_server_threads.size();
+				for	(	it	=	vs.var_server_threads.begin()	;	it	!=	vs.var_server_threads.end()	;	++it	)	{
+								s	<<	"{\n";
+								s	<<	*(*it).second;
+								s	<<	"}";
+								if	((n_connections-count)>1)	{
+												s	<<	","	;
+								}
+								s	<<	"\n";
+								count	++;
+				}
+				s	<<	"]}"	<<	std::endl;
+				return	s;
 }
 
-bool Trick::VariableServer::get_enabled() {
-    return enabled ;
+bool	Trick::VariableServer::get_enabled()	{
+				return	enabled	;
 }
 
-void Trick::VariableServer::set_enabled(bool on_off) {
-    enabled = on_off ;
+void	Trick::VariableServer::set_enabled(bool	on_off)	{
+				enabled	=	on_off	;
 }
 
-bool Trick::VariableServer::get_info_msg() {
-    return info_msg ;
+bool	Trick::VariableServer::get_info_msg()	{
+				return	info_msg	;
 }
 
-void Trick::VariableServer::set_var_server_info_msg_on() {
-    info_msg = true;
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_info_message(info_msg);
-    }
+void	Trick::VariableServer::set_var_server_info_msg_on()	{
+				info_msg	=	true;
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_info_message(info_msg);
+				}
 }
 
-void Trick::VariableServer::set_var_server_info_msg_off() {
-    info_msg = false;
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_info_message(info_msg);
-    }
+void	Trick::VariableServer::set_var_server_info_msg_off()	{
+				info_msg	=	false;
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_info_message(info_msg);
+				}
 }
 
-bool Trick::VariableServer::get_log() {
-    return log ;
+bool	Trick::VariableServer::get_log()	{
+				return	log	;
 }
 
-bool Trick::VariableServer::get_session_log() {
-    return session_log ;
+bool	Trick::VariableServer::get_session_log()	{
+				return	session_log	;
 }
 
-void Trick::VariableServer::set_var_server_log_on() {
-    log = true;
-    // turn log on for all current vs clients
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_log(true);
-    }
+void	Trick::VariableServer::set_var_server_log_on()	{
+				log	=	true;
+				//	turn	log	on	for	all	current	vs	clients
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_log(true);
+				}
 }
 
-void Trick::VariableServer::set_var_server_log_off() {
-    log = false;
-    // turn log off for all current vs clients
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_log(false);
-    }
+void	Trick::VariableServer::set_var_server_log_off()	{
+				log	=	false;
+				//	turn	log	off	for	all	current	vs	clients
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_log(false);
+				}
 }
 
-void Trick::VariableServer::set_var_server_session_log_on() {
-    session_log = true;
-    // turn log on for all current vs clients
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_session_log(true);
-    }
+void	Trick::VariableServer::set_var_server_session_log_on()	{
+				session_log	=	true;
+				//	turn	log	on	for	all	current	vs	clients
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_session_log(true);
+				}
 }
 
-void Trick::VariableServer::set_var_server_session_log_off() {
-    session_log = false;
-    // turn log off for all current vs clients
-    for ( auto& session_it : var_server_sessions ) {
-        session_it.second->set_session_log(false);
-    }
+void	Trick::VariableServer::set_var_server_session_log_off()	{
+				session_log	=	false;
+				//	turn	log	off	for	all	current	vs	clients
+				for	(	auto&	session_it	:	var_server_sessions	)	{
+								session_it.second->set_session_log(false);
+				}
 }
 
-const char * Trick::VariableServer::get_hostname() {
-    return listen_thread.get_hostname();
+const	char	*	Trick::VariableServer::get_hostname()	{
+				return	listen_thread.get_hostname();
 }
 
-Trick::VariableServerListenThread & Trick::VariableServer::get_listen_thread() {
-    return listen_thread ;
+Trick::VariableServerListenThread	&	Trick::VariableServer::get_listen_thread()	{
+				return	listen_thread	;
 }
 
-void Trick::VariableServer::add_vst(pthread_t in_thread_id, VariableServerSessionThread * in_vst) {
-    pthread_mutex_lock(&map_mutex) ;
-    var_server_threads[in_thread_id] = in_vst ;
-    pthread_mutex_unlock(&map_mutex) ;
+void	Trick::VariableServer::add_vst(pthread_t	in_thread_id,	VariableServerSessionThread	*	in_vst)	{
+				pthread_mutex_lock(&map_mutex)	;
+				var_server_threads[in_thread_id]	=	in_vst	;
+				pthread_mutex_unlock(&map_mutex)	;
 }
 
-void Trick::VariableServer::add_session(pthread_t in_thread_id, VariableServerSession * in_session) {
-    pthread_mutex_lock(&map_mutex) ;
-    var_server_sessions[in_thread_id] = in_session ;
-    pthread_mutex_unlock(&map_mutex) ;
+void	Trick::VariableServer::add_session(pthread_t	in_thread_id,	VariableServerSession	*	in_session)	{
+				pthread_mutex_lock(&map_mutex)	;
+				var_server_sessions[in_thread_id]	=	in_session	;
+				pthread_mutex_unlock(&map_mutex)	;
 }
 
-Trick::VariableServerSessionThread * Trick::VariableServer::get_vst(pthread_t thread_id) {
-    std::map < pthread_t , Trick::VariableServerSessionThread * >::iterator it ;
-    Trick::VariableServerSessionThread * ret = NULL ;
-    pthread_mutex_lock(&map_mutex) ;
-    it = var_server_threads.find(thread_id) ;
-    if ( it != var_server_threads.end() ) {
-        ret = (*it).second ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
-    return ret ;
+Trick::VariableServerSessionThread	*	Trick::VariableServer::get_vst(pthread_t	thread_id)	{
+				std::map	<	pthread_t	,	Trick::VariableServerSessionThread	*	>::iterator	it	;
+				Trick::VariableServerSessionThread	*	ret	=	NULL	;
+				pthread_mutex_lock(&map_mutex)	;
+				it	=	var_server_threads.find(thread_id)	;
+				if	(	it	!=	var_server_threads.end()	)	{
+								ret	=	(*it).second	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
+				return	ret	;
 }
 
-Trick::VariableServerSession * Trick::VariableServer::get_session(pthread_t thread_id) {
-    Trick::VariableServerSession * ret = NULL ;
-    pthread_mutex_lock(&map_mutex) ;
-    auto it = var_server_sessions.find(thread_id) ;
-    if ( it != var_server_sessions.end() ) {
-        ret = (*it).second ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
-    return ret ;
+Trick::VariableServerSession	*	Trick::VariableServer::get_session(pthread_t	thread_id)	{
+				Trick::VariableServerSession	*	ret	=	NULL	;
+				pthread_mutex_lock(&map_mutex)	;
+				auto	it	=	var_server_sessions.find(thread_id)	;
+				if	(	it	!=	var_server_sessions.end()	)	{
+								ret	=	(*it).second	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
+				return	ret	;
 }
 
-void Trick::VariableServer::delete_vst(pthread_t thread_id) {
-    pthread_mutex_lock(&map_mutex) ;
-    var_server_threads.erase(thread_id) ;
-    pthread_mutex_unlock(&map_mutex) ;
+void	Trick::VariableServer::delete_vst(pthread_t	thread_id)	{
+				pthread_mutex_lock(&map_mutex)	;
+				var_server_threads.erase(thread_id)	;
+				pthread_mutex_unlock(&map_mutex)	;
 }
 
-void Trick::VariableServer::delete_session(pthread_t thread_id) {
-    pthread_mutex_lock(&map_mutex) ;
-    var_server_sessions.erase(thread_id) ;
-    pthread_mutex_unlock(&map_mutex) ;
+void	Trick::VariableServer::delete_session(pthread_t	thread_id)	{
+				pthread_mutex_lock(&map_mutex)	;
+				var_server_sessions.erase(thread_id)	;
+				pthread_mutex_unlock(&map_mutex)	;
 }
 
-void Trick::VariableServer::set_copy_data_job( Trick::JobData * in_job ) {
-    copy_data_job = in_job ;
+void	Trick::VariableServer::set_copy_data_job(	Trick::JobData	*	in_job	)	{
+				copy_data_job	=	in_job	;
 }
 
-void Trick::VariableServer::set_copy_and_write_freeze_job( Trick::JobData * in_job ) {
-    copy_and_write_freeze_job = in_job ;
+void	Trick::VariableServer::set_copy_and_write_freeze_job(	Trick::JobData	*	in_job	)	{
+				copy_and_write_freeze_job	=	in_job	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp b/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp
index 643df11a2..dfc03a987 100644
--- a/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerListenThread.cpp
@@ -1,279 +1,279 @@
 
-#include <iostream>
-#include <pwd.h>
+#include	<iostream>
+#include	<pwd.h>
 
-#include "trick/VariableServerListenThread.hh"
-#include "trick/VariableServerSessionThread.hh"
-#include "trick/exec_proto.h"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"trick/VariableServerListenThread.hh"
+#include	"trick/VariableServerSessionThread.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-#define MAX_MACHINE_NAME 80
+#define	MAX_MACHINE_NAME	80
 
 
-Trick::VariableServerListenThread::VariableServerListenThread() : VariableServerListenThread (NULL) {}
+Trick::VariableServerListenThread::VariableServerListenThread()	:	VariableServerListenThread	(NULL)	{}
 
-Trick::VariableServerListenThread::VariableServerListenThread(TCPClientListener * listener) :
- Trick::SysThread("VarServListen"),
- _requested_source_address(""),
- _requested_port(0),
- _user_requested_address(false),
- _broadcast(true),
- _listener(listener),
- _multicast(new MulticastGroup())
+Trick::VariableServerListenThread::VariableServerListenThread(TCPClientListener	*	listener)	:
+	Trick::SysThread("VarServListen"),
+	_requested_source_address(""),
+	_requested_port(0),
+	_user_requested_address(false),
+	_broadcast(true),
+	_listener(listener),
+	_multicast(new	MulticastGroup())
 {
-    if (_listener != NULL) {
-        // If we were passed a listener
-        // We assume it is already initialized
-        _requested_source_address = _listener->getHostname();
-        _requested_port = _listener->getPort();
-        _user_requested_address = true;
-    } else {
-        // Otherwise, make one
-        _listener = new TCPClientListener;
-    }
-
-    allowConnections = true;
-    pendingConnections = 0;
-    pthread_mutex_init( &connectionMutex, NULL);
-    pthread_cond_init( &noPendingConnections_cv, NULL);
-
-    cancellable = false;
+				if	(_listener	!=	NULL)	{
+								//	If	we	were	passed	a	listener
+								//	We	assume	it	is	already	initialized
+								_requested_source_address	=	_listener->getHostname();
+								_requested_port	=	_listener->getPort();
+								_user_requested_address	=	true;
+				}	else	{
+								//	Otherwise,	make	one
+								_listener	=	new	TCPClientListener;
+				}
+
+				allowConnections	=	true;
+				pendingConnections	=	0;
+				pthread_mutex_init(	&connectionMutex,	NULL);
+				pthread_cond_init(	&noPendingConnections_cv,	NULL);
+
+				cancellable	=	false;
 }
 
-Trick::VariableServerListenThread::~VariableServerListenThread() {
-    delete _listener;
-    delete _multicast;
+Trick::VariableServerListenThread::~VariableServerListenThread()	{
+				delete	_listener;
+				delete	_multicast;
 }
 
-void Trick::VariableServerListenThread::set_multicast_group (MulticastGroup * group) {
-    delete _multicast;
-    _multicast = group;
+void	Trick::VariableServerListenThread::set_multicast_group	(MulticastGroup	*	group)	{
+				delete	_multicast;
+				_multicast	=	group;
 }
 
-const char * Trick::VariableServerListenThread::get_hostname() {
-    std::string hostname = _requested_source_address;
-    char * ret = (char *) malloc(hostname.length() + 1);
-    strncpy(ret, hostname.c_str(), hostname.length());
-    ret[hostname.length()] = '\0';
-    return ret;
+const	char	*	Trick::VariableServerListenThread::get_hostname()	{
+				std::string	hostname	=	_requested_source_address;
+				char	*	ret	=	(char	*)	malloc(hostname.length()	+	1);
+				strncpy(ret,	hostname.c_str(),	hostname.length());
+				ret[hostname.length()]	=	'\0';
+				return	ret;
 }
 
-unsigned short Trick::VariableServerListenThread::get_port() {
-    return _requested_port;
+unsigned	short	Trick::VariableServerListenThread::get_port()	{
+				return	_requested_port;
 }
 
-void Trick::VariableServerListenThread::set_port(unsigned short in_port) {
-    _requested_port = in_port;
-    _user_requested_address = true ;
+void	Trick::VariableServerListenThread::set_port(unsigned	short	in_port)	{
+				_requested_port	=	in_port;
+				_user_requested_address	=	true	;
 }
 
-std::string Trick::VariableServerListenThread::get_user_tag() {
-    return _user_tag ;
+std::string	Trick::VariableServerListenThread::get_user_tag()	{
+				return	_user_tag	;
 }
 
-const std::string& Trick::VariableServerListenThread::get_user_tag_ref() {
-    return _user_tag ;
+const	std::string&	Trick::VariableServerListenThread::get_user_tag_ref()	{
+				return	_user_tag	;
 }
 
-void Trick::VariableServerListenThread::set_user_tag(std::string in_tag) {
-    _user_tag = in_tag ;
+void	Trick::VariableServerListenThread::set_user_tag(std::string	in_tag)	{
+				_user_tag	=	in_tag	;
 }
 
-void Trick::VariableServerListenThread::set_source_address(const char * address) {
-    if ( address == NULL ) {
-        _requested_source_address = std::string("") ;
-    } else {
-        _requested_source_address = std::string(address) ;
-    }
-    _user_requested_address = true;
+void	Trick::VariableServerListenThread::set_source_address(const	char	*	address)	{
+				if	(	address	==	NULL	)	{
+								_requested_source_address	=	std::string("")	;
+				}	else	{
+								_requested_source_address	=	std::string(address)	;
+				}
+				_user_requested_address	=	true;
 }
 
-std::string Trick::VariableServerListenThread::get_source_address() {
-    return _requested_source_address ;
+std::string	Trick::VariableServerListenThread::get_source_address()	{
+				return	_requested_source_address	;
 }
 
-bool Trick::VariableServerListenThread::get_broadcast() {
-    return _broadcast;
+bool	Trick::VariableServerListenThread::get_broadcast()	{
+				return	_broadcast;
 }
 
-void Trick::VariableServerListenThread::set_broadcast(bool in_broadcast) {
-    _broadcast = in_broadcast;
+void	Trick::VariableServerListenThread::set_broadcast(bool	in_broadcast)	{
+				_broadcast	=	in_broadcast;
 }
 
-// Called from default data
-int Trick::VariableServerListenThread::init_listen_device() {
-    int ret = _listener->initialize();
-    _requested_port = _listener->getPort();
-    _requested_source_address = _listener->getHostname();
-    return ret;
+//	Called	from	default	data
+int	Trick::VariableServerListenThread::init_listen_device()	{
+				int	ret	=	_listener->initialize();
+				_requested_port	=	_listener->getPort();
+				_requested_source_address	=	_listener->getHostname();
+				return	ret;
 }
 
-// Called from init jobs
-int Trick::VariableServerListenThread::check_and_move_listen_device() {
-    int ret ;
-
-    if (_user_requested_address) {
-        /* The user has requested a different source address or port in the input file */
-        _listener->disconnect();
-        ret = _listener->initialize(_requested_source_address, _requested_port);
-        _requested_port = _listener->getPort();
-        _requested_source_address = _listener->getHostname();
-        if (ret != 0) {
-            message_publish(MSG_ERROR, "ERROR: Could not establish variable server source_address %s: port %d. Aborting.\n",
-                _requested_source_address.c_str(), _requested_port);
-            return -1 ;
-        }
-    }
-    return 0 ;
+//	Called	from	init	jobs
+int	Trick::VariableServerListenThread::check_and_move_listen_device()	{
+				int	ret	;
+
+				if	(_user_requested_address)	{
+								/*	The	user	has	requested	a	different	source	address	or	port	in	the	input	file	*/
+								_listener->disconnect();
+								ret	=	_listener->initialize(_requested_source_address,	_requested_port);
+								_requested_port	=	_listener->getPort();
+								_requested_source_address	=	_listener->getHostname();
+								if	(ret	!=	0)	{
+												message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	variable	server	source_address	%s:	port	%d.	Aborting.\n",
+																_requested_source_address.c_str(),	_requested_port);
+												return	-1	;
+								}
+				}
+				return	0	;
 }
 
-void * Trick::VariableServerListenThread::thread_body() {
-    // This thread listens for incoming client connections, and when one is received, creates a new thread to handle the session
-    // Also broadcasts on multicast channel
-
-    test_shutdown();
-
-
-    std::string version = std::string(exec_get_current_version()) ;
-    version.erase(version.find_last_not_of(" \t\f\v\n\r")+1);
-
-    // get username to _broadcast on multicast channel
-    struct passwd *passp = getpwuid(getuid()) ;
-    std::string user_name;
-    if ( passp == NULL ) {
-        user_name = strdup("unknown") ;
-    } else {
-        user_name = strdup(passp->pw_name) ;
-    }
-
-    _listener->setBlockMode(true);
-
-    if ( _broadcast ) {
-        initializeMulticast();
-    }
-
-    while (1) {
-        // Quit here if it's time
-        test_shutdown();
-
-        // Pause here if we need to
-        test_pause();
-
-        // Look for a new client requesting a connection
-        if (_listener->checkForNewConnections()) {
-
-            // Create a new thread to service this connection
-            if ( allowConnections) {
-                pthread_mutex_lock(&connectionMutex);
-                pendingConnections ++;
-
-                VariableServerSessionThread * vst = new Trick::VariableServerSessionThread() ;
-                vst->set_connection(_listener->setUpNewConnection());
-                vst->copy_cpus(get_cpus()) ;
-                vst->create_thread() ;
-                ConnectionStatus status = vst->wait_for_accept() ;
-
-                if (status == CONNECTION_FAIL) {
-                    // If the connection failed, the thread will exit.
-                    // Make sure it joins fully before deleting the vst object
-                    vst->join_thread();
-                    delete vst;
-                }
-                pendingConnections --;
-                if ( pendingConnections == 0 ) {
-                    pthread_cond_signal( &noPendingConnections_cv );
-                }
-                pthread_mutex_unlock(&connectionMutex);
-            }
-            
-        } else if ( _broadcast ) {
-            // Otherwise, broadcast on the multicast channel if enabled
-            char buf1[1024];
-            snprintf(buf1 , sizeof(buf1), "%s\t%hu\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%hu\n" , _listener->getHostname().c_str(), (unsigned short)_listener->getPort() ,
-             user_name.c_str() , (int)getpid() , command_line_args_get_default_dir() , command_line_args_get_cmdline_name() ,
-             command_line_args_get_input_file() , version.c_str() , _user_tag.c_str(), (unsigned short)_listener->getPort() ) ;
-
-            std::string message(buf1);
-
-            if (!_multicast->isInitialized()) {
-                // In case broadcast was turned on after this loop was entered
-                initializeMulticast();
-            }
-            _multicast->broadcast(message);
-        }
-    }
-
-    return NULL ;
+void	*	Trick::VariableServerListenThread::thread_body()	{
+				//	This	thread	listens	for	incoming	client	connections,	and	when	one	is	received,	creates	a	new	thread	to	handle	the	session
+				//	Also	broadcasts	on	multicast	channel
+
+				test_shutdown();
+
+
+				std::string	version	=	std::string(exec_get_current_version())	;
+				version.erase(version.find_last_not_of("	\t\f\v\n\r")+1);
+
+				//	get	username	to	_broadcast	on	multicast	channel
+				struct	passwd	*passp	=	getpwuid(getuid())	;
+				std::string	user_name;
+				if	(	passp	==	NULL	)	{
+								user_name	=	strdup("unknown")	;
+				}	else	{
+								user_name	=	strdup(passp->pw_name)	;
+				}
+
+				_listener->setBlockMode(true);
+
+				if	(	_broadcast	)	{
+								initializeMulticast();
+				}
+
+				while	(1)	{
+								//	Quit	here	if	it's	time
+								test_shutdown();
+
+								//	Pause	here	if	we	need	to
+								test_pause();
+
+								//	Look	for	a	new	client	requesting	a	connection
+								if	(_listener->checkForNewConnections())	{
+
+												//	Create	a	new	thread	to	service	this	connection
+												if	(	allowConnections)	{
+																pthread_mutex_lock(&connectionMutex);
+																pendingConnections	++;
+
+																VariableServerSessionThread	*	vst	=	new	Trick::VariableServerSessionThread()	;
+																vst->set_connection(_listener->setUpNewConnection());
+																vst->copy_cpus(get_cpus())	;
+																vst->create_thread()	;
+																ConnectionStatus	status	=	vst->wait_for_accept()	;
+
+																if	(status	==	CONNECTION_FAIL)	{
+																				//	If	the	connection	failed,	the	thread	will	exit.
+																				//	Make	sure	it	joins	fully	before	deleting	the	vst	object
+																				vst->join_thread();
+																				delete	vst;
+																}
+																pendingConnections	--;
+																if	(	pendingConnections	==	0	)	{
+																				pthread_cond_signal(	&noPendingConnections_cv	);
+																}
+																pthread_mutex_unlock(&connectionMutex);
+												}
+												
+								}	else	if	(	_broadcast	)	{
+												//	Otherwise,	broadcast	on	the	multicast	channel	if	enabled
+												char	buf1[1024];
+												snprintf(buf1	,	sizeof(buf1),	"%s\t%hu\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%hu\n"	,	_listener->getHostname().c_str(),	(unsigned	short)_listener->getPort()	,
+													user_name.c_str()	,	(int)getpid()	,	command_line_args_get_default_dir()	,	command_line_args_get_cmdline_name()	,
+													command_line_args_get_input_file()	,	version.c_str()	,	_user_tag.c_str(),	(unsigned	short)_listener->getPort()	)	;
+
+												std::string	message(buf1);
+
+												if	(!_multicast->isInitialized())	{
+																//	In	case	broadcast	was	turned	on	after	this	loop	was	entered
+																initializeMulticast();
+												}
+												_multicast->broadcast(message);
+								}
+				}
+
+				return	NULL	;
 }
 
-void Trick::VariableServerListenThread::shutdownConnections() {
-    pthread_mutex_lock(&connectionMutex);
-        allowConnections = false;
-        //  if ANY connections are pending, then wait here until we’re notified that NO connections are pending.
-        if (pendingConnections > 0) {
-            allowConnections = true;
-            pthread_cond_wait( &noPendingConnections_cv, &connectionMutex);
-        }
-    pthread_mutex_unlock( &connectionMutex );
+void	Trick::VariableServerListenThread::shutdownConnections()	{
+				pthread_mutex_lock(&connectionMutex);
+								allowConnections	=	false;
+								//		if	ANY	connections	are	pending,	then	wait	here	until	we’re	notified	that	NO	connections	are	pending.
+								if	(pendingConnections	>	0)	{
+												allowConnections	=	true;
+												pthread_cond_wait(	&noPendingConnections_cv,	&connectionMutex);
+								}
+				pthread_mutex_unlock(	&connectionMutex	);
 }
 
-#include <fcntl.h>
+#include	<fcntl.h>
 
-int Trick::VariableServerListenThread::restart() {
+int	Trick::VariableServerListenThread::restart()	{
 
-    int ret ;
+				int	ret	;
 
-    _listener->restart();
+				_listener->restart();
 
-    if ( _user_requested_address ) {
-        // If the use requested an address and/or port, make sure we reinitialize to the same one
-        if (!_listener->validateSourceAddress(_requested_source_address)) {
-            _requested_source_address.clear() ;
-        }
+				if	(	_user_requested_address	)	{
+								//	If	the	use	requested	an	address	and/or	port,	make	sure	we	reinitialize	to	the	same	one
+								if	(!_listener->validateSourceAddress(_requested_source_address))	{
+												_requested_source_address.clear()	;
+								}
 
-        message_publish(MSG_INFO, "variable server restart user_port requested set %s:%d\n",_requested_source_address.c_str(), _requested_port);
+								message_publish(MSG_INFO,	"variable	server	restart	user_port	requested	set	%s:%d\n",_requested_source_address.c_str(),	_requested_port);
 
-        _listener->disconnect();
-        ret = _listener->initialize(_requested_source_address, _requested_port);
+								_listener->disconnect();
+								ret	=	_listener->initialize(_requested_source_address,	_requested_port);
 
-        if (ret != 0) {
-            message_publish(MSG_ERROR, "ERROR: Could not establish listen port %d for Variable Server. Aborting.\n", _requested_port);
-            return (-1);
-        }
-    } else {
-        // Otherwise, just ask the listener what port it's using
-        _listener->checkSocket();
-        message_publish(MSG_INFO, "restart variable server message port = %d\n", _listener->getPort());
-    }
+								if	(ret	!=	0)	{
+												message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	listen	port	%d	for	Variable	Server.	Aborting.\n",	_requested_port);
+												return	(-1);
+								}
+				}	else	{
+								//	Otherwise,	just	ask	the	listener	what	port	it's	using
+								_listener->checkSocket();
+								message_publish(MSG_INFO,	"restart	variable	server	message	port	=	%d\n",	_listener->getPort());
+				}
 
-    initializeMulticast();
+				initializeMulticast();
 
-    return 0 ;
+				return	0	;
 }
 
-void Trick::VariableServerListenThread::initializeMulticast() {
-    _multicast->initialize();
-    _multicast->addAddress("239.3.14.15", 9265);
-    _multicast->addAddress("224.3.14.15", 9265);
+void	Trick::VariableServerListenThread::initializeMulticast()	{
+				_multicast->initialize();
+				_multicast->addAddress("239.3.14.15",	9265);
+				_multicast->addAddress("224.3.14.15",	9265);
 }
 
-void Trick::VariableServerListenThread::pause_listening() {
-    force_thread_to_pause();
+void	Trick::VariableServerListenThread::pause_listening()	{
+				force_thread_to_pause();
 }
 
-void Trick::VariableServerListenThread::restart_listening() {
-    _listener->restart();
-    unpause_thread();
+void	Trick::VariableServerListenThread::restart_listening()	{
+				_listener->restart();
+				unpause_thread();
 }
 
-void Trick::VariableServerListenThread::dump( std::ostream & oss ) {
-    oss << "Trick::VariableServerListenThread (" << name << ")" << std::endl ;
-    oss << "    source_address = " << _listener->getHostname() << std::endl ;
-    oss << "    port = " << _listener->getPort() << std::endl ;
-    oss << "    user_requested_address = " << _user_requested_address << std::endl ;
-    oss << "    user_tag = " << _user_tag << std::endl ;
-    oss << "    broadcast = " << _broadcast << std::endl ;
-    Trick::ThreadBase::dump(oss) ;
+void	Trick::VariableServerListenThread::dump(	std::ostream	&	oss	)	{
+				oss	<<	"Trick::VariableServerListenThread	("	<<	name	<<	")"	<<	std::endl	;
+				oss	<<	"				source_address	=	"	<<	_listener->getHostname()	<<	std::endl	;
+				oss	<<	"				port	=	"	<<	_listener->getPort()	<<	std::endl	;
+				oss	<<	"				user_requested_address	=	"	<<	_user_requested_address	<<	std::endl	;
+				oss	<<	"				user_tag	=	"	<<	_user_tag	<<	std::endl	;
+				oss	<<	"				broadcast	=	"	<<	_broadcast	<<	std::endl	;
+				Trick::ThreadBase::dump(oss)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession.cpp b/trick_source/sim_services/VariableServer/VariableServerSession.cpp
index e9329671f..a1d949259 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession.cpp
@@ -1,255 +1,255 @@
-#include "trick/VariableServerSession.hh"
-#include "trick/TrickConstant.hh"
-#include "trick/exec_proto.h"
-#include "trick/Message_proto.hh"
-#include "trick/message_proto.h"
-#include "trick/input_processor_proto.h"
-#include "trick/realtimesync_proto.h"
+#include	"trick/VariableServerSession.hh"
+#include	"trick/TrickConstant.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/Message_proto.hh"
+#include	"trick/message_proto.h"
+#include	"trick/input_processor_proto.h"
+#include	"trick/realtimesync_proto.h"
 
-int Trick::VariableServerSession::instance_counter = 0;
-std::string Trick::VariableServerSession::log_subdir = "session_logs";
+int	Trick::VariableServerSession::instance_counter	=	0;
+std::string	Trick::VariableServerSession::log_subdir	=	"session_logs";
 
-Trick::VariableServerSession::VariableServerSession() {
-    _debug = 0;
-    _enabled = true ;
-    _log = false ;
-    _session_log = false;
-    _session_log_msg_stream = -1;
-    _info_msg = false;
-    _copy_mode = VS_COPY_ASYNC ;
-    _write_mode = VS_WRITE_ASYNC ;
-    _frame_multiple = 1 ;
-    _frame_offset = 0 ;
-    _freeze_frame_multiple = 1 ;
-    _freeze_frame_offset = 0 ;
-    _update_rate = 0.1 ;
-    _cycle_tics = (long long)(_update_rate * exec_get_time_tic_value()) ;
-    if (_cycle_tics == 0) {
-        _cycle_tics = 1;
-    }
+Trick::VariableServerSession::VariableServerSession()	{
+				_debug	=	0;
+				_enabled	=	true	;
+				_log	=	false	;
+				_session_log	=	false;
+				_session_log_msg_stream	=	-1;
+				_info_msg	=	false;
+				_copy_mode	=	VS_COPY_ASYNC	;
+				_write_mode	=	VS_WRITE_ASYNC	;
+				_frame_multiple	=	1	;
+				_frame_offset	=	0	;
+				_freeze_frame_multiple	=	1	;
+				_freeze_frame_offset	=	0	;
+				_update_rate	=	0.1	;
+				_cycle_tics	=	(long	long)(_update_rate	*	exec_get_time_tic_value())	;
+				if	(_cycle_tics	==	0)	{
+								_cycle_tics	=	1;
+				}
 
-    _next_tics = TRICK_MAX_LONG_LONG ;
-    _freeze_next_tics = TRICK_MAX_LONG_LONG ;
-    _byteswap = false ;
-    _validate_address = false ;
-    _send_stdio = false ;
+				_next_tics	=	TRICK_MAX_LONG_LONG	;
+				_freeze_next_tics	=	TRICK_MAX_LONG_LONG	;
+				_byteswap	=	false	;
+				_validate_address	=	false	;
+				_send_stdio	=	false	;
 
-    _binary_data = false;
-    _byteswap = false;
-    _binary_data_nonames = false;
+				_binary_data	=	false;
+				_byteswap	=	false;
+				_binary_data_nonames	=	false;
 
-    _exit_cmd = false;
-    _pause_cmd = false;
+				_exit_cmd	=	false;
+				_pause_cmd	=	false;
 
-    _instance_num = instance_counter++;
+				_instance_num	=	instance_counter++;
 
-    pthread_mutex_init(&_copy_mutex, NULL);
+				pthread_mutex_init(&_copy_mutex,	NULL);
 }
 
-Trick::VariableServerSession::~VariableServerSession() {
-    for (unsigned int ii = 0 ; ii < _session_variables.size() ; ii++ ) {
-        delete _session_variables[ii];
-    }
- }
+Trick::VariableServerSession::~VariableServerSession()	{
+				for	(unsigned	int	ii	=	0	;	ii	<	_session_variables.size()	;	ii++	)	{
+								delete	_session_variables[ii];
+				}
+	}
 
 
-void Trick::VariableServerSession::set_connection(ClientConnection * conn) {
-    _connection = conn;
-    log_connection_opened();
+void	Trick::VariableServerSession::set_connection(ClientConnection	*	conn)	{
+				_connection	=	conn;
+				log_connection_opened();
 }
 
-bool Trick::VariableServerSession::is_session_log_open() {
-    return _session_log_msg_stream != -1;
+bool	Trick::VariableServerSession::is_session_log_open()	{
+				return	_session_log_msg_stream	!=	-1;
 }
 
-void Trick::VariableServerSession::open_session_log() {
-    std::string name = "VSSession" + std::to_string(_instance_num);
-    _session_log_msg_stream = open_custom_message_file(log_subdir + "/" + name + ".log", name);
+void	Trick::VariableServerSession::open_session_log()	{
+				std::string	name	=	"VSSession"	+	std::to_string(_instance_num);
+				_session_log_msg_stream	=	open_custom_message_file(log_subdir	+	"/"	+	name	+	".log",	name);
 }
 
 
-// Command to turn on log to varserver_log file
-int Trick::VariableServerSession::set_log(bool on_off) {
-    _log = on_off;
-    return(0) ;
+//	Command	to	turn	on	log	to	varserver_log	file
+int	Trick::VariableServerSession::set_log(bool	on_off)	{
+				_log	=	on_off;
+				return(0)	;
 }
 
-// Command to turn on individual session log file
-int Trick::VariableServerSession::set_session_log(bool on_off) {
-    _session_log = on_off;
-    return(0) ;
+//	Command	to	turn	on	individual	session	log	file
+int	Trick::VariableServerSession::set_session_log(bool	on_off)	{
+				_session_log	=	on_off;
+				return(0)	;
 }
 
-bool Trick::VariableServerSession::get_pause() {
-    return _pause_cmd ;
+bool	Trick::VariableServerSession::get_pause()	{
+				return	_pause_cmd	;
 }
 
-void Trick::VariableServerSession::set_pause( bool on_off) {
-    _pause_cmd = on_off ;
+void	Trick::VariableServerSession::set_pause(	bool	on_off)	{
+				_pause_cmd	=	on_off	;
 }
 
 
-bool Trick::VariableServerSession::get_exit_cmd() {
-    return _exit_cmd ;
+bool	Trick::VariableServerSession::get_exit_cmd()	{
+				return	_exit_cmd	;
 }
 
-void Trick::VariableServerSession::pause_copy() {
-    pthread_mutex_lock(&_copy_mutex);
+void	Trick::VariableServerSession::pause_copy()	{
+				pthread_mutex_lock(&_copy_mutex);
 }
 
-void Trick::VariableServerSession::unpause_copy() {
-    pthread_mutex_unlock(&_copy_mutex);
+void	Trick::VariableServerSession::unpause_copy()	{
+				pthread_mutex_unlock(&_copy_mutex);
 }
 
-void Trick::VariableServerSession::disconnect_references() {
-    for (VariableReference * variable : _session_variables) {
-        variable->tagAsInvalid();
-    }
+void	Trick::VariableServerSession::disconnect_references()	{
+				for	(VariableReference	*	variable	:	_session_variables)	{
+								variable->tagAsInvalid();
+				}
 }
 
-long long Trick::VariableServerSession::get_next_tics() const {
-    if ( ! _enabled ) {
-        return TRICK_MAX_LONG_LONG ;
-    }
-    return _next_tics ;
+long	long	Trick::VariableServerSession::get_next_tics()	const	{
+				if	(	!	_enabled	)	{
+								return	TRICK_MAX_LONG_LONG	;
+				}
+				return	_next_tics	;
 }
 
-long long Trick::VariableServerSession::get_freeze_next_tics() const {
-    if ( ! _enabled ) {
-        return TRICK_MAX_LONG_LONG ;
-    }
-    return _freeze_next_tics ;
+long	long	Trick::VariableServerSession::get_freeze_next_tics()	const	{
+				if	(	!	_enabled	)	{
+								return	TRICK_MAX_LONG_LONG	;
+				}
+				return	_freeze_next_tics	;
 }
 
-void Trick::VariableServerSession::log_connection_opened() {
-    if (_session_log) {
-        if (!is_session_log_open()) {
-            open_session_log();
-        }
-    
-        message_publish(_session_log_msg_stream, "Variable Server Session started with %s:%d\n", _connection->getClientHostname().c_str(), _connection->getClientPort());
-    }
+void	Trick::VariableServerSession::log_connection_opened()	{
+				if	(_session_log)	{
+								if	(!is_session_log_open())	{
+												open_session_log();
+								}
+				
+								message_publish(_session_log_msg_stream,	"Variable	Server	Session	started	with	%s:%d\n",	_connection->getClientHostname().c_str(),	_connection->getClientPort());
+				}
 }
 
-void Trick::VariableServerSession::log_received_message(const std::string& msg) {
-    if (_log) {
-        message_publish(MSG_PLAYBACK, "tag=<%s> time=%f %s", _connection->getClientTag().c_str(), exec_get_sim_time(), msg.c_str());
-    }
+void	Trick::VariableServerSession::log_received_message(const	std::string&	msg)	{
+				if	(_log)	{
+								message_publish(MSG_PLAYBACK,	"tag=<%s>	time=%f	%s",	_connection->getClientTag().c_str(),	exec_get_sim_time(),	msg.c_str());
+				}
 
-    if (_session_log) {
-        if (!is_session_log_open()) 
-            open_session_log();
+				if	(_session_log)	{
+								if	(!is_session_log_open())	
+												open_session_log();
 
-        message_publish(_session_log_msg_stream, "tag=<%s> time=%f %s", _connection->getClientTag().c_str(), exec_get_sim_time(), msg.c_str());
-    }
+								message_publish(_session_log_msg_stream,	"tag=<%s>	time=%f	%s",	_connection->getClientTag().c_str(),	exec_get_sim_time(),	msg.c_str());
+				}
 
-    if (_debug >= 3) {
-        message_publish(MSG_DEBUG, "%p tag=<%s> var_server received bytes = msg_len = %d\n", _connection, _connection->getClientTag().c_str(), msg.size());
-    }
+				if	(_debug	>=	3)	{
+								message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	received	bytes	=	msg_len	=	%d\n",	_connection,	_connection->getClientTag().c_str(),	msg.size());
+				}
 
-    if (_debug >= 1 || _info_msg) {
-        message_publish(MSG_DEBUG, "tag=<%s> time=%f %s", _connection->getClientTag().c_str(), exec_get_sim_time(), msg.c_str());
-    }
-    
+				if	(_debug	>=	1	||	_info_msg)	{
+								message_publish(MSG_DEBUG,	"tag=<%s>	time=%f	%s",	_connection->getClientTag().c_str(),	exec_get_sim_time(),	msg.c_str());
+				}
+				
 }
 
-int Trick::VariableServerSession::handle_message() {
+int	Trick::VariableServerSession::handle_message()	{
 
-    std::string received_message;
-    int nbytes = _connection->read(received_message);
-    if (nbytes > 0) {
-        log_received_message(received_message);
-        ip_parse(received_message.c_str()); /* returns 0 if no parsing error */
-    }
+				std::string	received_message;
+				int	nbytes	=	_connection->read(received_message);
+				if	(nbytes	>	0)	{
+								log_received_message(received_message);
+								ip_parse(received_message.c_str());	/*	returns	0	if	no	parsing	error	*/
+				}
 
-    return nbytes;
+				return	nbytes;
 }
 
-Trick::VariableReference * Trick::VariableServerSession::find_session_variable(std::string name) const {
-    for (VariableReference * ref : _session_variables) {
-        // Look for matching name
-        if (name.compare(ref->getName()) == 0) {
-            return ref;
-        }
-    }
+Trick::VariableReference	*	Trick::VariableServerSession::find_session_variable(std::string	name)	const	{
+				for	(VariableReference	*	ref	:	_session_variables)	{
+								//	Look	for	matching	name
+								if	(name.compare(ref->getName())	==	0)	{
+												return	ref;
+								}
+				}
 
-    return NULL;
+				return	NULL;
 }
 
-int Trick::VariableServerSession::set_info_message(bool on) {
-    _info_msg = on;
-    return 0;
+int	Trick::VariableServerSession::set_info_message(bool	on)	{
+				_info_msg	=	on;
+				return	0;
 }
 
-double Trick::VariableServerSession::get_update_rate() const {
-    return _update_rate;
+double	Trick::VariableServerSession::get_update_rate()	const	{
+				return	_update_rate;
 }
 
-VS_WRITE_MODE Trick::VariableServerSession::get_write_mode () const {
-    return _write_mode;
+VS_WRITE_MODE	Trick::VariableServerSession::get_write_mode	()	const	{
+				return	_write_mode;
 }
 
-VS_COPY_MODE Trick::VariableServerSession::get_copy_mode () const {
-    return _copy_mode;
+VS_COPY_MODE	Trick::VariableServerSession::get_copy_mode	()	const	{
+				return	_copy_mode;
 }
 
-long long Trick::VariableServerSession::get_cycle_tics() const {
-    return _cycle_tics;
+long	long	Trick::VariableServerSession::get_cycle_tics()	const	{
+				return	_cycle_tics;
 }
 
-int Trick::VariableServerSession::get_frame_multiple () const {
-    return _frame_multiple;
+int	Trick::VariableServerSession::get_frame_multiple	()	const	{
+				return	_frame_multiple;
 }
 
-int Trick::VariableServerSession::get_frame_offset () const {
-    return _frame_offset;
+int	Trick::VariableServerSession::get_frame_offset	()	const	{
+				return	_frame_offset;
 }
 
-int Trick::VariableServerSession::get_freeze_frame_multiple () const {
-    return _freeze_frame_multiple;
+int	Trick::VariableServerSession::get_freeze_frame_multiple	()	const	{
+				return	_freeze_frame_multiple;
 }
 
-int Trick::VariableServerSession::get_freeze_frame_offset () const {
-    return _freeze_frame_offset;
+int	Trick::VariableServerSession::get_freeze_frame_offset	()	const	{
+				return	_freeze_frame_offset;
 }
 
-bool Trick::VariableServerSession::get_enabled () const {
-    return _enabled;
+bool	Trick::VariableServerSession::get_enabled	()	const	{
+				return	_enabled;
 }
 
-void Trick::VariableServerSession::set_freeze_next_tics(long long tics) {
-    _freeze_next_tics = tics;
+void	Trick::VariableServerSession::set_freeze_next_tics(long	long	tics)	{
+				_freeze_next_tics	=	tics;
 }
 
-void Trick::VariableServerSession::set_next_tics(long long tics) {
-    _next_tics = tics;
+void	Trick::VariableServerSession::set_next_tics(long	long	tics)	{
+				_next_tics	=	tics;
 }
 
-void Trick::VariableServerSession::set_exit_cmd() {
-    _exit_cmd = true;
+void	Trick::VariableServerSession::set_exit_cmd()	{
+				_exit_cmd	=	true;
 }
 
 
 
-std::ostream& Trick::operator<< (std::ostream& s, const Trick::VariableServerSession& session) {
-    if (session._binary_data) {
-        s << "    \"format\":\"BINARY\",\n";
-    } else {
-        s << "    \"format\":\"ASCII\",\n";
-    }
-    s << "    \"update_rate\":" << session.get_update_rate() << ",\n";
+std::ostream&	Trick::operator<<	(std::ostream&	s,	const	Trick::VariableServerSession&	session)	{
+				if	(session._binary_data)	{
+								s	<<	"				\"format\":\"BINARY\",\n";
+				}	else	{
+								s	<<	"				\"format\":\"ASCII\",\n";
+				}
+				s	<<	"				\"update_rate\":"	<<	session.get_update_rate()	<<	",\n";
 
-    s << "    \"variables\":[\n";
+				s	<<	"				\"variables\":[\n";
 
-    int n_vars = (int)session._session_variables.size();
-    for (int i=0 ; i<n_vars ; i++) {
-        s << *(session._session_variables[i]);
-        if ((n_vars-i)>1) {
-            s << "," ;
-        }
-        s << "\n";
-    }
-    s << "    ]\n";
+				int	n_vars	=	(int)session._session_variables.size();
+				for	(int	i=0	;	i<n_vars	;	i++)	{
+								s	<<	*(session._session_variables[i]);
+								if	((n_vars-i)>1)	{
+												s	<<	","	;
+								}
+								s	<<	"\n";
+				}
+				s	<<	"				]\n";
 
-    return s;
+				return	s;
 }
\ No newline at end of file
diff --git a/trick_source/sim_services/VariableServer/VariableServerSessionThread.cpp b/trick_source/sim_services/VariableServer/VariableServerSessionThread.cpp
index a1108d232..87766d56b 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSessionThread.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSessionThread.cpp
@@ -1,134 +1,134 @@
 
-#include <iostream>
-#include <stdlib.h>
-#include "trick/VariableServerSessionThread.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/TrickConstant.hh"
-#include "trick/UDPConnection.hh"
-#include "trick/TCPConnection.hh"
+#include	<iostream>
+#include	<stdlib.h>
+#include	"trick/VariableServerSessionThread.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/TrickConstant.hh"
+#include	"trick/UDPConnection.hh"
+#include	"trick/TCPConnection.hh"
 
 
-Trick::VariableServer * Trick::VariableServerSessionThread::_vs = NULL ;
+Trick::VariableServer	*	Trick::VariableServerSessionThread::_vs	=	NULL	;
 
-static int instance_num = 0;
+static	int	instance_num	=	0;
 
-Trick::VariableServerSessionThread::VariableServerSessionThread() : VariableServerSessionThread (new VariableServerSession()) {}
+Trick::VariableServerSessionThread::VariableServerSessionThread()	:	VariableServerSessionThread	(new	VariableServerSession())	{}
 
-Trick::VariableServerSessionThread::VariableServerSessionThread(VariableServerSession * session) :
- Trick::SysThread(std::string("VarServer" + std::to_string(instance_num++))) , _debug(0), _session(session), _connection(NULL) {
+Trick::VariableServerSessionThread::VariableServerSessionThread(VariableServerSession	*	session)	:
+	Trick::SysThread(std::string("VarServer"	+	std::to_string(instance_num++)))	,	_debug(0),	_session(session),	_connection(NULL)	{
 
-    _connection_status = CONNECTION_PENDING ;
+				_connection_status	=	CONNECTION_PENDING	;
 
 
-    pthread_mutex_init(&_connection_status_mutex, NULL);
-    pthread_cond_init(&_connection_status_cv, NULL);
+				pthread_mutex_init(&_connection_status_mutex,	NULL);
+				pthread_cond_init(&_connection_status_cv,	NULL);
 
-    cancellable = false;
+				cancellable	=	false;
 }
 
-Trick::VariableServerSessionThread::~VariableServerSessionThread() {
-    cleanup();
+Trick::VariableServerSessionThread::~VariableServerSessionThread()	{
+				cleanup();
 }
 
-std::ostream& Trick::operator<< (std::ostream& s, Trick::VariableServerSessionThread& vst) {
-    // Write a JSON representation of a Trick::VariableServerSessionThread to an ostream.
-    s << "  \"connection\":{\n";
-    s << "    \"client_tag\":\"" << vst._connection->getClientTag() << "\",\n";
+std::ostream&	Trick::operator<<	(std::ostream&	s,	Trick::VariableServerSessionThread&	vst)	{
+				//	Write	a	JSON	representation	of	a	Trick::VariableServerSessionThread	to	an	ostream.
+				s	<<	"		\"connection\":{\n";
+				s	<<	"				\"client_tag\":\""	<<	vst._connection->getClientTag()	<<	"\",\n";
 
-    s << "    \"client_IP_address\":\"" << vst._connection->getClientHostname() << "\",\n";
-    s << "    \"client_port\":\"" << vst._connection->getClientPort() << "\",\n";
+				s	<<	"				\"client_IP_address\":\""	<<	vst._connection->getClientHostname()	<<	"\",\n";
+				s	<<	"				\"client_port\":\""	<<	vst._connection->getClientPort()	<<	"\",\n";
 
-    pthread_mutex_lock(&vst._connection_status_mutex);
-    if (vst._connection_status == CONNECTION_SUCCESS) {
-        s << *(vst._session);
-    }
-    pthread_mutex_unlock(&vst._connection_status_mutex);
+				pthread_mutex_lock(&vst._connection_status_mutex);
+				if	(vst._connection_status	==	CONNECTION_SUCCESS)	{
+								s	<<	*(vst._session);
+				}
+				pthread_mutex_unlock(&vst._connection_status_mutex);
 
-    s << "  }" << std::endl;
-    return s;
+				s	<<	"		}"	<<	std::endl;
+				return	s;
 }
 
-void Trick::VariableServerSessionThread::set_vs_ptr(Trick::VariableServer * in_vs) {
-    _vs = in_vs ;
+void	Trick::VariableServerSessionThread::set_vs_ptr(Trick::VariableServer	*	in_vs)	{
+				_vs	=	in_vs	;
 }
 
-Trick::VariableServer * Trick::VariableServerSessionThread::get_vs() {
-    return _vs ;
+Trick::VariableServer	*	Trick::VariableServerSessionThread::get_vs()	{
+				return	_vs	;
 }
 
-void Trick::VariableServerSessionThread::set_client_tag(std::string tag) {
-    _connection->setClientTag(tag);
+void	Trick::VariableServerSessionThread::set_client_tag(std::string	tag)	{
+				_connection->setClientTag(tag);
 }
 
-void Trick::VariableServerSessionThread::set_connection(Trick::ClientConnection * in_connection) {
-    _connection = in_connection;
+void	Trick::VariableServerSessionThread::set_connection(Trick::ClientConnection	*	in_connection)	{
+				_connection	=	in_connection;
 }
 
-Trick::ConnectionStatus Trick::VariableServerSessionThread::wait_for_accept() {
+Trick::ConnectionStatus	Trick::VariableServerSessionThread::wait_for_accept()	{
 
-    pthread_mutex_lock(&_connection_status_mutex);
-    while ( _connection_status == CONNECTION_PENDING ) {
-        pthread_cond_wait(&_connection_status_cv, &_connection_status_mutex);
-    }
-    pthread_mutex_unlock(&_connection_status_mutex);
+				pthread_mutex_lock(&_connection_status_mutex);
+				while	(	_connection_status	==	CONNECTION_PENDING	)	{
+								pthread_cond_wait(&_connection_status_cv,	&_connection_status_mutex);
+				}
+				pthread_mutex_unlock(&_connection_status_mutex);
 
-    return _connection_status;
+				return	_connection_status;
 }
 
-// Gets called from the main thread as a job
-void Trick::VariableServerSessionThread::preload_checkpoint() {
+//	Gets	called	from	the	main	thread	as	a	job
+void	Trick::VariableServerSessionThread::preload_checkpoint()	{
 
-    // Stop variable server processing at the top of the processing loop.
-    force_thread_to_pause();
+				//	Stop	variable	server	processing	at	the	top	of	the	processing	loop.
+				force_thread_to_pause();
 
 
-    // Make sure that the _session has been initialized
-    pthread_mutex_lock(&_connection_status_mutex);
-    if (_connection_status == CONNECTION_SUCCESS) {
+				//	Make	sure	that	the	_session	has	been	initialized
+				pthread_mutex_lock(&_connection_status_mutex);
+				if	(_connection_status	==	CONNECTION_SUCCESS)	{
 
-        // Let the thread complete any data copying it has to do
-        // and then suspend data copying until the checkpoint is reloaded.
-        _session->pause_copy();
-        
-        // Save the pause state of this thread.
-        _saved_pause_cmd = _session->get_pause();
+								//	Let	the	thread	complete	any	data	copying	it	has	to	do
+								//	and	then	suspend	data	copying	until	the	checkpoint	is	reloaded.
+								_session->pause_copy();
+								
+								//	Save	the	pause	state	of	this	thread.
+								_saved_pause_cmd	=	_session->get_pause();
 
-        // Disallow data writing.
-        _session->set_pause(true);
+								//	Disallow	data	writing.
+								_session->set_pause(true);
 
-        // Temporarily "disconnect" the variable references from Trick Managed Memory
-        // by tagging each as a "bad reference".
-        _session->disconnect_references();
+								//	Temporarily	"disconnect"	the	variable	references	from	Trick	Managed	Memory
+								//	by	tagging	each	as	a	"bad	reference".
+								_session->disconnect_references();
 
-        // Allow data copying to continue.
-        _session->unpause_copy();
-    }
-    pthread_mutex_unlock(&_connection_status_mutex);
+								//	Allow	data	copying	to	continue.
+								_session->unpause_copy();
+				}
+				pthread_mutex_unlock(&_connection_status_mutex);
 }
 
-// Gets called from the main thread as a job
-void Trick::VariableServerSessionThread::restart() {
-    // Set the pause state of this thread back to its "pre-checkpoint reload" state.
-    _connection->restart();
+//	Gets	called	from	the	main	thread	as	a	job
+void	Trick::VariableServerSessionThread::restart()	{
+				//	Set	the	pause	state	of	this	thread	back	to	its	"pre-checkpoint	reload"	state.
+				_connection->restart();
 
-    pthread_mutex_lock(&_connection_status_mutex);
-    if (_connection_status == CONNECTION_SUCCESS) {
-        _session->set_pause(_saved_pause_cmd) ;
-    }
-    pthread_mutex_unlock(&_connection_status_mutex);
+				pthread_mutex_lock(&_connection_status_mutex);
+				if	(_connection_status	==	CONNECTION_SUCCESS)	{
+								_session->set_pause(_saved_pause_cmd)	;
+				}
+				pthread_mutex_unlock(&_connection_status_mutex);
 
-    // Restart the variable server processing.
-    unpause_thread();
+				//	Restart	the	variable	server	processing.
+				unpause_thread();
 }
 
-void Trick::VariableServerSessionThread::cleanup() {
-    _connection->disconnect();
+void	Trick::VariableServerSessionThread::cleanup()	{
+				_connection->disconnect();
 
-    if (_session != NULL) {
-        delete _session;
-        _session = NULL;
-    }
+				if	(_session	!=	NULL)	{
+								delete	_session;
+								_session	=	NULL;
+				}
 }
 
diff --git a/trick_source/sim_services/VariableServer/VariableServerSessionThread_loop.cpp b/trick_source/sim_services/VariableServer/VariableServerSessionThread_loop.cpp
index 2dad9d0e3..5cad5f85e 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSessionThread_loop.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSessionThread_loop.cpp
@@ -1,139 +1,139 @@
 
-#include <iostream>
-#ifdef __linux
-#include <cxxabi.h>
+#include	<iostream>
+#ifdef	__linux
+#include	<cxxabi.h>
 #endif
 
-#include "trick/VariableServer.hh"
-#include "trick/message_proto.h"
-#include "trick/realtimesync_proto.h"
-#include "trick/ExecutiveException.hh"
-#include "trick/exec_proto.h"
-
-#include "trick/VariableServerSessionThread.hh"
-
-void exit_var_thread(void *in_vst) ;
-
-void * Trick::VariableServerSessionThread::thread_body() {
-
-    // Check for short running sims
-    test_shutdown(NULL, NULL);
-
-    //  We need to make the thread to VariableServerSessionThread map before we accept the connection.
-    //  Otherwise we have a race where this thread is unknown to the variable server and the
-    //  client gets confirmation that the connection is ready for communication.
-    _vs->add_vst( pthread_self() , this ) ;
-
-    // Accept client connection
-    int status = _connection->start();
-
-    if (status != 0) {
-        _vs->delete_vst(pthread_self());
-
-        // Tell main thread that we failed to initialize
-        pthread_mutex_lock(&_connection_status_mutex);
-        _connection_status = CONNECTION_FAIL;
-        pthread_cond_signal(&_connection_status_cv);
-        pthread_mutex_unlock(&_connection_status_mutex);
-
-        thread_shutdown();
-    }
-
-    // if log is set on for variable server (e.g., in input file), turn log on for each client
-    if (_vs->get_log()) {
-        _session->set_log(true);
-    }
-
-    if (_vs->get_session_log()) {
-        _session->set_session_log(true);
-    }
-
-    if (_vs->get_info_msg()) {
-        _session->set_info_message(true);
-    }
-
-    // Give the initialized connection to the session
-    // Don't touch the connection anymore until we shut them both down
-    _session->set_connection(_connection);
-    _vs->add_session( pthread_self(), _session );
-
-    // Tell main that we are ready
-    pthread_mutex_lock(&_connection_status_mutex);
-    _connection_status = CONNECTION_SUCCESS;
-    pthread_cond_signal(&_connection_status_cv);
-    pthread_mutex_unlock(&_connection_status_mutex);
-
-    try {
-        while (1) {
-            // Shutdown here if it's time
-            test_shutdown(exit_var_thread, (void *) this);
-
-            // Pause here if we are in a restart condition
-            test_pause();
-
-            // Look for a message from the client
-            // Parse and execute if one is availible
-            int read_status = _session->handle_message();
-            if ( read_status < 0 ) {
-                break ;
-            }
-
-            // Check to see if exit is necessary
-            if (_session->get_exit_cmd() == true) {
-                break;
-            }
-
-            // Tell session it's time to copy and write if the mode is correct
-            int ret =_session->copy_and_write_async(); 
-            if (ret < 0) {
-                break;
-            }
-
-            // Sleep for the appropriate cycle time
-            usleep((unsigned int) (_session->get_update_rate() * 1000000));
-        }
-    } catch (Trick::ExecutiveException & ex ) {
-        message_publish(MSG_ERROR, "\nVARIABLE SERVER COMMANDED exec_terminate\n  ROUTINE: %s\n  DIAGNOSTIC: %s\n" ,
-         ex.file.c_str(), ex.message.c_str()) ;
-
-        exec_signal_terminate();
-
-    } catch (const std::exception &ex) {
-        message_publish(MSG_ERROR, "\nVARIABLE SERVER caught std::exception\n  DIAGNOSTIC: %s\n" ,
-         ex.what()) ;
-        
-        exec_signal_terminate();
-
-#ifdef __linux
-#ifdef __GNUC__
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-    // for post gcc 4.1.2 or whatever glibc version is used in RHEL6 and above.
-    } catch (abi::__forced_unwind&) {
-        //pthread_exit and pthread_cancel will cause an abi::__forced_unwind to be thrown. Rethrow it.
-        throw;
+#include	"trick/VariableServer.hh"
+#include	"trick/message_proto.h"
+#include	"trick/realtimesync_proto.h"
+#include	"trick/ExecutiveException.hh"
+#include	"trick/exec_proto.h"
+
+#include	"trick/VariableServerSessionThread.hh"
+
+void	exit_var_thread(void	*in_vst)	;
+
+void	*	Trick::VariableServerSessionThread::thread_body()	{
+
+				//	Check	for	short	running	sims
+				test_shutdown(NULL,	NULL);
+
+				//		We	need	to	make	the	thread	to	VariableServerSessionThread	map	before	we	accept	the	connection.
+				//		Otherwise	we	have	a	race	where	this	thread	is	unknown	to	the	variable	server	and	the
+				//		client	gets	confirmation	that	the	connection	is	ready	for	communication.
+				_vs->add_vst(	pthread_self()	,	this	)	;
+
+				//	Accept	client	connection
+				int	status	=	_connection->start();
+
+				if	(status	!=	0)	{
+								_vs->delete_vst(pthread_self());
+
+								//	Tell	main	thread	that	we	failed	to	initialize
+								pthread_mutex_lock(&_connection_status_mutex);
+								_connection_status	=	CONNECTION_FAIL;
+								pthread_cond_signal(&_connection_status_cv);
+								pthread_mutex_unlock(&_connection_status_mutex);
+
+								thread_shutdown();
+				}
+
+				//	if	log	is	set	on	for	variable	server	(e.g.,	in	input	file),	turn	log	on	for	each	client
+				if	(_vs->get_log())	{
+								_session->set_log(true);
+				}
+
+				if	(_vs->get_session_log())	{
+								_session->set_session_log(true);
+				}
+
+				if	(_vs->get_info_msg())	{
+								_session->set_info_message(true);
+				}
+
+				//	Give	the	initialized	connection	to	the	session
+				//	Don't	touch	the	connection	anymore	until	we	shut	them	both	down
+				_session->set_connection(_connection);
+				_vs->add_session(	pthread_self(),	_session	);
+
+				//	Tell	main	that	we	are	ready
+				pthread_mutex_lock(&_connection_status_mutex);
+				_connection_status	=	CONNECTION_SUCCESS;
+				pthread_cond_signal(&_connection_status_cv);
+				pthread_mutex_unlock(&_connection_status_mutex);
+
+				try	{
+								while	(1)	{
+												//	Shutdown	here	if	it's	time
+												test_shutdown(exit_var_thread,	(void	*)	this);
+
+												//	Pause	here	if	we	are	in	a	restart	condition
+												test_pause();
+
+												//	Look	for	a	message	from	the	client
+												//	Parse	and	execute	if	one	is	availible
+												int	read_status	=	_session->handle_message();
+												if	(	read_status	<	0	)	{
+																break	;
+												}
+
+												//	Check	to	see	if	exit	is	necessary
+												if	(_session->get_exit_cmd()	==	true)	{
+																break;
+												}
+
+												//	Tell	session	it's	time	to	copy	and	write	if	the	mode	is	correct
+												int	ret	=_session->copy_and_write_async();	
+												if	(ret	<	0)	{
+																break;
+												}
+
+												//	Sleep	for	the	appropriate	cycle	time
+												usleep((unsigned	int)	(_session->get_update_rate()	*	1000000));
+								}
+				}	catch	(Trick::ExecutiveException	&	ex	)	{
+								message_publish(MSG_ERROR,	"\nVARIABLE	SERVER	COMMANDED	exec_terminate\n		ROUTINE:	%s\n		DIAGNOSTIC:	%s\n"	,
+									ex.file.c_str(),	ex.message.c_str())	;
+
+								exec_signal_terminate();
+
+				}	catch	(const	std::exception	&ex)	{
+								message_publish(MSG_ERROR,	"\nVARIABLE	SERVER	caught	std::exception\n		DIAGNOSTIC:	%s\n"	,
+									ex.what())	;
+								
+								exec_signal_terminate();
+
+#ifdef	__linux
+#ifdef	__GNUC__
+#if	__GNUC__	>=	4	&&	__GNUC_MINOR__	>=	2
+				//	for	post	gcc	4.1.2	or	whatever	glibc	version	is	used	in	RHEL6	and	above.
+				}	catch	(abi::__forced_unwind&)	{
+								//pthread_exit	and	pthread_cancel	will	cause	an	abi::__forced_unwind	to	be	thrown.	Rethrow	it.
+								throw;
 #endif
 #endif
 #endif
-    } catch (...) {
-#ifdef __linux
-#ifdef __GNUC__
-#if (__GNUC__ == 4 && __GNUC_MINOR__ == 1) || __GNUC__ == 12
-        // for gcc 4.1.2 or whatever glib version in RHEL 5 that does not work with the abi::__forced_unwind
-        // Also seems to have a problem with gcc 12
-        throw;
+				}	catch	(...)	{
+#ifdef	__linux
+#ifdef	__GNUC__
+#if	(__GNUC__	==	4	&&	__GNUC_MINOR__	==	1)	||	__GNUC__	==	12
+								//	for	gcc	4.1.2	or	whatever	glib	version	in	RHEL	5	that	does	not	work	with	the	abi::__forced_unwind
+								//	Also	seems	to	have	a	problem	with	gcc	12
+								throw;
 #else
-        message_publish(MSG_ERROR, "\nVARIABLE SERVER caught unknown exception\n" ) ;
-        exec_signal_terminate();
+								message_publish(MSG_ERROR,	"\nVARIABLE	SERVER	caught	unknown	exception\n"	)	;
+								exec_signal_terminate();
 #endif
 #endif
 #endif
-    }
+				}
 
-    if (_debug >= 3) {
-        message_publish(MSG_DEBUG, "%p tag=<%s> var_server receive loop exiting\n", _connection, _connection->getClientTag().c_str());
-    }
+				if	(_debug	>=	3)	{
+								message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	receive	loop	exiting\n",	_connection,	_connection->getClientTag().c_str());
+				}
 
-    thread_shutdown(exit_var_thread, this);
-    // No return from this.
+				thread_shutdown(exit_var_thread,	this);
+				//	No	return	from	this.
 }
 
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_commands.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_commands.cpp
index 4217d531a..054002560 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_commands.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_commands.cpp
@@ -1,392 +1,392 @@
 
-#include <string.h>
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <udunits2.h>
-#include "trick/VariableServerSession.hh"
-#include "trick/variable_server_message_types.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.h"
-#include "trick/command_line_protos.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/TrickConstant.hh"
-#include "trick/sie_c_intf.h"
-#include "trick/UdUnits.hh"
-#include "trick/map_trick_units_to_udunits.hh"
+#include	<string.h>
+#include	<iostream>
+#include	<sstream>
+#include	<stdlib.h>
+#include	<udunits2.h>
+#include	"trick/VariableServerSession.hh"
+#include	"trick/variable_server_message_types.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.h"
+#include	"trick/command_line_protos.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/TrickConstant.hh"
+#include	"trick/sie_c_intf.h"
+#include	"trick/UdUnits.hh"
+#include	"trick/map_trick_units_to_udunits.hh"
 
 
-int Trick::VariableServerSession::var_add(std::string in_name) {
-    VariableReference * new_var;
-    if (in_name == "time") {
-        new_var = new VariableReference(in_name, &_time);
-    } else {
-        new_var = new VariableReference(in_name);
-    }
+int	Trick::VariableServerSession::var_add(std::string	in_name)	{
+				VariableReference	*	new_var;
+				if	(in_name	==	"time")	{
+								new_var	=	new	VariableReference(in_name,	&_time);
+				}	else	{
+								new_var	=	new	VariableReference(in_name);
+				}
 
-    _session_variables.push_back(new_var) ;
-
-    return(0) ;
-}
-
-int Trick::VariableServerSession::var_add(std::string var_name, std::string units_name) {
-    var_add(var_name) ;
-    var_units(var_name, units_name) ;
-    return(0) ;
-}
-
-// Helper function for var_send_once
-std::vector<std::string> split (const std::string& str, const char delim) {
-    std::stringstream ss(str);
-    std::string s;
-    std::vector<std::string> ret;
-    while (std::getline(ss, s, delim)) {
-        ret.push_back(s);
-    }
-    return ret;
+				_session_variables.push_back(new_var)	;
+
+				return(0)	;
+}
+
+int	Trick::VariableServerSession::var_add(std::string	var_name,	std::string	units_name)	{
+				var_add(var_name)	;
+				var_units(var_name,	units_name)	;
+				return(0)	;
+}
+
+//	Helper	function	for	var_send_once
+std::vector<std::string>	split	(const	std::string&	str,	const	char	delim)	{
+				std::stringstream	ss(str);
+				std::string	s;
+				std::vector<std::string>	ret;
+				while	(std::getline(ss,	s,	delim))	{
+								ret.push_back(s);
+				}
+				return	ret;
 }
 
-int Trick::VariableServerSession::var_send_once(std::string in_name, int num_vars) {
-    std::vector<std::string> var_names = split(in_name, ',');
+int	Trick::VariableServerSession::var_send_once(std::string	in_name,	int	num_vars)	{
+				std::vector<std::string>	var_names	=	split(in_name,	',');
 
-    if (var_names.size() != num_vars) {
-        message_publish(MSG_ERROR, "Number of variables sent to var_send_once (%d) does not match num_vars (%d).\n", var_names.size(), num_vars);
-        return -1;
-    }
+				if	(var_names.size()	!=	num_vars)	{
+								message_publish(MSG_ERROR,	"Number	of	variables	sent	to	var_send_once	(%d)	does	not	match	num_vars	(%d).\n",	var_names.size(),	num_vars);
+								return	-1;
+				}
 
-    std::vector<VariableReference *> given_vars;
-    for (auto& varName : var_names) {
-        VariableReference * new_var;
-        if (varName == "time") {
-            new_var = new VariableReference(varName, &_time);
-        } else {
-            new_var = new VariableReference(varName);
-        }
-        given_vars.push_back(new_var);
-    }
-    copy_sim_data(given_vars, false);
-    write_data(given_vars, VS_SEND_ONCE);
+				std::vector<VariableReference	*>	given_vars;
+				for	(auto&	varName	:	var_names)	{
+								VariableReference	*	new_var;
+								if	(varName	==	"time")	{
+												new_var	=	new	VariableReference(varName,	&_time);
+								}	else	{
+												new_var	=	new	VariableReference(varName);
+								}
+								given_vars.push_back(new_var);
+				}
+				copy_sim_data(given_vars,	false);
+				write_data(given_vars,	VS_SEND_ONCE);
 
-    return(0) ;
+				return(0)	;
 }
 
 
-int Trick::VariableServerSession::var_remove(std::string in_name) {
+int	Trick::VariableServerSession::var_remove(std::string	in_name)	{
 
-    for (unsigned int ii = 0 ; ii < _session_variables.size() ; ii++ ) {
-        std::string var_name = _session_variables[ii]->getName();
-        if ( ! var_name.compare(in_name) ) {
-            delete _session_variables[ii];
-            _session_variables.erase(_session_variables.begin() + ii) ;
-            break ;
-        }
-    }
+				for	(unsigned	int	ii	=	0	;	ii	<	_session_variables.size()	;	ii++	)	{
+								std::string	var_name	=	_session_variables[ii]->getName();
+								if	(	!	var_name.compare(in_name)	)	{
+												delete	_session_variables[ii];
+												_session_variables.erase(_session_variables.begin()	+	ii)	;
+												break	;
+								}
+				}
 
-    return(0) ;
+				return(0)	;
 
 }
 
-int Trick::VariableServerSession::var_units(std::string var_name, std::string units_name) {    
-    VariableReference * variable = find_session_variable(var_name);
+int	Trick::VariableServerSession::var_units(std::string	var_name,	std::string	units_name)	{				
+				VariableReference	*	variable	=	find_session_variable(var_name);
 
-    if (variable == NULL) {
-        // TODO: ERROR LOGGER HERE
-        return -1;
-    }
+				if	(variable	==	NULL)	{
+								//	TODO:	ERROR	LOGGER	HERE
+								return	-1;
+				}
 
-    return variable->setRequestedUnits(units_name);
+				return	variable->setRequestedUnits(units_name);
 }
 
-int Trick::VariableServerSession::var_exists(std::string in_name) {
-    char buf1[5] ;
-    bool error = false ;
+int	Trick::VariableServerSession::var_exists(std::string	in_name)	{
+				char	buf1[5]	;
+				bool	error	=	false	;
 
-    unsigned int msg_type ;
-    REF2* var_ref = ref_attributes(in_name.c_str());
+				unsigned	int	msg_type	;
+				REF2*	var_ref	=	ref_attributes(in_name.c_str());
 
-    if ( var_ref == (REF2*)NULL ) {
-        error = true;
-    }
+				if	(	var_ref	==	(REF2*)NULL	)	{
+								error	=	true;
+				}
 
-    if (_binary_data) {
-        /* send binary 1 or 0 */
-        msg_type = VS_VAR_EXISTS ;
-        memcpy(buf1, &msg_type , sizeof(msg_type)) ;
+				if	(_binary_data)	{
+								/*	send	binary	1	or	0	*/
+								msg_type	=	VS_VAR_EXISTS	;
+								memcpy(buf1,	&msg_type	,	sizeof(msg_type))	;
 
-        buf1[4] = (error==false);
+								buf1[4]	=	(error==false);
 
-        if (_debug >= 2) {
-            message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending 1 binary byte\n", _connection, _connection->getClientTag().c_str());
-        }
+								if	(_debug	>=	2)	{
+												message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	1	binary	byte\n",	_connection,	_connection->getClientTag().c_str());
+								}
 
-        _connection->write(buf1, 5);
-    } else {
-        /* send ascii "1" or "0" */
-        sprintf(buf1, "%d\t%d\n", VS_VAR_EXISTS, (error==false));
-        if (_debug >= 2) {
-            message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending:\n%s\n", _connection, _connection->getClientTag().c_str(), buf1) ;
-        }
-        std::string write_string(buf1);
-        if (write_string.length() != strlen(buf1)) {
-            std::cout << "PROBLEM WITH STRING LENGTH: VAR_EXISTS ASCII" << std::endl;
-        }
-        _connection->write(write_string);
-    }
+								_connection->write(buf1,	5);
+				}	else	{
+								/*	send	ascii	"1"	or	"0"	*/
+								sprintf(buf1,	"%d\t%d\n",	VS_VAR_EXISTS,	(error==false));
+								if	(_debug	>=	2)	{
+												message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending:\n%s\n",	_connection,	_connection->getClientTag().c_str(),	buf1)	;
+								}
+								std::string	write_string(buf1);
+								if	(write_string.length()	!=	strlen(buf1))	{
+												std::cout	<<	"PROBLEM	WITH	STRING	LENGTH:	VAR_EXISTS	ASCII"	<<	std::endl;
+								}
+								_connection->write(write_string);
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_clear() {
+int	Trick::VariableServerSession::var_clear()	{
 
-    while( !_session_variables.empty() ) {
-        delete _session_variables.back();
-        _session_variables.pop_back();
-    }
+				while(	!_session_variables.empty()	)	{
+								delete	_session_variables.back();
+								_session_variables.pop_back();
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_send() {
-    copy_sim_data();
-    write_data();
-    return(0) ;
+int	Trick::VariableServerSession::var_send()	{
+				copy_sim_data();
+				write_data();
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_cycle(double in_rate) {
-    _update_rate = in_rate ;
-    _cycle_tics = (long long)(_update_rate * exec_get_time_tic_value()) ;
-    return(0) ;
+int	Trick::VariableServerSession::var_cycle(double	in_rate)	{
+				_update_rate	=	in_rate	;
+				_cycle_tics	=	(long	long)(_update_rate	*	exec_get_time_tic_value())	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_exit() {
-    _exit_cmd = true ;
-    return(0) ;
+int	Trick::VariableServerSession::var_exit()	{
+				_exit_cmd	=	true	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_validate_address(bool on_off) {
-    _validate_address = on_off ;
-    return(0) ;
+int	Trick::VariableServerSession::var_validate_address(bool	on_off)	{
+				_validate_address	=	on_off	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_debug(int level) {
-    _debug = level ;
-    return(0) ;
+int	Trick::VariableServerSession::var_debug(int	level)	{
+				_debug	=	level	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_ascii() {
-    _binary_data = 0 ;
-    return(0) ;
+int	Trick::VariableServerSession::var_ascii()	{
+				_binary_data	=	0	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_binary() {
-    _binary_data = 1 ;
-    return(0) ;
+int	Trick::VariableServerSession::var_binary()	{
+				_binary_data	=	1	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_binary_nonames() {
-    _binary_data = 1 ;
-    _binary_data_nonames = 1 ;
-    return(0) ;
+int	Trick::VariableServerSession::var_binary_nonames()	{
+				_binary_data	=	1	;
+				_binary_data_nonames	=	1	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::var_set_copy_mode(int mode) {
-    if ( mode >= VS_COPY_ASYNC and mode <= VS_COPY_TOP_OF_FRAME ) {
-        _copy_mode = (VS_COPY_MODE)mode ;
-        if ( _copy_mode == VS_COPY_SCHEDULED ) {
-            long long sim_time_tics ;
-            sim_time_tics = exec_get_time_tics() ;
-            // round the next call time to a multiple of the cycle
-            sim_time_tics -= sim_time_tics % _cycle_tics ;
-            _next_tics = sim_time_tics + _cycle_tics ;
+int	Trick::VariableServerSession::var_set_copy_mode(int	mode)	{
+				if	(	mode	>=	VS_COPY_ASYNC	and	mode	<=	VS_COPY_TOP_OF_FRAME	)	{
+								_copy_mode	=	(VS_COPY_MODE)mode	;
+								if	(	_copy_mode	==	VS_COPY_SCHEDULED	)	{
+												long	long	sim_time_tics	;
+												sim_time_tics	=	exec_get_time_tics()	;
+												//	round	the	next	call	time	to	a	multiple	of	the	cycle
+												sim_time_tics	-=	sim_time_tics	%	_cycle_tics	;
+												_next_tics	=	sim_time_tics	+	_cycle_tics	;
 
-            sim_time_tics = exec_get_freeze_time_tics() ;
-            // round the next call time to a multiple of the cycle
-            sim_time_tics -= sim_time_tics % _cycle_tics ;
-            _freeze_next_tics = sim_time_tics + _cycle_tics ;
+												sim_time_tics	=	exec_get_freeze_time_tics()	;
+												//	round	the	next	call	time	to	a	multiple	of	the	cycle
+												sim_time_tics	-=	sim_time_tics	%	_cycle_tics	;
+												_freeze_next_tics	=	sim_time_tics	+	_cycle_tics	;
 
-        } else {
-            _next_tics = TRICK_MAX_LONG_LONG ;
-        }
-        return 0 ;
-    }
-    return -1 ;
+								}	else	{
+												_next_tics	=	TRICK_MAX_LONG_LONG	;
+								}
+								return	0	;
+				}
+				return	-1	;
 }
 
-int Trick::VariableServerSession::var_set_write_mode(int mode) {
-    if ( mode >= VS_WRITE_ASYNC and mode <= VS_WRITE_WHEN_COPIED ) {
-        _write_mode = (VS_WRITE_MODE)mode ;
-        return 0 ;
-    }
-    return -1 ;
+int	Trick::VariableServerSession::var_set_write_mode(int	mode)	{
+				if	(	mode	>=	VS_WRITE_ASYNC	and	mode	<=	VS_WRITE_WHEN_COPIED	)	{
+								_write_mode	=	(VS_WRITE_MODE)mode	;
+								return	0	;
+				}
+				return	-1	;
 }
 
-int Trick::VariableServerSession::var_sync(int mode) {
+int	Trick::VariableServerSession::var_sync(int	mode)	{
 
-    switch (mode) {
-        case 1:
-            var_set_copy_mode(VS_COPY_SCHEDULED) ;
-            var_set_write_mode(VS_WRITE_ASYNC) ;
-            break ;
-        case 2:
-            var_set_copy_mode(VS_COPY_SCHEDULED) ;
-            var_set_write_mode(VS_WRITE_WHEN_COPIED) ;
-            break ;
-        case 0:
-        default:
-            var_set_copy_mode(VS_COPY_ASYNC) ;
-            var_set_write_mode(VS_WRITE_ASYNC) ;
-            break ;
-    }
+				switch	(mode)	{
+								case	1:
+												var_set_copy_mode(VS_COPY_SCHEDULED)	;
+												var_set_write_mode(VS_WRITE_ASYNC)	;
+												break	;
+								case	2:
+												var_set_copy_mode(VS_COPY_SCHEDULED)	;
+												var_set_write_mode(VS_WRITE_WHEN_COPIED)	;
+												break	;
+								case	0:
+								default:
+												var_set_copy_mode(VS_COPY_ASYNC)	;
+												var_set_write_mode(VS_WRITE_ASYNC)	;
+												break	;
+				}
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::VariableServerSession::var_set_frame_multiple(unsigned int mult) {
-    _frame_multiple = mult ;
-    return 0 ;
+int	Trick::VariableServerSession::var_set_frame_multiple(unsigned	int	mult)	{
+				_frame_multiple	=	mult	;
+				return	0	;
 }
 
-int Trick::VariableServerSession::var_set_frame_offset(unsigned int offset) {
-    _frame_offset = offset ;
-    return 0 ;
+int	Trick::VariableServerSession::var_set_frame_offset(unsigned	int	offset)	{
+				_frame_offset	=	offset	;
+				return	0	;
 }
 
-int Trick::VariableServerSession::var_set_freeze_frame_multiple(unsigned int mult) {
-    _freeze_frame_multiple = mult ;
-    return 0 ;
+int	Trick::VariableServerSession::var_set_freeze_frame_multiple(unsigned	int	mult)	{
+				_freeze_frame_multiple	=	mult	;
+				return	0	;
 }
 
-int Trick::VariableServerSession::var_set_freeze_frame_offset(unsigned int offset) {
-    _freeze_frame_offset = offset ;
-    return 0 ;
+int	Trick::VariableServerSession::var_set_freeze_frame_offset(unsigned	int	offset)	{
+				_freeze_frame_offset	=	offset	;
+				return	0	;
 }
 
-int Trick::VariableServerSession::var_byteswap(bool on_off) {
-    _byteswap = on_off ;
-    return(0) ;
+int	Trick::VariableServerSession::var_byteswap(bool	on_off)	{
+				_byteswap	=	on_off	;
+				return(0)	;
 }
 
-bool Trick::VariableServerSession::get_send_stdio() {
-    return _send_stdio ;
+bool	Trick::VariableServerSession::get_send_stdio()	{
+				return	_send_stdio	;
 }
 
-int Trick::VariableServerSession::set_send_stdio(bool on_off) {
-    _send_stdio = on_off ;
-    return(0) ;
+int	Trick::VariableServerSession::set_send_stdio(bool	on_off)	{
+				_send_stdio	=	on_off	;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::send_list_size() {
-    
-    unsigned int msg_type = VS_LIST_SIZE;
-    int var_count = _session_variables.size();
+int	Trick::VariableServerSession::send_list_size()	{
+				
+				unsigned	int	msg_type	=	VS_LIST_SIZE;
+				int	var_count	=	_session_variables.size();
 
-    // send number of variables
-    if (_binary_data) {
-        // send in the binary message header format:
-        // <message_indicator><message_size><number_of_variables>
-        char buf1[12] ;
+				//	send	number	of	variables
+				if	(_binary_data)	{
+								//	send	in	the	binary	message	header	format:
+								//	<message_indicator><message_size><number_of_variables>
+								char	buf1[12]	;
 
-        unsigned int msg_type = VS_LIST_SIZE;
-        memcpy(buf1, &msg_type , sizeof(msg_type)) ;
+								unsigned	int	msg_type	=	VS_LIST_SIZE;
+								memcpy(buf1,	&msg_type	,	sizeof(msg_type))	;
 
-        memset(&(buf1[4]), 0, sizeof(int)); // message size = 0
-        memcpy(&(buf1[8]), &var_count, sizeof(var_count));
+								memset(&(buf1[4]),	0,	sizeof(int));	//	message	size	=	0
+								memcpy(&(buf1[8]),	&var_count,	sizeof(var_count));
 
-        if (_debug >= 2) {
-            message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending %d event variables\n", _connection, _connection->getClientTag().c_str(), var_count);
-        }
+								if	(_debug	>=	2)	{
+												message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	%d	event	variables\n",	_connection,	_connection->getClientTag().c_str(),	var_count);
+								}
 
-        _connection->write(buf1, sizeof (buf1));
-    } else {
-        std::stringstream write_string;
-        write_string << VS_LIST_SIZE << "\t" << var_count << "\n";
-        // ascii
-        if (_debug >= 2) {
-            message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending number of event variables:\n%s\n", _connection, _connection->getClientTag().c_str(), write_string.str().c_str()) ;
-        }
+								_connection->write(buf1,	sizeof	(buf1));
+				}	else	{
+								std::stringstream	write_string;
+								write_string	<<	VS_LIST_SIZE	<<	"\t"	<<	var_count	<<	"\n";
+								//	ascii
+								if	(_debug	>=	2)	{
+												message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	number	of	event	variables:\n%s\n",	_connection,	_connection->getClientTag().c_str(),	write_string.str().c_str())	;
+								}
 
-        _connection->write(write_string.str());
-    }
+								_connection->write(write_string.str());
+				}
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::VariableServerSession::transmit_file(std::string filename) {
-    const unsigned int packet_size = 4095 ;
-    FILE * fp ;
-    unsigned int file_size ;
-    unsigned int current_size = 0 ;
-    unsigned int bytes_read ;
-    char buffer[packet_size+1] ;
-    int ret ;
+int	Trick::VariableServerSession::transmit_file(std::string	filename)	{
+				const	unsigned	int	packet_size	=	4095	;
+				FILE	*	fp	;
+				unsigned	int	file_size	;
+				unsigned	int	current_size	=	0	;
+				unsigned	int	bytes_read	;
+				char	buffer[packet_size+1]	;
+				int	ret	;
 
-    if (_debug >= 2) {
-        message_publish(MSG_DEBUG,"%p tag=<%s> var_server opening %s.\n", _connection, _connection->getClientTag().c_str(), filename.c_str()) ;
-    }
+				if	(_debug	>=	2)	{
+								message_publish(MSG_DEBUG,"%p	tag=<%s>	var_server	opening	%s.\n",	_connection,	_connection->getClientTag().c_str(),	filename.c_str())	;
+				}
 
-    if ((fp = fopen(filename.c_str() , "r")) == NULL ) {
-        message_publish(MSG_ERROR,"Variable Server Error: Cannot open %s.\n", filename.c_str()) ;
-        sprintf(buffer, "%d\t-1\n", VS_SIE_RESOURCE) ;
-        std::string message(buffer);
-        _connection->write(message);
-        return(-1) ;
-    }
+				if	((fp	=	fopen(filename.c_str()	,	"r"))	==	NULL	)	{
+								message_publish(MSG_ERROR,"Variable	Server	Error:	Cannot	open	%s.\n",	filename.c_str())	;
+								sprintf(buffer,	"%d\t-1\n",	VS_SIE_RESOURCE)	;
+								std::string	message(buffer);
+								_connection->write(message);
+								return(-1)	;
+				}
 
-    fseek(fp , 0L, SEEK_END) ;
-    file_size = ftell(fp) ;
+				fseek(fp	,	0L,	SEEK_END)	;
+				file_size	=	ftell(fp)	;
 
-    sprintf(buffer, "%d\t%u\n\0" , VS_SIE_RESOURCE, file_size) ;
-    std::string message(buffer);
-    _connection->write(message);
-    rewind(fp) ;
+				sprintf(buffer,	"%d\t%u\n\0"	,	VS_SIE_RESOURCE,	file_size)	;
+				std::string	message(buffer);
+				_connection->write(message);
+				rewind(fp)	;
 
-    // Switch to blocking writes since this could be a large transfer.
-    if (_connection->setBlockMode(true)) {
-        message_publish(MSG_DEBUG,"Variable Server Error: Failed to set socket to blocking mode.\n");
-    }
+				//	Switch	to	blocking	writes	since	this	could	be	a	large	transfer.
+				if	(_connection->setBlockMode(true))	{
+								message_publish(MSG_DEBUG,"Variable	Server	Error:	Failed	to	set	socket	to	blocking	mode.\n");
+				}
 
-    while ( current_size < file_size ) {
-        bytes_read = fread(buffer , 1 , packet_size , fp) ;
-        message = std::string(buffer);
-        message.resize(bytes_read);
-        ret = _connection->write(message);
-        if (ret != (int)bytes_read) {
-            message_publish(MSG_ERROR,"Variable Server Error: Failed to send file. Bytes read: %d Bytes sent: %d\n", bytes_read, ret) ;
-            return(-1);
-        }
-        current_size += bytes_read ;
-    }
+				while	(	current_size	<	file_size	)	{
+								bytes_read	=	fread(buffer	,	1	,	packet_size	,	fp)	;
+								message	=	std::string(buffer);
+								message.resize(bytes_read);
+								ret	=	_connection->write(message);
+								if	(ret	!=	(int)bytes_read)	{
+												message_publish(MSG_ERROR,"Variable	Server	Error:	Failed	to	send	file.	Bytes	read:	%d	Bytes	sent:	%d\n",	bytes_read,	ret)	;
+												return(-1);
+								}
+								current_size	+=	bytes_read	;
+				}
 
-    // Switch back to non-blocking writes.
-    if (_connection->setBlockMode(false)) {
-        message_publish(MSG_DEBUG,"Variable Server Error: Failed to set socket to non-blocking mode.\n");
-        return(-1);
-    }
+				//	Switch	back	to	non-blocking	writes.
+				if	(_connection->setBlockMode(false))	{
+								message_publish(MSG_DEBUG,"Variable	Server	Error:	Failed	to	set	socket	to	non-blocking	mode.\n");
+								return(-1);
+				}
 
-    return(0) ;
+				return(0)	;
 }
 
-int Trick::VariableServerSession::send_file(std::string file_name) {
-    return transmit_file(file_name) ;
+int	Trick::VariableServerSession::send_file(std::string	file_name)	{
+				return	transmit_file(file_name)	;
 }
 
-int Trick::VariableServerSession::send_sie_resource() {
-    sie_append_runtime_objs() ;
-    return transmit_file(std::string(command_line_args_get_default_dir()) + "/S_sie.resource") ;
+int	Trick::VariableServerSession::send_sie_resource()	{
+				sie_append_runtime_objs()	;
+				return	transmit_file(std::string(command_line_args_get_default_dir())	+	"/S_sie.resource")	;
 }
 
-int Trick::VariableServerSession::send_sie_class() {
-    sie_class_attr_map_print_xml() ;
-    return transmit_file(std::string(command_line_args_get_default_dir()) + "/" + "S_sie_class.xml") ;
+int	Trick::VariableServerSession::send_sie_class()	{
+				sie_class_attr_map_print_xml()	;
+				return	transmit_file(std::string(command_line_args_get_default_dir())	+	"/"	+	"S_sie_class.xml")	;
 }
 
-int Trick::VariableServerSession::send_sie_enum() {
-    sie_enum_attr_map_print_xml() ;
-    return transmit_file(std::string(command_line_args_get_default_dir()) + "/" + "S_sie_enum.xml") ;
+int	Trick::VariableServerSession::send_sie_enum()	{
+				sie_enum_attr_map_print_xml()	;
+				return	transmit_file(std::string(command_line_args_get_default_dir())	+	"/"	+	"S_sie_enum.xml")	;
 }
 
-int Trick::VariableServerSession::send_sie_top_level_objects() {
-    sie_top_level_objects_print_xml() ;
-    return transmit_file(std::string(command_line_args_get_default_dir()) + "/" + "S_sie_top_level_objects.xml") ;
+int	Trick::VariableServerSession::send_sie_top_level_objects()	{
+				sie_top_level_objects_print_xml()	;
+				return	transmit_file(std::string(command_line_args_get_default_dir())	+	"/"	+	"S_sie_top_level_objects.xml")	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_copy_and_write_modes.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_copy_and_write_modes.cpp
index 15a746567..b07035f12 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_copy_and_write_modes.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_copy_and_write_modes.cpp
@@ -1,119 +1,119 @@
 
-#include <iostream>
-#include <string.h>
-
-#include "trick/VariableServerSession.hh"
-#include "trick/variable_server_sync_types.h"
-#include "trick/realtimesync_proto.h"
-
-// These methods should be called from approprate jobs or from the VST
-
-int Trick::VariableServerSession::copy_and_write_freeze(long long curr_freeze_frame) {
-    int ret = 0 ;
-
-    if (!get_enabled())
-        return ret;
-
-    if (get_copy_mode() == VS_COPY_TOP_OF_FRAME) {
-        long long temp_frame = curr_freeze_frame % get_freeze_frame_multiple() ;
-        if ( temp_frame == get_freeze_frame_offset() ) {
-            copy_sim_data() ;
-            if ( !get_pause() and get_write_mode() == VS_WRITE_WHEN_COPIED and is_real_time()) {
-                ret = write_data() ;
-                if ( ret < 0 ) {
-                    set_exit_cmd();
-                }
-            }
-        }
-    }
-
-    return ret ;
+#include	<iostream>
+#include	<string.h>
+
+#include	"trick/VariableServerSession.hh"
+#include	"trick/variable_server_sync_types.h"
+#include	"trick/realtimesync_proto.h"
+
+//	These	methods	should	be	called	from	approprate	jobs	or	from	the	VST
+
+int	Trick::VariableServerSession::copy_and_write_freeze(long	long	curr_freeze_frame)	{
+				int	ret	=	0	;
+
+				if	(!get_enabled())
+								return	ret;
+
+				if	(get_copy_mode()	==	VS_COPY_TOP_OF_FRAME)	{
+								long	long	temp_frame	=	curr_freeze_frame	%	get_freeze_frame_multiple()	;
+								if	(	temp_frame	==	get_freeze_frame_offset()	)	{
+												copy_sim_data()	;
+												if	(	!get_pause()	and	get_write_mode()	==	VS_WRITE_WHEN_COPIED	and	is_real_time())	{
+																ret	=	write_data()	;
+																if	(	ret	<	0	)	{
+																				set_exit_cmd();
+																}
+												}
+								}
+				}
+
+				return	ret	;
 }
 
-int Trick::VariableServerSession::copy_and_write_freeze_scheduled(long long curr_tics) {
-    int ret = 0 ;
-
-    if (!get_enabled())
-        return ret;
-
-    if (get_copy_mode() == VS_COPY_SCHEDULED) {
-        if ( get_freeze_next_tics() <= curr_tics ) {
-            copy_sim_data() ;
-            if ( !get_pause() && get_write_mode() == VS_WRITE_WHEN_COPIED && is_real_time()) {
-                ret = write_data() ;
-                if ( ret < 0 ) {
-                    set_exit_cmd();
-                }
-            }
-            set_freeze_next_tics(curr_tics + get_cycle_tics()) ;
-        }
-    }
-    return ret ;
+int	Trick::VariableServerSession::copy_and_write_freeze_scheduled(long	long	curr_tics)	{
+				int	ret	=	0	;
+
+				if	(!get_enabled())
+								return	ret;
+
+				if	(get_copy_mode()	==	VS_COPY_SCHEDULED)	{
+								if	(	get_freeze_next_tics()	<=	curr_tics	)	{
+												copy_sim_data()	;
+												if	(	!get_pause()	&&	get_write_mode()	==	VS_WRITE_WHEN_COPIED	&&	is_real_time())	{
+																ret	=	write_data()	;
+																if	(	ret	<	0	)	{
+																				set_exit_cmd();
+																}
+												}
+												set_freeze_next_tics(curr_tics	+	get_cycle_tics())	;
+								}
+				}
+				return	ret	;
 }
 
-int Trick::VariableServerSession::copy_and_write_scheduled(long long curr_tics) {
-    int ret = 0 ;
-
-    if (!get_enabled())
-        return ret;
-
-    if (get_copy_mode() == VS_COPY_SCHEDULED) {
-        if ( get_next_tics() <= curr_tics ) {
-            copy_sim_data() ;
-            if ( !get_pause() && get_write_mode() == VS_WRITE_WHEN_COPIED && is_real_time()) {
-                ret = write_data() ;
-                if ( ret < 0 ) {
-                    set_exit_cmd();
-                }
-            }
-            set_next_tics(curr_tics + get_cycle_tics()) ;
-        }
-    }
-    return ret ;
+int	Trick::VariableServerSession::copy_and_write_scheduled(long	long	curr_tics)	{
+				int	ret	=	0	;
+
+				if	(!get_enabled())
+								return	ret;
+
+				if	(get_copy_mode()	==	VS_COPY_SCHEDULED)	{
+								if	(	get_next_tics()	<=	curr_tics	)	{
+												copy_sim_data()	;
+												if	(	!get_pause()	&&	get_write_mode()	==	VS_WRITE_WHEN_COPIED	&&	is_real_time())	{
+																ret	=	write_data()	;
+																if	(	ret	<	0	)	{
+																				set_exit_cmd();
+																}
+												}
+												set_next_tics(curr_tics	+	get_cycle_tics())	;
+								}
+				}
+				return	ret	;
 }
 
-int Trick::VariableServerSession::copy_and_write_top(long long curr_frame) {
-    int ret = 0 ;
-
-    if (!get_enabled())
-        return ret;
-
-    if (get_copy_mode() == VS_COPY_TOP_OF_FRAME) {
-        long long temp_frame = curr_frame % get_frame_multiple() ;
-        if ( temp_frame == get_frame_offset() ) {
-            copy_sim_data() ;
-            if ( !get_pause() && get_write_mode() == VS_WRITE_WHEN_COPIED && is_real_time()) {
-                ret = write_data() ;
-                if ( ret < 0 ) {
-                    set_exit_cmd();
-                }
-            }
-        }
-    }
-    return ret ;
+int	Trick::VariableServerSession::copy_and_write_top(long	long	curr_frame)	{
+				int	ret	=	0	;
+
+				if	(!get_enabled())
+								return	ret;
+
+				if	(get_copy_mode()	==	VS_COPY_TOP_OF_FRAME)	{
+								long	long	temp_frame	=	curr_frame	%	get_frame_multiple()	;
+								if	(	temp_frame	==	get_frame_offset()	)	{
+												copy_sim_data()	;
+												if	(	!get_pause()	&&	get_write_mode()	==	VS_WRITE_WHEN_COPIED	&&	is_real_time())	{
+																ret	=	write_data()	;
+																if	(	ret	<	0	)	{
+																				set_exit_cmd();
+																}
+												}
+								}
+				}
+				return	ret	;
 }
 
-int Trick::VariableServerSession::copy_and_write_async() {
-    int ret = 0;
+int	Trick::VariableServerSession::copy_and_write_async()	{
+				int	ret	=	0;
 
-    if (!get_enabled()) 
-        return ret;
+				if	(!get_enabled())	
+								return	ret;
 
-    if (get_copy_mode() == VS_COPY_ASYNC ) {
-        copy_sim_data() ;
-    }
+				if	(get_copy_mode()	==	VS_COPY_ASYNC	)	{
+								copy_sim_data()	;
+				}
 
-    // Write data out to connection if async mode or non-realtime, and not paused
-    bool should_write_async = (get_write_mode() == VS_WRITE_ASYNC) || 
-                                ( get_copy_mode() == VS_COPY_ASYNC &&  get_write_mode() == VS_WRITE_WHEN_COPIED)|| 
-                                (! is_real_time());
+				//	Write	data	out	to	connection	if	async	mode	or	non-realtime,	and	not	paused
+				bool	should_write_async	=	(get_write_mode()	==	VS_WRITE_ASYNC)	||	
+																																(	get_copy_mode()	==	VS_COPY_ASYNC	&&		get_write_mode()	==	VS_WRITE_WHEN_COPIED)||	
+																																(!	is_real_time());
 
-    if ( !get_pause() && should_write_async) {
-        ret = write_data() ;
-        if ( ret < 0 ) {
-            set_exit_cmd();
-        }
-    }
+				if	(	!get_pause()	&&	should_write_async)	{
+								ret	=	write_data()	;
+								if	(	ret	<	0	)	{
+												set_exit_cmd();
+								}
+				}
 
-    return ret;
+				return	ret;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_copy_sim_data.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_copy_sim_data.cpp
index 50febc3ff..ad48c653a 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_copy_sim_data.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_copy_sim_data.cpp
@@ -1,35 +1,35 @@
 
-#include <iostream>
-#include <string.h>
+#include	<iostream>
+#include	<string.h>
 
-#include "trick/VariableServerSession.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/exec_proto.h"
+#include	"trick/VariableServerSession.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/exec_proto.h"
 
 
-// These actually do the copying
+//	These	actually	do	the	copying
 
-int Trick::VariableServerSession::copy_sim_data() {
-    return copy_sim_data(_session_variables, true);
+int	Trick::VariableServerSession::copy_sim_data()	{
+				return	copy_sim_data(_session_variables,	true);
 }
 
-int Trick::VariableServerSession::copy_sim_data(std::vector<VariableReference *>& given_vars, bool cyclical) {
+int	Trick::VariableServerSession::copy_sim_data(std::vector<VariableReference	*>&	given_vars,	bool	cyclical)	{
 
-    if (given_vars.size() == 0) {
-        return 0;
-    }
+				if	(given_vars.size()	==	0)	{
+								return	0;
+				}
 
-    if ( pthread_mutex_trylock(&_copy_mutex) == 0 ) {
-        // Get the simulation time we start this copy
-        _time = (double)exec_get_time_tics() / exec_get_time_tic_value() ;
-        
+				if	(	pthread_mutex_trylock(&_copy_mutex)	==	0	)	{
+								//	Get	the	simulation	time	we	start	this	copy
+								_time	=	(double)exec_get_time_tics()	/	exec_get_time_tic_value()	;
+								
 
-        for (auto curr_var : given_vars ) {
-            curr_var->stageValue();
-        }
+								for	(auto	curr_var	:	given_vars	)	{
+												curr_var->stageValue();
+								}
 
-        pthread_mutex_unlock(&_copy_mutex) ;
-    }
+								pthread_mutex_unlock(&_copy_mutex)	;
+				}
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_freeze_init.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_freeze_init.cpp
index 0f16323bb..a5a232ab0 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_freeze_init.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_freeze_init.cpp
@@ -1,16 +1,16 @@
 
-#include <iostream>
-#include <string.h>
+#include	<iostream>
+#include	<string.h>
 
-#include "trick/VariableServerSession.hh"
-#include "trick/TrickConstant.hh"
+#include	"trick/VariableServerSession.hh"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServerSession::freeze_init() {
-    if ( _enabled && _copy_mode == VS_COPY_SCHEDULED) {
-        _freeze_next_tics = _cycle_tics ;
-    } else {
-        _freeze_next_tics = TRICK_MAX_LONG_LONG ;
-    }
-    return 0 ;
+int	Trick::VariableServerSession::freeze_init()	{
+				if	(	_enabled	&&	_copy_mode	==	VS_COPY_SCHEDULED)	{
+								_freeze_next_tics	=	_cycle_tics	;
+				}	else	{
+								_freeze_next_tics	=	TRICK_MAX_LONG_LONG	;
+				}
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_write_data.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_write_data.cpp
index c293bc18e..710015b31 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_write_data.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_write_data.cpp
@@ -1,238 +1,238 @@
 /*
-PURPOSE:      (Allows clients to get and set Trick parameters)
-PROGRAMMERS: (((Alex Lin) (NASA) (8/06) (--)))
+PURPOSE:						(Allows	clients	to	get	and	set	Trick	parameters)
+PROGRAMMERS:	(((Alex	Lin)	(NASA)	(8/06)	(--)))
 */
 
-#include <iostream>
-#include <sstream>
-#include <pthread.h>
-#include <iomanip> // for setprecision
-#include "trick/VariableServerSession.hh"
-#include "trick/parameter_types.h"
-#include "trick/bitfield_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/tc_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-
-#define MAX_MSG_LEN    8192
-
-
-
-int Trick::VariableServerSession::write_binary_data(const std::vector<VariableReference *>& given_vars, VS_MESSAGE_TYPE message_type) {
-    typedef std::vector<VariableReference *> VarList;
-    typedef std::pair<int,VarList> MessageData;
-
-    // Some constants to make size calculations more readable
-    static const int header_size = 12;
-    static const int sizeof_size = 4;
-    static const int type_size = 4;
-
-    std::vector<MessageData> message_sizes_and_vars;
-
-    // Calculate how many messages and what vars in each
-    int total_size = header_size;
-    VarList curr_message_vars;
-    for (int i = 0; i < given_vars.size(); i++) {
-        VariableReference * var = given_vars[i];
-
-        int total_var_size = 0;
-        if (!_binary_data_nonames) {
-            total_var_size += sizeof_size;
-            total_var_size += var->getName().size();
-        }
-
-        total_var_size += type_size;
-        total_var_size += sizeof_size;
-        total_var_size += var->getSizeBinary();
-
-        // Check if this variable will fit in a message at all
-        if (header_size + total_var_size > MAX_MSG_LEN) {
-            message_publish(MSG_WARNING, "tag=<%s> Variable Server buffer[%d] too small (need %d) for symbol %s, SKIPPING IT.\n", 
-                                _connection->getClientTag().c_str(), MAX_MSG_LEN, header_size + total_var_size, var->getName().c_str());
-            
-            continue;
-        }
-
-        // If this variable won't fit in the current message, truncate the message and plan to put this var in a new one
-        if (total_size + total_var_size > MAX_MSG_LEN) {
-            message_sizes_and_vars.emplace_back(MessageData(total_size, curr_message_vars));
-            
-            if (_debug >= 2) {
-                message_publish(MSG_DEBUG, "%p tag=<%s> var_server buffer[%d] too small (need %d), sending multiple binary packets.\n",
-                                _connection, _connection->getClientTag().c_str(), MAX_MSG_LEN, total_size + total_var_size);
-            }
-
-            total_size = header_size;
-            curr_message_vars.clear();
-        }
-        total_size += total_var_size;
-        curr_message_vars.push_back(var);
-    }
-
-    message_sizes_and_vars.emplace_back(MessageData(total_size, curr_message_vars));
-    
-    // Now write out all of these messages
-    int var_index = 0;
-    for (const auto& message_info : message_sizes_and_vars) {
-        int curr_message_size = message_info.first;
-        VarList curr_message_vars = message_info.second;
-
-        std::stringstream stream;
-
-        int written_message_type = message_type;
-        int written_header_size = curr_message_size - 4;
-        int written_num_vars = curr_message_vars.size();
-
-        if (_byteswap) {
-            written_message_type = trick_byteswap_int(written_message_type);
-            written_header_size = trick_byteswap_int(written_header_size);
-            written_num_vars = trick_byteswap_int(written_num_vars);
-        }
-
-        // Header format:
-        // <message_indicator><message_size><num_vars>
-
-        // Write the header first
-        stream.write((char *)(&written_message_type), sizeof(int)); 
-        stream.write((char *)(&written_header_size), sizeof(int)); 
-        stream.write((char *)(&written_num_vars), sizeof(int));
-
-        // Write variables next
-        for (VariableReference * var : curr_message_vars) {
-            // Each variable is formatted as:
-            // <namelength><name><type><size><value
-            // namelength and name are omitted if _binary_data_nonames is on
-
-            if (!_binary_data_nonames) {
-                var->writeNameLengthBinary(stream, _byteswap);
-                var->writeNameBinary(stream, _byteswap);
-            }
-            var->writeTypeBinary(stream, _byteswap);
-            var->writeSizeBinary(stream, _byteswap);
-            var->writeValueBinary(stream, _byteswap);
-        }
-
-        if (_debug >= 2) {
-            message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending %u binary bytes containing %d variables.\n",
-                            _connection, _connection->getClientTag().c_str(), curr_message_size, curr_message_vars.size());
-        }
-
-        // Send it out!
-        char write_buf[MAX_MSG_LEN];
-        stream.read(write_buf, curr_message_size);
-        _connection->write(write_buf, curr_message_size);
-    }
-
-    return 0;
+#include	<iostream>
+#include	<sstream>
+#include	<pthread.h>
+#include	<iomanip>	//	for	setprecision
+#include	"trick/VariableServerSession.hh"
+#include	"trick/parameter_types.h"
+#include	"trick/bitfield_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/tc_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+
+#define	MAX_MSG_LEN				8192
+
+
+
+int	Trick::VariableServerSession::write_binary_data(const	std::vector<VariableReference	*>&	given_vars,	VS_MESSAGE_TYPE	message_type)	{
+				typedef	std::vector<VariableReference	*>	VarList;
+				typedef	std::pair<int,VarList>	MessageData;
+
+				//	Some	constants	to	make	size	calculations	more	readable
+				static	const	int	header_size	=	12;
+				static	const	int	sizeof_size	=	4;
+				static	const	int	type_size	=	4;
+
+				std::vector<MessageData>	message_sizes_and_vars;
+
+				//	Calculate	how	many	messages	and	what	vars	in	each
+				int	total_size	=	header_size;
+				VarList	curr_message_vars;
+				for	(int	i	=	0;	i	<	given_vars.size();	i++)	{
+								VariableReference	*	var	=	given_vars[i];
+
+								int	total_var_size	=	0;
+								if	(!_binary_data_nonames)	{
+												total_var_size	+=	sizeof_size;
+												total_var_size	+=	var->getName().size();
+								}
+
+								total_var_size	+=	type_size;
+								total_var_size	+=	sizeof_size;
+								total_var_size	+=	var->getSizeBinary();
+
+								//	Check	if	this	variable	will	fit	in	a	message	at	all
+								if	(header_size	+	total_var_size	>	MAX_MSG_LEN)	{
+												message_publish(MSG_WARNING,	"tag=<%s>	Variable	Server	buffer[%d]	too	small	(need	%d)	for	symbol	%s,	SKIPPING	IT.\n",	
+																																_connection->getClientTag().c_str(),	MAX_MSG_LEN,	header_size	+	total_var_size,	var->getName().c_str());
+												
+												continue;
+								}
+
+								//	If	this	variable	won't	fit	in	the	current	message,	truncate	the	message	and	plan	to	put	this	var	in	a	new	one
+								if	(total_size	+	total_var_size	>	MAX_MSG_LEN)	{
+												message_sizes_and_vars.emplace_back(MessageData(total_size,	curr_message_vars));
+												
+												if	(_debug	>=	2)	{
+																message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	buffer[%d]	too	small	(need	%d),	sending	multiple	binary	packets.\n",
+																																_connection,	_connection->getClientTag().c_str(),	MAX_MSG_LEN,	total_size	+	total_var_size);
+												}
+
+												total_size	=	header_size;
+												curr_message_vars.clear();
+								}
+								total_size	+=	total_var_size;
+								curr_message_vars.push_back(var);
+				}
+
+				message_sizes_and_vars.emplace_back(MessageData(total_size,	curr_message_vars));
+				
+				//	Now	write	out	all	of	these	messages
+				int	var_index	=	0;
+				for	(const	auto&	message_info	:	message_sizes_and_vars)	{
+								int	curr_message_size	=	message_info.first;
+								VarList	curr_message_vars	=	message_info.second;
+
+								std::stringstream	stream;
+
+								int	written_message_type	=	message_type;
+								int	written_header_size	=	curr_message_size	-	4;
+								int	written_num_vars	=	curr_message_vars.size();
+
+								if	(_byteswap)	{
+												written_message_type	=	trick_byteswap_int(written_message_type);
+												written_header_size	=	trick_byteswap_int(written_header_size);
+												written_num_vars	=	trick_byteswap_int(written_num_vars);
+								}
+
+								//	Header	format:
+								//	<message_indicator><message_size><num_vars>
+
+								//	Write	the	header	first
+								stream.write((char	*)(&written_message_type),	sizeof(int));	
+								stream.write((char	*)(&written_header_size),	sizeof(int));	
+								stream.write((char	*)(&written_num_vars),	sizeof(int));
+
+								//	Write	variables	next
+								for	(VariableReference	*	var	:	curr_message_vars)	{
+												//	Each	variable	is	formatted	as:
+												//	<namelength><name><type><size><value
+												//	namelength	and	name	are	omitted	if	_binary_data_nonames	is	on
+
+												if	(!_binary_data_nonames)	{
+																var->writeNameLengthBinary(stream,	_byteswap);
+																var->writeNameBinary(stream,	_byteswap);
+												}
+												var->writeTypeBinary(stream,	_byteswap);
+												var->writeSizeBinary(stream,	_byteswap);
+												var->writeValueBinary(stream,	_byteswap);
+								}
+
+								if	(_debug	>=	2)	{
+												message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	%u	binary	bytes	containing	%d	variables.\n",
+																												_connection,	_connection->getClientTag().c_str(),	curr_message_size,	curr_message_vars.size());
+								}
+
+								//	Send	it	out!
+								char	write_buf[MAX_MSG_LEN];
+								stream.read(write_buf,	curr_message_size);
+								_connection->write(write_buf,	curr_message_size);
+				}
+
+				return	0;
 }
 
-int Trick::VariableServerSession::write_ascii_data(const std::vector<VariableReference *>& given_vars, VS_MESSAGE_TYPE message_type ) {
-    // Load message type first
-    std::stringstream message_stream;
-    message_stream << (int)message_type;
-
-    int message_size = message_stream.str().size();
-
-    // Load each variable
-    for (int i = 0; i < given_vars.size(); i++) {
-        message_stream << "\t";
-
-        std::stringstream var_stream;
-        given_vars[i]->writeValueAscii(var_stream);
-
-        // Unfortunately, there isn't a good way to get the size of the buffer without putting it into a string
-        std::string var_string = var_stream.str();
-        int var_size = var_string.size();
-
-        // Check if this single variable is too big, truncate if so
-        if (var_size + 2 > MAX_MSG_LEN) {
-            message_publish(MSG_WARNING, "tag=<%s> Variable Server buffer[%d] too small for symbol %s, TRUNCATED IT.\n",
-                            _connection->getClientTag().c_str(), MAX_MSG_LEN, given_vars[i]->getName().c_str());
-            
-            var_string = var_string.substr(0, MAX_MSG_LEN-2);
-            var_size = var_string.size();
-        }
-
-        // Check that there's enough room for the next variable, tab character, and possible newline
-        if (message_size + var_size + 2 > MAX_MSG_LEN) {
-    
-            // Write out an incomplete message
-            std::string message = message_stream.str();
-
-            if (_debug >= 2) {
-                message_publish(MSG_DEBUG, "%p tag=<%s> var_server buffer[%d] too small (need %d), sending multiple ascii packets.\n",
-                                _connection, _connection->getClientTag().c_str(), MAX_MSG_LEN, message_size + var_size + 2);
-
-                message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending %d ascii bytes:\n%s\n",
-                                _connection, _connection->getClientTag().c_str(), message_size, message.c_str());
-            }
-
-            int result = _connection->write(message);
-            if (result < 0) {
-                return result;
-            }
-
-            // Clear out the message stream
-            message_stream.str("");
-            message_size = 0;
-        }
-
-        // Concatenate
-        message_stream << var_string;
-        message_size += var_size + 1;
-    }
-
-
-    // End with newline
-    message_stream << '\n';
-    std::string message = message_stream.str();
-
-    if (_debug >= 2) {
-        message_publish(MSG_DEBUG, "%p tag=<%s> var_server sending %d ascii bytes:\n%s\n",
-                        _connection, _connection->getClientTag().c_str(), message.size(), message.c_str());
-    }
-
-    int result = _connection->write(message);
-    return result;
+int	Trick::VariableServerSession::write_ascii_data(const	std::vector<VariableReference	*>&	given_vars,	VS_MESSAGE_TYPE	message_type	)	{
+				//	Load	message	type	first
+				std::stringstream	message_stream;
+				message_stream	<<	(int)message_type;
+
+				int	message_size	=	message_stream.str().size();
+
+				//	Load	each	variable
+				for	(int	i	=	0;	i	<	given_vars.size();	i++)	{
+								message_stream	<<	"\t";
+
+								std::stringstream	var_stream;
+								given_vars[i]->writeValueAscii(var_stream);
+
+								//	Unfortunately,	there	isn't	a	good	way	to	get	the	size	of	the	buffer	without	putting	it	into	a	string
+								std::string	var_string	=	var_stream.str();
+								int	var_size	=	var_string.size();
+
+								//	Check	if	this	single	variable	is	too	big,	truncate	if	so
+								if	(var_size	+	2	>	MAX_MSG_LEN)	{
+												message_publish(MSG_WARNING,	"tag=<%s>	Variable	Server	buffer[%d]	too	small	for	symbol	%s,	TRUNCATED	IT.\n",
+																												_connection->getClientTag().c_str(),	MAX_MSG_LEN,	given_vars[i]->getName().c_str());
+												
+												var_string	=	var_string.substr(0,	MAX_MSG_LEN-2);
+												var_size	=	var_string.size();
+								}
+
+								//	Check	that	there's	enough	room	for	the	next	variable,	tab	character,	and	possible	newline
+								if	(message_size	+	var_size	+	2	>	MAX_MSG_LEN)	{
+				
+												//	Write	out	an	incomplete	message
+												std::string	message	=	message_stream.str();
+
+												if	(_debug	>=	2)	{
+																message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	buffer[%d]	too	small	(need	%d),	sending	multiple	ascii	packets.\n",
+																																_connection,	_connection->getClientTag().c_str(),	MAX_MSG_LEN,	message_size	+	var_size	+	2);
+
+																message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	%d	ascii	bytes:\n%s\n",
+																																_connection,	_connection->getClientTag().c_str(),	message_size,	message.c_str());
+												}
+
+												int	result	=	_connection->write(message);
+												if	(result	<	0)	{
+																return	result;
+												}
+
+												//	Clear	out	the	message	stream
+												message_stream.str("");
+												message_size	=	0;
+								}
+
+								//	Concatenate
+								message_stream	<<	var_string;
+								message_size	+=	var_size	+	1;
+				}
+
+
+				//	End	with	newline
+				message_stream	<<	'\n';
+				std::string	message	=	message_stream.str();
+
+				if	(_debug	>=	2)	{
+								message_publish(MSG_DEBUG,	"%p	tag=<%s>	var_server	sending	%d	ascii	bytes:\n%s\n",
+																								_connection,	_connection->getClientTag().c_str(),	message.size(),	message.c_str());
+				}
+
+				int	result	=	_connection->write(message);
+				return	result;
 }
 
-int Trick::VariableServerSession::write_data() {
-    return write_data(_session_variables, VS_VAR_LIST);
+int	Trick::VariableServerSession::write_data()	{
+				return	write_data(_session_variables,	VS_VAR_LIST);
 }
 
-int Trick::VariableServerSession::write_data(std::vector<VariableReference *>& given_vars, VS_MESSAGE_TYPE message_type) { 
-    // do not send anything when there are no variables!
-    if ( given_vars.size() == 0) {
-        return(0);
-    }
-
-    int result = 0;
-
-    if ( pthread_mutex_trylock(&_copy_mutex) == 0 ) {
-        // Check that all of the variables are staged
-        for (VariableReference * variable : given_vars ) {
-            if (!variable->isStaged()) {
-                pthread_mutex_unlock(&_copy_mutex) ;
-                return 0;
-            }
-        }
-
-        // Swap buffer_in and buffer_out for each vars[ii].
-        for (VariableReference * variable : given_vars ) {
-            variable->prepareForWrite();
-        }
-
-        pthread_mutex_unlock(&_copy_mutex) ;
-
-        // Send out in correct format
-        if (_binary_data) {
-            result = write_binary_data(given_vars, message_type );
-        } else {
-            // ascii mode
-            result = write_ascii_data(given_vars, message_type );
-        }
-    }
-
-    return result;
+int	Trick::VariableServerSession::write_data(std::vector<VariableReference	*>&	given_vars,	VS_MESSAGE_TYPE	message_type)	{	
+				//	do	not	send	anything	when	there	are	no	variables!
+				if	(	given_vars.size()	==	0)	{
+								return(0);
+				}
+
+				int	result	=	0;
+
+				if	(	pthread_mutex_trylock(&_copy_mutex)	==	0	)	{
+								//	Check	that	all	of	the	variables	are	staged
+								for	(VariableReference	*	variable	:	given_vars	)	{
+												if	(!variable->isStaged())	{
+																pthread_mutex_unlock(&_copy_mutex)	;
+																return	0;
+												}
+								}
+
+								//	Swap	buffer_in	and	buffer_out	for	each	vars[ii].
+								for	(VariableReference	*	variable	:	given_vars	)	{
+												variable->prepareForWrite();
+								}
+
+								pthread_mutex_unlock(&_copy_mutex)	;
+
+								//	Send	out	in	correct	format
+								if	(_binary_data)	{
+												result	=	write_binary_data(given_vars,	message_type	);
+								}	else	{
+												//	ascii	mode
+												result	=	write_ascii_data(given_vars,	message_type	);
+								}
+				}
+
+				return	result;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServerSession_write_stdio.cpp b/trick_source/sim_services/VariableServer/VariableServerSession_write_stdio.cpp
index f95e77bf6..2729d5d1b 100644
--- a/trick_source/sim_services/VariableServer/VariableServerSession_write_stdio.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServerSession_write_stdio.cpp
@@ -1,17 +1,17 @@
-#include <sstream>
+#include	<sstream>
 
-#include "trick/VariableServerSession.hh"
-#include "trick/variable_server_message_types.h"
-#include "trick/tc_proto.h"
+#include	"trick/VariableServerSession.hh"
+#include	"trick/variable_server_message_types.h"
+#include	"trick/tc_proto.h"
 
-int Trick::VariableServerSession::write_stdio(int stream, std::string text) {
-    
-    std::stringstream outstream;
+int	Trick::VariableServerSession::write_stdio(int	stream,	std::string	text)	{
+				
+				std::stringstream	outstream;
 
-    outstream << VS_STDIO << " " << stream << " " << (int)text.length() << "\n";
-    outstream << text;
+				outstream	<<	VS_STDIO	<<	"	"	<<	stream	<<	"	"	<<	(int)text.length()	<<	"\n";
+				outstream	<<	text;
 
-    _connection->write(outstream.str());
+				_connection->write(outstream.str());
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze.cpp
index 209c56f22..3316d3f64 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze.cpp
@@ -1,13 +1,13 @@
-#include "trick/VariableServer.hh"
-#include "trick/exec_proto.h"
+#include	"trick/VariableServer.hh"
+#include	"trick/exec_proto.h"
 
-int Trick::VariableServer::copy_and_write_freeze() {
+int	Trick::VariableServer::copy_and_write_freeze()	{
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        (*it).second->copy_and_write_freeze(exec_get_freeze_frame_count()) ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								(*it).second->copy_and_write_freeze(exec_get_freeze_frame_count())	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze_scheduled.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze_scheduled.cpp
index 4c485896c..8c1589d2c 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze_scheduled.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_freeze_scheduled.cpp
@@ -1,28 +1,28 @@
 
-#include <iostream>
-#include <sys/time.h>
+#include	<iostream>
+#include	<sys/time.h>
 
-#include "trick/VariableServer.hh"
-#include "trick/TrickConstant.hh"
+#include	"trick/VariableServer.hh"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServer::copy_and_write_freeze_scheduled() {
+int	Trick::VariableServer::copy_and_write_freeze_scheduled()	{
 
-    long long next_call_tics = TRICK_MAX_LONG_LONG ;
+				long	long	next_call_tics	=	TRICK_MAX_LONG_LONG	;
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        VariableServerSession * session = (*it).second ;
-        session->copy_and_write_freeze_scheduled(copy_and_write_freeze_job->next_tics) ;
-        if ( session->get_freeze_next_tics() < next_call_tics ) {
-            next_call_tics = session->get_freeze_next_tics() ;
-        }
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								VariableServerSession	*	session	=	(*it).second	;
+								session->copy_and_write_freeze_scheduled(copy_and_write_freeze_job->next_tics)	;
+								if	(	session->get_freeze_next_tics()	<	next_call_tics	)	{
+												next_call_tics	=	session->get_freeze_next_tics()	;
+								}
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    //reschedule the current job. TODO: a call needs to be created to do this the OO way
-    if ( copy_and_write_freeze_job != NULL ) {
-        copy_and_write_freeze_job->next_tics = next_call_tics ;
-    }
+				//reschedule	the	current	job.	TODO:	a	call	needs	to	be	created	to	do	this	the	OO	way
+				if	(	copy_and_write_freeze_job	!=	NULL	)	{
+								copy_and_write_freeze_job->next_tics	=	next_call_tics	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_scheduled.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_scheduled.cpp
index fa82104f0..8ecf3daae 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_scheduled.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_scheduled.cpp
@@ -1,28 +1,28 @@
 
-#include <iostream>
-#include <sys/time.h>
+#include	<iostream>
+#include	<sys/time.h>
 
-#include "trick/VariableServer.hh"
-#include "trick/TrickConstant.hh"
+#include	"trick/VariableServer.hh"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServer::copy_and_write_scheduled() {
+int	Trick::VariableServer::copy_and_write_scheduled()	{
 
-    long long next_call_tics = TRICK_MAX_LONG_LONG;
+				long	long	next_call_tics	=	TRICK_MAX_LONG_LONG;
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        VariableServerSession *  session = (*it).second ;
-        session->copy_and_write_scheduled(copy_data_job->next_tics) ;
-        if ( session->get_next_tics() < next_call_tics ) {
-            next_call_tics = session->get_next_tics() ;
-        }
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								VariableServerSession	*		session	=	(*it).second	;
+								session->copy_and_write_scheduled(copy_data_job->next_tics)	;
+								if	(	session->get_next_tics()	<	next_call_tics	)	{
+												next_call_tics	=	session->get_next_tics()	;
+								}
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    //reschedule the current job. TODO: a call needs to be created to do this the OO way
-    if ( copy_data_job != NULL ) {
-        copy_data_job->next_tics = next_call_tics ;
-    }
+				//reschedule	the	current	job.	TODO:	a	call	needs	to	be	created	to	do	this	the	OO	way
+				if	(	copy_data_job	!=	NULL	)	{
+								copy_data_job->next_tics	=	next_call_tics	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_top.cpp b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_top.cpp
index d2d8e222c..1574ee547 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_top.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_copy_and_write_top.cpp
@@ -1,13 +1,13 @@
-#include "trick/exec_proto.h"
-#include "trick/VariableServer.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/VariableServer.hh"
 
-int Trick::VariableServer::copy_and_write_top() {
+int	Trick::VariableServer::copy_and_write_top()	{
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        (*it).second->copy_and_write_top(exec_get_frame_count()) ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								(*it).second->copy_and_write_top(exec_get_frame_count())	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    return 0 ;
+				return	0	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp b/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp
index 3c8331dce..b8a6f5b41 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_default_data.cpp
@@ -1,7 +1,7 @@
 
-#include "trick/VariableServer.hh"
+#include	"trick/VariableServer.hh"
 
-int Trick::VariableServer::default_data() {
-    return listen_thread.init_listen_device() ;
+int	Trick::VariableServer::default_data()	{
+				return	listen_thread.init_listen_device()	;
 }
 
diff --git a/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp b/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp
index 818d04646..e33c74631 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_freeze_init.cpp
@@ -1,30 +1,30 @@
 
-#include <iostream>
-#include <sys/time.h>
+#include	<iostream>
+#include	<sys/time.h>
 
-#include "trick/VariableServer.hh"
-#include "trick/variable_server_proto.h"
-#include "trick/variable_server_sync_types.h"
-#include "trick/TrickConstant.hh"
+#include	"trick/VariableServer.hh"
+#include	"trick/variable_server_proto.h"
+#include	"trick/variable_server_sync_types.h"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServer::freeze_init() {
+int	Trick::VariableServer::freeze_init()	{
 
-    long long next_call_tics = TRICK_MAX_LONG_LONG ;
+				long	long	next_call_tics	=	TRICK_MAX_LONG_LONG	;
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto  it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        VariableServerSession * session = (*it).second ;
-        session->freeze_init() ;
-        if ( session->get_freeze_next_tics() < next_call_tics ) {
-            next_call_tics = session->get_freeze_next_tics() ;
-        }
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto		it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								VariableServerSession	*	session	=	(*it).second	;
+								session->freeze_init()	;
+								if	(	session->get_freeze_next_tics()	<	next_call_tics	)	{
+												next_call_tics	=	session->get_freeze_next_tics()	;
+								}
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    //reschedule the current job. TODO: a call needs to be created to do this the OO way
-    if ( copy_and_write_freeze_job != NULL ) {
-        copy_and_write_freeze_job->next_tics = next_call_tics ;
-    }
+				//reschedule	the	current	job.	TODO:	a	call	needs	to	be	created	to	do	this	the	OO	way
+				if	(	copy_and_write_freeze_job	!=	NULL	)	{
+								copy_and_write_freeze_job->next_tics	=	next_call_tics	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp b/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp
index bbb51c812..683f3f9ec 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_get_next_freeze_call_time.cpp
@@ -1,23 +1,23 @@
 
-#include <iostream>
-#include "trick/VariableServer.hh"
-#include "trick/variable_server_sync_types.h"
-#include "trick/TrickConstant.hh"
+#include	<iostream>
+#include	"trick/VariableServer.hh"
+#include	"trick/variable_server_sync_types.h"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServer::get_next_freeze_call_time() {
+int	Trick::VariableServer::get_next_freeze_call_time()	{
 
-    long long next_call_tics = TRICK_MAX_LONG_LONG;
+				long	long	next_call_tics	=	TRICK_MAX_LONG_LONG;
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        VariableServerSession * session = (*it).second ;
-        if ( session->get_freeze_next_tics() < next_call_tics ) {
-            next_call_tics = session->get_freeze_next_tics() ;
-        }
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								VariableServerSession	*	session	=	(*it).second	;
+								if	(	session->get_freeze_next_tics()	<	next_call_tics	)	{
+												next_call_tics	=	session->get_freeze_next_tics()	;
+								}
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    copy_and_write_freeze_job->next_tics = next_call_tics ;
+				copy_and_write_freeze_job->next_tics	=	next_call_tics	;
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp b/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp
index 8761a4d42..86544a1c0 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_get_next_sync_call_time.cpp
@@ -1,24 +1,24 @@
 
-#include <iostream>
-#include "trick/VariableServer.hh"
-#include "trick/variable_server_sync_types.h"
-#include "trick/TrickConstant.hh"
+#include	<iostream>
+#include	"trick/VariableServer.hh"
+#include	"trick/variable_server_sync_types.h"
+#include	"trick/TrickConstant.hh"
 
-int Trick::VariableServer::get_next_sync_call_time() {
+int	Trick::VariableServer::get_next_sync_call_time()	{
 
-    long long next_call_tics = TRICK_MAX_LONG_LONG ;
+				long	long	next_call_tics	=	TRICK_MAX_LONG_LONG	;
 
-    pthread_mutex_lock(&map_mutex) ;
-    for ( auto it = var_server_sessions.begin() ; it != var_server_sessions.end() ; ++it ) {
-        VariableServerSession * session = (*it).second ;
-        if ( session->get_next_tics() < next_call_tics ) {
-            next_call_tics = session->get_next_tics() ;
-        }
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				pthread_mutex_lock(&map_mutex)	;
+				for	(	auto	it	=	var_server_sessions.begin()	;	it	!=	var_server_sessions.end()	;	++it	)	{
+								VariableServerSession	*	session	=	(*it).second	;
+								if	(	session->get_next_tics()	<	next_call_tics	)	{
+												next_call_tics	=	session->get_next_tics()	;
+								}
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    copy_data_job->next_tics = next_call_tics ;
+				copy_data_job->next_tics	=	next_call_tics	;
 
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_init.cpp b/trick_source/sim_services/VariableServer/VariableServer_init.cpp
index 0b224b22d..04fc9fca6 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_init.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_init.cpp
@@ -1,17 +1,17 @@
 
-#include "trick/VariableServer.hh"
-#include "trick/exec_proto.hh"
+#include	"trick/VariableServer.hh"
+#include	"trick/exec_proto.hh"
 
-int Trick::VariableServer::init() {
+int	Trick::VariableServer::init()	{
 
-    /* start up a thread for the input processor variable server */
-    if ( enabled ) {
-        int ret = listen_thread.check_and_move_listen_device() ;
-        if ( ret != 0 ) {
-            return ret ;
-        }
-        listen_thread.create_thread() ;
-    }
+				/*	start	up	a	thread	for	the	input	processor	variable	server	*/
+				if	(	enabled	)	{
+								int	ret	=	listen_thread.check_and_move_listen_device()	;
+								if	(	ret	!=	0	)	{
+												return	ret	;
+								}
+								listen_thread.create_thread()	;
+				}
 
-    return(0) ;
+				return(0)	;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_open_additional_servers.cpp b/trick_source/sim_services/VariableServer/VariableServer_open_additional_servers.cpp
index 06f560f7e..a35d56627 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_open_additional_servers.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_open_additional_servers.cpp
@@ -1,96 +1,96 @@
 
-#include <stdio.h>
-#include "trick/VariableServer.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	<stdio.h>
+#include	"trick/VariableServer.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-#include "trick/TCPConnection.hh"
-#include "trick/UDPConnection.hh"
-#include "trick/TCPClientListener.hh"
+#include	"trick/TCPConnection.hh"
+#include	"trick/UDPConnection.hh"
+#include	"trick/TCPClientListener.hh"
 
-int Trick::VariableServer::create_tcp_socket(const char * address, unsigned short in_port ) {
-    // Open a VariableServerListenThread to manage this server
+int	Trick::VariableServer::create_tcp_socket(const	char	*	address,	unsigned	short	in_port	)	{
+				//	Open	a	VariableServerListenThread	to	manage	this	server
 
-    TCPClientListener * listener = new TCPClientListener();
-    int status = listener->initialize(address, in_port);
+				TCPClientListener	*	listener	=	new	TCPClientListener();
+				int	status	=	listener->initialize(address,	in_port);
 
-    if (status != 0) {
-        message_publish(MSG_ERROR, "ERROR: Could not establish additional listen port at address %s and port %d for Variable Server.\n", address, in_port);
-        delete listener;
-        return 0;
-    }
+				if	(status	!=	0)	{
+								message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	additional	listen	port	at	address	%s	and	port	%d	for	Variable	Server.\n",	address,	in_port);
+								delete	listener;
+								return	0;
+				}
 
-    std::string set_address = listener->getHostname();
-    int set_port = listener->getPort();
+				std::string	set_address	=	listener->getHostname();
+				int	set_port	=	listener->getPort();
 
-    Trick::VariableServerListenThread * new_listen_thread = new Trick::VariableServerListenThread(listener) ;
+				Trick::VariableServerListenThread	*	new_listen_thread	=	new	Trick::VariableServerListenThread(listener)	;
 
-    new_listen_thread->copy_cpus(listen_thread.get_cpus()) ;
-    new_listen_thread->create_thread() ;
-    additional_listen_threads[new_listen_thread->get_pthread_id()] = new_listen_thread ;
+				new_listen_thread->copy_cpus(listen_thread.get_cpus())	;
+				new_listen_thread->create_thread()	;
+				additional_listen_threads[new_listen_thread->get_pthread_id()]	=	new_listen_thread	;
 
-    message_publish(MSG_INFO, "Created TCP variable server %s: %d\n", set_address.c_str(), set_port);
+				message_publish(MSG_INFO,	"Created	TCP	variable	server	%s:	%d\n",	set_address.c_str(),	set_port);
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::VariableServer::create_udp_socket(const char * address, unsigned short in_port ) {
-    // UDP sockets are created without a listen thread, and represent only 1 session
-    // Create a VariableServerSessionThread to manage this session
+int	Trick::VariableServer::create_udp_socket(const	char	*	address,	unsigned	short	in_port	)	{
+				//	UDP	sockets	are	created	without	a	listen	thread,	and	represent	only	1	session
+				//	Create	a	VariableServerSessionThread	to	manage	this	session
 
-    UDPConnection * udp_conn = new UDPConnection();
-    int status = udp_conn->initialize(address, in_port);
-    if ( status != 0 ) {
-        message_publish(MSG_ERROR, "ERROR: Could not establish UDP port at address %s and port %d for Variable Server.\n", address, in_port);
-        delete udp_conn;
-        return 0;
-    }
+				UDPConnection	*	udp_conn	=	new	UDPConnection();
+				int	status	=	udp_conn->initialize(address,	in_port);
+				if	(	status	!=	0	)	{
+								message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	UDP	port	at	address	%s	and	port	%d	for	Variable	Server.\n",	address,	in_port);
+								delete	udp_conn;
+								return	0;
+				}
 
-    std::string set_address = udp_conn->getHostname();
-    int set_port = udp_conn->getPort();
+				std::string	set_address	=	udp_conn->getHostname();
+				int	set_port	=	udp_conn->getPort();
 
-    Trick::VariableServerSessionThread * vst = new Trick::VariableServerSessionThread() ;
+				Trick::VariableServerSessionThread	*	vst	=	new	Trick::VariableServerSessionThread()	;
 
-    vst->set_connection(udp_conn);
-    vst->copy_cpus(listen_thread.get_cpus()) ;
-    vst->create_thread() ;
+				vst->set_connection(udp_conn);
+				vst->copy_cpus(listen_thread.get_cpus())	;
+				vst->create_thread()	;
 
-    message_publish(MSG_INFO, "Created UDP variable server %s: %d\n", set_address.c_str(), set_port);
+				message_publish(MSG_INFO,	"Created	UDP	variable	server	%s:	%d\n",	set_address.c_str(),	set_port);
 
-    return 0 ;
+				return	0	;
 }
 
-int Trick::VariableServer::create_multicast_socket(const char * mcast_address, const char * address, unsigned short in_port ) {
+int	Trick::VariableServer::create_multicast_socket(const	char	*	mcast_address,	const	char	*	address,	unsigned	short	in_port	)	{
 
-    // Multicast sockets are created without a listen thread, and represent only 1 session
-    // Create a VariableServerSessionThread to manage this session
+				//	Multicast	sockets	are	created	without	a	listen	thread,	and	represent	only	1	session
+				//	Create	a	VariableServerSessionThread	to	manage	this	session
 
-    if (mcast_address == NULL || mcast_address[0] == '\0') {
-        message_publish(MSG_ERROR, "Multicast address must be defined.\n");
-        return -1;
-    }
+				if	(mcast_address	==	NULL	||	mcast_address[0]	==	'\0')	{
+								message_publish(MSG_ERROR,	"Multicast	address	must	be	defined.\n");
+								return	-1;
+				}
 
-    MulticastGroup * multicast = new MulticastGroup();
-    message_publish(MSG_INFO, "Created UDP variable server %s: %d\n", address, in_port);
+				MulticastGroup	*	multicast	=	new	MulticastGroup();
+				message_publish(MSG_INFO,	"Created	UDP	variable	server	%s:	%d\n",	address,	in_port);
 
-    int status = multicast->initialize_with_receiving(address, mcast_address, in_port);
-    if ( status != 0 ) {
-        message_publish(MSG_ERROR, "ERROR: Could not establish Multicast port at address %s and port %d for Variable Server.\n", address, in_port);
-        delete multicast;
-        return 0;
-    }
+				int	status	=	multicast->initialize_with_receiving(address,	mcast_address,	in_port);
+				if	(	status	!=	0	)	{
+								message_publish(MSG_ERROR,	"ERROR:	Could	not	establish	Multicast	port	at	address	%s	and	port	%d	for	Variable	Server.\n",	address,	in_port);
+								delete	multicast;
+								return	0;
+				}
 
-    std::string set_address = multicast->getHostname();
-    int set_port = multicast->getPort();
+				std::string	set_address	=	multicast->getHostname();
+				int	set_port	=	multicast->getPort();
 
-    Trick::VariableServerSessionThread * vst = new Trick::VariableServerSessionThread() ;
+				Trick::VariableServerSessionThread	*	vst	=	new	Trick::VariableServerSessionThread()	;
 
-    vst->set_connection(multicast);
-    vst->copy_cpus(listen_thread.get_cpus()) ;
-    vst->create_thread() ;
+				vst->set_connection(multicast);
+				vst->copy_cpus(listen_thread.get_cpus())	;
+				vst->create_thread()	;
 
-    message_publish(MSG_INFO, "Multicast variable server output %s:%d\n", mcast_address, set_port) ;
+				message_publish(MSG_INFO,	"Multicast	variable	server	output	%s:%d\n",	mcast_address,	set_port)	;
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/VariableServer/VariableServer_restart.cpp b/trick_source/sim_services/VariableServer/VariableServer_restart.cpp
index 46b62ac03..7635666cd 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_restart.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_restart.cpp
@@ -1,64 +1,64 @@
 
-#include "trick/VariableServer.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/tc_proto.h"
+#include	"trick/VariableServer.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/tc_proto.h"
 
-int Trick::VariableServer::restart() {
-    listen_thread.restart() ;
-    if ( listen_thread.get_pthread_id() == 0 ) {
-        listen_thread.create_thread() ;
-    }
+int	Trick::VariableServer::restart()	{
+				listen_thread.restart()	;
+				if	(	listen_thread.get_pthread_id()	==	0	)	{
+								listen_thread.create_thread()	;
+				}
 
-    for (const auto& listen_it : additional_listen_threads) {
-        listen_it.second->restart();
-        if ( listen_it.second->get_pthread_id() == 0 ) {
-            listen_it.second->create_thread() ;
-        }
-    }
-    return 0 ;
+				for	(const	auto&	listen_it	:	additional_listen_threads)	{
+								listen_it.second->restart();
+								if	(	listen_it.second->get_pthread_id()	==	0	)	{
+												listen_it.second->create_thread()	;
+								}
+				}
+				return	0	;
 }
 
-// =====================================================================================
-// The following two functions work together to allow a MemoryManager (ASCII) checkpoint
-// to be reloaded while a variable server client is connected.
-// =====================================================================================
+//	=====================================================================================
+//	The	following	two	functions	work	together	to	allow	a	MemoryManager	(ASCII)	checkpoint
+//	to	be	reloaded	while	a	variable	server	client	is	connected.
+//	=====================================================================================
 
-// Suspend variable server processing prior to reloading a checkpoint.
-int Trick::VariableServer::suspendPreCheckpointReload() {
+//	Suspend	variable	server	processing	prior	to	reloading	a	checkpoint.
+int	Trick::VariableServer::suspendPreCheckpointReload()	{
 
-    // Pause listening on all listening threads
-    listen_thread.pause_listening() ;
-    for (const auto& listen_it : additional_listen_threads) {
-        listen_it.second->pause_listening();
-    }
+				//	Pause	listening	on	all	listening	threads
+				listen_thread.pause_listening()	;
+				for	(const	auto&	listen_it	:	additional_listen_threads)	{
+								listen_it.second->pause_listening();
+				}
 
-    // Suspend session threads
-    pthread_mutex_lock(&map_mutex) ;
-    for (const auto& vst_it : var_server_threads ) {    
-        vst_it.second->preload_checkpoint() ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				//	Suspend	session	threads
+				pthread_mutex_lock(&map_mutex)	;
+				for	(const	auto&	vst_it	:	var_server_threads	)	{				
+								vst_it.second->preload_checkpoint()	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    return 0;
+				return	0;
 }
 
-// Resume variable server processing after reloading a MemoryManager (ASCII) checkpoint.
-int Trick::VariableServer::resumePostCheckpointReload() {
-    std::map<pthread_t, VariableServerSessionThread*>::iterator pos ;
+//	Resume	variable	server	processing	after	reloading	a	MemoryManager	(ASCII)	checkpoint.
+int	Trick::VariableServer::resumePostCheckpointReload()	{
+				std::map<pthread_t,	VariableServerSessionThread*>::iterator	pos	;
 
-    // Resume all session threads
-    pthread_mutex_lock(&map_mutex) ;
-    for (const auto& vst_it : var_server_threads ) {
-        vst_it.second->restart() ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				//	Resume	all	session	threads
+				pthread_mutex_lock(&map_mutex)	;
+				for	(const	auto&	vst_it	:	var_server_threads	)	{
+								vst_it.second->restart()	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    // Restart listening on all listening threads
-    listen_thread.restart_listening() ;
-    for (const auto& listen_it : additional_listen_threads) {
-        listen_it.second->restart_listening();
-    }
+				//	Restart	listening	on	all	listening	threads
+				listen_thread.restart_listening()	;
+				for	(const	auto&	listen_it	:	additional_listen_threads)	{
+								listen_it.second->restart_listening();
+				}
 
-    return 0;
+				return	0;
 }
diff --git a/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp b/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp
index 499da7c97..85e0cfc50 100644
--- a/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp
+++ b/trick_source/sim_services/VariableServer/VariableServer_shutdown.cpp
@@ -1,21 +1,21 @@
 
-#include "trick/VariableServer.hh"
+#include	"trick/VariableServer.hh"
 
-int Trick::VariableServer::shutdown() {
-    
-    // Shutdown all listen threads
-    listen_thread.cancel_thread() ;
-    for (auto& listen_it : additional_listen_threads) {
-        listen_it.second->cancel_thread();
-    }
+int	Trick::VariableServer::shutdown()	{
+				
+				//	Shutdown	all	listen	threads
+				listen_thread.cancel_thread()	;
+				for	(auto&	listen_it	:	additional_listen_threads)	{
+								listen_it.second->cancel_thread();
+				}
 
-    // Shutdown all session threads
-    pthread_mutex_lock(&map_mutex) ;
-    for (auto& it : var_server_threads) {
-        it.second->cancel_thread() ;
-    }
-    pthread_mutex_unlock(&map_mutex) ;
+				//	Shutdown	all	session	threads
+				pthread_mutex_lock(&map_mutex)	;
+				for	(auto&	it	:	var_server_threads)	{
+								it.second->cancel_thread()	;
+				}
+				pthread_mutex_unlock(&map_mutex)	;
 
-    return 0 ;
+				return	0	;
 }
 
diff --git a/trick_source/sim_services/VariableServer/exit_var_thread.cpp b/trick_source/sim_services/VariableServer/exit_var_thread.cpp
index 80210980b..536836276 100644
--- a/trick_source/sim_services/VariableServer/exit_var_thread.cpp
+++ b/trick_source/sim_services/VariableServer/exit_var_thread.cpp
@@ -1,17 +1,17 @@
 
-#include "trick/VariableServer.hh"
+#include	"trick/VariableServer.hh"
 
-// This should only be called from the VST itself
-void exit_var_thread(void *in_vst) {
-    Trick::VariableServerSessionThread * vst = (Trick::VariableServerSessionThread *) in_vst ;
+//	This	should	only	be	called	from	the	VST	itself
+void	exit_var_thread(void	*in_vst)	{
+				Trick::VariableServerSessionThread	*	vst	=	(Trick::VariableServerSessionThread	*)	in_vst	;
 
-    Trick::VariableServer * vs = vst->get_vs() ;
-    
-    vs->delete_session(vst->get_pthread_id());
+				Trick::VariableServer	*	vs	=	vst->get_vs()	;
+				
+				vs->delete_session(vst->get_pthread_id());
 
-    // Tell the variable server that this thread is exiting.
-    vs->delete_vst(vst->get_pthread_id()) ;
+				//	Tell	the	variable	server	that	this	thread	is	exiting.
+				vs->delete_vst(vst->get_pthread_id())	;
 
-    vst->cleanup();
+				vst->cleanup();
 }
 
diff --git a/trick_source/sim_services/VariableServer/var_server_ext.cpp b/trick_source/sim_services/VariableServer/var_server_ext.cpp
index 3372d07a8..35bdf1f83 100644
--- a/trick_source/sim_services/VariableServer/var_server_ext.cpp
+++ b/trick_source/sim_services/VariableServer/var_server_ext.cpp
@@ -1,577 +1,577 @@
 
-#include <iostream>
-#include <string.h>
+#include	<iostream>
+#include	<string.h>
 
-#include "trick/VariableServer.hh"
-#include "trick/exec_proto.h"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/map_trick_units_to_udunits.hh"
-
-extern Trick::VariableServer * the_vs ;
+#include	"trick/VariableServer.hh"
+#include	"trick/exec_proto.h"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/map_trick_units_to_udunits.hh"
+
+extern	Trick::VariableServer	*	the_vs	;
 
-Trick::VariableServerSessionThread * get_vst() {
-    return the_vs->get_vst(pthread_self()) ;
+Trick::VariableServerSessionThread	*	get_vst()	{
+				return	the_vs->get_vst(pthread_self())	;
 }
-
-Trick::VariableServerSession * get_session() {
-    return the_vs->get_session(pthread_self()) ;
-}
-
-int var_add(std::string in_name) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_add(in_name) ;
-    }
-    return(0) ;
-}
-
-int var_add(std::string in_name, std::string in_units) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_add(in_name, in_units) ;
-    }
-    return(0) ;
+
+Trick::VariableServerSession	*	get_session()	{
+				return	the_vs->get_session(pthread_self())	;
+}
+
+int	var_add(std::string	in_name)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_add(in_name)	;
+				}
+				return(0)	;
+}
+
+int	var_add(std::string	in_name,	std::string	in_units)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_add(in_name,	in_units)	;
+				}
+				return(0)	;
 }
 
-int var_remove(std::string in_name) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_remove(in_name) ;
-    }
-    return(0) ;
+int	var_remove(std::string	in_name)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_remove(in_name)	;
+				}
+				return(0)	;
 }
 
-int var_units(std::string var_name , std::string units_name) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_units(var_name , units_name) ;
-    }
-    return(0) ;
+int	var_units(std::string	var_name	,	std::string	units_name)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_units(var_name	,	units_name)	;
+				}
+				return(0)	;
 }
-
-int var_exists(std::string in_name) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_exists(in_name) ;
-    }
-    return(0) ;
-}
-
-int var_send_once(std::string in_name) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_send_once(in_name, 1) ;
-    }
-    return(0) ;
-}
-
-int var_send_once(std::string in_name, int num) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_send_once(in_name, num) ;
-    }
-    return(0) ;
+
+int	var_exists(std::string	in_name)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_exists(in_name)	;
+				}
+				return(0)	;
+}
+
+int	var_send_once(std::string	in_name)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_send_once(in_name,	1)	;
+				}
+				return(0)	;
+}
+
+int	var_send_once(std::string	in_name,	int	num)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_send_once(in_name,	num)	;
+				}
+				return(0)	;
 }
 
-int var_send() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_send() ;
-    }
-    return(0) ;
+int	var_send()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_send()	;
+				}
+				return(0)	;
 }
 
-int var_clear() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_clear() ;
-    }
-
-    // std::cout << "Done with var_clear" << std::endl;
-    return(0) ;
-}
-
-int var_cycle(double in_rate) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_cycle(in_rate) ;
-    }
-    return(0) ;
-}
+int	var_clear()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_clear()	;
+				}
+
+				//	std::cout	<<	"Done	with	var_clear"	<<	std::endl;
+				return(0)	;
+}
+
+int	var_cycle(double	in_rate)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_cycle(in_rate)	;
+				}
+				return(0)	;
+}
 
-int var_pause() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->set_pause(true) ;
-    }
-    return(0) ;
-
-}
-
-int var_unpause() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->set_pause(false) ;
-    }
-    return(0) ;
-
-}
-
-int var_exit() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_exit() ;
-    }
-    return(0) ;
-}
-
-int var_validate_address(int on_off) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_validate_address((bool)on_off) ;
-    }
-    return(0) ;
-}
-
-int var_debug(int level) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_debug(level) ;
-    }
-    return(0) ;
-}
-
-int var_ascii() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_ascii() ;
-    }
-    return(0) ;
-}
-
-int var_binary() {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_binary() ;
-    }
-    return(0) ;
-}
-
-int var_retry_bad_ref() {
-    message_publish(MSG_WARNING,"var_retry_bad_ref has been deprecated\n") ;
-    return(0) ;
-}
-
-int var_binary_nonames() {
-    Trick::VariableServerSession * session  = get_session();
-    
-    if (session != NULL ) {
-        session->var_binary_nonames() ;
-    }
-    return(0) ;
-}
-
-int var_set_copy_mode(int mode) {
-    Trick::VariableServerSession * session = get_session();
-    
-    if (session != NULL ) {
-        session->var_set_copy_mode(mode) ;
-        if ( mode == VS_COPY_SCHEDULED ) {
-            the_vs->get_next_sync_call_time() ;
-            the_vs->get_next_freeze_call_time() ;
-        }
-    }
-    return 0 ;
-}
-
-int var_set_write_mode(int mode) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_set_write_mode(mode) ;
-    }
-    return 0 ;
-}
-
-int var_set_send_stdio(int mode) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->set_send_stdio((bool)mode) ;
-    }
-    return 0 ;
-}
-
-int var_sync(int mode) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_sync(mode) ;
-        if ( mode ) {
-            the_vs->get_next_sync_call_time() ;
-            the_vs->get_next_freeze_call_time() ;
-        }
-    }
-    return(0) ;
-}
-
-int var_set_frame_multiple(unsigned int mult) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_set_frame_multiple(mult) ;
-    }
-    return 0 ;
-}
-
-int var_set_frame_offset(unsigned int offset) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_set_frame_offset(offset) ;
-    }
-    return 0 ;
-}
-
-int var_set_freeze_frame_multiple(unsigned int mult) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_set_freeze_frame_multiple(mult) ;
-    }
-    return 0 ;
-}
-
-int var_set_freeze_frame_offset(unsigned int offset) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_set_freeze_frame_offset(offset) ;
-    }
-    return 0 ;
-}
-
-int var_byteswap(bool on_off) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->var_byteswap(on_off) ;
-    }
-    return(0) ;
-}
-
-int var_write_stdio(int stream , std::string text ) {
-    // std::cout << "Executing var_write_stdio" << std::endl;
-    Trick::VariableServerSession * session = get_session();
-    if (session != NULL and session->get_send_stdio() == true) {
-        session->write_stdio(stream, text) ;
-    } else {
-        if ( stream == 1 ) {
-            fprintf( stdout , "%s" , text.c_str() ) ;
-        } else {
-            fprintf( stderr , "%s" , text.c_str() ) ;
-        }
-    }
-    return(0) ;
-}
-
-int var_set_client_tag( std::string text ) {
-    Trick::VariableServerSessionThread * vst = get_vst();
-    if (vst != NULL) {
-
-        vst->set_client_tag(text);
-        
-#if __linux
-#ifdef __GNUC__
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-        std::string short_str = std::string("VS_") + text.substr(0,12) ;
-        pthread_setname_np(pthread_self(), short_str.c_str()) ;
+int	var_pause()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->set_pause(true)	;
+				}
+				return(0)	;
+
+}
+
+int	var_unpause()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->set_pause(false)	;
+				}
+				return(0)	;
+
+}
+
+int	var_exit()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_exit()	;
+				}
+				return(0)	;
+}
+
+int	var_validate_address(int	on_off)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_validate_address((bool)on_off)	;
+				}
+				return(0)	;
+}
+
+int	var_debug(int	level)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_debug(level)	;
+				}
+				return(0)	;
+}
+
+int	var_ascii()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_ascii()	;
+				}
+				return(0)	;
+}
+
+int	var_binary()	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_binary()	;
+				}
+				return(0)	;
+}
+
+int	var_retry_bad_ref()	{
+				message_publish(MSG_WARNING,"var_retry_bad_ref	has	been	deprecated\n")	;
+				return(0)	;
+}
+
+int	var_binary_nonames()	{
+				Trick::VariableServerSession	*	session		=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_binary_nonames()	;
+				}
+				return(0)	;
+}
+
+int	var_set_copy_mode(int	mode)	{
+				Trick::VariableServerSession	*	session	=	get_session();
+				
+				if	(session	!=	NULL	)	{
+								session->var_set_copy_mode(mode)	;
+								if	(	mode	==	VS_COPY_SCHEDULED	)	{
+												the_vs->get_next_sync_call_time()	;
+												the_vs->get_next_freeze_call_time()	;
+								}
+				}
+				return	0	;
+}
+
+int	var_set_write_mode(int	mode)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_set_write_mode(mode)	;
+				}
+				return	0	;
+}
+
+int	var_set_send_stdio(int	mode)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->set_send_stdio((bool)mode)	;
+				}
+				return	0	;
+}
+
+int	var_sync(int	mode)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_sync(mode)	;
+								if	(	mode	)	{
+												the_vs->get_next_sync_call_time()	;
+												the_vs->get_next_freeze_call_time()	;
+								}
+				}
+				return(0)	;
+}
+
+int	var_set_frame_multiple(unsigned	int	mult)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_set_frame_multiple(mult)	;
+				}
+				return	0	;
+}
+
+int	var_set_frame_offset(unsigned	int	offset)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_set_frame_offset(offset)	;
+				}
+				return	0	;
+}
+
+int	var_set_freeze_frame_multiple(unsigned	int	mult)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_set_freeze_frame_multiple(mult)	;
+				}
+				return	0	;
+}
+
+int	var_set_freeze_frame_offset(unsigned	int	offset)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_set_freeze_frame_offset(offset)	;
+				}
+				return	0	;
+}
+
+int	var_byteswap(bool	on_off)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->var_byteswap(on_off)	;
+				}
+				return(0)	;
+}
+
+int	var_write_stdio(int	stream	,	std::string	text	)	{
+				//	std::cout	<<	"Executing	var_write_stdio"	<<	std::endl;
+				Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	and	session->get_send_stdio()	==	true)	{
+								session->write_stdio(stream,	text)	;
+				}	else	{
+								if	(	stream	==	1	)	{
+												fprintf(	stdout	,	"%s"	,	text.c_str()	)	;
+								}	else	{
+												fprintf(	stderr	,	"%s"	,	text.c_str()	)	;
+								}
+				}
+				return(0)	;
+}
+
+int	var_set_client_tag(	std::string	text	)	{
+				Trick::VariableServerSessionThread	*	vst	=	get_vst();
+				if	(vst	!=	NULL)	{
+
+								vst->set_client_tag(text);
+								
+#if	__linux
+#ifdef	__GNUC__
+#if	__GNUC__	>=	4	&&	__GNUC_MINOR__	>=	2
+								std::string	short_str	=	std::string("VS_")	+	text.substr(0,12)	;
+								pthread_setname_np(pthread_self(),	short_str.c_str())	;
 #endif
 #endif
 #endif
-    }
-    return(0) ;
+				}
+				return(0)	;
 }
 
-int var_send_list_size() {
+int	var_send_list_size()	{
 
-    Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->send_list_size() ;
-    }
-    return(0) ;
+				Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->send_list_size()	;
+				}
+				return(0)	;
 }
 
-int send_sie_resource() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->send_sie_resource() ;
-    }
-    return 0 ;
+int	send_sie_resource()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->send_sie_resource()	;
+				}
+				return	0	;
 }
 
-int send_sie_class() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->send_sie_class() ;
-    }
-    return 0 ;
+int	send_sie_class()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->send_sie_class()	;
+				}
+				return	0	;
 }
 
-int send_sie_enum() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        session->send_sie_enum() ;
-    }
-    return 0 ;
+int	send_sie_enum()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								session->send_sie_enum()	;
+				}
+				return	0	;
 }
 
-int send_sie_top_level_objects() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->send_sie_top_level_objects() ;
-    }
-    return 0 ;
+int	send_sie_top_level_objects()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->send_sie_top_level_objects()	;
+				}
+				return	0	;
 }
 
-int send_file(std::string file_name) {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->send_file(file_name) ;
-    }
-    return 0 ;
+int	send_file(std::string	file_name)	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->send_file(file_name)	;
+				}
+				return	0	;
 }
 
 
-// Command to turn on log to playback file
-int var_server_log_on() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->set_log(true) ;
-    }
-    return 0 ;
+//	Command	to	turn	on	log	to	playback	file
+int	var_server_log_on()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->set_log(true)	;
+				}
+				return	0	;
 }
 
-// Command to turn off log to playback file
-int var_server_log_off() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->set_log(false) ;
-    }
-    return 0 ;
+//	Command	to	turn	off	log	to	playback	file
+int	var_server_log_off()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->set_log(false)	;
+				}
+				return	0	;
 }
 
-// Command to turn on log to playback file
-int var_server_session_log_on() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->set_session_log(true) ;
-    }
-    return 0 ;
+//	Command	to	turn	on	log	to	playback	file
+int	var_server_session_log_on()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->set_session_log(true)	;
+				}
+				return	0	;
 }
 
-// Command to turn off log to playback file
-int var_server_session_log_off() {
-Trick::VariableServerSession * session = get_session();
-    if (session != NULL ) {
-        return session->set_session_log(false) ;
-    }
-    return 0 ;
+//	Command	to	turn	off	log	to	playback	file
+int	var_server_session_log_off()	{
+Trick::VariableServerSession	*	session	=	get_session();
+				if	(session	!=	NULL	)	{
+								return	session->set_session_log(false)	;
+				}
+				return	0	;
 }
 
-Trick::VariableServer * var_server_get_var_server() {
-    return the_vs ;
+Trick::VariableServer	*	var_server_get_var_server()	{
+				return	the_vs	;
 }
 
-extern "C" void var_server_list_connections(void) {
-    std::cout << *the_vs << std::endl;
+extern	"C"	void	var_server_list_connections(void)	{
+				std::cout	<<	*the_vs	<<	std::endl;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::get_hostname
- * C wrapper Trick::VariableServer::get_hostname
- */
-extern "C" const char * var_server_get_hostname(void) {
-    const char * ret = (the_vs->get_hostname()) ;
-    return ret;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::get_hostname
+	*	C	wrapper	Trick::VariableServer::get_hostname
+	*/
+extern	"C"	const	char	*	var_server_get_hostname(void)	{
+				const	char	*	ret	=	(the_vs->get_hostname())	;
+				return	ret;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::get_port
- * C wrapper Trick::VariableServer::get_port
- */
-extern "C" unsigned short var_server_get_port(void) {
-    return(the_vs->get_listen_thread().get_port()) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::get_port
+	*	C	wrapper	Trick::VariableServer::get_port
+	*/
+extern	"C"	unsigned	short	var_server_get_port(void)	{
+				return(the_vs->get_listen_thread().get_port())	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::set_port
- * C wrapper Trick::VariableServer::set_port
- */
-extern "C" void var_server_set_port(unsigned short port) {
-    the_vs->get_listen_thread().set_port(port);
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::set_port
+	*	C	wrapper	Trick::VariableServer::set_port
+	*/
+extern	"C"	void	var_server_set_port(unsigned	short	port)	{
+				the_vs->get_listen_thread().set_port(port);
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::set_listen_socket
- * C wrapper Trick::VariableServer::set_listen_socket
- */
-extern "C" void var_server_set_source_address(const char * source_address) {
-    the_vs->get_listen_thread().set_source_address(source_address) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::set_listen_socket
+	*	C	wrapper	Trick::VariableServer::set_listen_socket
+	*/
+extern	"C"	void	var_server_set_source_address(const	char	*	source_address)	{
+				the_vs->get_listen_thread().set_source_address(source_address)	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::get_user_tag
- * C wrapper Trick::VariableServer::get_user_tag
- */
-extern "C" const char * var_server_get_user_tag(void) {
-    return(the_vs->get_listen_thread().get_user_tag_ref().c_str()) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::get_user_tag
+	*	C	wrapper	Trick::VariableServer::get_user_tag
+	*/
+extern	"C"	const	char	*	var_server_get_user_tag(void)	{
+				return(the_vs->get_listen_thread().get_user_tag_ref().c_str())	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::set_user_tag
- * C wrapper Trick::VariableServer::set_user_tag
- */
-extern "C" void var_server_set_user_tag(const char * in_tag) {
-    the_vs->get_listen_thread().set_user_tag(std::string(in_tag));
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::set_user_tag
+	*	C	wrapper	Trick::VariableServer::set_user_tag
+	*/
+extern	"C"	void	var_server_set_user_tag(const	char	*	in_tag)	{
+				the_vs->get_listen_thread().set_user_tag(std::string(in_tag));
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::get_enabled
- * C wrapper Trick::VariableServer::get_enabled
- */
-extern "C" int var_server_get_enabled(void) {
-    return(the_vs->get_enabled()) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::get_enabled
+	*	C	wrapper	Trick::VariableServer::get_enabled
+	*/
+extern	"C"	int	var_server_get_enabled(void)	{
+				return(the_vs->get_enabled())	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::set_enabled
- * C wrapper Trick::VariableServer::set_enabled
- */
-extern "C" void var_server_set_enabled(int on_off) {
-    the_vs->set_enabled((bool)on_off) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::set_enabled
+	*	C	wrapper	Trick::VariableServer::set_enabled
+	*/
+extern	"C"	void	var_server_set_enabled(int	on_off)	{
+				the_vs->set_enabled((bool)on_off)	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::create_udp_socket
- * C wrapper Trick::VariableServer::create_udp_socket
- */
-extern "C" int var_server_create_tcp_socket(const char * source_address, unsigned short port) {
-    the_vs->create_tcp_socket(source_address, port) ;
-    return 0 ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::create_udp_socket
+	*	C	wrapper	Trick::VariableServer::create_udp_socket
+	*/
+extern	"C"	int	var_server_create_tcp_socket(const	char	*	source_address,	unsigned	short	port)	{
+				the_vs->create_tcp_socket(source_address,	port)	;
+				return	0	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::create_udp_socket
- * C wrapper Trick::VariableServer::create_udp_socket
- */
-extern "C" int var_server_create_udp_socket(const char * source_address, unsigned short port) {
-    the_vs->create_udp_socket(source_address, port) ;
-    return 0 ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::create_udp_socket
+	*	C	wrapper	Trick::VariableServer::create_udp_socket
+	*/
+extern	"C"	int	var_server_create_udp_socket(const	char	*	source_address,	unsigned	short	port)	{
+				the_vs->create_udp_socket(source_address,	port)	;
+				return	0	;
 }
 
 /**
- * @relates Trick::VariableServer
- * @copydoc Trick::VariableServer::create_multicast_socket
- * C wrapper Trick::VariableServer::create_multicast_socket
- */
-extern "C" int var_server_create_multicast_socket(const char * mcast_address,
- const char * source_address, unsigned short port) {
-    return the_vs->create_multicast_socket(mcast_address, source_address, port) ;
+	*	@relates	Trick::VariableServer
+	*	@copydoc	Trick::VariableServer::create_multicast_socket
+	*	C	wrapper	Trick::VariableServer::create_multicast_socket
+	*/
+extern	"C"	int	var_server_create_multicast_socket(const	char	*	mcast_address,
+	const	char	*	source_address,	unsigned	short	port)	{
+				return	the_vs->create_multicast_socket(mcast_address,	source_address,	port)	;
 }
 
-template<class T>
-void var_set_value( V_DATA & v_data , T value ) ;
+template<class	T>
+void	var_set_value(	V_DATA	&	v_data	,	T	value	)	;
 
 template<>
-void var_set_value< double > ( V_DATA & v_data , double value ) {
-    v_data.value.d = value ;
-    v_data.type = TRICK_DOUBLE ;
+void	var_set_value<	double	>	(	V_DATA	&	v_data	,	double	value	)	{
+				v_data.value.d	=	value	;
+				v_data.type	=	TRICK_DOUBLE	;
 }
 
 template<>
-void var_set_value< long long > ( V_DATA & v_data , long long value ) {
-    v_data.value.ll = value ;
-    v_data.type = TRICK_LONG_LONG ;
+void	var_set_value<	long	long	>	(	V_DATA	&	v_data	,	long	long	value	)	{
+				v_data.value.ll	=	value	;
+				v_data.type	=	TRICK_LONG_LONG	;
 }
 
 template<>
-void var_set_value< const char * > ( V_DATA & v_data , const char * value ) {
-    v_data.value.cp = (char *)value ;
-    v_data.type = TRICK_STRING ;
+void	var_set_value<	const	char	*	>	(	V_DATA	&	v_data	,	const	char	*	value	)	{
+				v_data.value.cp	=	(char	*)value	;
+				v_data.type	=	TRICK_STRING	;
 }
 
 template<>
-void var_set_value< void * > ( V_DATA & v_data , void * value ) {
-    v_data.value.vp = value ;
-    v_data.type = TRICK_VOID_PTR ;
-}
-
-template<class T>
-int var_set_base( const char  * var , T value , const char * units ) {
-    REF2 *ref = ref_attributes(var) ;
-    if ( ref != NULL ) {
-        if (ref->attr->io & TRICK_VAR_INPUT) {
-            V_TREE v_tree ;
-            V_DATA v_data ;
-            v_tree.v_data = &v_data ;
-            var_set_value( v_data , value) ;
-            if ( units != NULL ) {
-                ref->units = strdup(map_trick_units_to_udunits(units).c_str()) ;
-            } else {
-                ref->units = NULL ;
-            }
-            ref_assignment(ref , &v_tree) ;
-            if(ref->units != NULL) {
-                free(ref->units) ;
-                ref->units = NULL;
-            }
-            free(ref) ;
-            ref = NULL;
-        } else {
-            message_publish(MSG_WARNING,"Cannot assign to %s because io_spec does not allow input\n", var) ;
-            return 1;
-        }
-    } else {
-        message_publish(MSG_WARNING,"reference attributes not found for variable %s in call to var_set\n", var) ;
-        return 2;
-    }
-    return 0 ;
-}
-
-int var_set( const char  * var , double value , const char * units ) {
-    return var_set_base(var, value, units) ;
-}
-
-int var_set( const char  * var , long long value , const char * units ) {
-    return var_set_base(var, value, units) ;
-}
-
-int var_set( const char  * var , const char * value , const char * units ) {
-    return var_set_base(var, value, units) ;
-}
-
-int var_set( const char  * var , void * value , const char * units ) {
-    return var_set_base(var, value, units) ;
+void	var_set_value<	void	*	>	(	V_DATA	&	v_data	,	void	*	value	)	{
+				v_data.value.vp	=	value	;
+				v_data.type	=	TRICK_VOID_PTR	;
+}
+
+template<class	T>
+int	var_set_base(	const	char		*	var	,	T	value	,	const	char	*	units	)	{
+				REF2	*ref	=	ref_attributes(var)	;
+				if	(	ref	!=	NULL	)	{
+								if	(ref->attr->io	&	TRICK_VAR_INPUT)	{
+												V_TREE	v_tree	;
+												V_DATA	v_data	;
+												v_tree.v_data	=	&v_data	;
+												var_set_value(	v_data	,	value)	;
+												if	(	units	!=	NULL	)	{
+																ref->units	=	strdup(map_trick_units_to_udunits(units).c_str())	;
+												}	else	{
+																ref->units	=	NULL	;
+												}
+												ref_assignment(ref	,	&v_tree)	;
+												if(ref->units	!=	NULL)	{
+																free(ref->units)	;
+																ref->units	=	NULL;
+												}
+												free(ref)	;
+												ref	=	NULL;
+								}	else	{
+												message_publish(MSG_WARNING,"Cannot	assign	to	%s	because	io_spec	does	not	allow	input\n",	var)	;
+												return	1;
+								}
+				}	else	{
+								message_publish(MSG_WARNING,"reference	attributes	not	found	for	variable	%s	in	call	to	var_set\n",	var)	;
+								return	2;
+				}
+				return	0	;
+}
+
+int	var_set(	const	char		*	var	,	double	value	,	const	char	*	units	)	{
+				return	var_set_base(var,	value,	units)	;
+}
+
+int	var_set(	const	char		*	var	,	long	long	value	,	const	char	*	units	)	{
+				return	var_set_base(var,	value,	units)	;
+}
+
+int	var_set(	const	char		*	var	,	const	char	*	value	,	const	char	*	units	)	{
+				return	var_set_base(var,	value,	units)	;
+}
+
+int	var_set(	const	char		*	var	,	void	*	value	,	const	char	*	units	)	{
+				return	var_set_base(var,	value,	units)	;
 }
diff --git a/trick_source/sim_services/Zeroconf/Zeroconf.cpp b/trick_source/sim_services/Zeroconf/Zeroconf.cpp
index 664cd722a..4306fcb2e 100644
--- a/trick_source/sim_services/Zeroconf/Zeroconf.cpp
+++ b/trick_source/sim_services/Zeroconf/Zeroconf.cpp
@@ -1,107 +1,107 @@
 
-#include <stdio.h>
-
-#ifdef HAVE_ZEROCONF
-#if __linux
-#include <avahi-client/client.h>
-#include <avahi-client/publish.h>
-#include <avahi-common/simple-watch.h>
-#include <avahi-common/alternative.h>
-#include <avahi-common/error.h>
-#include <avahi-common/malloc.h>
+#include	<stdio.h>
+
+#ifdef	HAVE_ZEROCONF
+#if	__linux
+#include	<avahi-client/client.h>
+#include	<avahi-client/publish.h>
+#include	<avahi-common/simple-watch.h>
+#include	<avahi-common/alternative.h>
+#include	<avahi-common/error.h>
+#include	<avahi-common/malloc.h>
 #endif
-#if __APPLE__
-#include <dns_sd.h>
+#if	__APPLE__
+#include	<dns_sd.h>
 #endif
 #endif
 
-#include "trick/Zeroconf.hh"
-#include "trick/variable_server_proto.h"
+#include	"trick/Zeroconf.hh"
+#include	"trick/variable_server_proto.h"
 
-Trick::Zeroconf::Zeroconf() {
-    name = std::string("My Sim!!!") ;
-    type = std::string("_trick-vs._tcp") ;
+Trick::Zeroconf::Zeroconf()	{
+				name	=	std::string("My	Sim!!!")	;
+				type	=	std::string("_trick-vs._tcp")	;
 
-#ifdef HAVE_ZEROCONF
-#if __linux
-    simple_poll = NULL ;
-    client = NULL ;
-    group = NULL ;
+#ifdef	HAVE_ZEROCONF
+#if	__linux
+				simple_poll	=	NULL	;
+				client	=	NULL	;
+				group	=	NULL	;
 #endif
 #endif
 
 }
 
-#ifdef HAVE_ZEROCONF
-#if __linux
-extern "C" void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) ;
+#ifdef	HAVE_ZEROCONF
+#if	__linux
+extern	"C"	void	entry_group_callback(AvahiEntryGroup	*g,	AvahiEntryGroupState	state,	void	*userdata)	;
 
-extern "C" {
-void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
+extern	"C"	{
+void	entry_group_callback(AvahiEntryGroup	*g,	AvahiEntryGroupState	state,	void	*userdata)	{
 
-    /* Called whenever the entry group state changes */
-    char * name = (char *)userdata;
+				/*	Called	whenever	the	entry	group	state	changes	*/
+				char	*	name	=	(char	*)userdata;
 
-    switch (state) {
-        case AVAHI_ENTRY_GROUP_ESTABLISHED :
-            /* The entry group has been established successfully */
-            fprintf(stderr, "Service '%s' successfully established.\n", name);
-            break;
+				switch	(state)	{
+								case	AVAHI_ENTRY_GROUP_ESTABLISHED	:
+												/*	The	entry	group	has	been	established	successfully	*/
+												fprintf(stderr,	"Service	'%s'	successfully	established.\n",	name);
+												break;
 
-        case AVAHI_ENTRY_GROUP_COLLISION :
-            break;
+								case	AVAHI_ENTRY_GROUP_COLLISION	:
+												break;
 
-        case AVAHI_ENTRY_GROUP_FAILURE :
-            fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
-            break;
+								case	AVAHI_ENTRY_GROUP_FAILURE	:
+												fprintf(stderr,	"Entry	group	failure:	%s\n",	avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
+												break;
 
-        case AVAHI_ENTRY_GROUP_UNCOMMITED:
-        case AVAHI_ENTRY_GROUP_REGISTERING:
-            break;
-    }
+								case	AVAHI_ENTRY_GROUP_UNCOMMITED:
+								case	AVAHI_ENTRY_GROUP_REGISTERING:
+												break;
+				}
 }
 }
 #endif
 #endif
 
-int Trick::Zeroconf::init() {
-
-#ifdef HAVE_ZEROCONF
-#if __linux
-    int error;
-    int ret ;
-    char r[128] ;
-
-    if (!(simple_poll = avahi_simple_poll_new())) {
-        fprintf(stderr, "Failed to create simple poll object.\n");
-        return -1 ;
-    }
-
-    client = avahi_client_new(avahi_simple_poll_get(simple_poll), (AvahiClientFlags)0, NULL, NULL, &error);
-
-    if ( client != NULL ) {
-        group = avahi_entry_group_new(client, entry_group_callback, (void *)name.c_str()) ;
-        if (avahi_entry_group_is_empty(group)) {
-            ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, (AvahiPublishFlags)0,
-                name.c_str(), type.c_str(), NULL, NULL, var_server_get_port(), NULL, r, NULL) ;
-            ret = avahi_entry_group_commit(group) ;
-        }
-    }
+int	Trick::Zeroconf::init()	{
+
+#ifdef	HAVE_ZEROCONF
+#if	__linux
+				int	error;
+				int	ret	;
+				char	r[128]	;
+
+				if	(!(simple_poll	=	avahi_simple_poll_new()))	{
+								fprintf(stderr,	"Failed	to	create	simple	poll	object.\n");
+								return	-1	;
+				}
+
+				client	=	avahi_client_new(avahi_simple_poll_get(simple_poll),	(AvahiClientFlags)0,	NULL,	NULL,	&error);
+
+				if	(	client	!=	NULL	)	{
+								group	=	avahi_entry_group_new(client,	entry_group_callback,	(void	*)name.c_str())	;
+								if	(avahi_entry_group_is_empty(group))	{
+												ret	=	avahi_entry_group_add_service(group,	AVAHI_IF_UNSPEC,	AVAHI_PROTO_UNSPEC,	(AvahiPublishFlags)0,
+																name.c_str(),	type.c_str(),	NULL,	NULL,	var_server_get_port(),	NULL,	r,	NULL)	;
+												ret	=	avahi_entry_group_commit(group)	;
+								}
+				}
 #endif
-#if __APPLE__
-    DNSServiceErrorType error ;
-
-    error = DNSServiceRegister(&dns_service_ref,
-                         0, 0,
-                         name.c_str(), type.c_str(),
-                         NULL, NULL,
-                         htons(var_server_get_port()),
-                         0, NULL, // txt record stuff
-                         NULL, NULL); // callback stuff
+#if	__APPLE__
+				DNSServiceErrorType	error	;
+
+				error	=	DNSServiceRegister(&dns_service_ref,
+																									0,	0,
+																									name.c_str(),	type.c_str(),
+																									NULL,	NULL,
+																									htons(var_server_get_port()),
+																									0,	NULL,	//	txt	record	stuff
+																									NULL,	NULL);	//	callback	stuff
 #endif
 #endif
 
-    return 0 ;
+				return	0	;
 
 }
 
diff --git a/trick_source/sim_services/mains/master.cpp b/trick_source/sim_services/mains/master.cpp
index 444cae295..3a04134c3 100644
--- a/trick_source/sim_services/mains/master.cpp
+++ b/trick_source/sim_services/mains/master.cpp
@@ -1,53 +1,53 @@
 /*
-PURPOSE:                    (The Trick simulation executive MAIN program.)
-REFERENCE:                  ((Bailey, R.W, and Paddock, E.J.)
-                             (Trick Simulation Environment)
-                             (JSC / Automation and Robotics Division)
-                             (June 1994))
-ASSUMPTIONS AND LIMITATIONS: (It all starts here)
-PROGRAMMERS:                 ( (Robert W. Bailey) (LinCom) (April 1992) )
+PURPOSE:																				(The	Trick	simulation	executive	MAIN	program.)
+REFERENCE:																		((Bailey,	R.W,	and	Paddock,	E.J.)
+																													(Trick	Simulation	Environment)
+																													(JSC	/	Automation	and	Robotics	Division)
+																													(June	1994))
+ASSUMPTIONS	AND	LIMITATIONS:	(It	all	starts	here)
+PROGRAMMERS:																	(	(Robert	W.	Bailey)	(LinCom)	(April	1992)	)
 */
 
-#include <iostream>
-#include <locale.h>
+#include	<iostream>
+#include	<locale.h>
 
-#include "trick/Executive.hh"
-#include "trick/command_line_protos.h"
-#include "trick/exec_proto.hh"
+#include	"trick/Executive.hh"
+#include	"trick/command_line_protos.h"
+#include	"trick/exec_proto.hh"
 
-//TODO move to proto
-void memory_init(void);
+//TODO	move	to	proto
+void	memory_init(void);
 
-int master( int nargs, char **args) {
+int	master(	int	nargs,	char	**args)	{
 
-    int ret ;
+				int	ret	;
 
-    /* Set the locale */
-    if  (setlocale(LC_CTYPE, "") == NULL) {
-        fprintf(stderr, "Unable to set the locale.\n");
-        fprintf(stderr, "Please check LANG, LC_CTYPE and LC_ALL.\n");
-        return 1;
-    }
+				/*	Set	the	locale	*/
+				if		(setlocale(LC_CTYPE,	"")	==	NULL)	{
+								fprintf(stderr,	"Unable	to	set	the	locale.\n");
+								fprintf(stderr,	"Please	check	LANG,	LC_CTYPE	and	LC_ALL.\n");
+								return	1;
+				}
 
-    /* adds sim objects including the executive defined at CP time */
-    memory_init() ;
+				/*	adds	sim	objects	including	the	executive	defined	at	CP	time	*/
+				memory_init()	;
 
-    /* process generic command line arguments */
-    //Trick::CommandLineArguments * cmd_args = exec_get_cmd_args() ;
-    command_line_args_process_sim_args(nargs, args) ;
+				/*	process	generic	command	line	arguments	*/
+				//Trick::CommandLineArguments	*	cmd_args	=	exec_get_cmd_args()	;
+				command_line_args_process_sim_args(nargs,	args)	;
 
-    /* get the exec pointer */
-    Trick::Executive * exec = exec_get_exec_cpp() ;
+				/*	get	the	exec	pointer	*/
+				Trick::Executive	*	exec	=	exec_get_exec_cpp()	;
 
-    ret = exec->init() ;
+				ret	=	exec->init()	;
 
-    if ( ret == 0 ) {
-        exec->loop() ;
-    }
-    ret = exec->shutdown() ;
+				if	(	ret	==	0	)	{
+								exec->loop()	;
+				}
+				ret	=	exec->shutdown()	;
 
-    //TODO: add call to free all memory from memory manager
+				//TODO:	add	call	to	free	all	memory	from	memory	manager
 
-    return ret ;
+				return	ret	;
 }
 
diff --git a/trick_source/trick_swig/PrimitiveAttributesMap.cpp b/trick_source/trick_swig/PrimitiveAttributesMap.cpp
index 659f2fd62..b35081420 100644
--- a/trick_source/trick_swig/PrimitiveAttributesMap.cpp
+++ b/trick_source/trick_swig/PrimitiveAttributesMap.cpp
@@ -1,55 +1,55 @@
 
-#include <string.h>
-#include "trick/swig/PrimitiveAttributesMap.hh"
+#include	<string.h>
+#include	"trick/swig/PrimitiveAttributesMap.hh"
 
-// Global instance.  This isn't a singleton, but the only one that works with attributes_map.
-Trick::PrimitiveAttributesMap attr_map ;
+//	Global	instance.		This	isn't	a	singleton,	but	the	only	one	that	works	with	attributes_map.
+Trick::PrimitiveAttributesMap	attr_map	;
 
-Trick::PrimitiveAttributesMap * Trick::PrimitiveAttributesMap::attributes_map() {
-    return(&attr_map) ;
-} ;
+Trick::PrimitiveAttributesMap	*	Trick::PrimitiveAttributesMap::attributes_map()	{
+				return(&attr_map)	;
+}	;
 
-Trick::PrimitiveAttributesMap::PrimitiveAttributesMap() {
-    add_type("char", TRICK_CHARACTER , sizeof(char)) ;
-    add_type("unsigned char", TRICK_UNSIGNED_CHARACTER , sizeof(unsigned char)) ;
-    add_type("short", TRICK_SHORT , sizeof(short)) ;
-    add_type("unsigned short", TRICK_UNSIGNED_SHORT , sizeof(unsigned short)) ;
-    add_type("int", TRICK_INTEGER , sizeof(int)) ;
-    add_type("unsigned int", TRICK_UNSIGNED_INTEGER , sizeof(unsigned int)) ;
-    add_type("long", TRICK_LONG , sizeof(long)) ;
-    add_type("unsigned long", TRICK_UNSIGNED_LONG , sizeof(unsigned long)) ;
-    add_type("long long", TRICK_LONG_LONG , sizeof(long long)) ;
-    add_type("unsigned long long", TRICK_UNSIGNED_LONG_LONG , sizeof(unsigned long long)) ;
-    add_type("bool", TRICK_BOOLEAN , sizeof(bool)) ;
-    add_type("double", TRICK_DOUBLE , sizeof(double)) ;
-    add_type("float", TRICK_FLOAT , sizeof(float)) ;
+Trick::PrimitiveAttributesMap::PrimitiveAttributesMap()	{
+				add_type("char",	TRICK_CHARACTER	,	sizeof(char))	;
+				add_type("unsigned	char",	TRICK_UNSIGNED_CHARACTER	,	sizeof(unsigned	char))	;
+				add_type("short",	TRICK_SHORT	,	sizeof(short))	;
+				add_type("unsigned	short",	TRICK_UNSIGNED_SHORT	,	sizeof(unsigned	short))	;
+				add_type("int",	TRICK_INTEGER	,	sizeof(int))	;
+				add_type("unsigned	int",	TRICK_UNSIGNED_INTEGER	,	sizeof(unsigned	int))	;
+				add_type("long",	TRICK_LONG	,	sizeof(long))	;
+				add_type("unsigned	long",	TRICK_UNSIGNED_LONG	,	sizeof(unsigned	long))	;
+				add_type("long	long",	TRICK_LONG_LONG	,	sizeof(long	long))	;
+				add_type("unsigned	long	long",	TRICK_UNSIGNED_LONG_LONG	,	sizeof(unsigned	long	long))	;
+				add_type("bool",	TRICK_BOOLEAN	,	sizeof(bool))	;
+				add_type("double",	TRICK_DOUBLE	,	sizeof(double))	;
+				add_type("float",	TRICK_FLOAT	,	sizeof(float))	;
 }
 
-Trick::PrimitiveAttributesMap::~PrimitiveAttributesMap() {
-    std::map<std::string, ATTRIBUTES * >::iterator pit ;
-    for ( pit = param_attr.begin() ; pit != param_attr.end() ; ++pit ) {
-        delete(pit->second) ;
-    }
-    param_attr.clear() ;
+Trick::PrimitiveAttributesMap::~PrimitiveAttributesMap()	{
+				std::map<std::string,	ATTRIBUTES	*	>::iterator	pit	;
+				for	(	pit	=	param_attr.begin()	;	pit	!=	param_attr.end()	;	++pit	)	{
+								delete(pit->second)	;
+				}
+				param_attr.clear()	;
 }
 
-int Trick::PrimitiveAttributesMap::add_type(std::string param , TRICK_TYPE in_type, int in_size) {
-    ATTRIBUTES * new_attr ;
-    new_attr = new ATTRIBUTES() ;
-    new_attr->type = in_type ;
-    new_attr->size = in_size ;
-    new_attr->io = TRICK_VAR_OUTPUT | TRICK_VAR_INPUT | TRICK_CHKPNT_OUTPUT | TRICK_CHKPNT_INPUT ;
-    param_attr[param] = new_attr ;
-    return 0 ;
+int	Trick::PrimitiveAttributesMap::add_type(std::string	param	,	TRICK_TYPE	in_type,	int	in_size)	{
+				ATTRIBUTES	*	new_attr	;
+				new_attr	=	new	ATTRIBUTES()	;
+				new_attr->type	=	in_type	;
+				new_attr->size	=	in_size	;
+				new_attr->io	=	TRICK_VAR_OUTPUT	|	TRICK_VAR_INPUT	|	TRICK_CHKPNT_OUTPUT	|	TRICK_CHKPNT_INPUT	;
+				param_attr[param]	=	new_attr	;
+				return	0	;
 }
 
-ATTRIBUTES * Trick::PrimitiveAttributesMap::get_attr( std::string param ) {
-    if ( param_attr.find(param) != param_attr.end() ) {
-        ATTRIBUTES * new_attr = new ATTRIBUTES() ;
-        *new_attr = *(param_attr[param]) ;
-        return new_attr ;
-        //return param_attr[param] ;
-    } else {
-        return NULL ;
-    }
+ATTRIBUTES	*	Trick::PrimitiveAttributesMap::get_attr(	std::string	param	)	{
+				if	(	param_attr.find(param)	!=	param_attr.end()	)	{
+								ATTRIBUTES	*	new_attr	=	new	ATTRIBUTES()	;
+								*new_attr	=	*(param_attr[param])	;
+								return	new_attr	;
+								//return	param_attr[param]	;
+				}	else	{
+								return	NULL	;
+				}
 }
diff --git a/trick_source/trick_swig/swig_convert_units.cpp b/trick_source/trick_swig/swig_convert_units.cpp
index 85622e076..dc5bd1040 100644
--- a/trick_source/trick_swig/swig_convert_units.cpp
+++ b/trick_source/trick_swig/swig_convert_units.cpp
@@ -1,72 +1,72 @@
 
-#include <Python.h>
-#include <iostream>
-#include <udunits2.h>
+#include	<Python.h>
+#include	<iostream>
+#include	<udunits2.h>
 
-#include "trick/UdUnits.hh"
+#include	"trick/UdUnits.hh"
 
-int convert_united_value( std::string & to_units , std::string & from_units , long long * val ) {
-    if ( from_units.compare("1") ) {
-        ut_unit * from = ut_parse(Trick::UdUnits::get_u_system(), from_units.c_str(), UT_ASCII) ;
-        if ( !from ) {
-            PyErr_SetString(PyExc_AttributeError,(std::string("could not covert from units "+from_units).c_str()));
-            return -1 ;
-        }
-        ut_unit * to = ut_parse(Trick::UdUnits::get_u_system(), to_units.c_str(), UT_ASCII) ;
-        if ( !to ) {
-            PyErr_SetString(PyExc_AttributeError,(std::string("could not covert to units "+to_units).c_str()));
-            return -1 ;
-        }
+int	convert_united_value(	std::string	&	to_units	,	std::string	&	from_units	,	long	long	*	val	)	{
+				if	(	from_units.compare("1")	)	{
+								ut_unit	*	from	=	ut_parse(Trick::UdUnits::get_u_system(),	from_units.c_str(),	UT_ASCII)	;
+								if	(	!from	)	{
+												PyErr_SetString(PyExc_AttributeError,(std::string("could	not	covert	from	units	"+from_units).c_str()));
+												return	-1	;
+								}
+								ut_unit	*	to	=	ut_parse(Trick::UdUnits::get_u_system(),	to_units.c_str(),	UT_ASCII)	;
+								if	(	!to	)	{
+												PyErr_SetString(PyExc_AttributeError,(std::string("could	not	covert	to	units	"+to_units).c_str()));
+												return	-1	;
+								}
 
-        cv_converter * converter = ut_get_converter(from,to) ;
-        if ( converter ) {
-            *val = (long long)cv_convert_double(converter, (double)*val ) ;
-            cv_free(converter) ;
-        } else {
-            PyErr_SetString(PyExc_AttributeError,"Units conversion Error");
-            return -1 ;
-        }
+								cv_converter	*	converter	=	ut_get_converter(from,to)	;
+								if	(	converter	)	{
+												*val	=	(long	long)cv_convert_double(converter,	(double)*val	)	;
+												cv_free(converter)	;
+								}	else	{
+												PyErr_SetString(PyExc_AttributeError,"Units	conversion	Error");
+												return	-1	;
+								}
 
-        ut_free(from) ;
-        ut_free(to) ;
-    }
-    return 0 ;
+								ut_free(from)	;
+								ut_free(to)	;
+				}
+				return	0	;
 }
 
-int convert_united_value( std::string & to_units , std::string & from_units , double * val ) {
+int	convert_united_value(	std::string	&	to_units	,	std::string	&	from_units	,	double	*	val	)	{
 
-    if ( from_units.compare("1") ) {
-        ut_unit * from = ut_parse(Trick::UdUnits::get_u_system(), from_units.c_str(), UT_ASCII) ;
-        if ( !from ) {
-            PyErr_SetString(PyExc_AttributeError,(std::string("could not covert from units "+from_units).c_str()));
-            return -1 ;
-        }
-        ut_unit * to = ut_parse(Trick::UdUnits::get_u_system(), to_units.c_str(), UT_ASCII) ;
-        if ( !to ) {
-            PyErr_SetString(PyExc_AttributeError,(std::string("could not covert to units "+to_units).c_str()));
-            return -1 ;
-        }
+				if	(	from_units.compare("1")	)	{
+								ut_unit	*	from	=	ut_parse(Trick::UdUnits::get_u_system(),	from_units.c_str(),	UT_ASCII)	;
+								if	(	!from	)	{
+												PyErr_SetString(PyExc_AttributeError,(std::string("could	not	covert	from	units	"+from_units).c_str()));
+												return	-1	;
+								}
+								ut_unit	*	to	=	ut_parse(Trick::UdUnits::get_u_system(),	to_units.c_str(),	UT_ASCII)	;
+								if	(	!to	)	{
+												PyErr_SetString(PyExc_AttributeError,(std::string("could	not	covert	to	units	"+to_units).c_str()));
+												return	-1	;
+								}
 
-        cv_converter * converter = ut_get_converter(from,to) ;
-        if ( converter ) {
-            *val = cv_convert_double(converter, *val ) ;
-            cv_free(converter) ;
-        } else {
-            PyErr_SetString(PyExc_AttributeError,"Units conversion Error");
-            return -1 ;
-        }
+								cv_converter	*	converter	=	ut_get_converter(from,to)	;
+								if	(	converter	)	{
+												*val	=	cv_convert_double(converter,	*val	)	;
+												cv_free(converter)	;
+								}	else	{
+												PyErr_SetString(PyExc_AttributeError,"Units	conversion	Error");
+												return	-1	;
+								}
 
-        ut_free(from) ;
-        ut_free(to) ;
-    }
-    return 0 ;
+								ut_free(from)	;
+								ut_free(to)	;
+				}
+				return	0	;
 }
 
-int scale_united_value( std::string & to_units , std::string & from_units , long long * val ) {
-    return convert_united_value(to_units, from_units, val) ;
+int	scale_united_value(	std::string	&	to_units	,	std::string	&	from_units	,	long	long	*	val	)	{
+				return	convert_united_value(to_units,	from_units,	val)	;
 }
 
-int scale_united_value( std::string & to_units , std::string & from_units , double * val ) {
-    return convert_united_value(to_units, from_units, val) ;
+int	scale_united_value(	std::string	&	to_units	,	std::string	&	from_units	,	double	*	val	)	{
+				return	convert_united_value(to_units,	from_units,	val)	;
 }
 
diff --git a/trick_source/trick_swig/swig_double.cpp b/trick_source/trick_swig/swig_double.cpp
index 8e509066b..26bc68418 100644
--- a/trick_source/trick_swig/swig_double.cpp
+++ b/trick_source/trick_swig/swig_double.cpp
@@ -1,880 +1,880 @@
 
-#include <iostream>
-#include "trick/swig/swig_macros.hh"
-#include "trick/swig/swig_double.hh"
-#include "trick/swig/swig_int.hh"
-#include "trick/swig/swig_convert_units.hh"
+#include	<iostream>
+#include	"trick/swig/swig_macros.hh"
+#include	"trick/swig/swig_double.hh"
+#include	"trick/swig/swig_int.hh"
+#include	"trick/swig/swig_convert_units.hh"
 
-char swig_double::str_output[32] ;
+char	swig_double::str_output[32]	;
 
-swig_double::swig_double() {
-    value = 0 ;
-    units = "1" ;
+swig_double::swig_double()	{
+				value	=	0	;
+				units	=	"1"	;
 }
 
-char * swig_double::__str__() {
-    if ( ! units.empty() && units.compare("1") ) {
-        snprintf(str_output , sizeof(str_output), "%g %s", value , units.c_str()) ;
-    } else {
-        snprintf(str_output , sizeof(str_output), "%g", value ) ;
-    }
-    return(str_output) ;
+char	*	swig_double::__str__()	{
+				if	(	!	units.empty()	&&	units.compare("1")	)	{
+								snprintf(str_output	,	sizeof(str_output),	"%g	%s",	value	,	units.c_str())	;
+				}	else	{
+								snprintf(str_output	,	sizeof(str_output),	"%g",	value	)	;
+				}
+				return(str_output)	;
 }
 
-char * swig_double::__repr__() {
-    return(__str__()) ;
+char	*	swig_double::__repr__()	{
+				return(__str__())	;
 }
 
 
 //**********************************************************************************************
 
-PyObject * swig_double::__add__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-    double new_value ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = value + PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_value = (double)temp_m->value ;
-
-        conv_ret = scale_united_value( units , temp_m->units , &new_value ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value + new_value ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_value = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_value ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value + new_value ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value + PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__sub__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-    double new_value ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = value - PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_value = (double)temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_value ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value - new_value ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_value = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_value ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value - new_value ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value - PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__mul__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = value * PyFloat_AsDouble(obj1) ;
-        result->units = units ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        result->value = value * temp_m->value ;
-        result->units = units + "*(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        result->value = value * temp_m->value ;
-        result->units = units + "*(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value * PyInt_AsLong(obj1) ;
-        result->units = units ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__div__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = value / PyFloat_AsDouble(obj1) ;
-        result->units = units ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        result->value = value / temp_m->value ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        result->value = value / temp_m->value ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value / PyInt_AsLong(obj1) ;
-        result->units = units ;
-    }
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    return ret ;
-}
-
-PyObject * swig_double::__truediv__( PyObject * obj1 ) {
-    return __div__(obj1) ;
-}
-
-PyObject * swig_double::__floordiv__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = (long long)(value / PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        result->value = (long long)(value / temp_m->value) ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        result->value = (long long)(value / temp_m->value) ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = (long long)(value / PyInt_AsLong(obj1)) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__mod__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = fmod(value , PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = fmod( value , temp_m->value ) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Modulus must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = fmod( value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Modulus must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = fmod( value , PyInt_AsLong(obj1)) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__pow__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = pow(value , PyFloat_AsDouble(obj1)) ;
-        result->units = units ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = pow(value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = pow(value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        int power = PyInt_AsLong(obj1) ;
-        result->value = pow(value , power) ;
-        result->units = units ;
-        for ( int ii = 1 ; ii < power ; ii++ ) {
-            result->units = result->units + "*(" + units + ")";
-        }
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_double::__add__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+				double	new_value	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	value	+	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_value	=	(double)temp_m->value	;
+
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_value	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	+	new_value	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_value	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_value	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	+	new_value	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	+	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__sub__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+				double	new_value	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	value	-	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_value	=	(double)temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_value	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	-	new_value	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_value	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_value	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	-	new_value	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	-	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__mul__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	value	*	PyFloat_AsDouble(obj1)	;
+								result->units	=	units	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								result->value	=	value	*	temp_m->value	;
+								result->units	=	units	+	"*("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								result->value	=	value	*	temp_m->value	;
+								result->units	=	units	+	"*("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	*	PyInt_AsLong(obj1)	;
+								result->units	=	units	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__div__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	value	/	PyFloat_AsDouble(obj1)	;
+								result->units	=	units	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								result->value	=	value	/	temp_m->value	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								result->value	=	value	/	temp_m->value	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	/	PyInt_AsLong(obj1)	;
+								result->units	=	units	;
+				}
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				return	ret	;
+}
+
+PyObject	*	swig_double::__truediv__(	PyObject	*	obj1	)	{
+				return	__div__(obj1)	;
+}
+
+PyObject	*	swig_double::__floordiv__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	(long	long)(value	/	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								result->value	=	(long	long)(value	/	temp_m->value)	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								result->value	=	(long	long)(value	/	temp_m->value)	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	(long	long)(value	/	PyInt_AsLong(obj1))	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__mod__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	fmod(value	,	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	fmod(	value	,	temp_m->value	)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Modulus	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	fmod(	value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Modulus	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	fmod(	value	,	PyInt_AsLong(obj1))	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__pow__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	pow(value	,	PyFloat_AsDouble(obj1))	;
+								result->units	=	units	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	pow(value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	pow(value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								int	power	=	PyInt_AsLong(obj1)	;
+								result->value	=	pow(value	,	power)	;
+								result->units	=	units	;
+								for	(	int	ii	=	1	;	ii	<	power	;	ii++	)	{
+												result->units	=	result->units	+	"*("	+	units	+	")";
+								}
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_double::__radd__( PyObject * obj1 ) {
-    return __add__(obj1) ;
+PyObject	*	swig_double::__radd__(	PyObject	*	obj1	)	{
+				return	__add__(obj1)	;
 }
 
-PyObject * swig_double::__rsub__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__rsub__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        result->value = PyFloat_AsDouble(obj1) - value ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = PyInt_AsLong(obj1) - value ;
-    }
-    result->units = units ;
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	PyFloat_AsDouble(obj1)	-	value	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	PyInt_AsLong(obj1)	-	value	;
+				}
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__rmul__( PyObject * obj1 ) {
-    return __mul__(obj1) ;
+PyObject	*	swig_double::__rmul__(	PyObject	*	obj1	)	{
+				return	__mul__(obj1)	;
 }
 
-PyObject * swig_double::__rdiv__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__rdiv__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        result->value = PyFloat_AsDouble(obj1) / value ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = PyInt_AsLong(obj1) / value ;
-    }
-    result->units = "1/(" + units + ")" ;
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	PyFloat_AsDouble(obj1)	/	value	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	PyInt_AsLong(obj1)	/	value	;
+				}
+				result->units	=	"1/("	+	units	+	")"	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__rtruediv__( PyObject * obj1 ) {
-    return __rdiv__(obj1) ;
+PyObject	*	swig_double::__rtruediv__(	PyObject	*	obj1	)	{
+				return	__rdiv__(obj1)	;
 }
 
-PyObject * swig_double::__rfloordiv__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__rfloordiv__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        result->value = floor(PyFloat_AsDouble(obj1) / value) ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = floor(PyInt_AsLong(obj1) / value) ;
-    }
-    result->units = "1/(" + units + ")" ;
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	floor(PyFloat_AsDouble(obj1)	/	value)	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	floor(PyInt_AsLong(obj1)	/	value)	;
+				}
+				result->units	=	"1/("	+	units	+	")"	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__rmod__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__rmod__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            result->value = fmod(PyFloat_AsDouble(obj1) , value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Modulus must be unitless.  Cannot create new unit-ed type.");
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            result->value = fmod(PyInt_AsLong(obj1) , value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Modulus must be unitless.  Cannot create new unit-ed type.");
-        }
-    }
-    result->units = units ;
+				if	(	PyFloat_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												result->value	=	fmod(PyFloat_AsDouble(obj1)	,	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Modulus	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												result->value	=	fmod(PyInt_AsLong(obj1)	,	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Modulus	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__rpow__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__rpow__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
 
-    if ( PyFloat_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            return(PyFloat_FromDouble(pow(PyFloat_AsDouble(obj1) , value))) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Power argument must be unitless.  Cannot create new unit-ed type.");
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            return(PyFloat_FromDouble(pow(PyInt_AsLong(obj1) , value))) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Power argument must be unitless.  Cannot create new unit-ed type.");
-        }
-    }
+				if	(	PyFloat_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												return(PyFloat_FromDouble(pow(PyFloat_AsDouble(obj1)	,	value)))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Power	argument	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												return(PyFloat_FromDouble(pow(PyInt_AsLong(obj1)	,	value)))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Power	argument	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}
 
-    return ret ;
+				return	ret	;
 }
 
 //**********************************************************************************************
 
 
-PyObject * swig_double::__iadd__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-    double new_val ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value += PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = (double)temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value += new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value += new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value += PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__isub__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-    double new_val ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value -= PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value -= new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value -= new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value -= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__imul__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value *= PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        value *= temp_m->value ;
-        units += "*(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        value *= temp_m->value ;
-        units += "*(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        value *= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__idiv__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value /= PyFloat_AsDouble(obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        value /= temp_m->value ;
-        units += "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        value /= temp_m->value ;
-        units += "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        value /= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__itruediv__( PyObject * obj1 ) {
-    return __idiv__(obj1) ;
-}
-
-PyObject * swig_double::__ifloordiv__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = floor(value / PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        value = floor(value / temp_m->value) ;
-        units += "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        value = floor(value / temp_m->value) ;
-        units += "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        value = floor( value / PyInt_AsLong(obj1)) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__imod__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = fmod( value , PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = fmod(value , temp_m->value );
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Operation must contain at least one unit-less value.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = fmod( value , temp_m->value );
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Operation must contain at least one unit-less value.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value = fmod( value , PyInt_AsLong(obj1)) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
-}
-
-PyObject * swig_double::__ipow__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( units.compare("1")) {
-        PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-        return NULL ;
-    }
-
-    if ( PyFloat_Check(obj1) ) {
-        value = pow(value , PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = pow(value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = pow(value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value = pow(value , PyInt_AsLong(obj1)) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_double(*this)), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_double::__iadd__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+				double	new_val	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	+=	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	(double)temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	+=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	+=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	+=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__isub__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+				double	new_val	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	-=	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	-=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	-=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	-=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__imul__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	*=	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								value	*=	temp_m->value	;
+								units	+=	"*("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								value	*=	temp_m->value	;
+								units	+=	"*("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	*=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__idiv__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	/=	PyFloat_AsDouble(obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								value	/=	temp_m->value	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								value	/=	temp_m->value	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	/=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__itruediv__(	PyObject	*	obj1	)	{
+				return	__idiv__(obj1)	;
+}
+
+PyObject	*	swig_double::__ifloordiv__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	floor(value	/	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								value	=	floor(value	/	temp_m->value)	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								value	=	floor(value	/	temp_m->value)	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	=	floor(	value	/	PyInt_AsLong(obj1))	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__imod__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	fmod(	value	,	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	fmod(value	,	temp_m->value	);
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Operation	must	contain	at	least	one	unit-less	value.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	fmod(	value	,	temp_m->value	);
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Operation	must	contain	at	least	one	unit-less	value.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	=	fmod(	value	,	PyInt_AsLong(obj1))	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
+}
+
+PyObject	*	swig_double::__ipow__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	units.compare("1"))	{
+								PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+								return	NULL	;
+				}
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	pow(value	,	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	pow(value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	pow(value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	=	pow(value	,	PyInt_AsLong(obj1))	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_double(*this)),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_double::__lt__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value < PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value < new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value < new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value < PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
-}
-
-PyObject * swig_double::__le__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value <= PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value <= new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value <= new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value <= PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
-}
-
-PyObject * swig_double::__eq__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value == PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value == new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value == new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value == PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
-}
-
-PyObject * swig_double::__ne__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value != PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value != new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value != new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value != PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
-}
-
-PyObject * swig_double::__gt__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value > PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value > new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value > new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value > PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
-}
-
-PyObject * swig_double::__ge__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value >= PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value >= new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        double new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value >= new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value >= PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_double::__lt__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	<	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	<	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
+}
+
+PyObject	*	swig_double::__le__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	<=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	<=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
+}
+
+PyObject	*	swig_double::__eq__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	==	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	==	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	==	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	==	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
+}
+
+PyObject	*	swig_double::__ne__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	!=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	!=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	!=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	!=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
+}
+
+PyObject	*	swig_double::__gt__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	>	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	>	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
+}
+
+PyObject	*	swig_double::__ge__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	>=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								double	new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	>=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_double::__neg__() {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__neg__()	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    result->value = -value ;
-    result->units = units ;
+				result->value	=	-value	;
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__pos__() {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__pos__()	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    result->value = value ;
-    result->units = units ;
+				result->value	=	value	;
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_double::__abs__() {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_double::__abs__()	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    result->value = fabs(value) ;
-    result->units = units ;
+				result->value	=	fabs(value)	;
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_double::__int__() {
-    return PyInt_FromLong((long long)value) ;
+PyObject	*	swig_double::__int__()	{
+				return	PyInt_FromLong((long	long)value)	;
 }
 
-PyObject * swig_double::__long__() {
-    return PyLong_FromLongLong((long long)value) ;
+PyObject	*	swig_double::__long__()	{
+				return	PyLong_FromLongLong((long	long)value)	;
 }
 
-PyObject * swig_double::__float__() {
-    return PyFloat_FromDouble(value) ;
+PyObject	*	swig_double::__float__()	{
+				return	PyFloat_FromDouble(value)	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_double::__len__() {
-    return PyInt_FromLong(1) ;
+PyObject	*	swig_double::__len__()	{
+				return	PyInt_FromLong(1)	;
 }
 
diff --git a/trick_source/trick_swig/swig_global_vars.cpp b/trick_source/trick_swig/swig_global_vars.cpp
index 8e732ad59..472f85449 100644
--- a/trick_source/trick_swig/swig_global_vars.cpp
+++ b/trick_source/trick_swig/swig_global_vars.cpp
@@ -1,295 +1,295 @@
 
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
-# else
-#   define SWIGUNUSED
-# endif
+#ifndef	SWIGUNUSED
+#	if	defined(__GNUC__)
+#			if	!(defined(__cplusplus))	||	(__GNUC__	>	3	||	(__GNUC__	==	3	&&	__GNUC_MINOR__	>=	4))
+#					define	SWIGUNUSED	__attribute__	((__unused__))
+#			else
+#					define	SWIGUNUSED
+#			endif
+#	elif	defined(__ICC)
+#			define	SWIGUNUSED	__attribute__	((__unused__))
+#	else
+#			define	SWIGUNUSED
+#	endif
 #endif
 
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
-# endif
+#ifndef	SWIGUNUSEDPARM
+#	ifdef	__cplusplus
+#			define	SWIGUNUSEDPARM(p)
+#	else
+#			define	SWIGUNUSEDPARM(p)	p	SWIGUNUSED
+#	endif
 #endif
 
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
+#ifndef	SWIGINTERN
+#	define	SWIGINTERN	static	SWIGUNUSED
 #endif
 
-#include <Python.h>
-#include <iostream>
+#include	<Python.h>
+#include	<iostream>
 
 
-SWIGINTERN char*
-SWIG_Python_str_AsChar(PyObject *str)
+SWIGINTERN	char*
+SWIG_Python_str_AsChar(PyObject	*str)
 {
-#if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
-  str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
-  return newstr;
+#if	PY_VERSION_HEX	>=	0x03000000
+		char	*cstr;
+		char	*newstr;
+		Py_ssize_t	len;
+		str	=	PyUnicode_AsUTF8String(str);
+		PyBytes_AsStringAndSize(str,	&cstr,	&len);
+		newstr	=	(char	*)	malloc(len+1);
+		memcpy(newstr,	cstr,	len+1);
+		Py_XDECREF(str);
+		return	newstr;
 #else
-  return PyString_AsString(str);
+		return	PyString_AsString(str);
 #endif
 }
 
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
+#if	PY_VERSION_HEX	>=	0x03000000
+#		define	SWIG_Python_str_DelForPy3(x)	free(	(void*)	(x)	)
 #else
-#  define SWIG_Python_str_DelForPy3(x)
+#		define	SWIG_Python_str_DelForPy3(x)
 #endif
 
-extern "C" {
+extern	"C"	{
 
-  /* Python-specific SWIG API */
-#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+		/*	Python-specific	SWIG	API	*/
+#define	SWIG_newvarlink()																													SWIG_Python_newvarlink()
+#define	SWIG_addvarlink(p,	name,	get_attr,	set_attr)		SWIG_Python_addvarlink(p,	name,	get_attr,	set_attr)
+#define	SWIG_InstallConstants(d,	constants)											SWIG_Python_InstallConstants(d,	constants)
 
-  /* -----------------------------------------------------------------------------
-   * global variable support code.
-   * ----------------------------------------------------------------------------- */
+		/*	-----------------------------------------------------------------------------
+			*	global	variable	support	code.
+			*	-----------------------------------------------------------------------------	*/
 
-  typedef struct swig_globalvar {
-    char       *name;                  /* Name of global variable */
-    PyObject *(*get_attr)(void);       /* Return the current value */
-    int       (*set_attr)(PyObject *); /* Set the value */
-    struct swig_globalvar *next;
-  } swig_globalvar;
+		typedef	struct	swig_globalvar	{
+				char							*name;																		/*	Name	of	global	variable	*/
+				PyObject	*(*get_attr)(void);							/*	Return	the	current	value	*/
+				int							(*set_attr)(PyObject	*);	/*	Set	the	value	*/
+				struct	swig_globalvar	*next;
+		}	swig_globalvar;
 
-  typedef struct swig_varlinkobject {
-    PyObject_HEAD
-    swig_globalvar *vars;
-  } swig_varlinkobject;
+		typedef	struct	swig_varlinkobject	{
+				PyObject_HEAD
+				swig_globalvar	*vars;
+		}	swig_varlinkobject;
 
-  SWIGINTERN PyObject *
-  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
-#if PY_VERSION_HEX >= 0x03000000
-    return PyUnicode_InternFromString("<Swig global variables>");
+		SWIGINTERN	PyObject	*
+		swig_varlink_repr(swig_varlinkobject	*SWIGUNUSEDPARM(v))	{
+#if	PY_VERSION_HEX	>=	0x03000000
+				return	PyUnicode_InternFromString("<Swig	global	variables>");
 #else
-    return PyString_FromString("<Swig global variables>");
+				return	PyString_FromString("<Swig	global	variables>");
 #endif
-  }
+		}
 
-  SWIGINTERN PyObject *
-  swig_varlink_str(swig_varlinkobject *v) {
-#if PY_VERSION_HEX >= 0x03000000
-    PyObject *str = PyUnicode_InternFromString("(");
-    PyObject *tail;
-    PyObject *joined;
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      tail = PyUnicode_FromString(var->name);
-      joined = PyUnicode_Concat(str, tail);
-      Py_DecRef(str);
-      Py_DecRef(tail);
-      str = joined;
-      if (var->next) {
-        tail = PyUnicode_InternFromString(", ");
-        joined = PyUnicode_Concat(str, tail);
-        Py_DecRef(str);
-        Py_DecRef(tail);
-        str = joined;
-      }
-    }
-    tail = PyUnicode_InternFromString(")");
-    joined = PyUnicode_Concat(str, tail);
-    Py_DecRef(str);
-    Py_DecRef(tail);
-    str = joined;
+		SWIGINTERN	PyObject	*
+		swig_varlink_str(swig_varlinkobject	*v)	{
+#if	PY_VERSION_HEX	>=	0x03000000
+				PyObject	*str	=	PyUnicode_InternFromString("(");
+				PyObject	*tail;
+				PyObject	*joined;
+				swig_globalvar	*var;
+				for	(var	=	v->vars;	var;	var=var->next)	{
+						tail	=	PyUnicode_FromString(var->name);
+						joined	=	PyUnicode_Concat(str,	tail);
+						Py_DecRef(str);
+						Py_DecRef(tail);
+						str	=	joined;
+						if	(var->next)	{
+								tail	=	PyUnicode_InternFromString(",	");
+								joined	=	PyUnicode_Concat(str,	tail);
+								Py_DecRef(str);
+								Py_DecRef(tail);
+								str	=	joined;
+						}
+				}
+				tail	=	PyUnicode_InternFromString(")");
+				joined	=	PyUnicode_Concat(str,	tail);
+				Py_DecRef(str);
+				Py_DecRef(tail);
+				str	=	joined;
 #else
-    PyObject *str = PyString_FromString("(");
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
-      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
-    }
-    PyString_ConcatAndDel(&str,PyString_FromString(")"));
+				PyObject	*str	=	PyString_FromString("(");
+				swig_globalvar	*var;
+				for	(var	=	v->vars;	var;	var=var->next)	{
+						PyString_ConcatAndDel(&str,PyString_FromString(var->name));
+						if	(var->next)	PyString_ConcatAndDel(&str,PyString_FromString(",	"));
+				}
+				PyString_ConcatAndDel(&str,PyString_FromString(")"));
 #endif
-    return str;
-  }
+				return	str;
+		}
 
-  SWIGINTERN int
-  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-    char *tmp;
-    PyObject *str = swig_varlink_str(v);
-    fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(str);
-    return 0;
-  }
+		SWIGINTERN	int
+		swig_varlink_print(swig_varlinkobject	*v,	FILE	*fp,	int	SWIGUNUSEDPARM(flags))	{
+				char	*tmp;
+				PyObject	*str	=	swig_varlink_str(v);
+				fprintf(fp,"Swig	global	variables	");
+				fprintf(fp,"%s\n",	tmp	=	SWIG_Python_str_AsChar(str));
+				SWIG_Python_str_DelForPy3(tmp);
+				Py_DECREF(str);
+				return	0;
+		}
 
-  SWIGINTERN void
-  swig_varlink_dealloc(swig_varlinkobject *v) {
-    swig_globalvar *var = v->vars;
-    while (var) {
-      swig_globalvar *n = var->next;
-      free(var->name);
-      free(var);
-      var = n;
-    }
-  }
+		SWIGINTERN	void
+		swig_varlink_dealloc(swig_varlinkobject	*v)	{
+				swig_globalvar	*var	=	v->vars;
+				while	(var)	{
+						swig_globalvar	*n	=	var->next;
+						free(var->name);
+						free(var);
+						var	=	n;
+				}
+		}
 
-  SWIGINTERN PyObject *
-  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
-    PyObject *res = NULL;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->get_attr)();
-        break;
-      }
-      var = var->next;
-    }
-    if (res == NULL && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-    }
-    return res;
-  }
+		SWIGINTERN	PyObject	*
+		swig_varlink_getattr(swig_varlinkobject	*v,	char	*n)	{
+				PyObject	*res	=	NULL;
+				swig_globalvar	*var	=	v->vars;
+				while	(var)	{
+						if	(strcmp(var->name,n)	==	0)	{
+								res	=	(*var->get_attr)();
+								break;
+						}
+						var	=	var->next;
+				}
+				if	(res	==	NULL	&&	!PyErr_Occurred())	{
+						PyErr_SetString(PyExc_NameError,"Unknown	C	global	variable");
+				}
+				return	res;
+		}
 
-  SWIGINTERN int
-  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
-    int res = 1;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->set_attr)(p);
-        break;
-      }
-      var = var->next;
-    }
-    if (res == 1 && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-    }
-    return res;
-  }
+		SWIGINTERN	int
+		swig_varlink_setattr(swig_varlinkobject	*v,	char	*n,	PyObject	*p)	{
+				int	res	=	1;
+				swig_globalvar	*var	=	v->vars;
+				while	(var)	{
+						if	(strcmp(var->name,n)	==	0)	{
+								res	=	(*var->set_attr)(p);
+								break;
+						}
+						var	=	var->next;
+				}
+				if	(res	==	1	&&	!PyErr_Occurred())	{
+						PyErr_SetString(PyExc_NameError,"Unknown	C	global	variable");
+				}
+				return	res;
+		}
 
-  SWIGINTERN PyTypeObject*
-  swig_varlink_type(void) {
-    static char varlink__doc__[] = "Swig var link object";
-    static PyTypeObject varlink_type;
-    static int type_init = 0;
-    if (!type_init) {
-      const PyTypeObject tmp
-      = {
-        /* PyObject header changed in Python 3 */
-#if PY_VERSION_HEX >= 0x03000000
-        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+		SWIGINTERN	PyTypeObject*
+		swig_varlink_type(void)	{
+				static	char	varlink__doc__[]	=	"Swig	var	link	object";
+				static	PyTypeObject	varlink_type;
+				static	int	type_init	=	0;
+				if	(!type_init)	{
+						const	PyTypeObject	tmp
+						=	{
+								/*	PyObject	header	changed	in	Python	3	*/
+#if	PY_VERSION_HEX	>=	0x03000000
+								PyVarObject_HEAD_INIT(&PyType_Type,	0)
 #else
-        PyObject_HEAD_INIT(NULL)
-        0,                                  /* Number of items in variable part (ob_size) */
+								PyObject_HEAD_INIT(NULL)
+								0,																																		/*	Number	of	items	in	variable	part	(ob_size)	*/
 #endif
-        (char *)"swigvarlink",              /* Type name (tp_name) */
-        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
-        0,                                  /* Itemsize (tp_itemsize) */
-        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */
-        (printfunc) swig_varlink_print,     /* Print (tp_print) */
-        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
-        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
-        0,                                  /* tp_compare */
-        (reprfunc) swig_varlink_repr,       /* tp_repr */
-        0,                                  /* tp_as_number */
-        0,                                  /* tp_as_sequence */
-        0,                                  /* tp_as_mapping */
-        0,                                  /* tp_hash */
-        0,                                  /* tp_call */
-        (reprfunc) swig_varlink_str,        /* tp_str */
-        0,                                  /* tp_getattro */
-        0,                                  /* tp_setattro */
-        0,                                  /* tp_as_buffer */
-        0,                                  /* tp_flags */
-        varlink__doc__,                     /* tp_doc */
-        0,                                  /* tp_traverse */
-        0,                                  /* tp_clear */
-        0,                                  /* tp_richcompare */
-        0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+								(char	*)"swigvarlink",														/*	Type	name	(tp_name)	*/
+								sizeof(swig_varlinkobject),									/*	Basic	size	(tp_basicsize)	*/
+								0,																																		/*	Itemsize	(tp_itemsize)	*/
+								(destructor)	swig_varlink_dealloc,		/*	Deallocator	(tp_dealloc)	*/
+								(printfunc)	swig_varlink_print,					/*	Print	(tp_print)	*/
+								(getattrfunc)	swig_varlink_getattr,	/*	get	attr	(tp_getattr)	*/
+								(setattrfunc)	swig_varlink_setattr,	/*	Set	attr	(tp_setattr)	*/
+								0,																																		/*	tp_compare	*/
+								(reprfunc)	swig_varlink_repr,							/*	tp_repr	*/
+								0,																																		/*	tp_as_number	*/
+								0,																																		/*	tp_as_sequence	*/
+								0,																																		/*	tp_as_mapping	*/
+								0,																																		/*	tp_hash	*/
+								0,																																		/*	tp_call	*/
+								(reprfunc)	swig_varlink_str,								/*	tp_str	*/
+								0,																																		/*	tp_getattro	*/
+								0,																																		/*	tp_setattro	*/
+								0,																																		/*	tp_as_buffer	*/
+								0,																																		/*	tp_flags	*/
+								varlink__doc__,																					/*	tp_doc	*/
+								0,																																		/*	tp_traverse	*/
+								0,																																		/*	tp_clear	*/
+								0,																																		/*	tp_richcompare	*/
+								0,																																		/*	tp_weaklistoffset	*/
+#if	PY_VERSION_HEX	>=	0x02020000
+								0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,	/*	tp_iter	->	tp_weaklist	*/
 #endif
-#if PY_VERSION_HEX >= 0x02030000
-        0,                                  /* tp_del */
+#if	PY_VERSION_HEX	>=	0x02030000
+								0,																																		/*	tp_del	*/
 #endif
-#ifdef COUNT_ALLOCS
-        0,0,0,0                             /* tp_alloc -> tp_next */
+#ifdef	COUNT_ALLOCS
+								0,0,0,0																													/*	tp_alloc	->	tp_next	*/
 #endif
-      };
-      varlink_type = tmp;
-      /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
-      varlink_type.ob_type = &PyType_Type;
+						};
+						varlink_type	=	tmp;
+						/*	for	Python	3	we	already	assigned	ob_type	in	PyVarObject_HEAD_INIT()	*/
+#if	PY_VERSION_HEX	<	0x03000000
+						varlink_type.ob_type	=	&PyType_Type;
 #endif
-      type_init = 1;
-    }
-    return &varlink_type;
-  }
+						type_init	=	1;
+				}
+				return	&varlink_type;
+		}
 
-  /* Create a variable linking object for use later */
-  SWIGINTERN PyObject *
-  SWIG_Python_newvarlink(void) {
-    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
-    if (result) {
-      result->vars = 0;
-    }
-    return ((PyObject*) result);
-  }
+		/*	Create	a	variable	linking	object	for	use	later	*/
+		SWIGINTERN	PyObject	*
+		SWIG_Python_newvarlink(void)	{
+				swig_varlinkobject	*result	=	PyObject_NEW(swig_varlinkobject,	swig_varlink_type());
+				if	(result)	{
+						result->vars	=	0;
+				}
+				return	((PyObject*)	result);
+		}
 
-  SWIGINTERN void
-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
-    swig_varlinkobject *v = (swig_varlinkobject *) p;
-    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
-    if (gv) {
-      size_t size = strlen(name)+1;
-      gv->name = (char *)malloc(size);
-      if (gv->name) {
-        strncpy(gv->name,name,size);
-        gv->get_attr = get_attr;
-        gv->set_attr = set_attr;
-        gv->next = v->vars;
-      }
-    }
-    v->vars = gv;
-  }
+		SWIGINTERN	void
+		SWIG_Python_addvarlink(PyObject	*p,	char	*name,	PyObject	*(*get_attr)(void),	int	(*set_attr)(PyObject	*p))	{
+				swig_varlinkobject	*v	=	(swig_varlinkobject	*)	p;
+				swig_globalvar	*gv	=	(swig_globalvar	*)	malloc(sizeof(swig_globalvar));
+				if	(gv)	{
+						size_t	size	=	strlen(name)+1;
+						gv->name	=	(char	*)malloc(size);
+						if	(gv->name)	{
+								strncpy(gv->name,name,size);
+								gv->get_attr	=	get_attr;
+								gv->set_attr	=	set_attr;
+								gv->next	=	v->vars;
+						}
+				}
+				v->vars	=	gv;
+		}
 
-  SWIGINTERN PyObject *
-  SWIG_globals(void) {
-    static PyObject *_SWIG_globals = 0;
-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();
-    return _SWIG_globals;
-  }
+		SWIGINTERN	PyObject	*
+		SWIG_globals(void)	{
+				static	PyObject	*_SWIG_globals	=	0;
+				if	(!_SWIG_globals)	_SWIG_globals	=	SWIG_newvarlink();
+				return	_SWIG_globals;
+		}
 
-  /* new_cvar_list returns an empty cvar list.
-     It is not a static function so it is accessible in trick/__init__.py */
-  PyObject * new_cvar_list() {
-      return SWIG_globals();
-  }
+		/*	new_cvar_list	returns	an	empty	cvar	list.
+					It	is	not	a	static	function	so	it	is	accessible	in	trick/__init__.py	*/
+		PyObject	*	new_cvar_list()	{
+						return	SWIG_globals();
+		}
 
-  /* combine_cvars adds cvars from arg2 list to list in arg1.
-     No error checking is done to test if arg2 is proper swig_varlinkobject type */
-  void combine_cvars( PyObject *arg1 , PyObject *arg2 ) {
-      swig_globalvar * gvit ;
-      if ( arg2 != Py_None ) {
-          swig_varlinkobject *v = (swig_varlinkobject *) arg2;
-          gvit = v->vars ;
-          while (gvit != NULL ) {
-              SWIG_addvarlink( arg1, gvit->name, gvit->get_attr, gvit->set_attr);
-              gvit = gvit->next ;
-          }
-      }
-  }
+		/*	combine_cvars	adds	cvars	from	arg2	list	to	list	in	arg1.
+					No	error	checking	is	done	to	test	if	arg2	is	proper	swig_varlinkobject	type	*/
+		void	combine_cvars(	PyObject	*arg1	,	PyObject	*arg2	)	{
+						swig_globalvar	*	gvit	;
+						if	(	arg2	!=	Py_None	)	{
+										swig_varlinkobject	*v	=	(swig_varlinkobject	*)	arg2;
+										gvit	=	v->vars	;
+										while	(gvit	!=	NULL	)	{
+														SWIG_addvarlink(	arg1,	gvit->name,	gvit->get_attr,	gvit->set_attr);
+														gvit	=	gvit->next	;
+										}
+						}
+		}
 
 }
diff --git a/trick_source/trick_swig/swig_int.cpp b/trick_source/trick_swig/swig_int.cpp
index ee5b9bcdb..7a2529114 100644
--- a/trick_source/trick_swig/swig_int.cpp
+++ b/trick_source/trick_swig/swig_int.cpp
@@ -1,1240 +1,1240 @@
 
-#include <iostream>
-#include "trick/swig/swig_macros.hh"
-#include "trick/swig/swig_int.hh"
-#include "trick/swig/swig_double.hh"
-#include "trick/swig/swig_convert_units.hh"
+#include	<iostream>
+#include	"trick/swig/swig_macros.hh"
+#include	"trick/swig/swig_int.hh"
+#include	"trick/swig/swig_double.hh"
+#include	"trick/swig/swig_convert_units.hh"
 
-char swig_int::str_output[32] ;
+char	swig_int::str_output[32]	;
 
-swig_int::swig_int() {
-    value = 0 ;
-    units = "1" ;
+swig_int::swig_int()	{
+				value	=	0	;
+				units	=	"1"	;
 }
 
-char * swig_int::__str__() {
-    if ( ! units.empty() && units.compare("1") ) {
-        snprintf(str_output , sizeof(str_output), "%lld %s", value , units.c_str()) ;
-    } else {
-        snprintf(str_output , sizeof(str_output), "%lld", value ) ;
-    }
-    return(str_output) ;
+char	*	swig_int::__str__()	{
+				if	(	!	units.empty()	&&	units.compare("1")	)	{
+								snprintf(str_output	,	sizeof(str_output),	"%lld	%s",	value	,	units.c_str())	;
+				}	else	{
+								snprintf(str_output	,	sizeof(str_output),	"%lld",	value	)	;
+				}
+				return(str_output)	;
 }
 
-char * swig_int::__repr__() {
-    return(__str__()) ;
+char	*	swig_int::__repr__()	{
+				return(__str__())	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__add__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = (long long)(round(value + PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value + new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            result->value = (long long)(round(value + new_val)) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value + PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__add__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	(long	long)(round(value	+	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	+	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	(long	long)(round(value	+	new_val))	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	+	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__sub__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = (long long)(round(value - PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            result->value = value - new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            result->value = (long long)(round(value - new_val)) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value - (long long)PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__sub__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	(long	long)(round(value	-	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	value	-	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												result->value	=	(long	long)(round(value	-	new_val))	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	-	(long	long)PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__mul__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-
-    if ( PyFloat_Check(obj1) ) {
-        swig_double * result = new swig_double() ;
-        result->value = (double)value * PyFloat_AsDouble(obj1) ;
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * result = new swig_int() ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        result->value = value * temp_m->value ;
-        result->units = units + "*(" + temp_m->units + ")";
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * result = new swig_double() ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        result->value = value * temp_m->value ;
-        result->units = units + "*(" + temp_m->units + ")";
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if ( PyInt_Check(obj1) ) {
-        swig_int * result = new swig_int() ;
-        result->value = value * PyInt_AsLong(obj1) ;
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    }
-
-    return ret ;
+PyObject	*	swig_int::__mul__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+
+				if	(	PyFloat_Check(obj1)	)	{
+								swig_double	*	result	=	new	swig_double()	;
+								result->value	=	(double)value	*	PyFloat_AsDouble(obj1)	;
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	result	=	new	swig_int()	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								result->value	=	value	*	temp_m->value	;
+								result->units	=	units	+	"*("	+	temp_m->units	+	")";
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	result	=	new	swig_double()	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								result->value	=	value	*	temp_m->value	;
+								result->units	=	units	+	"*("	+	temp_m->units	+	")";
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								swig_int	*	result	=	new	swig_int()	;
+								result->value	=	value	*	PyInt_AsLong(obj1)	;
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}
+
+				return	ret	;
 }
 
-PyObject * swig_int::__div__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_double() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        result->value = value / PyFloat_AsDouble(obj1) ;
-        result->units = units ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        result->value = value / temp_m->value ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        result->value = value / temp_m->value ;
-        result->units = units + "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value / PyInt_AsLong(obj1) ;
-        result->units = units ;
-    }
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    return ret ;
+PyObject	*	swig_int::__div__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_double()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	value	/	PyFloat_AsDouble(obj1)	;
+								result->units	=	units	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								result->value	=	value	/	temp_m->value	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								result->value	=	value	/	temp_m->value	;
+								result->units	=	units	+	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	/	PyInt_AsLong(obj1)	;
+								result->units	=	units	;
+				}
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				return	ret	;
 }
 
-PyObject * swig_int::__truediv__( PyObject * obj1 ) {
-    return __div__(obj1) ;
+PyObject	*	swig_int::__truediv__(	PyObject	*	obj1	)	{
+				return	__div__(obj1)	;
 }
 
-PyObject * swig_int::__floordiv__( PyObject * obj1 ) {
-    return __div__(obj1) ;
+PyObject	*	swig_int::__floordiv__(	PyObject	*	obj1	)	{
+				return	__div__(obj1)	;
 }
 
-PyObject * swig_int::__mod__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        swig_double * result = new swig_double() ;
-        result->value = fmod(value , PyFloat_AsDouble(obj1)) ;
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * result = new swig_int() ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value % temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Divisor must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * result = new swig_double() ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = fmod( value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Divisor must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if ( PyInt_Check(obj1) ) {
-        swig_int * result = new swig_int() ;
-        result->value = value % PyInt_AsLong(obj1) ;
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    }
-
-    return ret ;
+PyObject	*	swig_int::__mod__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								swig_double	*	result	=	new	swig_double()	;
+								result->value	=	fmod(value	,	PyFloat_AsDouble(obj1))	;
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	result	=	new	swig_int()	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	%	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Divisor	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	result	=	new	swig_double()	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	fmod(	value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Divisor	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								swig_int	*	result	=	new	swig_int()	;
+								result->value	=	value	%	PyInt_AsLong(obj1)	;
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}
+
+				return	ret	;
 }
 
-PyObject * swig_int::__pow__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( units.compare("1")) {
-        PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-        return NULL ;
-    }
-
-    if ( PyFloat_Check(obj1) ) {
-        swig_double * result = new swig_double() ;
-        result->value = pow(value , PyFloat_AsDouble(obj1)) ;
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        swig_int * result = new swig_int() ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = (long long)(pow(value , temp_m->value)) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * result = new swig_double() ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = pow(value , temp_m->value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if ( PyInt_Check(obj1) ) {
-        swig_int * result = new swig_int() ;
-        int power = PyInt_AsLong(obj1) ;
-        result->value = (long long)(pow(value , power)) ;
-        result->units = units ;
-        for ( int ii = 1 ; ii < power ; ii++ ) {
-            result->units = result->units + "*(" + units + ")";
-        }
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    }
-
-    return ret ;
+PyObject	*	swig_int::__pow__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	units.compare("1"))	{
+								PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+								return	NULL	;
+				}
+
+				if	(	PyFloat_Check(obj1)	)	{
+								swig_double	*	result	=	new	swig_double()	;
+								result->value	=	pow(value	,	PyFloat_AsDouble(obj1))	;
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								swig_int	*	result	=	new	swig_int()	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	(long	long)(pow(value	,	temp_m->value))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	result	=	new	swig_double()	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	pow(value	,	temp_m->value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								swig_int	*	result	=	new	swig_int()	;
+								int	power	=	PyInt_AsLong(obj1)	;
+								result->value	=	(long	long)(pow(value	,	power))	;
+								result->units	=	units	;
+								for	(	int	ii	=	1	;	ii	<	power	;	ii++	)	{
+												result->units	=	result->units	+	"*("	+	units	+	")";
+								}
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}
+
+				return	ret	;
 }
 
-PyObject * swig_int::__lshift__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value << temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value << PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__lshift__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	<<	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	<<	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__rshift__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value >> temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value >> PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__rshift__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	>>	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	>>	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__and__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value & temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value & PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__and__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	&	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	&	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__xor__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value ^ temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value ^ PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__xor__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	^	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	^	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__or__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    result = new swig_int() ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            result->value = value | temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = value | PyInt_AsLong(obj1) ;
-    }
-    result->units = units ;
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__or__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				result	=	new	swig_int()	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												result->value	=	value	|	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	value	|	PyInt_AsLong(obj1)	;
+				}
+				result->units	=	units	;
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__radd__( PyObject * obj1 ) {
-    return __add__(obj1) ;
+PyObject	*	swig_int::__radd__(	PyObject	*	obj1	)	{
+				return	__add__(obj1)	;
 }
 
-PyObject * swig_int::__rsub__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__rsub__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
+				result	=	new	swig_int()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        result->value = (long long)(round(PyFloat_AsDouble(obj1) - value)) ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = (long long)(PyInt_AsLong(obj1) - value) ;
-    }
-    result->units = units ;
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	(long	long)(round(PyFloat_AsDouble(obj1)	-	value))	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	(long	long)(PyInt_AsLong(obj1)	-	value)	;
+				}
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_int::__rmul__( PyObject * obj1 ) {
-    return __mul__(obj1) ;
+PyObject	*	swig_int::__rmul__(	PyObject	*	obj1	)	{
+				return	__mul__(obj1)	;
 }
 
-PyObject * swig_int::__rdiv__( PyObject * obj1 ) {
-    swig_double * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__rdiv__(	PyObject	*	obj1	)	{
+				swig_double	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_double() ;
+				result	=	new	swig_double()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        result->value = PyFloat_AsDouble(obj1) / value ;
-    } else if ( PyInt_Check(obj1) ) {
-        result->value = PyInt_AsLong(obj1) / value ;
-    }
-    result->units = "1/(" + units + ")" ;
+				if	(	PyFloat_Check(obj1)	)	{
+								result->value	=	PyFloat_AsDouble(obj1)	/	value	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								result->value	=	PyInt_AsLong(obj1)	/	value	;
+				}
+				result->units	=	"1/("	+	units	+	")"	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_int::__rtruediv__( PyObject * obj1 ) {
-    return __rdiv__(obj1) ;
+PyObject	*	swig_int::__rtruediv__(	PyObject	*	obj1	)	{
+				return	__rdiv__(obj1)	;
 }
 
-PyObject * swig_int::__rfloordiv__( PyObject * obj1 ) {
-    return __rdiv__(obj1) ;
+PyObject	*	swig_int::__rfloordiv__(	PyObject	*	obj1	)	{
+				return	__rdiv__(obj1)	;
 }
 
-PyObject * swig_int::__rmod__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-
-
-    if ( PyFloat_Check(obj1) ) {
-        swig_double * result = new swig_double() ;
-        if ( !units.compare("1")) {
-            result->value = fmod(PyFloat_AsDouble(obj1) , value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Divisor must be unitless.  Cannot create new unit-ed type.");
-        }
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_double *"), SWIG_POINTER_OWN);
-    } else if ( PyInt_Check(obj1) ) {
-        swig_int * result = new swig_int() ;
-        if ( !units.compare("1")) {
-            result->value = (long long)(PyInt_AsLong(obj1) % value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Divisor must be unitless.  Cannot create new unit-ed type.");
-        }
-        result->units = units ;
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    }
-
-    return ret ;
+PyObject	*	swig_int::__rmod__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+
+
+				if	(	PyFloat_Check(obj1)	)	{
+								swig_double	*	result	=	new	swig_double()	;
+								if	(	!units.compare("1"))	{
+												result->value	=	fmod(PyFloat_AsDouble(obj1)	,	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Divisor	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_double	*"),	SWIG_POINTER_OWN);
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								swig_int	*	result	=	new	swig_int()	;
+								if	(	!units.compare("1"))	{
+												result->value	=	(long	long)(PyInt_AsLong(obj1)	%	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Divisor	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+								result->units	=	units	;
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				}
+
+				return	ret	;
 }
 
-PyObject * swig_int::__rpow__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-
-    if ( PyFloat_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            return(PyFloat_FromDouble(pow(PyFloat_AsDouble(obj1) , value))) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Power argument must be unitless.  Cannot create new unit-ed type.");
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            return(PyFloat_FromDouble(pow(PyInt_AsLong(obj1) , value))) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Power argument must be unitless.  Cannot create new unit-ed type.");
-        }
-    }
-
-    return ret ;
+PyObject	*	swig_int::__rpow__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												return(PyFloat_FromDouble(pow(PyFloat_AsDouble(obj1)	,	value)))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Power	argument	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												return(PyFloat_FromDouble(pow(PyInt_AsLong(obj1)	,	value)))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Power	argument	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+								}
+				}
+
+				return	ret	;
 }
 
-PyObject * swig_int::__rlshift__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__rlshift__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
+				result	=	new	swig_int()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shifted value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            result->value = (long long)(PyInt_AsLong(obj1) << value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    }
-    result->units = units ;
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shifted	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												result->value	=	(long	long)(PyInt_AsLong(obj1)	<<	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_int::__rrshift__( PyObject * obj1 ) {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__rrshift__(	PyObject	*	obj1	)	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
+				result	=	new	swig_int()	;
 
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shifted value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        if ( !units.compare("1")) {
-            result->value = (long long)(PyInt_AsLong(obj1) >> value) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    }
-    result->units = units ;
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shifted	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								if	(	!units.compare("1"))	{
+												result->value	=	(long	long)(PyInt_AsLong(obj1)	>>	value)	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}
+				result->units	=	units	;
 
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
 
-    return ret ;
+				return	ret	;
 }
 
-PyObject * swig_int::__rand__( PyObject * obj1 ) {
-    return __and__(obj1) ;
+PyObject	*	swig_int::__rand__(	PyObject	*	obj1	)	{
+				return	__and__(obj1)	;
 }
 
-PyObject * swig_int::__rxor__( PyObject * obj1 ) {
-    return __xor__(obj1) ;
+PyObject	*	swig_int::__rxor__(	PyObject	*	obj1	)	{
+				return	__xor__(obj1)	;
 }
 
-PyObject * swig_int::__ror__( PyObject * obj1 ) {
-    return __or__(obj1) ;
+PyObject	*	swig_int::__ror__(	PyObject	*	obj1	)	{
+				return	__or__(obj1)	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__iadd__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)round(value + PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value += new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value = (long long)round(value + new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value += PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__iadd__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)round(value	+	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	+=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	=	(long	long)round(value	+	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	+=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
 
-PyObject * swig_int::__isub__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)round(value - PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value -= new_val ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = scale_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            value = (long long)round(value - new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value -= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__isub__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)round(value	-	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	-=	new_val	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	scale_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												value	=	(long	long)round(value	-	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	-=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__imul__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)(round(value * PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        value *= temp_m->value ;
-        units += "*(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        value = (long long)round(value * temp_m->value) ;
-        units += "*(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        value *= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__imul__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)(round(value	*	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								value	*=	temp_m->value	;
+								units	+=	"*("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								value	=	(long	long)round(value	*	temp_m->value)	;
+								units	+=	"*("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	*=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__idiv__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)(round(value / PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        value /= temp_m->value ;
-        units += "/(" + temp_m->units + ")";
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        value = (long long)round(value / temp_m->value) ;
-        units += "/(" + temp_m->units + ")";
-    } else if ( PyInt_Check(obj1) ) {
-        value /= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__idiv__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)(round(value	/	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								value	/=	temp_m->value	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								value	=	(long	long)round(value	/	temp_m->value)	;
+								units	+=	"/("	+	temp_m->units	+	")";
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	/=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__itruediv__( PyObject * obj1 ) {
-    return __idiv__(obj1) ;
+PyObject	*	swig_int::__itruediv__(	PyObject	*	obj1	)	{
+				return	__idiv__(obj1)	;
 }
 
-PyObject * swig_int::__ifloordiv__( PyObject * obj1 ) {
-    return __idiv__(obj1) ;
+PyObject	*	swig_int::__ifloordiv__(	PyObject	*	obj1	)	{
+				return	__idiv__(obj1)	;
 }
 
-PyObject * swig_int::__imod__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)round(fmod( value , PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value %= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Operation must contain at least one unit-less value.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = (long long)round(fmod( value , temp_m->value ));
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Operation must contain at least one unit-less value.  Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value %= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__imod__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)round(fmod(	value	,	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	%=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Operation	must	contain	at	least	one	unit-less	value.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	(long	long)round(fmod(	value	,	temp_m->value	));
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Operation	must	contain	at	least	one	unit-less	value.		Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	%=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__ipow__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( units.compare("1")) {
-        PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-        return NULL ;
-    }
-
-    if ( PyFloat_Check(obj1) ) {
-        value = (long long)round(pow(value , PyFloat_AsDouble(obj1))) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = (long long)(pow(value , temp_m->value)) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value = (long long)round(pow(value , temp_m->value)) ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Both arguments must be unitless. Cannot create new unit-ed type.");
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        value = (long long)(pow(value , PyInt_AsLong(obj1))) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__ipow__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	units.compare("1"))	{
+								PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+								return	NULL	;
+				}
+
+				if	(	PyFloat_Check(obj1)	)	{
+								value	=	(long	long)round(pow(value	,	PyFloat_AsDouble(obj1)))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	(long	long)(pow(value	,	temp_m->value))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	=	(long	long)round(pow(value	,	temp_m->value))	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Both	arguments	must	be	unitless.	Cannot	create	new	unit-ed	type.");
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	=	(long	long)(pow(value	,	PyInt_AsLong(obj1)))	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__ilshift__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value <<= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        value <<= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__ilshift__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	<<=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	<<=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__irshift__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value >>= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Shift value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Shift value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        value >>= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__irshift__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	>>=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Shift	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	>>=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 
 }
 
-PyObject * swig_int::__iand__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value &= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        value &= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__iand__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	&=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	&=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__ixor__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value ^= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        value ^= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__ixor__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	^=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	^=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
-PyObject * swig_int::__ior__( PyObject * obj1 ) {
-    PyObject * ret = NULL ;
-    void * argp2 ;
-
-    if ( PyFloat_Check(obj1) ) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        if ( !temp_m->units.compare("1")) {
-            value |= temp_m->value ;
-        } else {
-            PyErr_SetString(PyExc_TypeError,"Bitmask value must be unitless.");
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        PyErr_SetString(PyExc_TypeError,"Bitmask value must be integer");
-        return NULL ;
-    } else if ( PyInt_Check(obj1) ) {
-        value |= PyInt_AsLong(obj1) ;
-    }
-
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(new swig_int(*this)), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-
-    return ret ;
+PyObject	*	swig_int::__ior__(	PyObject	*	obj1	)	{
+				PyObject	*	ret	=	NULL	;
+				void	*	argp2	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								if	(	!temp_m->units.compare("1"))	{
+												value	|=	temp_m->value	;
+								}	else	{
+												PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	unitless.");
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								PyErr_SetString(PyExc_TypeError,"Bitmask	value	must	be	integer");
+								return	NULL	;
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								value	|=	PyInt_AsLong(obj1)	;
+				}
+
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new	swig_int(*this)),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+
+				return	ret	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__lt__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value < PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value < new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value < new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value < PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__lt__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	<	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	<	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
-PyObject * swig_int::__le__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value <= PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value <= new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value <= new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value <= PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__le__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	<=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	<=	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	<=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
-PyObject * swig_int::__eq__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value == PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value == new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value == new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value == PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__eq__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	==	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	==	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	==	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	==	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
-PyObject * swig_int::__ne__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value != PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value != new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value != new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value != PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__ne__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	!=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	!=	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	!=	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	!=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
-PyObject * swig_int::__gt__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value > PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value > new_val) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value > new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value > PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__gt__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	>	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>	new_val)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	>	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
-PyObject * swig_int::__ge__( PyObject * obj1 ) {
-    void * argp2 ;
-    bool eq = 0 ;
-    int conv_ret ;
-
-    if ( PyFloat_Check(obj1) ) {
-        eq = (value >= PyFloat_AsDouble(obj1)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_int *"), 0 ))) {
-        long long new_val ;
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value >= temp_m->value) ;
-        } else {
-            return NULL ;
-        }
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("swig_double *"), 0 ))) {
-        double new_val ;
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        new_val = temp_m->value ;
-        conv_ret = convert_united_value( units , temp_m->units , &new_val ) ;
-        if ( conv_ret == 0 ) {
-            eq = (value >= new_val) ; ;
-        } else {
-            return NULL ;
-        }
-    } else if ( PyInt_Check(obj1) ) {
-        eq = (value >= PyInt_AsLong(obj1)) ;
-    }
-
-    if ( eq ) {
-        Py_RETURN_TRUE ;
-    }
-
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__ge__(	PyObject	*	obj1	)	{
+				void	*	argp2	;
+				bool	eq	=	0	;
+				int	conv_ret	;
+
+				if	(	PyFloat_Check(obj1)	)	{
+								eq	=	(value	>=	PyFloat_AsDouble(obj1))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_int	*"),	0	)))	{
+								long	long	new_val	;
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>=	temp_m->value)	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("swig_double	*"),	0	)))	{
+								double	new_val	;
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								new_val	=	temp_m->value	;
+								conv_ret	=	convert_united_value(	units	,	temp_m->units	,	&new_val	)	;
+								if	(	conv_ret	==	0	)	{
+												eq	=	(value	>=	new_val)	;	;
+								}	else	{
+												return	NULL	;
+								}
+				}	else	if	(	PyInt_Check(obj1)	)	{
+								eq	=	(value	>=	PyInt_AsLong(obj1))	;
+				}
+
+				if	(	eq	)	{
+								Py_RETURN_TRUE	;
+				}
+
+				Py_RETURN_FALSE	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__neg__() {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__neg__()	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
-    result->value = -value ;
-    result->units = units ;
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    return ret ;
+				result	=	new	swig_int()	;
+				result->value	=	-value	;
+				result->units	=	units	;
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				return	ret	;
 }
 
-PyObject * swig_int::__pos__() {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__pos__()	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
-    result->value = value ;
-    result->units = units ;
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    return ret ;
+				result	=	new	swig_int()	;
+				result->value	=	value	;
+				result->units	=	units	;
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				return	ret	;
 }
 
-PyObject * swig_int::__abs__() {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__abs__()	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
-    result->value = llabs(value) ;
-    result->units = units ;
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    return ret ;
+				result	=	new	swig_int()	;
+				result->value	=	llabs(value)	;
+				result->units	=	units	;
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				return	ret	;
 }
 
-PyObject * swig_int::__invert__() {
-    swig_int * result ;
-    PyObject * ret = NULL ;
+PyObject	*	swig_int::__invert__()	{
+				swig_int	*	result	;
+				PyObject	*	ret	=	NULL	;
 
-    result = new swig_int() ;
-    result->value = ~value ;
-    result->units = units ;
-    ret = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIG_TypeQuery("swig_int *"), SWIG_POINTER_OWN);
-    return ret ;
+				result	=	new	swig_int()	;
+				result->value	=	~value	;
+				result->units	=	units	;
+				ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(result),	SWIG_TypeQuery("swig_int	*"),	SWIG_POINTER_OWN);
+				return	ret	;
 }
 
-PyObject * swig_int::__nonzero__() {
-    if ( value != 0 ) {
-        Py_RETURN_TRUE ;
-    }
-    Py_RETURN_FALSE ;
+PyObject	*	swig_int::__nonzero__()	{
+				if	(	value	!=	0	)	{
+								Py_RETURN_TRUE	;
+				}
+				Py_RETURN_FALSE	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__int__() {
-    return PyInt_FromLong((long)value) ;
+PyObject	*	swig_int::__int__()	{
+				return	PyInt_FromLong((long)value)	;
 }
 
-PyObject * swig_int::__long__() {
-    return PyLong_FromLongLong(value) ;
+PyObject	*	swig_int::__long__()	{
+				return	PyLong_FromLongLong(value)	;
 }
 
-PyObject * swig_int::__float__() {
-    return PyFloat_FromDouble((double)value) ;
+PyObject	*	swig_int::__float__()	{
+				return	PyFloat_FromDouble((double)value)	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__oct__() {
-    char temp[32] ;
-    snprintf(temp, sizeof(temp), "0%o" , (unsigned int)value) ;
-    return PyString_FromString(temp) ;
+PyObject	*	swig_int::__oct__()	{
+				char	temp[32]	;
+				snprintf(temp,	sizeof(temp),	"0%o"	,	(unsigned	int)value)	;
+				return	PyString_FromString(temp)	;
 }
 
-PyObject * swig_int::__hex__() {
-    char temp[32] ;
-    snprintf(temp, sizeof(temp), "0x%llx" , value) ;
-    return PyString_FromString(temp) ;
+PyObject	*	swig_int::__hex__()	{
+				char	temp[32]	;
+				snprintf(temp,	sizeof(temp),	"0x%llx"	,	value)	;
+				return	PyString_FromString(temp)	;
 }
 
 //**********************************************************************************************
 
-PyObject * swig_int::__len__() {
-    return PyInt_FromLong(1) ;
+PyObject	*	swig_int::__len__()	{
+				return	PyInt_FromLong(1)	;
 }
 
 //**********************************************************************************************
 
-// New for python 3
+//	New	for	python	3
 
-int swig_int::__index__() {
-    return value ;
+int	swig_int::__index__()	{
+				return	value	;
 }
 
-PyObject * swig_int::__bool__() {
-    return __nonzero__() ;
+PyObject	*	swig_int::__bool__()	{
+				return	__nonzero__()	;
 }
diff --git a/trick_source/trick_swig/swig_ref.cpp b/trick_source/trick_swig/swig_ref.cpp
index acc49bea9..1778c365b 100644
--- a/trick_source/trick_swig/swig_ref.cpp
+++ b/trick_source/trick_swig/swig_ref.cpp
@@ -1,850 +1,850 @@
 
-#include <iostream>
-#include <sstream>
-#include <algorithm>
-#include <Python.h>
-#include <stdlib.h>
-
-#include "trick/swig/swig_ref.hh"
-#include "trick/swig/swig_double.hh"
-#include "trick/swig/swig_int.hh"
-#include "trick/swig/swig_convert_units.hh"
-#include "trick/MemoryManager.hh"
-#include "trick/memorymanager_c_intf.h"
-#include "trick/PythonPrint.hh"
-
-#if PY_VERSION_HEX < 0x02050000
-#define Py_ssize_t int
+#include	<iostream>
+#include	<sstream>
+#include	<algorithm>
+#include	<Python.h>
+#include	<stdlib.h>
+
+#include	"trick/swig/swig_ref.hh"
+#include	"trick/swig/swig_double.hh"
+#include	"trick/swig/swig_int.hh"
+#include	"trick/swig/swig_convert_units.hh"
+#include	"trick/MemoryManager.hh"
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/PythonPrint.hh"
+
+#if	PY_VERSION_HEX	<	0x02050000
+#define	Py_ssize_t	int
 #endif
 
-extern Trick::MemoryManager* trick_MM;
+extern	Trick::MemoryManager*	trick_MM;
 
-swig_ref::swig_ref() : ref() , need_to_deref(false) {
-    str_output = NULL ;
+swig_ref::swig_ref()	:	ref()	,	need_to_deref(false)	{
+				str_output	=	NULL	;
 }
 
-swig_ref::~swig_ref() {
-    if ( ref.attr->type_name ) {
-        free((void *)ref.attr->type_name) ;
-    }
-    if ( ref.attr->units ) {
-        free((void *)ref.attr->units) ;
-    }
-    delete ref.attr ;
-    if ( str_output ) {
-        free(str_output) ;
-    }
+swig_ref::~swig_ref()	{
+				if	(	ref.attr->type_name	)	{
+								free((void	*)ref.attr->type_name)	;
+				}
+				if	(	ref.attr->units	)	{
+								free((void	*)ref.attr->units)	;
+				}
+				delete	ref.attr	;
+				if	(	str_output	)	{
+								free(str_output)	;
+				}
 }
 
-char * swig_ref::__str__() {
-    std::stringstream os ;
+char	*	swig_ref::__str__()	{
+				std::stringstream	os	;
 
-    deref_address() ;
-    REF2 ref_copy = ref;
+				deref_address()	;
+				REF2	ref_copy	=	ref;
 
-    Trick::PythonPrint::write_rvalue(os , ref_copy.address , ref_copy.attr , 0 , 0) ;
+				Trick::PythonPrint::write_rvalue(os	,	ref_copy.address	,	ref_copy.attr	,	0	,	0)	;
 
-    if ( str_output ) {
-        free(str_output) ;
-    }
-    str_output = strdup(os.str().c_str()) ;
-    return str_output ;
+				if	(	str_output	)	{
+								free(str_output)	;
+				}
+				str_output	=	strdup(os.str().c_str())	;
+				return	str_output	;
 }
 
-char * swig_ref::__repr__() {
-    return(__str__()) ;
+char	*	swig_ref::__repr__()	{
+				return(__str__())	;
 }
 
-PyObject * swig_ref::__len__() {
-    return PyInt_FromLong((long)ref.attr->index[0].size) ;
+PyObject	*	swig_ref::__len__()	{
+				return	PyInt_FromLong((long)ref.attr->index[0].size)	;
 }
 
-// If the swig_ref needs is a pointer, dereference it and determine the array size.
-void swig_ref::deref_address() {
-    if ( need_to_deref ) {
-        ref.address = *(void**)ref.address ;
-        ref.attr->index[0].size = get_truncated_size((char *)ref.address) ;
-        need_to_deref = false ;
-    }
+//	If	the	swig_ref	needs	is	a	pointer,	dereference	it	and	determine	the	array	size.
+void	swig_ref::deref_address()	{
+				if	(	need_to_deref	)	{
+								ref.address	=	*(void**)ref.address	;
+								ref.attr->index[0].size	=	get_truncated_size((char	*)ref.address)	;
+								need_to_deref	=	false	;
+				}
 }
 
-template <class TYPE>
-void * assign_array( PyObject *obj1 , REF2 & ref ) {
-
-    void * argp2 ;
-    int ret ;
-    TYPE * temp_ptr ;
-    unsigned int jj ;
-
-
-    // convert list to tuple so we only have to deal with tuples in code below.
-    if ( PyList_Check(obj1) ) {
-        obj1 = PyList_AsTuple(obj1) ;
-    }
-    unsigned int size = PyTuple_Size(obj1) ;
-
-    temp_ptr = (TYPE *)TMM_declare_var_1d(ref.attr->type_name , size) ;
-
-    for( jj = 0 ; jj < size ; jj++ ) {
-        PyObject *o = PyTuple_GetItem( obj1 , jj ) ;
-        if (PyFloat_Check(o)) {
-            temp_ptr[jj] = (TYPE)(PyFloat_AsDouble(o)) ;
-        } else if (PyInt_Check(o)) {
-            temp_ptr[jj] = (TYPE)(PyInt_AsLong(o)) ;
-        } else if (SWIG_IsOK(SWIG_ConvertPtr(o, &argp2,SWIG_TypeQuery("_p_swig_double"), 0 ))) {
-            double new_value ;
-            std::string units_ref ;
-            swig_double * temp_m = reinterpret_cast<swig_double *>(argp2) ;
-
-            new_value = temp_m->value ;
-            units_ref = std::string(ref.attr->units) ;
-            ret = convert_united_value( units_ref , temp_m->units , &new_value ) ;
-            if ( ret == 0 ) {
-                temp_ptr[jj] = (TYPE)new_value ;
-            } else {
-                return NULL ;
-            }
-        } else if (SWIG_IsOK(SWIG_ConvertPtr(o, &argp2,SWIG_TypeQuery("_p_swig_int"), 0 ))) {
-            long long new_value ;
-            std::string units_ref ;
-            swig_int * temp_m = reinterpret_cast<swig_int *>(argp2) ;
-
-            new_value = temp_m->value ;
-            units_ref = std::string(ref.attr->units) ;
-            ret = convert_united_value( units_ref , temp_m->units , &new_value ) ;
-            if ( ret == 0 ) {
-                temp_ptr[jj] = (TYPE)new_value ;
-            } else {
-                return NULL ;
-            }
-        } else {
-            std::cout << "\033[31mHERE in swig_ref set_item with list of unknown types!!\033[0m" << std::endl ;
-            return NULL ;
-        }
-    }
-    return temp_ptr ;
+template	<class	TYPE>
+void	*	assign_array(	PyObject	*obj1	,	REF2	&	ref	)	{
+
+				void	*	argp2	;
+				int	ret	;
+				TYPE	*	temp_ptr	;
+				unsigned	int	jj	;
+
+
+				//	convert	list	to	tuple	so	we	only	have	to	deal	with	tuples	in	code	below.
+				if	(	PyList_Check(obj1)	)	{
+								obj1	=	PyList_AsTuple(obj1)	;
+				}
+				unsigned	int	size	=	PyTuple_Size(obj1)	;
+
+				temp_ptr	=	(TYPE	*)TMM_declare_var_1d(ref.attr->type_name	,	size)	;
+
+				for(	jj	=	0	;	jj	<	size	;	jj++	)	{
+								PyObject	*o	=	PyTuple_GetItem(	obj1	,	jj	)	;
+								if	(PyFloat_Check(o))	{
+												temp_ptr[jj]	=	(TYPE)(PyFloat_AsDouble(o))	;
+								}	else	if	(PyInt_Check(o))	{
+												temp_ptr[jj]	=	(TYPE)(PyInt_AsLong(o))	;
+								}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(o,	&argp2,SWIG_TypeQuery("_p_swig_double"),	0	)))	{
+												double	new_value	;
+												std::string	units_ref	;
+												swig_double	*	temp_m	=	reinterpret_cast<swig_double	*>(argp2)	;
+
+												new_value	=	temp_m->value	;
+												units_ref	=	std::string(ref.attr->units)	;
+												ret	=	convert_united_value(	units_ref	,	temp_m->units	,	&new_value	)	;
+												if	(	ret	==	0	)	{
+																temp_ptr[jj]	=	(TYPE)new_value	;
+												}	else	{
+																return	NULL	;
+												}
+								}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(o,	&argp2,SWIG_TypeQuery("_p_swig_int"),	0	)))	{
+												long	long	new_value	;
+												std::string	units_ref	;
+												swig_int	*	temp_m	=	reinterpret_cast<swig_int	*>(argp2)	;
+
+												new_value	=	temp_m->value	;
+												units_ref	=	std::string(ref.attr->units)	;
+												ret	=	convert_united_value(	units_ref	,	temp_m->units	,	&new_value	)	;
+												if	(	ret	==	0	)	{
+																temp_ptr[jj]	=	(TYPE)new_value	;
+												}	else	{
+																return	NULL	;
+												}
+								}	else	{
+												std::cout	<<	"\033[31mHERE	in	swig_ref	set_item	with	list	of	unknown	types!!\033[0m"	<<	std::endl	;
+												return	NULL	;
+								}
+				}
+				return	temp_ptr	;
 }
 
-void newVTreeNode( V_TREE **curr_node ) {
-    V_TREE * next_node = ( V_TREE * )calloc( 1 , sizeof(V_TREE) ) ;
-    (*curr_node)->next = next_node ;
-    *curr_node = next_node ;
-    (*curr_node)->v_data = ( V_DATA * )calloc( 1 , sizeof(V_DATA) ) ;
+void	newVTreeNode(	V_TREE	**curr_node	)	{
+				V_TREE	*	next_node	=	(	V_TREE	*	)calloc(	1	,	sizeof(V_TREE)	)	;
+				(*curr_node)->next	=	next_node	;
+				*curr_node	=	next_node	;
+				(*curr_node)->v_data	=	(	V_DATA	*	)calloc(	1	,	sizeof(V_DATA)	)	;
 }
 
-int setVData( V_DATA * v_data , PyObject * o , REF2 & ref_copy ) {
-    void * argp2 ;
-    int ret ;
-
-    if (PyFloat_Check(o)) {
-        v_data->type = TRICK_DOUBLE ;
-        v_data->value.d = PyFloat_AsDouble(o) ;
-    } else if (PyInt_Check(o)) {
-        v_data->type = TRICK_LONG_LONG ;
-        v_data->value.ll = PyInt_AsLong(o) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(o, &argp2,SWIG_TypeQuery("_p_swig_double"), 0 ))) {
-        double new_value ;
-        std::string units_ref ;
-        swig_double * temp_m = reinterpret_cast<swig_double *>(argp2) ;
-
-        new_value = temp_m->value ;
-        units_ref = std::string(ref_copy.attr->units) ;
-        ret = convert_united_value( units_ref , temp_m->units , &new_value ) ;
-        if ( ret == 0 ) {
-            v_data->value.d = new_value ;
-        } else {
-            return TRICK_UNITS_CONVERSION_ERROR ;
-        }
-        v_data->type = TRICK_DOUBLE ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(o, &argp2,SWIG_TypeQuery("_p_swig_int"), 0 ))) {
-        long long new_value ;
-        std::string units_ref ;
-        swig_int * temp_m = reinterpret_cast<swig_int *>(argp2) ;
-
-        new_value = temp_m->value ;
-        units_ref = std::string(ref_copy.attr->units) ;
-        ret = convert_united_value( units_ref , temp_m->units , &new_value ) ;
-        if ( ret == 0 ) {
-            v_data->value.ll = new_value ;
-        } else {
-            return -1 ;
-        }
-        v_data->type = TRICK_LONG_LONG ;
-    } else {
-        //TODO: handle list items of "void *" and other pointer types
-        std::cout << "\033[31mHERE in swig_ref set_item with list of unknown types!!\033[0m" << std::endl ;
-        return -1 ;
-    }
-    return 0 ;
+int	setVData(	V_DATA	*	v_data	,	PyObject	*	o	,	REF2	&	ref_copy	)	{
+				void	*	argp2	;
+				int	ret	;
+
+				if	(PyFloat_Check(o))	{
+								v_data->type	=	TRICK_DOUBLE	;
+								v_data->value.d	=	PyFloat_AsDouble(o)	;
+				}	else	if	(PyInt_Check(o))	{
+								v_data->type	=	TRICK_LONG_LONG	;
+								v_data->value.ll	=	PyInt_AsLong(o)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(o,	&argp2,SWIG_TypeQuery("_p_swig_double"),	0	)))	{
+								double	new_value	;
+								std::string	units_ref	;
+								swig_double	*	temp_m	=	reinterpret_cast<swig_double	*>(argp2)	;
+
+								new_value	=	temp_m->value	;
+								units_ref	=	std::string(ref_copy.attr->units)	;
+								ret	=	convert_united_value(	units_ref	,	temp_m->units	,	&new_value	)	;
+								if	(	ret	==	0	)	{
+												v_data->value.d	=	new_value	;
+								}	else	{
+												return	TRICK_UNITS_CONVERSION_ERROR	;
+								}
+								v_data->type	=	TRICK_DOUBLE	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(o,	&argp2,SWIG_TypeQuery("_p_swig_int"),	0	)))	{
+								long	long	new_value	;
+								std::string	units_ref	;
+								swig_int	*	temp_m	=	reinterpret_cast<swig_int	*>(argp2)	;
+
+								new_value	=	temp_m->value	;
+								units_ref	=	std::string(ref_copy.attr->units)	;
+								ret	=	convert_united_value(	units_ref	,	temp_m->units	,	&new_value	)	;
+								if	(	ret	==	0	)	{
+												v_data->value.ll	=	new_value	;
+								}	else	{
+												return	-1	;
+								}
+								v_data->type	=	TRICK_LONG_LONG	;
+				}	else	{
+								//TODO:	handle	list	items	of	"void	*"	and	other	pointer	types
+								std::cout	<<	"\033[31mHERE	in	swig_ref	set_item	with	list	of	unknown	types!!\033[0m"	<<	std::endl	;
+								return	-1	;
+				}
+				return	0	;
 }
 
-int swig_ref::__setitem__( int ii, PyObject * obj1 ) {
+int	swig_ref::__setitem__(	int	ii,	PyObject	*	obj1	)	{
 
-    V_TREE v_tree ;
-    void * argp2 ;
-    int ret ;
-    int status ;
-    V_TREE *first_node , * curr_node ;
+				V_TREE	v_tree	;
+				void	*	argp2	;
+				int	ret	;
+				int	status	;
+				V_TREE	*first_node	,	*	curr_node	;
 
-    deref_address() ;
-    REF2 ref_copy = ref;
+				deref_address()	;
+				REF2	ref_copy	=	ref;
 
-    if ( ii < 0 ) {
-        ii += ref_copy.attr->index[0].size ;
-    }
+				if	(	ii	<	0	)	{
+								ii	+=	ref_copy.attr->index[0].size	;
+				}
 
-    v_tree.v_data = ( V_DATA * )calloc( 1 , sizeof(V_DATA) ) ;
+				v_tree.v_data	=	(	V_DATA	*	)calloc(	1	,	sizeof(V_DATA)	)	;
 
-    v_tree.v_data->type = TRICK_INTEGER ;
-    v_tree.v_data->value.i = ii ;
+				v_tree.v_data->type	=	TRICK_INTEGER	;
+				v_tree.v_data->value.i	=	ii	;
 
-    status = trick_MM->ref_dim( &ref_copy , v_tree.v_data ) ;
+				status	=	trick_MM->ref_dim(	&ref_copy	,	v_tree.v_data	)	;
 
-    // Error in ref_dim
-    if ( status != 0 ) {
-        return status ;
-    }
+				//	Error	in	ref_dim
+				if	(	status	!=	0	)	{
+								return	status	;
+				}
 
-    v_tree.last = v_tree.next = v_tree.down = NULL ;
+				v_tree.last	=	v_tree.next	=	v_tree.down	=	NULL	;
 
-    // convert list to tuple so we only have to deal with tuples in code below.
-    if ( PyList_Check(obj1) ) {
-        obj1 = PyList_AsTuple(obj1) ;
-    }
+				//	convert	list	to	tuple	so	we	only	have	to	deal	with	tuples	in	code	below.
+				if	(	PyList_Check(obj1)	)	{
+								obj1	=	PyList_AsTuple(obj1)	;
+				}
 
-    if (PyFloat_Check(obj1)) {
-        v_tree.v_data->type = TRICK_DOUBLE ;
-        v_tree.v_data->value.d = PyFloat_AsDouble(obj1) ;
-    } else if (PyInt_Check(obj1)) {
-        v_tree.v_data->type = TRICK_LONG_LONG ;
-        v_tree.v_data->value.ll = PyInt_AsLong(obj1) ;
-#if PY_VERSION_HEX >= 0x03000000
-    } else if ( PyUnicode_Check(obj1) ) {
-        v_tree.v_data->type = TRICK_STRING ;
-        PyObject * temp = PyUnicode_AsEncodedString(obj1, "utf-8", "Error ~");
-        v_tree.v_data->value.cp = strdup(PyBytes_AS_STRING(temp)) ;
+				if	(PyFloat_Check(obj1))	{
+								v_tree.v_data->type	=	TRICK_DOUBLE	;
+								v_tree.v_data->value.d	=	PyFloat_AsDouble(obj1)	;
+				}	else	if	(PyInt_Check(obj1))	{
+								v_tree.v_data->type	=	TRICK_LONG_LONG	;
+								v_tree.v_data->value.ll	=	PyInt_AsLong(obj1)	;
+#if	PY_VERSION_HEX	>=	0x03000000
+				}	else	if	(	PyUnicode_Check(obj1)	)	{
+								v_tree.v_data->type	=	TRICK_STRING	;
+								PyObject	*	temp	=	PyUnicode_AsEncodedString(obj1,	"utf-8",	"Error	~");
+								v_tree.v_data->value.cp	=	strdup(PyBytes_AS_STRING(temp))	;
 #else
-    } else if (PyString_Check(obj1)) {
-        v_tree.v_data->type = TRICK_STRING ;
-        v_tree.v_data->value.cp = PyString_AsString(obj1) ;
+				}	else	if	(PyString_Check(obj1))	{
+								v_tree.v_data->type	=	TRICK_STRING	;
+								v_tree.v_data->value.cp	=	PyString_AsString(obj1)	;
 #endif
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("_p_swig_double"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast< swig_double * >(argp2) ;
-        ref_copy.units = (char *)temp_m->units.c_str() ;
-        v_tree.v_data->type = TRICK_DOUBLE ;
-        v_tree.v_data->value.d = temp_m->value ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("_p_swig_int"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast< swig_int * >(argp2) ;
-        ref_copy.units = (char *)temp_m->units.c_str() ;
-        v_tree.v_data->type = TRICK_LONG_LONG ;
-        v_tree.v_data->value.ll = temp_m->value ;
-    } else if ( PyTuple_Check(obj1) ) {
-        unsigned int jj ;
-        unsigned int size = PyTuple_Size(obj1) ;
-        int last_index ;
-
-        // See if we have a list to assign to on the left side
-        if ( ref_copy.num_index_left == 0 ) {
-            std::cout << "\033[31mCannot assign list to a scalar value\033[0m" << std::endl ;
-            return TRICK_PARAMETER_ARRAY_SIZE ;
-        }
-
-        //cout << "HERE in swig_ref set_item with list type!! ref->num_index " << ref.num_index << " attr->num_index = " << ref.attr->num_index << endl ;
-        //cout << "    last index size = " << ref.attr->index[ref.attr->num_index - 1].size << endl ;
-        last_index = ref_copy.attr->index[ref_copy.attr->num_index - 1].size ;
-
-        if ( last_index ) {
-            // The LHS is an array.  Fill out a V_TREE structure with the RHS data to be used with ref_assignment.
-            first_node = curr_node = ( V_TREE * )calloc( 1 , sizeof(V_TREE) ) ;
-
-            //TODO: Add 2 dimensional assignments
-            for( jj = 0 ; jj < size ; jj++ ) {
-                PyObject *o = PyTuple_GetItem( obj1 , jj ) ;
-                newVTreeNode(&curr_node) ;
-                ret = setVData( curr_node->v_data , o , ref_copy ) ;
-                if ( ret != 0 ) {
-                    return ret ;
-                }
-            }
-
-            v_tree.down = first_node->next ;
-            free(first_node) ;
-        } else {
-            // The LHS is a pointer.  Create an allocation from the data on the right to be used in ref_assignment.
-            v_tree.v_data->type = TRICK_VOID_PTR ;
-            switch (ref_copy.attr->type) {
-                case TRICK_UNSIGNED_CHARACTER:
-                    v_tree.v_data->value.vp = assign_array< unsigned char > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_SHORT:
-                    v_tree.v_data->value.vp = assign_array< short > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_UNSIGNED_SHORT:
-                    v_tree.v_data->value.vp = assign_array< unsigned short > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_INTEGER:
-                    v_tree.v_data->value.vp = assign_array< int > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_UNSIGNED_INTEGER:
-                    v_tree.v_data->value.vp = assign_array< unsigned int > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_LONG:
-                    v_tree.v_data->value.vp = assign_array< long > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_UNSIGNED_LONG:
-                    v_tree.v_data->value.vp = assign_array< unsigned long > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_LONG_LONG:
-                    v_tree.v_data->value.vp = assign_array< long long > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_UNSIGNED_LONG_LONG:
-                    v_tree.v_data->value.vp = assign_array< unsigned long long > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_DOUBLE:
-                    v_tree.v_data->value.vp = assign_array< double > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_FLOAT:
-                    v_tree.v_data->value.vp = assign_array< float > ( obj1 , ref_copy ) ;
-                break ;
-                case TRICK_BOOLEAN:
-                    v_tree.v_data->value.vp = assign_array< bool > ( obj1 , ref_copy ) ;
-                break ;
-                default:
-                break ;
-            }
-            //cout << "\033[33mGoing to set a pointer in swig_ref::set_item!!\033[0m" << endl ;
-        }
-        //cout << "finished making v_tree" << endl ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(obj1, &argp2,SWIG_TypeQuery("void *"), 0 ))) {
-        //cout << "\033[31mHERE in swig_ref set_item with void *!!\033[0m" << endl ;
-        v_tree.v_data->type = TRICK_VOID_PTR ;
-        v_tree.v_data->value.vp = reinterpret_cast< void * >(argp2) ;
-    } else {
-        // Test and see if a the RHS is a compatible pointer to our variable.
-#if SWIG_VERSION >= 0x010332
-        SwigPyObject * swig_obj = SWIG_Python_GetSwigThis(obj1) ;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("_p_swig_double"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<	swig_double	*	>(argp2)	;
+								ref_copy.units	=	(char	*)temp_m->units.c_str()	;
+								v_tree.v_data->type	=	TRICK_DOUBLE	;
+								v_tree.v_data->value.d	=	temp_m->value	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("_p_swig_int"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<	swig_int	*	>(argp2)	;
+								ref_copy.units	=	(char	*)temp_m->units.c_str()	;
+								v_tree.v_data->type	=	TRICK_LONG_LONG	;
+								v_tree.v_data->value.ll	=	temp_m->value	;
+				}	else	if	(	PyTuple_Check(obj1)	)	{
+								unsigned	int	jj	;
+								unsigned	int	size	=	PyTuple_Size(obj1)	;
+								int	last_index	;
+
+								//	See	if	we	have	a	list	to	assign	to	on	the	left	side
+								if	(	ref_copy.num_index_left	==	0	)	{
+												std::cout	<<	"\033[31mCannot	assign	list	to	a	scalar	value\033[0m"	<<	std::endl	;
+												return	TRICK_PARAMETER_ARRAY_SIZE	;
+								}
+
+								//cout	<<	"HERE	in	swig_ref	set_item	with	list	type!!	ref->num_index	"	<<	ref.num_index	<<	"	attr->num_index	=	"	<<	ref.attr->num_index	<<	endl	;
+								//cout	<<	"				last	index	size	=	"	<<	ref.attr->index[ref.attr->num_index	-	1].size	<<	endl	;
+								last_index	=	ref_copy.attr->index[ref_copy.attr->num_index	-	1].size	;
+
+								if	(	last_index	)	{
+												//	The	LHS	is	an	array.		Fill	out	a	V_TREE	structure	with	the	RHS	data	to	be	used	with	ref_assignment.
+												first_node	=	curr_node	=	(	V_TREE	*	)calloc(	1	,	sizeof(V_TREE)	)	;
+
+												//TODO:	Add	2	dimensional	assignments
+												for(	jj	=	0	;	jj	<	size	;	jj++	)	{
+																PyObject	*o	=	PyTuple_GetItem(	obj1	,	jj	)	;
+																newVTreeNode(&curr_node)	;
+																ret	=	setVData(	curr_node->v_data	,	o	,	ref_copy	)	;
+																if	(	ret	!=	0	)	{
+																				return	ret	;
+																}
+												}
+
+												v_tree.down	=	first_node->next	;
+												free(first_node)	;
+								}	else	{
+												//	The	LHS	is	a	pointer.		Create	an	allocation	from	the	data	on	the	right	to	be	used	in	ref_assignment.
+												v_tree.v_data->type	=	TRICK_VOID_PTR	;
+												switch	(ref_copy.attr->type)	{
+																case	TRICK_UNSIGNED_CHARACTER:
+																				v_tree.v_data->value.vp	=	assign_array<	unsigned	char	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_SHORT:
+																				v_tree.v_data->value.vp	=	assign_array<	short	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_UNSIGNED_SHORT:
+																				v_tree.v_data->value.vp	=	assign_array<	unsigned	short	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_INTEGER:
+																				v_tree.v_data->value.vp	=	assign_array<	int	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_UNSIGNED_INTEGER:
+																				v_tree.v_data->value.vp	=	assign_array<	unsigned	int	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_LONG:
+																				v_tree.v_data->value.vp	=	assign_array<	long	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_UNSIGNED_LONG:
+																				v_tree.v_data->value.vp	=	assign_array<	unsigned	long	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_LONG_LONG:
+																				v_tree.v_data->value.vp	=	assign_array<	long	long	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_UNSIGNED_LONG_LONG:
+																				v_tree.v_data->value.vp	=	assign_array<	unsigned	long	long	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_DOUBLE:
+																				v_tree.v_data->value.vp	=	assign_array<	double	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_FLOAT:
+																				v_tree.v_data->value.vp	=	assign_array<	float	>	(	obj1	,	ref_copy	)	;
+																break	;
+																case	TRICK_BOOLEAN:
+																				v_tree.v_data->value.vp	=	assign_array<	bool	>	(	obj1	,	ref_copy	)	;
+																break	;
+																default:
+																break	;
+												}
+												//cout	<<	"\033[33mGoing	to	set	a	pointer	in	swig_ref::set_item!!\033[0m"	<<	endl	;
+								}
+								//cout	<<	"finished	making	v_tree"	<<	endl	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(obj1,	&argp2,SWIG_TypeQuery("void	*"),	0	)))	{
+								//cout	<<	"\033[31mHERE	in	swig_ref	set_item	with	void	*!!\033[0m"	<<	endl	;
+								v_tree.v_data->type	=	TRICK_VOID_PTR	;
+								v_tree.v_data->value.vp	=	reinterpret_cast<	void	*	>(argp2)	;
+				}	else	{
+								//	Test	and	see	if	a	the	RHS	is	a	compatible	pointer	to	our	variable.
+#if	SWIG_VERSION	>=	0x010332
+								SwigPyObject	*	swig_obj	=	SWIG_Python_GetSwigThis(obj1)	;
 #else
-        PySwigObject * swig_obj = SWIG_Python_GetSwigThis(obj1) ;
+								PySwigObject	*	swig_obj	=	SWIG_Python_GetSwigThis(obj1)	;
 #endif
-        if ( swig_obj != NULL ) {
-            void *argp1 = NULL ;
-            std::string array_type_name = std::string("_p_") + ref.attr->type_name ;
-            if ( SWIG_IsOK(SWIG_ConvertPtr(obj1,&argp1,SWIG_TypeQuery(array_type_name.c_str()),SWIG_POINTER_DISOWN))) {
-                v_tree.v_data->type = TRICK_VOID_PTR ;
-                v_tree.v_data->value.vp = argp1 ;
-            } else {
-                std::cout << "\033[31mswig_ref::__setitem__ could not convert  " <<
-                 SWIG_TypePrettyName(SWIG_Python_GetSwigThis(obj1)->ty) <<
-                 " to " << ref.attr->type_name << "\033[0m" << std::endl ;
-                return TRICK_SWIG_PARAMETER_INCORRECT_TYPE ;
-            }
-        } else {
-            // Cannot determine what the RHS is.
-            std::cout << "\033[31mHERE3 in swig_ref set_item with unknown type\033[0m" << std::endl ;
-            return -1 ;
-        }
-    }
-
-    //cout << "HERE in swig_ref set_item!! " << ii << endl ;
-    ret = trick_MM->ref_assignment( &ref_copy , &v_tree ) ;
-
-    free(v_tree.v_data) ;
-    curr_node = v_tree.down ;
-    while ( curr_node != NULL ) {
-        V_TREE * next_node = curr_node->next ;
-        free(curr_node->v_data) ;
-        free(curr_node) ;
-        curr_node = next_node ;
-    }
-    return(ret) ;
+								if	(	swig_obj	!=	NULL	)	{
+												void	*argp1	=	NULL	;
+												std::string	array_type_name	=	std::string("_p_")	+	ref.attr->type_name	;
+												if	(	SWIG_IsOK(SWIG_ConvertPtr(obj1,&argp1,SWIG_TypeQuery(array_type_name.c_str()),SWIG_POINTER_DISOWN)))	{
+																v_tree.v_data->type	=	TRICK_VOID_PTR	;
+																v_tree.v_data->value.vp	=	argp1	;
+												}	else	{
+																std::cout	<<	"\033[31mswig_ref::__setitem__	could	not	convert		"	<<
+																	SWIG_TypePrettyName(SWIG_Python_GetSwigThis(obj1)->ty)	<<
+																	"	to	"	<<	ref.attr->type_name	<<	"\033[0m"	<<	std::endl	;
+																return	TRICK_SWIG_PARAMETER_INCORRECT_TYPE	;
+												}
+								}	else	{
+												//	Cannot	determine	what	the	RHS	is.
+												std::cout	<<	"\033[31mHERE3	in	swig_ref	set_item	with	unknown	type\033[0m"	<<	std::endl	;
+												return	-1	;
+								}
+				}
+
+				//cout	<<	"HERE	in	swig_ref	set_item!!	"	<<	ii	<<	endl	;
+				ret	=	trick_MM->ref_assignment(	&ref_copy	,	&v_tree	)	;
+
+				free(v_tree.v_data)	;
+				curr_node	=	v_tree.down	;
+				while	(	curr_node	!=	NULL	)	{
+								V_TREE	*	next_node	=	curr_node->next	;
+								free(curr_node->v_data)	;
+								free(curr_node)	;
+								curr_node	=	next_node	;
+				}
+				return(ret)	;
 }
 
-template < class VALUE_TYPE >
-VALUE_TYPE getValue(void * address , Py_ssize_t index ) {
-    VALUE_TYPE * casted_address = ( VALUE_TYPE * ) address ;
-    return casted_address[index] ;
+template	<	class	VALUE_TYPE	>
+VALUE_TYPE	getValue(void	*	address	,	Py_ssize_t	index	)	{
+				VALUE_TYPE	*	casted_address	=	(	VALUE_TYPE	*	)	address	;
+				return	casted_address[index]	;
 }
 
-int copyValue( V_DATA * v_data , REF2 & ref , Py_ssize_t index ) {
-    switch (ref.attr->type) {
-        case TRICK_CHARACTER:
-            v_data->value.ll = getValue< char >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_UNSIGNED_CHARACTER:
-            v_data->value.ll = getValue< unsigned char >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_SHORT:
-            v_data->value.ll = getValue< short >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_UNSIGNED_SHORT:
-            v_data->value.ll = getValue< unsigned short >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_INTEGER:
-            v_data->value.ll = getValue< int >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_UNSIGNED_INTEGER:
-            v_data->value.ll = getValue< unsigned int >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_LONG:
-            v_data->value.ll = getValue< long >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_UNSIGNED_LONG:
-            v_data->value.ll = getValue< unsigned long >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_LONG_LONG:
-            v_data->value.ll = getValue< long long >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_UNSIGNED_LONG_LONG:
-            v_data->value.ll = getValue< unsigned long long >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        case TRICK_DOUBLE:
-            v_data->value.d = getValue< double >(ref.address , index) ;
-            v_data->type = TRICK_DOUBLE ;
-            break ;
-        case TRICK_FLOAT:
-            v_data->value.d = getValue< float >(ref.address , index) ;
-            v_data->type = TRICK_DOUBLE ;
-            break ;
-        case TRICK_BOOLEAN:
-            v_data->value.ll = getValue< bool >(ref.address , index) ;
-            v_data->type = TRICK_LONG_LONG ;
-            break ;
-        default:
-            break ;
-    }
-    return 0 ;
+int	copyValue(	V_DATA	*	v_data	,	REF2	&	ref	,	Py_ssize_t	index	)	{
+				switch	(ref.attr->type)	{
+								case	TRICK_CHARACTER:
+												v_data->value.ll	=	getValue<	char	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_UNSIGNED_CHARACTER:
+												v_data->value.ll	=	getValue<	unsigned	char	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_SHORT:
+												v_data->value.ll	=	getValue<	short	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_UNSIGNED_SHORT:
+												v_data->value.ll	=	getValue<	unsigned	short	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_INTEGER:
+												v_data->value.ll	=	getValue<	int	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_UNSIGNED_INTEGER:
+												v_data->value.ll	=	getValue<	unsigned	int	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_LONG:
+												v_data->value.ll	=	getValue<	long	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_UNSIGNED_LONG:
+												v_data->value.ll	=	getValue<	unsigned	long	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_LONG_LONG:
+												v_data->value.ll	=	getValue<	long	long	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_UNSIGNED_LONG_LONG:
+												v_data->value.ll	=	getValue<	unsigned	long	long	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								case	TRICK_DOUBLE:
+												v_data->value.d	=	getValue<	double	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_DOUBLE	;
+												break	;
+								case	TRICK_FLOAT:
+												v_data->value.d	=	getValue<	float	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_DOUBLE	;
+												break	;
+								case	TRICK_BOOLEAN:
+												v_data->value.ll	=	getValue<	bool	>(ref.address	,	index)	;
+												v_data->type	=	TRICK_LONG_LONG	;
+												break	;
+								default:
+												break	;
+				}
+				return	0	;
 }
 
-int swig_ref::__setitem__( PyObject * index , PyObject * obj1 ) {
-
-    int ret = 0 ;
-    void * argp2 ;
-
-    /* Index types of ints, floats, swig_ints, and swig_doubles sent to __setitem__(int, PyObject *) */
-    if ( PyInt_Check(index)) {
-        ret = __setitem__((int)PyInt_AsLong(index), obj1) ;
-    } else if ( PyFloat_Check(index)) {
-        ret = __setitem__((int)PyFloat_AsDouble(index), obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(index, &argp2,SWIG_TypeQuery("_p_swig_int"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast<swig_int *>(argp2) ;
-        ret = __setitem__((int)(temp_m->value), obj1) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(index, &argp2,SWIG_TypeQuery("_p_swig_double"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast<swig_double *>(argp2) ;
-        ret = __setitem__((int)(temp_m->value), obj1) ;
-    } else if ( PySlice_Check(index)) {
-        Py_ssize_t ii , start , stop , step ;
-        int status ;
-        // TODO: make sure obj1 is list or tuple.  Handle singular values on RHS
-
-        // get the start, stop, and step value of the slice
-#if PY_VERSION_HEX >= 0x03000000
-        status = PySlice_GetIndices( index , ref.attr->index[0].size , &start , &stop , &step ) ;
+int	swig_ref::__setitem__(	PyObject	*	index	,	PyObject	*	obj1	)	{
+
+				int	ret	=	0	;
+				void	*	argp2	;
+
+				/*	Index	types	of	ints,	floats,	swig_ints,	and	swig_doubles	sent	to	__setitem__(int,	PyObject	*)	*/
+				if	(	PyInt_Check(index))	{
+								ret	=	__setitem__((int)PyInt_AsLong(index),	obj1)	;
+				}	else	if	(	PyFloat_Check(index))	{
+								ret	=	__setitem__((int)PyFloat_AsDouble(index),	obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(index,	&argp2,SWIG_TypeQuery("_p_swig_int"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<swig_int	*>(argp2)	;
+								ret	=	__setitem__((int)(temp_m->value),	obj1)	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(index,	&argp2,SWIG_TypeQuery("_p_swig_double"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<swig_double	*>(argp2)	;
+								ret	=	__setitem__((int)(temp_m->value),	obj1)	;
+				}	else	if	(	PySlice_Check(index))	{
+								Py_ssize_t	ii	,	start	,	stop	,	step	;
+								int	status	;
+								//	TODO:	make	sure	obj1	is	list	or	tuple.		Handle	singular	values	on	RHS
+
+								//	get	the	start,	stop,	and	step	value	of	the	slice
+#if	PY_VERSION_HEX	>=	0x03000000
+								status	=	PySlice_GetIndices(	index	,	ref.attr->index[0].size	,	&start	,	&stop	,	&step	)	;
 #else
-        status = PySlice_GetIndices( (PySliceObject *)index , ref.attr->index[0].size , &start , &stop , &step ) ;
+								status	=	PySlice_GetIndices(	(PySliceObject	*)index	,	ref.attr->index[0].size	,	&start	,	&stop	,	&step	)	;
 #endif
-        if ( status == 0 ) {
-
-            V_TREE v_tree ;
-            V_TREE * first_node , * curr_node ;
-            unsigned int size ;
-            unsigned int expected_slice_size ;
-
-            if ( PyList_Check(obj1) ) {
-                obj1 = PyList_AsTuple(obj1) ;
-            }
-            if ( PyTuple_Check(obj1) ) {
-                size = PyTuple_Size(obj1) ;
-            } else {
-                size = 1 ;
-            }
-
-            expected_slice_size = ( stop - start + 1 ) / step ;
-            if ( (step == 1) or (expected_slice_size == size) ) {
-
-                // create a dummy first node.  This simplifys code underneath.  We will throw this first node away.
-                first_node = curr_node = ( V_TREE * )calloc( 1 , sizeof(V_TREE) ) ;
-
-                // copy the current data before replacement slice
-                for ( ii = 0 ; ii < start ; ii++ ) {
-                    newVTreeNode(&curr_node) ;
-                    copyValue( curr_node->v_data , ref , ii ) ;
-                }
-
-                // insert slice data
-                if ( step == 1 ) {
-                    // normal slice insertion, copy the whole list from RHS to vtree structure.
-                    if ( PyTuple_Check(obj1) ) {
-#if PY_VERSION_HEX < 0x02050000
-                        for( ii = 0 ; ii < (int)size ; ii++ ) {
+								if	(	status	==	0	)	{
+
+												V_TREE	v_tree	;
+												V_TREE	*	first_node	,	*	curr_node	;
+												unsigned	int	size	;
+												unsigned	int	expected_slice_size	;
+
+												if	(	PyList_Check(obj1)	)	{
+																obj1	=	PyList_AsTuple(obj1)	;
+												}
+												if	(	PyTuple_Check(obj1)	)	{
+																size	=	PyTuple_Size(obj1)	;
+												}	else	{
+																size	=	1	;
+												}
+
+												expected_slice_size	=	(	stop	-	start	+	1	)	/	step	;
+												if	(	(step	==	1)	or	(expected_slice_size	==	size)	)	{
+
+																//	create	a	dummy	first	node.		This	simplifys	code	underneath.		We	will	throw	this	first	node	away.
+																first_node	=	curr_node	=	(	V_TREE	*	)calloc(	1	,	sizeof(V_TREE)	)	;
+
+																//	copy	the	current	data	before	replacement	slice
+																for	(	ii	=	0	;	ii	<	start	;	ii++	)	{
+																				newVTreeNode(&curr_node)	;
+																				copyValue(	curr_node->v_data	,	ref	,	ii	)	;
+																}
+
+																//	insert	slice	data
+																if	(	step	==	1	)	{
+																				//	normal	slice	insertion,	copy	the	whole	list	from	RHS	to	vtree	structure.
+																				if	(	PyTuple_Check(obj1)	)	{
+#if	PY_VERSION_HEX	<	0x02050000
+																								for(	ii	=	0	;	ii	<	(int)size	;	ii++	)	{
 #else
-                        for( ii = 0 ; ii < size ; ii++ ) {
+																								for(	ii	=	0	;	ii	<	size	;	ii++	)	{
 #endif
-                            newVTreeNode(&curr_node) ;
-                            PyObject *o = PyTuple_GetItem( obj1 , ii ) ;
-                            ret = setVData( curr_node->v_data , o , ref ) ;
-                        }
-                    } else {
-                        newVTreeNode(&curr_node) ;
-                        ret = setVData( curr_node->v_data , obj1 , ref ) ;
-                    }
-                } else {
-                    // extended slice insertion where step != 1.  Replace each <step> element in existing data
-                    for( ii = 0 ; ii < stop - start ; ii++ ) {
-                        newVTreeNode(&curr_node) ;
-                        if ( ii % step == 0 ) {
-                            if ( PyTuple_Check(obj1) ) {
-                                PyObject *o = PyTuple_GetItem( obj1 , ii / step) ;
-                                ret = setVData( curr_node->v_data , o , ref ) ;
-                            } else {
-                                ret = setVData( curr_node->v_data , obj1 , ref ) ;
-                            }
-                        } else {
-                            copyValue( curr_node->v_data , ref , ii + start ) ;
-                        }
-                    }
-                }
-
-                // copy the current data after replacement slice
-                for ( ii = stop ; ii < ref.attr->index[0].size ; ii++ ) {
-                    newVTreeNode(&curr_node) ;
-                    copyValue( curr_node->v_data , ref , ii ) ;
-                }
-
-                // skip first node because it has no data.
-                v_tree.down = first_node->next ;
-                free(first_node) ;
-
-                REF2 ref_copy = ref ;
-                ret = trick_MM->ref_assignment( &ref_copy , &v_tree ) ;
-
-                // Free all of the allocations made above.
-                curr_node = v_tree.down ;
-                while ( curr_node != NULL ) {
-                    V_TREE * next_node = curr_node->next ;
-                    free(curr_node->v_data) ;
-                    free(curr_node) ;
-                    curr_node = next_node ;
-                }
-            } else {
-                // RHS does not fit in space specified in slice
-                ret = TRICK_SWIG_SLICE_ASSIGNMENT ;
-            }
-        }
-    } else {
-        /* Can't figure out what the index type was. */
-        ret = TRICK_SWIG_UNKNOWN_INDEX_TYPE ;
-    }
-
-    return ret ;
+																												newVTreeNode(&curr_node)	;
+																												PyObject	*o	=	PyTuple_GetItem(	obj1	,	ii	)	;
+																												ret	=	setVData(	curr_node->v_data	,	o	,	ref	)	;
+																								}
+																				}	else	{
+																								newVTreeNode(&curr_node)	;
+																								ret	=	setVData(	curr_node->v_data	,	obj1	,	ref	)	;
+																				}
+																}	else	{
+																				//	extended	slice	insertion	where	step	!=	1.		Replace	each	<step>	element	in	existing	data
+																				for(	ii	=	0	;	ii	<	stop	-	start	;	ii++	)	{
+																								newVTreeNode(&curr_node)	;
+																								if	(	ii	%	step	==	0	)	{
+																												if	(	PyTuple_Check(obj1)	)	{
+																																PyObject	*o	=	PyTuple_GetItem(	obj1	,	ii	/	step)	;
+																																ret	=	setVData(	curr_node->v_data	,	o	,	ref	)	;
+																												}	else	{
+																																ret	=	setVData(	curr_node->v_data	,	obj1	,	ref	)	;
+																												}
+																								}	else	{
+																												copyValue(	curr_node->v_data	,	ref	,	ii	+	start	)	;
+																								}
+																				}
+																}
+
+																//	copy	the	current	data	after	replacement	slice
+																for	(	ii	=	stop	;	ii	<	ref.attr->index[0].size	;	ii++	)	{
+																				newVTreeNode(&curr_node)	;
+																				copyValue(	curr_node->v_data	,	ref	,	ii	)	;
+																}
+
+																//	skip	first	node	because	it	has	no	data.
+																v_tree.down	=	first_node->next	;
+																free(first_node)	;
+
+																REF2	ref_copy	=	ref	;
+																ret	=	trick_MM->ref_assignment(	&ref_copy	,	&v_tree	)	;
+
+																//	Free	all	of	the	allocations	made	above.
+																curr_node	=	v_tree.down	;
+																while	(	curr_node	!=	NULL	)	{
+																				V_TREE	*	next_node	=	curr_node->next	;
+																				free(curr_node->v_data)	;
+																				free(curr_node)	;
+																				curr_node	=	next_node	;
+																}
+												}	else	{
+																//	RHS	does	not	fit	in	space	specified	in	slice
+																ret	=	TRICK_SWIG_SLICE_ASSIGNMENT	;
+												}
+								}
+				}	else	{
+								/*	Can't	figure	out	what	the	index	type	was.	*/
+								ret	=	TRICK_SWIG_UNKNOWN_INDEX_TYPE	;
+				}
+
+				return	ret	;
 
 }
 
-PyObject * swig_ref::__getitem__(int ii) {
-
-    //cout << "In swig_ref getitem!! " << ii  << " start address = " << ref.address << endl ;
-    V_DATA v_data ;
-    PyObject * ret = NULL ;
-    int jj ;
-    int status = 0 ;
-    REF2 temp_ref ;
-
-    deref_address() ;
-    // convert python negative index to positive index
-    temp_ref = ref ;
-    if ( ii < 0 ) {
-        ii += temp_ref.attr->index[0].size ;
-    }
-
-    v_data.type = TRICK_INTEGER ;
-    v_data.value.i = ii ;
-
-
-    /* Do a bounds check before calling ref_dim.  Ref_dim would catch this error too, but it
-       prints an error message that throws visitors off from the python error.  Returining NULL
-       will cause the input processor to die with an IndexError */
-    if ( (int)ii >= temp_ref.attr->index[0].size or ii < 0 ) {
-        return NULL ;
-    } else {
-        status = trick_MM->ref_dim( &temp_ref , &v_data ) ;
-        // Error in ref_dim
-        if ( status != 0 ) {
-            return NULL ;
-        }
-    }
-
-    if ( temp_ref.num_index_left == 0 ) {
-        switch ( temp_ref.attr->type ) {
-            case TRICK_CHARACTER: {
-                swig_int * t = new swig_int ;
-                t->value = *(char *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_UNSIGNED_CHARACTER: {
-                swig_int * t = new swig_int ;
-                t->value = *(unsigned char *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_SHORT: {
-                swig_int * t = new swig_int ;
-                t->value = *(short *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_UNSIGNED_SHORT: {
-                swig_int * t = new swig_int ;
-                t->value = *(unsigned short *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_INTEGER: {
-                swig_int * t = new swig_int ;
-                t->value = *(int *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_UNSIGNED_INTEGER: {
-                swig_int * t = new swig_int ;
-                t->value = *(unsigned int *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_LONG: {
-                swig_int * t = new swig_int ;
-                t->value = *(long *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_UNSIGNED_LONG: {
-                swig_int * t = new swig_int ;
-                t->value = *(unsigned long *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_LONG_LONG: {
-                swig_int * t = new swig_int ;
-                t->value = *(long long *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_UNSIGNED_LONG_LONG: {
-                swig_int * t = new swig_int ;
-                t->value = *(unsigned long long *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_DOUBLE: {
-                //cout << "swig_ref::__getitem__ returning a swig_double!! " << temp_ref.address << endl ;
-                swig_double * t = new swig_double ;
-                t->value = *(double *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_double"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_FLOAT: {
-                swig_double * t = new swig_double ;
-                t->value = *(float *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_double"), SWIG_POINTER_OWN);
-            } break ;
-            case TRICK_BOOLEAN: {
-                swig_int * t = new swig_int ;
-                t->value = *(bool *)temp_ref.address ;
-                t->units = temp_ref.attr->units ;
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery("_p_swig_int"), SWIG_POINTER_OWN);
-            } break ;
-            default: {
-                std::string type_name ;
-                type_name = std::string("_p_") + temp_ref.attr->type_name ;
-                // change namespace ':' separators to '_'
-                std::replace( type_name.begin() , type_name.end() , ':' , '_' ) ;
-
-                // remove any "*" characters at the end of the type_name
-                size_t found = type_name.find(" ") ;
-                if ( found != std::string::npos) {
-                    type_name.erase(found) ;
-                }
-                ret = SWIG_NewPointerObj(SWIG_as_voidptr(temp_ref.address), SWIG_TypeQuery(type_name.c_str()), 0);
-            } break ;
-        }
-    } else if ( temp_ref.attr->type == TRICK_STRUCTURED and temp_ref.attr->num_index == 2) {
-        // Special case where we are dereferencing a double dimensional structure.
-        // We want to return a pointer to the correct structure type, not a swig_ref.
-        std::string type_name ;
-        void * new_addr ;
-        //std::cout << "double dim returing type " << temp_ref.attr->type_name << std::endl ;
-        type_name = std::string("_p_") + temp_ref.attr->type_name ;
-
-        // change namespace ':' separators to '_'
-        std::replace( type_name.begin() , type_name.end() , ':' , '_' ) ;
-
-        // remove any "*" characters at the end of the type_name
-        size_t found = type_name.find(" ") ;
-        if ( found != std::string::npos) {
-            type_name.erase(found) ;
-        }
-
-        // Dereference the pointer if this was a pointer dimension
-        if ( temp_ref.attr->index[temp_ref.num_index].size == 0 ) {
-            new_addr = *(void**)temp_ref.address ;
-        } else {
-            new_addr = temp_ref.address ;
-        }
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(new_addr), SWIG_TypeQuery(type_name.c_str()), 0);
-    } else {
-        /*
-           Takes care of non final dimensions for all cases.  We have already called ref_dim
-           to get to the correct index in the current array. Create a new swig_ref that
-           contains the indexed address.  All of the dimensional information will be shifted
-           by one in the new swig_ref.
-         */
-
-        /* Create a new swig_ref to hold the new dereferenced variable */
-        swig_ref * new_ref = new swig_ref ;
-
-        /* Copy temp_ref that holds the indexed address as a result of ref_dim */
-        new_ref->ref = temp_ref ;
-
-        /* Create a new attributes instance to because we're going to be modifying it below */
-        ATTRIBUTES * new_attr = new ATTRIBUTES() ;
-
-        /* Start with the current attributes we have */
-        *new_attr = *temp_ref.attr ;
-        new_ref->ref.attr = new_attr ;
-
-        /* make copies of the strings for type_name and units */
-        new_ref->ref.attr->type_name = strdup(temp_ref.attr->type_name) ;
-        new_ref->ref.attr->units = strdup(temp_ref.attr->units) ;
-
-        // Shift all remaining dimension information to the left
-        new_ref->ref.attr->num_index-- ;
-        new_ref->ref.num_index-- ;
-        for ( jj = 0 ; jj < new_ref->ref.attr->num_index ; jj++ ) {
-            new_ref->ref.attr->index[jj].size = new_ref->ref.attr->index[jj + 1].size ;
-        }
-
-        // If the current index is a pointer mark this swig_ref as needing to dereference
-        if ( new_ref->ref.attr->index[0].size == 0 ) {
-            new_ref->need_to_deref = true ;
-        }
-
-        ret = SWIG_NewPointerObj(SWIG_as_voidptr(new_ref), SWIG_TypeQuery("_p_swig_ref"), 0);
-    }
-    return ret ;
+PyObject	*	swig_ref::__getitem__(int	ii)	{
+
+				//cout	<<	"In	swig_ref	getitem!!	"	<<	ii		<<	"	start	address	=	"	<<	ref.address	<<	endl	;
+				V_DATA	v_data	;
+				PyObject	*	ret	=	NULL	;
+				int	jj	;
+				int	status	=	0	;
+				REF2	temp_ref	;
+
+				deref_address()	;
+				//	convert	python	negative	index	to	positive	index
+				temp_ref	=	ref	;
+				if	(	ii	<	0	)	{
+								ii	+=	temp_ref.attr->index[0].size	;
+				}
+
+				v_data.type	=	TRICK_INTEGER	;
+				v_data.value.i	=	ii	;
+
+
+				/*	Do	a	bounds	check	before	calling	ref_dim.		Ref_dim	would	catch	this	error	too,	but	it
+							prints	an	error	message	that	throws	visitors	off	from	the	python	error.		Returining	NULL
+							will	cause	the	input	processor	to	die	with	an	IndexError	*/
+				if	(	(int)ii	>=	temp_ref.attr->index[0].size	or	ii	<	0	)	{
+								return	NULL	;
+				}	else	{
+								status	=	trick_MM->ref_dim(	&temp_ref	,	&v_data	)	;
+								//	Error	in	ref_dim
+								if	(	status	!=	0	)	{
+												return	NULL	;
+								}
+				}
+
+				if	(	temp_ref.num_index_left	==	0	)	{
+								switch	(	temp_ref.attr->type	)	{
+												case	TRICK_CHARACTER:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(char	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_UNSIGNED_CHARACTER:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(unsigned	char	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_SHORT:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(short	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_UNSIGNED_SHORT:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(unsigned	short	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_INTEGER:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(int	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_UNSIGNED_INTEGER:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(unsigned	int	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_LONG:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(long	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_UNSIGNED_LONG:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(unsigned	long	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_LONG_LONG:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(long	long	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_UNSIGNED_LONG_LONG:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(unsigned	long	long	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_DOUBLE:	{
+																//cout	<<	"swig_ref::__getitem__	returning	a	swig_double!!	"	<<	temp_ref.address	<<	endl	;
+																swig_double	*	t	=	new	swig_double	;
+																t->value	=	*(double	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_double"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_FLOAT:	{
+																swig_double	*	t	=	new	swig_double	;
+																t->value	=	*(float	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_double"),	SWIG_POINTER_OWN);
+												}	break	;
+												case	TRICK_BOOLEAN:	{
+																swig_int	*	t	=	new	swig_int	;
+																t->value	=	*(bool	*)temp_ref.address	;
+																t->units	=	temp_ref.attr->units	;
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery("_p_swig_int"),	SWIG_POINTER_OWN);
+												}	break	;
+												default:	{
+																std::string	type_name	;
+																type_name	=	std::string("_p_")	+	temp_ref.attr->type_name	;
+																//	change	namespace	':'	separators	to	'_'
+																std::replace(	type_name.begin()	,	type_name.end()	,	':'	,	'_'	)	;
+
+																//	remove	any	"*"	characters	at	the	end	of	the	type_name
+																size_t	found	=	type_name.find("	")	;
+																if	(	found	!=	std::string::npos)	{
+																				type_name.erase(found)	;
+																}
+																ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(temp_ref.address),	SWIG_TypeQuery(type_name.c_str()),	0);
+												}	break	;
+								}
+				}	else	if	(	temp_ref.attr->type	==	TRICK_STRUCTURED	and	temp_ref.attr->num_index	==	2)	{
+								//	Special	case	where	we	are	dereferencing	a	double	dimensional	structure.
+								//	We	want	to	return	a	pointer	to	the	correct	structure	type,	not	a	swig_ref.
+								std::string	type_name	;
+								void	*	new_addr	;
+								//std::cout	<<	"double	dim	returing	type	"	<<	temp_ref.attr->type_name	<<	std::endl	;
+								type_name	=	std::string("_p_")	+	temp_ref.attr->type_name	;
+
+								//	change	namespace	':'	separators	to	'_'
+								std::replace(	type_name.begin()	,	type_name.end()	,	':'	,	'_'	)	;
+
+								//	remove	any	"*"	characters	at	the	end	of	the	type_name
+								size_t	found	=	type_name.find("	")	;
+								if	(	found	!=	std::string::npos)	{
+												type_name.erase(found)	;
+								}
+
+								//	Dereference	the	pointer	if	this	was	a	pointer	dimension
+								if	(	temp_ref.attr->index[temp_ref.num_index].size	==	0	)	{
+												new_addr	=	*(void**)temp_ref.address	;
+								}	else	{
+												new_addr	=	temp_ref.address	;
+								}
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new_addr),	SWIG_TypeQuery(type_name.c_str()),	0);
+				}	else	{
+								/*
+											Takes	care	of	non	final	dimensions	for	all	cases.		We	have	already	called	ref_dim
+											to	get	to	the	correct	index	in	the	current	array.	Create	a	new	swig_ref	that
+											contains	the	indexed	address.		All	of	the	dimensional	information	will	be	shifted
+											by	one	in	the	new	swig_ref.
+									*/
+
+								/*	Create	a	new	swig_ref	to	hold	the	new	dereferenced	variable	*/
+								swig_ref	*	new_ref	=	new	swig_ref	;
+
+								/*	Copy	temp_ref	that	holds	the	indexed	address	as	a	result	of	ref_dim	*/
+								new_ref->ref	=	temp_ref	;
+
+								/*	Create	a	new	attributes	instance	to	because	we're	going	to	be	modifying	it	below	*/
+								ATTRIBUTES	*	new_attr	=	new	ATTRIBUTES()	;
+
+								/*	Start	with	the	current	attributes	we	have	*/
+								*new_attr	=	*temp_ref.attr	;
+								new_ref->ref.attr	=	new_attr	;
+
+								/*	make	copies	of	the	strings	for	type_name	and	units	*/
+								new_ref->ref.attr->type_name	=	strdup(temp_ref.attr->type_name)	;
+								new_ref->ref.attr->units	=	strdup(temp_ref.attr->units)	;
+
+								//	Shift	all	remaining	dimension	information	to	the	left
+								new_ref->ref.attr->num_index--	;
+								new_ref->ref.num_index--	;
+								for	(	jj	=	0	;	jj	<	new_ref->ref.attr->num_index	;	jj++	)	{
+												new_ref->ref.attr->index[jj].size	=	new_ref->ref.attr->index[jj	+	1].size	;
+								}
+
+								//	If	the	current	index	is	a	pointer	mark	this	swig_ref	as	needing	to	dereference
+								if	(	new_ref->ref.attr->index[0].size	==	0	)	{
+												new_ref->need_to_deref	=	true	;
+								}
+
+								ret	=	SWIG_NewPointerObj(SWIG_as_voidptr(new_ref),	SWIG_TypeQuery("_p_swig_ref"),	0);
+				}
+				return	ret	;
 }
 
-template < class SWIG_TYPE , class VALUE_TYPE >
-PyObject * getValueAsSwigObjectByType( REF2 & temp_ref , Py_ssize_t index , const char * swig_type ) {
-    SWIG_TYPE * t = new SWIG_TYPE ;
-    VALUE_TYPE * casted_address = ( VALUE_TYPE * ) temp_ref.address ;
-    t->value = *(casted_address + index ) ;
-    t->units = temp_ref.attr->units ;
-    return SWIG_NewPointerObj(SWIG_as_voidptr(t), SWIG_TypeQuery(swig_type), SWIG_POINTER_OWN);
+template	<	class	SWIG_TYPE	,	class	VALUE_TYPE	>
+PyObject	*	getValueAsSwigObjectByType(	REF2	&	temp_ref	,	Py_ssize_t	index	,	const	char	*	swig_type	)	{
+				SWIG_TYPE	*	t	=	new	SWIG_TYPE	;
+				VALUE_TYPE	*	casted_address	=	(	VALUE_TYPE	*	)	temp_ref.address	;
+				t->value	=	*(casted_address	+	index	)	;
+				t->units	=	temp_ref.attr->units	;
+				return	SWIG_NewPointerObj(SWIG_as_voidptr(t),	SWIG_TypeQuery(swig_type),	SWIG_POINTER_OWN);
 }
 
-PyObject * getValueAsObject( REF2 & temp_ref , Py_ssize_t index ) {
-   switch ( temp_ref.attr->type ) {
-       case TRICK_CHARACTER:
-           return getValueAsSwigObjectByType< swig_int , char >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_UNSIGNED_CHARACTER:
-           return getValueAsSwigObjectByType< swig_int , unsigned char >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_SHORT:
-           return getValueAsSwigObjectByType< swig_int , short >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_UNSIGNED_SHORT:
-           return getValueAsSwigObjectByType< swig_int , unsigned short >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_INTEGER:
-           return getValueAsSwigObjectByType< swig_int , int >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_UNSIGNED_INTEGER:
-           return getValueAsSwigObjectByType< swig_int , unsigned int >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_LONG:
-           return getValueAsSwigObjectByType< swig_int , long >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_UNSIGNED_LONG:
-           return getValueAsSwigObjectByType< swig_int , unsigned long >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_LONG_LONG:
-           return getValueAsSwigObjectByType< swig_int , long long >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_UNSIGNED_LONG_LONG:
-           return getValueAsSwigObjectByType< swig_int , unsigned long long >(temp_ref , index , "_p_swig_int") ;
-       case TRICK_DOUBLE :
-           return getValueAsSwigObjectByType< swig_double , double >(temp_ref , index , "_p_swig_double") ;
-       case TRICK_FLOAT:
-           return getValueAsSwigObjectByType< swig_double , float >(temp_ref , index , "_p_swig_double") ;
-       case TRICK_BOOLEAN:
-           return getValueAsSwigObjectByType< swig_int , bool >(temp_ref , index , "_p_swig_int") ;
-       default :
-           return NULL ;
-   }
-   return NULL ;
+PyObject	*	getValueAsObject(	REF2	&	temp_ref	,	Py_ssize_t	index	)	{
+			switch	(	temp_ref.attr->type	)	{
+							case	TRICK_CHARACTER:
+											return	getValueAsSwigObjectByType<	swig_int	,	char	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_UNSIGNED_CHARACTER:
+											return	getValueAsSwigObjectByType<	swig_int	,	unsigned	char	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_SHORT:
+											return	getValueAsSwigObjectByType<	swig_int	,	short	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_UNSIGNED_SHORT:
+											return	getValueAsSwigObjectByType<	swig_int	,	unsigned	short	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_INTEGER:
+											return	getValueAsSwigObjectByType<	swig_int	,	int	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_UNSIGNED_INTEGER:
+											return	getValueAsSwigObjectByType<	swig_int	,	unsigned	int	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_LONG:
+											return	getValueAsSwigObjectByType<	swig_int	,	long	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_UNSIGNED_LONG:
+											return	getValueAsSwigObjectByType<	swig_int	,	unsigned	long	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_LONG_LONG:
+											return	getValueAsSwigObjectByType<	swig_int	,	long	long	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_UNSIGNED_LONG_LONG:
+											return	getValueAsSwigObjectByType<	swig_int	,	unsigned	long	long	>(temp_ref	,	index	,	"_p_swig_int")	;
+							case	TRICK_DOUBLE	:
+											return	getValueAsSwigObjectByType<	swig_double	,	double	>(temp_ref	,	index	,	"_p_swig_double")	;
+							case	TRICK_FLOAT:
+											return	getValueAsSwigObjectByType<	swig_double	,	float	>(temp_ref	,	index	,	"_p_swig_double")	;
+							case	TRICK_BOOLEAN:
+											return	getValueAsSwigObjectByType<	swig_int	,	bool	>(temp_ref	,	index	,	"_p_swig_int")	;
+							default	:
+											return	NULL	;
+			}
+			return	NULL	;
 }
 
-PyObject * swig_ref::__getitem__( PyObject * index ) {
+PyObject	*	swig_ref::__getitem__(	PyObject	*	index	)	{
 
-    PyObject * ret = NULL ;
-    int status = 0 ;
+				PyObject	*	ret	=	NULL	;
+				int	status	=	0	;
 
-    deref_address() ;
-    REF2 temp_ref = ref ;
+				deref_address()	;
+				REF2	temp_ref	=	ref	;
 
-    void * argp2 ;
+				void	*	argp2	;
 
-    //std::cout << "In swig_ref::__getitem__( PyObject * index )!!!\n" << std::endl ;
+				//std::cout	<<	"In	swig_ref::__getitem__(	PyObject	*	index	)!!!\n"	<<	std::endl	;
 
-    if ( PyInt_Check(index)) {
-        ret = __getitem__((int)PyInt_AsLong(index)) ;
-    } else if ( PyFloat_Check(index)) {
-        ret = __getitem__((int)PyFloat_AsDouble(index)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(index, &argp2,SWIG_TypeQuery("_p_swig_int"), 0 ))) {
-        swig_int * temp_m = reinterpret_cast<swig_int *>(argp2) ;
-        ret = __getitem__((int)(temp_m->value)) ;
-    } else if (SWIG_IsOK(SWIG_ConvertPtr(index, &argp2,SWIG_TypeQuery("_p_swig_double"), 0 ))) {
-        swig_double * temp_m = reinterpret_cast<swig_double *>(argp2) ;
-        ret = __getitem__((int)(temp_m->value)) ;
-    } else if ( PySlice_Check(index)) {
-        Py_ssize_t ii , start , stop , step ;
+				if	(	PyInt_Check(index))	{
+								ret	=	__getitem__((int)PyInt_AsLong(index))	;
+				}	else	if	(	PyFloat_Check(index))	{
+								ret	=	__getitem__((int)PyFloat_AsDouble(index))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(index,	&argp2,SWIG_TypeQuery("_p_swig_int"),	0	)))	{
+								swig_int	*	temp_m	=	reinterpret_cast<swig_int	*>(argp2)	;
+								ret	=	__getitem__((int)(temp_m->value))	;
+				}	else	if	(SWIG_IsOK(SWIG_ConvertPtr(index,	&argp2,SWIG_TypeQuery("_p_swig_double"),	0	)))	{
+								swig_double	*	temp_m	=	reinterpret_cast<swig_double	*>(argp2)	;
+								ret	=	__getitem__((int)(temp_m->value))	;
+				}	else	if	(	PySlice_Check(index))	{
+								Py_ssize_t	ii	,	start	,	stop	,	step	;
 
-        // get the start, stop, and step value of the slice
-#if PY_VERSION_HEX >= 0x03000000
-        status = PySlice_GetIndices( index , temp_ref.attr->index[0].size , &start , &stop , &step ) ;
+								//	get	the	start,	stop,	and	step	value	of	the	slice
+#if	PY_VERSION_HEX	>=	0x03000000
+								status	=	PySlice_GetIndices(	index	,	temp_ref.attr->index[0].size	,	&start	,	&stop	,	&step	)	;
 #else
-        status = PySlice_GetIndices( (PySliceObject *)index , temp_ref.attr->index[0].size , &start , &stop , &step ) ;
+								status	=	PySlice_GetIndices(	(PySliceObject	*)index	,	temp_ref.attr->index[0].size	,	&start	,	&stop	,	&step	)	;
 #endif
-        if ( status == 0 ) {
-            // only work with final index of array... no pointer dims yet. (Alex)
-            if ( temp_ref.num_index_left == 1 ) {
-                ret = PyList_New(0) ;
-                if ( step > 0 ) {
-                    for ( ii = start ; ii < stop ; ii += step ) {
-                        PyObject * new_obj = getValueAsObject( temp_ref , ii ) ;
-                        if ( new_obj ) {
-                            PyList_Append( ret , new_obj ) ;
-                        }
-                    }
-                } else {
-                    for ( ii = start ; ii > stop ; ii += step ) {
-                        PyObject * new_obj = getValueAsObject( temp_ref , ii ) ;
-                        if ( new_obj ) {
-                            PyList_Append( ret , new_obj ) ;
-                        }
-                    }
-                }
-            } else {
-                std::cout << "Array slices currently only work with single dimensional objects" << std::endl ;
-            }
-        } else {
-            std::cout << "Slice parameters do not fit within list length of " << temp_ref.attr->index[0].size << std::endl ;
-        }
-    } else {
-        std::cout << "Unknown object type as array index" << std::endl ;
-    }
-
-    return ret ;
+								if	(	status	==	0	)	{
+												//	only	work	with	final	index	of	array...	no	pointer	dims	yet.	(Alex)
+												if	(	temp_ref.num_index_left	==	1	)	{
+																ret	=	PyList_New(0)	;
+																if	(	step	>	0	)	{
+																				for	(	ii	=	start	;	ii	<	stop	;	ii	+=	step	)	{
+																								PyObject	*	new_obj	=	getValueAsObject(	temp_ref	,	ii	)	;
+																								if	(	new_obj	)	{
+																												PyList_Append(	ret	,	new_obj	)	;
+																								}
+																				}
+																}	else	{
+																				for	(	ii	=	start	;	ii	>	stop	;	ii	+=	step	)	{
+																								PyObject	*	new_obj	=	getValueAsObject(	temp_ref	,	ii	)	;
+																								if	(	new_obj	)	{
+																												PyList_Append(	ret	,	new_obj	)	;
+																								}
+																				}
+																}
+												}	else	{
+																std::cout	<<	"Array	slices	currently	only	work	with	single	dimensional	objects"	<<	std::endl	;
+												}
+								}	else	{
+												std::cout	<<	"Slice	parameters	do	not	fit	within	list	length	of	"	<<	temp_ref.attr->index[0].size	<<	std::endl	;
+								}
+				}	else	{
+								std::cout	<<	"Unknown	object	type	as	array	index"	<<	std::endl	;
+				}
+
+				return	ret	;
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/Flyby.cpp b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/Flyby.cpp
index de787a34c..cedf930fd 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/Flyby.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/Flyby.cpp
@@ -1,59 +1,59 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-#define GRAVITATIONAL_CONSTANT 6.674e-11
-#define EARTH_MASS 5.9723e24
-#define EARTH_RADIUS 6367500.0
+#define	GRAVITATIONAL_CONSTANT	6.674e-11
+#define	EARTH_MASS	5.9723e24
+#define	EARTH_RADIUS	6367500.0
 
-struct Flyby {
-    double pos[2];
-    double vel[2];
-    double planet_mass;
-    Flyby(double px, double py, double vx, double vy, double m);
+struct	Flyby	{
+				double	pos[2];
+				double	vel[2];
+				double	planet_mass;
+				Flyby(double	px,	double	py,	double	vx,	double	vy,	double	m);
 };
-Flyby::Flyby(double px, double py, double vx, double vy, double m) {
-    pos[0] = px;
-    pos[1] = py;
-    vel[0] = vx;
-    vel[1] = vy;
-    planet_mass = m;
+Flyby::Flyby(double	px,	double	py,	double	vx,	double	vy,	double	m)	{
+				pos[0]	=	px;
+				pos[1]	=	py;
+				vel[0]	=	vx;
+				vel[1]	=	vy;
+				planet_mass	=	m;
 }
-void print_header() {
-    printf ("time, dt, flyby.pos[0], flyby.pos[1], flyby.vel[0], flyby.vel[1]\n");
+void	print_header()	{
+				printf	("time,	dt,	flyby.pos[0],	flyby.pos[1],	flyby.vel[0],	flyby.vel[1]\n");
 }
-void print_state( double t, double dt, Flyby& flyby ) {
-    printf ("%10.10f, %10.10f, %10.10f, %10.10f, %10.10f, %10.10f\n",
-             t, dt, flyby.pos[0], flyby.pos[1], flyby.vel[0], flyby.vel[1]);
+void	print_state(	double	t,	double	dt,	Flyby&	flyby	)	{
+				printf	("%10.10f,	%10.10f,	%10.10f,	%10.10f,	%10.10f,	%10.10f\n",
+													t,	dt,	flyby.pos[0],	flyby.pos[1],	flyby.vel[0],	flyby.vel[1]);
 }
-void gravity( double t, double* state, double derivs[], void* udata) {
-    Flyby* flyby = (Flyby*)udata;
-    double d = sqrt( state[0]*state[0] + state[1]*state[1]);
-    derivs[0] = state[2];
-    derivs[1] = state[3];
-    derivs[2] = -state[0] * GRAVITATIONAL_CONSTANT * flyby->planet_mass / (d*d*d);
-    derivs[3] = -state[1] * GRAVITATIONAL_CONSTANT * flyby->planet_mass / (d*d*d);
+void	gravity(	double	t,	double*	state,	double	derivs[],	void*	udata)	{
+				Flyby*	flyby	=	(Flyby*)udata;
+				double	d	=	sqrt(	state[0]*state[0]	+	state[1]*state[1]);
+				derivs[0]	=	state[2];
+				derivs[1]	=	state[3];
+				derivs[2]	=	-state[0]	*	GRAVITATIONAL_CONSTANT	*	flyby->planet_mass	/	(d*d*d);
+				derivs[3]	=	-state[1]	*	GRAVITATIONAL_CONSTANT	*	flyby->planet_mass	/	(d*d*d);
 }
-int main ( int argc, char* argv[]) {
+int	main	(	int	argc,	char*	argv[])	{
 
-    double sim_duration = 25000.0; // s
-    double dt = 60.0; // s
-    double epsilon = 0.000000001;
-    Flyby flyby(-20.0 * EARTH_RADIUS, 2.0 * EARTH_RADIUS, 10000.0 , 0.0, EARTH_MASS);
-    double* state_p[4] = { &flyby.pos[0], &flyby.pos[1], &flyby.vel[0], &flyby.vel[1] };
+				double	sim_duration	=	25000.0;	//	s
+				double	dt	=	60.0;	//	s
+				double	epsilon	=	0.000000001;
+				Flyby	flyby(-20.0	*	EARTH_RADIUS,	2.0	*	EARTH_RADIUS,	10000.0	,	0.0,	EARTH_MASS);
+				double*	state_p[4]	=	{	&flyby.pos[0],	&flyby.pos[1],	&flyby.vel[0],	&flyby.vel[1]	};
 
-    double time = 0.0; // s
-    print_header();
-    print_state(time, dt, flyby);
+				double	time	=	0.0;	//	s
+				print_header();
+				print_state(time,	dt,	flyby);
 
-    SA::RKF45Integrator integ(epsilon, dt, 4, state_p, gravity, &flyby);
-    while (time < sim_duration) {
-        integ.integrate();
-        double last_h = integ.getLastStepSize();
-        time = integ.getIndyVar();
+				SA::RKF45Integrator	integ(epsilon,	dt,	4,	state_p,	gravity,	&flyby);
+				while	(time	<	sim_duration)	{
+								integ.integrate();
+								double	last_h	=	integ.getLastStepSize();
+								time	=	integ.getIndyVar();
 
-        double r = sqrt( flyby.pos[0]*flyby.pos[0] + flyby.pos[1]*flyby.pos[1]);
-        if (r < EARTH_RADIUS) { printf("Collision\n"); }
-        print_state(time, last_h, flyby);
-    }
+								double	r	=	sqrt(	flyby.pos[0]*flyby.pos[0]	+	flyby.pos[1]*flyby.pos[1]);
+								if	(r	<	EARTH_RADIUS)	{	printf("Collision\n");	}
+								print_state(time,	last_h,	flyby);
+				}
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/BouncyCannonBall.cpp b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/BouncyCannonBall.cpp
index ffb53ab25..efadebccc 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/BouncyCannonBall.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/BouncyCannonBall.cpp
@@ -1,57 +1,57 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-struct Cannon {
-    double pos[2];
-    double vel[2];
-    Cannon(double px, double py, double vx, double vy);
+struct	Cannon	{
+				double	pos[2];
+				double	vel[2];
+				Cannon(double	px,	double	py,	double	vx,	double	vy);
 };
-Cannon::Cannon(double px, double py, double vx, double vy) {
-    pos[0] = px;  pos[1] = py;
-    vel[0] = vx;  vel[1] = vy;
+Cannon::Cannon(double	px,	double	py,	double	vx,	double	vy)	{
+				pos[0]	=	px;		pos[1]	=	py;
+				vel[0]	=	vx;		vel[1]	=	vy;
 }
-void CSV_header() {
-    printf ("t, cannon.pos[0], cannon.pos[1], cannon.vel[0], cannon.vel[1]\n");
+void	CSV_header()	{
+				printf	("t,	cannon.pos[0],	cannon.pos[1],	cannon.vel[0],	cannon.vel[1]\n");
 }
-void CSV_state( double t, Cannon& cannon) {
-    printf ("%5.3f, %5.10f, %5.10f, %5.10f, %5.10f\n",
-    t, cannon.pos[0], cannon.pos[1], cannon.vel[0], cannon.vel[1]);
+void	CSV_state(	double	t,	Cannon&	cannon)	{
+				printf	("%5.3f,	%5.10f,	%5.10f,	%5.10f,	%5.10f\n",
+				t,	cannon.pos[0],	cannon.pos[1],	cannon.vel[0],	cannon.vel[1]);
 }
-void calc_derivs( double t, double state[], double derivs[], void* udata) {
-    derivs[0] = state[2];
-    derivs[1] = state[3];
-    derivs[2] =   0.0;
-    derivs[3] = -9.81;
+void	calc_derivs(	double	t,	double	state[],	double	derivs[],	void*	udata)	{
+				derivs[0]	=	state[2];
+				derivs[1]	=	state[3];
+				derivs[2]	=			0.0;
+				derivs[3]	=	-9.81;
 }
-double impact( double t, double state[], RootFinder* root_finder, void* udata) {
-    double root_error = root_finder->find_roots(t, state[1]);
-    if (root_error == 0.0) {
-        root_finder->init();
-        state[2] =  0.9 * state[2];
-        state[3] = -0.9 * state[3];
-    }
-    return (root_error);
+double	impact(	double	t,	double	state[],	RootFinder*	root_finder,	void*	udata)	{
+				double	root_error	=	root_finder->find_roots(t,	state[1]);
+				if	(root_error	==	0.0)	{
+								root_finder->init();
+								state[2]	=		0.9	*	state[2];
+								state[3]	=	-0.9	*	state[3];
+				}
+				return	(root_error);
 }
-int main ( int argc, char* argv[]) {
-    const double muzzle_speed = 50; // m/s
-    const double muzzle_angle = 30; // degrees
-    double vx0 = muzzle_speed * cos(muzzle_angle * M_PI / 180.0);
-    double vy0 = muzzle_speed * sin(muzzle_angle * M_PI / 180.0);
-    Cannon cannon(0.0, 0.0, vx0, vy0);
+int	main	(	int	argc,	char*	argv[])	{
+				const	double	muzzle_speed	=	50;	//	m/s
+				const	double	muzzle_angle	=	30;	//	degrees
+				double	vx0	=	muzzle_speed	*	cos(muzzle_angle	*	M_PI	/	180.0);
+				double	vy0	=	muzzle_speed	*	sin(muzzle_angle	*	M_PI	/	180.0);
+				Cannon	cannon(0.0,	0.0,	vx0,	vy0);
 
-    double* state_var_p[4] = { &(cannon.pos[0]), &(cannon.pos[1]),
-                               &(cannon.vel[0]), &(cannon.vel[1]) };
-    double dt = 0.01;
-    SA::RK2Integrator integ(dt, 4, state_var_p, calc_derivs, NULL);
-    integ.add_Rootfinder(1.0e-10, Negative, &impact);
+				double*	state_var_p[4]	=	{	&(cannon.pos[0]),	&(cannon.pos[1]),
+																															&(cannon.vel[0]),	&(cannon.vel[1])	};
+				double	dt	=	0.01;
+				SA::RK2Integrator	integ(dt,	4,	state_var_p,	calc_derivs,	NULL);
+				integ.add_Rootfinder(1.0e-10,	Negative,	&impact);
 
-    double t  = 0.0;
-    CSV_header();
-    CSV_state( t, cannon);
-    while (t < 20.0) {
-        integ.integrate();
-        t = integ.getIndyVar();
-        CSV_state( t, cannon);
-    }
+				double	t		=	0.0;
+				CSV_header();
+				CSV_state(	t,	cannon);
+				while	(t	<	20.0)	{
+								integ.integrate();
+								t	=	integ.getIndyVar();
+								CSV_state(	t,	cannon);
+				}
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/CannonBall.cpp b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/CannonBall.cpp
index a6a3972d2..ed79fd4b6 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/CannonBall.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/CannonBall.cpp
@@ -1,47 +1,47 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-struct Cannon {
-    double pos[2];
-    double vel[2];
-    Cannon(double px, double py, double vx, double vy);
+struct	Cannon	{
+				double	pos[2];
+				double	vel[2];
+				Cannon(double	px,	double	py,	double	vx,	double	vy);
 };
-Cannon::Cannon(double px, double py, double vx, double vy) {
-    pos[0] = px;  pos[1] = py;
-    vel[0] = vx;  vel[1] = vy;
+Cannon::Cannon(double	px,	double	py,	double	vx,	double	vy)	{
+				pos[0]	=	px;		pos[1]	=	py;
+				vel[0]	=	vx;		vel[1]	=	vy;
 }
-void CSV_header() {
-    printf ("t, cannon.pos[0], cannon.pos[1], cannon.vel[0], cannon.vel[1]\n");
+void	CSV_header()	{
+				printf	("t,	cannon.pos[0],	cannon.pos[1],	cannon.vel[0],	cannon.vel[1]\n");
 }
-void CSV_state( double t, Cannon& cannon) {
-    printf ("%5.3f, %5.10f, %5.10f, %5.10f, %5.10f\n",
-    t, cannon.pos[0], cannon.pos[1], cannon.vel[0], cannon.vel[1]);
+void	CSV_state(	double	t,	Cannon&	cannon)	{
+				printf	("%5.3f,	%5.10f,	%5.10f,	%5.10f,	%5.10f\n",
+				t,	cannon.pos[0],	cannon.pos[1],	cannon.vel[0],	cannon.vel[1]);
 }
-void calc_derivs( double t, double state[], double derivs[], void* udata) {
-    derivs[0] = state[2];
-    derivs[1] = state[3];
-    derivs[2] =   0.0;
-    derivs[3] = -9.81;
+void	calc_derivs(	double	t,	double	state[],	double	derivs[],	void*	udata)	{
+				derivs[0]	=	state[2];
+				derivs[1]	=	state[3];
+				derivs[2]	=			0.0;
+				derivs[3]	=	-9.81;
 }
-int main ( int argc, char* argv[]) {
-    const double muzzle_speed = 50; // m/s
-    const double muzzle_angle = 30; // degrees
-    double vx0 = muzzle_speed * cos(muzzle_angle * M_PI / 180.0);
-    double vy0 = muzzle_speed * sin(muzzle_angle * M_PI / 180.0);
-    Cannon cannon(0.0, 0.0, vx0, vy0);
+int	main	(	int	argc,	char*	argv[])	{
+				const	double	muzzle_speed	=	50;	//	m/s
+				const	double	muzzle_angle	=	30;	//	degrees
+				double	vx0	=	muzzle_speed	*	cos(muzzle_angle	*	M_PI	/	180.0);
+				double	vy0	=	muzzle_speed	*	sin(muzzle_angle	*	M_PI	/	180.0);
+				Cannon	cannon(0.0,	0.0,	vx0,	vy0);
 
-    double* state_var_p[4] = { &(cannon.pos[0]), &(cannon.pos[1]),
-                               &(cannon.vel[0]), &(cannon.vel[1]) };
-    double dt = 0.01;
-    SA::RK2Integrator integ(dt, 4, state_var_p, calc_derivs, NULL);
+				double*	state_var_p[4]	=	{	&(cannon.pos[0]),	&(cannon.pos[1]),
+																															&(cannon.vel[0]),	&(cannon.vel[1])	};
+				double	dt	=	0.01;
+				SA::RK2Integrator	integ(dt,	4,	state_var_p,	calc_derivs,	NULL);
 
-    double t  = 0.0;
-    CSV_header();
-    CSV_state( t, cannon);
-    while (t < 5.1) {
-        integ.integrate();
-        t = integ.getIndyVar();
-        CSV_state( t, cannon);
-    }
+				double	t		=	0.0;
+				CSV_header();
+				CSV_state(	t,	cannon);
+				while	(t	<	5.1)	{
+								integ.integrate();
+								t	=	integ.getIndyVar();
+								CSV_state(	t,	cannon);
+				}
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/DefiniteIntegral.cpp b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/DefiniteIntegral.cpp
index a70be1310..b50b96f5b 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/DefiniteIntegral.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/DefiniteIntegral.cpp
@@ -1,44 +1,44 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-struct DefiniteIntegral {
-    double lower_limit;
-    double upper_limit;
-    double result;
-    double Coeff[4];
-    SA::Integrator* integrator;
-    double evaluate ();
+struct	DefiniteIntegral	{
+				double	lower_limit;
+				double	upper_limit;
+				double	result;
+				double	Coeff[4];
+				SA::Integrator*	integrator;
+				double	evaluate	();
 };
-double DefiniteIntegral::evaluate () {
-    result = 0.0;
-    integrator->setIndyVar(lower_limit);
-    while(integrator->getIndyVar() < upper_limit){
-        integrator->integrate();
-    }
-    return result;
+double	DefiniteIntegral::evaluate	()	{
+				result	=	0.0;
+				integrator->setIndyVar(lower_limit);
+				while(integrator->getIndyVar()	<	upper_limit){
+								integrator->integrate();
+				}
+				return	result;
 }
-void Order3Polynomial( double x, double state[], double derivs[], void* udata) {
-    DefiniteIntegral& DI = *(DefiniteIntegral*)udata;
-    double x2 = x*x;
-    double x3 = x*x2;
-    derivs[0] = DI.Coeff[3] * x3 +
-                DI.Coeff[2] * x2 +
-                DI.Coeff[1] * x +
-                DI.Coeff[0];
+void	Order3Polynomial(	double	x,	double	state[],	double	derivs[],	void*	udata)	{
+				DefiniteIntegral&	DI	=	*(DefiniteIntegral*)udata;
+				double	x2	=	x*x;
+				double	x3	=	x*x2;
+				derivs[0]	=	DI.Coeff[3]	*	x3	+
+																DI.Coeff[2]	*	x2	+
+																DI.Coeff[1]	*	x	+
+																DI.Coeff[0];
 }
-int main (int argc, char* argv[]) {
-    unsigned int NSteps = 20;
-    DefiniteIntegral DI;
-    DI.Coeff[0] =  7.0;
-    DI.Coeff[1] = -5.0;
-    DI.Coeff[2] =  1.0;
-    DI.Coeff[3] =  2.0;
-    DI.lower_limit =  0.0;
-    DI.upper_limit =  2.0;
-    double dx = (DI.upper_limit - DI.lower_limit) / NSteps;
-    double* state[1] = { &DI.result };
-    DI.integrator = new SA::RK4Integrator(dx, 1, state, Order3Polynomial, &DI);
-    double result = DI.evaluate();
-    printf("Integral = %g.\n", result);
+int	main	(int	argc,	char*	argv[])	{
+				unsigned	int	NSteps	=	20;
+				DefiniteIntegral	DI;
+				DI.Coeff[0]	=		7.0;
+				DI.Coeff[1]	=	-5.0;
+				DI.Coeff[2]	=		1.0;
+				DI.Coeff[3]	=		2.0;
+				DI.lower_limit	=		0.0;
+				DI.upper_limit	=		2.0;
+				double	dx	=	(DI.upper_limit	-	DI.lower_limit)	/	NSteps;
+				double*	state[1]	=	{	&DI.result	};
+				DI.integrator	=	new	SA::RK4Integrator(dx,	1,	state,	Order3Polynomial,	&DI);
+				double	result	=	DI.evaluate();
+				printf("Integral	=	%g.\n",	result);
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/DoubleIntegral.cpp b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/DoubleIntegral.cpp
index e2ecff56a..cf97e3856 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/DoubleIntegral.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/DoubleIntegral.cpp
@@ -1,55 +1,55 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-struct DefiniteIntegrator {
-    double ivar;
-    double start;
-    double end;
-    double result;
-    SA::Integrator* integrator;
-    double evaluate ();
+struct	DefiniteIntegrator	{
+				double	ivar;
+				double	start;
+				double	end;
+				double	result;
+				SA::Integrator*	integrator;
+				double	evaluate	();
 };
-double DefiniteIntegrator::evaluate () {
-    result = 0.0;
-    integrator->setIndyVar(start);
-    ivar = start;
-    while (ivar < end) {
-        integrator->integrate();
-        ivar = integrator->getIndyVar();
-    }
-    return result;
+double	DefiniteIntegrator::evaluate	()	{
+				result	=	0.0;
+				integrator->setIndyVar(start);
+				ivar	=	start;
+				while	(ivar	<	end)	{
+								integrator->integrate();
+								ivar	=	integrator->getIndyVar();
+				}
+				return	result;
 }
-struct IntegContext {
-    DefiniteIntegrator XDI;
-    DefiniteIntegrator YDI;
+struct	IntegContext	{
+				DefiniteIntegrator	XDI;
+				DefiniteIntegrator	YDI;
 };
-void deriv_y( double y, double state_y[], double derivs_y[], void* udata) {
-    IntegContext& IC = *(IntegContext*)udata;
-    derivs_y[0] = cos(IC.XDI.ivar) * cos(y);
+void	deriv_y(	double	y,	double	state_y[],	double	derivs_y[],	void*	udata)	{
+				IntegContext&	IC	=	*(IntegContext*)udata;
+				derivs_y[0]	=	cos(IC.XDI.ivar)	*	cos(y);
 }
-void deriv_x( double x, double state_x[], double derivs_x[], void* udata) {
-    IntegContext& IC = *(IntegContext*)udata;
-    derivs_x[0] = IC.YDI.evaluate();
+void	deriv_x(	double	x,	double	state_x[],	double	derivs_x[],	void*	udata)	{
+				IntegContext&	IC	=	*(IntegContext*)udata;
+				derivs_x[0]	=	IC.YDI.evaluate();
 }
-double doubleIntegral( double x_start, double x_end, double y_start, double y_end ) {
-    IntegContext IC;
-    double dx = (x_end - x_start) / 20.0;
-    double dy = (y_end - y_start) / 20.0;
-    double* state_x[1] = { &IC.XDI.result };
-    double* state_y[1] = { &IC.YDI.result };
+double	doubleIntegral(	double	x_start,	double	x_end,	double	y_start,	double	y_end	)	{
+				IntegContext	IC;
+				double	dx	=	(x_end	-	x_start)	/	20.0;
+				double	dy	=	(y_end	-	y_start)	/	20.0;
+				double*	state_x[1]	=	{	&IC.XDI.result	};
+				double*	state_y[1]	=	{	&IC.YDI.result	};
 
-    IC.XDI.start = x_start;
-    IC.XDI.end   = x_end;
-    IC.XDI.integrator = new SA::RK4Integrator(dx, 1, state_x, deriv_x, &IC);
+				IC.XDI.start	=	x_start;
+				IC.XDI.end			=	x_end;
+				IC.XDI.integrator	=	new	SA::RK4Integrator(dx,	1,	state_x,	deriv_x,	&IC);
 
-    IC.YDI.start = y_start;
-    IC.YDI.end   = y_end;
-    IC.YDI.integrator = new SA::RK4Integrator(dy, 1, state_y, deriv_y, &IC);
+				IC.YDI.start	=	y_start;
+				IC.YDI.end			=	y_end;
+				IC.YDI.integrator	=	new	SA::RK4Integrator(dy,	1,	state_y,	deriv_y,	&IC);
 
-    return (IC.XDI.evaluate());
+				return	(IC.XDI.evaluate());
 }
-int main ( int argc, char* argv[]) {
-    double vol = doubleIntegral( -M_PI/2.0, M_PI/2.0, -M_PI/2.0, M_PI/2.0 );
-    printf("Volume = %g.\n", vol);
+int	main	(	int	argc,	char*	argv[])	{
+				double	vol	=	doubleIntegral(	-M_PI/2.0,	M_PI/2.0,	-M_PI/2.0,	M_PI/2.0	);
+				printf("Volume	=	%g.\n",	vol);
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/MassSpringDamper.cpp b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/MassSpringDamper.cpp
index f35069ea5..446586443 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/MassSpringDamper.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/MassSpringDamper.cpp
@@ -1,64 +1,64 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-struct MassSpringDamper {
-    double pos;
-    double vel;
-    double k;     // Spring constant
-    double c;     // Damping constant
-    double mass;
-    double extForce;
-    MassSpringDamper(double k, double c, double m);
+struct	MassSpringDamper	{
+				double	pos;
+				double	vel;
+				double	k;					//	Spring	constant
+				double	c;					//	Damping	constant
+				double	mass;
+				double	extForce;
+				MassSpringDamper(double	k,	double	c,	double	m);
 };
-MassSpringDamper::MassSpringDamper( double k, double c, double m)
-: pos(0.0), vel(0.0), k(k), c(c), mass(m), extForce(0.0) {}
+MassSpringDamper::MassSpringDamper(	double	k,	double	c,	double	m)
+:	pos(0.0),	vel(0.0),	k(k),	c(c),	mass(m),	extForce(0.0)	{}
 
-struct ImpulseGenerator {
-    double period;
-    double duration;
-    double force;
-    ImpulseGenerator(double period, double duration, double force);
-    double impulse(double time);
+struct	ImpulseGenerator	{
+				double	period;
+				double	duration;
+				double	force;
+				ImpulseGenerator(double	period,	double	duration,	double	force);
+				double	impulse(double	time);
 };
-ImpulseGenerator::ImpulseGenerator(double period, double duration, double force)
-: period(period), duration(duration), force(force) {}
-double ImpulseGenerator::impulse(double time) {
-    double tt = fmod(time, period);
-    if ((tt >= 0.0) && (tt < duration)) return force;
-    return 0.0;
+ImpulseGenerator::ImpulseGenerator(double	period,	double	duration,	double	force)
+:	period(period),	duration(duration),	force(force)	{}
+double	ImpulseGenerator::impulse(double	time)	{
+				double	tt	=	fmod(time,	period);
+				if	((tt	>=	0.0)	&&	(tt	<	duration))	return	force;
+				return	0.0;
 }
-void print_header() {
-    printf ("time, msd.pos, msd.vel\n");
+void	print_header()	{
+				printf	("time,	msd.pos,	msd.vel\n");
 }
-void print_state( double t, MassSpringDamper& msd ) {
-    printf ("%10.10f, %10.10f, %10.10f\n", t, msd.pos, msd.vel);
+void	print_state(	double	t,	MassSpringDamper&	msd	)	{
+				printf	("%10.10f,	%10.10f,	%10.10f\n",	t,	msd.pos,	msd.vel);
 }
-void acceleration( double t, double x[], double v[], double g_out[], void* udata) {
-    MassSpringDamper* msd = (MassSpringDamper*)udata;
-    g_out[0] = -(msd->k/msd->mass) * x[0]
-               -(msd->c/msd->mass) * v[0]
-               + msd->extForce/msd->mass;
+void	acceleration(	double	t,	double	x[],	double	v[],	double	g_out[],	void*	udata)	{
+				MassSpringDamper*	msd	=	(MassSpringDamper*)udata;
+				g_out[0]	=	-(msd->k/msd->mass)	*	x[0]
+															-(msd->c/msd->mass)	*	v[0]
+															+	msd->extForce/msd->mass;
 }
-#define N_DIMENSIONS 1
-int main ( int argc, char* argv[]) {
-    const double mass = 1.0;            // kg
-    const double frequency = 2;         // Hz
-    const double dampingConstant = 5.0; // kg/s = Ns/m
-    double springConstant = 4.0 * M_PI * M_PI * frequency * frequency * mass; // kg/s^2 = N/m
-    MassSpringDamper msd(springConstant, dampingConstant, mass);
-    ImpulseGenerator ImpGen(5.0, 0.005, 500.0); // 500 Newtons for 0.005 seconds every 5 seconds.
-    double time = 0.0;
-    double* x_p[N_DIMENSIONS] = { &msd.pos };
-    double* v_p[N_DIMENSIONS] = { &msd.vel };
-    double dt = 0.001;
-    print_header();
-    print_state(time, msd);
-    SA::EulerCromerIntegrator integ(dt, N_DIMENSIONS, x_p, v_p, acceleration, &msd);
-    while (time < 10) {
-        msd.extForce = ImpGen.impulse(time);
-        integ.integrate();
-        time = integ.getIndyVar();
-        print_state(time, msd);
-    }
+#define	N_DIMENSIONS	1
+int	main	(	int	argc,	char*	argv[])	{
+				const	double	mass	=	1.0;												//	kg
+				const	double	frequency	=	2;									//	Hz
+				const	double	dampingConstant	=	5.0;	//	kg/s	=	Ns/m
+				double	springConstant	=	4.0	*	M_PI	*	M_PI	*	frequency	*	frequency	*	mass;	//	kg/s^2	=	N/m
+				MassSpringDamper	msd(springConstant,	dampingConstant,	mass);
+				ImpulseGenerator	ImpGen(5.0,	0.005,	500.0);	//	500	Newtons	for	0.005	seconds	every	5	seconds.
+				double	time	=	0.0;
+				double*	x_p[N_DIMENSIONS]	=	{	&msd.pos	};
+				double*	v_p[N_DIMENSIONS]	=	{	&msd.vel	};
+				double	dt	=	0.001;
+				print_header();
+				print_state(time,	msd);
+				SA::EulerCromerIntegrator	integ(dt,	N_DIMENSIONS,	x_p,	v_p,	acceleration,	&msd);
+				while	(time	<	10)	{
+								msd.extForce	=	ImpGen.impulse(time);
+								integ.integrate();
+								time	=	integ.getIndyVar();
+								print_state(time,	msd);
+				}
 }
diff --git a/trick_source/trick_utils/SAIntegrator/examples/Orbit/Orbit.cpp b/trick_source/trick_utils/SAIntegrator/examples/Orbit/Orbit.cpp
index 327a936ff..474d0ded4 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/Orbit/Orbit.cpp
+++ b/trick_source/trick_utils/SAIntegrator/examples/Orbit/Orbit.cpp
@@ -1,59 +1,59 @@
-#include <math.h>
-#include <stdio.h>
-#include "SAIntegrator.hh"
+#include	<math.h>
+#include	<stdio.h>
+#include	"SAIntegrator.hh"
 
-#define GRAVITATIONAL_CONSTANT 6.674e-11
-#define EARTH_MASS 5.9723e24
-#define EARTH_RADIUS 6367500.0
+#define	GRAVITATIONAL_CONSTANT	6.674e-11
+#define	EARTH_MASS	5.9723e24
+#define	EARTH_RADIUS	6367500.0
 
-struct Orbit {
-    double pos[2];
-    double vel[2];
-    double planet_mass;
-    Orbit(double px, double py, double vx, double vy, double m);
+struct	Orbit	{
+				double	pos[2];
+				double	vel[2];
+				double	planet_mass;
+				Orbit(double	px,	double	py,	double	vx,	double	vy,	double	m);
 };
-Orbit::Orbit(double px, double py, double vx, double vy, double m) {
-    pos[0] = px;
-    pos[1] = py;
-    vel[0] = vx;
-    vel[1] = vy;
-    planet_mass = m;
+Orbit::Orbit(double	px,	double	py,	double	vx,	double	vy,	double	m)	{
+				pos[0]	=	px;
+				pos[1]	=	py;
+				vel[0]	=	vx;
+				vel[1]	=	vy;
+				planet_mass	=	m;
 }
-void print_header() {
-    printf ("time, orbit.pos[0], orbit.pos[1], orbit.vel[0], orbit.vel[1]\n");
+void	print_header()	{
+				printf	("time,	orbit.pos[0],	orbit.pos[1],	orbit.vel[0],	orbit.vel[1]\n");
 }
-void print_state( double t, Orbit& orbit ) {
-    printf ("%10.10f, %10.10f, %10.10f, %10.10f, %10.10f\n",
-             t, orbit.pos[0], orbit.pos[1], orbit.vel[0], orbit.vel[1]);
+void	print_state(	double	t,	Orbit&	orbit	)	{
+				printf	("%10.10f,	%10.10f,	%10.10f,	%10.10f,	%10.10f\n",
+													t,	orbit.pos[0],	orbit.pos[1],	orbit.vel[0],	orbit.vel[1]);
 }
-void G( double t, double pos[], double vel[], double acc_out[], void* udata) {
-    Orbit* orbit = (Orbit*)udata;
-    double d = sqrt( pos[0]*pos[0] + pos[1]*pos[1]);
-    acc_out[0] = -pos[0] * GRAVITATIONAL_CONSTANT * orbit->planet_mass / (d*d*d);
-    acc_out[1] = -pos[1] * GRAVITATIONAL_CONSTANT * orbit->planet_mass / (d*d*d);
+void	G(	double	t,	double	pos[],	double	vel[],	double	acc_out[],	void*	udata)	{
+				Orbit*	orbit	=	(Orbit*)udata;
+				double	d	=	sqrt(	pos[0]*pos[0]	+	pos[1]*pos[1]);
+				acc_out[0]	=	-pos[0]	*	GRAVITATIONAL_CONSTANT	*	orbit->planet_mass	/	(d*d*d);
+				acc_out[1]	=	-pos[1]	*	GRAVITATIONAL_CONSTANT	*	orbit->planet_mass	/	(d*d*d);
 }
-int main ( int argc, char* argv[]) {
+int	main	(	int	argc,	char*	argv[])	{
 
-    const double altitude_AGL = 408000.0;            // m
+				const	double	altitude_AGL	=	408000.0;												//	m
 
-    double mu = GRAVITATIONAL_CONSTANT * EARTH_MASS; // m^3s^2
-    double R_bar_mag = EARTH_RADIUS + altitude_AGL;  // m
-    double V_bar_mag = sqrt(mu / R_bar_mag);         // m/s
-    double Orbital_period = 2 * M_PI * sqrt((R_bar_mag * R_bar_mag * R_bar_mag) / mu); // s
+				double	mu	=	GRAVITATIONAL_CONSTANT	*	EARTH_MASS;	//	m^3s^2
+				double	R_bar_mag	=	EARTH_RADIUS	+	altitude_AGL;		//	m
+				double	V_bar_mag	=	sqrt(mu	/	R_bar_mag);									//	m/s
+				double	Orbital_period	=	2	*	M_PI	*	sqrt((R_bar_mag	*	R_bar_mag	*	R_bar_mag)	/	mu);	//	s
 
-    double dt = 0.1; // s
-    Orbit orbit(0.0, R_bar_mag, V_bar_mag, 0.0, EARTH_MASS);
-    double* x_p[2] = { &orbit.pos[0], &orbit.pos[1] };
-    double* v_p[2] = { &orbit.vel[0], &orbit.vel[1] };
+				double	dt	=	0.1;	//	s
+				Orbit	orbit(0.0,	R_bar_mag,	V_bar_mag,	0.0,	EARTH_MASS);
+				double*	x_p[2]	=	{	&orbit.pos[0],	&orbit.pos[1]	};
+				double*	v_p[2]	=	{	&orbit.vel[0],	&orbit.vel[1]	};
 
-    double time = 0.0; // s
+				double	time	=	0.0;	//	s
 
-    print_header();
-    print_state(time, orbit);
-    SA::EulerCromerIntegrator integ(dt, 2, x_p, v_p, G, &orbit);
-    while (time < Orbital_period) {
-        integ.integrate();
-        time = integ.getIndyVar();
-        print_state(time, orbit);
-    }
+				print_header();
+				print_state(time,	orbit);
+				SA::EulerCromerIntegrator	integ(dt,	2,	x_p,	v_p,	G,	&orbit);
+				while	(time	<	Orbital_period)	{
+								integ.integrate();
+								time	=	integ.getIndyVar();
+								print_state(time,	orbit);
+				}
 }
diff --git a/trick_source/trick_utils/SAIntegrator/src/RootFinder.cpp b/trick_source/trick_utils/SAIntegrator/src/RootFinder.cpp
index 3fd0f62b9..e69197a62 100644
--- a/trick_source/trick_utils/SAIntegrator/src/RootFinder.cpp
+++ b/trick_source/trick_utils/SAIntegrator/src/RootFinder.cpp
@@ -1,106 +1,106 @@
-#include "Rootfinder.hh"
-#include <math.h>
-#include <float.h>
-#include <iostream>
+#include	"Rootfinder.hh"
+#include	<math.h>
+#include	<float.h>
+#include	<iostream>
 
-void RootFinder::init( double tolerance, SlopeConstraint constraint) {
-    iterations = 0;
-    prev_f_error = DBL_MAX;
-    lower_set = false;
-    upper_set = false;
-    f_error_tol = tolerance;
-    slope_constraint = constraint;
+void	RootFinder::init(	double	tolerance,	SlopeConstraint	constraint)	{
+				iterations	=	0;
+				prev_f_error	=	DBL_MAX;
+				lower_set	=	false;
+				upper_set	=	false;
+				f_error_tol	=	tolerance;
+				slope_constraint	=	constraint;
 }
-void RootFinder::init() {
-    init(0.00000000001, Unconstrained);
+void	RootFinder::init()	{
+				init(0.00000000001,	Unconstrained);
 }
-// Default Constructor
-RootFinder::RootFinder () {
-    init();
+//	Default	Constructor
+RootFinder::RootFinder	()	{
+				init();
 }
-// Constructor
-RootFinder::RootFinder (double tolerance, SlopeConstraint constraint) {
-    init(tolerance, constraint);
+//	Constructor
+RootFinder::RootFinder	(double	tolerance,	SlopeConstraint	constraint)	{
+				init(tolerance,	constraint);
 }
-// Copy Constructor: The default copy_constructor should suffice.
-// Assignment Operator: The default assignment operator should suffice.
-// Destructor: The default destructor should suffice.
+//	Copy	Constructor:	The	default	copy_constructor	should	suffice.
+//	Assignment	Operator:	The	default	assignment	operator	should	suffice.
+//	Destructor:	The	default	destructor	should	suffice.
 
-// Given the values of the independent variable, and the function,
-// estimate the distance of the independent variable from functions root.
-double RootFinder::find_roots( double x, double f_error ) {
-    if (  ( fabs(f_error) < f_error_tol) ||
-          (( iterations > 0) && (fabs(prev_f_error - f_error) < f_error_tol))
-       ) {
-        if (slope_constraint == Unconstrained) {
-            return (0.0);
-        } else if (slope_constraint == Positive && lower_set) {
-            return (0.0);
-        } else if (slope_constraint == Negative && upper_set) {
-            return (0.0);
-        }
-    }
-    if (f_error < 0.0) {
-        f_lower = f_error;
-        x_lower = x;
-        lower_set = true;
-    } else if (f_error > 0.0) {
-        f_upper = f_error;
-        x_upper = x;
-        upper_set = true;
-    }
-    iterations++;
-    if (upper_set && lower_set) {
-        double x_correction_estimate;
-        if (fabs(f_error) < f_error_tol)
-            x_correction_estimate = 0.0;
-        else {
-            x_correction_estimate = -f_error/((f_upper-f_lower)/(x_upper-x_lower));
-            if (iterations > 20)
-                x_correction_estimate = 0.0;
-        }
-        /* Check for Positive or Negative constraint */
-        switch (slope_constraint) {
-            case Unconstrained:
-                prev_f_error = f_error;
-                return (x_correction_estimate);
-            case Positive:
-                if (f_slope == Positive) {
-                    prev_f_error = f_error;
-                    return (x_correction_estimate);
-                } else {
-                    lower_set = false;
-                    f_slope = Positive;
-                }
-                break;
-            case Negative:
-                if (f_slope == Negative) {
-                    prev_f_error = f_error;
-                    return (x_correction_estimate);
-                } else {
-                    upper_set = false;
-                    f_slope = Negative;
-                }
-                break;
-        }
-        f_slope = Unconstrained;
-    } else if (lower_set == 1) {
-        f_slope = Positive;
-    } else if (upper_set == 1) {
-        f_slope = Negative;
-    }
-    iterations = 0;
-    return (DBL_MAX);
+//	Given	the	values	of	the	independent	variable,	and	the	function,
+//	estimate	the	distance	of	the	independent	variable	from	functions	root.
+double	RootFinder::find_roots(	double	x,	double	f_error	)	{
+				if	(		(	fabs(f_error)	<	f_error_tol)	||
+										((	iterations	>	0)	&&	(fabs(prev_f_error	-	f_error)	<	f_error_tol))
+							)	{
+								if	(slope_constraint	==	Unconstrained)	{
+												return	(0.0);
+								}	else	if	(slope_constraint	==	Positive	&&	lower_set)	{
+												return	(0.0);
+								}	else	if	(slope_constraint	==	Negative	&&	upper_set)	{
+												return	(0.0);
+								}
+				}
+				if	(f_error	<	0.0)	{
+								f_lower	=	f_error;
+								x_lower	=	x;
+								lower_set	=	true;
+				}	else	if	(f_error	>	0.0)	{
+								f_upper	=	f_error;
+								x_upper	=	x;
+								upper_set	=	true;
+				}
+				iterations++;
+				if	(upper_set	&&	lower_set)	{
+								double	x_correction_estimate;
+								if	(fabs(f_error)	<	f_error_tol)
+												x_correction_estimate	=	0.0;
+								else	{
+												x_correction_estimate	=	-f_error/((f_upper-f_lower)/(x_upper-x_lower));
+												if	(iterations	>	20)
+																x_correction_estimate	=	0.0;
+								}
+								/*	Check	for	Positive	or	Negative	constraint	*/
+								switch	(slope_constraint)	{
+												case	Unconstrained:
+																prev_f_error	=	f_error;
+																return	(x_correction_estimate);
+												case	Positive:
+																if	(f_slope	==	Positive)	{
+																				prev_f_error	=	f_error;
+																				return	(x_correction_estimate);
+																}	else	{
+																				lower_set	=	false;
+																				f_slope	=	Positive;
+																}
+																break;
+												case	Negative:
+																if	(f_slope	==	Negative)	{
+																				prev_f_error	=	f_error;
+																				return	(x_correction_estimate);
+																}	else	{
+																				upper_set	=	false;
+																				f_slope	=	Negative;
+																}
+																break;
+								}
+								f_slope	=	Unconstrained;
+				}	else	if	(lower_set	==	1)	{
+								f_slope	=	Positive;
+				}	else	if	(upper_set	==	1)	{
+								f_slope	=	Negative;
+				}
+				iterations	=	0;
+				return	(DBL_MAX);
 }
 
-std::ostream& operator<<(std::ostream& os, const RootFinder& rf) {
-    os << "\n--- RootFinder ---";
-    os << "\nupper: {" << rf.f_upper << ',' << rf.x_upper << ',' << rf.upper_set << "}";
-    os << "\nlower: {" << rf.f_lower << ',' << rf.x_lower << ',' << rf.lower_set << "}";
-    os << "\nprev_f_error: " << rf.prev_f_error;
-    os << "\nf_error_tol:" << rf.prev_f_error;
-    os << "\niterations:" << rf.prev_f_error;
-    os << "\nslope_constraint:" << rf.slope_constraint;
-    os << "\nf_slope:" << rf.f_slope;
-    return os;
+std::ostream&	operator<<(std::ostream&	os,	const	RootFinder&	rf)	{
+				os	<<	"\n---	RootFinder	---";
+				os	<<	"\nupper:	{"	<<	rf.f_upper	<<	','	<<	rf.x_upper	<<	','	<<	rf.upper_set	<<	"}";
+				os	<<	"\nlower:	{"	<<	rf.f_lower	<<	','	<<	rf.x_lower	<<	','	<<	rf.lower_set	<<	"}";
+				os	<<	"\nprev_f_error:	"	<<	rf.prev_f_error;
+				os	<<	"\nf_error_tol:"	<<	rf.prev_f_error;
+				os	<<	"\niterations:"	<<	rf.prev_f_error;
+				os	<<	"\nslope_constraint:"	<<	rf.slope_constraint;
+				os	<<	"\nf_slope:"	<<	rf.f_slope;
+				return	os;
 }
diff --git a/trick_source/trick_utils/SAIntegrator/src/SAIntegrator.cpp b/trick_source/trick_utils/SAIntegrator/src/SAIntegrator.cpp
index 8f114b689..b9c3848eb 100644
--- a/trick_source/trick_utils/SAIntegrator/src/SAIntegrator.cpp
+++ b/trick_source/trick_utils/SAIntegrator/src/SAIntegrator.cpp
@@ -1,1309 +1,1309 @@
 
-#include <stdlib.h>
-#include <math.h>
-#include <stdexcept>
-#include <iostream>  // std::cout, std::cerr
-#include <algorithm> // std::copy
-#include "SAIntegrator.hh"
+#include	<stdlib.h>
+#include	<math.h>
+#include	<stdexcept>
+#include	<iostream>		//	std::cout,	std::cerr
+#include	<algorithm>	//	std::copy
+#include	"SAIntegrator.hh"
 
-static void nil_dfunc( double x,
-                       double state[] __attribute__((unused)),
-                       double derivs[],
-                       void*  udata __attribute__((unused))) {
-    derivs[0] = 0.0;
-}
-static void nil_gfunc( double t,
-                       double x[] __attribute__((unused)),
-                       double v[] __attribute__((unused)),
-                       double derivs[],
-                       void*  udata __attribute__((unused))) {
-    derivs[0] = 0.0;
-}
-// ------------------------------------------------------------
-// Class Integrator
-// ------------------------------------------------------------
-// Default Constructor
+static	void	nil_dfunc(	double	x,
+																							double	state[]	__attribute__((unused)),
+																							double	derivs[],
+																							void*		udata	__attribute__((unused)))	{
+				derivs[0]	=	0.0;
+}
+static	void	nil_gfunc(	double	t,
+																							double	x[]	__attribute__((unused)),
+																							double	v[]	__attribute__((unused)),
+																							double	derivs[],
+																							void*		udata	__attribute__((unused)))	{
+				derivs[0]	=	0.0;
+}
+//	------------------------------------------------------------
+//	Class	Integrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::Integrator::Integrator()
-: X_in(0.0), X_out(0.0), default_h(1.0), user_data(NULL) {};
-// Constructor
-SA::Integrator::Integrator(double h, void* udata)
-: X_in(0.0), X_out(0.0), default_h(h), user_data(udata) {};
+:	X_in(0.0),	X_out(0.0),	default_h(1.0),	user_data(NULL)	{};
+//	Constructor
+SA::Integrator::Integrator(double	h,	void*	udata)
+:	X_in(0.0),	X_out(0.0),	default_h(h),	user_data(udata)	{};
 
-void SA::Integrator::advanceIndyVar() {
-    X_out = X_in + default_h;
+void	SA::Integrator::advanceIndyVar()	{
+				X_out	=	X_in	+	default_h;
 }
-void SA::Integrator::step() {
-    advanceIndyVar();
+void	SA::Integrator::step()	{
+				advanceIndyVar();
 }
-void SA::Integrator::load() {
-    X_in = X_out;
+void	SA::Integrator::load()	{
+				X_in	=	X_out;
 }
-void SA::Integrator::unload() {
-    std::cout << "SA::Integrator : Nothing to unload." << std::endl;
+void	SA::Integrator::unload()	{
+				std::cout	<<	"SA::Integrator	:	Nothing	to	unload."	<<	std::endl;
 }
-void SA::Integrator::integrate() {
-    load();
-    step();
-    unload();
+void	SA::Integrator::integrate()	{
+				load();
+				step();
+				unload();
 }
-double SA::Integrator::undo_integrate() {
-    X_out = X_in;
-    return (default_h);
+double	SA::Integrator::undo_integrate()	{
+				X_out	=	X_in;
+				return	(default_h);
 }
-double SA::Integrator::getIndyVar() {
-    return X_out;
+double	SA::Integrator::getIndyVar()	{
+				return	X_out;
 }
-void SA::Integrator::setIndyVar(double v) {
-    X_out = v;
+void	SA::Integrator::setIndyVar(double	v)	{
+				X_out	=	v;
 }
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const Integrator& I) {
-    os << "\n--- Integrator ---";
-    os << "\nX_in      : " << I.X_in;
-    os << "\nX_out     : " << I.X_out;
-    os << "\ndefault_h : " << I.default_h;
-    os << "\nuser_data : " << I.user_data;
-    return os;
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	Integrator&	I)	{
+				os	<<	"\n---	Integrator	---";
+				os	<<	"\nX_in						:	"	<<	I.X_in;
+				os	<<	"\nX_out					:	"	<<	I.X_out;
+				os	<<	"\ndefault_h	:	"	<<	I.default_h;
+				os	<<	"\nuser_data	:	"	<<	I.user_data;
+				return	os;
 }
 
-// ------------------------------------------------------------
-// Class FirstOrderODEIntegrator
-// ------------------------------------------------------------
-// Default Constructor
+//	------------------------------------------------------------
+//	Class	FirstOrderODEIntegrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::FirstOrderODEIntegrator::FirstOrderODEIntegrator()
-: Integrator() {
-    state_size = 0;
-    inVars = NULL;
-    outVars = NULL;
-    inState = new double[state_size];
-    outState = new double[state_size];
-    derivs_func = nil_dfunc;
-}
-// Constructor
+:	Integrator()	{
+				state_size	=	0;
+				inVars	=	NULL;
+				outVars	=	NULL;
+				inState	=	new	double[state_size];
+				outState	=	new	double[state_size];
+				derivs_func	=	nil_dfunc;
+}
+//	Constructor
 SA::FirstOrderODEIntegrator::FirstOrderODEIntegrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-: Integrator(h, udata) {
-    state_size = N;
-    inVars = in_vars;
-    outVars = out_vars;
-    inState = new double[state_size];
-    outState = new double[state_size];
-    if (dfunc == NULL) throw std::invalid_argument("dfunc must be non-NULL.");
-    derivs_func = dfunc;
-}
-// Copy Constructor
-SA::FirstOrderODEIntegrator::FirstOrderODEIntegrator(const FirstOrderODEIntegrator& other)
-: Integrator(other) {
-    state_size = other.state_size;
-    inVars = other.inVars;
-    outVars = other.outVars;
-    inState = new double[state_size];
-    std::copy( other.inState, other.inState + state_size, inState);
-    outState = new double[state_size];
-    std::copy( other.outState, other.outState + state_size, outState);
-    derivs_func = other.derivs_func;
-}
-// Assignment Operator
-SA::FirstOrderODEIntegrator& SA::FirstOrderODEIntegrator::operator=( const SA::FirstOrderODEIntegrator& rhs) {
-    if (this != &rhs) {
-        // Call base assignment operator
-        Integrator::operator=(rhs);
-        // Duplicate rhs arrays
-        double* new_inState = new double[rhs.state_size];
-        std::copy( rhs.inState, rhs.inState + rhs.state_size, new_inState);
-        double* new_outState = new double[rhs.state_size];
-        std::copy( rhs.outState, rhs.outState + rhs.state_size, new_outState);
-        // Delete lhs arrays & replace with rhs arrays
-        if (inState != NULL) delete inState;
-        inState = new_inState;
-        if (outState != NULL) delete outState;
-        outState = new_outState;
-        // Copy primitive members
-        state_size = rhs.state_size;
-        inVars = rhs.inVars;
-        outVars = rhs.outVars;
-        derivs_func = rhs.derivs_func;
-    }
-    return *this;
-}
-// Destructor
-SA::FirstOrderODEIntegrator::~FirstOrderODEIntegrator() {
-    if (inState != NULL) delete inState;
-    if (outState != NULL) delete outState;
-}
-void SA::FirstOrderODEIntegrator::load() {
-    if (inVars != NULL) {
-        for (unsigned int i=0 ; i<state_size; i++ ) {
-            inState[i] = *(inVars[i]);
-        }
-        Integrator::load();
-    } else {
-        std::cerr << "Error: SA::FirstOrderODEIntegrator::load(). inVars is not set." << std::endl;
-    }
-}
-void SA::FirstOrderODEIntegrator::unload() {
-    if (outVars != NULL) {
-        for (unsigned int i=0 ; i<state_size; i++ ) {
-            *(outVars[i]) = outState[i];
-        }
-    } else {
-        std::cerr << "Error: SA::FirstOrderODEIntegrator::load(). outVars is not set." << std::endl;
-    }
-}
-void SA::FirstOrderODEIntegrator::load_from_outState(){
-    for (unsigned int i=0 ; i<state_size; i++ ) {
-        inState[i] = outState[i];
-    }
-    Integrator::load();
-}
-double** SA::FirstOrderODEIntegrator::set_in_vars( double* in_vars[]){
-    double **ret = inVars;
-    inVars = in_vars;
-    return (ret);
-}
-double** SA::FirstOrderODEIntegrator::set_out_vars( double* out_vars[]){
-    double **ret = outVars;
-    outVars = out_vars;
-    return (ret);
-}
-double SA::FirstOrderODEIntegrator::undo_integrate() {
-    if (inVars != NULL) {
-        for (unsigned int i=0 ; i<state_size; i++ ) {
-            *(inVars[i]) = inState[i];
-        }
-        std::copy(inState, inState + state_size, outState);
-        return (SA::Integrator::undo_integrate());
-    } else {
-        std::cerr << "Error: SA::FirstOrderODEIntegrator::load(). inVars is not set." << std::endl;
-    }
-    return (0.0);
-}
-void SA::FirstOrderODEIntegrator::step() {
-    double derivs[state_size];
-    (*derivs_func)( X_in, inState, derivs, user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + derivs[i] * default_h;
-    }
-    advanceIndyVar();
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	Integrator(h,	udata)	{
+				state_size	=	N;
+				inVars	=	in_vars;
+				outVars	=	out_vars;
+				inState	=	new	double[state_size];
+				outState	=	new	double[state_size];
+				if	(dfunc	==	NULL)	throw	std::invalid_argument("dfunc	must	be	non-NULL.");
+				derivs_func	=	dfunc;
+}
+//	Copy	Constructor
+SA::FirstOrderODEIntegrator::FirstOrderODEIntegrator(const	FirstOrderODEIntegrator&	other)
+:	Integrator(other)	{
+				state_size	=	other.state_size;
+				inVars	=	other.inVars;
+				outVars	=	other.outVars;
+				inState	=	new	double[state_size];
+				std::copy(	other.inState,	other.inState	+	state_size,	inState);
+				outState	=	new	double[state_size];
+				std::copy(	other.outState,	other.outState	+	state_size,	outState);
+				derivs_func	=	other.derivs_func;
+}
+//	Assignment	Operator
+SA::FirstOrderODEIntegrator&	SA::FirstOrderODEIntegrator::operator=(	const	SA::FirstOrderODEIntegrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								//	Call	base	assignment	operator
+								Integrator::operator=(rhs);
+								//	Duplicate	rhs	arrays
+								double*	new_inState	=	new	double[rhs.state_size];
+								std::copy(	rhs.inState,	rhs.inState	+	rhs.state_size,	new_inState);
+								double*	new_outState	=	new	double[rhs.state_size];
+								std::copy(	rhs.outState,	rhs.outState	+	rhs.state_size,	new_outState);
+								//	Delete	lhs	arrays	&	replace	with	rhs	arrays
+								if	(inState	!=	NULL)	delete	inState;
+								inState	=	new_inState;
+								if	(outState	!=	NULL)	delete	outState;
+								outState	=	new_outState;
+								//	Copy	primitive	members
+								state_size	=	rhs.state_size;
+								inVars	=	rhs.inVars;
+								outVars	=	rhs.outVars;
+								derivs_func	=	rhs.derivs_func;
+				}
+				return	*this;
+}
+//	Destructor
+SA::FirstOrderODEIntegrator::~FirstOrderODEIntegrator()	{
+				if	(inState	!=	NULL)	delete	inState;
+				if	(outState	!=	NULL)	delete	outState;
+}
+void	SA::FirstOrderODEIntegrator::load()	{
+				if	(inVars	!=	NULL)	{
+								for	(unsigned	int	i=0	;	i<state_size;	i++	)	{
+												inState[i]	=	*(inVars[i]);
+								}
+								Integrator::load();
+				}	else	{
+								std::cerr	<<	"Error:	SA::FirstOrderODEIntegrator::load().	inVars	is	not	set."	<<	std::endl;
+				}
+}
+void	SA::FirstOrderODEIntegrator::unload()	{
+				if	(outVars	!=	NULL)	{
+								for	(unsigned	int	i=0	;	i<state_size;	i++	)	{
+												*(outVars[i])	=	outState[i];
+								}
+				}	else	{
+								std::cerr	<<	"Error:	SA::FirstOrderODEIntegrator::load().	outVars	is	not	set."	<<	std::endl;
+				}
+}
+void	SA::FirstOrderODEIntegrator::load_from_outState(){
+				for	(unsigned	int	i=0	;	i<state_size;	i++	)	{
+								inState[i]	=	outState[i];
+				}
+				Integrator::load();
+}
+double**	SA::FirstOrderODEIntegrator::set_in_vars(	double*	in_vars[]){
+				double	**ret	=	inVars;
+				inVars	=	in_vars;
+				return	(ret);
+}
+double**	SA::FirstOrderODEIntegrator::set_out_vars(	double*	out_vars[]){
+				double	**ret	=	outVars;
+				outVars	=	out_vars;
+				return	(ret);
+}
+double	SA::FirstOrderODEIntegrator::undo_integrate()	{
+				if	(inVars	!=	NULL)	{
+								for	(unsigned	int	i=0	;	i<state_size;	i++	)	{
+												*(inVars[i])	=	inState[i];
+								}
+								std::copy(inState,	inState	+	state_size,	outState);
+								return	(SA::Integrator::undo_integrate());
+				}	else	{
+								std::cerr	<<	"Error:	SA::FirstOrderODEIntegrator::load().	inVars	is	not	set."	<<	std::endl;
+				}
+				return	(0.0);
+}
+void	SA::FirstOrderODEIntegrator::step()	{
+				double	derivs[state_size];
+				(*derivs_func)(	X_in,	inState,	derivs,	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	derivs[i]	*	default_h;
+				}
+				advanceIndyVar();
 }
 
-static std::ostream& stream_double_array(std::ostream& os, unsigned int n, double* d_array) {
-    if (d_array == NULL) {
-        os << " NULL\n";
-    } else {
-        os << "[";
-        for (int i=0; i<n ; i++) {
-            if (i==0) { os << d_array[i]; }
-            else { os << " ," << d_array[i]; }
-        }
-        os << "]";
-    }
-    return os;
-}
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const FirstOrderODEIntegrator& I) {
-        os << (SA::Integrator)I;
-        os << "\n--- FirstOrderODEIntegrator ---";
-        os << "\nstate_size: " << I.state_size;
-        os << "\ninState   :";
-        stream_double_array(os, I.state_size, I.inState);
-        os << "\noutState  :";
-        stream_double_array(os, I.state_size, I.outState);
-        os << "\ninVars    : " << (void*)I.inVars;
-        os << "\noutVars   : " << (void*)I.outVars;
-        return os;
+static	std::ostream&	stream_double_array(std::ostream&	os,	unsigned	int	n,	double*	d_array)	{
+				if	(d_array	==	NULL)	{
+								os	<<	"	NULL\n";
+				}	else	{
+								os	<<	"[";
+								for	(int	i=0;	i<n	;	i++)	{
+												if	(i==0)	{	os	<<	d_array[i];	}
+												else	{	os	<<	"	,"	<<	d_array[i];	}
+								}
+								os	<<	"]";
+				}
+				return	os;
+}
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	FirstOrderODEIntegrator&	I)	{
+								os	<<	(SA::Integrator)I;
+								os	<<	"\n---	FirstOrderODEIntegrator	---";
+								os	<<	"\nstate_size:	"	<<	I.state_size;
+								os	<<	"\ninState			:";
+								stream_double_array(os,	I.state_size,	I.inState);
+								os	<<	"\noutState		:";
+								stream_double_array(os,	I.state_size,	I.outState);
+								os	<<	"\ninVars				:	"	<<	(void*)I.inVars;
+								os	<<	"\noutVars			:	"	<<	(void*)I.outVars;
+								return	os;
 }
 
-// ------------------------------------------------------------
-// Class FirstOrderODEVariableStepIntegrator
-// ------------------------------------------------------------
-// Default Constructor
+//	------------------------------------------------------------
+//	Class	FirstOrderODEVariableStepIntegrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::FirstOrderODEVariableStepIntegrator::FirstOrderODEVariableStepIntegrator()
-: FirstOrderODEIntegrator() {
-    root_finder = (RootFinder*) NULL;
-    root_error_func = (RootErrorFunc) NULL;
+:	FirstOrderODEIntegrator()	{
+				root_finder	=	(RootFinder*)	NULL;
+				root_error_func	=	(RootErrorFunc)	NULL;
 }
-// Constructor
+//	Constructor
 SA::FirstOrderODEVariableStepIntegrator::FirstOrderODEVariableStepIntegrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-: FirstOrderODEIntegrator(h, N, in_vars, out_vars, dfunc, udata) {
-    root_finder = (RootFinder*) NULL;
-    root_error_func = (RootErrorFunc) NULL;
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	FirstOrderODEIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{
+				root_finder	=	(RootFinder*)	NULL;
+				root_error_func	=	(RootErrorFunc)	NULL;
 }
 
-// Copy Constructor
+//	Copy	Constructor
 SA::FirstOrderODEVariableStepIntegrator::FirstOrderODEVariableStepIntegrator(
-const FirstOrderODEVariableStepIntegrator& other)
-: FirstOrderODEIntegrator(other) {
-    if (other.root_finder != NULL) {
-        root_finder = new RootFinder(*(other.root_finder));
-    } else {
-        root_finder = NULL;
-    }
-    root_error_func = other.root_error_func;
-}
-// Assignment Operator
-SA::FirstOrderODEVariableStepIntegrator& SA::
-FirstOrderODEVariableStepIntegrator::operator=( const SA::FirstOrderODEVariableStepIntegrator& rhs) {
-    FirstOrderODEIntegrator::operator=(rhs);
-    if (root_finder != NULL) delete root_finder;
-    if (rhs.root_finder != NULL) {
-        root_finder = new RootFinder(*(rhs.root_finder));
-    } else {
-        root_finder = NULL;
-    }
-    root_error_func = rhs.root_error_func;
-    return *this;
-}
-// Destructor
-SA::FirstOrderODEVariableStepIntegrator::~FirstOrderODEVariableStepIntegrator() {
-    if (root_finder != NULL) {
-        delete root_finder;
-    }
-}
-double SA::FirstOrderODEVariableStepIntegrator::undo_integrate() {
-    SA::FirstOrderODEIntegrator::undo_integrate();
-    return (last_h);
-}
-void SA::FirstOrderODEVariableStepIntegrator::add_Rootfinder( double tolerance, SlopeConstraint constraint, RootErrorFunc rfunc) {
-    root_finder = new RootFinder(tolerance, constraint);
-    if (rfunc == NULL) {
-        throw std::invalid_argument("OOPS! RootErrorFunc function-pointer is NULL.");
-    }
-    root_error_func = rfunc;
-}
-void SA::FirstOrderODEVariableStepIntegrator::advanceIndyVar(double h) {
-    last_h = h; X_out = X_in + h;
-}
-void SA::FirstOrderODEVariableStepIntegrator::variable_step( double h) {
-    double derivs[state_size];
-    (*derivs_func)( X_in, inState, derivs, user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + derivs[i] * h;
-    }
-    advanceIndyVar(h);
-}
-void SA::FirstOrderODEVariableStepIntegrator::find_roots(double h, unsigned int depth) {
-    double new_h;
-    double h_correction = (*root_error_func)( getIndyVar(), outState, root_finder, user_data );
-    if (h_correction < 0.0) {
-        while (h_correction != 0.0) {
-            new_h = undo_integrate() + h_correction;
-            variable_step(new_h);
-            h_correction = (*root_error_func)( getIndyVar(), outState, root_finder, user_data );
-        }
-        load_from_outState();
-        variable_step(h-new_h);
-        if (depth > 0) {
-            find_roots(h-new_h, depth-1);
-        }
-    }
-}
-void SA::FirstOrderODEVariableStepIntegrator::step() {
-    variable_step( default_h );
-    if ((root_finder != NULL) && (root_error_func != NULL)) {
-        find_roots( default_h, 5 );
-    }
-}
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const FirstOrderODEVariableStepIntegrator& I) {
-    os << (SA::FirstOrderODEIntegrator)I;
-    os << "\n--- FirstOrderODEVariableStepIntegrator ---";
-    if (I.root_error_func == NULL) {
-        os << "\nroot_error_func: NULL.";
-    } else {
-        os << "\nroot_error_func: " << (void*)I.root_error_func;
-    }
-    if (I.root_finder == NULL) {
-        os << "\nroot_finder: NULL.";
-    } else {
-        os << "\nroot_finder -> " << *(I.root_finder);
-    }
-    return os;
+const	FirstOrderODEVariableStepIntegrator&	other)
+:	FirstOrderODEIntegrator(other)	{
+				if	(other.root_finder	!=	NULL)	{
+								root_finder	=	new	RootFinder(*(other.root_finder));
+				}	else	{
+								root_finder	=	NULL;
+				}
+				root_error_func	=	other.root_error_func;
+}
+//	Assignment	Operator
+SA::FirstOrderODEVariableStepIntegrator&	SA::
+FirstOrderODEVariableStepIntegrator::operator=(	const	SA::FirstOrderODEVariableStepIntegrator&	rhs)	{
+				FirstOrderODEIntegrator::operator=(rhs);
+				if	(root_finder	!=	NULL)	delete	root_finder;
+				if	(rhs.root_finder	!=	NULL)	{
+								root_finder	=	new	RootFinder(*(rhs.root_finder));
+				}	else	{
+								root_finder	=	NULL;
+				}
+				root_error_func	=	rhs.root_error_func;
+				return	*this;
+}
+//	Destructor
+SA::FirstOrderODEVariableStepIntegrator::~FirstOrderODEVariableStepIntegrator()	{
+				if	(root_finder	!=	NULL)	{
+								delete	root_finder;
+				}
+}
+double	SA::FirstOrderODEVariableStepIntegrator::undo_integrate()	{
+				SA::FirstOrderODEIntegrator::undo_integrate();
+				return	(last_h);
+}
+void	SA::FirstOrderODEVariableStepIntegrator::add_Rootfinder(	double	tolerance,	SlopeConstraint	constraint,	RootErrorFunc	rfunc)	{
+				root_finder	=	new	RootFinder(tolerance,	constraint);
+				if	(rfunc	==	NULL)	{
+								throw	std::invalid_argument("OOPS!	RootErrorFunc	function-pointer	is	NULL.");
+				}
+				root_error_func	=	rfunc;
+}
+void	SA::FirstOrderODEVariableStepIntegrator::advanceIndyVar(double	h)	{
+				last_h	=	h;	X_out	=	X_in	+	h;
+}
+void	SA::FirstOrderODEVariableStepIntegrator::variable_step(	double	h)	{
+				double	derivs[state_size];
+				(*derivs_func)(	X_in,	inState,	derivs,	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	derivs[i]	*	h;
+				}
+				advanceIndyVar(h);
+}
+void	SA::FirstOrderODEVariableStepIntegrator::find_roots(double	h,	unsigned	int	depth)	{
+				double	new_h;
+				double	h_correction	=	(*root_error_func)(	getIndyVar(),	outState,	root_finder,	user_data	);
+				if	(h_correction	<	0.0)	{
+								while	(h_correction	!=	0.0)	{
+												new_h	=	undo_integrate()	+	h_correction;
+												variable_step(new_h);
+												h_correction	=	(*root_error_func)(	getIndyVar(),	outState,	root_finder,	user_data	);
+								}
+								load_from_outState();
+								variable_step(h-new_h);
+								if	(depth	>	0)	{
+												find_roots(h-new_h,	depth-1);
+								}
+				}
+}
+void	SA::FirstOrderODEVariableStepIntegrator::step()	{
+				variable_step(	default_h	);
+				if	((root_finder	!=	NULL)	&&	(root_error_func	!=	NULL))	{
+								find_roots(	default_h,	5	);
+				}
+}
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	FirstOrderODEVariableStepIntegrator&	I)	{
+				os	<<	(SA::FirstOrderODEIntegrator)I;
+				os	<<	"\n---	FirstOrderODEVariableStepIntegrator	---";
+				if	(I.root_error_func	==	NULL)	{
+								os	<<	"\nroot_error_func:	NULL.";
+				}	else	{
+								os	<<	"\nroot_error_func:	"	<<	(void*)I.root_error_func;
+				}
+				if	(I.root_finder	==	NULL)	{
+								os	<<	"\nroot_finder:	NULL.";
+				}	else	{
+								os	<<	"\nroot_finder	->	"	<<	*(I.root_finder);
+				}
+				return	os;
 }
 
-// ------------------------------------------------------------
-// Class EulerIntegrator
-// ------------------------------------------------------------
-// Default Constructor
+//	------------------------------------------------------------
+//	Class	EulerIntegrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::EulerIntegrator::EulerIntegrator()
-: FirstOrderODEVariableStepIntegrator() {}
-// Constructor
+:	FirstOrderODEVariableStepIntegrator()	{}
+//	Constructor
 SA::EulerIntegrator::EulerIntegrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEVariableStepIntegrator(h, N, in_vars, out_vars, dfunc, udata) {}
-// Constructor
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEVariableStepIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{}
+//	Constructor
 SA::EulerIntegrator::EulerIntegrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: EulerIntegrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::EulerIntegrator::EulerIntegrator(const EulerIntegrator& other)
-    : FirstOrderODEVariableStepIntegrator(other) {}
-// Assignment Operator
-SA::EulerIntegrator& SA::EulerIntegrator::operator=( const SA::EulerIntegrator& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEVariableStepIntegrator::operator=(rhs);
-    }
-    return *this;
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	EulerIntegrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::EulerIntegrator::EulerIntegrator(const	EulerIntegrator&	other)
+				:	FirstOrderODEVariableStepIntegrator(other)	{}
+//	Assignment	Operator
+SA::EulerIntegrator&	SA::EulerIntegrator::operator=(	const	SA::EulerIntegrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEVariableStepIntegrator::operator=(rhs);
+				}
+				return	*this;
 }
 //Destructor
-SA::EulerIntegrator::~EulerIntegrator() {}
+SA::EulerIntegrator::~EulerIntegrator()	{}
 
-void SA::EulerIntegrator::variable_step( double h) {
-    double derivs[state_size];
-    (*derivs_func)( X_in, inState, derivs, user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + derivs[i] * h;
-    }
-    advanceIndyVar(h);
+void	SA::EulerIntegrator::variable_step(	double	h)	{
+				double	derivs[state_size];
+				(*derivs_func)(	X_in,	inState,	derivs,	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	derivs[i]	*	h;
+				}
+				advanceIndyVar(h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const EulerIntegrator& I) {
-    os << (SA::FirstOrderODEVariableStepIntegrator)I;
-    return os;
-}
-// ------------------------------------------------------------
-// Class HeunsMethod
-// ------------------------------------------------------------
-// Default Constructor
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	EulerIntegrator&	I)	{
+				os	<<	(SA::FirstOrderODEVariableStepIntegrator)I;
+				return	os;
+}
+//	------------------------------------------------------------
+//	Class	HeunsMethod
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::HeunsMethod::HeunsMethod()
-: FirstOrderODEVariableStepIntegrator() {}
-// Constructor
+:	FirstOrderODEVariableStepIntegrator()	{}
+//	Constructor
 SA::HeunsMethod::HeunsMethod(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEVariableStepIntegrator(h, N, in_vars, out_vars, dfunc, udata) {}
-// Constructor
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEVariableStepIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{}
+//	Constructor
 SA::HeunsMethod::HeunsMethod(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: HeunsMethod(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::HeunsMethod::HeunsMethod(const HeunsMethod& other)
-    : FirstOrderODEVariableStepIntegrator(other) {}
-// Assignment Operator
-SA::HeunsMethod& SA::HeunsMethod::operator=( const SA::HeunsMethod& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEVariableStepIntegrator::operator=(rhs);
-    }
-    return *this;
-}
-// Destructor
-SA::HeunsMethod::~HeunsMethod() {}
-void SA::HeunsMethod::variable_step( double h) {
-    double wstate[state_size];
-    double derivs[2][state_size];
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	HeunsMethod(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::HeunsMethod::HeunsMethod(const	HeunsMethod&	other)
+				:	FirstOrderODEVariableStepIntegrator(other)	{}
+//	Assignment	Operator
+SA::HeunsMethod&	SA::HeunsMethod::operator=(	const	SA::HeunsMethod&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEVariableStepIntegrator::operator=(rhs);
+				}
+				return	*this;
+}
+//	Destructor
+SA::HeunsMethod::~HeunsMethod()	{}
+void	SA::HeunsMethod::variable_step(	double	h)	{
+				double	wstate[state_size];
+				double	derivs[2][state_size];
 
-    (*derivs_func)( X_in, inState, derivs[0], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[i] = inState[i] + h * derivs[0][i];
-    }
-    (*derivs_func)( X_in, wstate, derivs[1], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + (h/2) * ( derivs[0][i] +  derivs[1][i] );
-    }
-    advanceIndyVar(h);
+				(*derivs_func)(	X_in,	inState,	derivs[0],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[i]	=	inState[i]	+	h	*	derivs[0][i];
+				}
+				(*derivs_func)(	X_in,	wstate,	derivs[1],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	(h/2)	*	(	derivs[0][i]	+		derivs[1][i]	);
+				}
+				advanceIndyVar(h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const HeunsMethod& I) {
-    os << (SA::FirstOrderODEVariableStepIntegrator)I;
-    return os;
-}
-// ------------------------------------------------------------
-// Class RK2Integrator
-// ------------------------------------------------------------
-// Default Constructor
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	HeunsMethod&	I)	{
+				os	<<	(SA::FirstOrderODEVariableStepIntegrator)I;
+				return	os;
+}
+//	------------------------------------------------------------
+//	Class	RK2Integrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::RK2Integrator::RK2Integrator()
-    : FirstOrderODEVariableStepIntegrator() {}
-// Constructor
+				:	FirstOrderODEVariableStepIntegrator()	{}
+//	Constructor
 SA::RK2Integrator::RK2Integrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEVariableStepIntegrator(h, N, in_vars, out_vars, dfunc, udata) {}
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEVariableStepIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{}
 SA::RK2Integrator::RK2Integrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: RK2Integrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::RK2Integrator::RK2Integrator(const RK2Integrator& other)
-    : FirstOrderODEVariableStepIntegrator(other) {}
-// Assignment Operator
-SA::RK2Integrator& SA::RK2Integrator::operator=( const SA::RK2Integrator& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEVariableStepIntegrator::operator=(rhs);
-    }
-    return *this;
-}
-// Destructor
-SA::RK2Integrator::~RK2Integrator() {}
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	RK2Integrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::RK2Integrator::RK2Integrator(const	RK2Integrator&	other)
+				:	FirstOrderODEVariableStepIntegrator(other)	{}
+//	Assignment	Operator
+SA::RK2Integrator&	SA::RK2Integrator::operator=(	const	SA::RK2Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEVariableStepIntegrator::operator=(rhs);
+				}
+				return	*this;
+}
+//	Destructor
+SA::RK2Integrator::~RK2Integrator()	{}
 
-void SA::RK2Integrator::variable_step( double h) {
-    double wstate[state_size];
-    double derivs[2][state_size];
-    (*derivs_func)( X_in, inState, derivs[0], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[i] = inState[i] + 0.5 * h * derivs[0][i];
-    }
-    (*derivs_func)( X_in + 0.5 * h , wstate, derivs[1], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + h * derivs[1][i];
-    }
-    advanceIndyVar(h);
+void	SA::RK2Integrator::variable_step(	double	h)	{
+				double	wstate[state_size];
+				double	derivs[2][state_size];
+				(*derivs_func)(	X_in,	inState,	derivs[0],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[i]	=	inState[i]	+	0.5	*	h	*	derivs[0][i];
+				}
+				(*derivs_func)(	X_in	+	0.5	*	h	,	wstate,	derivs[1],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	h	*	derivs[1][i];
+				}
+				advanceIndyVar(h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const RK2Integrator& I) {
-    os << (SA::FirstOrderODEVariableStepIntegrator)I;
-    return os;
-}
-// ------------------------------------------------------------
-// Class RK4Integrator
-// ------------------------------------------------------------
-// Default Constructor
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	RK2Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEVariableStepIntegrator)I;
+				return	os;
+}
+//	------------------------------------------------------------
+//	Class	RK4Integrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::RK4Integrator::RK4Integrator()
-    : FirstOrderODEVariableStepIntegrator() {}
-// Constructor
+				:	FirstOrderODEVariableStepIntegrator()	{}
+//	Constructor
 SA::RK4Integrator::RK4Integrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEVariableStepIntegrator(h, N, in_vars, out_vars, dfunc, udata) {}
-// Constructor
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEVariableStepIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{}
+//	Constructor
 SA::RK4Integrator::RK4Integrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: RK4Integrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::RK4Integrator::RK4Integrator(const RK4Integrator& other)
-    : FirstOrderODEVariableStepIntegrator(other) {}
-// Assignment Operator
-SA::RK4Integrator& SA::RK4Integrator::operator=( const SA::RK4Integrator& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEVariableStepIntegrator::operator=(rhs);
-    }
-    return *this;
-}
-// Destructor
-SA::RK4Integrator::~RK4Integrator() {}
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	RK4Integrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::RK4Integrator::RK4Integrator(const	RK4Integrator&	other)
+				:	FirstOrderODEVariableStepIntegrator(other)	{}
+//	Assignment	Operator
+SA::RK4Integrator&	SA::RK4Integrator::operator=(	const	SA::RK4Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEVariableStepIntegrator::operator=(rhs);
+				}
+				return	*this;
+}
+//	Destructor
+SA::RK4Integrator::~RK4Integrator()	{}
 
-void SA::RK4Integrator::variable_step( double h) {
-    double wstate[3][state_size];
-    double derivs[4][state_size];
+void	SA::RK4Integrator::variable_step(	double	h)	{
+				double	wstate[3][state_size];
+				double	derivs[4][state_size];
 
-    (*derivs_func)( X_in, inState, derivs[0], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[0][i] = inState[i] + 0.5 * derivs[0][i] * h;
-    }
-    (*derivs_func)( X_in + 0.5 * h , wstate[0], derivs[1], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[1][i] = inState[i] + 0.5 * derivs[1][i] * h;
-    }
-    (*derivs_func)( X_in + 0.5 * h , wstate[1], derivs[2], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[2][i] = inState[i] + derivs[2][i] * h;
-    }
-    (*derivs_func)( X_in + h , wstate[2], derivs[3], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + ((1/6.0)* derivs[0][i] +
-                                 (1/3.0)* derivs[1][i] +
-                                 (1/3.0)* derivs[2][i] +
-                                 (1/6.0)* derivs[3][i]) * h;
-    }
-    advanceIndyVar(h);
+				(*derivs_func)(	X_in,	inState,	derivs[0],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[0][i]	=	inState[i]	+	0.5	*	derivs[0][i]	*	h;
+				}
+				(*derivs_func)(	X_in	+	0.5	*	h	,	wstate[0],	derivs[1],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[1][i]	=	inState[i]	+	0.5	*	derivs[1][i]	*	h;
+				}
+				(*derivs_func)(	X_in	+	0.5	*	h	,	wstate[1],	derivs[2],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[2][i]	=	inState[i]	+	derivs[2][i]	*	h;
+				}
+				(*derivs_func)(	X_in	+	h	,	wstate[2],	derivs[3],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	((1/6.0)*	derivs[0][i]	+
+																																	(1/3.0)*	derivs[1][i]	+
+																																	(1/3.0)*	derivs[2][i]	+
+																																	(1/6.0)*	derivs[3][i])	*	h;
+				}
+				advanceIndyVar(h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const RK4Integrator& I) {
-    os << (SA::FirstOrderODEVariableStepIntegrator)I;
-    return os;
-}
-// ------------------------------------------------------------
-// Class RK3_8Integrator
-// ------------------------------------------------------------
-// Default Constructor
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	RK4Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEVariableStepIntegrator)I;
+				return	os;
+}
+//	------------------------------------------------------------
+//	Class	RK3_8Integrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::RK3_8Integrator::RK3_8Integrator()
-    : FirstOrderODEVariableStepIntegrator() {}
-// Constructor
+				:	FirstOrderODEVariableStepIntegrator()	{}
+//	Constructor
 SA::RK3_8Integrator::RK3_8Integrator(
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEVariableStepIntegrator(h, N, in_vars, out_vars ,dfunc, udata) {}
-// Constructor
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEVariableStepIntegrator(h,	N,	in_vars,	out_vars	,dfunc,	udata)	{}
+//	Constructor
 SA::RK3_8Integrator::RK3_8Integrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: RK3_8Integrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::RK3_8Integrator::RK3_8Integrator(const RK3_8Integrator& other)
-    : FirstOrderODEVariableStepIntegrator(other) {}
-// Assignment Operator
-SA::RK3_8Integrator& SA::RK3_8Integrator::operator=( const SA::RK3_8Integrator& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEVariableStepIntegrator::operator=(rhs);
-    }
-    return *this;
-}
-// Destructor
-SA::RK3_8Integrator::~RK3_8Integrator() {}
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	RK3_8Integrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::RK3_8Integrator::RK3_8Integrator(const	RK3_8Integrator&	other)
+				:	FirstOrderODEVariableStepIntegrator(other)	{}
+//	Assignment	Operator
+SA::RK3_8Integrator&	SA::RK3_8Integrator::operator=(	const	SA::RK3_8Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEVariableStepIntegrator::operator=(rhs);
+				}
+				return	*this;
+}
+//	Destructor
+SA::RK3_8Integrator::~RK3_8Integrator()	{}
 
-void SA::RK3_8Integrator::variable_step( double h) {
-    double wstate[3][state_size];
-    double derivs[4][state_size];
+void	SA::RK3_8Integrator::variable_step(	double	h)	{
+				double	wstate[3][state_size];
+				double	derivs[4][state_size];
 
-    (*derivs_func)( X_in, inState, derivs[0], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[0][i] = inState[i] + h * (1/3.0) * derivs[0][i];
-    }
-    (*derivs_func)( X_in + (1/3.0) * h , wstate[0], derivs[1], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[1][i] = inState[i] + h * ((-1/3.0) * derivs[0][i] + derivs[1][i]);
-    }
-    (*derivs_func)( X_in + (2/3.0) * h , wstate[1], derivs[2], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        wstate[2][i] = inState[i] + h * (derivs[0][i] - derivs[1][i] + derivs[2][i]);
-    }
-    (*derivs_func)( X_in + h , wstate[2], derivs[3], user_data);
-    for (unsigned int i=0; i<state_size; i++) {
-        outState[i] = inState[i] + ((1/8.0)* derivs[0][i] +
-                                 (3/8.0)* derivs[1][i] +
-                                 (3/8.0)* derivs[2][i] +
-                                 (1/8.0)* derivs[3][i]) * h;
-    }
-    advanceIndyVar(h);
+				(*derivs_func)(	X_in,	inState,	derivs[0],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[0][i]	=	inState[i]	+	h	*	(1/3.0)	*	derivs[0][i];
+				}
+				(*derivs_func)(	X_in	+	(1/3.0)	*	h	,	wstate[0],	derivs[1],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[1][i]	=	inState[i]	+	h	*	((-1/3.0)	*	derivs[0][i]	+	derivs[1][i]);
+				}
+				(*derivs_func)(	X_in	+	(2/3.0)	*	h	,	wstate[1],	derivs[2],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								wstate[2][i]	=	inState[i]	+	h	*	(derivs[0][i]	-	derivs[1][i]	+	derivs[2][i]);
+				}
+				(*derivs_func)(	X_in	+	h	,	wstate[2],	derivs[3],	user_data);
+				for	(unsigned	int	i=0;	i<state_size;	i++)	{
+								outState[i]	=	inState[i]	+	((1/8.0)*	derivs[0][i]	+
+																																	(3/8.0)*	derivs[1][i]	+
+																																	(3/8.0)*	derivs[2][i]	+
+																																	(1/8.0)*	derivs[3][i])	*	h;
+				}
+				advanceIndyVar(h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const RK3_8Integrator& I) {
-    os << (SA::FirstOrderODEVariableStepIntegrator)I;
-    return os;
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	RK3_8Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEVariableStepIntegrator)I;
+				return	os;
 }
 
-// ------------------------------------------------------------
-// Class RKF45Integrator
-// ------------------------------------------------------------
-// Default Constructor
-SA::RKF45Integrator::RKF45Integrator() : FirstOrderODEIntegrator() {
-    epsilon = 0.00000000001;
-    next_h = default_h;
-}
-// Constructor
-SA::RKF45Integrator::RKF45Integrator(double eps,
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEIntegrator(h, N, in_vars, out_vars, dfunc, udata) {
-        epsilon = eps;
-        next_h = h;
-    }
-// Constructor
-SA::RKF45Integrator::RKF45Integrator(double eps,
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: RKF45Integrator(eps, h, N, in_out_vars, in_out_vars, dfunc, udata) {}
-// Copy Constructor
-SA::RKF45Integrator::RKF45Integrator(const RKF45Integrator& other)
-    : FirstOrderODEIntegrator(other) {
-        epsilon = other.epsilon;
-        next_h = other.next_h;
-    }
-// Assignment Operator
-SA::RKF45Integrator& SA::RKF45Integrator::operator=( const SA::RKF45Integrator& rhs) {
-    if (this != &rhs) {
-        FirstOrderODEIntegrator::operator=(rhs);
-    }
-    epsilon = rhs.epsilon;
-    next_h  = rhs.next_h;
-    return *this;
-}
-// Destructor
-SA::RKF45Integrator::~RKF45Integrator() {}
+//	------------------------------------------------------------
+//	Class	RKF45Integrator
+//	------------------------------------------------------------
+//	Default	Constructor
+SA::RKF45Integrator::RKF45Integrator()	:	FirstOrderODEIntegrator()	{
+				epsilon	=	0.00000000001;
+				next_h	=	default_h;
+}
+//	Constructor
+SA::RKF45Integrator::RKF45Integrator(double	eps,
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{
+								epsilon	=	eps;
+								next_h	=	h;
+				}
+//	Constructor
+SA::RKF45Integrator::RKF45Integrator(double	eps,
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	RKF45Integrator(eps,	h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
+//	Copy	Constructor
+SA::RKF45Integrator::RKF45Integrator(const	RKF45Integrator&	other)
+				:	FirstOrderODEIntegrator(other)	{
+								epsilon	=	other.epsilon;
+								next_h	=	other.next_h;
+				}
+//	Assignment	Operator
+SA::RKF45Integrator&	SA::RKF45Integrator::operator=(	const	SA::RKF45Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								FirstOrderODEIntegrator::operator=(rhs);
+				}
+				epsilon	=	rhs.epsilon;
+				next_h		=	rhs.next_h;
+				return	*this;
+}
+//	Destructor
+SA::RKF45Integrator::~RKF45Integrator()	{}
 
-void SA::RKF45Integrator::advanceIndyVar(double h) {
-    last_h = h; X_out = X_in + h;
+void	SA::RKF45Integrator::advanceIndyVar(double	h)	{
+				last_h	=	h;	X_out	=	X_in	+	h;
 }
-void SA::RKF45Integrator::step() {
-    adaptive_step( next_h );
+void	SA::RKF45Integrator::step()	{
+				adaptive_step(	next_h	);
 }
 
-double SA::RKF45Integrator::getLastStepSize() {return last_h;}
+double	SA::RKF45Integrator::getLastStepSize()	{return	last_h;}
 
-double SA::RKF45Integrator::adaptive_step(double h) {
-    double wstate[5][state_size];
-    double derivs[6][state_size];
-    double w2[state_size];
-    double R;
-    do {
+double	SA::RKF45Integrator::adaptive_step(double	h)	{
+				double	wstate[5][state_size];
+				double	derivs[6][state_size];
+				double	w2[state_size];
+				double	R;
+				do	{
 
-        (*derivs_func)( X_in, inState, derivs[0], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            wstate[0][i] = inState[i] + h * (1/4.0) * derivs[0][i];
-        }
-        (*derivs_func)( X_in + (1/4.0) * h , wstate[0], derivs[1], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            wstate[1][i] = inState[i] + h * ((3/32.0)*derivs[0][i] +
-                                             (9/32.0)*derivs[1][i]);
-        }
-        (*derivs_func)( X_in + (3/8.0) * h , wstate[1], derivs[2], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            wstate[2][i] = inState[i] + h * (( 1932/2197.0) * derivs[0][i] +
-                                             (-7200/2197.0) * derivs[1][i] +
-                                             ( 7296/2197.0) * derivs[2][i]);
-        }
-        (*derivs_func)( X_in + (12/13.0) * h , wstate[2], derivs[3], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            wstate[3][i] = inState[i] + h * (( 439/216.0)  * derivs[0][i] +
-                                             (-8.0)        * derivs[1][i] +
-                                             ( 3680/513.0) * derivs[2][i] +
-                                             (-845/4104.0) * derivs[3][i]);
-        }
-        (*derivs_func)( X_in + h , wstate[3], derivs[4], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            wstate[4][i] = inState[i] + h * ((-8/27.0) * derivs[0][i] +
-                                             ( 2.0) * derivs[1][i] +
-                                             (-3544/2565.0) * derivs[2][i] +
-                                             ( 1859/4104.0) * derivs[3][i] +
-                                             (-11/40.0) * derivs[4][i]);
-        }
-        (*derivs_func)( X_in + (1/2.0)* h , wstate[4], derivs[5], user_data);
-        for (unsigned int i=0; i<state_size; i++) {
-            outState[i] = inState[i] + ((25/216.0) * derivs[0][i] +
-                                 (1408/2565.0) * derivs[2][i] +
-                                 (2197/4104.0) * derivs[3][i] +
-                                 (-1/5.0) * derivs[4][i]) * h;
-        }
-        for (unsigned int i=0; i<state_size; i++) {
-            w2[i] = inState[i] + (( 16/135.0) * derivs[0][i] +
-                                  ( 6656/12825.0) * derivs[2][i] +
-                                  ( 28561/56430.0) * derivs[3][i] +
-                                  (-9/50.0) * derivs[4][i] +
-                                  ( 2/55.0) * derivs[5][i]) * h;
-        }
-        last_h = h;
-        R = 0.0;
-        for (unsigned int i=0; i<state_size; i++) {
-            double RI = fabs(outState[i] - w2[i]) / h;
-            if (RI>R) R = RI;
-        }
-        if (R == 0.0) {
-            next_h = default_h;
-        } else {
-            double delta = 0.84 * pow((epsilon/R), 0.25);
-            next_h = delta * h;
-            if (next_h > default_h)
-                next_h = default_h;
-        }
-        h = next_h;
-    } while (R > epsilon);
+								(*derivs_func)(	X_in,	inState,	derivs[0],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												wstate[0][i]	=	inState[i]	+	h	*	(1/4.0)	*	derivs[0][i];
+								}
+								(*derivs_func)(	X_in	+	(1/4.0)	*	h	,	wstate[0],	derivs[1],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												wstate[1][i]	=	inState[i]	+	h	*	((3/32.0)*derivs[0][i]	+
+																																													(9/32.0)*derivs[1][i]);
+								}
+								(*derivs_func)(	X_in	+	(3/8.0)	*	h	,	wstate[1],	derivs[2],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												wstate[2][i]	=	inState[i]	+	h	*	((	1932/2197.0)	*	derivs[0][i]	+
+																																													(-7200/2197.0)	*	derivs[1][i]	+
+																																													(	7296/2197.0)	*	derivs[2][i]);
+								}
+								(*derivs_func)(	X_in	+	(12/13.0)	*	h	,	wstate[2],	derivs[3],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												wstate[3][i]	=	inState[i]	+	h	*	((	439/216.0)		*	derivs[0][i]	+
+																																													(-8.0)								*	derivs[1][i]	+
+																																													(	3680/513.0)	*	derivs[2][i]	+
+																																													(-845/4104.0)	*	derivs[3][i]);
+								}
+								(*derivs_func)(	X_in	+	h	,	wstate[3],	derivs[4],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												wstate[4][i]	=	inState[i]	+	h	*	((-8/27.0)	*	derivs[0][i]	+
+																																													(	2.0)	*	derivs[1][i]	+
+																																													(-3544/2565.0)	*	derivs[2][i]	+
+																																													(	1859/4104.0)	*	derivs[3][i]	+
+																																													(-11/40.0)	*	derivs[4][i]);
+								}
+								(*derivs_func)(	X_in	+	(1/2.0)*	h	,	wstate[4],	derivs[5],	user_data);
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												outState[i]	=	inState[i]	+	((25/216.0)	*	derivs[0][i]	+
+																																	(1408/2565.0)	*	derivs[2][i]	+
+																																	(2197/4104.0)	*	derivs[3][i]	+
+																																	(-1/5.0)	*	derivs[4][i])	*	h;
+								}
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												w2[i]	=	inState[i]	+	((	16/135.0)	*	derivs[0][i]	+
+																																		(	6656/12825.0)	*	derivs[2][i]	+
+																																		(	28561/56430.0)	*	derivs[3][i]	+
+																																		(-9/50.0)	*	derivs[4][i]	+
+																																		(	2/55.0)	*	derivs[5][i])	*	h;
+								}
+								last_h	=	h;
+								R	=	0.0;
+								for	(unsigned	int	i=0;	i<state_size;	i++)	{
+												double	RI	=	fabs(outState[i]	-	w2[i])	/	h;
+												if	(RI>R)	R	=	RI;
+								}
+								if	(R	==	0.0)	{
+												next_h	=	default_h;
+								}	else	{
+												double	delta	=	0.84	*	pow((epsilon/R),	0.25);
+												next_h	=	delta	*	h;
+												if	(next_h	>	default_h)
+																next_h	=	default_h;
+								}
+								h	=	next_h;
+				}	while	(R	>	epsilon);
 
-    advanceIndyVar(last_h);
-    return (next_h);
+				advanceIndyVar(last_h);
+				return	(next_h);
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const RKF45Integrator& I) {
-    os << (SA::FirstOrderODEIntegrator)I;
-    os << "\nepsilon: " << I.epsilon;
-    os << "\nnext_h: " << I.next_h;
-    return os;
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	RKF45Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEIntegrator)I;
+				os	<<	"\nepsilon:	"	<<	I.epsilon;
+				os	<<	"\nnext_h:	"	<<	I.next_h;
+				return	os;
 }
 
-// ------------------------------------------------------------
-// Class EulerCromerIntegrator
-// ------------------------------------------------------------
-// Default Constructor
+//	------------------------------------------------------------
+//	Class	EulerCromerIntegrator
+//	------------------------------------------------------------
+//	Default	Constructor
 SA::EulerCromerIntegrator::EulerCromerIntegrator()
-    :Integrator() {
-    nDimensions  = 1;
-    last_h = 0.0;
-    pos_p = NULL;
-    pos_in  = new double[nDimensions];
-    pos_out = new double[nDimensions];
-    vel_p = NULL;
-    vel_in  = new double[nDimensions];
-    vel_out = new double[nDimensions];
-    g_out   = new double[nDimensions];
-    gderivs = nil_gfunc;
-}
-// Constructor
+				:Integrator()	{
+				nDimensions		=	1;
+				last_h	=	0.0;
+				pos_p	=	NULL;
+				pos_in		=	new	double[nDimensions];
+				pos_out	=	new	double[nDimensions];
+				vel_p	=	NULL;
+				vel_in		=	new	double[nDimensions];
+				vel_out	=	new	double[nDimensions];
+				g_out			=	new	double[nDimensions];
+				gderivs	=	nil_gfunc;
+}
+//	Constructor
 SA::EulerCromerIntegrator::EulerCromerIntegrator(
-    double dt, unsigned int N, double* xp[], double* vp[], Derivs2Func gfunc, void* udata)
-    :Integrator(dt, udata) {
-    nDimensions  = N;
-    last_h = 0.0;
-    pos_p = xp;
-    pos_in  = new double[N];
-    pos_out = new double[N];
-    vel_p = vp;
-    vel_in  = new double[N];
-    vel_out = new double[N];
-    g_out   = new double[N];
-    gderivs = gfunc;
-}
-// Copy Constructor
-SA::EulerCromerIntegrator::EulerCromerIntegrator(const EulerCromerIntegrator& other)
-: Integrator(other.default_h, other.user_data) {
-    nDimensions = other.nDimensions;
-    last_h = other.last_h;
-    pos_p = other.pos_p;
-    pos_in = new double[nDimensions];
-    std::copy( other.pos_in, other.pos_in + nDimensions, pos_in);
-    pos_out = new double[nDimensions];
-    std::copy( other.pos_out, other.pos_out + nDimensions, pos_out);
-    vel_p = other.vel_p;
-    std::copy( other.vel_p, other.vel_p + nDimensions, vel_p);
-    vel_in = new double[nDimensions];
-    std::copy( other.vel_in, other.vel_in + nDimensions, vel_in);
-    vel_out = new double[nDimensions];
-    std::copy( other.vel_out, other.vel_out + nDimensions, vel_out);
-    g_out = new double[nDimensions];
-    std::copy( other.g_out, other.g_out + nDimensions, g_out);
-    gderivs = other.gderivs;
-}
-// Assignment Operator
-SA::EulerCromerIntegrator& SA::EulerCromerIntegrator::operator=( const SA::EulerCromerIntegrator& rhs) {
-    if (this != &rhs) {
-        // Call base assignment operator
-        Integrator::operator=(rhs);
-        // Duplicate the rhs arrays
-        double* new_pos_in  = new double[rhs.nDimensions];
-        std::copy( rhs.pos_in, rhs.pos_in + rhs.nDimensions, new_pos_in);
-        double* new_pos_out = new double[rhs.nDimensions];
-        std::copy( rhs.pos_out, rhs.pos_out + rhs.nDimensions, new_pos_out);
-        double* new_vel_in  = new double[rhs.nDimensions];
-        std::copy( rhs.vel_in, rhs.vel_in + rhs.nDimensions, new_vel_in);
-        double* new_vel_out = new double[rhs.nDimensions];
-        std::copy( rhs.vel_out, rhs.vel_out + rhs.nDimensions, new_vel_out);
-        double* new_g_out = new double[rhs.nDimensions];
-        std::copy( rhs.g_out, rhs.g_out + rhs.nDimensions, new_g_out);
-        // Delete lhs arrays & replace with rhs arrays
-        if (pos_in != NULL) delete pos_in;
-        pos_in = new_pos_in;
-        if (pos_out != NULL) delete pos_out;
-        pos_out = new_pos_out;
-        if (vel_in != NULL) delete vel_in;
-        vel_in = new_vel_in;
-        if (vel_out != NULL) delete vel_out;
-        vel_out = new_vel_out;
-        if (g_out != NULL) delete g_out;
-        g_out = new_g_out;
-        // Copy primitive members
-        last_h = rhs.last_h;
-        pos_p = rhs.pos_p;
-        vel_p = rhs.vel_p;
-        nDimensions = rhs.nDimensions;
-        gderivs = rhs.gderivs;
-    }
-    return *this;
-}
-// Destructor
-SA::EulerCromerIntegrator::~EulerCromerIntegrator() {
-    if (pos_in != NULL)  delete pos_in;
-    if (pos_out != NULL) delete pos_out;
-    if (vel_in != NULL)  delete vel_in;
-    if (vel_out != NULL) delete vel_out;
-    if (g_out != NULL)   delete g_out;
-}
-void SA::EulerCromerIntegrator::advanceIndyVar(double h) {
-    last_h = h; X_out = X_in + h;
-}
-void SA::EulerCromerIntegrator::step( double dt) {
-    (*gderivs)( X_in, pos_in, vel_in, g_out, user_data);
-    for (int i=0 ; i<nDimensions; i++ ) {
-        vel_out[i] = vel_in[i] + g_out[i] * dt;
-        pos_out[i] = pos_in[i] + vel_out[i] * dt;
-    }
-    advanceIndyVar(dt);
-}
-void SA::EulerCromerIntegrator::step() {
-    step(default_h);
-}
-void SA::EulerCromerIntegrator::load() {
-    if ((pos_in != NULL) && (vel_in != NULL)) {
-        for (int i=0 ; i<nDimensions; i++ ) {
-            pos_in[i] = *(pos_p[i]);
-            vel_in[i] = *(vel_p[i]);
-        }
-        Integrator::load();
-    } else {
-        std::cerr << "Error: SA::EulerCromerIntegrator::load(). Input variable pointers (pos_in, vel_in) aren't set." << std::endl;
-    }
-}
-void SA::EulerCromerIntegrator::unload(){
-    if ((pos_in != NULL) && (vel_in != NULL)) {
-        for (int i=0 ; i<nDimensions; i++ ) {
-            *(pos_p[i]) = pos_out[i];
-            *(vel_p[i]) = vel_out[i];
-        }
-    } else {
-        std::cerr << "Error: SA::EulerCromerIntegrator::load(). Input variable pointers (pos_in, vel_in) aren't set." << std::endl;
-    }
-}
-double SA::EulerCromerIntegrator::undo_integrate() {
-    if ((pos_in != NULL) && (vel_in != NULL)) {
-        for (unsigned int i=0 ; i<nDimensions; i++ ) {
-            *(pos_p[i]) = pos_in[i];
-            *(vel_p[i]) = vel_in[i];
-        }
-        std::copy(pos_in, pos_in + nDimensions, pos_out);
-        std::copy(vel_in, vel_in + nDimensions, vel_out);
-        return (SA::Integrator::undo_integrate());
-    } else {
-        std::cerr << "Error: SA::EulerCromerIntegrator::undo_integrate(). Input variable pointers (pos_in, vel_in) aren't set." << std::endl;
-    }
-    return (last_h);
-}
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const EulerCromerIntegrator& I) {
-    os << (SA::Integrator)I;
-    os << "\n--- EulerCromerIntegrator ---";
-    os << "\nnDimensions : " << I.nDimensions;
-    os << "\nlast_h      : " << I.last_h;
-    os << "\npos_p       :" << I.pos_p;
-    os << "\nvel_p       :" << I.vel_p;
-    os << "\npos_in    :";
-    stream_double_array(os, I.nDimensions, I.pos_in);
-    os << "\npos_out    :";
-    stream_double_array(os, I.nDimensions, I.pos_out);
-    os << "\nvel_in    :";
-    stream_double_array(os, I.nDimensions, I.vel_in);
-    os << "\nvel_out    :";
-    stream_double_array(os, I.nDimensions, I.vel_out);
-    os << "\ng_out    :";
-    stream_double_array(os, I.nDimensions, I.g_out);
-    return os;
+				double	dt,	unsigned	int	N,	double*	xp[],	double*	vp[],	Derivs2Func	gfunc,	void*	udata)
+				:Integrator(dt,	udata)	{
+				nDimensions		=	N;
+				last_h	=	0.0;
+				pos_p	=	xp;
+				pos_in		=	new	double[N];
+				pos_out	=	new	double[N];
+				vel_p	=	vp;
+				vel_in		=	new	double[N];
+				vel_out	=	new	double[N];
+				g_out			=	new	double[N];
+				gderivs	=	gfunc;
+}
+//	Copy	Constructor
+SA::EulerCromerIntegrator::EulerCromerIntegrator(const	EulerCromerIntegrator&	other)
+:	Integrator(other.default_h,	other.user_data)	{
+				nDimensions	=	other.nDimensions;
+				last_h	=	other.last_h;
+				pos_p	=	other.pos_p;
+				pos_in	=	new	double[nDimensions];
+				std::copy(	other.pos_in,	other.pos_in	+	nDimensions,	pos_in);
+				pos_out	=	new	double[nDimensions];
+				std::copy(	other.pos_out,	other.pos_out	+	nDimensions,	pos_out);
+				vel_p	=	other.vel_p;
+				std::copy(	other.vel_p,	other.vel_p	+	nDimensions,	vel_p);
+				vel_in	=	new	double[nDimensions];
+				std::copy(	other.vel_in,	other.vel_in	+	nDimensions,	vel_in);
+				vel_out	=	new	double[nDimensions];
+				std::copy(	other.vel_out,	other.vel_out	+	nDimensions,	vel_out);
+				g_out	=	new	double[nDimensions];
+				std::copy(	other.g_out,	other.g_out	+	nDimensions,	g_out);
+				gderivs	=	other.gderivs;
+}
+//	Assignment	Operator
+SA::EulerCromerIntegrator&	SA::EulerCromerIntegrator::operator=(	const	SA::EulerCromerIntegrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								//	Call	base	assignment	operator
+								Integrator::operator=(rhs);
+								//	Duplicate	the	rhs	arrays
+								double*	new_pos_in		=	new	double[rhs.nDimensions];
+								std::copy(	rhs.pos_in,	rhs.pos_in	+	rhs.nDimensions,	new_pos_in);
+								double*	new_pos_out	=	new	double[rhs.nDimensions];
+								std::copy(	rhs.pos_out,	rhs.pos_out	+	rhs.nDimensions,	new_pos_out);
+								double*	new_vel_in		=	new	double[rhs.nDimensions];
+								std::copy(	rhs.vel_in,	rhs.vel_in	+	rhs.nDimensions,	new_vel_in);
+								double*	new_vel_out	=	new	double[rhs.nDimensions];
+								std::copy(	rhs.vel_out,	rhs.vel_out	+	rhs.nDimensions,	new_vel_out);
+								double*	new_g_out	=	new	double[rhs.nDimensions];
+								std::copy(	rhs.g_out,	rhs.g_out	+	rhs.nDimensions,	new_g_out);
+								//	Delete	lhs	arrays	&	replace	with	rhs	arrays
+								if	(pos_in	!=	NULL)	delete	pos_in;
+								pos_in	=	new_pos_in;
+								if	(pos_out	!=	NULL)	delete	pos_out;
+								pos_out	=	new_pos_out;
+								if	(vel_in	!=	NULL)	delete	vel_in;
+								vel_in	=	new_vel_in;
+								if	(vel_out	!=	NULL)	delete	vel_out;
+								vel_out	=	new_vel_out;
+								if	(g_out	!=	NULL)	delete	g_out;
+								g_out	=	new_g_out;
+								//	Copy	primitive	members
+								last_h	=	rhs.last_h;
+								pos_p	=	rhs.pos_p;
+								vel_p	=	rhs.vel_p;
+								nDimensions	=	rhs.nDimensions;
+								gderivs	=	rhs.gderivs;
+				}
+				return	*this;
+}
+//	Destructor
+SA::EulerCromerIntegrator::~EulerCromerIntegrator()	{
+				if	(pos_in	!=	NULL)		delete	pos_in;
+				if	(pos_out	!=	NULL)	delete	pos_out;
+				if	(vel_in	!=	NULL)		delete	vel_in;
+				if	(vel_out	!=	NULL)	delete	vel_out;
+				if	(g_out	!=	NULL)			delete	g_out;
+}
+void	SA::EulerCromerIntegrator::advanceIndyVar(double	h)	{
+				last_h	=	h;	X_out	=	X_in	+	h;
+}
+void	SA::EulerCromerIntegrator::step(	double	dt)	{
+				(*gderivs)(	X_in,	pos_in,	vel_in,	g_out,	user_data);
+				for	(int	i=0	;	i<nDimensions;	i++	)	{
+								vel_out[i]	=	vel_in[i]	+	g_out[i]	*	dt;
+								pos_out[i]	=	pos_in[i]	+	vel_out[i]	*	dt;
+				}
+				advanceIndyVar(dt);
+}
+void	SA::EulerCromerIntegrator::step()	{
+				step(default_h);
+}
+void	SA::EulerCromerIntegrator::load()	{
+				if	((pos_in	!=	NULL)	&&	(vel_in	!=	NULL))	{
+								for	(int	i=0	;	i<nDimensions;	i++	)	{
+												pos_in[i]	=	*(pos_p[i]);
+												vel_in[i]	=	*(vel_p[i]);
+								}
+								Integrator::load();
+				}	else	{
+								std::cerr	<<	"Error:	SA::EulerCromerIntegrator::load().	Input	variable	pointers	(pos_in,	vel_in)	aren't	set."	<<	std::endl;
+				}
+}
+void	SA::EulerCromerIntegrator::unload(){
+				if	((pos_in	!=	NULL)	&&	(vel_in	!=	NULL))	{
+								for	(int	i=0	;	i<nDimensions;	i++	)	{
+												*(pos_p[i])	=	pos_out[i];
+												*(vel_p[i])	=	vel_out[i];
+								}
+				}	else	{
+								std::cerr	<<	"Error:	SA::EulerCromerIntegrator::load().	Input	variable	pointers	(pos_in,	vel_in)	aren't	set."	<<	std::endl;
+				}
+}
+double	SA::EulerCromerIntegrator::undo_integrate()	{
+				if	((pos_in	!=	NULL)	&&	(vel_in	!=	NULL))	{
+								for	(unsigned	int	i=0	;	i<nDimensions;	i++	)	{
+												*(pos_p[i])	=	pos_in[i];
+												*(vel_p[i])	=	vel_in[i];
+								}
+								std::copy(pos_in,	pos_in	+	nDimensions,	pos_out);
+								std::copy(vel_in,	vel_in	+	nDimensions,	vel_out);
+								return	(SA::Integrator::undo_integrate());
+				}	else	{
+								std::cerr	<<	"Error:	SA::EulerCromerIntegrator::undo_integrate().	Input	variable	pointers	(pos_in,	vel_in)	aren't	set."	<<	std::endl;
+				}
+				return	(last_h);
+}
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	EulerCromerIntegrator&	I)	{
+				os	<<	(SA::Integrator)I;
+				os	<<	"\n---	EulerCromerIntegrator	---";
+				os	<<	"\nnDimensions	:	"	<<	I.nDimensions;
+				os	<<	"\nlast_h						:	"	<<	I.last_h;
+				os	<<	"\npos_p							:"	<<	I.pos_p;
+				os	<<	"\nvel_p							:"	<<	I.vel_p;
+				os	<<	"\npos_in				:";
+				stream_double_array(os,	I.nDimensions,	I.pos_in);
+				os	<<	"\npos_out				:";
+				stream_double_array(os,	I.nDimensions,	I.pos_out);
+				os	<<	"\nvel_in				:";
+				stream_double_array(os,	I.nDimensions,	I.vel_in);
+				os	<<	"\nvel_out				:";
+				stream_double_array(os,	I.nDimensions,	I.vel_out);
+				os	<<	"\ng_out				:";
+				stream_double_array(os,	I.nDimensions,	I.g_out);
+				return	os;
 }
 
-// ------------------------------------------------------------
-// Class ABMIntegrator
-// ------------------------------------------------------------
-// // Adams-Bashforth Coefficients
-static const double ABCoeffs[5][5] = {
-  {1.0,           0.0,           0.0,          0.0,           0.0},
-  {(3/2.0),      (-1/2.0),       0.0,          0.0,           0.0},
-  {(23/12.0),    (-16/12.0),    (5/12.0),      0.0,           0.0},
-  {(55/24.0),    (-59/24.0),    (37/24.0),    (-9/24.0),      0.0},
-  {(1901/720.0), (-2774/720.0), (2616/720.0), (-1274/720.0), (251/720.0)}
+//	------------------------------------------------------------
+//	Class	ABMIntegrator
+//	------------------------------------------------------------
+//	//	Adams-Bashforth	Coefficients
+static	const	double	ABCoeffs[5][5]	=	{
+		{1.0,											0.0,											0.0,										0.0,											0.0},
+		{(3/2.0),						(-1/2.0),							0.0,										0.0,											0.0},
+		{(23/12.0),				(-16/12.0),				(5/12.0),						0.0,											0.0},
+		{(55/24.0),				(-59/24.0),				(37/24.0),				(-9/24.0),						0.0},
+		{(1901/720.0),	(-2774/720.0),	(2616/720.0),	(-1274/720.0),	(251/720.0)}
 };
 //
-// // Adams-Moulton Coefficients
-static const double AMCoeffs[5][5] = {
-  {1.0,          0.0,         0.0,          0.0,         0.0},
-  {(1/2.0),     (1/2.0),      0.0,          0.0,         0.0},
-  {(5/12.0),    (8/12.0),    (-1/12.0),     0.0,         0.0},
-  {(9/24.0),    (19/24.0),   (-5/24.0),    (1/24.0),     0.0},
-  {(251/720.0), (646/720.0), (-264/720.0), (106/720.0), (-19/720.0)}
+//	//	Adams-Moulton	Coefficients
+static	const	double	AMCoeffs[5][5]	=	{
+		{1.0,										0.0,									0.0,										0.0,									0.0},
+		{(1/2.0),					(1/2.0),						0.0,										0.0,									0.0},
+		{(5/12.0),				(8/12.0),				(-1/12.0),					0.0,									0.0},
+		{(9/24.0),				(19/24.0),			(-5/24.0),				(1/24.0),					0.0},
+		{(251/720.0),	(646/720.0),	(-264/720.0),	(106/720.0),	(-19/720.0)}
 };
 
-// Default Constructor
+//	Default	Constructor
 
-// Constructor
-SA::ABMIntegrator::ABMIntegrator ( unsigned int history_size, double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc func, void* udata)
-    : FirstOrderODEIntegrator(h, N, in_vars, out_vars ,func, udata) {
-    if ((history_size < 1) || (history_size > 5)) {
-        throw std::invalid_argument("history_size must be in the range [1..5].");
-    }
-    algorithmHistorySize=history_size; // The amount of history that we intend to use in this ABM integrator.
-    bufferSize=algorithmHistorySize+1; // The size of the buffer needs to be one more than the history so that an integration step can be reset.
-    hix=0;
-    currentHistorySize=0;              // How much derivative history is currently stored int the history buffer. Initially there will be none until we've primed the integrator.
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-    }
-    composite_deriv = new double[state_size];
-}
-// Constructor
+//	Constructor
+SA::ABMIntegrator::ABMIntegrator	(	unsigned	int	history_size,	double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	func,	void*	udata)
+				:	FirstOrderODEIntegrator(h,	N,	in_vars,	out_vars	,func,	udata)	{
+				if	((history_size	<	1)	||	(history_size	>	5))	{
+								throw	std::invalid_argument("history_size	must	be	in	the	range	[1..5].");
+				}
+				algorithmHistorySize=history_size;	//	The	amount	of	history	that	we	intend	to	use	in	this	ABM	integrator.
+				bufferSize=algorithmHistorySize+1;	//	The	size	of	the	buffer	needs	to	be	one	more	than	the	history	so	that	an	integration	step	can	be	reset.
+				hix=0;
+				currentHistorySize=0;														//	How	much	derivative	history	is	currently	stored	int	the	history	buffer.	Initially	there	will	be	none	until	we've	primed	the	integrator.
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+				}
+				composite_deriv	=	new	double[state_size];
+}
+//	Constructor
 SA::ABMIntegrator::ABMIntegrator(
-unsigned int history_size, double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: ABMIntegrator(history_size, h, N, in_out_vars, in_out_vars, dfunc, udata) {}
+unsigned	int	history_size,	double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	ABMIntegrator(history_size,	h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
 
-// Copy Constructor
-SA::ABMIntegrator::ABMIntegrator(const ABMIntegrator& other)
-: FirstOrderODEIntegrator(other) {
-    bufferSize = other.bufferSize;
-    algorithmHistorySize = other.algorithmHistorySize;
-    hix = other.hix;
-    currentHistorySize = other.currentHistorySize;
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-        std::copy(other.deriv_history[i], other.deriv_history[i]+state_size, deriv_history[i]);
-    }
-    composite_deriv = new double[state_size];
-    std::copy(other.composite_deriv, other.composite_deriv+state_size, composite_deriv);
-}
-// Assignment Operator
-SA::ABMIntegrator& SA::ABMIntegrator::operator=( const SA::ABMIntegrator& rhs) {
-    if (this != &rhs) {
-        // Call base assignment operator
-        FirstOrderODEIntegrator::operator=(rhs);
-        // Duplicate rhs arrays
-        double** new_deriv_history = new double*[rhs.bufferSize];
-        for (unsigned int i=0 ; i<rhs.bufferSize; i++ ) {
-            new_deriv_history[i] = new double[rhs.state_size];
-            std::copy(rhs.deriv_history[i], rhs.deriv_history[i] + rhs.state_size, new_deriv_history[i]);
-        }
-        double* new_composite_deriv = new double[rhs.state_size];
-        std::copy(rhs.composite_deriv, rhs.composite_deriv+rhs.state_size, new_composite_deriv);
-        // Delete lhs arrays & replace with rhs arrays
-        for (unsigned int i=0 ; i<bufferSize; i++ ) {
-            delete deriv_history[i];
-        }
-        delete deriv_history;
-        deriv_history = new_deriv_history;
-        delete composite_deriv;
-        composite_deriv = new_composite_deriv;
-        // Copy primitive members
-        bufferSize = rhs.bufferSize;
-        algorithmHistorySize = rhs.algorithmHistorySize;
-        hix = rhs.hix;
-        currentHistorySize = rhs.currentHistorySize;
-    }
-    return *this;
-}
-// Destructor
-SA::ABMIntegrator::~ABMIntegrator() {
-    for (int i=0; i<bufferSize ; i++) {
-        delete (deriv_history[i]);
-    }
-    delete(deriv_history);
-    delete(composite_deriv);
-}
-void SA::ABMIntegrator::step() {
+//	Copy	Constructor
+SA::ABMIntegrator::ABMIntegrator(const	ABMIntegrator&	other)
+:	FirstOrderODEIntegrator(other)	{
+				bufferSize	=	other.bufferSize;
+				algorithmHistorySize	=	other.algorithmHistorySize;
+				hix	=	other.hix;
+				currentHistorySize	=	other.currentHistorySize;
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+								std::copy(other.deriv_history[i],	other.deriv_history[i]+state_size,	deriv_history[i]);
+				}
+				composite_deriv	=	new	double[state_size];
+				std::copy(other.composite_deriv,	other.composite_deriv+state_size,	composite_deriv);
+}
+//	Assignment	Operator
+SA::ABMIntegrator&	SA::ABMIntegrator::operator=(	const	SA::ABMIntegrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								//	Call	base	assignment	operator
+								FirstOrderODEIntegrator::operator=(rhs);
+								//	Duplicate	rhs	arrays
+								double**	new_deriv_history	=	new	double*[rhs.bufferSize];
+								for	(unsigned	int	i=0	;	i<rhs.bufferSize;	i++	)	{
+												new_deriv_history[i]	=	new	double[rhs.state_size];
+												std::copy(rhs.deriv_history[i],	rhs.deriv_history[i]	+	rhs.state_size,	new_deriv_history[i]);
+								}
+								double*	new_composite_deriv	=	new	double[rhs.state_size];
+								std::copy(rhs.composite_deriv,	rhs.composite_deriv+rhs.state_size,	new_composite_deriv);
+								//	Delete	lhs	arrays	&	replace	with	rhs	arrays
+								for	(unsigned	int	i=0	;	i<bufferSize;	i++	)	{
+												delete	deriv_history[i];
+								}
+								delete	deriv_history;
+								deriv_history	=	new_deriv_history;
+								delete	composite_deriv;
+								composite_deriv	=	new_composite_deriv;
+								//	Copy	primitive	members
+								bufferSize	=	rhs.bufferSize;
+								algorithmHistorySize	=	rhs.algorithmHistorySize;
+								hix	=	rhs.hix;
+								currentHistorySize	=	rhs.currentHistorySize;
+				}
+				return	*this;
+}
+//	Destructor
+SA::ABMIntegrator::~ABMIntegrator()	{
+				for	(int	i=0;	i<bufferSize	;	i++)	{
+								delete	(deriv_history[i]);
+				}
+				delete(deriv_history);
+				delete(composite_deriv);
+}
+void	SA::ABMIntegrator::step()	{
 
-    hix = (hix+1)%bufferSize;                                      // Move history index forward
-    (*derivs_func)( X_in, inState, deriv_history[hix], user_data); // Calculated and store the deriv for current, corrected state.
-    // Increase the size of the stored history, up to the limit specified by the user.
-    currentHistorySize = (currentHistorySize < algorithmHistorySize) ? currentHistorySize+1 : algorithmHistorySize;
-    // (Predictor) Predict the next state using the Adams-Bashforth explicit method.
-    for (int i=0; i<state_size; i++) {
-        composite_deriv[i] = 0.0;
-        for (int n=0,j=hix; n<currentHistorySize ; n++,j=(j+bufferSize-1)%bufferSize) {
-            composite_deriv[i] += ABCoeffs[currentHistorySize-1][n] * deriv_history[j][i];
-        }
-        outState[i] = inState[i] + default_h * composite_deriv[i];
-    }
-    // Move history index forward, so we can temporarily store the derivative of the predicted next state.
-    // We do not increase the currentHistorySize.
-    hix = (hix+1)%bufferSize;
-    (*derivs_func)( X_out, outState, deriv_history[hix], user_data); // Calc deriv for predicted next state.
-    // (Corrector) Refine the next state using the Adams-Moulton implicit method. This is the corrected next state.
-    for (int i=0; i<state_size; i++) {
-        composite_deriv[i] = 0.0;
-        for (int n=0,j=hix; n<currentHistorySize ; n++,j=(j+bufferSize-1)%bufferSize) {
-            composite_deriv[i] += AMCoeffs[currentHistorySize-1][n] * deriv_history[j][i];
-        }
-        outState[i] = inState[i] + default_h * composite_deriv[i];
-    }
-    // Move history index backward, so we over-write the predicted state with the corrected state on our next step().
-    hix = (hix+bufferSize-1)%bufferSize;
-    advanceIndyVar();
-}
-double SA::ABMIntegrator::undo_integrate() {
-    hix = (hix+bufferSize-1)%bufferSize;
-    return (FirstOrderODEIntegrator::undo_integrate());
-}
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const ABMIntegrator& I) {
-    os << (SA::FirstOrderODEIntegrator)I;
-    os << "\n--- ABMIntegrator ---";
-    os << "\nbufferSize           : " << I.bufferSize;
-    os << "\nalgorithmHistorySize : " << I.algorithmHistorySize;
-    os << "\nhix                  : " << I.hix;
-    os << "\ncurrentHistorySize   : " << I.currentHistorySize;
-    os << "\nderiv_history        :[";
-    for (int i=0; i<I.bufferSize ; i++) {
-        os << "\n";
-        stream_double_array(os, I.state_size, I.deriv_history[i]);
-    }
-    os << "\n]";
-    os << "\ncomposite_deriv     :";
-    stream_double_array(os, I.state_size, I.composite_deriv);
-    return os;
+				hix	=	(hix+1)%bufferSize;																																						//	Move	history	index	forward
+				(*derivs_func)(	X_in,	inState,	deriv_history[hix],	user_data);	//	Calculated	and	store	the	deriv	for	current,	corrected	state.
+				//	Increase	the	size	of	the	stored	history,	up	to	the	limit	specified	by	the	user.
+				currentHistorySize	=	(currentHistorySize	<	algorithmHistorySize)	?	currentHistorySize+1	:	algorithmHistorySize;
+				//	(Predictor)	Predict	the	next	state	using	the	Adams-Bashforth	explicit	method.
+				for	(int	i=0;	i<state_size;	i++)	{
+								composite_deriv[i]	=	0.0;
+								for	(int	n=0,j=hix;	n<currentHistorySize	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+												composite_deriv[i]	+=	ABCoeffs[currentHistorySize-1][n]	*	deriv_history[j][i];
+								}
+								outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+				}
+				//	Move	history	index	forward,	so	we	can	temporarily	store	the	derivative	of	the	predicted	next	state.
+				//	We	do	not	increase	the	currentHistorySize.
+				hix	=	(hix+1)%bufferSize;
+				(*derivs_func)(	X_out,	outState,	deriv_history[hix],	user_data);	//	Calc	deriv	for	predicted	next	state.
+				//	(Corrector)	Refine	the	next	state	using	the	Adams-Moulton	implicit	method.	This	is	the	corrected	next	state.
+				for	(int	i=0;	i<state_size;	i++)	{
+								composite_deriv[i]	=	0.0;
+								for	(int	n=0,j=hix;	n<currentHistorySize	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+												composite_deriv[i]	+=	AMCoeffs[currentHistorySize-1][n]	*	deriv_history[j][i];
+								}
+								outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+				}
+				//	Move	history	index	backward,	so	we	over-write	the	predicted	state	with	the	corrected	state	on	our	next	step().
+				hix	=	(hix+bufferSize-1)%bufferSize;
+				advanceIndyVar();
+}
+double	SA::ABMIntegrator::undo_integrate()	{
+				hix	=	(hix+bufferSize-1)%bufferSize;
+				return	(FirstOrderODEIntegrator::undo_integrate());
+}
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	ABMIntegrator&	I)	{
+				os	<<	(SA::FirstOrderODEIntegrator)I;
+				os	<<	"\n---	ABMIntegrator	---";
+				os	<<	"\nbufferSize											:	"	<<	I.bufferSize;
+				os	<<	"\nalgorithmHistorySize	:	"	<<	I.algorithmHistorySize;
+				os	<<	"\nhix																		:	"	<<	I.hix;
+				os	<<	"\ncurrentHistorySize			:	"	<<	I.currentHistorySize;
+				os	<<	"\nderiv_history								:[";
+				for	(int	i=0;	i<I.bufferSize	;	i++)	{
+								os	<<	"\n";
+								stream_double_array(os,	I.state_size,	I.deriv_history[i]);
+				}
+				os	<<	"\n]";
+				os	<<	"\ncomposite_deriv					:";
+				stream_double_array(os,	I.state_size,	I.composite_deriv);
+				return	os;
 }
 
-// ************************************************************
-//                       ATTENTION!!!
-// ABM Integrators CAN NOT have a variable step, because of its
-// derivative history.
-// ************************************************************
+//	************************************************************
+//																							ATTENTION!!!
+//	ABM	Integrators	CAN	NOT	have	a	variable	step,	because	of	its
+//	derivative	history.
+//	************************************************************
 
-// ------------------------------------------------------------
-// Class ABM2Integrator
-// ------------------------------------------------------------
-static const double AB2Coeffs[2] = {(3/2.0), (-1/2.0)};
-static const double AM2Coeffs[2] = {(1/2.0),  (1/2.0)};
+//	------------------------------------------------------------
+//	Class	ABM2Integrator
+//	------------------------------------------------------------
+static	const	double	AB2Coeffs[2]	=	{(3/2.0),	(-1/2.0)};
+static	const	double	AM2Coeffs[2]	=	{(1/2.0),		(1/2.0)};
 
-SA::ABM2Integrator::ABM2Integrator (
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEIntegrator(h, N, in_vars, out_vars, dfunc, udata) {
-    // The amount of history that we intend to use in this ABM integrator.
-    bufferSize=2+1; // The size of the buffer needs to be one more than the history so that an integration step can be reset.
-    hix=0;
-    currentHistorySize=0;            // How much derivative history is currently stored int the history buffer. Initially there will be none until we've primed the integrator.
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-    }
-    composite_deriv = new double[state_size];
+SA::ABM2Integrator::ABM2Integrator	(
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{
+				//	The	amount	of	history	that	we	intend	to	use	in	this	ABM	integrator.
+				bufferSize=2+1;	//	The	size	of	the	buffer	needs	to	be	one	more	than	the	history	so	that	an	integration	step	can	be	reset.
+				hix=0;
+				currentHistorySize=0;												//	How	much	derivative	history	is	currently	stored	int	the	history	buffer.	Initially	there	will	be	none	until	we've	primed	the	integrator.
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+				}
+				composite_deriv	=	new	double[state_size];
 
-    // Create a priming integrator.
-    double** priming_integrator_in_vars = new double*[state_size];
-    for (unsigned int i=0; i<N ; i++) {
-        priming_integrator_in_vars[i] = &(inState[i]);
-    }
-    double** priming_integrator_out_vars = new double*[state_size];
-    for (unsigned int i=0; i<N ; i++) {
-        priming_integrator_out_vars[i] = &(outState[i]);
-    }
-    priming_integrator = new SA::RK2Integrator(h, N, priming_integrator_in_vars, priming_integrator_out_vars, dfunc, udata);
-}
-// Constructor
+				//	Create	a	priming	integrator.
+				double**	priming_integrator_in_vars	=	new	double*[state_size];
+				for	(unsigned	int	i=0;	i<N	;	i++)	{
+								priming_integrator_in_vars[i]	=	&(inState[i]);
+				}
+				double**	priming_integrator_out_vars	=	new	double*[state_size];
+				for	(unsigned	int	i=0;	i<N	;	i++)	{
+								priming_integrator_out_vars[i]	=	&(outState[i]);
+				}
+				priming_integrator	=	new	SA::RK2Integrator(h,	N,	priming_integrator_in_vars,	priming_integrator_out_vars,	dfunc,	udata);
+}
+//	Constructor
 SA::ABM2Integrator::ABM2Integrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: ABM2Integrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	ABM2Integrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
 
-SA::ABM2Integrator::ABM2Integrator(const ABM2Integrator& other)
-: FirstOrderODEIntegrator(other) {
-    bufferSize = other.bufferSize;
-    hix = other.hix;
-    currentHistorySize = other.currentHistorySize;
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-        std::copy(other.deriv_history[i], other.deriv_history[i]+state_size, deriv_history[i]);
-    }
-    composite_deriv = new double[state_size];
-    std::copy(other.composite_deriv, other.composite_deriv+state_size, composite_deriv);
+SA::ABM2Integrator::ABM2Integrator(const	ABM2Integrator&	other)
+:	FirstOrderODEIntegrator(other)	{
+				bufferSize	=	other.bufferSize;
+				hix	=	other.hix;
+				currentHistorySize	=	other.currentHistorySize;
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+								std::copy(other.deriv_history[i],	other.deriv_history[i]+state_size,	deriv_history[i]);
+				}
+				composite_deriv	=	new	double[state_size];
+				std::copy(other.composite_deriv,	other.composite_deriv+state_size,	composite_deriv);
 
-    priming_integrator = new RK2Integrator(*other.priming_integrator);
-}
-// Assignment Operator
-SA::ABM2Integrator& SA::ABM2Integrator::operator=( const SA::ABM2Integrator& rhs) {
-    if (this != &rhs) {
-        // Call base assignment operator
-        FirstOrderODEIntegrator::operator=(rhs);
-        // Duplicate rhs arrays
-        double** new_deriv_history = new double*[rhs.bufferSize];
-        for (unsigned int i=0 ; i<rhs.bufferSize; i++ ) {
-            new_deriv_history[i] = new double[rhs.state_size];
-            std::copy(rhs.deriv_history[i], rhs.deriv_history[i] + rhs.state_size, new_deriv_history[i]);
-        }
-        double* new_composite_deriv = new double[rhs.state_size];
-        std::copy(rhs.composite_deriv, rhs.composite_deriv+rhs.state_size, new_composite_deriv);
-        // Delete lhs arrays & replace with rhs arrays
-        for (unsigned int i=0 ; i<bufferSize; i++ ) {
-            delete deriv_history[i];
-        }
-        delete deriv_history;
-        deriv_history = new_deriv_history;
-        delete composite_deriv;
-        composite_deriv = new_composite_deriv;
-        // Copy primitive members
-        bufferSize = rhs.bufferSize;
-        hix = rhs.hix;
-        currentHistorySize = rhs.currentHistorySize;
-    }
-    return *this;
+				priming_integrator	=	new	RK2Integrator(*other.priming_integrator);
+}
+//	Assignment	Operator
+SA::ABM2Integrator&	SA::ABM2Integrator::operator=(	const	SA::ABM2Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								//	Call	base	assignment	operator
+								FirstOrderODEIntegrator::operator=(rhs);
+								//	Duplicate	rhs	arrays
+								double**	new_deriv_history	=	new	double*[rhs.bufferSize];
+								for	(unsigned	int	i=0	;	i<rhs.bufferSize;	i++	)	{
+												new_deriv_history[i]	=	new	double[rhs.state_size];
+												std::copy(rhs.deriv_history[i],	rhs.deriv_history[i]	+	rhs.state_size,	new_deriv_history[i]);
+								}
+								double*	new_composite_deriv	=	new	double[rhs.state_size];
+								std::copy(rhs.composite_deriv,	rhs.composite_deriv+rhs.state_size,	new_composite_deriv);
+								//	Delete	lhs	arrays	&	replace	with	rhs	arrays
+								for	(unsigned	int	i=0	;	i<bufferSize;	i++	)	{
+												delete	deriv_history[i];
+								}
+								delete	deriv_history;
+								deriv_history	=	new_deriv_history;
+								delete	composite_deriv;
+								composite_deriv	=	new_composite_deriv;
+								//	Copy	primitive	members
+								bufferSize	=	rhs.bufferSize;
+								hix	=	rhs.hix;
+								currentHistorySize	=	rhs.currentHistorySize;
+				}
+				return	*this;
 }
 
-SA::ABM2Integrator::~ABM2Integrator() {
-    for (int i=0; i<bufferSize ; i++) {
-        delete (deriv_history[i]);
-    }
-    delete(deriv_history);
-    delete(composite_deriv);
-    delete priming_integrator;
-}
-void SA::ABM2Integrator::step() {
+SA::ABM2Integrator::~ABM2Integrator()	{
+				for	(int	i=0;	i<bufferSize	;	i++)	{
+								delete	(deriv_history[i]);
+				}
+				delete(deriv_history);
+				delete(composite_deriv);
+				delete	priming_integrator;
+}
+void	SA::ABM2Integrator::step()	{
 
-    hix = (hix+1)%bufferSize;                          // Move history index forward
-    (*derivs_func)( X_in, inState, deriv_history[hix], user_data); // Calculated and store the deriv for current, corrected state.
-    // Increase the size of the stored history, up to the limit specified by the user.
-    currentHistorySize = (currentHistorySize < 2) ? currentHistorySize+1 : 2;
+				hix	=	(hix+1)%bufferSize;																										//	Move	history	index	forward
+				(*derivs_func)(	X_in,	inState,	deriv_history[hix],	user_data);	//	Calculated	and	store	the	deriv	for	current,	corrected	state.
+				//	Increase	the	size	of	the	stored	history,	up	to	the	limit	specified	by	the	user.
+				currentHistorySize	=	(currentHistorySize	<	2)	?	currentHistorySize+1	:	2;
 
-    if ( currentHistorySize < 2 ) {
-        priming_integrator->load();
-        priming_integrator->step();
-        priming_integrator->unload();
-    } else {
-        // (Predictor) Predict the next state using the Adams-Bashforth explicit method.
-        for (int i=0; i<state_size; i++) {
-            composite_deriv[i] = 0.0;
-            for (int n=0,j=hix; n<2 ; n++,j=(j+bufferSize-1)%bufferSize) {
-                composite_deriv[i] += AB2Coeffs[n] * deriv_history[j][i];
-            }
-            outState[i] = inState[i] + default_h * composite_deriv[i];
-        }
-        // Move history index forward, so we can temporarily store the derivative of the predicted next state.
-        // We do not increase the currentHistorySize.
-        hix = (hix+1)%bufferSize;
-        (*derivs_func)( X_in, outState, deriv_history[hix], user_data); // Calc deriv for predicted next state.
-        // (Corrector) Refine the next state using the Adams-Moulton implicit method. This is the corrected next state.
-        for (int i=0; i<state_size; i++) {
-            composite_deriv[i] = 0.0;
-            for (int n=0,j=hix; n<2 ; n++,j=(j+bufferSize-1)%bufferSize) {
-                composite_deriv[i] += AM2Coeffs[n] * deriv_history[j][i];
-            }
-            outState[i] = inState[i] + default_h * composite_deriv[i];
-        }
-        // Move history index backward, so we over-write the predicted state with the corrected state on our next step().
-        hix = (hix+bufferSize-1)%bufferSize;
-    }
-    advanceIndyVar();
-}
-double SA::ABM2Integrator::undo_integrate() {
-    hix = (hix+bufferSize-1)%bufferSize;
-    return ( FirstOrderODEIntegrator::undo_integrate());
+				if	(	currentHistorySize	<	2	)	{
+								priming_integrator->load();
+								priming_integrator->step();
+								priming_integrator->unload();
+				}	else	{
+								//	(Predictor)	Predict	the	next	state	using	the	Adams-Bashforth	explicit	method.
+								for	(int	i=0;	i<state_size;	i++)	{
+												composite_deriv[i]	=	0.0;
+												for	(int	n=0,j=hix;	n<2	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+																composite_deriv[i]	+=	AB2Coeffs[n]	*	deriv_history[j][i];
+												}
+												outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+								}
+								//	Move	history	index	forward,	so	we	can	temporarily	store	the	derivative	of	the	predicted	next	state.
+								//	We	do	not	increase	the	currentHistorySize.
+								hix	=	(hix+1)%bufferSize;
+								(*derivs_func)(	X_in,	outState,	deriv_history[hix],	user_data);	//	Calc	deriv	for	predicted	next	state.
+								//	(Corrector)	Refine	the	next	state	using	the	Adams-Moulton	implicit	method.	This	is	the	corrected	next	state.
+								for	(int	i=0;	i<state_size;	i++)	{
+												composite_deriv[i]	=	0.0;
+												for	(int	n=0,j=hix;	n<2	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+																composite_deriv[i]	+=	AM2Coeffs[n]	*	deriv_history[j][i];
+												}
+												outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+								}
+								//	Move	history	index	backward,	so	we	over-write	the	predicted	state	with	the	corrected	state	on	our	next	step().
+								hix	=	(hix+bufferSize-1)%bufferSize;
+				}
+				advanceIndyVar();
+}
+double	SA::ABM2Integrator::undo_integrate()	{
+				hix	=	(hix+bufferSize-1)%bufferSize;
+				return	(	FirstOrderODEIntegrator::undo_integrate());
 }
 
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const ABM2Integrator& I) {
-    os << (SA::FirstOrderODEIntegrator)I;
-    os << "\n--- ABM2Integrator ---";
-    os << "\nbufferSize           : " << I.bufferSize;
-    os << "\nhix                  : " << I.hix;
-    os << "\ncurrentHistorySize   : " << I.currentHistorySize;
-    os << "\nderiv_history        :[";
-    for (int i=0; i<I.bufferSize ; i++) {
-        os << "\n";
-        stream_double_array(os, I.state_size, I.deriv_history[i]);
-    }
-    os << "\n]";
-    os << "\ncomposite_deriv     :";
-    stream_double_array(os, I.state_size, I.composite_deriv);
-    return os;
-}
-// ------------------------------------------------------------
-// Class ABM4Integrator
-// ------------------------------------------------------------
-static const double AB4Coeffs[4] = {(55/24.0), (-59/24.0), (37/24.0), (-9/24.0)};
-static const double AM4Coeffs[4] = {(9/24.0), (19/24.0), (-5/24.0), (1/24.0)};
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	ABM2Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEIntegrator)I;
+				os	<<	"\n---	ABM2Integrator	---";
+				os	<<	"\nbufferSize											:	"	<<	I.bufferSize;
+				os	<<	"\nhix																		:	"	<<	I.hix;
+				os	<<	"\ncurrentHistorySize			:	"	<<	I.currentHistorySize;
+				os	<<	"\nderiv_history								:[";
+				for	(int	i=0;	i<I.bufferSize	;	i++)	{
+								os	<<	"\n";
+								stream_double_array(os,	I.state_size,	I.deriv_history[i]);
+				}
+				os	<<	"\n]";
+				os	<<	"\ncomposite_deriv					:";
+				stream_double_array(os,	I.state_size,	I.composite_deriv);
+				return	os;
+}
+//	------------------------------------------------------------
+//	Class	ABM4Integrator
+//	------------------------------------------------------------
+static	const	double	AB4Coeffs[4]	=	{(55/24.0),	(-59/24.0),	(37/24.0),	(-9/24.0)};
+static	const	double	AM4Coeffs[4]	=	{(9/24.0),	(19/24.0),	(-5/24.0),	(1/24.0)};
 
-SA::ABM4Integrator::ABM4Integrator (
-    double h, unsigned int N, double* in_vars[], double* out_vars[], DerivsFunc dfunc, void* udata)
-    : FirstOrderODEIntegrator(h, N, in_vars, out_vars, dfunc, udata) {
+SA::ABM4Integrator::ABM4Integrator	(
+				double	h,	unsigned	int	N,	double*	in_vars[],	double*	out_vars[],	DerivsFunc	dfunc,	void*	udata)
+				:	FirstOrderODEIntegrator(h,	N,	in_vars,	out_vars,	dfunc,	udata)	{
 
-    // The amount of history that we intend to use in this ABM integrator.
-    bufferSize=4+1; // The size of the buffer needs to be one more than the history so that an integration step can be reset.
-    hix=0;
-    currentHistorySize=0;            // How much derivative history is currently stored int the history buffer. Initially there will be none until we've primed the integrator.
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-    }
-    composite_deriv = new double[state_size];
-    // NEW: Create a priming integrator.
-    double** priming_integrator_in_vars = new double*[state_size];
-    for (unsigned int i=0; i<N ; i++) {
-        priming_integrator_in_vars[i] = &(inState[i]);
-    }
-    double** priming_integrator_out_vars = new double*[state_size];
-    for (unsigned int i=0; i<N ; i++) {
-        priming_integrator_out_vars[i] = &(outState[i]);
-    }
-    priming_integrator = new SA::RK4Integrator(h, N, priming_integrator_in_vars, priming_integrator_out_vars, dfunc, udata);
-}
-// Constructor
+				//	The	amount	of	history	that	we	intend	to	use	in	this	ABM	integrator.
+				bufferSize=4+1;	//	The	size	of	the	buffer	needs	to	be	one	more	than	the	history	so	that	an	integration	step	can	be	reset.
+				hix=0;
+				currentHistorySize=0;												//	How	much	derivative	history	is	currently	stored	int	the	history	buffer.	Initially	there	will	be	none	until	we've	primed	the	integrator.
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+				}
+				composite_deriv	=	new	double[state_size];
+				//	NEW:	Create	a	priming	integrator.
+				double**	priming_integrator_in_vars	=	new	double*[state_size];
+				for	(unsigned	int	i=0;	i<N	;	i++)	{
+								priming_integrator_in_vars[i]	=	&(inState[i]);
+				}
+				double**	priming_integrator_out_vars	=	new	double*[state_size];
+				for	(unsigned	int	i=0;	i<N	;	i++)	{
+								priming_integrator_out_vars[i]	=	&(outState[i]);
+				}
+				priming_integrator	=	new	SA::RK4Integrator(h,	N,	priming_integrator_in_vars,	priming_integrator_out_vars,	dfunc,	udata);
+}
+//	Constructor
 SA::ABM4Integrator::ABM4Integrator(
-double h, unsigned int N, double* in_out_vars[], DerivsFunc dfunc, void* udata)
-: ABM4Integrator(h, N, in_out_vars, in_out_vars, dfunc, udata) {}
+double	h,	unsigned	int	N,	double*	in_out_vars[],	DerivsFunc	dfunc,	void*	udata)
+:	ABM4Integrator(h,	N,	in_out_vars,	in_out_vars,	dfunc,	udata)	{}
 
-SA::ABM4Integrator::ABM4Integrator(const ABM4Integrator& other)
-: FirstOrderODEIntegrator(other) {
-    bufferSize = other.bufferSize;
-    hix = other.hix;
-    currentHistorySize = other.currentHistorySize;
-    deriv_history = new double*[bufferSize];
-    for (unsigned int i=0; i<bufferSize ; i++) {
-        deriv_history[i] = new double[state_size];
-        std::copy(other.deriv_history[i], other.deriv_history[i]+state_size, deriv_history[i]);
-    }
-    composite_deriv = new double[state_size];
-    std::copy(other.composite_deriv, other.composite_deriv+state_size, composite_deriv);
+SA::ABM4Integrator::ABM4Integrator(const	ABM4Integrator&	other)
+:	FirstOrderODEIntegrator(other)	{
+				bufferSize	=	other.bufferSize;
+				hix	=	other.hix;
+				currentHistorySize	=	other.currentHistorySize;
+				deriv_history	=	new	double*[bufferSize];
+				for	(unsigned	int	i=0;	i<bufferSize	;	i++)	{
+								deriv_history[i]	=	new	double[state_size];
+								std::copy(other.deriv_history[i],	other.deriv_history[i]+state_size,	deriv_history[i]);
+				}
+				composite_deriv	=	new	double[state_size];
+				std::copy(other.composite_deriv,	other.composite_deriv+state_size,	composite_deriv);
 
-    priming_integrator = new RK4Integrator(*other.priming_integrator);
-}
-// Assignment Operator
-SA::ABM4Integrator& SA::ABM4Integrator::operator=( const SA::ABM4Integrator& rhs) {
-    if (this != &rhs) {
-        // Call base assignment operator
-        FirstOrderODEIntegrator::operator=(rhs);
-        // Duplicate rhs arrays
-        double** new_deriv_history = new double*[rhs.bufferSize];
-        for (unsigned int i=0 ; i<rhs.bufferSize; i++ ) {
-            new_deriv_history[i] = new double[rhs.state_size];
-            std::copy(rhs.deriv_history[i], rhs.deriv_history[i] + rhs.state_size, new_deriv_history[i]);
-        }
-        double* new_composite_deriv = new double[rhs.state_size];
-        std::copy(rhs.composite_deriv, rhs.composite_deriv+rhs.state_size, new_composite_deriv);
-        // Delete lhs arrays & replace with rhs arrays
-        for (unsigned int i=0 ; i<bufferSize; i++ ) {
-            delete deriv_history[i];
-        }
-        delete deriv_history;
-        deriv_history = new_deriv_history;
-        delete composite_deriv;
-        composite_deriv = new_composite_deriv;
-        // Copy primitive members
-        bufferSize = rhs.bufferSize;
-        hix = rhs.hix;
-        currentHistorySize = rhs.currentHistorySize;
-    }
-    return *this;
-}
-SA::ABM4Integrator::~ABM4Integrator() {
-    for (int i=0; i<bufferSize ; i++) {
-        delete (deriv_history[i]);
-    }
-    delete(deriv_history);
-    delete(composite_deriv);
-    delete priming_integrator;
-}
-void SA::ABM4Integrator::step() {
+				priming_integrator	=	new	RK4Integrator(*other.priming_integrator);
+}
+//	Assignment	Operator
+SA::ABM4Integrator&	SA::ABM4Integrator::operator=(	const	SA::ABM4Integrator&	rhs)	{
+				if	(this	!=	&rhs)	{
+								//	Call	base	assignment	operator
+								FirstOrderODEIntegrator::operator=(rhs);
+								//	Duplicate	rhs	arrays
+								double**	new_deriv_history	=	new	double*[rhs.bufferSize];
+								for	(unsigned	int	i=0	;	i<rhs.bufferSize;	i++	)	{
+												new_deriv_history[i]	=	new	double[rhs.state_size];
+												std::copy(rhs.deriv_history[i],	rhs.deriv_history[i]	+	rhs.state_size,	new_deriv_history[i]);
+								}
+								double*	new_composite_deriv	=	new	double[rhs.state_size];
+								std::copy(rhs.composite_deriv,	rhs.composite_deriv+rhs.state_size,	new_composite_deriv);
+								//	Delete	lhs	arrays	&	replace	with	rhs	arrays
+								for	(unsigned	int	i=0	;	i<bufferSize;	i++	)	{
+												delete	deriv_history[i];
+								}
+								delete	deriv_history;
+								deriv_history	=	new_deriv_history;
+								delete	composite_deriv;
+								composite_deriv	=	new_composite_deriv;
+								//	Copy	primitive	members
+								bufferSize	=	rhs.bufferSize;
+								hix	=	rhs.hix;
+								currentHistorySize	=	rhs.currentHistorySize;
+				}
+				return	*this;
+}
+SA::ABM4Integrator::~ABM4Integrator()	{
+				for	(int	i=0;	i<bufferSize	;	i++)	{
+								delete	(deriv_history[i]);
+				}
+				delete(deriv_history);
+				delete(composite_deriv);
+				delete	priming_integrator;
+}
+void	SA::ABM4Integrator::step()	{
 
-    hix = (hix+1)%bufferSize;                          // Move history index forward
-    (*derivs_func)( X_in, inState, deriv_history[hix], user_data); // Calculated and store the deriv for current, corrected state.
-    // Increase the size of the stored history, up to the limit specified by the user.
-    currentHistorySize = (currentHistorySize < 4) ? currentHistorySize+1 : 4;
-    if ( currentHistorySize < 4 ) {
-        priming_integrator->load();
-        priming_integrator->step();
-        priming_integrator->unload();
-    } else {
-        // (Predictor) Predict the next state using the Adams-Bashforth explicit method.
-        for (int i=0; i<state_size; i++) {
-            composite_deriv[i] = 0.0;
-            for (int n=0,j=hix; n<4 ; n++,j=(j+bufferSize-1)%bufferSize) {
-                composite_deriv[i] += AB4Coeffs[n] * deriv_history[j][i];
-            }
-            outState[i] = inState[i] + default_h * composite_deriv[i];
-        }
-        // Move history index forward, so we can temporarily store the derivative of the predicted next state.
-        // We do not increase the currentHistorySize.
-        hix = (hix+1)%bufferSize;
-        (*derivs_func)( X_out, outState, deriv_history[hix], user_data); // Calc deriv for predicted next state.
-        // (Corrector) Refine the next state using the Adams-Moulton implicit method. This is the corrected next state.
-        for (int i=0; i<state_size; i++) {
-            composite_deriv[i] = 0.0;
-            for (int n=0,j=hix; n<4 ; n++,j=(j+bufferSize-1)%bufferSize) {
-                composite_deriv[i] += AM4Coeffs[n] * deriv_history[j][i];
-            }
-            outState[i] = inState[i] + default_h * composite_deriv[i];
-        }
-        // Move history index backward, so we over-write the predicted state with the corrected state on our next step().
-        hix = (hix+bufferSize-1)%bufferSize;
-    }
-    advanceIndyVar();
-}
-double SA::ABM4Integrator::undo_integrate() {
-    hix = (hix+bufferSize-1)%bufferSize;
-    return (FirstOrderODEIntegrator::undo_integrate());
-}
-// Insertion Operator
-std::ostream& SA::operator<<(std::ostream& os, const ABM4Integrator& I) {
-    os << (SA::FirstOrderODEIntegrator)I;
-    os << "\n--- ABM4Integrator ---";
-    os << "\nbufferSize           : " << I.bufferSize;
-    os << "\nhix                  : " << I.hix;
-    os << "\ncurrentHistorySize   : " << I.currentHistorySize;
-    os << "\nderiv_history        :[";
-    for (int i=0; i<I.bufferSize ; i++) {
-        os << "\n";
-        stream_double_array(os, I.state_size, I.deriv_history[i]);
-    }
-    os << "\n]";
-    os << "\ncomposite_deriv     :";
-    stream_double_array(os, I.state_size, I.composite_deriv);
-    return os;
+				hix	=	(hix+1)%bufferSize;																										//	Move	history	index	forward
+				(*derivs_func)(	X_in,	inState,	deriv_history[hix],	user_data);	//	Calculated	and	store	the	deriv	for	current,	corrected	state.
+				//	Increase	the	size	of	the	stored	history,	up	to	the	limit	specified	by	the	user.
+				currentHistorySize	=	(currentHistorySize	<	4)	?	currentHistorySize+1	:	4;
+				if	(	currentHistorySize	<	4	)	{
+								priming_integrator->load();
+								priming_integrator->step();
+								priming_integrator->unload();
+				}	else	{
+								//	(Predictor)	Predict	the	next	state	using	the	Adams-Bashforth	explicit	method.
+								for	(int	i=0;	i<state_size;	i++)	{
+												composite_deriv[i]	=	0.0;
+												for	(int	n=0,j=hix;	n<4	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+																composite_deriv[i]	+=	AB4Coeffs[n]	*	deriv_history[j][i];
+												}
+												outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+								}
+								//	Move	history	index	forward,	so	we	can	temporarily	store	the	derivative	of	the	predicted	next	state.
+								//	We	do	not	increase	the	currentHistorySize.
+								hix	=	(hix+1)%bufferSize;
+								(*derivs_func)(	X_out,	outState,	deriv_history[hix],	user_data);	//	Calc	deriv	for	predicted	next	state.
+								//	(Corrector)	Refine	the	next	state	using	the	Adams-Moulton	implicit	method.	This	is	the	corrected	next	state.
+								for	(int	i=0;	i<state_size;	i++)	{
+												composite_deriv[i]	=	0.0;
+												for	(int	n=0,j=hix;	n<4	;	n++,j=(j+bufferSize-1)%bufferSize)	{
+																composite_deriv[i]	+=	AM4Coeffs[n]	*	deriv_history[j][i];
+												}
+												outState[i]	=	inState[i]	+	default_h	*	composite_deriv[i];
+								}
+								//	Move	history	index	backward,	so	we	over-write	the	predicted	state	with	the	corrected	state	on	our	next	step().
+								hix	=	(hix+bufferSize-1)%bufferSize;
+				}
+				advanceIndyVar();
+}
+double	SA::ABM4Integrator::undo_integrate()	{
+				hix	=	(hix+bufferSize-1)%bufferSize;
+				return	(FirstOrderODEIntegrator::undo_integrate());
+}
+//	Insertion	Operator
+std::ostream&	SA::operator<<(std::ostream&	os,	const	ABM4Integrator&	I)	{
+				os	<<	(SA::FirstOrderODEIntegrator)I;
+				os	<<	"\n---	ABM4Integrator	---";
+				os	<<	"\nbufferSize											:	"	<<	I.bufferSize;
+				os	<<	"\nhix																		:	"	<<	I.hix;
+				os	<<	"\ncurrentHistorySize			:	"	<<	I.currentHistorySize;
+				os	<<	"\nderiv_history								:[";
+				for	(int	i=0;	i<I.bufferSize	;	i++)	{
+								os	<<	"\n";
+								stream_double_array(os,	I.state_size,	I.deriv_history[i]);
+				}
+				os	<<	"\n]";
+				os	<<	"\ncomposite_deriv					:";
+				stream_double_array(os,	I.state_size,	I.composite_deriv);
+				return	os;
 }
diff --git a/trick_source/trick_utils/comm/test/TCBlockioTest.cpp b/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
index ff725f098..53841daf7 100644
--- a/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCBlockioTest.cpp
@@ -1,60 +1,60 @@
 
-#include <gtest/gtest.h>
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	<gtest/gtest.h>
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCBlockioTest : public testing::Test {
+class	TCBlockioTest	:	public	testing::Test	{
 
-   protected:
-      TCBlockioTest(){}
-      ~TCBlockioTest(){}
+			protected:
+						TCBlockioTest(){}
+						~TCBlockioTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-      }
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-#if 0
-TEST_F( TCBlockioTest, testNullDevice ) {
+#if	0
+TEST_F(	TCBlockioTest,	testNullDevice	)	{
 
-   int blockio_status = tc_blockio( NULL, TC_COMM_ALL_OR_NOTHING );
+			int	blockio_status	=	tc_blockio(	NULL,	TC_COMM_ALL_OR_NOTHING	);
 
-   EXPECT_EQ( TC_EWOULDBLOCK, blockio_status );
+			EXPECT_EQ(	TC_EWOULDBLOCK,	blockio_status	);
 }
 
-TEST_F( TCBlockioTest, testTC_COMM_BLOCKIO ) {
+TEST_F(	TCBlockioTest,	testTC_COMM_BLOCKIO	)	{
 
-   (void) tc_blockio( device, TC_COMM_BLOCKIO );
-   EXPECT_EQ( TC_COMM_BLOCKIO, device->blockio_type);
+			(void)	tc_blockio(	device,	TC_COMM_BLOCKIO	);
+			EXPECT_EQ(	TC_COMM_BLOCKIO,	device->blockio_type);
 }
 
-TEST_F( TCBlockioTest, testTC_COMM_NOBLOCKIO ) {
+TEST_F(	TCBlockioTest,	testTC_COMM_NOBLOCKIO	)	{
 
-   (void) tc_blockio( device, TC_COMM_NOBLOCKIO );
-   EXPECT_EQ( TC_COMM_NOBLOCKIO, device->blockio_type);
+			(void)	tc_blockio(	device,	TC_COMM_NOBLOCKIO	);
+			EXPECT_EQ(	TC_COMM_NOBLOCKIO,	device->blockio_type);
 }
 
-TEST_F( TCBlockioTest, testTC_COMM_TIMED_BLOCKIO ) {
+TEST_F(	TCBlockioTest,	testTC_COMM_TIMED_BLOCKIO	)	{
 
-   (void) tc_blockio( device, TC_COMM_TIMED_BLOCKIO );
-   EXPECT_EQ( TC_COMM_TIMED_BLOCKIO, device->blockio_type );
+			(void)	tc_blockio(	device,	TC_COMM_TIMED_BLOCKIO	);
+			EXPECT_EQ(	TC_COMM_TIMED_BLOCKIO,	device->blockio_type	);
 }
 
-TEST_F( TCBlockioTest, testTC_COMM_ALL_OR_NOTHING ) {
+TEST_F(	TCBlockioTest,	testTC_COMM_ALL_OR_NOTHING	)	{
 
-   (void) tc_blockio( device, TC_COMM_ALL_OR_NOTHING );
-   EXPECT_EQ( TC_COMM_ALL_OR_NOTHING, device->blockio_type );
+			(void)	tc_blockio(	device,	TC_COMM_ALL_OR_NOTHING	);
+			EXPECT_EQ(	TC_COMM_ALL_OR_NOTHING,	device->blockio_type	);
 }
 #endif
diff --git a/trick_source/trick_utils/comm/test/TCConnectTest.cpp b/trick_source/trick_utils/comm/test/TCConnectTest.cpp
index e2cb89643..2e14c4992 100644
--- a/trick_source/trick_utils/comm/test/TCConnectTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCConnectTest.cpp
@@ -1,63 +1,63 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/tc_proto.h"
-#include "trick/attributes.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/tc_proto.h"
+#include	"trick/attributes.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCConnectTest : public testing::Test {
+class	TCConnectTest	:	public	testing::Test	{
 
-   protected:
-      TCConnectTest(){}
-      ~TCConnectTest(){}
+			protected:
+						TCConnectTest(){}
+						~TCConnectTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         /* device */
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-         device->hostname = strdup("127.0.0.1");
-         device->disabled = TC_COMM_FALSE;
-         device->disable_handshaking = TC_COMM_DISABLED;
-         strcpy(device->client_tag, "<empty>");
+									/*	device	*/
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+									device->hostname	=	strdup("127.0.0.1");
+									device->disabled	=	TC_COMM_FALSE;
+									device->disable_handshaking	=	TC_COMM_DISABLED;
+									strcpy(device->client_tag,	"<empty>");
 
-      }
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device->hostname);
-         free(device);
-      }
+									free(device->hostname);
+									free(device);
+						}
 };
 
 
-TEST_F( TCConnectTest, testNoDevice ) {
+TEST_F(	TCConnectTest,	testNoDevice	)	{
 
-   int connect_status = tc_connect( NULL );
+			int	connect_status	=	tc_connect(	NULL	);
 
-   EXPECT_EQ( connect_status, -1 );
+			EXPECT_EQ(	connect_status,	-1	);
 }
 
-TEST_F( TCConnectTest, testDisabledDevice ) {
+TEST_F(	TCConnectTest,	testDisabledDevice	)	{
 
-   device->disabled = TC_COMM_TRUE;
+			device->disabled	=	TC_COMM_TRUE;
 
-   int connect_status = tc_connect( device );
+			int	connect_status	=	tc_connect(	device	);
 
-   EXPECT_EQ( connect_status, TC_CONN_DISABLED );
+			EXPECT_EQ(	connect_status,	TC_CONN_DISABLED	);
 
 }
 
-TEST_F( TCConnectTest, testNullHostname ) {
+TEST_F(	TCConnectTest,	testNullHostname	)	{
 
-   device->hostname = NULL;
+			device->hostname	=	NULL;
 
-   int connect_status = tc_connect( device );
+			int	connect_status	=	tc_connect(	device	);
 
-   EXPECT_EQ( connect_status, TC_CONN_DISABLED );
+			EXPECT_EQ(	connect_status,	TC_CONN_DISABLED	);
 }
 
diff --git a/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp b/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
index db001b284..b84c2b48c 100644
--- a/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCDevCopyTest.cpp
@@ -1,55 +1,55 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
 
-class TCDevCopyTest : public testing::Test {
+class	TCDevCopyTest	:	public	testing::Test	{
 
-   protected:
-      TCDevCopyTest(){}
-      ~TCDevCopyTest(){}
+			protected:
+						TCDevCopyTest(){}
+						~TCDevCopyTest(){}
 
-      TCDevice* src_device;
-      TCDevice* dest_device;
+						TCDevice*	src_device;
+						TCDevice*	dest_device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         src_device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)src_device,'\0',sizeof(TCDevice) );
+									src_device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)src_device,'\0',sizeof(TCDevice)	);
 
-         dest_device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)dest_device,'\0',sizeof(TCDevice) );
-      }
+									dest_device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)dest_device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(src_device);
-         free(dest_device);
-      }
+									free(src_device);
+									free(dest_device);
+						}
 };
 
-TEST_F( TCDevCopyTest, testNullSrcDest ) {
+TEST_F(	TCDevCopyTest,	testNullSrcDest	)	{
 
-   int tcdev_status = tc_dev_copy( NULL, NULL );
+			int	tcdev_status	=	tc_dev_copy(	NULL,	NULL	);
 
-   EXPECT_EQ( tcdev_status, -1 );
+			EXPECT_EQ(	tcdev_status,	-1	);
 }
 
-TEST_F( TCDevCopyTest, testNullSrc ) {
+TEST_F(	TCDevCopyTest,	testNullSrc	)	{
 
-   int tcdev_status = tc_dev_copy( dest_device, NULL );
+			int	tcdev_status	=	tc_dev_copy(	dest_device,	NULL	);
 
-   EXPECT_EQ( tcdev_status, -1 );
+			EXPECT_EQ(	tcdev_status,	-1	);
 }
 
-TEST_F( TCDevCopyTest, testNullDest ) {
+TEST_F(	TCDevCopyTest,	testNullDest	)	{
 
-   int tcdev_status = tc_dev_copy( NULL, src_device );
+			int	tcdev_status	=	tc_dev_copy(	NULL,	src_device	);
 
-   EXPECT_EQ( tcdev_status, -1 );
+			EXPECT_EQ(	tcdev_status,	-1	);
 }
diff --git a/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp b/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
index 70d7475a4..22ba00c6f 100644
--- a/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCDisconnectTest.cpp
@@ -1,43 +1,43 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
 
-class TCDisconnectTest : public testing::Test {
+class	TCDisconnectTest	:	public	testing::Test	{
 
-   protected:
-      TCDisconnectTest(){}
-      ~TCDisconnectTest(){}
+			protected:
+						TCDisconnectTest(){}
+						~TCDisconnectTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-      }
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-TEST_F( TCDisconnectTest, testNoDevice ) {
+TEST_F(	TCDisconnectTest,	testNoDevice	)	{
 
-   int disconnect_status = tc_disconnect( NULL );
+			int	disconnect_status	=	tc_disconnect(	NULL	);
 
-   EXPECT_EQ( disconnect_status, TC_DRIVER_ALREADY_DISCONNECTED );
+			EXPECT_EQ(	disconnect_status,	TC_DRIVER_ALREADY_DISCONNECTED	);
 }
 
-TEST_F( TCDisconnectTest, testSuccess ) {
+TEST_F(	TCDisconnectTest,	testSuccess	)	{
 
-   int disconnect_status = tc_disconnect( device );
+			int	disconnect_status	=	tc_disconnect(	device	);
 
-   EXPECT_EQ( disconnect_status, TC_SUCCESS );
+			EXPECT_EQ(	disconnect_status,	TC_SUCCESS	);
 }
diff --git a/trick_source/trick_utils/comm/test/TCErrorTest.cpp b/trick_source/trick_utils/comm/test/TCErrorTest.cpp
index 977d44767..851489bc9 100644
--- a/trick_source/trick_utils/comm/test/TCErrorTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCErrorTest.cpp
@@ -1,61 +1,61 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCErrorTest : public testing::Test {
+class	TCErrorTest	:	public	testing::Test	{
 
-   protected:
-      TCErrorTest(){}
-      ~TCErrorTest(){}
+			protected:
+						TCErrorTest(){}
+						~TCErrorTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-      }
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-TEST_F( TCErrorTest, testNoDevice ) {
+TEST_F(	TCErrorTest,	testNoDevice	)	{
 
-   int error_status = tc_error( NULL, 0 );
+			int	error_status	=	tc_error(	NULL,	0	);
 
-   EXPECT_EQ( error_status, -1 );
+			EXPECT_EQ(	error_status,	-1	);
 }
 
-TEST_F( TCErrorTest, testNoErrorHandler ) {
+TEST_F(	TCErrorTest,	testNoErrorHandler	)	{
 
-   device->error_handler = NULL;
+			device->error_handler	=	NULL;
 
-   int error_status = tc_error( device, 0 );
+			int	error_status	=	tc_error(	device,	0	);
 
-   EXPECT_EQ( error_status, 0 );
+			EXPECT_EQ(	error_status,	0	);
 }
 
-TEST_F( TCErrorTest, testOn ) {
+TEST_F(	TCErrorTest,	testOn	)	{
 
-   int error_status = tc_error( device, 1 );
+			int	error_status	=	tc_error(	device,	1	);
 
-   EXPECT_EQ( device->error_handler->report_level, TRICK_ERROR_ALL );
-   EXPECT_EQ( error_status, 0 );
+			EXPECT_EQ(	device->error_handler->report_level,	TRICK_ERROR_ALL	);
+			EXPECT_EQ(	error_status,	0	);
 }
 
-TEST_F( TCErrorTest, testOff ) {
+TEST_F(	TCErrorTest,	testOff	)	{
 
-   int error_status = tc_error( device, 0 );
+			int	error_status	=	tc_error(	device,	0	);
 
-   EXPECT_EQ( device->error_handler->report_level, TRICK_ERROR_SILENT );
-   EXPECT_EQ( error_status, 0 );
+			EXPECT_EQ(	device->error_handler->report_level,	TRICK_ERROR_SILENT	);
+			EXPECT_EQ(	error_status,	0	);
 }
 
diff --git a/trick_source/trick_utils/comm/test/TCIsValidTest.cpp b/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
index 7f8d27051..c5e7b483d 100644
--- a/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCIsValidTest.cpp
@@ -1,54 +1,54 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/tc_proto.h"
-#include "trick/attributes.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/tc_proto.h"
+#include	"trick/attributes.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCIsValidTest : public testing::Test {
+class	TCIsValidTest	:	public	testing::Test	{
 
-   protected:
-      TCIsValidTest(){}
-      ~TCIsValidTest(){}
+			protected:
+						TCIsValidTest(){}
+						~TCIsValidTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
 
-         device->socket = 1;
-      }
+									device->socket	=	1;
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-TEST_F( TCIsValidTest, testNullDevice ) {
+TEST_F(	TCIsValidTest,	testNullDevice	)	{
 
-   int tcisvalid_status = tc_isValid( NULL );
+			int	tcisvalid_status	=	tc_isValid(	NULL	);
 
-   EXPECT_EQ( tcisvalid_status, 0 );
+			EXPECT_EQ(	tcisvalid_status,	0	);
 }
 
-TEST_F( TCIsValidTest, testInvalidSocket ) {
+TEST_F(	TCIsValidTest,	testInvalidSocket	)	{
 
-   device->socket = TRICKCOMM_INVALID_SOCKET;
+			device->socket	=	TRICKCOMM_INVALID_SOCKET;
 
-   int tcisvalid_status = tc_isValid( device );
+			int	tcisvalid_status	=	tc_isValid(	device	);
 
-   EXPECT_EQ( tcisvalid_status, 0 );
+			EXPECT_EQ(	tcisvalid_status,	0	);
 }
 
-TEST_F( TCIsValidTest, testValidSocket ) {
+TEST_F(	TCIsValidTest,	testValidSocket	)	{
 
-   int tcisvalid_status = tc_isValid( device );
+			int	tcisvalid_status	=	tc_isValid(	device	);
 
-   EXPECT_EQ( tcisvalid_status, 0 );
+			EXPECT_EQ(	tcisvalid_status,	0	);
 }
 
diff --git a/trick_source/trick_utils/comm/test/TCPendingTest.cpp b/trick_source/trick_utils/comm/test/TCPendingTest.cpp
index dae5f40b9..d1b989a6c 100644
--- a/trick_source/trick_utils/comm/test/TCPendingTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCPendingTest.cpp
@@ -1,48 +1,48 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCPendingTest : public testing::Test {
+class	TCPendingTest	:	public	testing::Test	{
 
-   protected:
-      TCPendingTest(){}
-      ~TCPendingTest(){}
+			protected:
+						TCPendingTest(){}
+						~TCPendingTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
 
-         device->socket = 1;
-      }
+									device->socket	=	1;
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-TEST_F( TCPendingTest, testNullDevice ) {
+TEST_F(	TCPendingTest,	testNullDevice	)	{
 
-   int tcpending_status = tc_pending( NULL );
+			int	tcpending_status	=	tc_pending(	NULL	);
 
-   EXPECT_EQ( tcpending_status, -1 );
+			EXPECT_EQ(	tcpending_status,	-1	);
 }
 
 /*
-TEST_F( TCPendingTest, testInvalidSocket ) {
+TEST_F(	TCPendingTest,	testInvalidSocket	)	{
 
-   device->socket = TRICKCOMM_INVALID_SOCKET;
+			device->socket	=	TRICKCOMM_INVALID_SOCKET;
 
-   int tcpending_status = tc_pending( device );
+			int	tcpending_status	=	tc_pending(	device	);
 
-   EXPECT_EQ( tcpending_status, 0 );
+			EXPECT_EQ(	tcpending_status,	0	);
 }
 */
diff --git a/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp b/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
index 0d9006090..4c0ef91a8 100644
--- a/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCReadByteSwapTest.cpp
@@ -1,29 +1,29 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
 
-class TCReadByteSwapTest : public testing::Test {
+class	TCReadByteSwapTest	:	public	testing::Test	{
 
-   protected:
-      TCReadByteSwapTest(){}
-      ~TCReadByteSwapTest(){}
+			protected:
+						TCReadByteSwapTest(){}
+						~TCReadByteSwapTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-      }
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
diff --git a/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp b/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
index 9c826f72e..3ed217f75 100644
--- a/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
+++ b/trick_source/trick_utils/comm/test/TCSetBlockIOTest.cpp
@@ -1,43 +1,43 @@
 
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/tc.h"
-#include "trick/attributes.h"
-#include "trick/tc_proto.h"
-#include "trick/trick_byteswap.h"
-#include "trick/trick_error_hndlr.h"
+#include	"trick/tc.h"
+#include	"trick/attributes.h"
+#include	"trick/tc_proto.h"
+#include	"trick/trick_byteswap.h"
+#include	"trick/trick_error_hndlr.h"
 
-class TCSetBlockIOTest : public testing::Test {
+class	TCSetBlockIOTest	:	public	testing::Test	{
 
-   protected:
-      TCSetBlockIOTest(){}
-      ~TCSetBlockIOTest(){}
+			protected:
+						TCSetBlockIOTest(){}
+						~TCSetBlockIOTest(){}
 
-      TCDevice* device;
+						TCDevice*	device;
 
-      void SetUp(){
+						void	SetUp(){
 
-         device = (TCDevice *) malloc(sizeof(TCDevice));
-         memset( (void *)device,'\0',sizeof(TCDevice) );
-      }
+									device	=	(TCDevice	*)	malloc(sizeof(TCDevice));
+									memset(	(void	*)device,'\0',sizeof(TCDevice)	);
+						}
 
-      void TearDown(){
+						void	TearDown(){
 
-         free(device);
-      }
+									free(device);
+						}
 };
 
-TEST_F( TCSetBlockIOTest, testNoDevice ) {
+TEST_F(	TCSetBlockIOTest,	testNoDevice	)	{
 
-   int set_blockio_status = tc_set_blockio_timeout_limit( NULL, 0 );
+			int	set_blockio_status	=	tc_set_blockio_timeout_limit(	NULL,	0	);
 
-   EXPECT_EQ( set_blockio_status, -1 );
+			EXPECT_EQ(	set_blockio_status,	-1	);
 }
 
-TEST_F( TCSetBlockIOTest, testSuccess ) {
+TEST_F(	TCSetBlockIOTest,	testSuccess	)	{
 
-   int set_blockio_status = tc_set_blockio_timeout_limit( device, 5 );
+			int	set_blockio_status	=	tc_set_blockio_timeout_limit(	device,	5	);
 
-   EXPECT_EQ( set_blockio_status, 0 );
-   EXPECT_EQ( device->blockio_limit, 5 );
+			EXPECT_EQ(	set_blockio_status,	0	);
+			EXPECT_EQ(	device->blockio_limit,	5	);
 }
diff --git a/trick_source/trick_utils/compareFloatingPoint/src/compareFloatingPoint.cpp b/trick_source/trick_utils/compareFloatingPoint/src/compareFloatingPoint.cpp
index 76a888ba6..5c4235734 100644
--- a/trick_source/trick_utils/compareFloatingPoint/src/compareFloatingPoint.cpp
+++ b/trick_source/trick_utils/compareFloatingPoint/src/compareFloatingPoint.cpp
@@ -1,70 +1,70 @@
-#include <float.h>
-#include <math.h>
-#include "trick/compareFloatingPoint.hh"
+#include	<float.h>
+#include	<math.h>
+#include	"trick/compareFloatingPoint.hh"
 
-bool Trick::dbl_is_near( double A, double B, double tolerance) {
+bool	Trick::dbl_is_near(	double	A,	double	B,	double	tolerance)	{
 
-    if (isnan(A) || isnan(B) || isinf(A) || isinf(B)) { return false; }
+				if	(isnan(A)	||	isnan(B)	||	isinf(A)	||	isinf(B))	{	return	false;	}
 
-    // If A or B is a FP_SUBNORMAL that is: less than
-    // DBL_MIN (2.22507e-308) then set it to zero.
-    if ( fpclassify(A) == FP_SUBNORMAL ) { A = 0.0; }
-    if ( fpclassify(B) == FP_SUBNORMAL ) { B = 0.0; }
+				//	If	A	or	B	is	a	FP_SUBNORMAL	that	is:	less	than
+				//	DBL_MIN	(2.22507e-308)	then	set	it	to	zero.
+				if	(	fpclassify(A)	==	FP_SUBNORMAL	)	{	A	=	0.0;	}
+				if	(	fpclassify(B)	==	FP_SUBNORMAL	)	{	B	=	0.0;	}
 
-    // If A and B are identical, then they're close_enough.
-    if (A==B) { return true; }
+				//	If	A	and	B	are	identical,	then	they're	close_enough.
+				if	(A==B)	{	return	true;	}
 
-    // The tolerance must be an FP_NORMAL. Neither of FP_INFINITE and
-    // FP_NAN makes sense. Nor do FP_SUBNORMAL and FP_ZERO, given
-    // the above tests.
+				//	The	tolerance	must	be	an	FP_NORMAL.	Neither	of	FP_INFINITE	and
+				//	FP_NAN	makes	sense.	Nor	do	FP_SUBNORMAL	and	FP_ZERO,	given
+				//	the	above	tests.
 
-    // In order than we not generate an FP_underflow, we must set the minimum
-    // allowable tolerance such that fmin(A,B)+tolerance (or fmax(A,B)-tolerance)
-    // cannot be FP_SUBNORMAL. This is only possible if (tolerance >= DBL_MIN/DBL_EPSILON),
-    // where the gap_size around tolerance >= DBL_MIN, the smallest FP_NORMAL number.
-    // So, if A and B are within 1.00208e-292 of each other, they will always be
-    // considered close_enough.
-    if (( fpclassify(tolerance) != FP_NORMAL ) || (tolerance < (DBL_MIN/DBL_EPSILON) )) {
-       tolerance = (DBL_MIN/DBL_EPSILON);
-    }
+				//	In	order	than	we	not	generate	an	FP_underflow,	we	must	set	the	minimum
+				//	allowable	tolerance	such	that	fmin(A,B)+tolerance	(or	fmax(A,B)-tolerance)
+				//	cannot	be	FP_SUBNORMAL.	This	is	only	possible	if	(tolerance	>=	DBL_MIN/DBL_EPSILON),
+				//	where	the	gap_size	around	tolerance	>=	DBL_MIN,	the	smallest	FP_NORMAL	number.
+				//	So,	if	A	and	B	are	within	1.00208e-292	of	each	other,	they	will	always	be
+				//	considered	close_enough.
+				if	((	fpclassify(tolerance)	!=	FP_NORMAL	)	||	(tolerance	<	(DBL_MIN/DBL_EPSILON)	))	{
+							tolerance	=	(DBL_MIN/DBL_EPSILON);
+				}
 
-    // For A and B to be close enough, the tolerance must be greater than or
-    // equal to the larger of the gaps around A and B.
-    if ( tolerance >= DBL_EPSILON * fmax( fabs(A), fabs(B))) {
+				//	For	A	and	B	to	be	close	enough,	the	tolerance	must	be	greater	than	or
+				//	equal	to	the	larger	of	the	gaps	around	A	and	B.
+				if	(	tolerance	>=	DBL_EPSILON	*	fmax(	fabs(A),	fabs(B)))	{
 
-        // We want to avoid directly computing the difference between A and B.
-        // We might otherwise generate an FP_SUBNORMAL. For example:
-        // If A = (1.5*DBL_MIN), and B = DBL_MIN, the difference is an
-        // FP_SUBNORMAL value.
-        // When FP_SUBNORMAL values are generated, so are FP_underflows.
-        // By insisting that A and B are FP_NORMAL and that the
-        // gap_size around our tolerance is at least DBL_MIN, then we
-        // can avoid generating FP_SUBNORMALs.
-        if ((fmin(A,B) + tolerance) >= fmax(A,B)) {
-            return true ; // A and B are close enough.
-        } else {
-            return false ;
-        }
-    } else {
-        return false;
-    }
+								//	We	want	to	avoid	directly	computing	the	difference	between	A	and	B.
+								//	We	might	otherwise	generate	an	FP_SUBNORMAL.	For	example:
+								//	If	A	=	(1.5*DBL_MIN),	and	B	=	DBL_MIN,	the	difference	is	an
+								//	FP_SUBNORMAL	value.
+								//	When	FP_SUBNORMAL	values	are	generated,	so	are	FP_underflows.
+								//	By	insisting	that	A	and	B	are	FP_NORMAL	and	that	the
+								//	gap_size	around	our	tolerance	is	at	least	DBL_MIN,	then	we
+								//	can	avoid	generating	FP_SUBNORMALs.
+								if	((fmin(A,B)	+	tolerance)	>=	fmax(A,B))	{
+												return	true	;	//	A	and	B	are	close	enough.
+								}	else	{
+												return	false	;
+								}
+				}	else	{
+								return	false;
+				}
 }
 
-bool Trick::flt_is_near( float A, float B, float tolerance) {
-    if (isnan(A) || isnan(B) || isinf(A) || isinf(B)) { return false; }
-    if ( fpclassify(A) == FP_SUBNORMAL ) { A = 0.0; }
-    if ( fpclassify(B) == FP_SUBNORMAL ) { B = 0.0; }
-    if (A==B) { return true; }
-    if (( fpclassify(tolerance) != FP_NORMAL ) || (tolerance < (FLT_MIN/FLT_EPSILON) )) {
-       tolerance = (FLT_MIN/FLT_EPSILON);
-    }
-    if ( tolerance >= FLT_EPSILON * fmax( fabs(A), fabs(B))) {
-        if ((fmin(A,B) + tolerance) >= fmax(A,B)) {
-            return true ;
-        } else {
-            return false ;
-        }
-    } else {
-        return false;
-    }
+bool	Trick::flt_is_near(	float	A,	float	B,	float	tolerance)	{
+				if	(isnan(A)	||	isnan(B)	||	isinf(A)	||	isinf(B))	{	return	false;	}
+				if	(	fpclassify(A)	==	FP_SUBNORMAL	)	{	A	=	0.0;	}
+				if	(	fpclassify(B)	==	FP_SUBNORMAL	)	{	B	=	0.0;	}
+				if	(A==B)	{	return	true;	}
+				if	((	fpclassify(tolerance)	!=	FP_NORMAL	)	||	(tolerance	<	(FLT_MIN/FLT_EPSILON)	))	{
+							tolerance	=	(FLT_MIN/FLT_EPSILON);
+				}
+				if	(	tolerance	>=	FLT_EPSILON	*	fmax(	fabs(A),	fabs(B)))	{
+								if	((fmin(A,B)	+	tolerance)	>=	fmax(A,B))	{
+												return	true	;
+								}	else	{
+												return	false	;
+								}
+				}	else	{
+								return	false;
+				}
 }
diff --git a/trick_source/trick_utils/connection_handlers/ClientConnection.cpp b/trick_source/trick_utils/connection_handlers/ClientConnection.cpp
index 3df752b4a..9b8a2e0ad 100644
--- a/trick_source/trick_utils/connection_handlers/ClientConnection.cpp
+++ b/trick_source/trick_utils/connection_handlers/ClientConnection.cpp
@@ -1 +1 @@
-#include "trick/ClientConnection.hh"
\ No newline at end of file
+#include	"trick/ClientConnection.hh"
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/MulticastGroup.cpp b/trick_source/trick_utils/connection_handlers/MulticastGroup.cpp
index 35c9bc6da..f4c214768 100644
--- a/trick_source/trick_utils/connection_handlers/MulticastGroup.cpp
+++ b/trick_source/trick_utils/connection_handlers/MulticastGroup.cpp
@@ -1,228 +1,228 @@
-#include "trick/MulticastGroup.hh"
-#include <string.h>
-#include <vector>
-#include <sstream>
+#include	"trick/MulticastGroup.hh"
+#include	<string.h>
+#include	<vector>
+#include	<sstream>
 
 
-Trick::MulticastGroup::MulticastGroup() : MulticastGroup(new SystemInterface) {}
+Trick::MulticastGroup::MulticastGroup()	:	MulticastGroup(new	SystemInterface)	{}
 
-Trick::MulticastGroup::MulticastGroup (SystemInterface * system_interface) : _initialized(false), _system_interface(system_interface) {}
+Trick::MulticastGroup::MulticastGroup	(SystemInterface	*	system_interface)	:	_initialized(false),	_system_interface(system_interface)	{}
 
-Trick::MulticastGroup::~MulticastGroup() {}
+Trick::MulticastGroup::~MulticastGroup()	{}
 
-int Trick::MulticastGroup::restart () {
-    // Keep address list the same, but we may need to get a new socket
-    _system_interface = new SystemInterface();
-    // return initialize();
-    // return 0;
+int	Trick::MulticastGroup::restart	()	{
+				//	Keep	address	list	the	same,	but	we	may	need	to	get	a	new	socket
+				_system_interface	=	new	SystemInterface();
+				//	return	initialize();
+				//	return	0;
 }
 
 
-int Trick::MulticastGroup::broadcast (std::string message) {
-    if (!isInitialized()) {
-        return -1;
-    }
-
-    const char * message_send = message.c_str();
-    for (struct sockaddr_in& address : _addresses) {
-        int status = _system_interface->sendto(_socket , message_send , strlen(message_send) , 0 , (struct sockaddr *)&address , (socklen_t)sizeof(address)) ;
-        if (status == -1) {
-            char * readable_addr = inet_ntoa( address.sin_addr );
-            std::string err_msg = "MulticastGroup: Failed to broadcast to address " + std::string(readable_addr);
-            perror(err_msg.c_str());
-        }
-    }
-    return 0;
+int	Trick::MulticastGroup::broadcast	(std::string	message)	{
+				if	(!isInitialized())	{
+								return	-1;
+				}
+
+				const	char	*	message_send	=	message.c_str();
+				for	(struct	sockaddr_in&	address	:	_addresses)	{
+								int	status	=	_system_interface->sendto(_socket	,	message_send	,	strlen(message_send)	,	0	,	(struct	sockaddr	*)&address	,	(socklen_t)sizeof(address))	;
+								if	(status	==	-1)	{
+												char	*	readable_addr	=	inet_ntoa(	address.sin_addr	);
+												std::string	err_msg	=	"MulticastGroup:	Failed	to	broadcast	to	address	"	+	std::string(readable_addr);
+												perror(err_msg.c_str());
+								}
+				}
+				return	0;
 }
 
-int Trick::MulticastGroup::addAddress (std::string addr, int port) {
-    auto in_addr = _system_interface->inet_addr(addr.c_str());
-    if (in_addr == -1) {
-        std::string error_msg = "MulticastGroup: Cannot add address " + addr + " to multicast group";
-        perror(error_msg.c_str());
-        return -1;
-    }
-
-    struct sockaddr_in mcast_addr;
-    memset(&mcast_addr, 0, sizeof(mcast_addr));
-    mcast_addr.sin_family = AF_INET;
-    mcast_addr.sin_addr.s_addr = in_addr;
-    mcast_addr.sin_port = htons((uint16_t) port);;
-    _addresses.emplace_back(mcast_addr);
-    return 0;
+int	Trick::MulticastGroup::addAddress	(std::string	addr,	int	port)	{
+				auto	in_addr	=	_system_interface->inet_addr(addr.c_str());
+				if	(in_addr	==	-1)	{
+								std::string	error_msg	=	"MulticastGroup:	Cannot	add	address	"	+	addr	+	"	to	multicast	group";
+								perror(error_msg.c_str());
+								return	-1;
+				}
+
+				struct	sockaddr_in	mcast_addr;
+				memset(&mcast_addr,	0,	sizeof(mcast_addr));
+				mcast_addr.sin_family	=	AF_INET;
+				mcast_addr.sin_addr.s_addr	=	in_addr;
+				mcast_addr.sin_port	=	htons((uint16_t)	port);;
+				_addresses.emplace_back(mcast_addr);
+				return	0;
 }
 
-bool Trick::MulticastGroup::isInitialized () {
-    return _initialized;
+bool	Trick::MulticastGroup::isInitialized	()	{
+				return	_initialized;
 }
 
-int Trick::MulticastGroup::initialize() {
-    _socket = _system_interface->socket(AF_INET, SOCK_DGRAM, 0);
-    if (_socket < 0) {
-        perror("MulticastGroup: socket");
-        return -1;
-    }
-
-    int option_value = 1;
-    if (_system_interface->setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, (char *) &option_value, (socklen_t) sizeof(option_value)) < 0) {
-        perror("MulticastGroup: setsockopt: reuseaddr");
-        return -1;
-    }
-#ifdef SO_REUSEPORT
-    if (_system_interface->setsockopt(_socket, SOL_SOCKET, SO_REUSEPORT, (char *) &option_value, sizeof(option_value)) < 0) {
-        perror("MulticastGroup: setsockopt: reuseport");
-        return -1;
-    }
+int	Trick::MulticastGroup::initialize()	{
+				_socket	=	_system_interface->socket(AF_INET,	SOCK_DGRAM,	0);
+				if	(_socket	<	0)	{
+								perror("MulticastGroup:	socket");
+								return	-1;
+				}
+
+				int	option_value	=	1;
+				if	(_system_interface->setsockopt(_socket,	SOL_SOCKET,	SO_REUSEADDR,	(char	*)	&option_value,	(socklen_t)	sizeof(option_value))	<	0)	{
+								perror("MulticastGroup:	setsockopt:	reuseaddr");
+								return	-1;
+				}
+#ifdef	SO_REUSEPORT
+				if	(_system_interface->setsockopt(_socket,	SOL_SOCKET,	SO_REUSEPORT,	(char	*)	&option_value,	sizeof(option_value))	<	0)	{
+								perror("MulticastGroup:	setsockopt:	reuseport");
+								return	-1;
+				}
 #endif
-    _initialized = true;
-    return 0;
+				_initialized	=	true;
+				return	0;
 }
 
-int Trick::MulticastGroup::initialize_with_receiving(std::string addr, std::string mcast_addr, int port) {
-    UDPConnection::initialize(addr, port);
-
-    struct ip_mreq mreq;
-    mreq.imr_multiaddr.s_addr = inet_addr(mcast_addr.c_str());
-    mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-    int ret = setsockopt(_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) ;
-    if ( ret < 0 ) {
-        perror("ip_add_membership") ;
-        return ret ;
-    }
-
-    // Save our info so that we know to ignore messages from ourself
-    memset(&_remote_serv_addr, 0, sizeof(struct sockaddr_in));
-    _remote_serv_addr.sin_family = AF_INET;
-    _remote_serv_addr.sin_addr.s_addr = inet_addr(mcast_addr.c_str());
-    _remote_serv_addr.sin_port = htons(port);
-
-    int s_in_size =  sizeof(_self_info) ;
-    getsockname( _socket , (struct sockaddr *)&_self_info, (socklen_t *)&s_in_size) ;
-    if ( _self_info.sin_addr.s_addr == 0 ) {
-        char hname[80];
-        struct hostent *ip_host = NULL;
-        gethostname(hname, (size_t) 80);
-        ip_host = gethostbyname(hname);
-        if (ip_host != NULL) { 
-            memcpy(&(_self_info.sin_addr.s_addr), ip_host->h_addr, (size_t) ip_host->h_length);
-        } else {
-            _self_info.sin_addr.s_addr = inet_addr(addr.c_str());
-            _self_info.sin_port = htons(port);
-        }
-    }
-
-    setBlockMode(false);
-
-
-    return 0;    
+int	Trick::MulticastGroup::initialize_with_receiving(std::string	addr,	std::string	mcast_addr,	int	port)	{
+				UDPConnection::initialize(addr,	port);
+
+				struct	ip_mreq	mreq;
+				mreq.imr_multiaddr.s_addr	=	inet_addr(mcast_addr.c_str());
+				mreq.imr_interface.s_addr	=	htonl(INADDR_ANY);
+				int	ret	=	setsockopt(_socket,	IPPROTO_IP,	IP_ADD_MEMBERSHIP,	&mreq,	sizeof(mreq))	;
+				if	(	ret	<	0	)	{
+								perror("ip_add_membership")	;
+								return	ret	;
+				}
+
+				//	Save	our	info	so	that	we	know	to	ignore	messages	from	ourself
+				memset(&_remote_serv_addr,	0,	sizeof(struct	sockaddr_in));
+				_remote_serv_addr.sin_family	=	AF_INET;
+				_remote_serv_addr.sin_addr.s_addr	=	inet_addr(mcast_addr.c_str());
+				_remote_serv_addr.sin_port	=	htons(port);
+
+				int	s_in_size	=		sizeof(_self_info)	;
+				getsockname(	_socket	,	(struct	sockaddr	*)&_self_info,	(socklen_t	*)&s_in_size)	;
+				if	(	_self_info.sin_addr.s_addr	==	0	)	{
+								char	hname[80];
+								struct	hostent	*ip_host	=	NULL;
+								gethostname(hname,	(size_t)	80);
+								ip_host	=	gethostbyname(hname);
+								if	(ip_host	!=	NULL)	{	
+												memcpy(&(_self_info.sin_addr.s_addr),	ip_host->h_addr,	(size_t)	ip_host->h_length);
+								}	else	{
+												_self_info.sin_addr.s_addr	=	inet_addr(addr.c_str());
+												_self_info.sin_port	=	htons(port);
+								}
+				}
+
+				setBlockMode(false);
+
+
+				return	0;				
 }
 
-int Trick::MulticastGroup::disconnect() {
-    if (_initialized) {
-        _system_interface->close(_socket);
-    }
-    return 0;
+int	Trick::MulticastGroup::disconnect()	{
+				if	(_initialized)	{
+								_system_interface->close(_socket);
+				}
+				return	0;
 }
 
 
-int Trick::MulticastGroup::write (char * message, int size) {
-    if (!_started)
-        return -1;
+int	Trick::MulticastGroup::write	(char	*	message,	int	size)	{
+				if	(!_started)
+								return	-1;
 
-    socklen_t sock_size = sizeof(_remote_serv_addr);
+				socklen_t	sock_size	=	sizeof(_remote_serv_addr);
 
-    return _system_interface->sendto(_socket, message, size, 0, (struct sockaddr *) &_remote_serv_addr, sock_size );
+				return	_system_interface->sendto(_socket,	message,	size,	0,	(struct	sockaddr	*)	&_remote_serv_addr,	sock_size	);
 }
 
-int Trick::MulticastGroup::write (const std::string& message) {
-    if (!_started)
-        return -1;
+int	Trick::MulticastGroup::write	(const	std::string&	message)	{
+				if	(!_started)
+								return	-1;
 
-    char send_buf[message.length()+1];
-    strcpy (send_buf, message.c_str());
-    socklen_t sock_size = sizeof(_remote_serv_addr);
+				char	send_buf[message.length()+1];
+				strcpy	(send_buf,	message.c_str());
+				socklen_t	sock_size	=	sizeof(_remote_serv_addr);
 
-    return _system_interface->sendto(_socket, send_buf, message.length(), 0, (struct sockaddr *) &_remote_serv_addr, sock_size );
+				return	_system_interface->sendto(_socket,	send_buf,	message.length(),	0,	(struct	sockaddr	*)	&_remote_serv_addr,	sock_size	);
 }
 
 
-int Trick::MulticastGroup::read  (std::string& message, int max_len) {
-    if (!_started)
-        return 0;
-
-    struct sockaddr_in s_in ;
-    socklen_t sock_size = sizeof(s_in) ;
-
-    char incoming_msg[max_len];
-    int nbytes = _system_interface->recvfrom( _socket, incoming_msg, MAX_CMD_LEN, MSG_PEEK,(struct sockaddr *)&s_in, &sock_size ) ;
-
-    if (nbytes == 0 ) {
-        return 0;
-    }
-
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            // There's nothing ready in the socket, just return an empty string
-            message = "";
-            return 0;
-        }
-
-        // Otherwise, some other system error has occurred. Return an error.
-        return -1;
-    }
-
-    // Make sure that this message isn't from ourself
-    if ( s_in.sin_addr.s_addr == _self_info.sin_addr.s_addr && s_in.sin_port == _self_info.sin_port) {
-        // Clear out the socket
-        _system_interface->recvfrom( _socket, incoming_msg, MAX_CMD_LEN, 0 , 0, 0) ;
-        return 0;
-    }
-
-    /* find the last newline that is present on the socket */
-    incoming_msg[nbytes] = '\0' ;
-    char *last_newline = rindex( incoming_msg , '\n') ;
-
-    /* if there is a newline then there is a complete command on the socket */
-    if ( last_newline != NULL ) {
-        socklen_t sock_size = sizeof(_remote_serv_addr);
-        /* only remove up to (and including) the last newline on the socket */
-        int size = last_newline - incoming_msg + 1;
-        nbytes = _system_interface->recvfrom( _socket, incoming_msg, size, 0 , 0, 0) ;
-    } else {
-        nbytes = 0 ;
-    }
-    
-    std::stringstream msg_stream;
-
-    if ( nbytes > 0 ) {
-        // Strip out \r characers
-
-        int msg_len = nbytes ;
-        incoming_msg[msg_len] = '\0' ;
-
-        for( int ii = 0 , jj = 0 ; ii <= msg_len ; ii++ ) {
-            if ( incoming_msg[ii] != '\r' ) {
-                msg_stream << incoming_msg[ii] ;
-            }
-        }
-    }
-
-    message = msg_stream.str();
-    return message.size();
+int	Trick::MulticastGroup::read		(std::string&	message,	int	max_len)	{
+				if	(!_started)
+								return	0;
+
+				struct	sockaddr_in	s_in	;
+				socklen_t	sock_size	=	sizeof(s_in)	;
+
+				char	incoming_msg[max_len];
+				int	nbytes	=	_system_interface->recvfrom(	_socket,	incoming_msg,	MAX_CMD_LEN,	MSG_PEEK,(struct	sockaddr	*)&s_in,	&sock_size	)	;
+
+				if	(nbytes	==	0	)	{
+								return	0;
+				}
+
+				if	(nbytes	==	-1)	{
+								if	(errno	==	EAGAIN	||	errno	==	EWOULDBLOCK)	{
+												//	There's	nothing	ready	in	the	socket,	just	return	an	empty	string
+												message	=	"";
+												return	0;
+								}
+
+								//	Otherwise,	some	other	system	error	has	occurred.	Return	an	error.
+								return	-1;
+				}
+
+				//	Make	sure	that	this	message	isn't	from	ourself
+				if	(	s_in.sin_addr.s_addr	==	_self_info.sin_addr.s_addr	&&	s_in.sin_port	==	_self_info.sin_port)	{
+								//	Clear	out	the	socket
+								_system_interface->recvfrom(	_socket,	incoming_msg,	MAX_CMD_LEN,	0	,	0,	0)	;
+								return	0;
+				}
+
+				/*	find	the	last	newline	that	is	present	on	the	socket	*/
+				incoming_msg[nbytes]	=	'\0'	;
+				char	*last_newline	=	rindex(	incoming_msg	,	'\n')	;
+
+				/*	if	there	is	a	newline	then	there	is	a	complete	command	on	the	socket	*/
+				if	(	last_newline	!=	NULL	)	{
+								socklen_t	sock_size	=	sizeof(_remote_serv_addr);
+								/*	only	remove	up	to	(and	including)	the	last	newline	on	the	socket	*/
+								int	size	=	last_newline	-	incoming_msg	+	1;
+								nbytes	=	_system_interface->recvfrom(	_socket,	incoming_msg,	size,	0	,	0,	0)	;
+				}	else	{
+								nbytes	=	0	;
+				}
+				
+				std::stringstream	msg_stream;
+
+				if	(	nbytes	>	0	)	{
+								//	Strip	out	\r	characers
+
+								int	msg_len	=	nbytes	;
+								incoming_msg[msg_len]	=	'\0'	;
+
+								for(	int	ii	=	0	,	jj	=	0	;	ii	<=	msg_len	;	ii++	)	{
+												if	(	incoming_msg[ii]	!=	'\r'	)	{
+																msg_stream	<<	incoming_msg[ii]	;
+												}
+								}
+				}
+
+				message	=	msg_stream.str();
+				return	message.size();
 }
 
-std::string Trick::MulticastGroup::getClientHostname() {
-    if (!_started) {
-        return "";
-    }
+std::string	Trick::MulticastGroup::getClientHostname()	{
+				if	(!_started)	{
+								return	"";
+				}
 
-    return inet_ntoa(_remote_serv_addr.sin_addr);
+				return	inet_ntoa(_remote_serv_addr.sin_addr);
 }
 
-int Trick::MulticastGroup::getClientPort() {
-    if (!_started) {
-        return 0;
-    }
+int	Trick::MulticastGroup::getClientPort()	{
+				if	(!_started)	{
+								return	0;
+				}
 
-    return ntohs(_remote_serv_addr.sin_port);
+				return	ntohs(_remote_serv_addr.sin_port);
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/TCPClientListener.cpp b/trick_source/trick_utils/connection_handlers/TCPClientListener.cpp
index 12b5e158c..9d5d8c332 100644
--- a/trick_source/trick_utils/connection_handlers/TCPClientListener.cpp
+++ b/trick_source/trick_utils/connection_handlers/TCPClientListener.cpp
@@ -1,271 +1,271 @@
-#include <unistd.h>
-#include <iostream>
-#include <sys/select.h>
-#include <netinet/tcp.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
-#include "trick/TCPClientListener.hh"
-
-Trick::TCPClientListener::TCPClientListener () : TCPClientListener (new SystemInterface()) {}
-Trick::TCPClientListener::TCPClientListener (SystemInterface * system_interface) : _listen_socket(-1), _hostname(""), _port(0), _client_tag("<empty>"), _initialized(false), _system_interface(system_interface) {}
-
-Trick::TCPClientListener::~TCPClientListener () {
-    // Clean up our socket if initialized
-    if (_initialized) {
-        close (_listen_socket);
-    }
-
-    delete _system_interface;
+#include	<unistd.h>
+#include	<iostream>
+#include	<sys/select.h>
+#include	<netinet/tcp.h>
+#include	<fcntl.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<netdb.h>
+#include	<unistd.h>
+#include	<arpa/inet.h>
+
+#include	"trick/TCPClientListener.hh"
+
+Trick::TCPClientListener::TCPClientListener	()	:	TCPClientListener	(new	SystemInterface())	{}
+Trick::TCPClientListener::TCPClientListener	(SystemInterface	*	system_interface)	:	_listen_socket(-1),	_hostname(""),	_port(0),	_client_tag("<empty>"),	_initialized(false),	_system_interface(system_interface)	{}
+
+Trick::TCPClientListener::~TCPClientListener	()	{
+				//	Clean	up	our	socket	if	initialized
+				if	(_initialized)	{
+								close	(_listen_socket);
+				}
+
+				delete	_system_interface;
 }
 
-int Trick::TCPClientListener::initialize(std::string in_hostname, int in_port) {
-
-    if ((_listen_socket = _system_interface->socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-        perror ("Server: Unable to open socket");
-        return LISTENER_ERROR;
-    }
-
-    int option_val = 1;
-
-    // Do not replicate the socket's handle if this process is forked
-    // Removing this will cause all kinds of problems when starting a variable server client via input file
-    _system_interface->fcntl(_listen_socket, F_SETFD, FD_CLOEXEC);
-
-    // Allow socket's bound address to be used by others
-    if (_system_interface->setsockopt(_listen_socket, SOL_SOCKET, SO_REUSEADDR, (const char *) &option_val, (socklen_t) sizeof(option_val)) != 0) {
-        perror("Server: Could not set socket to reuse addr");
-        _system_interface->close (_listen_socket);
-        return LISTENER_ERROR;
-    }
-    // Turn off data buffering on the send side
-    if (_system_interface->setsockopt(_listen_socket, IPPROTO_TCP, TCP_NODELAY, (const void *) &option_val, (socklen_t) sizeof(option_val)) != 0) {
-        perror("Server: Could not turn off data buffering");
-        _system_interface->close (_listen_socket);
-        return LISTENER_ERROR;
-    }
-
-    struct sockaddr_in s_in;
-    memset(&s_in, 0 , sizeof(struct sockaddr_in)) ;
-
-    // Look up the hostname
-    char name[80];
-    gethostname(name, (size_t) 80);
-
-    struct hostent *ip_host ;
-    socklen_t s_in_size =  sizeof(s_in) ;
-
-    s_in.sin_family = AF_INET;
-
-    if (in_hostname == "" || in_hostname == "localhost" || strcmp(in_hostname.c_str(),name) == 0) {
-        s_in.sin_addr.s_addr = INADDR_ANY;
-        _hostname = std::string(name);
-    } else if ( inet_pton(AF_INET, in_hostname.c_str(), (struct in_addr *)&s_in.sin_addr.s_addr) == 1 ) {
-        /* numeric character string address */
-        _hostname = in_hostname;
-    } else if ( (ip_host = gethostbyname(in_hostname.c_str())) != NULL ) {
-        /* some name other than the default name was given */
-        memcpy((void *) &(s_in.sin_addr.s_addr), (const void *) ip_host->h_addr, (size_t) ip_host->h_length);
-        _hostname = in_hostname;
-    } else {
-        perror("Server: Could not determine source address");
-        return -1 ;
-    }
-
-    // Set port
-    s_in.sin_port = htons((short) in_port);
-
-    // Bind to socket
-    if (_system_interface->bind(_listen_socket, (struct sockaddr *)&s_in, sizeof(s_in)) < 0) {
-
-        perror("Server: Could not bind to socket");
-        _system_interface->close (_listen_socket);
-        return LISTENER_ERROR;
-    } 
-
-    // Check that correct port was bound to
-    _system_interface->getsockname( _listen_socket , (struct sockaddr *)&s_in, &s_in_size) ;
-    int bound_port = ntohs(s_in.sin_port);
-
-    if (in_port != 0 && bound_port != in_port) {
-        std::cerr << "Server: Could not bind to requested port " << in_port << std::endl;
-        _system_interface->close(_listen_socket);
-        return LISTENER_ERROR;
-    }
-
-    // Save port number
-    _port = bound_port;
-    
-
-    // Start listening
-    if (_system_interface->listen(_listen_socket, SOMAXCONN) < 0) {
-        std::string error_message = "Server: Could not listen on port " + std::to_string(_port);
-        perror (error_message.c_str());
-        _system_interface->close(_listen_socket);
-        return LISTENER_ERROR;
-    }
-
-    // Done!
-    _initialized = true;
-    return 0;
+int	Trick::TCPClientListener::initialize(std::string	in_hostname,	int	in_port)	{
+
+				if	((_listen_socket	=	_system_interface->socket(AF_INET,	SOCK_STREAM,	0))	<	0)	{
+								perror	("Server:	Unable	to	open	socket");
+								return	LISTENER_ERROR;
+				}
+
+				int	option_val	=	1;
+
+				//	Do	not	replicate	the	socket's	handle	if	this	process	is	forked
+				//	Removing	this	will	cause	all	kinds	of	problems	when	starting	a	variable	server	client	via	input	file
+				_system_interface->fcntl(_listen_socket,	F_SETFD,	FD_CLOEXEC);
+
+				//	Allow	socket's	bound	address	to	be	used	by	others
+				if	(_system_interface->setsockopt(_listen_socket,	SOL_SOCKET,	SO_REUSEADDR,	(const	char	*)	&option_val,	(socklen_t)	sizeof(option_val))	!=	0)	{
+								perror("Server:	Could	not	set	socket	to	reuse	addr");
+								_system_interface->close	(_listen_socket);
+								return	LISTENER_ERROR;
+				}
+				//	Turn	off	data	buffering	on	the	send	side
+				if	(_system_interface->setsockopt(_listen_socket,	IPPROTO_TCP,	TCP_NODELAY,	(const	void	*)	&option_val,	(socklen_t)	sizeof(option_val))	!=	0)	{
+								perror("Server:	Could	not	turn	off	data	buffering");
+								_system_interface->close	(_listen_socket);
+								return	LISTENER_ERROR;
+				}
+
+				struct	sockaddr_in	s_in;
+				memset(&s_in,	0	,	sizeof(struct	sockaddr_in))	;
+
+				//	Look	up	the	hostname
+				char	name[80];
+				gethostname(name,	(size_t)	80);
+
+				struct	hostent	*ip_host	;
+				socklen_t	s_in_size	=		sizeof(s_in)	;
+
+				s_in.sin_family	=	AF_INET;
+
+				if	(in_hostname	==	""	||	in_hostname	==	"localhost"	||	strcmp(in_hostname.c_str(),name)	==	0)	{
+								s_in.sin_addr.s_addr	=	INADDR_ANY;
+								_hostname	=	std::string(name);
+				}	else	if	(	inet_pton(AF_INET,	in_hostname.c_str(),	(struct	in_addr	*)&s_in.sin_addr.s_addr)	==	1	)	{
+								/*	numeric	character	string	address	*/
+								_hostname	=	in_hostname;
+				}	else	if	(	(ip_host	=	gethostbyname(in_hostname.c_str()))	!=	NULL	)	{
+								/*	some	name	other	than	the	default	name	was	given	*/
+								memcpy((void	*)	&(s_in.sin_addr.s_addr),	(const	void	*)	ip_host->h_addr,	(size_t)	ip_host->h_length);
+								_hostname	=	in_hostname;
+				}	else	{
+								perror("Server:	Could	not	determine	source	address");
+								return	-1	;
+				}
+
+				//	Set	port
+				s_in.sin_port	=	htons((short)	in_port);
+
+				//	Bind	to	socket
+				if	(_system_interface->bind(_listen_socket,	(struct	sockaddr	*)&s_in,	sizeof(s_in))	<	0)	{
+
+								perror("Server:	Could	not	bind	to	socket");
+								_system_interface->close	(_listen_socket);
+								return	LISTENER_ERROR;
+				}	
+
+				//	Check	that	correct	port	was	bound	to
+				_system_interface->getsockname(	_listen_socket	,	(struct	sockaddr	*)&s_in,	&s_in_size)	;
+				int	bound_port	=	ntohs(s_in.sin_port);
+
+				if	(in_port	!=	0	&&	bound_port	!=	in_port)	{
+								std::cerr	<<	"Server:	Could	not	bind	to	requested	port	"	<<	in_port	<<	std::endl;
+								_system_interface->close(_listen_socket);
+								return	LISTENER_ERROR;
+				}
+
+				//	Save	port	number
+				_port	=	bound_port;
+				
+
+				//	Start	listening
+				if	(_system_interface->listen(_listen_socket,	SOMAXCONN)	<	0)	{
+								std::string	error_message	=	"Server:	Could	not	listen	on	port	"	+	std::to_string(_port);
+								perror	(error_message.c_str());
+								_system_interface->close(_listen_socket);
+								return	LISTENER_ERROR;
+				}
+
+				//	Done!
+				_initialized	=	true;
+				return	0;
 }
 
-int Trick::TCPClientListener::initialize() {
-    return initialize("", 0);
+int	Trick::TCPClientListener::initialize()	{
+				return	initialize("",	0);
 }
 
 
-int Trick::TCPClientListener::setBlockMode(bool blocking) {
-    if (!_initialized)
-        return -1;
+int	Trick::TCPClientListener::setBlockMode(bool	blocking)	{
+				if	(!_initialized)
+								return	-1;
 
-    int flag = _system_interface->fcntl(_listen_socket, F_GETFL, 0);
+				int	flag	=	_system_interface->fcntl(_listen_socket,	F_GETFL,	0);
 
-    if (flag == -1) {
-        std::string error_message = "Unable to get flags for fd " + std::to_string(_listen_socket) + " block mode to " + std::to_string(blocking);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(flag	==	-1)	{
+								std::string	error_message	=	"Unable	to	get	flags	for	fd	"	+	std::to_string(_listen_socket)	+	"	block	mode	to	"	+	std::to_string(blocking);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    if (blocking) {
-        flag &= ~O_NONBLOCK;
-    } else {
-        flag |= O_NONBLOCK;
-    }
+				if	(blocking)	{
+								flag	&=	~O_NONBLOCK;
+				}	else	{
+								flag	|=	O_NONBLOCK;
+				}
 
-    if (_system_interface->fcntl(_listen_socket, F_SETFL, flag) == -1) {
-        std::string error_message = "Unable to set fd " + std::to_string(_listen_socket) + " block mode to " + std::to_string(blocking);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(_system_interface->fcntl(_listen_socket,	F_SETFL,	flag)	==	-1)	{
+								std::string	error_message	=	"Unable	to	set	fd	"	+	std::to_string(_listen_socket)	+	"	block	mode	to	"	+	std::to_string(blocking);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    return 0;
+				return	0;
 }
 
 
-bool Trick::TCPClientListener::checkForNewConnections() {
-    if (!_initialized)
-        return false;
+bool	Trick::TCPClientListener::checkForNewConnections()	{
+				if	(!_initialized)
+								return	false;
 
-    fd_set rfds;
-    struct timeval timeout_time = { 2, 0 };
-    FD_ZERO(&rfds);
-    FD_SET(_listen_socket, &rfds);
-    timeout_time.tv_sec = 2 ;
+				fd_set	rfds;
+				struct	timeval	timeout_time	=	{	2,	0	};
+				FD_ZERO(&rfds);
+				FD_SET(_listen_socket,	&rfds);
+				timeout_time.tv_sec	=	2	;
 
-    // Listen with a timeout of 2 seconds
-    int result = _system_interface->select(_listen_socket + 1, &rfds, NULL, NULL, &timeout_time);
+				//	Listen	with	a	timeout	of	2	seconds
+				int	result	=	_system_interface->select(_listen_socket	+	1,	&rfds,	NULL,	NULL,	&timeout_time);
 
-    // If there's some kind of error, just ignore it and return false
-    if (result < 0) {
-        return false;
-    }
+				//	If	there's	some	kind	of	error,	just	ignore	it	and	return	false
+				if	(result	<	0)	{
+								return	false;
+				}
 
-    return FD_ISSET(_listen_socket, &rfds);
+				return	FD_ISSET(_listen_socket,	&rfds);
 }
 
 
 
-std::string Trick::TCPClientListener::getHostname () {
-    if (!_initialized)
-        return "";
+std::string	Trick::TCPClientListener::getHostname	()	{
+				if	(!_initialized)
+								return	"";
 
-    return _hostname;
+				return	_hostname;
 }
 
 
-int Trick::TCPClientListener::getPort() {
-    if (!_initialized)
-        return -1;
+int	Trick::TCPClientListener::getPort()	{
+				if	(!_initialized)
+								return	-1;
 
-    return _port;
+				return	_port;
 }
 
 
-int Trick::TCPClientListener::disconnect() {
-    if (!_initialized) {
-        return -1;
-    }
+int	Trick::TCPClientListener::disconnect()	{
+				if	(!_initialized)	{
+								return	-1;
+				}
 
-    _system_interface->shutdown(_listen_socket, SHUT_RDWR);
-    _system_interface->close (_listen_socket);
-    _initialized = false;
+				_system_interface->shutdown(_listen_socket,	SHUT_RDWR);
+				_system_interface->close	(_listen_socket);
+				_initialized	=	false;
 
-    return 0; 
+				return	0;	
 }
 
-bool Trick::TCPClientListener::validateSourceAddress(std::string in_hostname) {
-    // struct addrinfo hints, *res;
-    // memset(&hints, 0, sizeof hints);
-    // hints.ai_family = AF_INET;
-    // hints.ai_socktype = SOCK_STREAM;
-    // hints.ai_protocol = 0;
-
-    // int err;
-    // if ((err = _system_interface->getaddrinfo(requested_source_address.c_str(), 0, &hints, &res)) != 0) {
-    //     std::cerr << "Unable to lookup address: " << gai_strerror(err) << std::endl;
-    //     return false;
-    // }
-
-        // Look up the hostname
-    char name[80];
-    gethostname(name, (size_t) 80);
-
-    struct hostent *ip_host ;
-    sockaddr_in s_in;
-    socklen_t s_in_size =  sizeof(s_in) ;
-
-    s_in.sin_family = AF_INET;
-
-    if (in_hostname == "" || in_hostname == "localhost" || strcmp(in_hostname.c_str(),name) == 0) {
-        s_in.sin_addr.s_addr = INADDR_ANY;
-        _hostname = std::string(name);
-    } else if ( inet_pton(AF_INET, in_hostname.c_str(), (struct in_addr *)&s_in.sin_addr.s_addr) == 1 ) {
-        /* numeric character string address */
-        _hostname = in_hostname;
-    } else if ( (ip_host = gethostbyname(in_hostname.c_str())) != NULL ) {
-        /* some name other than the default name was given */
-        memcpy((void *) &(s_in.sin_addr.s_addr), (const void *) ip_host->h_addr, (size_t) ip_host->h_length);
-        _hostname = in_hostname;
-    } else {
-        perror("Server: Could not determine source address");
-        return false;
-    }
-
-    return true;
+bool	Trick::TCPClientListener::validateSourceAddress(std::string	in_hostname)	{
+				//	struct	addrinfo	hints,	*res;
+				//	memset(&hints,	0,	sizeof	hints);
+				//	hints.ai_family	=	AF_INET;
+				//	hints.ai_socktype	=	SOCK_STREAM;
+				//	hints.ai_protocol	=	0;
+
+				//	int	err;
+				//	if	((err	=	_system_interface->getaddrinfo(requested_source_address.c_str(),	0,	&hints,	&res))	!=	0)	{
+				//					std::cerr	<<	"Unable	to	lookup	address:	"	<<	gai_strerror(err)	<<	std::endl;
+				//					return	false;
+				//	}
+
+								//	Look	up	the	hostname
+				char	name[80];
+				gethostname(name,	(size_t)	80);
+
+				struct	hostent	*ip_host	;
+				sockaddr_in	s_in;
+				socklen_t	s_in_size	=		sizeof(s_in)	;
+
+				s_in.sin_family	=	AF_INET;
+
+				if	(in_hostname	==	""	||	in_hostname	==	"localhost"	||	strcmp(in_hostname.c_str(),name)	==	0)	{
+								s_in.sin_addr.s_addr	=	INADDR_ANY;
+								_hostname	=	std::string(name);
+				}	else	if	(	inet_pton(AF_INET,	in_hostname.c_str(),	(struct	in_addr	*)&s_in.sin_addr.s_addr)	==	1	)	{
+								/*	numeric	character	string	address	*/
+								_hostname	=	in_hostname;
+				}	else	if	(	(ip_host	=	gethostbyname(in_hostname.c_str()))	!=	NULL	)	{
+								/*	some	name	other	than	the	default	name	was	given	*/
+								memcpy((void	*)	&(s_in.sin_addr.s_addr),	(const	void	*)	ip_host->h_addr,	(size_t)	ip_host->h_length);
+								_hostname	=	in_hostname;
+				}	else	{
+								perror("Server:	Could	not	determine	source	address");
+								return	false;
+				}
+
+				return	true;
 }
 
-int Trick::TCPClientListener::checkSocket() {
-    if (!_initialized)
-        return -1;
+int	Trick::TCPClientListener::checkSocket()	{
+				if	(!_initialized)
+								return	-1;
 
-    struct sockaddr_in s_in;
-    socklen_t s_in_size =  sizeof(s_in) ;
-    _system_interface->getsockname( _listen_socket , (struct sockaddr *)&s_in, &s_in_size) ;
-    _port = ntohs(s_in.sin_port);
+				struct	sockaddr_in	s_in;
+				socklen_t	s_in_size	=		sizeof(s_in)	;
+				_system_interface->getsockname(	_listen_socket	,	(struct	sockaddr	*)&s_in,	&s_in_size)	;
+				_port	=	ntohs(s_in.sin_port);
 
-    return 0;
+				return	0;
 }
 
-bool Trick::TCPClientListener::isInitialized() {
-    return _initialized;
+bool	Trick::TCPClientListener::isInitialized()	{
+				return	_initialized;
 }
 
-Trick::TCPConnection * Trick::TCPClientListener::setUpNewConnection () {
-    if (!_initialized)
-        return NULL;
+Trick::TCPConnection	*	Trick::TCPClientListener::setUpNewConnection	()	{
+				if	(!_initialized)
+								return	NULL;
 
-    TCPConnection * connection = new TCPConnection(_listen_socket);
-    return connection;
+				TCPConnection	*	connection	=	new	TCPConnection(_listen_socket);
+				return	connection;
 }
 
-int Trick::TCPClientListener::restart () {
-    _system_interface = new SystemInterface();
-    return 0;
+int	Trick::TCPClientListener::restart	()	{
+				_system_interface	=	new	SystemInterface();
+				return	0;
 }
- 
+	
 
diff --git a/trick_source/trick_utils/connection_handlers/TCPConnection.cpp b/trick_source/trick_utils/connection_handlers/TCPConnection.cpp
index a72ef7f49..a95d8f951 100644
--- a/trick_source/trick_utils/connection_handlers/TCPConnection.cpp
+++ b/trick_source/trick_utils/connection_handlers/TCPConnection.cpp
@@ -1,201 +1,201 @@
-#include "trick/TCPConnection.hh"
+#include	"trick/TCPConnection.hh"
 
-#include <sstream>
-#include <iostream>
-#include <cstring>
-#include <strings.h>
+#include	<sstream>
+#include	<iostream>
+#include	<cstring>
+#include	<strings.h>
 
-Trick::TCPConnection::TCPConnection () : TCPConnection(0, new SystemInterface()) {}
+Trick::TCPConnection::TCPConnection	()	:	TCPConnection(0,	new	SystemInterface())	{}
 
-Trick::TCPConnection::TCPConnection (SystemInterface * system_interface) : TCPConnection(0, system_interface) {}
+Trick::TCPConnection::TCPConnection	(SystemInterface	*	system_interface)	:	TCPConnection(0,	system_interface)	{}
 
-Trick::TCPConnection::TCPConnection (int listen_socket) : TCPConnection(listen_socket, new SystemInterface()) {}
+Trick::TCPConnection::TCPConnection	(int	listen_socket)	:	TCPConnection(listen_socket,	new	SystemInterface())	{}
 
-Trick::TCPConnection::TCPConnection (int listen_socket, SystemInterface * system_interface) : _system_interface(system_interface), _listen_socket(listen_socket), _socket(0), _connected(false) {
-    _connection_type = TCP;
+Trick::TCPConnection::TCPConnection	(int	listen_socket,	SystemInterface	*	system_interface)	:	_system_interface(system_interface),	_listen_socket(listen_socket),	_socket(0),	_connected(false)	{
+				_connection_type	=	TCP;
 }
 
-int Trick::TCPConnection::start() {
-    if (_listen_socket <= 0) {
-        return -1;
-    }
+int	Trick::TCPConnection::start()	{
+				if	(_listen_socket	<=	0)	{
+								return	-1;
+				}
 
-    // Accept a waiting connection
-    struct sockaddr_storage their_addr;
-    socklen_t addr_size = sizeof their_addr;
+				//	Accept	a	waiting	connection
+				struct	sockaddr_storage	their_addr;
+				socklen_t	addr_size	=	sizeof	their_addr;
 
-    if ((_socket = _system_interface->accept(_listen_socket, (struct sockaddr *)&their_addr, &addr_size)) < 0) {
-        perror ("Unable to accept incoming connection");
-        return -1;
-    }
+				if	((_socket	=	_system_interface->accept(_listen_socket,	(struct	sockaddr	*)&their_addr,	&addr_size))	<	0)	{
+								perror	("Unable	to	accept	incoming	connection");
+								return	-1;
+				}
 
-    // Set to non blocking
-    setBlockMode(false);
+				//	Set	to	non	blocking
+				setBlockMode(false);
 
 
-    _connected = true;
+				_connected	=	true;
 
-    return 0;
+				return	0;
 }
 
-int Trick::TCPConnection::write (char * message, int size) {
-    if (!_connected)
-        return -1;
+int	Trick::TCPConnection::write	(char	*	message,	int	size)	{
+				if	(!_connected)
+								return	-1;
 
-    return _system_interface->send(_socket, message, size, 0);
+				return	_system_interface->send(_socket,	message,	size,	0);
 }
 
-int Trick::TCPConnection::write (const std::string& message) {
-    if (!_connected)
-        return -1;
+int	Trick::TCPConnection::write	(const	std::string&	message)	{
+				if	(!_connected)
+								return	-1;
 
-    char send_buf[message.length()+1];
-    strcpy (send_buf, message.c_str());
+				char	send_buf[message.length()+1];
+				strcpy	(send_buf,	message.c_str());
 
-    return _system_interface->send(_socket, send_buf, message.length(), 0);
+				return	_system_interface->send(_socket,	send_buf,	message.length(),	0);
 }
 
-int Trick::TCPConnection::read  (std::string& message, int max_len) {
-    if (!_connected) {
-        std::cerr << "Trying to read from a socket that is not connected" << std::endl;
-        message = "";
-        return 0;
-    }
-
-    char incoming_msg[max_len];
-
-    int max_receive_length = max_len < MAX_CMD_LEN ? max_len : MAX_CMD_LEN;
-    int nbytes = _system_interface->recv(_socket, incoming_msg, max_receive_length, MSG_PEEK);
-
-    if (nbytes == 0 ) {
-        message = "";
-        return 0;
-    }
-
-    if (nbytes == -1) {
-        if (errno == EAGAIN) {
-            message = "";
-            return 0;
-        } else {
-            std::string error_msg = "Error while reading from socket " + std::to_string(_socket);
-            perror(error_msg.c_str());
-            message = "";
-            return -1;
-        }
-    }
-
-    /* find the last newline that is present on the socket */
-    incoming_msg[nbytes] = '\0' ;
-    char *last_newline = rindex( incoming_msg , '\n') ;
-
-    /* if there is a newline then there is a complete command on the socket */
-    if ( last_newline != NULL ) {
-        /* only remove up to (and including) the last newline on the socket */
-        int size = last_newline - incoming_msg + 1;
-        nbytes =  _system_interface->recv( _socket, incoming_msg, size, 0) ;
-    } else {
-        nbytes = 0 ;
-    }
-    
-    std::stringstream msg_stream;
-
-    if ( nbytes > 0 ) {
-        int msg_len = nbytes ;
-        incoming_msg[msg_len] = '\0' ;
-
-        // Strip off any \r characters
-        for( int ii = 0 , jj = 0 ; ii <= msg_len ; ii++ ) {
-            if ( incoming_msg[ii] != '\r' ) {
-                msg_stream << incoming_msg[ii] ;
-            }
-        }
-    }
-
-    message = msg_stream.str();
-    return message.size();
+int	Trick::TCPConnection::read		(std::string&	message,	int	max_len)	{
+				if	(!_connected)	{
+								std::cerr	<<	"Trying	to	read	from	a	socket	that	is	not	connected"	<<	std::endl;
+								message	=	"";
+								return	0;
+				}
+
+				char	incoming_msg[max_len];
+
+				int	max_receive_length	=	max_len	<	MAX_CMD_LEN	?	max_len	:	MAX_CMD_LEN;
+				int	nbytes	=	_system_interface->recv(_socket,	incoming_msg,	max_receive_length,	MSG_PEEK);
+
+				if	(nbytes	==	0	)	{
+								message	=	"";
+								return	0;
+				}
+
+				if	(nbytes	==	-1)	{
+								if	(errno	==	EAGAIN)	{
+												message	=	"";
+												return	0;
+								}	else	{
+												std::string	error_msg	=	"Error	while	reading	from	socket	"	+	std::to_string(_socket);
+												perror(error_msg.c_str());
+												message	=	"";
+												return	-1;
+								}
+				}
+
+				/*	find	the	last	newline	that	is	present	on	the	socket	*/
+				incoming_msg[nbytes]	=	'\0'	;
+				char	*last_newline	=	rindex(	incoming_msg	,	'\n')	;
+
+				/*	if	there	is	a	newline	then	there	is	a	complete	command	on	the	socket	*/
+				if	(	last_newline	!=	NULL	)	{
+								/*	only	remove	up	to	(and	including)	the	last	newline	on	the	socket	*/
+								int	size	=	last_newline	-	incoming_msg	+	1;
+								nbytes	=		_system_interface->recv(	_socket,	incoming_msg,	size,	0)	;
+				}	else	{
+								nbytes	=	0	;
+				}
+				
+				std::stringstream	msg_stream;
+
+				if	(	nbytes	>	0	)	{
+								int	msg_len	=	nbytes	;
+								incoming_msg[msg_len]	=	'\0'	;
+
+								//	Strip	off	any	\r	characters
+								for(	int	ii	=	0	,	jj	=	0	;	ii	<=	msg_len	;	ii++	)	{
+												if	(	incoming_msg[ii]	!=	'\r'	)	{
+																msg_stream	<<	incoming_msg[ii]	;
+												}
+								}
+				}
+
+				message	=	msg_stream.str();
+				return	message.size();
 }
 
 
-int Trick::TCPConnection::disconnect () {
-    if (!_connected) {
-        return -1;
-    }
+int	Trick::TCPConnection::disconnect	()	{
+				if	(!_connected)	{
+								return	-1;
+				}
 
-    _system_interface->shutdown(_socket, SHUT_RDWR);
-    _system_interface->close (_socket);
-    _connected = false;
+				_system_interface->shutdown(_socket,	SHUT_RDWR);
+				_system_interface->close	(_socket);
+				_connected	=	false;
 
-    return 0; 
+				return	0;	
 }
 
-int Trick::TCPConnection::setBlockMode(bool blocking) {
+int	Trick::TCPConnection::setBlockMode(bool	blocking)	{
 
-    int flag = _system_interface->fcntl(_socket, F_GETFL, 0);
+				int	flag	=	_system_interface->fcntl(_socket,	F_GETFL,	0);
 
-    if (flag == -1) {
-        std::string error_message = "Unable to get flags for fd " + std::to_string(_socket);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(flag	==	-1)	{
+								std::string	error_message	=	"Unable	to	get	flags	for	fd	"	+	std::to_string(_socket);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    if (blocking) {
-        flag &= ~O_NONBLOCK;
-    } else {
-        flag |= O_NONBLOCK;
-    }
+				if	(blocking)	{
+								flag	&=	~O_NONBLOCK;
+				}	else	{
+								flag	|=	O_NONBLOCK;
+				}
 
-    if (_system_interface->fcntl(_socket, F_SETFL, flag) == -1) {
-        std::string error_message = "Unable to set fd " + std::to_string(_socket) + " block mode to " + std::to_string(blocking);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(_system_interface->fcntl(_socket,	F_SETFL,	flag)	==	-1)	{
+								std::string	error_message	=	"Unable	to	set	fd	"	+	std::to_string(_socket)	+	"	block	mode	to	"	+	std::to_string(blocking);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    return 0;
+				return	0;
 }
 
-bool Trick::TCPConnection::isInitialized() {
-    return _connected;
+bool	Trick::TCPConnection::isInitialized()	{
+				return	_connected;
 }
 
 
-int Trick::TCPConnection::restart() {
-    _system_interface = new SystemInterface();
-    return 0;
+int	Trick::TCPConnection::restart()	{
+				_system_interface	=	new	SystemInterface();
+				return	0;
 }
 
-std::string Trick::TCPConnection::getClientTag () {
-    return _client_tag;
+std::string	Trick::TCPConnection::getClientTag	()	{
+				return	_client_tag;
 }
 
-int Trick::TCPConnection::setClientTag (std::string tag) {
-    _client_tag = tag;
-    return 0;
+int	Trick::TCPConnection::setClientTag	(std::string	tag)	{
+				_client_tag	=	tag;
+				return	0;
 }
 
-std::string Trick::TCPConnection::getClientHostname() {
-    if (!_connected) {
-        return "";
-    }
+std::string	Trick::TCPConnection::getClientHostname()	{
+				if	(!_connected)	{
+								return	"";
+				}
 
-    struct sockaddr_in otherside;
-    socklen_t len = (socklen_t)sizeof(otherside);
+				struct	sockaddr_in	otherside;
+				socklen_t	len	=	(socklen_t)sizeof(otherside);
 
-    if (getpeername(_socket, (struct sockaddr*)&otherside, &len) != 0)
-        return "";
+				if	(getpeername(_socket,	(struct	sockaddr*)&otherside,	&len)	!=	0)
+								return	"";
 
-    return inet_ntoa(otherside.sin_addr);
+				return	inet_ntoa(otherside.sin_addr);
 }
 
-int Trick::TCPConnection::getClientPort() {
-    if (!_connected) {
-        return 0;
-    }
+int	Trick::TCPConnection::getClientPort()	{
+				if	(!_connected)	{
+								return	0;
+				}
 
-    struct sockaddr_in otherside;
-    socklen_t len = (socklen_t)sizeof(otherside);
+				struct	sockaddr_in	otherside;
+				socklen_t	len	=	(socklen_t)sizeof(otherside);
 
-    if (getpeername(_socket, (struct sockaddr*)&otherside, &len) != 0)
-        return 0;
+				if	(getpeername(_socket,	(struct	sockaddr*)&otherside,	&len)	!=	0)
+								return	0;
 
-    return ntohs(otherside.sin_port);
+				return	ntohs(otherside.sin_port);
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/UDPConnection.cpp b/trick_source/trick_utils/connection_handlers/UDPConnection.cpp
index e9076977e..652de2168 100644
--- a/trick_source/trick_utils/connection_handlers/UDPConnection.cpp
+++ b/trick_source/trick_utils/connection_handlers/UDPConnection.cpp
@@ -1,252 +1,252 @@
-#include "trick/UDPConnection.hh"
-
-#include <sstream>
-#include <iostream>
-#include <cstring>
-#include <strings.h>
-#include <arpa/inet.h>
-
-Trick::UDPConnection::UDPConnection () : UDPConnection(new SystemInterface()) {}
-Trick::UDPConnection::UDPConnection (SystemInterface * system_interface) : _started(false), _initialized(false), _port(0), _hostname(""), _system_interface(system_interface), _socket(0) {}
-
-int Trick::UDPConnection::initialize(const std::string& in_hostname, int in_port) {
-
-
-    if ((_socket = _system_interface->socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        perror ("Server: Unable to open socket");
-        return -1;
-    }
-
-    int option_val = 1;
-
-    // Do not replicate the socket's handle if this process is forked
-    // Removing this will cause all kinds of problems when starting a variable server client via input file
-    _system_interface->fcntl(_socket, F_SETFD, FD_CLOEXEC);
-
-    // Allow socket's bound address to be used by others
-    if (_system_interface->setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, (const char *) &option_val, (socklen_t) sizeof(option_val)) != 0) {
-        perror("Server: Could not set socket to reuse addr");
-        _system_interface->close (_socket);
-        return -1;
-    }
-
-    struct sockaddr_in s_in;
-    memset(&s_in, 0 , sizeof(struct sockaddr_in)) ;
-
-    // Look up the hostname
-    char name[80];
-    gethostname(name, (size_t) 80);
-
-    struct hostent *ip_host ;
-    socklen_t s_in_size =  sizeof(s_in) ;
-
-    s_in.sin_family = AF_INET;
-
-    if (in_hostname == "" || in_hostname == "localhost" || in_hostname == "127.0.0.1" || strcmp(in_hostname.c_str(),name) == 0) {
-        s_in.sin_addr.s_addr = INADDR_ANY;
-        _hostname = std::string(name);
-    } else if ( inet_pton(AF_INET, in_hostname.c_str(), (struct in_addr *)&s_in.sin_addr.s_addr) == 1 ) {
-        /* numeric character string address */
-        _hostname = in_hostname;
-    } else if ( (ip_host = gethostbyname(in_hostname.c_str())) != NULL ) {
-        /* some name other than the default name was given */
-        memcpy((void *) &(s_in.sin_addr.s_addr), (const void *) ip_host->h_addr, (size_t) ip_host->h_length);
-        _hostname = in_hostname;
-    } else {
-        perror("UDP socket: Could not determine source address");
-        return -1 ;
-    }
-
-    // Set port
-    s_in.sin_port = htons((short) in_port);
-
-    // Bind to socket
-    if (_system_interface->bind(_socket, (struct sockaddr *)&s_in, sizeof(s_in)) < 0) {
-
-        perror("UDP socket: Could not bind to socket");
-        _system_interface->close (_socket);
-        return -1;
-    } 
-
-    // Check that correct port was bound to
-    _system_interface->getsockname( _socket , (struct sockaddr *)&s_in, &s_in_size) ;
-    int bound_port = ntohs(s_in.sin_port);
-
-    if (in_port != 0 && bound_port != in_port) {
-        std::cerr << "UDP socket: Could not bind to requested port " << in_port << std::endl;
-        _system_interface->close(_socket);
-        return -1;
-    }
-
-    // Save port number
-    _port = bound_port;
-    
-    setBlockMode(false);
-
-    // Done!
-    _initialized = true;
-    return 0;
+#include	"trick/UDPConnection.hh"
+
+#include	<sstream>
+#include	<iostream>
+#include	<cstring>
+#include	<strings.h>
+#include	<arpa/inet.h>
+
+Trick::UDPConnection::UDPConnection	()	:	UDPConnection(new	SystemInterface())	{}
+Trick::UDPConnection::UDPConnection	(SystemInterface	*	system_interface)	:	_started(false),	_initialized(false),	_port(0),	_hostname(""),	_system_interface(system_interface),	_socket(0)	{}
+
+int	Trick::UDPConnection::initialize(const	std::string&	in_hostname,	int	in_port)	{
+
+
+				if	((_socket	=	_system_interface->socket(AF_INET,	SOCK_DGRAM,	0))	<	0)	{
+								perror	("Server:	Unable	to	open	socket");
+								return	-1;
+				}
+
+				int	option_val	=	1;
+
+				//	Do	not	replicate	the	socket's	handle	if	this	process	is	forked
+				//	Removing	this	will	cause	all	kinds	of	problems	when	starting	a	variable	server	client	via	input	file
+				_system_interface->fcntl(_socket,	F_SETFD,	FD_CLOEXEC);
+
+				//	Allow	socket's	bound	address	to	be	used	by	others
+				if	(_system_interface->setsockopt(_socket,	SOL_SOCKET,	SO_REUSEADDR,	(const	char	*)	&option_val,	(socklen_t)	sizeof(option_val))	!=	0)	{
+								perror("Server:	Could	not	set	socket	to	reuse	addr");
+								_system_interface->close	(_socket);
+								return	-1;
+				}
+
+				struct	sockaddr_in	s_in;
+				memset(&s_in,	0	,	sizeof(struct	sockaddr_in))	;
+
+				//	Look	up	the	hostname
+				char	name[80];
+				gethostname(name,	(size_t)	80);
+
+				struct	hostent	*ip_host	;
+				socklen_t	s_in_size	=		sizeof(s_in)	;
+
+				s_in.sin_family	=	AF_INET;
+
+				if	(in_hostname	==	""	||	in_hostname	==	"localhost"	||	in_hostname	==	"127.0.0.1"	||	strcmp(in_hostname.c_str(),name)	==	0)	{
+								s_in.sin_addr.s_addr	=	INADDR_ANY;
+								_hostname	=	std::string(name);
+				}	else	if	(	inet_pton(AF_INET,	in_hostname.c_str(),	(struct	in_addr	*)&s_in.sin_addr.s_addr)	==	1	)	{
+								/*	numeric	character	string	address	*/
+								_hostname	=	in_hostname;
+				}	else	if	(	(ip_host	=	gethostbyname(in_hostname.c_str()))	!=	NULL	)	{
+								/*	some	name	other	than	the	default	name	was	given	*/
+								memcpy((void	*)	&(s_in.sin_addr.s_addr),	(const	void	*)	ip_host->h_addr,	(size_t)	ip_host->h_length);
+								_hostname	=	in_hostname;
+				}	else	{
+								perror("UDP	socket:	Could	not	determine	source	address");
+								return	-1	;
+				}
+
+				//	Set	port
+				s_in.sin_port	=	htons((short)	in_port);
+
+				//	Bind	to	socket
+				if	(_system_interface->bind(_socket,	(struct	sockaddr	*)&s_in,	sizeof(s_in))	<	0)	{
+
+								perror("UDP	socket:	Could	not	bind	to	socket");
+								_system_interface->close	(_socket);
+								return	-1;
+				}	
+
+				//	Check	that	correct	port	was	bound	to
+				_system_interface->getsockname(	_socket	,	(struct	sockaddr	*)&s_in,	&s_in_size)	;
+				int	bound_port	=	ntohs(s_in.sin_port);
+
+				if	(in_port	!=	0	&&	bound_port	!=	in_port)	{
+								std::cerr	<<	"UDP	socket:	Could	not	bind	to	requested	port	"	<<	in_port	<<	std::endl;
+								_system_interface->close(_socket);
+								return	-1;
+				}
+
+				//	Save	port	number
+				_port	=	bound_port;
+				
+				setBlockMode(false);
+
+				//	Done!
+				_initialized	=	true;
+				return	0;
 }
 
-int Trick::UDPConnection::start() {
-    // We've already set everything up, just make sure it was successful
-    if (_initialized) {
-        _started = true;
-        return 0;
-    }
-    return -1;
+int	Trick::UDPConnection::start()	{
+				//	We've	already	set	everything	up,	just	make	sure	it	was	successful
+				if	(_initialized)	{
+								_started	=	true;
+								return	0;
+				}
+				return	-1;
 }
 
-int Trick::UDPConnection::write (char * message, int size) {
-    if (!_started)
-        return -1;
+int	Trick::UDPConnection::write	(char	*	message,	int	size)	{
+				if	(!_started)
+								return	-1;
 
-    socklen_t sock_size = sizeof(_remote_serv_addr);
+				socklen_t	sock_size	=	sizeof(_remote_serv_addr);
 
-    return _system_interface->sendto(_socket, message, size, 0, (struct sockaddr *) &_remote_serv_addr, sock_size );
+				return	_system_interface->sendto(_socket,	message,	size,	0,	(struct	sockaddr	*)	&_remote_serv_addr,	sock_size	);
 }
 
-int Trick::UDPConnection::write (const std::string& message) {
-    if (!_started)
-        return -1;
+int	Trick::UDPConnection::write	(const	std::string&	message)	{
+				if	(!_started)
+								return	-1;
 
-    char send_buf[message.length()+1];
-    strcpy (send_buf, message.c_str());
-    socklen_t sock_size = sizeof(_remote_serv_addr);
+				char	send_buf[message.length()+1];
+				strcpy	(send_buf,	message.c_str());
+				socklen_t	sock_size	=	sizeof(_remote_serv_addr);
 
-    return _system_interface->sendto(_socket, send_buf, message.length(), 0, (struct sockaddr *) &_remote_serv_addr, sock_size );
+				return	_system_interface->sendto(_socket,	send_buf,	message.length(),	0,	(struct	sockaddr	*)	&_remote_serv_addr,	sock_size	);
 }
 
-int Trick::UDPConnection::read  (std::string& message, int max_len) {
-    if (!_started)
-        return 0;
-
-    char incoming_msg[max_len];
-    int nbytes = _system_interface->recvfrom( _socket, incoming_msg, MAX_CMD_LEN, MSG_PEEK, NULL, NULL ) ;
-    if (nbytes == 0 ) {
-        return 0;
-    }
-
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            // There's nothing ready in the socket, just return an empty string
-            message = "";
-            return 0;
-        }
-
-        // Otherwise, some other system error has occurred. Return an error.
-        return -1;
-    }
-
-    /* find the last newline that is present on the socket */
-    incoming_msg[nbytes] = '\0' ;
-    char *last_newline = rindex( incoming_msg , '\n') ;
-
-    /* if there is a newline then there is a complete command on the socket */
-    if ( last_newline != NULL ) {
-        socklen_t sock_size = sizeof(_remote_serv_addr);
-        /* Save the remote host information so we know where to send replies */
-        /* only remove up to (and including) the last newline on the socket */
-        int size = last_newline - incoming_msg + 1;
-        nbytes = _system_interface->recvfrom( _socket, incoming_msg, size, 0 , (struct sockaddr *) &_remote_serv_addr, &sock_size ) ;
-    } else {
-        nbytes = 0 ;
-    }
-    
-    std::stringstream msg_stream;
-
-    if ( nbytes > 0 ) {
-        // Strip out \r characers
-
-        int msg_len = nbytes ;
-        incoming_msg[msg_len] = '\0' ;
-
-        for( int ii = 0 , jj = 0 ; ii <= msg_len ; ii++ ) {
-            if ( incoming_msg[ii] != '\r' ) {
-                msg_stream << incoming_msg[ii] ;
-            }
-        }
-    }
-
-    message = msg_stream.str();
-    return message.size();
+int	Trick::UDPConnection::read		(std::string&	message,	int	max_len)	{
+				if	(!_started)
+								return	0;
+
+				char	incoming_msg[max_len];
+				int	nbytes	=	_system_interface->recvfrom(	_socket,	incoming_msg,	MAX_CMD_LEN,	MSG_PEEK,	NULL,	NULL	)	;
+				if	(nbytes	==	0	)	{
+								return	0;
+				}
+
+				if	(nbytes	==	-1)	{
+								if	(errno	==	EAGAIN	||	errno	==	EWOULDBLOCK)	{
+												//	There's	nothing	ready	in	the	socket,	just	return	an	empty	string
+												message	=	"";
+												return	0;
+								}
+
+								//	Otherwise,	some	other	system	error	has	occurred.	Return	an	error.
+								return	-1;
+				}
+
+				/*	find	the	last	newline	that	is	present	on	the	socket	*/
+				incoming_msg[nbytes]	=	'\0'	;
+				char	*last_newline	=	rindex(	incoming_msg	,	'\n')	;
+
+				/*	if	there	is	a	newline	then	there	is	a	complete	command	on	the	socket	*/
+				if	(	last_newline	!=	NULL	)	{
+								socklen_t	sock_size	=	sizeof(_remote_serv_addr);
+								/*	Save	the	remote	host	information	so	we	know	where	to	send	replies	*/
+								/*	only	remove	up	to	(and	including)	the	last	newline	on	the	socket	*/
+								int	size	=	last_newline	-	incoming_msg	+	1;
+								nbytes	=	_system_interface->recvfrom(	_socket,	incoming_msg,	size,	0	,	(struct	sockaddr	*)	&_remote_serv_addr,	&sock_size	)	;
+				}	else	{
+								nbytes	=	0	;
+				}
+				
+				std::stringstream	msg_stream;
+
+				if	(	nbytes	>	0	)	{
+								//	Strip	out	\r	characers
+
+								int	msg_len	=	nbytes	;
+								incoming_msg[msg_len]	=	'\0'	;
+
+								for(	int	ii	=	0	,	jj	=	0	;	ii	<=	msg_len	;	ii++	)	{
+												if	(	incoming_msg[ii]	!=	'\r'	)	{
+																msg_stream	<<	incoming_msg[ii]	;
+												}
+								}
+				}
+
+				message	=	msg_stream.str();
+				return	message.size();
 }
 
-int Trick::UDPConnection::disconnect () {
-    if (!_initialized) {
-        return -1;
-    }
+int	Trick::UDPConnection::disconnect	()	{
+				if	(!_initialized)	{
+								return	-1;
+				}
 
-    _system_interface->shutdown(_socket, SHUT_RDWR);
-    _system_interface->close (_socket);
-    _initialized = false;
-    _started = false;
+				_system_interface->shutdown(_socket,	SHUT_RDWR);
+				_system_interface->close	(_socket);
+				_initialized	=	false;
+				_started	=	false;
 
-    return 0; 
+				return	0;	
 }
 
-int Trick::UDPConnection::setBlockMode(bool blocking) {
-    int flag = _system_interface->fcntl(_socket, F_GETFL, 0);
+int	Trick::UDPConnection::setBlockMode(bool	blocking)	{
+				int	flag	=	_system_interface->fcntl(_socket,	F_GETFL,	0);
 
-    if (flag == -1) {
-        std::string error_message = "Unable to get flags for fd " + std::to_string(_socket);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(flag	==	-1)	{
+								std::string	error_message	=	"Unable	to	get	flags	for	fd	"	+	std::to_string(_socket);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    if (blocking) {
-        flag &= ~O_NONBLOCK;
-    } else {
-        flag |= O_NONBLOCK;
-    }
+				if	(blocking)	{
+								flag	&=	~O_NONBLOCK;
+				}	else	{
+								flag	|=	O_NONBLOCK;
+				}
 
-    if (_system_interface->fcntl(_socket, F_SETFL, flag) == -1) {
-        std::string error_message = "Unable to set fd " + std::to_string(_socket) + " block mode to " + std::to_string(blocking);
-        perror (error_message.c_str());
-        return -1;
-    }
+				if	(_system_interface->fcntl(_socket,	F_SETFL,	flag)	==	-1)	{
+								std::string	error_message	=	"Unable	to	set	fd	"	+	std::to_string(_socket)	+	"	block	mode	to	"	+	std::to_string(blocking);
+								perror	(error_message.c_str());
+								return	-1;
+				}
 
-    return 0;
+				return	0;
 }
 
-int Trick::UDPConnection::restart() {
-    _system_interface = new SystemInterface();
-    return 0;
+int	Trick::UDPConnection::restart()	{
+				_system_interface	=	new	SystemInterface();
+				return	0;
 }
 
-bool Trick::UDPConnection::isInitialized() {
-    return _started;
+bool	Trick::UDPConnection::isInitialized()	{
+				return	_started;
 }
 
-int Trick::UDPConnection::getPort() {
-    return _port;
+int	Trick::UDPConnection::getPort()	{
+				return	_port;
 }
 
-std::string Trick::UDPConnection::getHostname() {
-    return _hostname;
+std::string	Trick::UDPConnection::getHostname()	{
+				return	_hostname;
 }
 
-std::string Trick::UDPConnection::getClientTag () {
-    return _client_tag;
+std::string	Trick::UDPConnection::getClientTag	()	{
+				return	_client_tag;
 }
 
-int Trick::UDPConnection::setClientTag (std::string tag) {
-    _client_tag = tag;
-    return 0;
+int	Trick::UDPConnection::setClientTag	(std::string	tag)	{
+				_client_tag	=	tag;
+				return	0;
 }
 
-std::string Trick::UDPConnection::getClientHostname() {
-    if (!_initialized) {
-        return "";
-    }
+std::string	Trick::UDPConnection::getClientHostname()	{
+				if	(!_initialized)	{
+								return	"";
+				}
 
-    return inet_ntoa(_remote_serv_addr.sin_addr);
+				return	inet_ntoa(_remote_serv_addr.sin_addr);
 }
 
-int Trick::UDPConnection::getClientPort() {
-    if (!_initialized) {
-        return 0;
-    }
+int	Trick::UDPConnection::getClientPort()	{
+				if	(!_initialized)	{
+								return	0;
+				}
 
-    return ntohs(_remote_serv_addr.sin_port);
+				return	ntohs(_remote_serv_addr.sin_port);
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/test/MulticastGroup_test.cpp b/trick_source/trick_utils/connection_handlers/test/MulticastGroup_test.cpp
index a664f9c90..25dff15d4 100644
--- a/trick_source/trick_utils/connection_handlers/test/MulticastGroup_test.cpp
+++ b/trick_source/trick_utils/connection_handlers/test/MulticastGroup_test.cpp
@@ -1,136 +1,136 @@
-#include <gtest/gtest.h>
+#include	<gtest/gtest.h>
 
-#include "trick/MulticastGroup.hh"
-#include "SystemInterfaceMock/SystemInterfaceMock.hh"
+#include	"trick/MulticastGroup.hh"
+#include	"SystemInterfaceMock/SystemInterfaceMock.hh"
 
-class MulticastGroupTest : public testing::Test {
+class	MulticastGroupTest	:	public	testing::Test	{
 
-   protected:
-      MulticastGroupTest() : system_context(new SystemInferfaceMock()), mcast (system_context) {}
-      ~MulticastGroupTest(){
-        mcast.disconnect();
-      }
+			protected:
+						MulticastGroupTest()	:	system_context(new	SystemInferfaceMock()),	mcast	(system_context)	{}
+						~MulticastGroupTest(){
+								mcast.disconnect();
+						}
 
-      SystemInferfaceMock * system_context;
-      Trick::MulticastGroup mcast;
+						SystemInferfaceMock	*	system_context;
+						Trick::MulticastGroup	mcast;
 };
 
-TEST_F(MulticastGroupTest, not_initialized) {
-    // ARRANGE
-    // ACT
-    // ASSERT
-    EXPECT_EQ(mcast.isInitialized(), 0);
+TEST_F(MulticastGroupTest,	not_initialized)	{
+				//	ARRANGE
+				//	ACT
+				//	ASSERT
+				EXPECT_EQ(mcast.isInitialized(),	0);
 }
 
-TEST_F(MulticastGroupTest, initialize) {
-    // ARRANGE
-    // ACT
-    mcast.initialize();
-    // ASSERT
-    EXPECT_EQ(mcast.isInitialized(), 1);
+TEST_F(MulticastGroupTest,	initialize)	{
+				//	ARRANGE
+				//	ACT
+				mcast.initialize();
+				//	ASSERT
+				EXPECT_EQ(mcast.isInitialized(),	1);
 }
 
-TEST_F(MulticastGroupTest, initialize_socket_fails) {
-    // ARRANGE
-    system_context->register_socket_impl([](int a, int b, int c) { 
-        errno = EPERM;
-        return -1; 
-    });
-
-    // ACT
-    mcast.initialize();
-    // ASSERT
-    EXPECT_EQ(mcast.isInitialized(), 0);
+TEST_F(MulticastGroupTest,	initialize_socket_fails)	{
+				//	ARRANGE
+				system_context->register_socket_impl([](int	a,	int	b,	int	c)	{	
+								errno	=	EPERM;
+								return	-1;	
+				});
+
+				//	ACT
+				mcast.initialize();
+				//	ASSERT
+				EXPECT_EQ(mcast.isInitialized(),	0);
 }
 
-TEST_F(MulticastGroupTest, initialize_sockopt_reuseaddr_fails) {
-    // ARRANGE
-    system_context->register_setsockopt_impl([](int sockfd, int level, int optname, const void *optval, socklen_t optlen) { 
-        if (optname == SO_REUSEADDR) {
-            errno = EINVAL;
-            return -1; 
-        }
-        return 0;
-    });
-
-    // ACT
-    mcast.initialize();
-    // ASSERT
-    EXPECT_EQ(mcast.isInitialized(), 0);
+TEST_F(MulticastGroupTest,	initialize_sockopt_reuseaddr_fails)	{
+				//	ARRANGE
+				system_context->register_setsockopt_impl([](int	sockfd,	int	level,	int	optname,	const	void	*optval,	socklen_t	optlen)	{	
+								if	(optname	==	SO_REUSEADDR)	{
+												errno	=	EINVAL;
+												return	-1;	
+								}
+								return	0;
+				});
+
+				//	ACT
+				mcast.initialize();
+				//	ASSERT
+				EXPECT_EQ(mcast.isInitialized(),	0);
 }
 
-TEST_F(MulticastGroupTest, initialize_sockopt_reuseport_fails) {
-    // ARRANGE
-    system_context->register_setsockopt_impl([](int sockfd, int level, int optname, const void *optval, socklen_t optlen) { 
-        if (optname == SO_REUSEPORT) {
-            errno = EINVAL;
-            return -1; 
-        }
-        return 0;
-    });
-
-    // ACT
-    mcast.initialize();
-    // ASSERT
-    EXPECT_EQ(mcast.isInitialized(), 0);
+TEST_F(MulticastGroupTest,	initialize_sockopt_reuseport_fails)	{
+				//	ARRANGE
+				system_context->register_setsockopt_impl([](int	sockfd,	int	level,	int	optname,	const	void	*optval,	socklen_t	optlen)	{	
+								if	(optname	==	SO_REUSEPORT)	{
+												errno	=	EINVAL;
+												return	-1;	
+								}
+								return	0;
+				});
+
+				//	ACT
+				mcast.initialize();
+				//	ASSERT
+				EXPECT_EQ(mcast.isInitialized(),	0);
 }
 
-TEST_F(MulticastGroupTest, add_address) {
-    // ARRANGE
-    // ACT
-    int result = mcast.addAddress("239.3.14.15", 9265);
+TEST_F(MulticastGroupTest,	add_address)	{
+				//	ARRANGE
+				//	ACT
+				int	result	=	mcast.addAddress("239.3.14.15",	9265);
 
-    // ASSERT
-    EXPECT_EQ(result, 0);
+				//	ASSERT
+				EXPECT_EQ(result,	0);
 }
 
-TEST_F(MulticastGroupTest, add_address_fails) {
-    // ARRANGE
-    system_context->register_inet_addr_impl([](const char * addr) {
-        return -1;
-    });
+TEST_F(MulticastGroupTest,	add_address_fails)	{
+				//	ARRANGE
+				system_context->register_inet_addr_impl([](const	char	*	addr)	{
+								return	-1;
+				});
 
-    // ACT
-    int result = mcast.addAddress("239.3.14.15", 9265);
+				//	ACT
+				int	result	=	mcast.addAddress("239.3.14.15",	9265);
 
-    // ASSERT
-    EXPECT_EQ(result, -1);
+				//	ASSERT
+				EXPECT_EQ(result,	-1);
 }
 
-TEST_F(MulticastGroupTest, broadcast_uninitialized) {
-    // ARRANGE
-    // ACT
-    int result = mcast.broadcast("Some message");
+TEST_F(MulticastGroupTest,	broadcast_uninitialized)	{
+				//	ARRANGE
+				//	ACT
+				int	result	=	mcast.broadcast("Some	message");
 
-    // ASSERT
-    EXPECT_EQ(result, -1);
+				//	ASSERT
+				EXPECT_EQ(result,	-1);
 }
 
-TEST_F(MulticastGroupTest, broadcast) {
-    // ARRANGE
-    mcast.initialize();
-    mcast.addAddress("239.3.14.15", 9265);
+TEST_F(MulticastGroupTest,	broadcast)	{
+				//	ARRANGE
+				mcast.initialize();
+				mcast.addAddress("239.3.14.15",	9265);
 
-    // ACT
-    int result = mcast.broadcast("Some message");
+				//	ACT
+				int	result	=	mcast.broadcast("Some	message");
 
-    // ASSERT
-    EXPECT_EQ(result, 0);
+				//	ASSERT
+				EXPECT_EQ(result,	0);
 }
 
 
-TEST_F(MulticastGroupTest, broadcast_send_fails) {
-    // ARRANGE
-    system_context->register_sendto_impl([](int socket, const void * buffer, size_t length, int flags, const struct sockaddr * dest_addr, socklen_t dest_len) {
-        return -1;
-    });
-    
-    mcast.initialize();
-    mcast.addAddress("239.3.14.15", 9265);
+TEST_F(MulticastGroupTest,	broadcast_send_fails)	{
+				//	ARRANGE
+				system_context->register_sendto_impl([](int	socket,	const	void	*	buffer,	size_t	length,	int	flags,	const	struct	sockaddr	*	dest_addr,	socklen_t	dest_len)	{
+								return	-1;
+				});
+				
+				mcast.initialize();
+				mcast.addAddress("239.3.14.15",	9265);
 
-    // ACT
-    int result = mcast.broadcast("Some message");
+				//	ACT
+				int	result	=	mcast.broadcast("Some	message");
 
-    // ASSERT
-    EXPECT_EQ(result, 0);
+				//	ASSERT
+				EXPECT_EQ(result,	0);
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/test/TCPClientListener_test.cpp b/trick_source/trick_utils/connection_handlers/test/TCPClientListener_test.cpp
index 0a4bf7a41..664fc419e 100644
--- a/trick_source/trick_utils/connection_handlers/test/TCPClientListener_test.cpp
+++ b/trick_source/trick_utils/connection_handlers/test/TCPClientListener_test.cpp
@@ -1,400 +1,400 @@
 
-#include <gtest/gtest.h>
-#include <errno.h>
-#include <unistd.h>
-#include <iostream>
-#include <sys/select.h>
-#include <netinet/tcp.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
-#include "trick/TCPClientListener.hh"
-#include "SystemInterfaceMock/SystemInterfaceMock.hh"
-
-
-class TCPClientListenerTest : public testing::Test {
-
-   protected:
-      TCPClientListenerTest() : system_context(new SystemInferfaceMock()), listener (system_context) {}
-      ~TCPClientListenerTest(){}
-
-      SystemInferfaceMock * system_context;
-      Trick::TCPClientListener listener;
+#include	<gtest/gtest.h>
+#include	<errno.h>
+#include	<unistd.h>
+#include	<iostream>
+#include	<sys/select.h>
+#include	<netinet/tcp.h>
+#include	<fcntl.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<netdb.h>
+#include	<unistd.h>
+#include	<arpa/inet.h>
+
+#include	"trick/TCPClientListener.hh"
+#include	"SystemInterfaceMock/SystemInterfaceMock.hh"
+
+
+class	TCPClientListenerTest	:	public	testing::Test	{
+
+			protected:
+						TCPClientListenerTest()	:	system_context(new	SystemInferfaceMock()),	listener	(system_context)	{}
+						~TCPClientListenerTest(){}
+
+						SystemInferfaceMock	*	system_context;
+						Trick::TCPClientListener	listener;
 };
 
 
-TEST_F( TCPClientListenerTest, initialized ) {
-    EXPECT_EQ(listener.isInitialized(), false);
+TEST_F(	TCPClientListenerTest,	initialized	)	{
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, initialize_localhost_0 ) {
-    // ARRANGE
-    // Look up the hostname
-    char name[80];
-    gethostname(name, (size_t) 80);
+TEST_F(	TCPClientListenerTest,	initialize_localhost_0	)	{
+				//	ARRANGE
+				//	Look	up	the	hostname
+				char	name[80];
+				gethostname(name,	(size_t)	80);
 
-    // ACT
-    listener.initialize("localhost", 0);
+				//	ACT
+				listener.initialize("localhost",	0);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), true);
-    EXPECT_EQ(listener.getHostname(), std::string(name));
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	true);
+				EXPECT_EQ(listener.getHostname(),	std::string(name));
 }
 
-TEST_F( TCPClientListenerTest, initialize_localhost_54321 ) {
-    // ARRANGE
-    // ACT
-    listener.initialize("localhost", 54321);
+TEST_F(	TCPClientListenerTest,	initialize_localhost_54321	)	{
+				//	ARRANGE
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), true);
-    EXPECT_EQ(listener.getPort(), 54321);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	true);
+				EXPECT_EQ(listener.getPort(),	54321);
 }
 
-TEST_F( TCPClientListenerTest, initialize_no_args ) {
-    // ARRANGE
-    // ACT
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	initialize_no_args	)	{
+				//	ARRANGE
+				//	ACT
+				listener.initialize();
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), true);
-    EXPECT_GT(listener.getPort(), 1000);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	true);
+				EXPECT_GT(listener.getPort(),	1000);
 }
 
-TEST_F( TCPClientListenerTest, initialize_localhost_numerical_54321 ) {
-    // ARRANGE
-    // ACT
-    listener.initialize("127.0.0.1", 54321);
+TEST_F(	TCPClientListenerTest,	initialize_localhost_numerical_54321	)	{
+				//	ARRANGE
+				//	ACT
+				listener.initialize("127.0.0.1",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), true);
-    EXPECT_EQ(listener.getPort(), 54321);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	true);
+				EXPECT_EQ(listener.getPort(),	54321);
 }
 
-TEST_F( TCPClientListenerTest, initialize_invalid_hostname ) {
-    // ARRANGE
-    // ACT
-    listener.initialize("some_invalid_hostname", 0);
+TEST_F(	TCPClientListenerTest,	initialize_invalid_hostname	)	{
+				//	ARRANGE
+				//	ACT
+				listener.initialize("some_invalid_hostname",	0);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_socket ) {
-    // ARRANGE
-    system_context->register_socket_impl([](int a, int b, int c) { 
-        errno = EPERM;
-        return -1; 
-    });
+TEST_F(	TCPClientListenerTest,	failed_socket	)	{
+				//	ARRANGE
+				system_context->register_socket_impl([](int	a,	int	b,	int	c)	{	
+								errno	=	EPERM;
+								return	-1;	
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_setsockopt_reuseaddr ) {
-    // ARRANGE
-    system_context->register_setsockopt_impl([](int sockfd, int level, int optname, const void *optval, socklen_t optlen) { 
-        errno = EINVAL;
-        return -1; 
-    });
+TEST_F(	TCPClientListenerTest,	failed_setsockopt_reuseaddr	)	{
+				//	ARRANGE
+				system_context->register_setsockopt_impl([](int	sockfd,	int	level,	int	optname,	const	void	*optval,	socklen_t	optlen)	{	
+								errno	=	EINVAL;
+								return	-1;	
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_setsockopt_buffering ) {
-    // ARRANGE
-    system_context->register_setsockopt_impl([](int sockfd, int level, int optname, const void *optval, socklen_t optlen) { 
-        if (level == IPPROTO_TCP && optname == TCP_NODELAY) {
-            errno = ENOTSOCK;
-            return -1; 
-        }
+TEST_F(	TCPClientListenerTest,	failed_setsockopt_buffering	)	{
+				//	ARRANGE
+				system_context->register_setsockopt_impl([](int	sockfd,	int	level,	int	optname,	const	void	*optval,	socklen_t	optlen)	{	
+								if	(level	==	IPPROTO_TCP	&&	optname	==	TCP_NODELAY)	{
+												errno	=	ENOTSOCK;
+												return	-1;	
+								}
 
-        return 0;
-    });
+								return	0;
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_bind ) {
-    // ARRANGE
-    system_context->register_bind_impl([](int sockfd, const struct sockaddr *addr,socklen_t addrlen) { 
-        errno = EADDRINUSE;
-        return -1;
-    });
+TEST_F(	TCPClientListenerTest,	failed_bind	)	{
+				//	ARRANGE
+				system_context->register_bind_impl([](int	sockfd,	const	struct	sockaddr	*addr,socklen_t	addrlen)	{	
+								errno	=	EADDRINUSE;
+								return	-1;
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_sockname ) {
-    // ARRANGE
-    system_context->register_getsockname_impl([](int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
-        ((struct sockaddr_in *) addr)->sin_port = htons(1234);
-        return 0;
-    });
+TEST_F(	TCPClientListenerTest,	failed_sockname	)	{
+				//	ARRANGE
+				system_context->register_getsockname_impl([](int	sockfd,	struct	sockaddr	*addr,	socklen_t	*addrlen)	{
+								((struct	sockaddr_in	*)	addr)->sin_port	=	htons(1234);
+								return	0;
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, failed_listen ) {
-    // ARRANGE
-    system_context->register_listen_impl([](int sockfd, int backlog) {
-        errno = EADDRINUSE;
-        return -1;
-    });
+TEST_F(	TCPClientListenerTest,	failed_listen	)	{
+				//	ARRANGE
+				system_context->register_listen_impl([](int	sockfd,	int	backlog)	{
+								errno	=	EADDRINUSE;
+								return	-1;
+				});
 
-    // ACT
-    listener.initialize("localhost", 54321);
+				//	ACT
+				listener.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(listener.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(listener.isInitialized(),	false);
 }
 
-TEST_F( TCPClientListenerTest, checkForNewConnections_uninitialized ) {
-    // ARRANGE
-    // ACT
-    bool result = listener.checkForNewConnections();
+TEST_F(	TCPClientListenerTest,	checkForNewConnections_uninitialized	)	{
+				//	ARRANGE
+				//	ACT
+				bool	result	=	listener.checkForNewConnections();
 
-    // ASSERT
-    EXPECT_EQ(result, false);
+				//	ASSERT
+				EXPECT_EQ(result,	false);
 }
 
-TEST_F( TCPClientListenerTest, checkForNewConnections ) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    system_context->register_select_impl([&socket_fd](int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *timeout) {
-        FD_SET(socket_fd, readfds);
-        return 1;
-    });
-    listener.initialize();
-
-    // ACT
-    bool result = listener.checkForNewConnections();
-    
-    // ASSERT
-    EXPECT_EQ(result, true);
+TEST_F(	TCPClientListenerTest,	checkForNewConnections	)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				system_context->register_select_impl([&socket_fd](int	nfds,	fd_set	*readfds,	fd_set	*writefds,fd_set	*exceptfds,	struct	timeval	*timeout)	{
+								FD_SET(socket_fd,	readfds);
+								return	1;
+				});
+				listener.initialize();
+
+				//	ACT
+				bool	result	=	listener.checkForNewConnections();
+				
+				//	ASSERT
+				EXPECT_EQ(result,	true);
 }
 
-TEST_F( TCPClientListenerTest, checkForNewConnections_select_error ) {
-    // ARRANGE
-    system_context->register_select_impl([](int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *timeout) {
-        return -1;
-    });
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	checkForNewConnections_select_error	)	{
+				//	ARRANGE
+				system_context->register_select_impl([](int	nfds,	fd_set	*readfds,	fd_set	*writefds,fd_set	*exceptfds,	struct	timeval	*timeout)	{
+								return	-1;
+				});
+				listener.initialize();
 
-    // ACT
-    bool result = listener.checkForNewConnections();
+				//	ACT
+				bool	result	=	listener.checkForNewConnections();
 
-    // ASSERT
-    EXPECT_EQ(result, false);
+				//	ASSERT
+				EXPECT_EQ(result,	false);
 }
 
-TEST_F( TCPClientListenerTest, setBlockMode_false ) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	setBlockMode_false	)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				listener.initialize();
 
-    // ACT
-    int status = listener.setBlockMode(false);
+				//	ACT
+				int	status	=	listener.setBlockMode(false);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_TRUE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_TRUE(flag	&	O_NONBLOCK);
 }
 
-TEST_F( TCPClientListenerTest, setBlockMode_nonblocking) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	setBlockMode_nonblocking)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				listener.initialize();
 
-    // ACT
-    int status = listener.setBlockMode(false);
+				//	ACT
+				int	status	=	listener.setBlockMode(false);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_TRUE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_TRUE(flag	&	O_NONBLOCK);
 }
 
 
-TEST_F( TCPClientListenerTest, setBlockMode_blocking) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	setBlockMode_blocking)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				listener.initialize();
 
-    // ACT
-    int status = listener.setBlockMode(true);
+				//	ACT
+				int	status	=	listener.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_FALSE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_FALSE(flag	&	O_NONBLOCK);
 }
 
-TEST_F( TCPClientListenerTest, setBlockMode_fcntl_getfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    system_context->register_fcntl_impl([](int a, int b, int c) {
-        errno = EACCES;
-        return -1;
-    });
-    listener.initialize();
-
-    // ACT
-    int status = listener.setBlockMode(true);
-
-    // ASSERT
-    EXPECT_EQ(status, -1);
+TEST_F(	TCPClientListenerTest,	setBlockMode_fcntl_getfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				system_context->register_fcntl_impl([](int	a,	int	b,	int	c)	{
+								errno	=	EACCES;
+								return	-1;
+				});
+				listener.initialize();
+
+				//	ACT
+				int	status	=	listener.setBlockMode(true);
+
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 }
 
-TEST_F( TCPClientListenerTest, setBlockMode_fcntl_setfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
-    system_context->register_fcntl_impl([](int a, int cmd, int c) {
-        if (cmd == F_SETFL) {
-            errno = EBADF;
-            return -1;
-        }
-        return 0;
-    });
-
-    listener.initialize();
-
-    // ACT
-    int status = listener.setBlockMode(true);
-
-    // ASSERT
-    EXPECT_EQ(status, -1);
+TEST_F(	TCPClientListenerTest,	setBlockMode_fcntl_setfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
+				system_context->register_fcntl_impl([](int	a,	int	cmd,	int	c)	{
+								if	(cmd	==	F_SETFL)	{
+												errno	=	EBADF;
+												return	-1;
+								}
+								return	0;
+				});
+
+				listener.initialize();
+
+				//	ACT
+				int	status	=	listener.setBlockMode(true);
+
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 }
 
 
-TEST_F( TCPClientListenerTest, validateSourceAddress_localhost) {
-    // ARRANGE
-    // ACT
-    bool status = listener.validateSourceAddress("localhost");
+TEST_F(	TCPClientListenerTest,	validateSourceAddress_localhost)	{
+				//	ARRANGE
+				//	ACT
+				bool	status	=	listener.validateSourceAddress("localhost");
 
-    // ASSERT
-    EXPECT_EQ(status, true);
+				//	ASSERT
+				EXPECT_EQ(status,	true);
 }
 
-TEST_F( TCPClientListenerTest, validateSourceAddress_junk) {
-    // ARRANGE
-    // ACT
-    bool status = listener.validateSourceAddress("alsdkfjgalkdj");
+TEST_F(	TCPClientListenerTest,	validateSourceAddress_junk)	{
+				//	ARRANGE
+				//	ACT
+				bool	status	=	listener.validateSourceAddress("alsdkfjgalkdj");
 
-    // ASSERT
-    EXPECT_EQ(status, false);
+				//	ASSERT
+				EXPECT_EQ(status,	false);
 }
 
-TEST_F( TCPClientListenerTest, checkSocket) {
-    // ARRANGE
-    listener.initialize();
-    int port = listener.getPort();
-
-    // ACT
-    int status = listener.checkSocket();
-    
-    // ASSERT
-    EXPECT_EQ(status, 0);
-    EXPECT_EQ(listener.getPort(), port);
+TEST_F(	TCPClientListenerTest,	checkSocket)	{
+				//	ARRANGE
+				listener.initialize();
+				int	port	=	listener.getPort();
+
+				//	ACT
+				int	status	=	listener.checkSocket();
+				
+				//	ASSERT
+				EXPECT_EQ(status,	0);
+				EXPECT_EQ(listener.getPort(),	port);
 }
 
-TEST_F( TCPClientListenerTest, checkSocket_uninitialized) {
-    // ARRANGE
-    // ACT
-    int status = listener.checkSocket();
-    
-    // ASSERT
-    EXPECT_EQ(status, -1);
+TEST_F(	TCPClientListenerTest,	checkSocket_uninitialized)	{
+				//	ARRANGE
+				//	ACT
+				int	status	=	listener.checkSocket();
+				
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 }
 
-TEST_F( TCPClientListenerTest, disconnect) {
-    // ARRANGE
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	disconnect)	{
+				//	ARRANGE
+				listener.initialize();
 
-    // ACT
-    int status = listener.disconnect();
-    
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ACT
+				int	status	=	listener.disconnect();
+				
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 }
 
-TEST_F( TCPClientListenerTest, disconnect_uninitialized) {
-    // ARRANGE
-    // ACT
-    int status = listener.disconnect();
-    
-    // ASSERT
-    EXPECT_EQ(status, -1);
+TEST_F(	TCPClientListenerTest,	disconnect_uninitialized)	{
+				//	ARRANGE
+				//	ACT
+				int	status	=	listener.disconnect();
+				
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 }
 
-TEST_F( TCPClientListenerTest, setupNewConnection) {
-    // ARRANGE
-    listener.initialize();
+TEST_F(	TCPClientListenerTest,	setupNewConnection)	{
+				//	ARRANGE
+				listener.initialize();
 
-    // ACT
-    Trick::TCPConnection * connection = listener.setUpNewConnection();
-    
-    // ASSERT
-    EXPECT_TRUE(connection != NULL);
+				//	ACT
+				Trick::TCPConnection	*	connection	=	listener.setUpNewConnection();
+				
+				//	ASSERT
+				EXPECT_TRUE(connection	!=	NULL);
 }
 
-TEST_F( TCPClientListenerTest, setupNewConnection_uninitialized) {
-    // ARRANGE
+TEST_F(	TCPClientListenerTest,	setupNewConnection_uninitialized)	{
+				//	ARRANGE
 
-    // ACT
-    Trick::TCPConnection * connection = listener.setUpNewConnection();
-    
-    // ASSERT
-    EXPECT_TRUE(connection == NULL);
+				//	ACT
+				Trick::TCPConnection	*	connection	=	listener.setUpNewConnection();
+				
+				//	ASSERT
+				EXPECT_TRUE(connection	==	NULL);
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/test/TCPConnection_test.cpp b/trick_source/trick_utils/connection_handlers/test/TCPConnection_test.cpp
index 2494a55d7..6cfc8f9b7 100644
--- a/trick_source/trick_utils/connection_handlers/test/TCPConnection_test.cpp
+++ b/trick_source/trick_utils/connection_handlers/test/TCPConnection_test.cpp
@@ -1,379 +1,379 @@
 
-#include <gtest/gtest.h>
-#include <errno.h>
-#include <unistd.h>
-#include <iostream>
-#include <sys/select.h>
-#include <netinet/tcp.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include "trick/TCPConnection.hh"
-#include "SystemInterfaceMock/SystemInterfaceMock.hh"
-
-
-class TCPConnectionTest : public testing::Test {
-
-   protected:
-      TCPConnectionTest() : system_context(new SystemInferfaceMock()), connection (fake_listen_socket_fd, system_context) {}
-      ~TCPConnectionTest(){}
-
-      SystemInferfaceMock * system_context;
-      Trick::TCPConnection connection;
-      const static int fake_listen_socket_fd;
+#include	<gtest/gtest.h>
+#include	<errno.h>
+#include	<unistd.h>
+#include	<iostream>
+#include	<sys/select.h>
+#include	<netinet/tcp.h>
+#include	<fcntl.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<netdb.h>
+#include	<unistd.h>
+#include	<arpa/inet.h>
+#include	"trick/TCPConnection.hh"
+#include	"SystemInterfaceMock/SystemInterfaceMock.hh"
+
+
+class	TCPConnectionTest	:	public	testing::Test	{
+
+			protected:
+						TCPConnectionTest()	:	system_context(new	SystemInferfaceMock()),	connection	(fake_listen_socket_fd,	system_context)	{}
+						~TCPConnectionTest(){}
+
+						SystemInferfaceMock	*	system_context;
+						Trick::TCPConnection	connection;
+						const	static	int	fake_listen_socket_fd;
 };
 
-const int TCPConnectionTest::fake_listen_socket_fd = 5;
+const	int	TCPConnectionTest::fake_listen_socket_fd	=	5;
 
-TEST_F( TCPConnectionTest, initialized ) {
-    // ARRANGE
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
+TEST_F(	TCPConnectionTest,	initialized	)	{
+				//	ARRANGE
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
 
-    // ACT
-    int result = connection.start();
+				//	ACT
+				int	result	=	connection.start();
 
-    // ASSERT
-    ASSERT_EQ(result, 0);
+				//	ASSERT
+				ASSERT_EQ(result,	0);
 }
 
-TEST_F( TCPConnectionTest, initialized_accept_failure ) {
-    // ARRANGE
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        errno = EWOULDBLOCK;
-        return -1;
-    });
+TEST_F(	TCPConnectionTest,	initialized_accept_failure	)	{
+				//	ARRANGE
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								errno	=	EWOULDBLOCK;
+								return	-1;
+				});
 
-    // ACT
-    int result = connection.start();
+				//	ACT
+				int	result	=	connection.start();
 
-    // ASSERT
-    ASSERT_EQ(result, -1);
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
 }
 
 
-TEST_F( TCPConnectionTest, setBlockMode_nonblocking) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        socket_fd = ::socket(AF_INET, SOCK_STREAM, 0);
-        return socket_fd;
-    });
-    connection.start();
+TEST_F(	TCPConnectionTest,	setBlockMode_nonblocking)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								socket_fd	=	::socket(AF_INET,	SOCK_STREAM,	0);
+								return	socket_fd;
+				});
+				connection.start();
 
-    // ACT
-    int status = connection.setBlockMode(false);
+				//	ACT
+				int	status	=	connection.setBlockMode(false);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_TRUE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_TRUE(flag	&	O_NONBLOCK);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
 
-TEST_F( TCPConnectionTest, setBlockMode_blocking) {
-// ARRANGE
-    int socket_fd;
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        socket_fd = ::socket(AF_INET, SOCK_STREAM, 0);
-        return socket_fd;
-    });
-    connection.start();
+TEST_F(	TCPConnectionTest,	setBlockMode_blocking)	{
+//	ARRANGE
+				int	socket_fd;
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								socket_fd	=	::socket(AF_INET,	SOCK_STREAM,	0);
+								return	socket_fd;
+				});
+				connection.start();
 
-    // ACT
-    int status = connection.setBlockMode(true);
+				//	ACT
+				int	status	=	connection.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_FALSE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_FALSE(flag	&	O_NONBLOCK);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
-TEST_F( TCPConnectionTest, setBlockMode_fcntl_getfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        socket_fd = ::socket(AF_INET, SOCK_STREAM, 0);
-        return socket_fd;
-    });
-    connection.start();
-    system_context->register_fcntl_impl([](int a, int b, int c) {
-        errno = EACCES;
-        return -1;
-    });
-    // ACT
-    
-    int status = connection.setBlockMode(true);
-
-    // ASSERT
-    EXPECT_EQ(status, -1);
-
-    close(socket_fd);
+TEST_F(	TCPConnectionTest,	setBlockMode_fcntl_getfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								socket_fd	=	::socket(AF_INET,	SOCK_STREAM,	0);
+								return	socket_fd;
+				});
+				connection.start();
+				system_context->register_fcntl_impl([](int	a,	int	b,	int	c)	{
+								errno	=	EACCES;
+								return	-1;
+				});
+				//	ACT
+				
+				int	status	=	connection.setBlockMode(true);
+
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
+
+				close(socket_fd);
 }
 
-TEST_F( TCPConnectionTest, setBlockMode_fcntl_setfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        socket_fd = ::socket(AF_INET, SOCK_STREAM, 0);
-        return socket_fd;
-    });
+TEST_F(	TCPConnectionTest,	setBlockMode_fcntl_setfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								socket_fd	=	::socket(AF_INET,	SOCK_STREAM,	0);
+								return	socket_fd;
+				});
 
-    connection.start();
+				connection.start();
 
-    system_context->register_fcntl_impl([](int a, int cmd, int c) {
-        if (cmd == F_SETFL) {
-            errno = EBADF;
-            return -1;
-        }
-        return 0;
-    });
+				system_context->register_fcntl_impl([](int	a,	int	cmd,	int	c)	{
+								if	(cmd	==	F_SETFL)	{
+												errno	=	EBADF;
+												return	-1;
+								}
+								return	0;
+				});
 
-    // ACT
-    int status = connection.setBlockMode(true);
+				//	ACT
+				int	status	=	connection.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, -1);
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
-TEST_F( TCPConnectionTest, write_string ) {
-    // ARRANGE
-    char sent_data[100];
-    memset(sent_data, 0, 100);
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_send_impl([&](int socket, const void * buffer, size_t length, int flags) -> ssize_t {
-        memcpy (sent_data, buffer, length);
-        return length;
-    });
-    connection.start();
-
-    // ACT
-    std::string str = "This is a message to write";
-    int result = connection.write(str);
-
-    // ASSERT
-    ASSERT_EQ(result, str.length());
-    ASSERT_STREQ(str.c_str(), sent_data);
+TEST_F(	TCPConnectionTest,	write_string	)	{
+				//	ARRANGE
+				char	sent_data[100];
+				memset(sent_data,	0,	100);
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_send_impl([&](int	socket,	const	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								memcpy	(sent_data,	buffer,	length);
+								return	length;
+				});
+				connection.start();
+
+				//	ACT
+				std::string	str	=	"This	is	a	message	to	write";
+				int	result	=	connection.write(str);
+
+				//	ASSERT
+				ASSERT_EQ(result,	str.length());
+				ASSERT_STREQ(str.c_str(),	sent_data);
 }
 
-TEST_F( TCPConnectionTest, write_binary_buf ) {
-    // ARRANGE
-    char to_send[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-    char sent_data[100];
-
-    memset(sent_data, 0, 100);
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_send_impl([&](int socket, const void * buffer, size_t length, int flags) -> ssize_t {
-        memcpy (sent_data, buffer, length);
-        return length;
-    });
-    connection.start();
-
-    // ACT
-    int result = connection.write(to_send, sizeof(to_send));
-
-    // ASSERT
-    ASSERT_EQ(result, sizeof(to_send));
-    for (int i = 0; i < 8; i++) {
-        ASSERT_EQ(to_send[i], sent_data[i]);
-    }
+TEST_F(	TCPConnectionTest,	write_binary_buf	)	{
+				//	ARRANGE
+				char	to_send[8]	=	{0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07};
+				char	sent_data[100];
+
+				memset(sent_data,	0,	100);
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_send_impl([&](int	socket,	const	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								memcpy	(sent_data,	buffer,	length);
+								return	length;
+				});
+				connection.start();
+
+				//	ACT
+				int	result	=	connection.write(to_send,	sizeof(to_send));
+
+				//	ASSERT
+				ASSERT_EQ(result,	sizeof(to_send));
+				for	(int	i	=	0;	i	<	8;	i++)	{
+								ASSERT_EQ(to_send[i],	sent_data[i]);
+				}
 }
 
 
-TEST_F( TCPConnectionTest, write_string_uninitialized ) {
-    // ARRANGE
-    std::string str = "This is a message to write";
+TEST_F(	TCPConnectionTest,	write_string_uninitialized	)	{
+				//	ARRANGE
+				std::string	str	=	"This	is	a	message	to	write";
 
-    // ACT
-    int result = connection.write(str);
+				//	ACT
+				int	result	=	connection.write(str);
 
-    // ASSERT
-    ASSERT_EQ(result, -1);
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
 }
 
-TEST_F( TCPConnectionTest, write_binary_buf_uninitialized ) {
-    // ARRANGE
-    char to_send[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+TEST_F(	TCPConnectionTest,	write_binary_buf_uninitialized	)	{
+				//	ARRANGE
+				char	to_send[8]	=	{0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07};
 
-    // ACT
-    int result = connection.write(to_send, sizeof(to_send));
+				//	ACT
+				int	result	=	connection.write(to_send,	sizeof(to_send));
 
-    // ASSERT
-    ASSERT_EQ(result, -1);
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
 }
 
 
-TEST_F( TCPConnectionTest, read_nonewline ) {
-    // ARRANGE
-    std::string data_to_read = "Here is an incomplete message from a socket";
-    
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_recv_impl([&](int socket, void * buffer, size_t length, int flags) -> ssize_t {
-        int data_to_read_size = data_to_read.size() < length ? data_to_read.size() : length;
-
-        memcpy (buffer, data_to_read.c_str(), data_to_read_size);
-        return data_to_read_size;
-    });
-    connection.start();
-
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
-
-    // ASSERT
-    ASSERT_EQ(result, std::string(""));
-    ASSERT_EQ(nbytes, 0);
+TEST_F(	TCPConnectionTest,	read_nonewline	)	{
+				//	ARRANGE
+				std::string	data_to_read	=	"Here	is	an	incomplete	message	from	a	socket";
+				
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_recv_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								int	data_to_read_size	=	data_to_read.size()	<	length	?	data_to_read.size()	:	length;
+
+								memcpy	(buffer,	data_to_read.c_str(),	data_to_read_size);
+								return	data_to_read_size;
+				});
+				connection.start();
+
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
+
+				//	ASSERT
+				ASSERT_EQ(result,	std::string(""));
+				ASSERT_EQ(nbytes,	0);
 }
 
 
-TEST_F( TCPConnectionTest, read ) {
-    // ARRANGE
-    std::string data_to_read = "Here is a complete message from a socket\n This part is incomplete";
-    
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_recv_impl([&](int socket, void * buffer, size_t length, int flags) -> ssize_t {
-        int data_to_read_size = data_to_read.size() < length ? data_to_read.size() : length;
-        memcpy (buffer, data_to_read.c_str(), data_to_read_size);
-        return data_to_read_size;
-    });
-    connection.start();
-
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
-
-    // ASSERT
-    std::string expected = "Here is a complete message from a socket\n";
-    expected += '\0';
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, expected.size());
+TEST_F(	TCPConnectionTest,	read	)	{
+				//	ARRANGE
+				std::string	data_to_read	=	"Here	is	a	complete	message	from	a	socket\n	This	part	is	incomplete";
+				
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_recv_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								int	data_to_read_size	=	data_to_read.size()	<	length	?	data_to_read.size()	:	length;
+								memcpy	(buffer,	data_to_read.c_str(),	data_to_read_size);
+								return	data_to_read_size;
+				});
+				connection.start();
+
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
+
+				//	ASSERT
+				std::string	expected	=	"Here	is	a	complete	message	from	a	socket\n";
+				expected	+=	'\0';
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	expected.size());
 }
 
 
-TEST_F( TCPConnectionTest, read_nodata ) {
-    // ARRANGE    
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_recv_impl([&](int socket, void * buffer, size_t length, int flags) -> ssize_t {
-        errno = EAGAIN;
-        return -1;
-    });
-    connection.start();
+TEST_F(	TCPConnectionTest,	read_nodata	)	{
+				//	ARRANGE				
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_recv_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								errno	=	EAGAIN;
+								return	-1;
+				});
+				connection.start();
 
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
 
 
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    EXPECT_EQ(nbytes, 0);
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				EXPECT_EQ(nbytes,	0);
 }
 
-TEST_F( TCPConnectionTest, read_other_error ) {
-    // ARRANGE    
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return 6;
-    });
-    system_context->noop_fcntl_impl();
-    system_context->register_recv_impl([&](int socket, void * buffer, size_t length, int flags) -> ssize_t {
-        errno = EBADF;
-        return -1;
-    });
+TEST_F(	TCPConnectionTest,	read_other_error	)	{
+				//	ARRANGE				
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	6;
+				});
+				system_context->noop_fcntl_impl();
+				system_context->register_recv_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags)	->	ssize_t	{
+								errno	=	EBADF;
+								return	-1;
+				});
 
-    connection.start();
+				connection.start();
 
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
 
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    EXPECT_EQ(nbytes, -1);
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				EXPECT_EQ(nbytes,	-1);
 
 }
 
 
 
-TEST_F( TCPConnectionTest, read_uninitialized ) {
-    // ARRANGE
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
+TEST_F(	TCPConnectionTest,	read_uninitialized	)	{
+				//	ARRANGE
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
 
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, 0);
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	0);
 
 }
 
 
-TEST_F( TCPConnectionTest, disconnect ) {
-    // ARRANGE
-    int socket_fd = 6;
-    int close_called = 0;
-    int shutdown_called = 0;
-    system_context->register_accept_impl([&](int socket, struct sockaddr * address, socklen_t * address_len) -> int {
-        return socket_fd;
-    });
-    system_context->register_close_impl([&](int socket) {
-        if (socket == socket_fd)
-            close_called++;
-        return 0;
-    });
-    system_context->register_shutdown_impl([&](int socket, int how) {
-        if (socket == socket_fd)
-            shutdown_called++;
-        return 0;
-    });
-    system_context->noop_fcntl_impl();
-    connection.start();
-
-    // ACT
-    int result = connection.disconnect();
-
-    // ASSERT
-    ASSERT_EQ(result, 0);
-    ASSERT_EQ(close_called, 1);
-    ASSERT_EQ(shutdown_called, 1);
-
-    // Don't shut down if already shut down
-    // ACT
-    result = connection.disconnect();
-
-    // ASSERT
-    ASSERT_EQ(result, -1);
-    ASSERT_EQ(close_called, 1);
-    ASSERT_EQ(shutdown_called, 1);
+TEST_F(	TCPConnectionTest,	disconnect	)	{
+				//	ARRANGE
+				int	socket_fd	=	6;
+				int	close_called	=	0;
+				int	shutdown_called	=	0;
+				system_context->register_accept_impl([&](int	socket,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	int	{
+								return	socket_fd;
+				});
+				system_context->register_close_impl([&](int	socket)	{
+								if	(socket	==	socket_fd)
+												close_called++;
+								return	0;
+				});
+				system_context->register_shutdown_impl([&](int	socket,	int	how)	{
+								if	(socket	==	socket_fd)
+												shutdown_called++;
+								return	0;
+				});
+				system_context->noop_fcntl_impl();
+				connection.start();
+
+				//	ACT
+				int	result	=	connection.disconnect();
+
+				//	ASSERT
+				ASSERT_EQ(result,	0);
+				ASSERT_EQ(close_called,	1);
+				ASSERT_EQ(shutdown_called,	1);
+
+				//	Don't	shut	down	if	already	shut	down
+				//	ACT
+				result	=	connection.disconnect();
+
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
+				ASSERT_EQ(close_called,	1);
+				ASSERT_EQ(shutdown_called,	1);
 
 }
\ No newline at end of file
diff --git a/trick_source/trick_utils/connection_handlers/test/UDPConnection_test.cpp b/trick_source/trick_utils/connection_handlers/test/UDPConnection_test.cpp
index a7c7623fd..603ccaf5c 100644
--- a/trick_source/trick_utils/connection_handlers/test/UDPConnection_test.cpp
+++ b/trick_source/trick_utils/connection_handlers/test/UDPConnection_test.cpp
@@ -1,406 +1,406 @@
 
-#include <gtest/gtest.h>
-#include <errno.h>
-#include <unistd.h>
-#include <iostream>
-#include <sys/select.h>
-#include <netinet/tcp.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
-#include "trick/UDPConnection.hh"
-#include "SystemInterfaceMock/SystemInterfaceMock.hh"
-
-
-class UDPConnectionTest : public testing::Test {
-
-   protected:
-      UDPConnectionTest() : system_context(new SystemInferfaceMock()), connection (system_context) {}
-      ~UDPConnectionTest() {}
-
-      SystemInferfaceMock * system_context;
-      Trick::UDPConnection connection;
+#include	<gtest/gtest.h>
+#include	<errno.h>
+#include	<unistd.h>
+#include	<iostream>
+#include	<sys/select.h>
+#include	<netinet/tcp.h>
+#include	<fcntl.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<netdb.h>
+#include	<unistd.h>
+#include	<arpa/inet.h>
+
+#include	"trick/UDPConnection.hh"
+#include	"SystemInterfaceMock/SystemInterfaceMock.hh"
+
+
+class	UDPConnectionTest	:	public	testing::Test	{
+
+			protected:
+						UDPConnectionTest()	:	system_context(new	SystemInferfaceMock()),	connection	(system_context)	{}
+						~UDPConnectionTest()	{}
+
+						SystemInferfaceMock	*	system_context;
+						Trick::UDPConnection	connection;
 };
 
 
 
-TEST_F( UDPConnectionTest, initialize_localhost_0 ) {
-    // ARRANGE
-    char name[80];
-    gethostname(name, (size_t) 80);
+TEST_F(	UDPConnectionTest,	initialize_localhost_0	)	{
+				//	ARRANGE
+				char	name[80];
+				gethostname(name,	(size_t)	80);
 
-    // ACT
-    connection.initialize("localhost", 0);
-    connection.start();
+				//	ACT
+				connection.initialize("localhost",	0);
+				connection.start();
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), true);
-    EXPECT_EQ(connection.getHostname(), std::string(name));
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	true);
+				EXPECT_EQ(connection.getHostname(),	std::string(name));
 }
 
-TEST_F( UDPConnectionTest, initialize_localhost_54321 ) {
-    // ARRANGE
-    // ACT
-    connection.initialize("localhost", 54321);
-    connection.start();
+TEST_F(	UDPConnectionTest,	initialize_localhost_54321	)	{
+				//	ARRANGE
+				//	ACT
+				connection.initialize("localhost",	54321);
+				connection.start();
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), true);
-    EXPECT_EQ(connection.getPort(), 54321);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	true);
+				EXPECT_EQ(connection.getPort(),	54321);
 }
 
-TEST_F( UDPConnectionTest, initialize_localhost_numerical_54321 ) {
-    // ARRANGE
-    // ACT
-    connection.initialize("127.0.0.1", 12345);
-    connection.start();
+TEST_F(	UDPConnectionTest,	initialize_localhost_numerical_54321	)	{
+				//	ARRANGE
+				//	ACT
+				connection.initialize("127.0.0.1",	12345);
+				connection.start();
 
-    // ASSERT
-    EXPECT_EQ(connection.getPort(), 12345);
+				//	ASSERT
+				EXPECT_EQ(connection.getPort(),	12345);
 }
 
-TEST_F( UDPConnectionTest, initialize_invalid_hostname ) {
-    // ARRANGE
-    // ACT
-    connection.initialize("some_invalid_hostname", 0);
-    connection.start();
+TEST_F(	UDPConnectionTest,	initialize_invalid_hostname	)	{
+				//	ARRANGE
+				//	ACT
+				connection.initialize("some_invalid_hostname",	0);
+				connection.start();
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	false);
 }
 
-TEST_F( UDPConnectionTest, failed_socket ) {
-    // ARRANGE
-    system_context->register_socket_impl([](int a, int b, int c) { 
-        errno = EPERM;
-        return -1; 
-    });
+TEST_F(	UDPConnectionTest,	failed_socket	)	{
+				//	ARRANGE
+				system_context->register_socket_impl([](int	a,	int	b,	int	c)	{	
+								errno	=	EPERM;
+								return	-1;	
+				});
 
-    // ACT
-    connection.initialize("localhost", 54321);
+				//	ACT
+				connection.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	false);
 }
 
-TEST_F( UDPConnectionTest, failed_setsockopt_reuseaddr ) {
-    // ARRANGE
-    system_context->register_setsockopt_impl([](int sockfd, int level, int optname, const void *optval, socklen_t optlen) { 
-        errno = EINVAL;
-        return -1; 
-    });
+TEST_F(	UDPConnectionTest,	failed_setsockopt_reuseaddr	)	{
+				//	ARRANGE
+				system_context->register_setsockopt_impl([](int	sockfd,	int	level,	int	optname,	const	void	*optval,	socklen_t	optlen)	{	
+								errno	=	EINVAL;
+								return	-1;	
+				});
 
-    // ACT
-    connection.initialize("localhost", 54321);
+				//	ACT
+				connection.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	false);
 }
 
-TEST_F( UDPConnectionTest, failed_bind ) {
-    // ARRANGE
-    system_context->register_bind_impl([](int sockfd, const struct sockaddr *addr,socklen_t addrlen) { 
-        errno = EADDRINUSE;
-        return -1;
-    });
+TEST_F(	UDPConnectionTest,	failed_bind	)	{
+				//	ARRANGE
+				system_context->register_bind_impl([](int	sockfd,	const	struct	sockaddr	*addr,socklen_t	addrlen)	{	
+								errno	=	EADDRINUSE;
+								return	-1;
+				});
 
-    // ACT
-    connection.initialize("localhost", 54321);
+				//	ACT
+				connection.initialize("localhost",	54321);
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	false);
 }
 
-TEST_F( UDPConnectionTest, failed_sockname ) {
-    // ARRANGE
-    system_context->register_getsockname_impl([](int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
-        ((struct sockaddr_in *) addr)->sin_port = htons(1234);
-        return 0;
-    });
+TEST_F(	UDPConnectionTest,	failed_sockname	)	{
+				//	ARRANGE
+				system_context->register_getsockname_impl([](int	sockfd,	struct	sockaddr	*addr,	socklen_t	*addrlen)	{
+								((struct	sockaddr_in	*)	addr)->sin_port	=	htons(1234);
+								return	0;
+				});
 
-    // ACT
-    connection.initialize("localhost", 3412);
+				//	ACT
+				connection.initialize("localhost",	3412);
 
-    // ASSERT
-    EXPECT_EQ(connection.isInitialized(), false);
+				//	ASSERT
+				EXPECT_EQ(connection.isInitialized(),	false);
 }
 
 
-TEST_F( UDPConnectionTest, setBlockMode_nonblocking) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
+TEST_F(	UDPConnectionTest,	setBlockMode_nonblocking)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
 
-    connection.initialize("localhost", 0);
-    connection.start();
+				connection.initialize("localhost",	0);
+				connection.start();
 
-    // ACT
-    int status = connection.setBlockMode(false);
+				//	ACT
+				int	status	=	connection.setBlockMode(false);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_TRUE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_TRUE(flag	&	O_NONBLOCK);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
 
-TEST_F( UDPConnectionTest, setBlockMode_blocking) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
+TEST_F(	UDPConnectionTest,	setBlockMode_blocking)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
 
-    connection.initialize("localhost", 0);
-    connection.start();
+				connection.initialize("localhost",	0);
+				connection.start();
 
-    // ACT
-    int status = connection.setBlockMode(true);
+				//	ACT
+				int	status	=	connection.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, 0);
+				//	ASSERT
+				EXPECT_EQ(status,	0);
 
-    int flag = fcntl(socket_fd, F_GETFL, 0);
-    EXPECT_FALSE(flag & O_NONBLOCK);
+				int	flag	=	fcntl(socket_fd,	F_GETFL,	0);
+				EXPECT_FALSE(flag	&	O_NONBLOCK);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
-TEST_F( UDPConnectionTest, setBlockMode_fcntl_getfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
+TEST_F(	UDPConnectionTest,	setBlockMode_fcntl_getfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
 
-    connection.initialize("localhost", 0);
-    connection.start();
+				connection.initialize("localhost",	0);
+				connection.start();
 
-    system_context->register_fcntl_impl([](int a, int b, int c) {
-        errno = EACCES;
-        return -1;
-    });
+				system_context->register_fcntl_impl([](int	a,	int	b,	int	c)	{
+								errno	=	EACCES;
+								return	-1;
+				});
 
-    // ACT
-    
-    int status = connection.setBlockMode(true);
+				//	ACT
+				
+				int	status	=	connection.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, -1);
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
-TEST_F( UDPConnectionTest, setBlockMode_fcntl_setfl_fail) {
-    // ARRANGE
-    int socket_fd;
-    system_context->register_socket_impl([&socket_fd](int a, int b, int c) {
-        socket_fd = ::socket(a, b, c);
-        return socket_fd;
-    });
+TEST_F(	UDPConnectionTest,	setBlockMode_fcntl_setfl_fail)	{
+				//	ARRANGE
+				int	socket_fd;
+				system_context->register_socket_impl([&socket_fd](int	a,	int	b,	int	c)	{
+								socket_fd	=	::socket(a,	b,	c);
+								return	socket_fd;
+				});
 
-    connection.initialize("localhost", 0);
-    connection.start();
+				connection.initialize("localhost",	0);
+				connection.start();
 
-    system_context->register_fcntl_impl([](int a, int cmd, int c) {
-        if (cmd == F_SETFL) {
-            errno = EBADF;
-            return -1;
-        }
-        return 0;
-    });
+				system_context->register_fcntl_impl([](int	a,	int	cmd,	int	c)	{
+								if	(cmd	==	F_SETFL)	{
+												errno	=	EBADF;
+												return	-1;
+								}
+								return	0;
+				});
 
-    // ACT
-    int status = connection.setBlockMode(true);
+				//	ACT
+				int	status	=	connection.setBlockMode(true);
 
-    // ASSERT
-    EXPECT_EQ(status, -1);
+				//	ASSERT
+				EXPECT_EQ(status,	-1);
 
-    close(socket_fd);
+				close(socket_fd);
 }
 
 
-TEST_F( UDPConnectionTest, write_string ) {
-    // ARRANGE
-    char sent_data[100];
-    memset(sent_data, 0, 100);
-    system_context->noop_fcntl_impl();
-    system_context->register_sendto_impl([&](int socket, const void * buffer, size_t length, int flags, const struct sockaddr * dest_addr, socklen_t dest_len) -> ssize_t {
-        memcpy (sent_data, buffer, length);
-        return length;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
-
-    // ACT
-    std::string str = "This is a message to write";
-    int result = connection.write(str);
-
-    // ASSERT
-    ASSERT_EQ(result, str.length());
-    ASSERT_STREQ(str.c_str(), sent_data);
+TEST_F(	UDPConnectionTest,	write_string	)	{
+				//	ARRANGE
+				char	sent_data[100];
+				memset(sent_data,	0,	100);
+				system_context->noop_fcntl_impl();
+				system_context->register_sendto_impl([&](int	socket,	const	void	*	buffer,	size_t	length,	int	flags,	const	struct	sockaddr	*	dest_addr,	socklen_t	dest_len)	->	ssize_t	{
+								memcpy	(sent_data,	buffer,	length);
+								return	length;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
+
+				//	ACT
+				std::string	str	=	"This	is	a	message	to	write";
+				int	result	=	connection.write(str);
+
+				//	ASSERT
+				ASSERT_EQ(result,	str.length());
+				ASSERT_STREQ(str.c_str(),	sent_data);
 }
 
-TEST_F( UDPConnectionTest, write_binary_buf ) {
-    // ARRANGE
-    char to_send[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-    char sent_data[100];
-
-    memset(sent_data, 0, 100);
-    system_context->noop_fcntl_impl();
-    system_context->register_sendto_impl([&](int socket, const void * buffer, size_t length, int flags, const struct sockaddr * dest_addr, socklen_t dest_len) -> ssize_t {
-        memcpy (sent_data, buffer, length);
-        return length;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
-
-    // ACT
-    int result = connection.write(to_send, sizeof(to_send));
-
-    // ASSERT
-    ASSERT_EQ(result, sizeof(to_send));
-    for (int i = 0; i < 8; i++) {
-        ASSERT_EQ(to_send[i], sent_data[i]);
-    }
+TEST_F(	UDPConnectionTest,	write_binary_buf	)	{
+				//	ARRANGE
+				char	to_send[8]	=	{0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07};
+				char	sent_data[100];
+
+				memset(sent_data,	0,	100);
+				system_context->noop_fcntl_impl();
+				system_context->register_sendto_impl([&](int	socket,	const	void	*	buffer,	size_t	length,	int	flags,	const	struct	sockaddr	*	dest_addr,	socklen_t	dest_len)	->	ssize_t	{
+								memcpy	(sent_data,	buffer,	length);
+								return	length;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
+
+				//	ACT
+				int	result	=	connection.write(to_send,	sizeof(to_send));
+
+				//	ASSERT
+				ASSERT_EQ(result,	sizeof(to_send));
+				for	(int	i	=	0;	i	<	8;	i++)	{
+								ASSERT_EQ(to_send[i],	sent_data[i]);
+				}
 }
 
 
-TEST_F( UDPConnectionTest, write_string_uninitialized ) {
-    // ARRANGE
-    std::string str = "This is a message to write";
+TEST_F(	UDPConnectionTest,	write_string_uninitialized	)	{
+				//	ARRANGE
+				std::string	str	=	"This	is	a	message	to	write";
 
-    // ACT
-    int result = connection.write(str);
+				//	ACT
+				int	result	=	connection.write(str);
 
-    // ASSERT
-    ASSERT_EQ(result, -1);
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
 }
 
-TEST_F( UDPConnectionTest, write_binary_buf_uninitialized ) {
-    // ARRANGE
-    char to_send[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+TEST_F(	UDPConnectionTest,	write_binary_buf_uninitialized	)	{
+				//	ARRANGE
+				char	to_send[8]	=	{0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07};
 
-    // ACT
-    int result = connection.write(to_send, sizeof(to_send));
+				//	ACT
+				int	result	=	connection.write(to_send,	sizeof(to_send));
 
-    // ASSERT
-    ASSERT_EQ(result, -1);
+				//	ASSERT
+				ASSERT_EQ(result,	-1);
 }
 
 
-TEST_F( UDPConnectionTest, read_nonewline ) {
-    // ARRANGE
-    std::string data_to_read = "Here is an incomplete message from a socket";
-    
-    system_context->noop_fcntl_impl();
-    system_context->register_recvfrom_impl([&](int socket, void * buffer, size_t length, int flags, struct sockaddr * address, socklen_t * address_len) -> ssize_t {
-        int data_to_read_size = data_to_read.size() < length ? data_to_read.size() : length;
+TEST_F(	UDPConnectionTest,	read_nonewline	)	{
+				//	ARRANGE
+				std::string	data_to_read	=	"Here	is	an	incomplete	message	from	a	socket";
+				
+				system_context->noop_fcntl_impl();
+				system_context->register_recvfrom_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	ssize_t	{
+								int	data_to_read_size	=	data_to_read.size()	<	length	?	data_to_read.size()	:	length;
 
-        memcpy (buffer, data_to_read.c_str(), data_to_read_size);
-        return data_to_read_size;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
+								memcpy	(buffer,	data_to_read.c_str(),	data_to_read_size);
+								return	data_to_read_size;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
 
 
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
 
-    // ASSERT
-    ASSERT_EQ(result, std::string(""));
-    ASSERT_EQ(nbytes, 0);
+				//	ASSERT
+				ASSERT_EQ(result,	std::string(""));
+				ASSERT_EQ(nbytes,	0);
 }
 
 
-TEST_F( UDPConnectionTest, read ) {
-    // ARRANGE
-    std::string data_to_read = "Here is a complete message from a socket\n This part is incomplete";
-    
-    system_context->noop_fcntl_impl();
-    system_context->register_recvfrom_impl([&](int socket, void * buffer, size_t length, int flags, struct sockaddr * address, socklen_t * address_len) -> ssize_t {
-        int data_to_read_size = data_to_read.size() < length ? data_to_read.size() : length;
-        memcpy (buffer, data_to_read.c_str(), data_to_read_size);
-        return data_to_read_size;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
-
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
-
-    // ASSERT
-    std::string expected = "Here is a complete message from a socket\n";
-    expected += '\0';
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, expected.size());
+TEST_F(	UDPConnectionTest,	read	)	{
+				//	ARRANGE
+				std::string	data_to_read	=	"Here	is	a	complete	message	from	a	socket\n	This	part	is	incomplete";
+				
+				system_context->noop_fcntl_impl();
+				system_context->register_recvfrom_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	ssize_t	{
+								int	data_to_read_size	=	data_to_read.size()	<	length	?	data_to_read.size()	:	length;
+								memcpy	(buffer,	data_to_read.c_str(),	data_to_read_size);
+								return	data_to_read_size;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
+
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
+
+				//	ASSERT
+				std::string	expected	=	"Here	is	a	complete	message	from	a	socket\n";
+				expected	+=	'\0';
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	expected.size());
 
 }
 
 
-TEST_F( UDPConnectionTest, read_nodata ) {
-    // ARRANGE    
-    system_context->noop_fcntl_impl();
-    system_context->register_recvfrom_impl([&](int socket, void * buffer, size_t length, int flags, struct sockaddr * address, socklen_t * address_len) -> ssize_t {
-        errno = EAGAIN;
-        return -1;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
-
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
-
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, 0);
+TEST_F(	UDPConnectionTest,	read_nodata	)	{
+				//	ARRANGE				
+				system_context->noop_fcntl_impl();
+				system_context->register_recvfrom_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	ssize_t	{
+								errno	=	EAGAIN;
+								return	-1;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
+
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
+
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	0);
 }
 
-TEST_F( UDPConnectionTest, read_other_error ) {
-    // ARRANGE    
-    system_context->noop_fcntl_impl();
-    system_context->register_recvfrom_impl([&](int socket, void * buffer, size_t length, int flags, struct sockaddr * address, socklen_t * address_len) -> ssize_t {
-        errno = EBADF;
-        return -1;
-    });
-    connection.initialize("localhost", 0);
-    connection.start();
-
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
-
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, -1);
+TEST_F(	UDPConnectionTest,	read_other_error	)	{
+				//	ARRANGE				
+				system_context->noop_fcntl_impl();
+				system_context->register_recvfrom_impl([&](int	socket,	void	*	buffer,	size_t	length,	int	flags,	struct	sockaddr	*	address,	socklen_t	*	address_len)	->	ssize_t	{
+								errno	=	EBADF;
+								return	-1;
+				});
+				connection.initialize("localhost",	0);
+				connection.start();
+
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
+
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	-1);
 
 }
 
-TEST_F( UDPConnectionTest, read_uninitialized ) {
-    // ARRANGE
-    // ACT
-    std::string result;
-    int nbytes = connection.read(result);
+TEST_F(	UDPConnectionTest,	read_uninitialized	)	{
+				//	ARRANGE
+				//	ACT
+				std::string	result;
+				int	nbytes	=	connection.read(result);
 
-    // ASSERT
-    std::string expected = "";
-    ASSERT_EQ(result, expected);
-    ASSERT_EQ(nbytes, 0);
+				//	ASSERT
+				std::string	expected	=	"";
+				ASSERT_EQ(result,	expected);
+				ASSERT_EQ(nbytes,	0);
 }
diff --git a/trick_source/trick_utils/interpolator/src/Interpolator.cpp b/trick_source/trick_utils/interpolator/src/Interpolator.cpp
index fc2a8a19c..c5494fe54 100644
--- a/trick_source/trick_utils/interpolator/src/Interpolator.cpp
+++ b/trick_source/trick_utils/interpolator/src/Interpolator.cpp
@@ -1,76 +1,76 @@
 
-#include <iostream>
-#include <sstream>
-#include <stdarg.h>
-#include "trick/Interpolator.hh"
+#include	<iostream>
+#include	<sstream>
+#include	<stdarg.h>
+#include	"trick/Interpolator.hh"
 
-double Trick::Interpolator::eval (double param[], unsigned int param_index, unsigned int offset)
+double	Trick::Interpolator::eval	(double	param[],	unsigned	int	param_index,	unsigned	int	offset)
 {
 
-    double x, x_lower, x_upper;
-    double f_x, f_x_lower, f_x_upper;
-    double *breakPoint;
-    unsigned int breakPointArraySize;
-    unsigned int ii;
+				double	x,	x_lower,	x_upper;
+				double	f_x,	f_x_lower,	f_x_upper;
+				double	*breakPoint;
+				unsigned	int	breakPointArraySize;
+				unsigned	int	ii;
 
-    x = param[param_index];
+				x	=	param[param_index];
 
-    breakPoint = breakPointArrays[param_index];
-    breakPointArraySize = breakPointArraySizes[param_index];
+				breakPoint	=	breakPointArrays[param_index];
+				breakPointArraySize	=	breakPointArraySizes[param_index];
 
-    for ( ii=0 ; ((ii+2 < breakPointArraySize) && (x > breakPoint[ii+1])) ; ii++ ) ;
+				for	(	ii=0	;	((ii+2	<	breakPointArraySize)	&&	(x	>	breakPoint[ii+1]))	;	ii++	)	;
 
-    x_lower = breakPoint[ii];
-    x_upper = breakPoint[ii+1];
+				x_lower	=	breakPoint[ii];
+				x_upper	=	breakPoint[ii+1];
 
-    if ((x < x_lower) ||  (x > x_upper)) {
-        std::stringstream ss;
+				if	((x	<	x_lower)	||		(x	>	x_upper))	{
+								std::stringstream	ss;
 
-        ss << "Interpolation parameter[" << param_index << "] is outside of its specified breakpoint range." ;
-        throw std::logic_error( ss.str() );
-    }
+								ss	<<	"Interpolation	parameter["	<<	param_index	<<	"]	is	outside	of	its	specified	breakpoint	range."	;
+								throw	std::logic_error(	ss.str()	);
+				}
 
-    if (param_index == nParams-1) {
-        f_x_lower = table[offset * breakPointArraySize + ii];
-        f_x_upper = table[offset * breakPointArraySize + ii + 1];
-    } else {
-        f_x_lower = eval( param, param_index+1, offset * breakPointArraySize + ii);
-        f_x_upper = eval( param, param_index+1, offset * breakPointArraySize + ii + 1);
-    }
+				if	(param_index	==	nParams-1)	{
+								f_x_lower	=	table[offset	*	breakPointArraySize	+	ii];
+								f_x_upper	=	table[offset	*	breakPointArraySize	+	ii	+	1];
+				}	else	{
+								f_x_lower	=	eval(	param,	param_index+1,	offset	*	breakPointArraySize	+	ii);
+								f_x_upper	=	eval(	param,	param_index+1,	offset	*	breakPointArraySize	+	ii	+	1);
+				}
 
-    f_x = (x_upper - x)/(x_upper - x_lower) * f_x_lower +
-          (x - x_lower)/(x_upper - x_lower) * f_x_upper ;
+				f_x	=	(x_upper	-	x)/(x_upper	-	x_lower)	*	f_x_lower	+
+										(x	-	x_lower)/(x_upper	-	x_lower)	*	f_x_upper	;
 
-    return(f_x);
+				return(f_x);
 
 }
 
-double Trick::Interpolator::eval (double params[])
+double	Trick::Interpolator::eval	(double	params[])
 {
 
-    return ( eval( params, 0,0));
+				return	(	eval(	params,	0,0));
 }
 
-double Trick::Interpolator::eval (double param1, ...)
+double	Trick::Interpolator::eval	(double	param1,	...)
 {
 
-    double params[256];
-    va_list ap;
-    unsigned int i=0;
-
-    va_start(ap, param1);
-    params[i] = param1;
-    i++;
-    while (i < nParams) {
-        params[i] = va_arg(ap, double);
-        i++;
-    }
-    va_end(ap);
-
-    if (i == nParams ) {
-       return ( eval( params, 0,0));
-    } else {
-       return(0);
-    }
+				double	params[256];
+				va_list	ap;
+				unsigned	int	i=0;
+
+				va_start(ap,	param1);
+				params[i]	=	param1;
+				i++;
+				while	(i	<	nParams)	{
+								params[i]	=	va_arg(ap,	double);
+								i++;
+				}
+				va_end(ap);
+
+				if	(i	==	nParams	)	{
+							return	(	eval(	params,	0,0));
+				}	else	{
+							return(0);
+				}
 }
 
diff --git a/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp b/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
index 4d97275b5..fd0c813c7 100644
--- a/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
+++ b/trick_source/trick_utils/math/Unittest/euler_quat_test.cpp
@@ -1,82 +1,82 @@
-#include <iostream>
-#include <stdlib.h>
-#include <time.h>
-#include "euler_quat_test.hh"
-int main()
+#include	<iostream>
+#include	<stdlib.h>
+#include	<time.h>
+#include	"euler_quat_test.hh"
+int	main()
 {
-   EulerQuatTest  test;
-   int ii;
+			EulerQuatTest		test;
+			int	ii;
 
-   // =========  Testing deuler_*_quat.c ========================
-   // There are 2 capabilities for every deuler_*_quat.c function:
-   // 1. Convert form euler to left handed quaternion
-   // 2. Convert from left handed quaternion to euler: (2 methods)
-   //      - Make angles from quaternion
-   //      - Make angles from quaternion but use previous values to
-   //        prevent singularities
-   // ============================================================
+			//	=========		Testing	deuler_*_quat.c	========================
+			//	There	are	2	capabilities	for	every	deuler_*_quat.c	function:
+			//	1.	Convert	form	euler	to	left	handed	quaternion
+			//	2.	Convert	from	left	handed	quaternion	to	euler:	(2	methods)
+			//						-	Make	angles	from	quaternion
+			//						-	Make	angles	from	quaternion	but	use	previous	values	to
+			//								prevent	singularities
+			//	============================================================
 
-   srand(time(NULL));
-   for (ii=0; ii<test.num_tests; ii++){
+			srand(time(NULL));
+			for	(ii=0;	ii<test.num_tests;	ii++){
 
-      // Randomly input euler angles:
-      test.init_data.euler_angles[0] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
-      test.init_data.euler_angles[1] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
-      test.init_data.euler_angles[2] = (rand()%test.num_tests) * (2*M_PI/test.num_tests);
+						//	Randomly	input	euler	angles:
+						test.init_data.euler_angles[0]	=	(rand()%test.num_tests)	*	(2*M_PI/test.num_tests);
+						test.init_data.euler_angles[1]	=	(rand()%test.num_tests)	*	(2*M_PI/test.num_tests);
+						test.init_data.euler_angles[2]	=	(rand()%test.num_tests)	*	(2*M_PI/test.num_tests);
 
-      // Testing deuler_123_quat.c:
-      test.init_data.euler_sequence = Roll_Pitch_Yaw;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);   // Tesing singularities
+						//	Testing	deuler_123_quat.c:
+						test.init_data.euler_sequence	=	Roll_Pitch_Yaw;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);			//	Tesing	singularities
 
-      // Testing deuler_132_quat.c:
-      test.init_data.euler_sequence = Roll_Yaw_Pitch;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);
+						//	Testing	deuler_132_quat.c:
+						test.init_data.euler_sequence	=	Roll_Yaw_Pitch;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);
 
-      // Testing deuler_231_quat.c:
-      test.init_data.euler_sequence = Pitch_Yaw_Roll;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);
+						//	Testing	deuler_231_quat.c:
+						test.init_data.euler_sequence	=	Pitch_Yaw_Roll;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);
 
-      // Testing deuler_213_quat.c:
-      test.init_data.euler_sequence = Pitch_Roll_Yaw;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);
+						//	Testing	deuler_213_quat.c:
+						test.init_data.euler_sequence	=	Pitch_Roll_Yaw;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);
 
-      // Testing deuler_312_quat.c:
-      test.init_data.euler_sequence = Yaw_Roll_Pitch;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);
+						//	Testing	deuler_312_quat.c:
+						test.init_data.euler_sequence	=	Yaw_Roll_Pitch;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);
 
-      // Testing deuler_321_quat.c:
-      test.init_data.euler_sequence = Yaw_Pitch_Roll;
-      euler_matrix(test.init_data.euler_angles, test.mat, 0 , test.init_data.euler_sequence);
-      mat_to_quat(test.quat, test.mat);
-      test.test_euler_to_quat();
-      test.test_quat_to_euler(1);
-      test.test_quat_to_euler(2);
+						//	Testing	deuler_321_quat.c:
+						test.init_data.euler_sequence	=	Yaw_Pitch_Roll;
+						euler_matrix(test.init_data.euler_angles,	test.mat,	0	,	test.init_data.euler_sequence);
+						mat_to_quat(test.quat,	test.mat);
+						test.test_euler_to_quat();
+						test.test_quat_to_euler(1);
+						test.test_quat_to_euler(2);
 
-      test.num_pass ++;
-   }
-   if (test.num_pass == test.num_tests){
-       printf(" \e[1;34m Tested all %d sets of Euler angles and they were all PASSED \n\e",  test.num_tests);
-       printf("%c[%dm", 0x1B, 0);
-   }
-   return(0);
+						test.num_pass	++;
+			}
+			if	(test.num_pass	==	test.num_tests){
+							printf("	\e[1;34m	Tested	all	%d	sets	of	Euler	angles	and	they	were	all	PASSED	\n\e",		test.num_tests);
+							printf("%c[%dm",	0x1B,	0);
+			}
+			return(0);
 }
diff --git a/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp b/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
index a1886c90b..adb69b241 100644
--- a/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
+++ b/trick_source/trick_utils/math/test/UnitTestEulerQuat.cpp
@@ -1,398 +1,398 @@
-#include <gtest/gtest.h>
-#include "trick/trick_math.h"
-#include "trick/reference_frame.h"
-using namespace std;
+#include	<gtest/gtest.h>
+#include	"trick/trick_math.h"
+#include	"trick/reference_frame.h"
+using	namespace	std;
 
-class EulerQuatTest : public ::testing::Test {
+class	EulerQuatTest	:	public	::testing::Test	{
 
-   public:
+			public:
 
-      TRANSFORM init_data;
-      bool pass;
-      int num_tests;
-      int num_pass;
-      int method;
-      double quat[4];
-      double mat[3][3];
+						TRANSFORM	init_data;
+						bool	pass;
+						int	num_tests;
+						int	num_pass;
+						int	method;
+						double	quat[4];
+						double	mat[3][3];
 
-      EulerQuatTest() {
-          this->num_tests = 100;
-          this->num_pass = 0;
-          this->pass = false;
-      }
-      ~EulerQuatTest() {}
-      void SetUp() {}
-      void TearDown() {}
+						EulerQuatTest()	{
+										this->num_tests	=	100;
+										this->num_pass	=	0;
+										this->pass	=	false;
+						}
+						~EulerQuatTest()	{}
+						void	SetUp()	{}
+						void	TearDown()	{}
 
-      void compare_euler(double eul[3]){
-          double eul_error[3];
-          double mat_test[3][3];
-          double mat_error[3][3];
+						void	compare_euler(double	eul[3]){
+										double	eul_error[3];
+										double	mat_test[3][3];
+										double	mat_error[3][3];
 
-          M_IDENT(mat_error);
-          M_IDENT(mat_test);
-          V_INIT(eul_error);
-          euler_matrix(eul, mat_test, 0 , this->init_data.euler_sequence);
-          MxMt(mat_error, mat_test, this->mat);
-          euler_matrix(eul_error, mat_error, 0 , this->init_data.euler_sequence);
-          if(V_MAG(eul_error) < 0.00001){
-             this->num_pass ++;
-             pass = true;
-          } else{
-             pass = false;
-             printf("EulerAngle = %lf  %lf  %lf\n",this->init_data.euler_angles[0],
-                                                   this->init_data.euler_angles[1],
-                                                   this->init_data.euler_angles[2]);
-          }
-          return;
-      }
-      void compare_quat(double Q[4]){
-          double Q_error[4];
-          double mat_error[3][3];
-          double eul_error[3];
+										M_IDENT(mat_error);
+										M_IDENT(mat_test);
+										V_INIT(eul_error);
+										euler_matrix(eul,	mat_test,	0	,	this->init_data.euler_sequence);
+										MxMt(mat_error,	mat_test,	this->mat);
+										euler_matrix(eul_error,	mat_error,	0	,	this->init_data.euler_sequence);
+										if(V_MAG(eul_error)	<	0.00001){
+													this->num_pass	++;
+													pass	=	true;
+										}	else{
+													pass	=	false;
+													printf("EulerAngle	=	%lf		%lf		%lf\n",this->init_data.euler_angles[0],
+																																																			this->init_data.euler_angles[1],
+																																																			this->init_data.euler_angles[2]);
+										}
+										return;
+						}
+						void	compare_quat(double	Q[4]){
+										double	Q_error[4];
+										double	mat_error[3][3];
+										double	eul_error[3];
 
-          M_IDENT(mat_error);
-          V_INIT(eul_error);
-          QxQt(Q_error, Q, quat);
-          quat_to_mat(mat_error, Q_error);
-          euler_matrix(eul_error, mat_error, 0 , this->init_data.euler_sequence);
-          if(V_MAG(eul_error) < 0.00001){
-             this->num_pass ++;
-             this->pass = true;
-          } else{
-             this->pass = false;
-             printf("EulerAngle = %lf  %lf  %lf\n",this->init_data.euler_angles[0],
-                                                   this->init_data.euler_angles[1],
-                                                   this->init_data.euler_angles[2]);
-          }
-          return;
-      }
-      void test_euler_to_quat(){
-          double Q[4];
-          euler_quat(this->init_data.euler_angles, Q, 0,  this->init_data.euler_sequence);
-          compare_quat( Q );
-          return;
-      }
-      void test_quat_to_euler(int test){
-          double eul[3];
-          this->method = test;
-          if(this->method == 1){
-              euler_quat(eul, this->quat, this->method, this->init_data.euler_sequence);
-          }
-          else {
-             switch (this->init_data.euler_sequence) {
-                 case Roll_Pitch_Yaw:
-                     euler123_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-                 case Roll_Yaw_Pitch:
-                     euler132_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-                 case Pitch_Yaw_Roll:
-                     euler231_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-                 case Pitch_Roll_Yaw:
-                     euler213_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-                 case Yaw_Roll_Pitch:
-                     euler312_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-                 case Yaw_Pitch_Roll:
-                     euler321_quat( eul, this->quat, 2, this->init_data.euler_angles );
-                     break;
-             }
-          }
-          compare_euler(eul);
-          return;
-      }
+										M_IDENT(mat_error);
+										V_INIT(eul_error);
+										QxQt(Q_error,	Q,	quat);
+										quat_to_mat(mat_error,	Q_error);
+										euler_matrix(eul_error,	mat_error,	0	,	this->init_data.euler_sequence);
+										if(V_MAG(eul_error)	<	0.00001){
+													this->num_pass	++;
+													this->pass	=	true;
+										}	else{
+													this->pass	=	false;
+													printf("EulerAngle	=	%lf		%lf		%lf\n",this->init_data.euler_angles[0],
+																																																			this->init_data.euler_angles[1],
+																																																			this->init_data.euler_angles[2]);
+										}
+										return;
+						}
+						void	test_euler_to_quat(){
+										double	Q[4];
+										euler_quat(this->init_data.euler_angles,	Q,	0,		this->init_data.euler_sequence);
+										compare_quat(	Q	);
+										return;
+						}
+						void	test_quat_to_euler(int	test){
+										double	eul[3];
+										this->method	=	test;
+										if(this->method	==	1){
+														euler_quat(eul,	this->quat,	this->method,	this->init_data.euler_sequence);
+										}
+										else	{
+													switch	(this->init_data.euler_sequence)	{
+																	case	Roll_Pitch_Yaw:
+																					euler123_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+																	case	Roll_Yaw_Pitch:
+																					euler132_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+																	case	Pitch_Yaw_Roll:
+																					euler231_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+																	case	Pitch_Roll_Yaw:
+																					euler213_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+																	case	Yaw_Roll_Pitch:
+																					euler312_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+																	case	Yaw_Pitch_Roll:
+																					euler321_quat(	eul,	this->quat,	2,	this->init_data.euler_angles	);
+																					break;
+													}
+										}
+										compare_euler(eul);
+										return;
+						}
 };
 
-TEST_F(EulerQuatTest, euler123_to_quat)
+TEST_F(EulerQuatTest,	euler123_to_quat)
 {
-  init_data.euler_sequence = Roll_Pitch_Yaw;
-  num_pass = 0;
-  srand(time(NULL));
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Pitch_Yaw;
+		num_pass	=	0;
+		srand(time(NULL));
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, euler132_to_quat)
+TEST_F(EulerQuatTest,	euler132_to_quat)
 {
-  init_data.euler_sequence = Roll_Yaw_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Yaw_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, euler231_to_quat)
+TEST_F(EulerQuatTest,	euler231_to_quat)
 {
-  init_data.euler_sequence = Pitch_Yaw_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Yaw_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, euler213_to_quat)
+TEST_F(EulerQuatTest,	euler213_to_quat)
 {
-  init_data.euler_sequence = Pitch_Roll_Yaw;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Roll_Yaw;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, euler312_to_quat)
+TEST_F(EulerQuatTest,	euler312_to_quat)
 {
-  init_data.euler_sequence = Yaw_Roll_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Roll_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, euler321_to_quat)
+TEST_F(EulerQuatTest,	euler321_to_quat)
 {
-  init_data.euler_sequence = Yaw_Pitch_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_euler_to_quat();
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Pitch_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_euler_to_quat();
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
 
-TEST_F(EulerQuatTest, quat_to_euler123_method1)
+TEST_F(EulerQuatTest,	quat_to_euler123_method1)
 {
-  init_data.euler_sequence = Roll_Pitch_Yaw;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Pitch_Yaw;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler123_method2)
+TEST_F(EulerQuatTest,	quat_to_euler123_method2)
 {
-  init_data.euler_sequence = Roll_Pitch_Yaw;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Pitch_Yaw;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler132_method1)
+TEST_F(EulerQuatTest,	quat_to_euler132_method1)
 {
-  init_data.euler_sequence = Roll_Yaw_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Yaw_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler132_method2)
+TEST_F(EulerQuatTest,	quat_to_euler132_method2)
 {
-  init_data.euler_sequence = Roll_Yaw_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Roll_Yaw_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler231_method1)
+TEST_F(EulerQuatTest,	quat_to_euler231_method1)
 {
-  init_data.euler_sequence = Pitch_Yaw_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Yaw_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler231_method2)
+TEST_F(EulerQuatTest,	quat_to_euler231_method2)
 {
-  init_data.euler_sequence = Pitch_Yaw_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Yaw_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler213_method1)
+TEST_F(EulerQuatTest,	quat_to_euler213_method1)
 {
-  init_data.euler_sequence = Pitch_Roll_Yaw;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Roll_Yaw;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler213_method2)
+TEST_F(EulerQuatTest,	quat_to_euler213_method2)
 {
-  init_data.euler_sequence = Pitch_Roll_Yaw;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Pitch_Roll_Yaw;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler312_method1)
+TEST_F(EulerQuatTest,	quat_to_euler312_method1)
 {
-  init_data.euler_sequence = Yaw_Roll_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Roll_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler312_method2)
+TEST_F(EulerQuatTest,	quat_to_euler312_method2)
 {
-  init_data.euler_sequence = Yaw_Roll_Pitch;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Roll_Pitch;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler321_method1)
+TEST_F(EulerQuatTest,	quat_to_euler321_method1)
 {
-  init_data.euler_sequence = Yaw_Pitch_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(1);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Pitch_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(1);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
-TEST_F(EulerQuatTest, quat_to_euler321_method2)
+TEST_F(EulerQuatTest,	quat_to_euler321_method2)
 {
-  init_data.euler_sequence = Yaw_Pitch_Roll;
-  num_pass = 0;
-  for (int ii=0; ii<num_tests; ii++){
-      // Randomly input euler angles:
-      init_data.euler_angles[0] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[1] = (rand()%num_tests) * (2*M_PI/num_tests);
-      init_data.euler_angles[2] = (rand()%num_tests) * (2*M_PI/num_tests);
-      euler_matrix(init_data.euler_angles, mat, 0 , init_data.euler_sequence);
-      mat_to_quat(quat, mat);
-      test_quat_to_euler(2);
-  }
-  EXPECT_EQ(num_pass, num_tests);
+		init_data.euler_sequence	=	Yaw_Pitch_Roll;
+		num_pass	=	0;
+		for	(int	ii=0;	ii<num_tests;	ii++){
+						//	Randomly	input	euler	angles:
+						init_data.euler_angles[0]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[1]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						init_data.euler_angles[2]	=	(rand()%num_tests)	*	(2*M_PI/num_tests);
+						euler_matrix(init_data.euler_angles,	mat,	0	,	init_data.euler_sequence);
+						mat_to_quat(quat,	mat);
+						test_quat_to_euler(2);
+		}
+		EXPECT_EQ(num_pass,	num_tests);
 }
 
diff --git a/trick_source/trick_utils/trick_adt/test/dllist_unittest.cpp b/trick_source/trick_utils/trick_adt/test/dllist_unittest.cpp
index 0d7f5b833..6bd32f2f4 100644
--- a/trick_source/trick_utils/trick_adt/test/dllist_unittest.cpp
+++ b/trick_source/trick_utils/trick_adt/test/dllist_unittest.cpp
@@ -1,1051 +1,1051 @@
-#include <gtest/gtest.h>
-#include <iostream>
-#include "trick/dllist.h"
+#include	<gtest/gtest.h>
+#include	<iostream>
+#include	"trick/dllist.h"
 
-/* ==========================================================================
-DLL_Delete deletes all of the nodes, and then the list. Returns Nothing.
+/*	==========================================================================
+DLL_Delete	deletes	all	of	the	nodes,	and	then	the	list.	Returns	Nothing.
 PROTOTYPE:
-    void DLL_Delete(DLLIST*);
+				void	DLL_Delete(DLLIST*);
 
-NOTE: The following test, "DLL_Delete_null_list" exercises error handling
-    behavior. DLL_Delete is called in numerous other test cases below.
+NOTE:	The	following	test,	"DLL_Delete_null_list"	exercises	error	handling
+				behavior.	DLL_Delete	is	called	in	numerous	other	test	cases	below.
 */
 
-TEST( dllist_test, DLL_Delete_null_list) {
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLL_Init( nullptr);
-    // ALAS, there is nothing to check.
+TEST(	dllist_test,	DLL_Delete_null_list)	{
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLL_Init(	nullptr);
+				//	ALAS,	there	is	nothing	to	check.
 }
 
-/* ==========================================================================
-DLL_Create allocates and initializes an empty DLLIST object. Returns
-the initialized list object.
+/*	==========================================================================
+DLL_Create	allocates	and	initializes	an	empty	DLLIST	object.	Returns
+the	initialized	list	object.
 PROTOTYPE:
-    DLLIST* DLL_Create();
+				DLLIST*	DLL_Create();
 */
 
-TEST( dllist_test, DLL_Create) {
+TEST(	dllist_test,	DLL_Create)	{
 
-    DLLIST* result = DLL_Create();
+				DLLIST*	result	=	DLL_Create();
 
-    EXPECT_NE(result, nullptr);
-    EXPECT_EQ(result->count, 0);
-    EXPECT_EQ(result->head, nullptr);
-    EXPECT_EQ(result->tail, nullptr);
-    EXPECT_EQ(result->compare, nullptr);
+				EXPECT_NE(result,	nullptr);
+				EXPECT_EQ(result->count,	0);
+				EXPECT_EQ(result->head,	nullptr);
+				EXPECT_EQ(result->tail,	nullptr);
+				EXPECT_EQ(result->compare,	nullptr);
 
-    DLL_Delete(result);
+				DLL_Delete(result);
 }
 
-/* ==========================================================================
+/*	==========================================================================
 DLL_Init
-Initializes an empty DLLIST object.
-Returns nothing.
+Initializes	an	empty	DLLIST	object.
+Returns	nothing.
 
 PROTOTYPE:
-    void DLL_Init(DLLIST * list)
+				void	DLL_Init(DLLIST	*	list)
 */
 
-TEST( dllist_test, DLL_Init) {
+TEST(	dllist_test,	DLL_Init)	{
 
-    DLLIST list;
-    DLL_Init( &list);
+				DLLIST	list;
+				DLL_Init(	&list);
 
-    EXPECT_EQ(list.count, 0);
-    EXPECT_EQ(list.head, nullptr);
-    EXPECT_EQ(list.tail, nullptr);
-    EXPECT_EQ(list.compare, nullptr);
+				EXPECT_EQ(list.count,	0);
+				EXPECT_EQ(list.head,	nullptr);
+				EXPECT_EQ(list.tail,	nullptr);
+				EXPECT_EQ(list.compare,	nullptr);
 
 }
 
-TEST( dllist_test, DLL_Init_null_list) {
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLL_Init( nullptr);
+TEST(	dllist_test,	DLL_Init_null_list)	{
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLL_Init(	nullptr);
 
-    // ALAS, there is nothing to check.
+				//	ALAS,	there	is	nothing	to	check.
 }
 
-/* ==========================================================================
-DLL_GetCount returns the number of elements in the given list, unless list is
-null, in which case it returns -1.
+/*	==========================================================================
+DLL_GetCount	returns	the	number	of	elements	in	the	given	list,	unless	list	is
+null,	in	which	case	it	returns	-1.
 PROTOTYPE:
-    int DLL_GetCount(DLLIST* list);
+				int	DLL_GetCount(DLLIST*	list);
 
-NOTE: The following test, "DLL_GetCount_null_list" tests error handling
-behavior. Normal behavior of DLL_GetCount is tested in: "DLL_AddHead",
-"DLL_AddTail", "DLL_InsertBefore", and "DLL_InsertAfter".
+NOTE:	The	following	test,	"DLL_GetCount_null_list"	tests	error	handling
+behavior.	Normal	behavior	of	DLL_GetCount	is	tested	in:	"DLL_AddHead",
+"DLL_AddTail",	"DLL_InsertBefore",	and	"DLL_InsertAfter".
 */
 
-TEST( dllist_test, DLL_GetCount_null_list) {
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    int result = DLL_GetCount(nullptr);
-    EXPECT_EQ(result, -1);
+TEST(	dllist_test,	DLL_GetCount_null_list)	{
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				int	result	=	DLL_GetCount(nullptr);
+				EXPECT_EQ(result,	-1);
 }
 
-/* ==========================================================================
-DLL_GetHeadPosition returns a the head node position of the given list,
-unless the list is null, in which case it returns NULL.
+/*	==========================================================================
+DLL_GetHeadPosition	returns	a	the	head	node	position	of	the	given	list,
+unless	the	list	is	null,	in	which	case	it	returns	NULL.
 PROTOTYPE:
-    DLLPOS DLL_GetHeadPosition(DLLIST* list);
+				DLLPOS	DLL_GetHeadPosition(DLLIST*	list);
 
-NOTE: The following test, "DLL_GetHeadPosition_null_list" tests error handling
-behavior. Normal behavior of DLL_GetHeadPosition is tested in: "DLL_AddHead",
-"DLL_AddTail", "DLL_InsertBefore", and "DLL_InsertAfter".
+NOTE:	The	following	test,	"DLL_GetHeadPosition_null_list"	tests	error	handling
+behavior.	Normal	behavior	of	DLL_GetHeadPosition	is	tested	in:	"DLL_AddHead",
+"DLL_AddTail",	"DLL_InsertBefore",	and	"DLL_InsertAfter".
 */
 
-TEST( dllist_test, DLL_GetHeadPosition_null_list) {
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLLPOS result = DLL_GetHeadPosition(nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_GetHeadPosition_null_list)	{
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLLPOS	result	=	DLL_GetHeadPosition(nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
-DLL_GetTailPosition returns a the tail node position of the given list,
-unless the list is null, in which case it returns NULL.
+/*	==========================================================================
+DLL_GetTailPosition	returns	a	the	tail	node	position	of	the	given	list,
+unless	the	list	is	null,	in	which	case	it	returns	NULL.
 PROTOTYPE:
-    DLLPOS DLL_GetTailPosition(DLLIST* list);
+				DLLPOS	DLL_GetTailPosition(DLLIST*	list);
 
-NOTE: The error case is tested in "DLL_GetTailPosition_null_list".
-Normal behavior is tested in: "DLL_AddHead", "DLL_AddTail",
-"DLL_InsertBefore", and "DLL_InsertAfter".
+NOTE:	The	error	case	is	tested	in	"DLL_GetTailPosition_null_list".
+Normal	behavior	is	tested	in:	"DLL_AddHead",	"DLL_AddTail",
+"DLL_InsertBefore",	and	"DLL_InsertAfter".
 */
 
-TEST( dllist_test, DLL_GetTailPosition_null_list) {
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLLPOS result = DLL_GetTailPosition(nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_GetTailPosition_null_list)	{
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLLPOS	result	=	DLL_GetTailPosition(nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
-DLL_AddHead inserts an element at the head of the given list, and returns
-a pointer to a new node. If the given list is NULL, an error message is printed
-and the function returns NULL.
+/*	==========================================================================
+DLL_AddHead	inserts	an	element	at	the	head	of	the	given	list,	and	returns
+a	pointer	to	a	new	node.	If	the	given	list	is	NULL,	an	error	message	is	printed
+and	the	function	returns	NULL.
 
 PROTOTYPE:
-    DLLPOS DLL_AddHead(void* element, DLLIST* list);
+				DLLPOS	DLL_AddHead(void*	element,	DLLIST*	list);
 */
 
-TEST( dllist_test, DLL_AddHead) {
+TEST(	dllist_test,	DLL_AddHead)	{
 
-    int A[] = {1,2,3,4,5};
+				int	A[]	=	{1,2,3,4,5};
 
-    /* Create a list. */
-    DLLIST* list = DLL_Create();
-    EXPECT_NE(list, nullptr);
+				/*	Create	a	list.	*/
+				DLLIST*	list	=	DLL_Create();
+				EXPECT_NE(list,	nullptr);
 
-    /* Add a node to the list. */
-    DLLPOS pos_first = DLL_AddHead( &A[0], list);
+				/*	Add	a	node	to	the	list.	*/
+				DLLPOS	pos_first	=	DLL_AddHead(	&A[0],	list);
 
-    /* List State after call.
-        H [first] T
-    */
+				/*	List	State	after	call.
+								H	[first]	T
+				*/
 
-    EXPECT_NE(pos_first, nullptr);
-    EXPECT_EQ(pos_first->info, &A[0]);
-    EXPECT_EQ(pos_first->prev, nullptr);
-    EXPECT_EQ(pos_first->next, nullptr);
-    EXPECT_EQ(pos_first, list->head);
-    EXPECT_EQ(pos_first, list->tail);
+				EXPECT_NE(pos_first,	nullptr);
+				EXPECT_EQ(pos_first->info,	&A[0]);
+				EXPECT_EQ(pos_first->prev,	nullptr);
+				EXPECT_EQ(pos_first->next,	nullptr);
+				EXPECT_EQ(pos_first,	list->head);
+				EXPECT_EQ(pos_first,	list->tail);
 
-    /* Add a second node to the list. */
-    DLLPOS pos_second = DLL_AddHead( &A[1], list);
+				/*	Add	a	second	node	to	the	list.	*/
+				DLLPOS	pos_second	=	DLL_AddHead(	&A[1],	list);
 
-    /* Expected List State after call.
-        H [second]=[first] T
-    */
+				/*	Expected	List	State	after	call.
+								H	[second]=[first]	T
+				*/
 
-    EXPECT_NE(pos_second, nullptr);
-    EXPECT_EQ(pos_second->info, &A[1]);
+				EXPECT_NE(pos_second,	nullptr);
+				EXPECT_EQ(pos_second->info,	&A[1]);
 
-    EXPECT_EQ(pos_first->prev, pos_second);
-    EXPECT_EQ(pos_first->next, nullptr);
-    EXPECT_EQ(pos_second->prev, nullptr);
-    EXPECT_EQ(pos_second->next, pos_first);
+				EXPECT_EQ(pos_first->prev,	pos_second);
+				EXPECT_EQ(pos_first->next,	nullptr);
+				EXPECT_EQ(pos_second->prev,	nullptr);
+				EXPECT_EQ(pos_second->next,	pos_first);
 
-    EXPECT_EQ(pos_second, list->head);
-    EXPECT_EQ(pos_first, list->tail);
+				EXPECT_EQ(pos_second,	list->head);
+				EXPECT_EQ(pos_first,	list->tail);
 
-    /* Add a third node to the list. */
-    DLLPOS pos_third = DLL_AddHead( &A[2], list);
+				/*	Add	a	third	node	to	the	list.	*/
+				DLLPOS	pos_third	=	DLL_AddHead(	&A[2],	list);
 
-    /* Expected List State after call.
-        H [third]=[second]=[first] T
-    */
+				/*	Expected	List	State	after	call.
+								H	[third]=[second]=[first]	T
+				*/
 
-    EXPECT_NE(pos_third, nullptr);
-    EXPECT_EQ(pos_third->info, &A[2]);
-    EXPECT_EQ(pos_first->prev, pos_second);
-    EXPECT_EQ(pos_first->next, nullptr);
-    EXPECT_EQ(pos_second->prev, pos_third);
-    EXPECT_EQ(pos_second->next, pos_first);
-    EXPECT_EQ(pos_third->prev, nullptr);
-    EXPECT_EQ(pos_third->next, pos_second);
+				EXPECT_NE(pos_third,	nullptr);
+				EXPECT_EQ(pos_third->info,	&A[2]);
+				EXPECT_EQ(pos_first->prev,	pos_second);
+				EXPECT_EQ(pos_first->next,	nullptr);
+				EXPECT_EQ(pos_second->prev,	pos_third);
+				EXPECT_EQ(pos_second->next,	pos_first);
+				EXPECT_EQ(pos_third->prev,	nullptr);
+				EXPECT_EQ(pos_third->next,	pos_second);
 
-    EXPECT_EQ(pos_third, list->head);
-    EXPECT_EQ(pos_third, DLL_GetHeadPosition(list));
-    EXPECT_EQ(pos_first, list->tail);
-    EXPECT_EQ(pos_first, DLL_GetTailPosition(list));
+				EXPECT_EQ(pos_third,	list->head);
+				EXPECT_EQ(pos_third,	DLL_GetHeadPosition(list));
+				EXPECT_EQ(pos_first,	list->tail);
+				EXPECT_EQ(pos_first,	DLL_GetTailPosition(list));
 
-    EXPECT_EQ(list->count, 3);
-    EXPECT_EQ( DLL_GetCount(list), 3);
+				EXPECT_EQ(list->count,	3);
+				EXPECT_EQ(	DLL_GetCount(list),	3);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_AddHead_null_list) {
-    int A[] = {1,2,3,4,5};
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLLPOS result = DLL_AddHead( &A[0], nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_AddHead_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLLPOS	result	=	DLL_AddHead(	&A[0],	nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
-DLL_AddTail inserts an element at the tail of the given list, and returns
-a pointer to a new node. If the given list is NULL, an error message is printed
-and the functions returns NULL.
+/*	==========================================================================
+DLL_AddTail	inserts	an	element	at	the	tail	of	the	given	list,	and	returns
+a	pointer	to	a	new	node.	If	the	given	list	is	NULL,	an	error	message	is	printed
+and	the	functions	returns	NULL.
 
 PROTOTYPE:
-    DLLPOS DLL_AddTail(void* element, DLLIST* list);
+				DLLPOS	DLL_AddTail(void*	element,	DLLIST*	list);
 */
 
-TEST( dllist_test, DLL_AddTail) {
+TEST(	dllist_test,	DLL_AddTail)	{
 
-    int A[] = {1,2,3,4,5};                  // These elements will be added to a list.
-    DLLIST* list = DLL_Create();            // Create an empty list to add things to.
-    EXPECT_NE(list, nullptr);               // It better not be null.
+				int	A[]	=	{1,2,3,4,5};																		//	These	elements	will	be	added	to	a	list.
+				DLLIST*	list	=	DLL_Create();												//	Create	an	empty	list	to	add	things	to.
+				EXPECT_NE(list,	nullptr);															//	It	better	not	be	null.
 
-    /* Add a node to the list. */
-    DLLPOS pos_first = DLL_AddTail( &A[0], list);
+				/*	Add	a	node	to	the	list.	*/
+				DLLPOS	pos_first	=	DLL_AddTail(	&A[0],	list);
 
-    /* List State after call.
-        H [first] T
-    */
+				/*	List	State	after	call.
+								H	[first]	T
+				*/
 
-    EXPECT_NE(pos_first, nullptr);
-    EXPECT_EQ(pos_first->info, &A[0]);
+				EXPECT_NE(pos_first,	nullptr);
+				EXPECT_EQ(pos_first->info,	&A[0]);
 
-    EXPECT_EQ(pos_first->prev, nullptr);
-    EXPECT_EQ(pos_first->next, nullptr);
+				EXPECT_EQ(pos_first->prev,	nullptr);
+				EXPECT_EQ(pos_first->next,	nullptr);
 
-    /* ===== Add a second node to the list. ===== */
-    DLLPOS pos_second = DLL_AddTail( &A[1], list);
+				/*	=====	Add	a	second	node	to	the	list.	=====	*/
+				DLLPOS	pos_second	=	DLL_AddTail(	&A[1],	list);
 
-    /* Expected List State after call.
-        H [first]=[second] T
-    */
+				/*	Expected	List	State	after	call.
+								H	[first]=[second]	T
+				*/
 
-    EXPECT_NE(pos_second, nullptr);
-    EXPECT_EQ(pos_second->info, &A[1]);
+				EXPECT_NE(pos_second,	nullptr);
+				EXPECT_EQ(pos_second->info,	&A[1]);
 
-    EXPECT_EQ(pos_first->prev, nullptr);
-    EXPECT_EQ(pos_first->next, pos_second);
-    EXPECT_EQ(pos_second->prev, pos_first);
-    EXPECT_EQ(pos_second->next, nullptr);
+				EXPECT_EQ(pos_first->prev,	nullptr);
+				EXPECT_EQ(pos_first->next,	pos_second);
+				EXPECT_EQ(pos_second->prev,	pos_first);
+				EXPECT_EQ(pos_second->next,	nullptr);
 
-    /* ===== CALL: Add a third node to the list. ===== */
-    DLLPOS pos_third = DLL_AddTail( &A[2], list);
+				/*	=====	CALL:	Add	a	third	node	to	the	list.	=====	*/
+				DLLPOS	pos_third	=	DLL_AddTail(	&A[2],	list);
 
-    /* Expected List State after call.
-        H [first]=[second]==[third] T
-    */
+				/*	Expected	List	State	after	call.
+								H	[first]=[second]==[third]	T
+				*/
 
-    EXPECT_NE(pos_third, nullptr);
-    EXPECT_EQ(pos_third->info, &A[2]);
+				EXPECT_NE(pos_third,	nullptr);
+				EXPECT_EQ(pos_third->info,	&A[2]);
 
-    EXPECT_EQ(pos_first->prev, nullptr);
-    EXPECT_EQ(pos_first->next, pos_second);
-    EXPECT_EQ(pos_second->prev, pos_first);
-    EXPECT_EQ(pos_second->next, pos_third);
-    EXPECT_EQ(pos_third->prev, pos_second);
-    EXPECT_EQ(pos_third->next, nullptr);
+				EXPECT_EQ(pos_first->prev,	nullptr);
+				EXPECT_EQ(pos_first->next,	pos_second);
+				EXPECT_EQ(pos_second->prev,	pos_first);
+				EXPECT_EQ(pos_second->next,	pos_third);
+				EXPECT_EQ(pos_third->prev,	pos_second);
+				EXPECT_EQ(pos_third->next,	nullptr);
 
-    EXPECT_EQ(pos_first, list->head);
-    EXPECT_EQ(pos_first, DLL_GetHeadPosition(list));
-    EXPECT_EQ(pos_third, list->tail);
-    EXPECT_EQ(pos_third, DLL_GetTailPosition(list));
+				EXPECT_EQ(pos_first,	list->head);
+				EXPECT_EQ(pos_first,	DLL_GetHeadPosition(list));
+				EXPECT_EQ(pos_third,	list->tail);
+				EXPECT_EQ(pos_third,	DLL_GetTailPosition(list));
 
-    EXPECT_EQ(list->count, 3);
-    EXPECT_EQ( DLL_GetCount(list), 3);
+				EXPECT_EQ(list->count,	3);
+				EXPECT_EQ(	DLL_GetCount(list),	3);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_AddTail_null_list) {
-    int A[] = {1,2,3,4,5};
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLLPOS result = DLL_AddTail( &A[0], nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_AddTail_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLLPOS	result	=	DLL_AddTail(	&A[0],	nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
-DLL_InsertBefore inserts the given data element before the given position, of
-the given list. Returns the position of the inserted element node.
+/*	==========================================================================
+DLL_InsertBefore	inserts	the	given	data	element	before	the	given	position,	of
+the	given	list.	Returns	the	position	of	the	inserted	element	node.
 
 PROTOTYPE:
-    DLLPOS DLL_InsertBefore(DLLPOS pos, void* element, DLLIST* list);
+				DLLPOS	DLL_InsertBefore(DLLPOS	pos,	void*	element,	DLLIST*	list);
 */
 
-TEST( dllist_test, DLL_InsertBefore) {
+TEST(	dllist_test,	DLL_InsertBefore)	{
 
-    int A[] = {1,2,3,4,5};
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first = DLL_AddHead( &A[0], list);
-    DLLPOS pos_second = DLL_AddHead( &A[1], list);
+				int	A[]	=	{1,2,3,4,5};
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=	DLL_AddHead(	&A[0],	list);
+				DLLPOS	pos_second	=	DLL_AddHead(	&A[1],	list);
 
-    /* Initial List State
-        H [second]=[first] T
-    */
+				/*	Initial	List	State
+								H	[second]=[first]	T
+				*/
 
-    /* ===== CALL: Add a third node to the list. ===== */
-    DLLPOS pos_third = DLL_InsertBefore(pos_first, &A[2], list);
+				/*	=====	CALL:	Add	a	third	node	to	the	list.	=====	*/
+				DLLPOS	pos_third	=	DLL_InsertBefore(pos_first,	&A[2],	list);
 
-    /* Expected List State after the call:
-        H [second]=[third]=[first] T
-    */
+				/*	Expected	List	State	after	the	call:
+								H	[second]=[third]=[first]	T
+				*/
 
-    EXPECT_NE(pos_third, nullptr);
-    EXPECT_EQ(pos_third->info, &A[2] );
+				EXPECT_NE(pos_third,	nullptr);
+				EXPECT_EQ(pos_third->info,	&A[2]	);
 
-    EXPECT_EQ(pos_first->prev, pos_third );
-    EXPECT_EQ(pos_first->next, nullptr );
-    EXPECT_EQ(pos_second->prev, nullptr );
-    EXPECT_EQ(pos_second->next, pos_third );
-    EXPECT_EQ(pos_third->prev, pos_second );
-    EXPECT_EQ(pos_third->next, pos_first );
+				EXPECT_EQ(pos_first->prev,	pos_third	);
+				EXPECT_EQ(pos_first->next,	nullptr	);
+				EXPECT_EQ(pos_second->prev,	nullptr	);
+				EXPECT_EQ(pos_second->next,	pos_third	);
+				EXPECT_EQ(pos_third->prev,	pos_second	);
+				EXPECT_EQ(pos_third->next,	pos_first	);
 
-    /* ===== CALL: Add a fourth node to the beginning of the list. ===== */
-    DLLPOS pos_fourth = DLL_InsertBefore(pos_second, &A[3], list);
+				/*	=====	CALL:	Add	a	fourth	node	to	the	beginning	of	the	list.	=====	*/
+				DLLPOS	pos_fourth	=	DLL_InsertBefore(pos_second,	&A[3],	list);
 
-    /* Expected List State after the call:
-        H [fourth]=[second]=[third]=[first] T
-    */
+				/*	Expected	List	State	after	the	call:
+								H	[fourth]=[second]=[third]=[first]	T
+				*/
 
-    EXPECT_NE(pos_fourth, nullptr);
-    EXPECT_EQ(pos_fourth->info, &A[3] );
+				EXPECT_NE(pos_fourth,	nullptr);
+				EXPECT_EQ(pos_fourth->info,	&A[3]	);
 
-    EXPECT_EQ(pos_first->prev, pos_third );
-    EXPECT_EQ(pos_first->next, nullptr );
-    EXPECT_EQ(pos_second->prev, pos_fourth );
-    EXPECT_EQ(pos_second->next, pos_third );
-    EXPECT_EQ(pos_third->prev, pos_second );
-    EXPECT_EQ(pos_third->next, pos_first );
-    EXPECT_EQ(pos_fourth->next, pos_second );
-    EXPECT_EQ(pos_fourth->prev, nullptr );
+				EXPECT_EQ(pos_first->prev,	pos_third	);
+				EXPECT_EQ(pos_first->next,	nullptr	);
+				EXPECT_EQ(pos_second->prev,	pos_fourth	);
+				EXPECT_EQ(pos_second->next,	pos_third	);
+				EXPECT_EQ(pos_third->prev,	pos_second	);
+				EXPECT_EQ(pos_third->next,	pos_first	);
+				EXPECT_EQ(pos_fourth->next,	pos_second	);
+				EXPECT_EQ(pos_fourth->prev,	nullptr	);
 
-    EXPECT_EQ(pos_fourth, list->head);
-    EXPECT_EQ(pos_fourth, DLL_GetHeadPosition(list));
-    EXPECT_EQ(pos_first, list->tail);
-    EXPECT_EQ(pos_first, DLL_GetTailPosition(list));
+				EXPECT_EQ(pos_fourth,	list->head);
+				EXPECT_EQ(pos_fourth,	DLL_GetHeadPosition(list));
+				EXPECT_EQ(pos_first,	list->tail);
+				EXPECT_EQ(pos_first,	DLL_GetTailPosition(list));
 
-    EXPECT_EQ(list->count, 4);
-    EXPECT_EQ( DLL_GetCount(list), 4);
+				EXPECT_EQ(list->count,	4);
+				EXPECT_EQ(	DLL_GetCount(list),	4);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-/* ==========================================================================
-DLL_InsertAfter inserts the given data element after the given position, of
-the given list. Returns the position of the inserted element node.
+/*	==========================================================================
+DLL_InsertAfter	inserts	the	given	data	element	after	the	given	position,	of
+the	given	list.	Returns	the	position	of	the	inserted	element	node.
 
 PROTOTYPE:
-    DLLPOS DLL_InsertBefore(DLLPOS pos, void* element, DLLIST* list);
+				DLLPOS	DLL_InsertBefore(DLLPOS	pos,	void*	element,	DLLIST*	list);
 =============================================================================
 */
-TEST( dllist_test, DLL_InsertAfter) {
+TEST(	dllist_test,	DLL_InsertAfter)	{
 
-    int A[] = {1,2,3,4,5};
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first = DLL_AddHead( &A[0], list);
-    DLLPOS pos_second = DLL_AddHead( &A[1], list);
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=	DLL_AddHead(	&A[0],	list);
+				DLLPOS	pos_second	=	DLL_AddHead(	&A[1],	list);
 
-    /* Initial List State
-        H [second]=[first] T
-    */
+				/*	Initial	List	State
+								H	[second]=[first]	T
+				*/
 
-    /* Add a third node. */
-    DLLPOS pos_third = DLL_InsertAfter(pos_first, &A[2], list);
+				/*	Add	a	third	node.	*/
+				DLLPOS	pos_third	=	DLL_InsertAfter(pos_first,	&A[2],	list);
 
-    /* Expected State of List after the call:
-        H [second]=[first]=[third] T
-    */
+				/*	Expected	State	of	List	after	the	call:
+								H	[second]=[first]=[third]	T
+				*/
 
-    EXPECT_NE(pos_third, nullptr);
-    EXPECT_EQ(pos_third->info, &A[2] );
+				EXPECT_NE(pos_third,	nullptr);
+				EXPECT_EQ(pos_third->info,	&A[2]	);
 
-    EXPECT_EQ(pos_first->prev,  pos_second );
-    EXPECT_EQ(pos_first->next, pos_third );
-    EXPECT_EQ(pos_second->prev, nullptr );
-    EXPECT_EQ(pos_second->next, pos_first );
-    EXPECT_EQ(pos_third->prev, pos_first );
-    EXPECT_EQ(pos_third->next, nullptr );
+				EXPECT_EQ(pos_first->prev,		pos_second	);
+				EXPECT_EQ(pos_first->next,	pos_third	);
+				EXPECT_EQ(pos_second->prev,	nullptr	);
+				EXPECT_EQ(pos_second->next,	pos_first	);
+				EXPECT_EQ(pos_third->prev,	pos_first	);
+				EXPECT_EQ(pos_third->next,	nullptr	);
 
-    /* ===== CALL: Add a fourth node ===== */
-    DLLPOS pos_fourth = DLL_InsertAfter(pos_second, &A[3], list);
+				/*	=====	CALL:	Add	a	fourth	node	=====	*/
+				DLLPOS	pos_fourth	=	DLL_InsertAfter(pos_second,	&A[3],	list);
 
-    /* Expected State of List after the call:
-        H [second]=[fourth]=[first]=[third] T
-    */
+				/*	Expected	State	of	List	after	the	call:
+								H	[second]=[fourth]=[first]=[third]	T
+				*/
 
-    EXPECT_NE(pos_fourth, nullptr);
-    EXPECT_EQ(pos_fourth->info, &A[3] );
+				EXPECT_NE(pos_fourth,	nullptr);
+				EXPECT_EQ(pos_fourth->info,	&A[3]	);
 
-    EXPECT_EQ(pos_first->prev,  pos_fourth );
-    EXPECT_EQ(pos_first->next, pos_third );
-    EXPECT_EQ(pos_second->prev, nullptr );
-    EXPECT_EQ(pos_second->next, pos_fourth );
-    EXPECT_EQ(pos_third->prev, pos_first );
-    EXPECT_EQ(pos_third->next, nullptr );
-    EXPECT_EQ(pos_fourth->next, pos_first );
-    EXPECT_EQ(pos_fourth->prev, pos_second );
+				EXPECT_EQ(pos_first->prev,		pos_fourth	);
+				EXPECT_EQ(pos_first->next,	pos_third	);
+				EXPECT_EQ(pos_second->prev,	nullptr	);
+				EXPECT_EQ(pos_second->next,	pos_fourth	);
+				EXPECT_EQ(pos_third->prev,	pos_first	);
+				EXPECT_EQ(pos_third->next,	nullptr	);
+				EXPECT_EQ(pos_fourth->next,	pos_first	);
+				EXPECT_EQ(pos_fourth->prev,	pos_second	);
 
-    EXPECT_EQ(pos_second, list->head);
-    EXPECT_EQ(pos_second, DLL_GetHeadPosition(list));
-    EXPECT_EQ(pos_third, list->tail);
-    EXPECT_EQ(pos_third, DLL_GetTailPosition(list));
+				EXPECT_EQ(pos_second,	list->head);
+				EXPECT_EQ(pos_second,	DLL_GetHeadPosition(list));
+				EXPECT_EQ(pos_third,	list->tail);
+				EXPECT_EQ(pos_third,	DLL_GetTailPosition(list));
 
-    EXPECT_EQ(list->count, 4);
-    EXPECT_EQ( DLL_GetCount(list), 4);
+				EXPECT_EQ(list->count,	4);
+				EXPECT_EQ(	DLL_GetCount(list),	4);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-/* ==========================================================================
-DLL_GetNext returns a pointer to the data of the DLLPOS pointed
-to by pos_p, and updates the DLLPOS referenced by pos_p to the
-next DLLPOS in the linked list.
+/*	==========================================================================
+DLL_GetNext	returns	a	pointer	to	the	data	of	the	DLLPOS	pointed
+to	by	pos_p,	and	updates	the	DLLPOS	referenced	by	pos_p	to	the
+next	DLLPOS	in	the	linked	list.
 
 PROTOTYPE:
-    void* DLL_GetNext(DLLPOS* pos_p ,DLLIST*);
+				void*	DLL_GetNext(DLLPOS*	pos_p	,DLLIST*);
 =============================================================================*/
 
-TEST( dllist_test, DLL_GetNext) {
-
-    int A[] = {1,2,3,4,5};
-
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first =  DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
-    (void) DLL_AddTail( &(A[2]), list);
-    (void) DLL_AddTail( &(A[3]), list);
-    (void) DLL_AddTail( &(A[4]), list);
-
-    /* Expected List State after call.
-        H [first]=[second]=[third]=[fourth]=[fifth] T
-             |        |       |       |        |
-            [1]      [2]     [3]     [4]      [5]
-    */
-
-    DLLPOS current_pos = pos_first;
-
-    int *result;
-    result = (int*)DLL_GetNext(&current_pos, list);
-    EXPECT_NE(current_pos, nullptr);
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_GetNext(&current_pos, list);
-    EXPECT_EQ(*result, 2);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetNext(&current_pos, list);
-    EXPECT_EQ(*result, 3);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetNext(&current_pos, list);
-    EXPECT_EQ(*result, 4);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetNext(&current_pos, list);
-    EXPECT_EQ(*result, 5);
-    EXPECT_EQ(current_pos, nullptr);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_GetNext)	{
+
+				int	A[]	=	{1,2,3,4,5};
+
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=		DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
+				(void)	DLL_AddTail(	&(A[2]),	list);
+				(void)	DLL_AddTail(	&(A[3]),	list);
+				(void)	DLL_AddTail(	&(A[4]),	list);
+
+				/*	Expected	List	State	after	call.
+								H	[first]=[second]=[third]=[fourth]=[fifth]	T
+													|								|							|							|								|
+												[1]						[2]					[3]					[4]						[5]
+				*/
+
+				DLLPOS	current_pos	=	pos_first;
+
+				int	*result;
+				result	=	(int*)DLL_GetNext(&current_pos,	list);
+				EXPECT_NE(current_pos,	nullptr);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_GetNext(&current_pos,	list);
+				EXPECT_EQ(*result,	2);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetNext(&current_pos,	list);
+				EXPECT_EQ(*result,	3);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetNext(&current_pos,	list);
+				EXPECT_EQ(*result,	4);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetNext(&current_pos,	list);
+				EXPECT_EQ(*result,	5);
+				EXPECT_EQ(current_pos,	nullptr);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetNext_null_pos) {
-    int A[] = {1,2,3,4,5};
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
+TEST(	dllist_test,	DLL_GetNext_null_pos)	{
+				int	A[]	=	{1,2,3,4,5};
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    void* result = DLL_GetNext(nullptr, list);
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				void*	result	=	DLL_GetNext(nullptr,	list);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetNext_null_list) {
-    int A[] = {1,2,3,4,5};
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first =  DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
-    DLLPOS current_pos = pos_first;
+TEST(	dllist_test,	DLL_GetNext_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=		DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
+				DLLPOS	current_pos	=	pos_first;
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    void* result = DLL_GetNext(&current_pos, nullptr);
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				void*	result	=	DLL_GetNext(&current_pos,	nullptr);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
 
-/* ==========================================================================
-DLL_GetPrev returns a pointer to the node data of the DLLPOS pointed
-to by pos_p, and updates the DLLPOS referenced by pos_p to the
-previous DLLPOS in the linked list.
+/*	==========================================================================
+DLL_GetPrev	returns	a	pointer	to	the	node	data	of	the	DLLPOS	pointed
+to	by	pos_p,	and	updates	the	DLLPOS	referenced	by	pos_p	to	the
+previous	DLLPOS	in	the	linked	list.
 PROTOTYPE:
-    void* DLL_GetPrev(DLLPOS* pos_p ,DLLIST*);
+				void*	DLL_GetPrev(DLLPOS*	pos_p	,DLLIST*);
 =============================================================================*/
 
-TEST( dllist_test, DLL_GetPrev) {
-
-    int A[] = {1,2,3,4,5};
-
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first =  DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
-    (void) DLL_AddHead( &(A[2]), list);
-    (void) DLL_AddHead( &(A[3]), list);
-    (void) DLL_AddHead( &(A[4]), list);
-
-    /* Expected List State.
-        H [fifth]=[fourth]=[third]=[second]=[first] T
-             |        |       |       |        |
-            [5]      [4]     [3]     [2]      [1]
-    */
-
-    DLLPOS current_pos = pos_first;
-
-    int *result;
-    result = (int*)DLL_GetPrev(&current_pos, list);
-    EXPECT_NE(current_pos, nullptr);
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_GetPrev(&current_pos, list);
-    EXPECT_EQ(*result, 2);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetPrev(&current_pos, list);
-    EXPECT_EQ(*result, 3);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetPrev(&current_pos, list);
-    EXPECT_EQ(*result, 4);
-    EXPECT_NE(current_pos, nullptr);
-    result = (int*)DLL_GetPrev(&current_pos, list);
-    EXPECT_EQ(*result, 5);
-    EXPECT_EQ(current_pos, nullptr);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_GetPrev)	{
+
+				int	A[]	=	{1,2,3,4,5};
+
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=		DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
+				(void)	DLL_AddHead(	&(A[2]),	list);
+				(void)	DLL_AddHead(	&(A[3]),	list);
+				(void)	DLL_AddHead(	&(A[4]),	list);
+
+				/*	Expected	List	State.
+								H	[fifth]=[fourth]=[third]=[second]=[first]	T
+													|								|							|							|								|
+												[5]						[4]					[3]					[2]						[1]
+				*/
+
+				DLLPOS	current_pos	=	pos_first;
+
+				int	*result;
+				result	=	(int*)DLL_GetPrev(&current_pos,	list);
+				EXPECT_NE(current_pos,	nullptr);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_GetPrev(&current_pos,	list);
+				EXPECT_EQ(*result,	2);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetPrev(&current_pos,	list);
+				EXPECT_EQ(*result,	3);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetPrev(&current_pos,	list);
+				EXPECT_EQ(*result,	4);
+				EXPECT_NE(current_pos,	nullptr);
+				result	=	(int*)DLL_GetPrev(&current_pos,	list);
+				EXPECT_EQ(*result,	5);
+				EXPECT_EQ(current_pos,	nullptr);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetPrev_null_pos) {
-    int A[] = {1,2,3,4,5};
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+TEST(	dllist_test,	DLL_GetPrev_null_pos)	{
+				int	A[]	=	{1,2,3,4,5};
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    /* Call function under test with pos == NULL. */
-    void* result = DLL_GetPrev(nullptr, list);
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				/*	Call	function	under	test	with	pos	==	NULL.	*/
+				void*	result	=	DLL_GetPrev(nullptr,	list);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetPrev_null_list) {
-    int A[] = {1,2,3,4,5};
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first =  DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
-    DLLPOS current_pos = pos_first;
+TEST(	dllist_test,	DLL_GetPrev_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=		DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
+				DLLPOS	current_pos	=	pos_first;
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    /* Call function under test with list == NULL. */
-    void* result = DLL_GetPrev(&current_pos, nullptr);
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				/*	Call	function	under	test	with	list	==	NULL.	*/
+				void*	result	=	DLL_GetPrev(&current_pos,	nullptr);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-/* ==========================================================================
-DLL_Find returns a pointer to data stored in the list that matches the
-specified data. Return NULL if the list is NULL, or if the specified data is
-not found in the list.
+/*	==========================================================================
+DLL_Find	returns	a	pointer	to	data	stored	in	the	list	that	matches	the
+specified	data.	Return	NULL	if	the	list	is	NULL,	or	if	the	specified	data	is
+not	found	in	the	list.
 
-DLL_Find requires that a pointer to a compare function must be set in the
-DLLIST structure. The prototype of a suitable compare function is:
-    int (*compare)(void* info1,void* info2);
-The function should return 1 if the data match or 0 if they don't.
+DLL_Find	requires	that	a	pointer	to	a	compare	function	must	be	set	in	the
+DLLIST	structure.	The	prototype	of	a	suitable	compare	function	is:
+				int	(*compare)(void*	info1,void*	info2);
+The	function	should	return	1	if	the	data	match	or	0	if	they	don't.
 
-The test below can serve as an example.
+The	test	below	can	serve	as	an	example.
 
 PROTOTYPE:
-    void* DLL_Find(void* data, DLLIST* list);
+				void*	DLL_Find(void*	data,	DLLIST*	list);
 =============================================================================*/
 
-/* The following is a comparison function used in the DLL_Find test. */
-int IntCompare(void* a, void* b ) {
-    if ( *(int*)a == *(int*)b ) {
-        return 1;
-    } else {
-        return 0;
-    }
+/*	The	following	is	a	comparison	function	used	in	the	DLL_Find	test.	*/
+int	IntCompare(void*	a,	void*	b	)	{
+				if	(	*(int*)a	==	*(int*)b	)	{
+								return	1;
+				}	else	{
+								return	0;
+				}
 }
 
-TEST( dllist_test, DLL_Find) {
-    int A[] = {1,2,3,4,5};
-    int waldo = 0;
-    void* result = nullptr;
-
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
-    (void) DLL_AddHead( &(A[2]), list);
-    (void) DLL_AddHead( &(A[3]), list);
-    (void) DLL_AddHead( &(A[4]), list);
-
-    // DLL_Find requires the list to have a compare function.
-    list->compare =  &IntCompare;
-
-    waldo = 1;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, &(A[0]));
-    waldo = 2;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, &(A[1]));
-    waldo = 3;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, &(A[2]));
-    waldo = 4;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, &(A[3]));
-    waldo = 5;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, &(A[4]));
-    waldo = 7;
-    result = DLL_Find( &waldo, list );
-    EXPECT_EQ(result, nullptr);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_Find)	{
+				int	A[]	=	{1,2,3,4,5};
+				int	waldo	=	0;
+				void*	result	=	nullptr;
+
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
+				(void)	DLL_AddHead(	&(A[2]),	list);
+				(void)	DLL_AddHead(	&(A[3]),	list);
+				(void)	DLL_AddHead(	&(A[4]),	list);
+
+				//	DLL_Find	requires	the	list	to	have	a	compare	function.
+				list->compare	=		&IntCompare;
+
+				waldo	=	1;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	&(A[0]));
+				waldo	=	2;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	&(A[1]));
+				waldo	=	3;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	&(A[2]));
+				waldo	=	4;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	&(A[3]));
+				waldo	=	5;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	&(A[4]));
+				waldo	=	7;
+				result	=	DLL_Find(	&waldo,	list	);
+				EXPECT_EQ(result,	nullptr);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_Find_null_list) {
-    int waldo = 1;
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    /* Call function under test with list == NULL. */
-    void* result = DLL_Find(&waldo, nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_Find_null_list)	{
+				int	waldo	=	1;
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				/*	Call	function	under	test	with	list	==	NULL.	*/
+				void*	result	=	DLL_Find(&waldo,	nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-TEST( dllist_test, DLL_Find_null_compare_function) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_Find_null_compare_function)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    int waldo = 1;
-    void* result = DLL_Find( &waldo, list );
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    EXPECT_EQ(result, nullptr);
+				int	waldo	=	1;
+				void*	result	=	DLL_Find(	&waldo,	list	);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-/* ==========================================================================
-DLL_GetAt returns a pointer to the data of the node specified by pos.
-Return NULL if list is NULL, pos is NULL, or if the node specified by pos is
-not contained in the list.
+/*	==========================================================================
+DLL_GetAt	returns	a	pointer	to	the	data	of	the	node	specified	by	pos.
+Return	NULL	if	list	is	NULL,	pos	is	NULL,	or	if	the	node	specified	by	pos	is
+not	contained	in	the	list.
 PROTOTYPE:
-    void* DLL_GetAt(DLLPOS pos, DLLIST* list);
+				void*	DLL_GetAt(DLLPOS	pos,	DLLIST*	list);
 */
 
-TEST( dllist_test, DLL_GetAt) {
-    int A[] = {1,2,3,4,5};
-    int* result;
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first = DLL_AddHead( &(A[0]), list);
-    DLLPOS pos_second = DLL_AddHead( &(A[1]), list);
-    DLLPOS pos_third = DLL_AddHead( &(A[2]), list);
-    DLLPOS pos_fourth = DLL_AddHead( &(A[3]), list);
-    DLLPOS pos_fifth = DLL_AddHead( &(A[4]), list);
-
-    result = (int*)DLL_GetAt( pos_first, list );
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_GetAt( pos_second, list );
-    EXPECT_EQ(*result, 2);
-    result = (int*)DLL_GetAt( pos_third, list );
-    EXPECT_EQ(*result, 3);
-    result = (int*)DLL_GetAt( pos_fourth, list );
-    EXPECT_EQ(*result, 4);
-    result = (int*)DLL_GetAt( pos_fifth, list );
-    EXPECT_EQ(*result, 5);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_GetAt)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=	DLL_AddHead(	&(A[0]),	list);
+				DLLPOS	pos_second	=	DLL_AddHead(	&(A[1]),	list);
+				DLLPOS	pos_third	=	DLL_AddHead(	&(A[2]),	list);
+				DLLPOS	pos_fourth	=	DLL_AddHead(	&(A[3]),	list);
+				DLLPOS	pos_fifth	=	DLL_AddHead(	&(A[4]),	list);
+
+				result	=	(int*)DLL_GetAt(	pos_first,	list	);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_GetAt(	pos_second,	list	);
+				EXPECT_EQ(*result,	2);
+				result	=	(int*)DLL_GetAt(	pos_third,	list	);
+				EXPECT_EQ(*result,	3);
+				result	=	(int*)DLL_GetAt(	pos_fourth,	list	);
+				EXPECT_EQ(*result,	4);
+				result	=	(int*)DLL_GetAt(	pos_fifth,	list	);
+				EXPECT_EQ(*result,	5);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetAt_null_list) {
-    int A[] = {1,2,3,4,5};
-    int* result;
+TEST(	dllist_test,	DLL_GetAt_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
 
-    DLLIST* null_list = nullptr;
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first  = DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+				DLLIST*	null_list	=	nullptr;
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first		=	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_GetAt( pos_first, null_list );
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_GetAt(	pos_first,	null_list	);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetAt_null_pos) {
-    int A[] = {1,2,3,4,5};
-    int* result;
-    DLLPOS null_pos = nullptr;
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+TEST(	dllist_test,	DLL_GetAt_null_pos)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
+				DLLPOS	null_pos	=	nullptr;
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_GetAt( null_pos, list );
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_GetAt(	null_pos,	list	);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_GetAt_list_doesnt_contain_node) {
-    int A[] = {1,2,3,4,5};
-    int* result;
-
-    DLLIST* list1 = DLL_Create();
-    DLLPOS pos_in_list1 = DLL_AddHead( &(A[0]), list1);
-    DLLIST* list2 = DLL_Create();
-    DLLPOS pos_in_list2 = DLL_AddHead( &(A[0]), list2);
-
-    // These work.
-    result = (int*)DLL_GetAt( pos_in_list1, list1 );
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_GetAt( pos_in_list2, list2 );
-    EXPECT_EQ(*result, 1);
-
-    // These don't.
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_GetAt( pos_in_list1, list2 );
-    EXPECT_EQ(result, nullptr);
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_GetAt( pos_in_list2, list1 );
-    EXPECT_EQ(result, nullptr);
-
-    DLL_Delete(list1);
-    DLL_Delete(list2);
+TEST(	dllist_test,	DLL_GetAt_list_doesnt_contain_node)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
+
+				DLLIST*	list1	=	DLL_Create();
+				DLLPOS	pos_in_list1	=	DLL_AddHead(	&(A[0]),	list1);
+				DLLIST*	list2	=	DLL_Create();
+				DLLPOS	pos_in_list2	=	DLL_AddHead(	&(A[0]),	list2);
+
+				//	These	work.
+				result	=	(int*)DLL_GetAt(	pos_in_list1,	list1	);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_GetAt(	pos_in_list2,	list2	);
+				EXPECT_EQ(*result,	1);
+
+				//	These	don't.
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_GetAt(	pos_in_list1,	list2	);
+				EXPECT_EQ(result,	nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_GetAt(	pos_in_list2,	list1	);
+				EXPECT_EQ(result,	nullptr);
+
+				DLL_Delete(list1);
+				DLL_Delete(list2);
 }
 
-/* ==========================================================================
-DLL_SetAt sets the data of the node specified by pos to info, and return the
-previous info. Return NULL if list is NULL, pos is NULL, or if the node
-specified by pos is not contained in the list.
+/*	==========================================================================
+DLL_SetAt	sets	the	data	of	the	node	specified	by	pos	to	info,	and	return	the
+previous	info.	Return	NULL	if	list	is	NULL,	pos	is	NULL,	or	if	the	node
+specified	by	pos	is	not	contained	in	the	list.
 PROTOTYPE:
-    void *DLL_SetAt(DLLPOS pos, void *info, DLLIST * list)
+				void	*DLL_SetAt(DLLPOS	pos,	void	*info,	DLLIST	*	list)
 */
 
-TEST( dllist_test, DLL_SetAt) {
-    int A[] = {1,2,3,4,5};
-    int B[] = {6,7,8,9,10};
-    int* result;
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first = DLL_AddHead( &(A[0]), list);
-    DLLPOS pos_second = DLL_AddHead( &(A[1]), list);
-    DLLPOS pos_third = DLL_AddHead( &(A[2]), list);
-    DLLPOS pos_fourth = DLL_AddHead( &(A[3]), list);
-    DLLPOS pos_fifth = DLL_AddHead( &(A[4]), list);
-
-    result = (int*)DLL_SetAt( pos_first,  &(B[0]), list );
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_SetAt( pos_second, &(B[1]), list );
-    EXPECT_EQ(*result, 2);
-    result = (int*)DLL_SetAt( pos_third,  &(B[2]), list );
-    EXPECT_EQ(*result, 3);
-    result = (int*)DLL_SetAt( pos_fourth, &(B[3]), list );
-    EXPECT_EQ(*result, 4);
-    result = (int*)DLL_SetAt( pos_fifth,  &(B[4]), list );
-    EXPECT_EQ(*result, 5);
-    result = (int*)DLL_GetAt( pos_first, list );
-    EXPECT_EQ(*result, 6);
-    result = (int*)DLL_GetAt( pos_second, list );
-    EXPECT_EQ(*result, 7);
-    result = (int*)DLL_GetAt( pos_third, list );
-    EXPECT_EQ(*result, 8);
-    result = (int*)DLL_GetAt( pos_fourth, list );
-    EXPECT_EQ(*result, 9);
-    result = (int*)DLL_GetAt( pos_fifth, list );
-    EXPECT_EQ(*result, 10);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_SetAt)	{
+				int	A[]	=	{1,2,3,4,5};
+				int	B[]	=	{6,7,8,9,10};
+				int*	result;
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first	=	DLL_AddHead(	&(A[0]),	list);
+				DLLPOS	pos_second	=	DLL_AddHead(	&(A[1]),	list);
+				DLLPOS	pos_third	=	DLL_AddHead(	&(A[2]),	list);
+				DLLPOS	pos_fourth	=	DLL_AddHead(	&(A[3]),	list);
+				DLLPOS	pos_fifth	=	DLL_AddHead(	&(A[4]),	list);
+
+				result	=	(int*)DLL_SetAt(	pos_first,		&(B[0]),	list	);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_SetAt(	pos_second,	&(B[1]),	list	);
+				EXPECT_EQ(*result,	2);
+				result	=	(int*)DLL_SetAt(	pos_third,		&(B[2]),	list	);
+				EXPECT_EQ(*result,	3);
+				result	=	(int*)DLL_SetAt(	pos_fourth,	&(B[3]),	list	);
+				EXPECT_EQ(*result,	4);
+				result	=	(int*)DLL_SetAt(	pos_fifth,		&(B[4]),	list	);
+				EXPECT_EQ(*result,	5);
+				result	=	(int*)DLL_GetAt(	pos_first,	list	);
+				EXPECT_EQ(*result,	6);
+				result	=	(int*)DLL_GetAt(	pos_second,	list	);
+				EXPECT_EQ(*result,	7);
+				result	=	(int*)DLL_GetAt(	pos_third,	list	);
+				EXPECT_EQ(*result,	8);
+				result	=	(int*)DLL_GetAt(	pos_fourth,	list	);
+				EXPECT_EQ(*result,	9);
+				result	=	(int*)DLL_GetAt(	pos_fifth,	list	);
+				EXPECT_EQ(*result,	10);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_SetAt_null_list) {
-    int A[] = {1,2,3,4,5};
-    int* result;
+TEST(	dllist_test,	DLL_SetAt_null_list)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
 
-    DLLIST* null_list = nullptr;
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first  = DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+				DLLIST*	null_list	=	nullptr;
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first		=	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_SetAt( pos_first, &(A[0]), null_list );
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_SetAt(	pos_first,	&(A[0]),	null_list	);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_SetAt_null_pos) {
-    int A[] = {1,2,3,4,5};
-    int* result;
+TEST(	dllist_test,	DLL_SetAt_null_pos)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
 
-    DLLPOS null_pos = nullptr;
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddHead( &(A[0]), list);
-    (void) DLL_AddHead( &(A[1]), list);
+				DLLPOS	null_pos	=	nullptr;
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddHead(	&(A[0]),	list);
+				(void)	DLL_AddHead(	&(A[1]),	list);
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_SetAt( null_pos, &(A[0]), list );
-    EXPECT_EQ(result, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_SetAt(	null_pos,	&(A[0]),	list	);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_SetAt_list_doesnt_contain_node) {
-    int A[] = {1,2,3,4,5};
-    int* result;
-
-    DLLIST* list1 = DLL_Create();
-    DLLPOS pos_in_list1 = DLL_AddHead( &(A[0]), list1);
-    DLLIST* list2 = DLL_Create();
-    DLLPOS pos_in_list2 = DLL_AddHead( &(A[0]), list2);
-
-    // These should work.
-    result = (int*)DLL_SetAt( pos_in_list1, &(A[1]), list1 );
-    EXPECT_EQ(*result, 1);
-    result = (int*)DLL_SetAt( pos_in_list2, &(A[1]), list2 );
-    EXPECT_EQ(*result, 1);
-
-    // These shouldn't, because the specified nodes are not in the specified lists.
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_SetAt( pos_in_list1, &(A[1]), list2 );
-    EXPECT_EQ(result, nullptr);
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_SetAt( pos_in_list2, &(A[1]), list1 );
-    EXPECT_EQ(result, nullptr);
-
-    DLL_Delete(list1);
-    DLL_Delete(list2);
+TEST(	dllist_test,	DLL_SetAt_list_doesnt_contain_node)	{
+				int	A[]	=	{1,2,3,4,5};
+				int*	result;
+
+				DLLIST*	list1	=	DLL_Create();
+				DLLPOS	pos_in_list1	=	DLL_AddHead(	&(A[0]),	list1);
+				DLLIST*	list2	=	DLL_Create();
+				DLLPOS	pos_in_list2	=	DLL_AddHead(	&(A[0]),	list2);
+
+				//	These	should	work.
+				result	=	(int*)DLL_SetAt(	pos_in_list1,	&(A[1]),	list1	);
+				EXPECT_EQ(*result,	1);
+				result	=	(int*)DLL_SetAt(	pos_in_list2,	&(A[1]),	list2	);
+				EXPECT_EQ(*result,	1);
+
+				//	These	shouldn't,	because	the	specified	nodes	are	not	in	the	specified	lists.
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_SetAt(	pos_in_list1,	&(A[1]),	list2	);
+				EXPECT_EQ(result,	nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_SetAt(	pos_in_list2,	&(A[1]),	list1	);
+				EXPECT_EQ(result,	nullptr);
+
+				DLL_Delete(list1);
+				DLL_Delete(list2);
 }
 
-/* ==========================================================================
+/*	==========================================================================
 DLL_FindPos
-Return the position, in the specified list, that holds the specified data
-address. If the list is NULL, or the data address isn't found, return NULL.
+Return	the	position,	in	the	specified	list,	that	holds	the	specified	data
+address.	If	the	list	is	NULL,	or	the	data	address	isn't	found,	return	NULL.
 PROTOTYPE:
-    DLLPOS DLL_FindPos(void* data, DLLIST*);
+				DLLPOS	DLL_FindPos(void*	data,	DLLIST*);
 */
 
-TEST( dllist_test, DLL_FindPos) {
-    int A[] = {1,2,3,4,5};
-    int B = 7;
-
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first  = DLL_AddHead( &(A[0]), list);
-    DLLPOS pos_second = DLL_AddHead( &(A[1]), list);
-    DLLPOS pos_third  = DLL_AddHead( &(A[2]), list);
-    DLLPOS pos_fourth = DLL_AddHead( &(A[3]), list);
-    DLLPOS pos_fifth  = DLL_AddHead( &(A[4]), list);
-
-    DLLPOS result = nullptr;
-    result = DLL_FindPos( &(A[0]), list);
-    EXPECT_EQ(result, pos_first);
-    result = DLL_FindPos( &(A[1]), list);
-    EXPECT_EQ(result, pos_second);
-    result = DLL_FindPos( &(A[2]), list);
-    EXPECT_EQ(result, pos_third);
-    result = DLL_FindPos( &(A[3]), list);
-    EXPECT_EQ(result, pos_fourth);
-    result = DLL_FindPos( &(A[4]), list);
-    EXPECT_EQ(result, pos_fifth);
-
-    /* B isn't in the list. */
-    result = DLL_FindPos( &B, list);
-    EXPECT_EQ(result, nullptr);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_FindPos)	{
+				int	A[]	=	{1,2,3,4,5};
+				int	B	=	7;
+
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first		=	DLL_AddHead(	&(A[0]),	list);
+				DLLPOS	pos_second	=	DLL_AddHead(	&(A[1]),	list);
+				DLLPOS	pos_third		=	DLL_AddHead(	&(A[2]),	list);
+				DLLPOS	pos_fourth	=	DLL_AddHead(	&(A[3]),	list);
+				DLLPOS	pos_fifth		=	DLL_AddHead(	&(A[4]),	list);
+
+				DLLPOS	result	=	nullptr;
+				result	=	DLL_FindPos(	&(A[0]),	list);
+				EXPECT_EQ(result,	pos_first);
+				result	=	DLL_FindPos(	&(A[1]),	list);
+				EXPECT_EQ(result,	pos_second);
+				result	=	DLL_FindPos(	&(A[2]),	list);
+				EXPECT_EQ(result,	pos_third);
+				result	=	DLL_FindPos(	&(A[3]),	list);
+				EXPECT_EQ(result,	pos_fourth);
+				result	=	DLL_FindPos(	&(A[4]),	list);
+				EXPECT_EQ(result,	pos_fifth);
+
+				/*	B	isn't	in	the	list.	*/
+				result	=	DLL_FindPos(	&B,	list);
+				EXPECT_EQ(result,	nullptr);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_FindPos_null_list) {
-    int B = 7;
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    /* Call function under test with list == NULL. */
-    DLLPOS result = DLL_FindPos(&B, nullptr);
-    EXPECT_EQ(result, nullptr);
+TEST(	dllist_test,	DLL_FindPos_null_list)	{
+				int	B	=	7;
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				/*	Call	function	under	test	with	list	==	NULL.	*/
+				DLLPOS	result	=	DLL_FindPos(&B,	nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
+/*	==========================================================================
 DLL_FindIndex
-Return the node at the given index (n), where n ranges from 0 {the head node}
-to (list->count - 1) {The tail node}.
+Return	the	node	at	the	given	index	(n),	where	n	ranges	from	0	{the	head	node}
+to	(list->count	-	1)	{The	tail	node}.
 PROTOTYPE:
-    DLLPOS DLL_FindIndex(int n, DLLIST * list)
+				DLLPOS	DLL_FindIndex(int	n,	DLLIST	*	list)
 */
 
-TEST( dllist_test, DLL_FindIndex) {
-    int A[] = {1,2,3,4,5};
-
-    DLLIST* list = DLL_Create();
-    DLLPOS pos_first  = DLL_AddTail( &(A[0]), list);
-    DLLPOS pos_second = DLL_AddTail( &(A[1]), list);
-    DLLPOS pos_third  = DLL_AddTail( &(A[2]), list);
-    DLLPOS pos_fourth = DLL_AddTail( &(A[3]), list);
-    DLLPOS pos_fifth  = DLL_AddTail( &(A[4]), list);
-
-    DLLPOS result = nullptr;
-    result = DLL_FindIndex( 0, list);
-    EXPECT_EQ(result, pos_first);
-    result = DLL_FindIndex( 1, list);
-    EXPECT_EQ(result, pos_second);
-    result = DLL_FindIndex( 2, list);
-    EXPECT_EQ(result, pos_third);
-    result = DLL_FindIndex( 3, list);
-    EXPECT_EQ(result, pos_fourth);
-    result = DLL_FindIndex( 4, list);
-    EXPECT_EQ(result, pos_fifth);
-
-    /* B isn't in the list. */
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = DLL_FindIndex( 6, list);
-    EXPECT_EQ(result, nullptr);
-
-    DLL_Delete(list);
+TEST(	dllist_test,	DLL_FindIndex)	{
+				int	A[]	=	{1,2,3,4,5};
+
+				DLLIST*	list	=	DLL_Create();
+				DLLPOS	pos_first		=	DLL_AddTail(	&(A[0]),	list);
+				DLLPOS	pos_second	=	DLL_AddTail(	&(A[1]),	list);
+				DLLPOS	pos_third		=	DLL_AddTail(	&(A[2]),	list);
+				DLLPOS	pos_fourth	=	DLL_AddTail(	&(A[3]),	list);
+				DLLPOS	pos_fifth		=	DLL_AddTail(	&(A[4]),	list);
+
+				DLLPOS	result	=	nullptr;
+				result	=	DLL_FindIndex(	0,	list);
+				EXPECT_EQ(result,	pos_first);
+				result	=	DLL_FindIndex(	1,	list);
+				EXPECT_EQ(result,	pos_second);
+				result	=	DLL_FindIndex(	2,	list);
+				EXPECT_EQ(result,	pos_third);
+				result	=	DLL_FindIndex(	3,	list);
+				EXPECT_EQ(result,	pos_fourth);
+				result	=	DLL_FindIndex(	4,	list);
+				EXPECT_EQ(result,	pos_fifth);
+
+				/*	B	isn't	in	the	list.	*/
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	DLL_FindIndex(	6,	list);
+				EXPECT_EQ(result,	nullptr);
+
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_FindIndex_null_list) {
+TEST(	dllist_test,	DLL_FindIndex_null_list)	{
 
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    DLLPOS result = DLL_FindIndex(0, nullptr);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				DLLPOS	result	=	DLL_FindIndex(0,	nullptr);
 
-    EXPECT_EQ(result, nullptr);
+				EXPECT_EQ(result,	nullptr);
 }
 
-/* ==========================================================================
+/*	==========================================================================
 DLL_RemoveAt
-Remove the spcified node (pos) Node from the specified list.
-Reurn the info at the position being removed, or NULL if it's not found in the
+Remove	the	spcified	node	(pos)	Node	from	the	specified	list.
+Reurn	the	info	at	the	position	being	removed,	or	NULL	if	it's	not	found	in	the
 list.
 PROTOTYPE:
-    void *DLL_RemoveAt(DLLPOS pos, DLLIST * list)
+				void	*DLL_RemoveAt(DLLPOS	pos,	DLLIST	*	list)
 */
 
-TEST( dllist_test, DLL_RemoveAt_head) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_RemoveAt_head)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
-    (void) DLL_AddTail( &(A[2]), list);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
+				(void)	DLL_AddTail(	&(A[2]),	list);
 
-    DLLPOS nodeToRemove = DLL_GetHeadPosition(list);
-    int* result = nullptr;
+				DLLPOS	nodeToRemove	=	DLL_GetHeadPosition(list);
+				int*	result	=	nullptr;
 
-    result = (int*)DLL_RemoveAt(nodeToRemove, list);
-    EXPECT_EQ(*result, 1);
-    EXPECT_EQ( DLL_GetCount(list), 2);
+				result	=	(int*)DLL_RemoveAt(nodeToRemove,	list);
+				EXPECT_EQ(*result,	1);
+				EXPECT_EQ(	DLL_GetCount(list),	2);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_RemoveAt_tail) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_RemoveAt_tail)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
-    (void) DLL_AddTail( &(A[2]), list);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
+				(void)	DLL_AddTail(	&(A[2]),	list);
 
-    DLLPOS nodeToRemove = DLL_GetTailPosition(list);
-    int* result = nullptr;
+				DLLPOS	nodeToRemove	=	DLL_GetTailPosition(list);
+				int*	result	=	nullptr;
 
-    result = (int*)DLL_RemoveAt(nodeToRemove, list);
-    EXPECT_EQ(*result, 3);
-    EXPECT_EQ( DLL_GetCount(list), 2);
+				result	=	(int*)DLL_RemoveAt(nodeToRemove,	list);
+				EXPECT_EQ(*result,	3);
+				EXPECT_EQ(	DLL_GetCount(list),	2);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_RemoveAt_from_middle) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_RemoveAt_from_middle)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
-    DLLPOS nodeToRemove = DLL_AddTail( &(A[1]), list);
-    (void) DLL_AddTail( &(A[2]), list);
-    EXPECT_EQ( DLL_GetCount(list), 3);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
+				DLLPOS	nodeToRemove	=	DLL_AddTail(	&(A[1]),	list);
+				(void)	DLL_AddTail(	&(A[2]),	list);
+				EXPECT_EQ(	DLL_GetCount(list),	3);
 
-    int* result = nullptr;
-    result = (int*)DLL_RemoveAt(nodeToRemove, list);
-    EXPECT_EQ(*result, 2);
-    EXPECT_EQ( DLL_GetCount(list), 2);
+				int*	result	=	nullptr;
+				result	=	(int*)DLL_RemoveAt(nodeToRemove,	list);
+				EXPECT_EQ(*result,	2);
+				EXPECT_EQ(	DLL_GetCount(list),	2);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_RemoveAt_from_single_node_list) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_RemoveAt_from_single_node_list)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
 
-    DLLPOS nodeToRemove = DLL_GetTailPosition(list);
-    int* result = nullptr;
+				DLLPOS	nodeToRemove	=	DLL_GetTailPosition(list);
+				int*	result	=	nullptr;
 
-    result = (int*)DLL_RemoveAt(nodeToRemove, list);
-    EXPECT_EQ(*result, 1);
-    EXPECT_EQ( DLL_GetCount(list), 0);
+				result	=	(int*)DLL_RemoveAt(nodeToRemove,	list);
+				EXPECT_EQ(*result,	1);
+				EXPECT_EQ(	DLL_GetCount(list),	0);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-TEST( dllist_test, DLL_RemoveAt_null_list) {
+TEST(	dllist_test,	DLL_RemoveAt_null_list)	{
 
-    DLLIST* list = nullptr;
-    DLLPOS nodeToRemove = nullptr;
-    int* result = nullptr;
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)DLL_RemoveAt(nodeToRemove, list);
-    EXPECT_EQ(result, nullptr);
+				DLLIST*	list	=	nullptr;
+				DLLPOS	nodeToRemove	=	nullptr;
+				int*	result	=	nullptr;
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)DLL_RemoveAt(nodeToRemove,	list);
+				EXPECT_EQ(result,	nullptr);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 }
 
-/* ==========================================================================
+/*	==========================================================================
 DLL_RemoveAll
-Removes all elements in the list. The list will then be empty.
-Returns nothing.
+Removes	all	elements	in	the	list.	The	list	will	then	be	empty.
+Returns	nothing.
 PROTOTYPE:
-    void DLL_RemoveAll(DLLIST * list)
+				void	DLL_RemoveAll(DLLIST	*	list)
 */
 
-TEST( dllist_test, DLL_RemoveAll) {
-    int A[] = {1,2,3,4,5};
+TEST(	dllist_test,	DLL_RemoveAll)	{
+				int	A[]	=	{1,2,3,4,5};
 
-    DLLIST* list = DLL_Create();
-    (void) DLL_AddTail( &(A[0]), list);
-    (void) DLL_AddTail( &(A[1]), list);
-    (void) DLL_AddTail( &(A[2]), list);
-    (void) DLL_AddTail( &(A[3]), list);
-    (void) DLL_AddTail( &(A[4]), list);
-    EXPECT_EQ( DLL_GetCount(list), 5);
+				DLLIST*	list	=	DLL_Create();
+				(void)	DLL_AddTail(	&(A[0]),	list);
+				(void)	DLL_AddTail(	&(A[1]),	list);
+				(void)	DLL_AddTail(	&(A[2]),	list);
+				(void)	DLL_AddTail(	&(A[3]),	list);
+				(void)	DLL_AddTail(	&(A[4]),	list);
+				EXPECT_EQ(	DLL_GetCount(list),	5);
 
-    DLL_RemoveAll(list);
+				DLL_RemoveAll(list);
 
-    EXPECT_EQ( DLL_GetCount(list), 0);
+				EXPECT_EQ(	DLL_GetCount(list),	0);
 
-    DLL_Delete(list);
+				DLL_Delete(list);
 
 }
 
-// END OF TEST SUITE
+//	END	OF	TEST	SUITE
diff --git a/trick_source/trick_utils/trick_adt/test/lqueue_unittest.cpp b/trick_source/trick_utils/trick_adt/test/lqueue_unittest.cpp
index fbafaecbe..3af4bbb1c 100644
--- a/trick_source/trick_utils/trick_adt/test/lqueue_unittest.cpp
+++ b/trick_source/trick_utils/trick_adt/test/lqueue_unittest.cpp
@@ -1,142 +1,142 @@
-#include <gtest/gtest.h>
-#include <iostream>
-#include "trick/lqueue.h"
+#include	<gtest/gtest.h>
+#include	<iostream>
+#include	"trick/lqueue.h"
 
 /*
 
-LQUEUE* LQ_Create(void);
-int LQ_Delete(LQUEUE* lqueue);              free an lqueue object created by LQ_Create.
-void LQ_Init(LQUEUE*);
-void LQ_EnQ(void* pData,LQUEUE* pQueue);    insert data into queue
-void* LQ_DeQ(LQUEUE* pQueue);               extract data from queue
-void* LQ_Peek(LQUEUE* pQueue);              get data off queue without extracting
-int LQ_GetCount(LQUEUE* pQueue);            returns number of items in the queue
+LQUEUE*	LQ_Create(void);
+int	LQ_Delete(LQUEUE*	lqueue);														free	an	lqueue	object	created	by	LQ_Create.
+void	LQ_Init(LQUEUE*);
+void	LQ_EnQ(void*	pData,LQUEUE*	pQueue);				insert	data	into	queue
+void*	LQ_DeQ(LQUEUE*	pQueue);															extract	data	from	queue
+void*	LQ_Peek(LQUEUE*	pQueue);														get	data	off	queue	without	extracting
+int	LQ_GetCount(LQUEUE*	pQueue);												returns	number	of	items	in	the	queue
 
-BUG: There's no way to free an LQUEUE without a memory leak.
+BUG:	There's	no	way	to	free	an	LQUEUE	without	a	memory	leak.
 */
 
 
 
-TEST(lqueue_test, LQUEUE_Create) {
-    LQUEUE* result = LQ_Create();
-    EXPECT_NE(result, nullptr);
-    EXPECT_EQ( LQ_GetCount(result), 0);
+TEST(lqueue_test,	LQUEUE_Create)	{
+				LQUEUE*	result	=	LQ_Create();
+				EXPECT_NE(result,	nullptr);
+				EXPECT_EQ(	LQ_GetCount(result),	0);
 }
 
-TEST(lqueue_test, LQUEUE_Delete) {
-    LQUEUE* lqueue = LQ_Create();
-    EXPECT_EQ( LQ_Delete(lqueue), 0);
+TEST(lqueue_test,	LQUEUE_Delete)	{
+				LQUEUE*	lqueue	=	LQ_Create();
+				EXPECT_EQ(	LQ_Delete(lqueue),	0);
 }
 
-TEST(lqueue_test, LQUEUE_Delete_null) {
+TEST(lqueue_test,	LQUEUE_Delete_null)	{
 
-    LQUEUE* lqueue = nullptr;
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    EXPECT_EQ( LQ_Delete(lqueue), -1);
+				LQUEUE*	lqueue	=	nullptr;
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				EXPECT_EQ(	LQ_Delete(lqueue),	-1);
 }
 
-TEST(lqueue_test, LQUEUE_Init) {
-
-    LQUEUE* lqueue = LQ_Create();
-    lqueue->list.count = 1;
-    lqueue->list.head = (DLLNODE*)(0xDEADBEEF);
-    lqueue->list.tail = (DLLNODE*)(0xDEADBEEF);
-    LQ_Init(lqueue);
-    EXPECT_EQ(lqueue->list.count, 0);
-    EXPECT_EQ(lqueue->list.head, nullptr);
-    EXPECT_EQ(lqueue->list.tail, nullptr);
-    EXPECT_EQ(lqueue->list.compare, nullptr);
-    EXPECT_EQ( LQ_GetCount(lqueue), 0);
+TEST(lqueue_test,	LQUEUE_Init)	{
+
+				LQUEUE*	lqueue	=	LQ_Create();
+				lqueue->list.count	=	1;
+				lqueue->list.head	=	(DLLNODE*)(0xDEADBEEF);
+				lqueue->list.tail	=	(DLLNODE*)(0xDEADBEEF);
+				LQ_Init(lqueue);
+				EXPECT_EQ(lqueue->list.count,	0);
+				EXPECT_EQ(lqueue->list.head,	nullptr);
+				EXPECT_EQ(lqueue->list.tail,	nullptr);
+				EXPECT_EQ(lqueue->list.compare,	nullptr);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	0);
 }
 
-TEST(lqueue_test, LQUEUE_Init_null) {
+TEST(lqueue_test,	LQUEUE_Init_null)	{
 
-    LQUEUE* lqueue = nullptr;
-    std::cout << "NOTE: Two error messages are expected to follow." << std::endl;
-    LQ_Init(lqueue);
+				LQUEUE*	lqueue	=	nullptr;
+				std::cout	<<	"NOTE:	Two	error	messages	are	expected	to	follow."	<<	std::endl;
+				LQ_Init(lqueue);
 
 }
 
-TEST(lqueue_test, LQUEUE_EnQ) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    LQUEUE* lqueue = LQ_Create();
-    LQ_EnQ( &A, lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 1);
-    LQ_EnQ( &B, lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 2);
-    LQ_EnQ( &C, lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 3);
+TEST(lqueue_test,	LQUEUE_EnQ)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				LQUEUE*	lqueue	=	LQ_Create();
+				LQ_EnQ(	&A,	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	1);
+				LQ_EnQ(	&B,	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	2);
+				LQ_EnQ(	&C,	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	3);
 }
 
-TEST(lqueue_test, LQUEUE_EnQ_null_queue) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    LQUEUE* lqueue = LQ_Create();
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    LQ_EnQ( &A, nullptr);
+TEST(lqueue_test,	LQUEUE_EnQ_null_queue)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				LQUEUE*	lqueue	=	LQ_Create();
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				LQ_EnQ(	&A,	nullptr);
 
 }
 
-TEST(lqueue_test, LQUEUE_DeQ) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    LQUEUE* lqueue = LQ_Create();
-    LQ_EnQ( &A, lqueue);
-    LQ_EnQ( &B, lqueue);
-    LQ_EnQ( &C, lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 3);
-    LQ_DeQ( lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 2);
-    LQ_DeQ( lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 1);
-    LQ_DeQ( lqueue);
-    EXPECT_EQ( LQ_GetCount(lqueue), 0);
+TEST(lqueue_test,	LQUEUE_DeQ)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				LQUEUE*	lqueue	=	LQ_Create();
+				LQ_EnQ(	&A,	lqueue);
+				LQ_EnQ(	&B,	lqueue);
+				LQ_EnQ(	&C,	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	3);
+				LQ_DeQ(	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	2);
+				LQ_DeQ(	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	1);
+				LQ_DeQ(	lqueue);
+				EXPECT_EQ(	LQ_GetCount(lqueue),	0);
 }
 
-TEST(lqueue_test, LQUEUE_DeQ_null_queue) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    LQUEUE* lqueue = nullptr;
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    LQ_EnQ( &A, lqueue);
+TEST(lqueue_test,	LQUEUE_DeQ_null_queue)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				LQUEUE*	lqueue	=	nullptr;
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				LQ_EnQ(	&A,	lqueue);
 }
 
-TEST(lqueue_test, LQUEUE_Peek) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    int* result;
-    LQUEUE* lqueue = LQ_Create();
-    LQ_EnQ( &A, lqueue);
-    LQ_EnQ( &B, lqueue);
-    LQ_EnQ( &C, lqueue);
-
-    EXPECT_EQ( LQ_GetCount(lqueue), 3);
-    result = (int*)LQ_Peek(lqueue);
-    EXPECT_EQ(*result, 1);
-    LQ_DeQ( lqueue);
-
-    EXPECT_EQ( LQ_GetCount(lqueue), 2);
-    result = (int*)LQ_Peek(lqueue);
-    EXPECT_EQ(*result, 2);
-    LQ_DeQ( lqueue);
-
-    EXPECT_EQ( LQ_GetCount(lqueue), 1);
-    result = (int*)LQ_Peek(lqueue);
-    EXPECT_EQ(*result, 3);
-    LQ_DeQ( lqueue);
-
-    EXPECT_EQ( LQ_GetCount(lqueue), 0);
-    std::cout << "NOTE: An error message is expected to follow." << std::endl;
-    result = (int*)LQ_Peek(lqueue);
-    EXPECT_EQ(result, nullptr);
+TEST(lqueue_test,	LQUEUE_Peek)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				int*	result;
+				LQUEUE*	lqueue	=	LQ_Create();
+				LQ_EnQ(	&A,	lqueue);
+				LQ_EnQ(	&B,	lqueue);
+				LQ_EnQ(	&C,	lqueue);
+
+				EXPECT_EQ(	LQ_GetCount(lqueue),	3);
+				result	=	(int*)LQ_Peek(lqueue);
+				EXPECT_EQ(*result,	1);
+				LQ_DeQ(	lqueue);
+
+				EXPECT_EQ(	LQ_GetCount(lqueue),	2);
+				result	=	(int*)LQ_Peek(lqueue);
+				EXPECT_EQ(*result,	2);
+				LQ_DeQ(	lqueue);
+
+				EXPECT_EQ(	LQ_GetCount(lqueue),	1);
+				result	=	(int*)LQ_Peek(lqueue);
+				EXPECT_EQ(*result,	3);
+				LQ_DeQ(	lqueue);
+
+				EXPECT_EQ(	LQ_GetCount(lqueue),	0);
+				std::cout	<<	"NOTE:	An	error	message	is	expected	to	follow."	<<	std::endl;
+				result	=	(int*)LQ_Peek(lqueue);
+				EXPECT_EQ(result,	nullptr);
 }
 
-TEST(lqueue_test, LQUEUE_Peek_null_queue) {
-    int A,B,C;
-    A=1; B=2; C=3;
-    int* result = (int*)(0xDEADBEEF);;
-    LQUEUE* lqueue = nullptr;
-    result = (int*)LQ_Peek(lqueue);
-    EXPECT_EQ(result, nullptr);
+TEST(lqueue_test,	LQUEUE_Peek_null_queue)	{
+				int	A,B,C;
+				A=1;	B=2;	C=3;
+				int*	result	=	(int*)(0xDEADBEEF);;
+				LQUEUE*	lqueue	=	nullptr;
+				result	=	(int*)LQ_Peek(lqueue);
+				EXPECT_EQ(result,	nullptr);
 }
diff --git a/trick_source/trick_utils/unicode/test/unicode_utils_test.cpp b/trick_source/trick_utils/unicode/test/unicode_utils_test.cpp
index 8175664a9..3496f96bd 100644
--- a/trick_source/trick_utils/unicode/test/unicode_utils_test.cpp
+++ b/trick_source/trick_utils/unicode/test/unicode_utils_test.cpp
@@ -1,491 +1,491 @@
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#include <gtest/gtest.h>
-#include "trick/unicode_utils.h"
-
-int main(int argc, char **argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-
-const char* ISO_6429_Restore_Default   = "\x1b[00m";
-const char* ISO_6429_Bold              = "\x1b[01m";
-const char* ISO_6429_Underline         = "\x1b[04m";
-const char* ISO_6429_Black_Foreground  = "\x1b[30m";
-const char* ISO_6429_Red_Foreground    = "\x1b[31m";
-const char* ISO_6429_Green_Foreground  = "\x1b[32m";
-const char* ISO_6429_Yellow_Foreground = "\x1b[33m";
-const char* ISO_6429_Blue_Foreground   = "\x1b[34m";
-const char* ISO_6429_Purple_Foreground = "\x1b[35m";
-const char* ISO_6429_Cyan_Foreground   = "\x1b[36m";
-const char* ISO_6429_White_Foreground  = "\x1b[37m";
-const char* ISO_6429_Black_Background  = "\x1b[40m";
-const char* ISO_6429_Red_Background    = "\x1b[41m";
-const char* ISO_6429_Green_Background  = "\x1b[42m";
-const char* ISO_6429_Yellow_Background = "\x1b[43m";
-const char* ISO_6429_Blue_Background   = "\x1b[44m";
-const char* ISO_6429_Purple_Background = "\x1b[45m";
-const char* ISO_6429_Cyan_Background   = "\x1b[46m";
-const char* ISO_6429_White_Background  = "\x1b[47m";
-
-void Error_Message_Expected() {
-    printf("%s%s%s", ISO_6429_Blue_Background, ISO_6429_White_Foreground, ISO_6429_Underline);
-    printf("An error message is expected from this test.");
-    printf("%s\n", ISO_6429_Restore_Default );
-}
-
-/* The following are the utf-8 encodings of four unicode characters used in the following tests. */
-// Greek Phi Symbol => U+03d5 => 0xcf 0x95                      // see: https://www.compart.com/en/unicode/U+03D5
-// Superscript Latin Small Letter I => U+2071 => 0xe2 0x81 0xb1 // see: https://www.compart.com/en/unicode/U+2071
-// Modifier Letter Small Greek Phi  => U+1D60 => 0xe1 0xb5 0xa0 // see: https://www.compart.com/en/unicode/U+1D60
-// Aegean Number Ten => U+10110 => 0xf0 0x90 0x84 0x90          // see: https://www.compart.com/en/unicode/U+10110
-
-// -------------------------------------------------------
-// Test suite for ucodepoint_to_utf32()
-// -------------------------------------------------------
-TEST(ucodepoint_to_utf32, valid ) {
-    /* Aegean Number Ten, U+10110 is a valid code point. */
-    int32_t out;
-    size_t size = ucodepoint_to_utf32(0x10110, &out);
-    EXPECT_EQ(1, size);
-}
-
-TEST(ucodepoint_to_utf32, invalid ) {
-    /* 0xdead is in the range [d800 .. dfff], and reserved for UTF-16
-       surrogates. They are not valid unicode codepoints. So, if we
-       attempt to convert a surrogate as a codepoint, we should get
-       an error meassage.
-     */
-    int32_t out;
-    Error_Message_Expected();
-    size_t size = ucodepoint_to_utf32(0xdead, &out);
-    EXPECT_EQ(0, size);
-}
-
-// -------------------------------------------------------
-// Test suite for ucodepoint_to_utf16()
-// -------------------------------------------------------
-TEST(ucodepoint_to_utf16, two_16bit_element_sequence ) {
-    /* Note that unicode is a 21-bit encoding.
-       Because Aegean Number Ten (U+10110) is larger than can be stored in 16-bits,
-       UTF-16 requires two 16-bit values, called surrogates to encode it.
-       The high-surrogate "carries" the most significant 11 bits of the codepoint.
-       High-surrogate = 0xd800 + most significant 11 bits of the codepoint.
-       The low-surrogate carries the least significant 10 bits of the codepoint.
-       Low-surrogate = 0xde00 + least significant 10 bits of the codepoint.
-    */
-    int16_t out[2];
-    size_t size = ucodepoint_to_utf16(0x10110, &out);
-    EXPECT_EQ(2, size);
-    EXPECT_EQ((int16_t)0xd840, out[0]); 
-    EXPECT_EQ((int16_t)0xdd10, out[1]);
-}
-
-TEST(ucodepoint_to_utf16, one_16bit_element) {
-    int16_t out[2];
-    /* A valid codepoint that can be stored within 16-bits should be
-       equal to its UTF-16 character value. */
-    size_t size = ucodepoint_to_utf16(0x03d5, &out);
-    EXPECT_EQ(1, size);
-    EXPECT_EQ((int16_t)0x03d5, out[0]); 
-}
-
-TEST(ucodepoint_to_utf16, invalid_surrogate ) {
-    /* Input codepoint can not be a surrogate. */
-    int16_t out[2];
-    Error_Message_Expected();
-    size_t size = ucodepoint_to_utf16(0xdead, &out);
-    EXPECT_EQ(0, size);
-}
-
-TEST(ucodepoint_to_utf16, codepoint_too_big ) {
-    /* Input codepoint can not be > 0x10ffff, which is the largest valid unicode codepoint. */
-    int16_t out[2];
-    Error_Message_Expected();
-    size_t size = ucodepoint_to_utf16(0x110000, &out);
-    EXPECT_EQ(0, size);
-}
-
-// -------------------------------------------------------
-// Test suite for ucodepoint_to_utf8()
-// -------------------------------------------------------
-TEST(ucodepoint_to_utf8, four_8bit_element_sequence ) {
-    char out[4];
-    /* Aegean Number Ten, U+10110 is a valid codepoint that
-       requires four bytes to encode in utf-8. */
-    size_t size = ucodepoint_to_utf8(0x10110, &out);
-    EXPECT_EQ(4, size);
-}
-
-TEST(ucodepoint_to_utf8, three_8bit_element_sequence ) {
-    char out[4];
-    /* Superscript Latin Small Letter I, U+2071 is a valid
-       codepoint that requires three bytes to encode in utf-8. */
-    size_t size = ucodepoint_to_utf8(0x2071, &out);
-    EXPECT_EQ(3, size);
-}
-
-TEST(ucodepoint_to_utf8, two_8bit_element_sequence ) {
-    char out[4];
-    /* Greek Phi Symbol, U+03d5 is a valid codepoint that
-       requires two bytes to encode in utf-8. */
-    size_t size = ucodepoint_to_utf8(0x03d5, &out);
-    EXPECT_EQ(2, size);
-}
-
-TEST(ucodepoint_to_utf8, ascii ) {
-    char out[4];
-    /* Latin Small Letter A,  U+0061 is a valid codepoint that
-       requires one byte to encode in utf-8. Below 0x7f, Unicode
-       and ASCII are identical. */
-    size_t size = ucodepoint_to_utf8('a', &out);
-    EXPECT_EQ(1, size);
-}
-
-// -------------------------------------------------------
-// Test suite for escape_to_ascii()
-// -------------------------------------------------------
-TEST(escape_to_ascii, null_input ) {
-    /* Should generate error message if input character pointer is NULL. */
-    char output[128];
-    char* null_ptr = (char*)0;
-    Error_Message_Expected();
-    size_t size = escape_to_ascii( null_ptr, output, sizeof(output));
-    EXPECT_EQ(0, size);
-}
-
-TEST(escape_to_ascii, null_output ) {
-    /* If output character pointer is NULL, still determine the length. */
-    char* null_ptr = (char*)0;
-    const char* input = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)\n";
-    size_t expected_size = strlen ("e\\u2071\\u1d60 = cos(\\u03d5) + i*sin(\\u03d5)\\n");
-    size_t size = escape_to_ascii( input, null_ptr, size_t(5));
-    EXPECT_EQ(expected_size, size);
-}
-
-TEST(escape_to_ascii, normal_1  ) {
-    char output[128];
-    /* escape_to_ascii() should escape all Unicode and non-printable ASCII characters. */
-    const char* utf8_s = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)\n";
-    const char* expected_ascii_s = "e\\u2071\\u1d60 = cos(\\u03d5) + i*sin(\\u03d5)\\n";
-    size_t size = escape_to_ascii( utf8_s, output, sizeof(output));
-    EXPECT_EQ( strlen(expected_ascii_s), size);
-    EXPECT_STREQ(expected_ascii_s, output);
+#include	<stddef.h>
+#include	<stdio.h>
+#include	<string.h>
+#include	<wchar.h>
+#include	<gtest/gtest.h>
+#include	"trick/unicode_utils.h"
+
+int	main(int	argc,	char	**argv)	{
+		::testing::InitGoogleTest(&argc,	argv);
+		return	RUN_ALL_TESTS();
+}
+
+const	char*	ISO_6429_Restore_Default			=	"\x1b[00m";
+const	char*	ISO_6429_Bold														=	"\x1b[01m";
+const	char*	ISO_6429_Underline									=	"\x1b[04m";
+const	char*	ISO_6429_Black_Foreground		=	"\x1b[30m";
+const	char*	ISO_6429_Red_Foreground				=	"\x1b[31m";
+const	char*	ISO_6429_Green_Foreground		=	"\x1b[32m";
+const	char*	ISO_6429_Yellow_Foreground	=	"\x1b[33m";
+const	char*	ISO_6429_Blue_Foreground			=	"\x1b[34m";
+const	char*	ISO_6429_Purple_Foreground	=	"\x1b[35m";
+const	char*	ISO_6429_Cyan_Foreground			=	"\x1b[36m";
+const	char*	ISO_6429_White_Foreground		=	"\x1b[37m";
+const	char*	ISO_6429_Black_Background		=	"\x1b[40m";
+const	char*	ISO_6429_Red_Background				=	"\x1b[41m";
+const	char*	ISO_6429_Green_Background		=	"\x1b[42m";
+const	char*	ISO_6429_Yellow_Background	=	"\x1b[43m";
+const	char*	ISO_6429_Blue_Background			=	"\x1b[44m";
+const	char*	ISO_6429_Purple_Background	=	"\x1b[45m";
+const	char*	ISO_6429_Cyan_Background			=	"\x1b[46m";
+const	char*	ISO_6429_White_Background		=	"\x1b[47m";
+
+void	Error_Message_Expected()	{
+				printf("%s%s%s",	ISO_6429_Blue_Background,	ISO_6429_White_Foreground,	ISO_6429_Underline);
+				printf("An	error	message	is	expected	from	this	test.");
+				printf("%s\n",	ISO_6429_Restore_Default	);
+}
+
+/*	The	following	are	the	utf-8	encodings	of	four	unicode	characters	used	in	the	following	tests.	*/
+//	Greek	Phi	Symbol	=>	U+03d5	=>	0xcf	0x95																						//	see:	https://www.compart.com/en/unicode/U+03D5
+//	Superscript	Latin	Small	Letter	I	=>	U+2071	=>	0xe2	0x81	0xb1	//	see:	https://www.compart.com/en/unicode/U+2071
+//	Modifier	Letter	Small	Greek	Phi		=>	U+1D60	=>	0xe1	0xb5	0xa0	//	see:	https://www.compart.com/en/unicode/U+1D60
+//	Aegean	Number	Ten	=>	U+10110	=>	0xf0	0x90	0x84	0x90										//	see:	https://www.compart.com/en/unicode/U+10110
+
+//	-------------------------------------------------------
+//	Test	suite	for	ucodepoint_to_utf32()
+//	-------------------------------------------------------
+TEST(ucodepoint_to_utf32,	valid	)	{
+				/*	Aegean	Number	Ten,	U+10110	is	a	valid	code	point.	*/
+				int32_t	out;
+				size_t	size	=	ucodepoint_to_utf32(0x10110,	&out);
+				EXPECT_EQ(1,	size);
+}
+
+TEST(ucodepoint_to_utf32,	invalid	)	{
+				/*	0xdead	is	in	the	range	[d800	..	dfff],	and	reserved	for	UTF-16
+							surrogates.	They	are	not	valid	unicode	codepoints.	So,	if	we
+							attempt	to	convert	a	surrogate	as	a	codepoint,	we	should	get
+							an	error	meassage.
+					*/
+				int32_t	out;
+				Error_Message_Expected();
+				size_t	size	=	ucodepoint_to_utf32(0xdead,	&out);
+				EXPECT_EQ(0,	size);
+}
+
+//	-------------------------------------------------------
+//	Test	suite	for	ucodepoint_to_utf16()
+//	-------------------------------------------------------
+TEST(ucodepoint_to_utf16,	two_16bit_element_sequence	)	{
+				/*	Note	that	unicode	is	a	21-bit	encoding.
+							Because	Aegean	Number	Ten	(U+10110)	is	larger	than	can	be	stored	in	16-bits,
+							UTF-16	requires	two	16-bit	values,	called	surrogates	to	encode	it.
+							The	high-surrogate	"carries"	the	most	significant	11	bits	of	the	codepoint.
+							High-surrogate	=	0xd800	+	most	significant	11	bits	of	the	codepoint.
+							The	low-surrogate	carries	the	least	significant	10	bits	of	the	codepoint.
+							Low-surrogate	=	0xde00	+	least	significant	10	bits	of	the	codepoint.
+				*/
+				int16_t	out[2];
+				size_t	size	=	ucodepoint_to_utf16(0x10110,	&out);
+				EXPECT_EQ(2,	size);
+				EXPECT_EQ((int16_t)0xd840,	out[0]);	
+				EXPECT_EQ((int16_t)0xdd10,	out[1]);
+}
+
+TEST(ucodepoint_to_utf16,	one_16bit_element)	{
+				int16_t	out[2];
+				/*	A	valid	codepoint	that	can	be	stored	within	16-bits	should	be
+							equal	to	its	UTF-16	character	value.	*/
+				size_t	size	=	ucodepoint_to_utf16(0x03d5,	&out);
+				EXPECT_EQ(1,	size);
+				EXPECT_EQ((int16_t)0x03d5,	out[0]);	
+}
+
+TEST(ucodepoint_to_utf16,	invalid_surrogate	)	{
+				/*	Input	codepoint	can	not	be	a	surrogate.	*/
+				int16_t	out[2];
+				Error_Message_Expected();
+				size_t	size	=	ucodepoint_to_utf16(0xdead,	&out);
+				EXPECT_EQ(0,	size);
+}
+
+TEST(ucodepoint_to_utf16,	codepoint_too_big	)	{
+				/*	Input	codepoint	can	not	be	>	0x10ffff,	which	is	the	largest	valid	unicode	codepoint.	*/
+				int16_t	out[2];
+				Error_Message_Expected();
+				size_t	size	=	ucodepoint_to_utf16(0x110000,	&out);
+				EXPECT_EQ(0,	size);
+}
+
+//	-------------------------------------------------------
+//	Test	suite	for	ucodepoint_to_utf8()
+//	-------------------------------------------------------
+TEST(ucodepoint_to_utf8,	four_8bit_element_sequence	)	{
+				char	out[4];
+				/*	Aegean	Number	Ten,	U+10110	is	a	valid	codepoint	that
+							requires	four	bytes	to	encode	in	utf-8.	*/
+				size_t	size	=	ucodepoint_to_utf8(0x10110,	&out);
+				EXPECT_EQ(4,	size);
+}
+
+TEST(ucodepoint_to_utf8,	three_8bit_element_sequence	)	{
+				char	out[4];
+				/*	Superscript	Latin	Small	Letter	I,	U+2071	is	a	valid
+							codepoint	that	requires	three	bytes	to	encode	in	utf-8.	*/
+				size_t	size	=	ucodepoint_to_utf8(0x2071,	&out);
+				EXPECT_EQ(3,	size);
+}
+
+TEST(ucodepoint_to_utf8,	two_8bit_element_sequence	)	{
+				char	out[4];
+				/*	Greek	Phi	Symbol,	U+03d5	is	a	valid	codepoint	that
+							requires	two	bytes	to	encode	in	utf-8.	*/
+				size_t	size	=	ucodepoint_to_utf8(0x03d5,	&out);
+				EXPECT_EQ(2,	size);
+}
+
+TEST(ucodepoint_to_utf8,	ascii	)	{
+				char	out[4];
+				/*	Latin	Small	Letter	A,		U+0061	is	a	valid	codepoint	that
+							requires	one	byte	to	encode	in	utf-8.	Below	0x7f,	Unicode
+							and	ASCII	are	identical.	*/
+				size_t	size	=	ucodepoint_to_utf8('a',	&out);
+				EXPECT_EQ(1,	size);
+}
+
+//	-------------------------------------------------------
+//	Test	suite	for	escape_to_ascii()
+//	-------------------------------------------------------
+TEST(escape_to_ascii,	null_input	)	{
+				/*	Should	generate	error	message	if	input	character	pointer	is	NULL.	*/
+				char	output[128];
+				char*	null_ptr	=	(char*)0;
+				Error_Message_Expected();
+				size_t	size	=	escape_to_ascii(	null_ptr,	output,	sizeof(output));
+				EXPECT_EQ(0,	size);
+}
+
+TEST(escape_to_ascii,	null_output	)	{
+				/*	If	output	character	pointer	is	NULL,	still	determine	the	length.	*/
+				char*	null_ptr	=	(char*)0;
+				const	char*	input	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)\n";
+				size_t	expected_size	=	strlen	("e\\u2071\\u1d60	=	cos(\\u03d5)	+	i*sin(\\u03d5)\\n");
+				size_t	size	=	escape_to_ascii(	input,	null_ptr,	size_t(5));
+				EXPECT_EQ(expected_size,	size);
+}
+
+TEST(escape_to_ascii,	normal_1		)	{
+				char	output[128];
+				/*	escape_to_ascii()	should	escape	all	Unicode	and	non-printable	ASCII	characters.	*/
+				const	char*	utf8_s	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)\n";
+				const	char*	expected_ascii_s	=	"e\\u2071\\u1d60	=	cos(\\u03d5)	+	i*sin(\\u03d5)\\n";
+				size_t	size	=	escape_to_ascii(	utf8_s,	output,	sizeof(output));
+				EXPECT_EQ(	strlen(expected_ascii_s),	size);
+				EXPECT_STREQ(expected_ascii_s,	output);
 }
 
-TEST(escape_to_ascii, normal_2  ) {
-    char output[256];
-    /* escape_to_ascii() should escape all Unicode and non-printable ASCII characters. */
-    const char ascii[128] = {       '\x01','\x02','\x03','\x04','\x05','\x06','\x07','\x08','\x09','\x0a','\x0b','\x0c','\x0d','\x0e','\x0f',
-                             '\x10','\x11','\x12','\x13','\x14','\x15','\x16','\x17','\x18','\x19','\x1a','\x1b','\x1c','\x1d','\x1e','\x1f',
-                             '\x20','\x21','\x22','\x23','\x24','\x25','\x26','\x27','\x28','\x29','\x2a','\x2b','\x2c','\x2d','\x2e','\x2f',
-                             '\x30','\x31','\x32','\x33','\x34','\x35','\x36','\x37','\x38','\x39','\x3a','\x3b','\x3c','\x3d','\x3e','\x3f',
-                             '\x40','\x41','\x42','\x43','\x44','\x45','\x46','\x47','\x48','\x49','\x4a','\x4b','\x4c','\x4d','\x4e','\x4f',
-                             '\x50','\x51','\x52','\x53','\x54','\x55','\x56','\x57','\x58','\x59','\x5a','\x5b','\x5c','\x5d','\x5e','\x5f',
-                             '\x60','\x61','\x62','\x63','\x64','\x65','\x66','\x67','\x68','\x69','\x6a','\x6b','\x6c','\x6d','\x6e','\x6f',
-                             '\x70','\x71','\x72','\x73','\x74','\x75','\x76','\x77','\x78','\x79','\x7a','\x7b','\x7c','\x7d','\x7e','\x7f',
-                             '\x00'
-                            };
+TEST(escape_to_ascii,	normal_2		)	{
+				char	output[256];
+				/*	escape_to_ascii()	should	escape	all	Unicode	and	non-printable	ASCII	characters.	*/
+				const	char	ascii[128]	=	{							'\x01','\x02','\x03','\x04','\x05','\x06','\x07','\x08','\x09','\x0a','\x0b','\x0c','\x0d','\x0e','\x0f',
+																													'\x10','\x11','\x12','\x13','\x14','\x15','\x16','\x17','\x18','\x19','\x1a','\x1b','\x1c','\x1d','\x1e','\x1f',
+																													'\x20','\x21','\x22','\x23','\x24','\x25','\x26','\x27','\x28','\x29','\x2a','\x2b','\x2c','\x2d','\x2e','\x2f',
+																													'\x30','\x31','\x32','\x33','\x34','\x35','\x36','\x37','\x38','\x39','\x3a','\x3b','\x3c','\x3d','\x3e','\x3f',
+																													'\x40','\x41','\x42','\x43','\x44','\x45','\x46','\x47','\x48','\x49','\x4a','\x4b','\x4c','\x4d','\x4e','\x4f',
+																													'\x50','\x51','\x52','\x53','\x54','\x55','\x56','\x57','\x58','\x59','\x5a','\x5b','\x5c','\x5d','\x5e','\x5f',
+																													'\x60','\x61','\x62','\x63','\x64','\x65','\x66','\x67','\x68','\x69','\x6a','\x6b','\x6c','\x6d','\x6e','\x6f',
+																													'\x70','\x71','\x72','\x73','\x74','\x75','\x76','\x77','\x78','\x79','\x7a','\x7b','\x7c','\x7d','\x7e','\x7f',
+																													'\x00'
+																												};
 
-    const char* expected_ascii_s = "\\x01\\x02\\x03\\x04\\x05\\x06\\a\\b\\t\\n\\v\\f"
-                                   "\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f"
-                                   " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\x7f";
+				const	char*	expected_ascii_s	=	"\\x01\\x02\\x03\\x04\\x05\\x06\\a\\b\\t\\n\\v\\f"
+																																			"\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f"
+																																			"	!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\x7f";
 
-    size_t size = escape_to_ascii( ascii, output, sizeof(output));
-    EXPECT_EQ(strlen(expected_ascii_s), size);
-    EXPECT_STREQ(expected_ascii_s, output);
+				size_t	size	=	escape_to_ascii(	ascii,	output,	sizeof(output));
+				EXPECT_EQ(strlen(expected_ascii_s),	size);
+				EXPECT_STREQ(expected_ascii_s,	output);
 }
 
-TEST(escape_to_ascii, demotest ) {
-    char output[128];
+TEST(escape_to_ascii,	demotest	)	{
+				char	output[128];
 
-    /* This test simply demonstrates that the following UTF-8 string (utf8_s),
-       used in subsequent tests, is a well formed UTF-8 string. */
+				/*	This	test	simply	demonstrates	that	the	following	UTF-8	string	(utf8_s),
+							used	in	subsequent	tests,	is	a	well	formed	UTF-8	string.	*/
 
-    const char utf8_s[11] = {'P','h','i',' ','=',' ','\xcf','\x95','\0'};
-    const char* expected_ascii_s = "Phi = \\u03d5";
+				const	char	utf8_s[11]	=	{'P','h','i','	','=','	','\xcf','\x95','\0'};
+				const	char*	expected_ascii_s	=	"Phi	=	\\u03d5";
 
-    size_t size = escape_to_ascii( utf8_s, output, sizeof(output));
+				size_t	size	=	escape_to_ascii(	utf8_s,	output,	sizeof(output));
 
-    EXPECT_STREQ(expected_ascii_s, output);
-    EXPECT_EQ(strlen(expected_ascii_s), size);
+				EXPECT_STREQ(expected_ascii_s,	output);
+				EXPECT_EQ(strlen(expected_ascii_s),	size);
 }
 
-TEST(escape_to_ascii, detect_corruption_1 ) {
-    char output[128];
+TEST(escape_to_ascii,	detect_corruption_1	)	{
+				char	output[128];
 
-    /* The input string is deliberately corrupted with a spurious
-       continuation character.*/
+				/*	The	input	string	is	deliberately	corrupted	with	a	spurious
+							continuation	character.*/
 
-    char utf8_s[11] = {'P','h','i',' ','=',' ','\xcf','\x95','\0'};
-    utf8_s[6] = '\x80'; /* Deliberately corrupt the UTF-8 string. */
+				char	utf8_s[11]	=	{'P','h','i','	','=','	','\xcf','\x95','\0'};
+				utf8_s[6]	=	'\x80';	/*	Deliberately	corrupt	the	UTF-8	string.	*/
 
-    Error_Message_Expected();
-    size_t size = escape_to_ascii( utf8_s, output, sizeof(output));
+				Error_Message_Expected();
+				size_t	size	=	escape_to_ascii(	utf8_s,	output,	sizeof(output));
 
-    EXPECT_EQ(0, size);
+				EXPECT_EQ(0,	size);
 }
 
-TEST(escape_to_ascii, detect_corruption_2 ) {
-    char output[128];
+TEST(escape_to_ascii,	detect_corruption_2	)	{
+				char	output[128];
 
-    /* The following string is deliberately corrupted: 0xcf is a header
-       for a two-byte sequence, it should be followed by a continuation
-       byte (most significant 2 bits are 10). 0x75 starts with 01 */
+				/*	The	following	string	is	deliberately	corrupted:	0xcf	is	a	header
+							for	a	two-byte	sequence,	it	should	be	followed	by	a	continuation
+							byte	(most	significant	2	bits	are	10).	0x75	starts	with	01	*/
 
-    char utf8_s[11] = {'P','h','i',' ','=',' ','\xcf','\x95','\0'};
-    utf8_s[7] = '\x75'; /* Deliberately corrupt the UTF-8 string. */
+				char	utf8_s[11]	=	{'P','h','i','	','=','	','\xcf','\x95','\0'};
+				utf8_s[7]	=	'\x75';	/*	Deliberately	corrupt	the	UTF-8	string.	*/
 
-    Error_Message_Expected();
-    size_t size = escape_to_ascii( utf8_s, output, sizeof(output));
+				Error_Message_Expected();
+				size_t	size	=	escape_to_ascii(	utf8_s,	output,	sizeof(output));
 
-    EXPECT_EQ(0, size);
+				EXPECT_EQ(0,	size);
 }
 
-TEST(escape_to_ascii, insufficient_result_array_size ) {
-    char output[16];
+TEST(escape_to_ascii,	insufficient_result_array_size	)	{
+				char	output[16];
 
-    /* If the output array pointer is not NULL, it must be of sufficient size. Here it is not. */
-    const char* utf8_s = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)\n";
-    Error_Message_Expected();
-    size_t size = escape_to_ascii( utf8_s, output, sizeof(output));
-    EXPECT_EQ(0, size);
+				/*	If	the	output	array	pointer	is	not	NULL,	it	must	be	of	sufficient	size.	Here	it	is	not.	*/
+				const	char*	utf8_s	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)\n";
+				Error_Message_Expected();
+				size_t	size	=	escape_to_ascii(	utf8_s,	output,	sizeof(output));
+				EXPECT_EQ(0,	size);
 }
 
-// -------------------------------------------------------
-// Test suite for unescape_to_utf8()
-// -------------------------------------------------------
+//	-------------------------------------------------------
+//	Test	suite	for	unescape_to_utf8()
+//	-------------------------------------------------------
 
-TEST(unescape_to_utf8, null_input ) {
-    /* Should generate error message if input character pointer is NULL. */
-    char output[128];
-    char* null_ptr = (char*)0;
-    Error_Message_Expected();
-    size_t size = unescape_to_utf8( null_ptr, output, sizeof(output));
-    EXPECT_EQ(0, size);
+TEST(unescape_to_utf8,	null_input	)	{
+				/*	Should	generate	error	message	if	input	character	pointer	is	NULL.	*/
+				char	output[128];
+				char*	null_ptr	=	(char*)0;
+				Error_Message_Expected();
+				size_t	size	=	unescape_to_utf8(	null_ptr,	output,	sizeof(output));
+				EXPECT_EQ(0,	size);
 }
 
-TEST(unescape_to_utf8, null_output ) {
-    /* Should return the length of the string that would have been produced. */
-    char* null_ptr = (char*)0;
-    const char* input = "e\\u2071\\u1d60 = cos(\\u03d5) + i*sin(\\u03d5)\\n";
-    size_t expected_size = strlen("e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)\n");
-    size_t size = unescape_to_utf8( input, null_ptr, size_t(5));
-    EXPECT_EQ(expected_size, size);
+TEST(unescape_to_utf8,	null_output	)	{
+				/*	Should	return	the	length	of	the	string	that	would	have	been	produced.	*/
+				char*	null_ptr	=	(char*)0;
+				const	char*	input	=	"e\\u2071\\u1d60	=	cos(\\u03d5)	+	i*sin(\\u03d5)\\n";
+				size_t	expected_size	=	strlen("e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)\n");
+				size_t	size	=	unescape_to_utf8(	input,	null_ptr,	size_t(5));
+				EXPECT_EQ(expected_size,	size);
 }
 
-TEST(unescape_to_utf8, normal_1) {
-    /* unescape_to_utf8() should un-escape all escaped ASCII and escaped unicode,
-       producing a utf8 character string. It should also return the length of
-       that string. */
-    char actual_output[128];
-    const char* input = "e\\u2071\\u1d60 = cos(\\u03d5) + i*sin(\\u03d5)\\n";
-    const char* expected_output = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)\n";
+TEST(unescape_to_utf8,	normal_1)	{
+				/*	unescape_to_utf8()	should	un-escape	all	escaped	ASCII	and	escaped	unicode,
+							producing	a	utf8	character	string.	It	should	also	return	the	length	of
+							that	string.	*/
+				char	actual_output[128];
+				const	char*	input	=	"e\\u2071\\u1d60	=	cos(\\u03d5)	+	i*sin(\\u03d5)\\n";
+				const	char*	expected_output	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)\n";
 
-    size_t size = unescape_to_utf8(input, actual_output, sizeof(actual_output));
+				size_t	size	=	unescape_to_utf8(input,	actual_output,	sizeof(actual_output));
 
-    EXPECT_EQ( strlen(expected_output), size);
-    EXPECT_STREQ(expected_output, actual_output);
+				EXPECT_EQ(	strlen(expected_output),	size);
+				EXPECT_STREQ(expected_output,	actual_output);
 }
 
-TEST(unescape_to_utf8, non_ascii_chars) {
-    char actual_output[128];
-    /* 
+TEST(unescape_to_utf8,	non_ascii_chars)	{
+				char	actual_output[128];
+				/*	
 ???
-     */
-    const char* input = "eⁱᵠ = cos(ϕ) + i*sin(\\u03d5)\\n";
+					*/
+				const	char*	input	=	"eⁱᵠ	=	cos(ϕ)	+	i*sin(\\u03d5)\\n";
 
-    Error_Message_Expected();
-    size_t size = unescape_to_utf8(input, actual_output, sizeof(actual_output));
+				Error_Message_Expected();
+				size_t	size	=	unescape_to_utf8(input,	actual_output,	sizeof(actual_output));
 
-    EXPECT_EQ(30, size);
+				EXPECT_EQ(30,	size);
 }
 
-TEST(unescape_to_utf8, insufficient_hex_digits_1) {
-    /* The \U escape code expects exactly 8 hexidecimal digits to follow.
-       If fewer than 8 are present, then an error message should result.
-       Note: "\U10110" will fail in a C/C++ literal at compile time too,
-       because it is incomplete. It should be "\U00010110".
-     */
-    char actual_output[128];
-    const char* input = "Aegean Number Ten = \\U10110\n";
+TEST(unescape_to_utf8,	insufficient_hex_digits_1)	{
+				/*	The	\U	escape	code	expects	exactly	8	hexidecimal	digits	to	follow.
+							If	fewer	than	8	are	present,	then	an	error	message	should	result.
+							Note:	"\U10110"	will	fail	in	a	C/C++	literal	at	compile	time	too,
+							because	it	is	incomplete.	It	should	be	"\U00010110".
+					*/
+				char	actual_output[128];
+				const	char*	input	=	"Aegean	Number	Ten	=	\\U10110\n";
 
-    Error_Message_Expected();
-    size_t size = unescape_to_utf8(input, actual_output, sizeof(actual_output));
+				Error_Message_Expected();
+				size_t	size	=	unescape_to_utf8(input,	actual_output,	sizeof(actual_output));
 
-    EXPECT_EQ(0, size);
+				EXPECT_EQ(0,	size);
 }
 
-TEST(unescape_to_utf8, insufficient_hex_digits_2) {
-    /* The \u escape code expects exactly 4 hexidecimal digits to follow.
-       If fewer than 4 are present, then an error message should result.
-       Note: "\u3d5" will fail in a C/C++ literal at compile time too,
-       because it is incomplete. It should be "\u03d5".
-     */
-    char actual_output[128];
-    const char* input = "Phi = \\u3d5\n";
+TEST(unescape_to_utf8,	insufficient_hex_digits_2)	{
+				/*	The	\u	escape	code	expects	exactly	4	hexidecimal	digits	to	follow.
+							If	fewer	than	4	are	present,	then	an	error	message	should	result.
+							Note:	"\u3d5"	will	fail	in	a	C/C++	literal	at	compile	time	too,
+							because	it	is	incomplete.	It	should	be	"\u03d5".
+					*/
+				char	actual_output[128];
+				const	char*	input	=	"Phi	=	\\u3d5\n";
 
-    Error_Message_Expected();
-    size_t size = unescape_to_utf8(input, actual_output, sizeof(actual_output));
+				Error_Message_Expected();
+				size_t	size	=	unescape_to_utf8(input,	actual_output,	sizeof(actual_output));
 
-    EXPECT_EQ(0, size);
+				EXPECT_EQ(0,	size);
 }
 
-TEST(unescape_to_utf8, insufficient_result_array_size) {
-    /* The result array must be of sufficient size. If it isn't, then an error
-       message should be emitted.
-     */
-    char actual_output[16];
-    const char* input = "e\\u2071\\u1d60 = cos(\\u03d5) + i*sin(\\u03d5)\\n";
+TEST(unescape_to_utf8,	insufficient_result_array_size)	{
+				/*	The	result	array	must	be	of	sufficient	size.	If	it	isn't,	then	an	error
+							message	should	be	emitted.
+					*/
+				char	actual_output[16];
+				const	char*	input	=	"e\\u2071\\u1d60	=	cos(\\u03d5)	+	i*sin(\\u03d5)\\n";
 
-    Error_Message_Expected();
-    size_t size = unescape_to_utf8(input, actual_output, sizeof(actual_output));
+				Error_Message_Expected();
+				size_t	size	=	unescape_to_utf8(input,	actual_output,	sizeof(actual_output));
 
-    EXPECT_EQ(0, size);
+				EXPECT_EQ(0,	size);
 }
 
-// -------------------------------------------------------
-// Test suite for utf8_to_wchar()
-// -------------------------------------------------------
-TEST(utf8_to_wchar, null_input ) {
-    /* Should generate error message if input character pointer is NULL. */
-    wchar_t output[128];
-    char* null_ptr = (char*)0;
-    Error_Message_Expected();
-    size_t size = utf8_to_wchar( null_ptr, output, sizeof(output)/sizeof(wchar_t)); 
-    EXPECT_EQ(0, size);
+//	-------------------------------------------------------
+//	Test	suite	for	utf8_to_wchar()
+//	-------------------------------------------------------
+TEST(utf8_to_wchar,	null_input	)	{
+				/*	Should	generate	error	message	if	input	character	pointer	is	NULL.	*/
+				wchar_t	output[128];
+				char*	null_ptr	=	(char*)0;
+				Error_Message_Expected();
+				size_t	size	=	utf8_to_wchar(	null_ptr,	output,	sizeof(output)/sizeof(wchar_t));	
+				EXPECT_EQ(0,	size);
 }
 
-TEST(utf8_to_wchar, null_output ) {
-    /* Should return the length of the string that would have been produced. */
-    wchar_t* null_ptr = (wchar_t*)0;
-    const char* input = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)";
-    size_t expected_size = wcslen(L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)");
-    size_t size = utf8_to_wchar( input, null_ptr, size_t(0));
-    EXPECT_EQ(expected_size, size);
+TEST(utf8_to_wchar,	null_output	)	{
+				/*	Should	return	the	length	of	the	string	that	would	have	been	produced.	*/
+				wchar_t*	null_ptr	=	(wchar_t*)0;
+				const	char*	input	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)";
+				size_t	expected_size	=	wcslen(L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)");
+				size_t	size	=	utf8_to_wchar(	input,	null_ptr,	size_t(0));
+				EXPECT_EQ(expected_size,	size);
 }
 
-/* The following three tests demonstrate three different ways to
-   create the same input string. */
+/*	The	following	three	tests	demonstrate	three	different	ways	to
+			create	the	same	input	string.	*/
 
-TEST(utf8_to_wchar, test1) {
-    wchar_t resultant_wchar_s[128];
-    const char* input = "eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
-    const wchar_t* expected_wide_s = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(utf8_to_wchar,	test1)	{
+				wchar_t	resultant_wchar_s[128];
+				const	char*	input	=	"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
+				const	wchar_t*	expected_wide_s	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    (void) utf8_to_wchar(input, resultant_wchar_s, sizeof(resultant_wchar_s)/sizeof(wchar_t)); 
-    bool test_result = (wcscmp(expected_wide_s, expected_wide_s) == 0);
-    EXPECT_EQ(true, test_result);
+				(void)	utf8_to_wchar(input,	resultant_wchar_s,	sizeof(resultant_wchar_s)/sizeof(wchar_t));	
+				bool	test_result	=	(wcscmp(expected_wide_s,	expected_wide_s)	==	0);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST(utf8_to_wchar, test2) {
-    wchar_t resultant_wchar_s[128];
-    const char* input = "e\u2071\u1d60 = cos(\u03d5) + i*sin(\u03d5)";
-    const wchar_t* expected_wide_s = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(utf8_to_wchar,	test2)	{
+				wchar_t	resultant_wchar_s[128];
+				const	char*	input	=	"e\u2071\u1d60	=	cos(\u03d5)	+	i*sin(\u03d5)";
+				const	wchar_t*	expected_wide_s	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    (void) utf8_to_wchar(input, resultant_wchar_s, sizeof(resultant_wchar_s)/sizeof(wchar_t)); 
-    bool test_result = (wcscmp(expected_wide_s, expected_wide_s) == 0);
-    EXPECT_EQ(true, test_result);
+				(void)	utf8_to_wchar(input,	resultant_wchar_s,	sizeof(resultant_wchar_s)/sizeof(wchar_t));	
+				bool	test_result	=	(wcscmp(expected_wide_s,	expected_wide_s)	==	0);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST(utf8_to_wchar, test3) {
-    wchar_t resultant_wchar_s[128];
-    const char input[30] = {'e','\xe2','\x81','\xb1','\xe1','\xb5','\xa0',' ','=',' ',
-                            'c','o','s','(','\xcf','\x95',')',' ','+',' ','i','*','s',
-                            'i','n','(','\xcf','\x95',')','\0'};
-    const wchar_t* expected_wide_s = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(utf8_to_wchar,	test3)	{
+				wchar_t	resultant_wchar_s[128];
+				const	char	input[30]	=	{'e','\xe2','\x81','\xb1','\xe1','\xb5','\xa0','	','=','	',
+																												'c','o','s','(','\xcf','\x95',')','	','+','	','i','*','s',
+																												'i','n','(','\xcf','\x95',')','\0'};
+				const	wchar_t*	expected_wide_s	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    (void) utf8_to_wchar(input, resultant_wchar_s, sizeof(resultant_wchar_s)/sizeof(wchar_t)); 
-    bool test_result = (wcscmp(expected_wide_s, expected_wide_s) == 0);
-    EXPECT_EQ(true, test_result);
+				(void)	utf8_to_wchar(input,	resultant_wchar_s,	sizeof(resultant_wchar_s)/sizeof(wchar_t));	
+				bool	test_result	=	(wcscmp(expected_wide_s,	expected_wide_s)	==	0);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST(utf8_to_wchar, insufficient_result_array_size) {
-    wchar_t resultant_wchar_s[16];
-    const char* input = "eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(utf8_to_wchar,	insufficient_result_array_size)	{
+				wchar_t	resultant_wchar_s[16];
+				const	char*	input	=	"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    Error_Message_Expected();
-    size_t size = utf8_to_wchar(input, resultant_wchar_s, sizeof(resultant_wchar_s)/sizeof(wchar_t)); 
-    EXPECT_EQ(0, size);
+				Error_Message_Expected();
+				size_t	size	=	utf8_to_wchar(input,	resultant_wchar_s,	sizeof(resultant_wchar_s)/sizeof(wchar_t));	
+				EXPECT_EQ(0,	size);
 }
 
-TEST(utf8_to_wchar, corrupted_input) {
-    wchar_t resultant_wchar_s[128];
-    char input[30] = {'e','\xe2','\x81','\xb1','\xe1','\xb5','\xa0',' ','=',' ',
-                      'c','o','s','(','\xcf','\x95',')',' ','+',' ','i','*','s',
-                      'i','n','(','\xcf','\x95',')','\0'};
+TEST(utf8_to_wchar,	corrupted_input)	{
+				wchar_t	resultant_wchar_s[128];
+				char	input[30]	=	{'e','\xe2','\x81','\xb1','\xe1','\xb5','\xa0','	','=','	',
+																						'c','o','s','(','\xcf','\x95',')','	','+','	','i','*','s',
+																						'i','n','(','\xcf','\x95',')','\0'};
 
-    /* Deliberately corrupt input by changing input[2] to not being a continuation byte. */
-    input[2] = 0x70;
+				/*	Deliberately	corrupt	input	by	changing	input[2]	to	not	being	a	continuation	byte.	*/
+				input[2]	=	0x70;
 
-    Error_Message_Expected();
-    size_t size = utf8_to_wchar(input, resultant_wchar_s, sizeof(resultant_wchar_s)/sizeof(wchar_t)); 
-    EXPECT_EQ(0, size);
+				Error_Message_Expected();
+				size_t	size	=	utf8_to_wchar(input,	resultant_wchar_s,	sizeof(resultant_wchar_s)/sizeof(wchar_t));	
+				EXPECT_EQ(0,	size);
 }
 
-// -------------------------------------------------------
-// Test suite for wchar_to_utf8()
-// -------------------------------------------------------
-TEST(wchar_to_utf8, null_input ) {
-    /* Should generate error message if input character pointer is NULL. */
-    wchar_t* null_ptr = (wchar_t*)0;
-    char output[128];
-    Error_Message_Expected();
-    size_t size = wchar_to_utf8( null_ptr, output, sizeof(output)/sizeof(wchar_t)); 
-    EXPECT_EQ(0, size);
+//	-------------------------------------------------------
+//	Test	suite	for	wchar_to_utf8()
+//	-------------------------------------------------------
+TEST(wchar_to_utf8,	null_input	)	{
+				/*	Should	generate	error	message	if	input	character	pointer	is	NULL.	*/
+				wchar_t*	null_ptr	=	(wchar_t*)0;
+				char	output[128];
+				Error_Message_Expected();
+				size_t	size	=	wchar_to_utf8(	null_ptr,	output,	sizeof(output)/sizeof(wchar_t));	
+				EXPECT_EQ(0,	size);
 }
 
-TEST(wchar_to_utf8, null_output ) {
-    /* If output is NULL, still generate the length of the array that would have been produced. */
-    const wchar_t* input = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
-    char* null_ptr = (char*)0;
-    size_t expected_size = strlen("eⁱᵠ = cos(ϕ) + i*sin(ϕ)");
-    size_t size = wchar_to_utf8( input, null_ptr, (size_t)0); 
-    EXPECT_EQ(expected_size, size);
+TEST(wchar_to_utf8,	null_output	)	{
+				/*	If	output	is	NULL,	still	generate	the	length	of	the	array	that	would	have	been	produced.	*/
+				const	wchar_t*	input	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
+				char*	null_ptr	=	(char*)0;
+				size_t	expected_size	=	strlen("eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)");
+				size_t	size	=	wchar_to_utf8(	input,	null_ptr,	(size_t)0);	
+				EXPECT_EQ(expected_size,	size);
 }
 
-TEST(wchar_to_utf8, test1) {
-    /* Should convert wchar_t array to a UTF-8 array. */
-    char resultant_utf8_s[128];
-    const wchar_t* wide_s = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
-    const char* expected_utf8_s = "eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(wchar_to_utf8,	test1)	{
+				/*	Should	convert	wchar_t	array	to	a	UTF-8	array.	*/
+				char	resultant_utf8_s[128];
+				const	wchar_t*	wide_s	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
+				const	char*	expected_utf8_s	=	"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    wchar_to_utf8(wide_s, resultant_utf8_s, sizeof(resultant_utf8_s)/sizeof(char)); 
-    bool test_result = (strcmp(expected_utf8_s, resultant_utf8_s) == 0);
-    EXPECT_EQ(true, test_result);
+				wchar_to_utf8(wide_s,	resultant_utf8_s,	sizeof(resultant_utf8_s)/sizeof(char));	
+				bool	test_result	=	(strcmp(expected_utf8_s,	resultant_utf8_s)	==	0);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST(wchar_to_utf8, test2) {
-    /* Same test as above, but input is a constrained array. A variant fo this is used below.*/
-    char resultant_utf8_s[128];
-    wchar_t wide_s[32] = { L'e', L'ⁱ', L'ᵠ', L' ', L'=', L' ', L'c', L'o', L's', L'(', L'ϕ', L')',
-                           L' ', L'+', L' ', L'i', L'*', L's', L'i', L'n', L'(', L'ϕ', L')' };
-    const char* expected_utf8_s = "eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+TEST(wchar_to_utf8,	test2)	{
+				/*	Same	test	as	above,	but	input	is	a	constrained	array.	A	variant	fo	this	is	used	below.*/
+				char	resultant_utf8_s[128];
+				wchar_t	wide_s[32]	=	{	L'e',	L'ⁱ',	L'ᵠ',	L'	',	L'=',	L'	',	L'c',	L'o',	L's',	L'(',	L'ϕ',	L')',
+																											L'	',	L'+',	L'	',	L'i',	L'*',	L's',	L'i',	L'n',	L'(',	L'ϕ',	L')'	};
+				const	char*	expected_utf8_s	=	"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    wchar_to_utf8(wide_s, resultant_utf8_s, sizeof(resultant_utf8_s)/sizeof(char)); 
-    bool test_result = (strcmp(expected_utf8_s, resultant_utf8_s) == 0);
-    EXPECT_EQ(true, test_result);
+				wchar_to_utf8(wide_s,	resultant_utf8_s,	sizeof(resultant_utf8_s)/sizeof(char));	
+				bool	test_result	=	(strcmp(expected_utf8_s,	resultant_utf8_s)	==	0);
+				EXPECT_EQ(true,	test_result);
 }
 
-TEST(wchar_to_utf8, invalid_unicode) {
-    /* Should detect an invalid unicode codepoint. */
-    char resultant_utf8_s[128];
-    wchar_t wide_s[32] = { L'e', L'ⁱ', L'ᵠ', L' ', L'=', L' ', L'c', L'o', L's', L'(', L'ϕ', L')',
-                           L' ', L'+', L' ', L'i', L'*', L's', L'i', L'n', L'(', L'ϕ', L')' };
-    wide_s[14] = (wchar_t)0x110000;
-    Error_Message_Expected();
-    size_t size = wchar_to_utf8(wide_s, resultant_utf8_s, sizeof(resultant_utf8_s)/sizeof(char)); 
-    EXPECT_EQ(0, size);
+TEST(wchar_to_utf8,	invalid_unicode)	{
+				/*	Should	detect	an	invalid	unicode	codepoint.	*/
+				char	resultant_utf8_s[128];
+				wchar_t	wide_s[32]	=	{	L'e',	L'ⁱ',	L'ᵠ',	L'	',	L'=',	L'	',	L'c',	L'o',	L's',	L'(',	L'ϕ',	L')',
+																											L'	',	L'+',	L'	',	L'i',	L'*',	L's',	L'i',	L'n',	L'(',	L'ϕ',	L')'	};
+				wide_s[14]	=	(wchar_t)0x110000;
+				Error_Message_Expected();
+				size_t	size	=	wchar_to_utf8(wide_s,	resultant_utf8_s,	sizeof(resultant_utf8_s)/sizeof(char));	
+				EXPECT_EQ(0,	size);
 }
 
-TEST(wchar_to_utf8, insufficient_result_array_size) {
+TEST(wchar_to_utf8,	insufficient_result_array_size)	{
 
-    char resultant_utf8_s[16];
-    const wchar_t* wide_s = L"eⁱᵠ = cos(ϕ) + i*sin(ϕ)";
+				char	resultant_utf8_s[16];
+				const	wchar_t*	wide_s	=	L"eⁱᵠ	=	cos(ϕ)	+	i*sin(ϕ)";
 
-    Error_Message_Expected();
-    size_t size = wchar_to_utf8(wide_s, resultant_utf8_s, sizeof(resultant_utf8_s)/sizeof(char)); 
-    EXPECT_EQ(0, size);
+				Error_Message_Expected();
+				size_t	size	=	wchar_to_utf8(wide_s,	resultant_utf8_s,	sizeof(resultant_utf8_s)/sizeof(char));	
+				EXPECT_EQ(0,	size);
 }
diff --git a/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp b/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
index 120aa4ecc..38488f88d 100644
--- a/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
+++ b/trick_source/trick_utils/units/Unittest/unit_cpp_test.cpp
@@ -1,565 +1,565 @@
-#include <stdio.h>
-#include <math.h>
-#include <iostream>
-#include "Unit.hh"
+#include	<stdio.h>
+#include	<math.h>
+#include	<iostream>
+#include	"Unit.hh"
 
-using namespace std;
+using	namespace	std;
 
-// GLOBAL
-int test_number = 0;
-int n_failures = 0;
+//	GLOBAL
+int	test_number	=	0;
+int	n_failures	=	0;
 
-#define TOLERANCE 0.00001
+#define	TOLERANCE	0.00001
 
-int pretty_close (double a, double b) {
-     int close = 1;;
+int	pretty_close	(double	a,	double	b)	{
+					int	close	=	1;;
 
-     if ( fabs(a + b) > TOLERANCE ) {
-	  if ( ( ( 2.0 * fabs(a-b)) / fabs(a+b)) > TOLERANCE )  {
-	       return 0;
-	  }
-     }
-     return close;
+					if	(	fabs(a	+	b)	>	TOLERANCE	)	{
+			if	(	(	(	2.0	*	fabs(a-b))	/	fabs(a+b))	>	TOLERANCE	)		{
+								return	0;
+			}
+					}
+					return	close;
 }
 
 
-void validate_conv_fn (Unit *u1, Unit *u2, double c1, double c0) {
-     UCFn *cf;
+void	validate_conv_fn	(Unit	*u1,	Unit	*u2,	double	c1,	double	c0)	{
+					UCFn	*cf;
 
-     test_number ++;
-     cout << "TEST " << test_number << ":" << endl;
-     cout << "expecting {" << c1 << "," << c0 << "}" << endl;
-     cf  = u1->Conversion_to(u2);
-     cout << "Conversion function: " << cf << endl;
+					test_number	++;
+					cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+					cout	<<	"expecting	{"	<<	c1	<<	","	<<	c0	<<	"}"	<<	endl;
+					cf		=	u1->Conversion_to(u2);
+					cout	<<	"Conversion	function:	"	<<	cf	<<	endl;
 
-     if ( ( pretty_close(c0, cf->C[0] )) &&
-	  ( pretty_close(c1, cf->C[1]))) {
-	  cout << "RESULT: PASS" << endl;
-     } else {
-	  cout << "RESULT: FAIL" << endl;
-         n_failures++ ;
-     }
+					if	(	(	pretty_close(c0,	cf->C[0]	))	&&
+			(	pretty_close(c1,	cf->C[1])))	{
+			cout	<<	"RESULT:	PASS"	<<	endl;
+					}	else	{
+			cout	<<	"RESULT:	FAIL"	<<	endl;
+									n_failures++	;
+					}
 
-     delete cf;
+					delete	cf;
 }
 
 
-void test_conversion ( Unit *u1, Unit *u2) {
-     UCFn *cf;
-
-     test_number ++;
-     try {
-	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Try " << u1 << " to " << u2 << endl;
-	  cf  = u1->Conversion_to(u2);
-	  cout << "Conversion function: " << cf << endl;
-	  delete cf;
-	  cout << "RESULT: PASS." << endl << endl;
-     } catch (Unit::CONVERSION_ERROR) {
-	  cout << "RESULT: FAIL." << endl <<endl;
-         n_failures++ ;
-     }
+void	test_conversion	(	Unit	*u1,	Unit	*u2)	{
+					UCFn	*cf;
+
+					test_number	++;
+					try	{
+			cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+			cout	<<	"Try	"	<<	u1	<<	"	to	"	<<	u2	<<	endl;
+			cf		=	u1->Conversion_to(u2);
+			cout	<<	"Conversion	function:	"	<<	cf	<<	endl;
+			delete	cf;
+			cout	<<	"RESULT:	PASS."	<<	endl	<<	endl;
+					}	catch	(Unit::CONVERSION_ERROR)	{
+			cout	<<	"RESULT:	FAIL."	<<	endl	<<endl;
+									n_failures++	;
+					}
 }
 
-void test_conversion_exception ( Unit *u1, Unit *u2) {
-     UCFn *cf;
-
-     test_number ++;
-     try {
-	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Try " << u1 << " to " << u2 << " (We expect an exception)" << endl;
-	  cf  = u1->Conversion_to(u2);
-	  cout << "Conversion function: " << cf << endl;
-	  delete cf;
-	  cout << "RESULT: FAIL." << endl << endl;
-         n_failures++ ;
-     } catch (Unit::CONVERSION_ERROR) {
-	  cout << "RESULT: PASS." << endl << endl;
-     }
+void	test_conversion_exception	(	Unit	*u1,	Unit	*u2)	{
+					UCFn	*cf;
+
+					test_number	++;
+					try	{
+			cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+			cout	<<	"Try	"	<<	u1	<<	"	to	"	<<	u2	<<	"	(We	expect	an	exception)"	<<	endl;
+			cf		=	u1->Conversion_to(u2);
+			cout	<<	"Conversion	function:	"	<<	cf	<<	endl;
+			delete	cf;
+			cout	<<	"RESULT:	FAIL."	<<	endl	<<	endl;
+									n_failures++	;
+					}	catch	(Unit::CONVERSION_ERROR)	{
+			cout	<<	"RESULT:	PASS."	<<	endl	<<	endl;
+					}
 }
 
-void test_unit_creation (const char *u_str) {
-     Unit * u;
-
-     test_number ++;
-     try {
-	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Attempt to create a Unit \"" << u_str << "\"" << endl;
-	  u = new Unit(u_str);
-	  cout << u << endl;
-	  delete u;
-	  cout << "RESULT: PASS." << endl << endl;
-     } catch (Unit::CONVERSION_ERROR) {
-	  cout << "RESULT: FAIL." << endl << endl;
-         n_failures++ ;
-     }
+void	test_unit_creation	(const	char	*u_str)	{
+					Unit	*	u;
+
+					test_number	++;
+					try	{
+			cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+			cout	<<	"Attempt	to	create	a	Unit	\""	<<	u_str	<<	"\""	<<	endl;
+			u	=	new	Unit(u_str);
+			cout	<<	u	<<	endl;
+			delete	u;
+			cout	<<	"RESULT:	PASS."	<<	endl	<<	endl;
+					}	catch	(Unit::CONVERSION_ERROR)	{
+			cout	<<	"RESULT:	FAIL."	<<	endl	<<	endl;
+									n_failures++	;
+					}
 }
 
-void test_unit_exception (const char *u_str) {
-     Unit * u;
-
-     test_number ++;
-     try {
-	  cout << "TEST " << test_number << ":" << endl;
-	  cout << "Attempt to create a Unit \"" << u_str << "\"" << "(We expect a an exception.)" << endl;
-	  u = new Unit(u_str);
-	  cout << u << endl;
-	  delete u;
-	  cout << "RESULT: FAIL." << endl << endl;
-         n_failures++ ;
-     } catch (Unit::CONVERSION_ERROR) {
-	  cout << "RESULT: PASS." << endl << endl;
-     }
+void	test_unit_exception	(const	char	*u_str)	{
+					Unit	*	u;
+
+					test_number	++;
+					try	{
+			cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+			cout	<<	"Attempt	to	create	a	Unit	\""	<<	u_str	<<	"\""	<<	"(We	expect	a	an	exception.)"	<<	endl;
+			u	=	new	Unit(u_str);
+			cout	<<	u	<<	endl;
+			delete	u;
+			cout	<<	"RESULT:	FAIL."	<<	endl	<<	endl;
+									n_failures++	;
+					}	catch	(Unit::CONVERSION_ERROR)	{
+			cout	<<	"RESULT:	PASS."	<<	endl	<<	endl;
+					}
 }
 
 
-int main (int argc, char * argv[] ) {
-
-cout << "==================================================================================." << endl;
-cout << "Test Suite for the \"C++\" Language Interface to the Trick Unit Conversion Package." << endl;
-cout << "==================================================================================." << endl;
-
-     cout << endl << "TIME CONVERSIONS:" << endl;
-     {
-	  Unit *Second  = new Unit("s");
-	  Unit *Minute  = new Unit("min");
-	  Unit *Hour    = new Unit("hr");
-	  Unit *Day     = new Unit("day");
-
-	  validate_conv_fn (Second ,Second,                            1.0, 0.0 );
-	  validate_conv_fn (Second ,Minute,                     (1.0/60.0), 0.0 );
-	  validate_conv_fn (Second ,Hour,                (1.0/(60.0*60.0)), 0.0 );
-	  validate_conv_fn (Second ,Day,            (1.0/(60.0*60.0*24.0)), 0.0 );
-
-	  validate_conv_fn (Minute, Second,                           60.0, 0.0 );
-	  validate_conv_fn (Hour,   Second,                         3600.0, 0.0 );
-	  validate_conv_fn (Day,    Second,                        86400.0, 0.0 );
-     }
-
-     cout << endl << "LENGTH CONVERSIONS:" << endl;
-     {
-	  Unit *Meter          = new Unit("m");
-	  Unit *Foot           = new Unit("ft");
-	  Unit *Inch           = new Unit("in");
-	  Unit *Millimeter     = new Unit("mm");
-	  Unit *Centimeter     = new Unit("cm");
-	  Unit *Kilometer      = new Unit("km");
-	  Unit *Yard           = new Unit("yd");
-	  Unit *Mile           = new Unit("mi");
-	  Unit *Nautical_Mile  = new Unit("n.m.");
-	  Unit *Kilofoot       = new Unit("kft");
-
-	  validate_conv_fn (Meter ,Meter,                                1.0, 0.0 );
-	  validate_conv_fn (Meter ,Foot,                             3.28084, 0.0 );
-	  validate_conv_fn (Meter ,Inch,                             39.3701, 0.0 );
-	  validate_conv_fn (Meter ,Millimeter,                        1000.0, 0.0 );
-	  validate_conv_fn (Meter ,Centimeter,                         100.0, 0.0 );
-	  validate_conv_fn (Meter ,Kilometer,                          0.001, 0.0 );
-	  validate_conv_fn (Meter ,Yard,                             1.09361, 0.0 );
-	  validate_conv_fn (Meter ,Mile,                      (1.0/1609.344), 0.0 );
-	  validate_conv_fn (Meter ,Nautical_Mile,               (1.0/1852.0), 0.0 );
-	  validate_conv_fn (Meter ,Kilofoot,                (3.28084/1000.0), 0.0 );
-
-	  validate_conv_fn (Foot ,Inch,                                  12.0, 0.0);
-	  validate_conv_fn (Yard ,Foot,                                   3.0, 0.0);
-	  validate_conv_fn (Yard ,Inch,                                  36.0, 0.0);
-	  validate_conv_fn (Mile ,Foot,                                5280.0, 0.0);
-	  validate_conv_fn (Nautical_Mile ,Foot,                   6076.11549, 0.0);
-	  validate_conv_fn (Kilofoot ,Foot,                            1000.0, 0.0);
-
-     }
-
-     cout << endl << "ANGLE CONVERSIONS:" << endl;
-     {
-	  Unit *Radian      = new Unit("r");
-	  Unit *Degree      = new Unit("d");
-	  Unit *ArcSecond   = new Unit("as");
-	  Unit *ArcMinute   = new Unit("am");
-	  Unit *Revolution  = new Unit("rev");
-	  Unit *Milliradian = new Unit("mr");
-
-#define PI 3.14159265
-
-	  validate_conv_fn (Radian, Radian,                               1.0, 0.0);
-	  validate_conv_fn (Radian, Degree,                        (180.0/PI), 0.0);
-	  validate_conv_fn (Radian, ArcSecond,           (180.0*60.0*60.0/PI), 0.0);
-	  validate_conv_fn (Radian, ArcMinute,                (180.0*60.0/PI), 0.0);
-	  validate_conv_fn (Radian, Revolution,                (1.0/(2.0*PI)), 0.0);
-	  validate_conv_fn (Radian, Milliradian,                       1000.0, 0.0);
-
-	  validate_conv_fn (Revolution, Degree,                         360.0, 0.0);
-	  validate_conv_fn (Revolution, Radian,                      (2.0*PI), 0.0);
-	  validate_conv_fn (ArcMinute,  Degree,                    (1.0/60.0), 0.0);
-	  validate_conv_fn (ArcSecond,  Degree,                  (1.0/3600.0), 0.0);
-     }
-
-     cout << endl << "MASS CONVERSIONS:" << endl;
-     {
-	  Unit *Kilogram      = new Unit("kg");
-	  Unit *Slug          = new Unit("sl");
-	  Unit *PoundMass     = new Unit("lbm");
-	  Unit *Gram          = new Unit("g");
-	  Unit *MetricTon     = new Unit("mt");
-
-	  validate_conv_fn (Kilogram, Kilogram,                           1.0, 0.0);
-	  validate_conv_fn (Kilogram, Slug,                   (1.0/14.593902), 0.0);
-	  validate_conv_fn (Kilogram, PoundMass,                   2.20462262, 0.0);
-	  validate_conv_fn (Kilogram, Gram,                            1000.0, 0.0);
-	  validate_conv_fn (Kilogram, MetricTon,                 (1.0/1000.0), 0.0);
-
-	  validate_conv_fn (MetricTon, Kilogram,                       1000.0, 0.0);
-     }
-
-     cout << endl << "FORCE CONVERSIONS:" << endl;
-     {
-	  Unit *Newton     = new Unit("N");
-	  Unit *KiloNewton = new Unit("kN");
-	  Unit *Ounce      = new Unit("oz");
-	  Unit *PoundForce = new Unit("lbf");
-
-	  validate_conv_fn (Newton, Newton,                               1.0, 0.0);
-	  validate_conv_fn (Newton, KiloNewton,                         0.001, 0.0);
-	  validate_conv_fn (Newton, Ounce,                   (16.0/4.4482216), 0.0);
-	  validate_conv_fn (Newton, PoundForce,                     (1/4.4482216), 0.0);
-     }
-
-     cout << endl << "VOLTAGE CONVERSIONS:" << endl;
-     {
-	  Unit *Volt      = new Unit("v");
-	  Unit *KiloVolt  = new Unit("kv");
-
-	  validate_conv_fn (Volt, Volt,                                   1.0, 0.0);
-	  validate_conv_fn (Volt, KiloVolt,                             0.001, 0.0);
-     }
-
-     cout << endl << "CURRENT CONVERSIONS:" << endl;
-     {
-	  Unit *Ampere       = new Unit("amp");
-	  Unit *MilliAmpere  = new Unit("mamp");
-
-	  validate_conv_fn (Ampere, Ampere,                               1.0, 0.0);
-	  validate_conv_fn (Ampere, MilliAmpere,                       1000.0, 0.0);
-     }
-
-     cout << endl << "UNITLESS CONVERSIONS:" << endl;
-     {
-	  Unit *DoubleDash = new Unit("--");
-	  Unit *Count      = new Unit("cnt");
-	  Unit *One        = new Unit("one");
-
-	  validate_conv_fn (DoubleDash, DoubleDash,                       1.0, 0.0);
-	  validate_conv_fn (DoubleDash, Count,                            1.0, 0.0);
-	  validate_conv_fn (DoubleDash, One,                              1.0, 0.0);
-
-     }
-
-     cout << endl << "FREQUENCY CONVERSIONS:" << endl;
-     {
-      	  Unit *Hz  = new Unit("Hz");
-	  Unit *Mhz = new Unit("Mhz");
-	  Unit *Ghz = new Unit("Ghz");
-
-	  validate_conv_fn (Hertz, Hertz,				  1.0,  0.0);
-	  validate_conv_fn (Hertz, MegaHertz, 				  1000000,  0.0);
-	  validate_conv_fn (Hertz, GigaHertz, 				  1000000000, 0.0);
-     }
-
-// Note: Issue E..4-187 no longer allows the dubious "default units" interpretation
-// of double-dash. Yeah!
-
-     cout << endl << "PRIMITIVE TEMPERATURE CONVERSIONS:" << endl;
-     {
-	  double C_val, F_val, K_val, R_val;
-
-	  Unit *Deg_Celsius    = new Unit("C");
-	  cout << "new Unit = " << Deg_Celsius << endl;
-	  Unit *Deg_Kelvin     = new Unit("K");
-	  cout << "new Unit = " << Deg_Kelvin << endl;
-	  Unit *Deg_Fahrenheit = new Unit("F");
-	  cout << "new Unit = " << Deg_Fahrenheit << endl;
-	  Unit *Deg_Rankine    = new Unit("R");
-	  cout << "new Unit = " << Deg_Rankine << endl << endl;
-
-	  test_conversion (Deg_Celsius ,Deg_Kelvin );
-	  test_conversion (Deg_Celsius ,Deg_Fahrenheit );
-	  test_conversion (Deg_Celsius ,Deg_Rankine );
-	  test_conversion (Deg_Kelvin  ,Deg_Celsius );
-	  test_conversion (Deg_Kelvin  ,Deg_Fahrenheit );
-	  test_conversion (Deg_Kelvin  ,Deg_Rankine );
-	  test_conversion (Deg_Rankine ,Deg_Celsius );
-	  test_conversion (Deg_Rankine ,Deg_Kelvin );
-	  test_conversion (Deg_Rankine ,Deg_Fahrenheit );
-
-	  cout << "TEST " << test_number << ":  0 Celsius" << endl;
-	  test_number ++;
-	  C_val = 0.0;
-	  F_val = Deg_Celsius->Convert_to(C_val, "F");
-	  K_val = Deg_Celsius->Convert_to(C_val, "K");
-	  R_val = Deg_Celsius->Convert_to(C_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 0 Kelvin" << endl;
-	  test_number ++;
-	  K_val = 0.0;
-	  F_val = Deg_Kelvin->Convert_to(K_val, "F");
-	  C_val = Deg_Kelvin->Convert_to(K_val, "C");
-	  R_val = Deg_Kelvin->Convert_to(K_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 0 Fahrenheit" << endl;
-	  test_number ++;
-	  F_val = 0.0;
-	  K_val = Deg_Fahrenheit->Convert_to(F_val, "K");
-	  C_val = Deg_Fahrenheit->Convert_to(F_val, "C");
-	  R_val = Deg_Fahrenheit->Convert_to(F_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 0 Rankine" << endl;
-	  test_number ++;
-	  R_val = 0.0;
-	  K_val = Deg_Rankine->Convert_to(R_val, "K");
-	  C_val = Deg_Rankine->Convert_to(R_val, "C");
-	  F_val = Deg_Rankine->Convert_to(R_val, "F");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "AVERAGE HUMAN BODY TEMPERATURE" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 36.8 Celsius" << endl;
-	  test_number ++;
-	  C_val = 36.8;
-	  F_val = Deg_Celsius->Convert_to(C_val, "F");
-	  K_val = Deg_Celsius->Convert_to(C_val, "K");
-	  R_val = Deg_Celsius->Convert_to(C_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 310.0 Kelvin" << endl;
-	  test_number ++;
-	  K_val = 310.0;
-	  F_val = Deg_Kelvin->Convert_to(K_val, "F");
-	  C_val = Deg_Kelvin->Convert_to(K_val, "C");
-	  R_val = Deg_Kelvin->Convert_to(K_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 98.2 Fahrenheit" << endl;
-	  test_number ++;
-	  F_val = 98.2;
-	  K_val = Deg_Fahrenheit->Convert_to(F_val, "K");
-	  C_val = Deg_Fahrenheit->Convert_to(F_val, "C");
-	  R_val = Deg_Fahrenheit->Convert_to(F_val, "R");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  cout << "TEST " << test_number << ": 557.9 Rankine" << endl;
-	  test_number ++;
-	  R_val = 557.9;
-	  K_val = Deg_Rankine->Convert_to(R_val, "K");
-	  C_val = Deg_Rankine->Convert_to(R_val, "C");
-	  F_val = Deg_Rankine->Convert_to(R_val, "F");
-	  cout << C_val << "C = " << F_val << "F = " << K_val << "K = " << R_val << "R" << endl;
-	  cout << endl;
-
-	  delete Deg_Celsius;
-	  delete Deg_Kelvin;
-	  delete Deg_Fahrenheit;
-	  delete Deg_Rankine;
-     }
-
-     cout << endl << "INVERSES:" << endl;
-     {
-	  Unit *Seconds = new Unit ("1/s");
-	  cout << "new Unit = " << Seconds << endl;
-	  Unit *Minutes = new Unit ("1/min");
-	  cout << "new Unit = " << Minutes << endl << endl;
-
-	  test_conversion (Seconds ,Minutes );
-	  test_conversion (Minutes ,Seconds );
-
-	  delete Seconds;
-	  delete Minutes;
-     }
-
-     cout << endl << "PRODUCTS CONTAINING A TEMPERATURE PRIMITIVE:" << endl;
-     {
-	  Unit *Celsius_seconds = new Unit ("C*s");
-	  cout << "new Unit = " << Celsius_seconds << endl;
-	  Unit *Fahrenheit_minutes = new Unit ("F*min");
-	  cout << "new Unit = " << Fahrenheit_minutes << endl << endl;
-
-	  test_conversion (Celsius_seconds ,Fahrenheit_minutes );
-	  test_conversion (Fahrenheit_minutes ,Celsius_seconds );
-
-	  delete Celsius_seconds;
-	  delete Fahrenheit_minutes;
-     }
-
-
-     cout << endl << "PRODUCTS of TEMPERATURE PRIMITIVE:" << endl;
-     {
-	  Unit *Celsius_squared = new Unit ("C2");
-	  cout << "new Unit = " << Celsius_squared << endl;
-	  Unit *Fahrenheit_squared = new Unit ("F2");
-	  cout << "new Unit = " << Fahrenheit_squared << endl;
-	  Unit *Celsius_Fahrenheit = new Unit ("C*F");
-	  cout << "new Unit = " << Celsius_Fahrenheit << endl << endl;
-
-	  test_conversion_exception (Celsius_squared ,Fahrenheit_squared );
-	  test_conversion_exception (Fahrenheit_squared ,Celsius_squared );
-
-	  test_conversion (Fahrenheit_squared ,Fahrenheit_squared );
-	  test_conversion (Celsius_Fahrenheit ,Celsius_Fahrenheit);
-
-	  delete Celsius_squared;
-	  delete Fahrenheit_squared;
-     }
-
-
-     cout << endl << "RATIOS CONTAINING A TEMPERATURE PRIMITIVE:" << endl;
-     {
-	  Unit *Deg_Celsius_per_second= new Unit ("C/s");
-	  cout << "new Unit = " << Deg_Celsius_per_second << endl;
-	  Unit *Deg_Fahrenheit_per_second= new Unit ("F/s");
-	  cout << "new Unit = " << Deg_Fahrenheit_per_second << endl << endl;
-
-	  test_conversion (Deg_Celsius_per_second ,Deg_Fahrenheit_per_second );
-	  test_conversion (Deg_Fahrenheit_per_second ,Deg_Celsius_per_second );
-
-	  delete Deg_Celsius_per_second;
-	  delete Deg_Fahrenheit_per_second;
-     }
-
-
-     cout << endl << "COMPLEX CONVERSIONS:" << endl;
-     {
-	  Unit *Newton = new Unit("kg*m/s2");
-	  cout << "new Unit = " << Newton << endl;
-	  Unit *Poundal = new Unit("lbm*ft/s2");
-	  cout << "new Unit = " << Poundal << endl << endl;
-
-	  test_conversion (Newton ,Poundal );
-	  test_conversion (Poundal, Newton);
-
-	  delete Newton;
-	  delete Poundal;
-     }
-
-// Note: Issue E..4-187 no longer allows the dubious "default units" interpretation
-// of double-dash. Yeah!
-
-     cout << endl << "COMMUTATIVITY of FACTORS:" << endl;
-     {
-	  Unit *CNewton = new Unit("m*kg/s2");
-	  cout << "new Unit = " << CNewton << endl;
-	  Unit *CPoundal = new Unit("lbm*ft/s*s");
-	  cout << "new Unit = " << CPoundal << endl << endl;
-
-	  test_conversion (CNewton ,CPoundal );
-	  test_conversion (CPoundal, CNewton);
-
-	  delete CNewton;
-	  delete CPoundal;
-     }
-
-     cout << endl << "TEST COLLECTION of DENOMINATORS:" << endl;
-     {
-	  Unit *Meters_per_minute_squared_1 = new Unit ("m/s2");
-	  cout << "new Unit = " << Meters_per_minute_squared_1 << endl;
-	  Unit *Meters_per_minute_squared_2 = new Unit ("m/s*s");
-	  cout << "new Unit = " << Meters_per_minute_squared_2 << endl;
-	  Unit *Meters_per_minute_squared_3 = new Unit ("m/s/s");
-	  cout << "new Unit = " << Meters_per_minute_squared_3 << endl << endl;
-
-	  test_conversion (Meters_per_minute_squared_1 ,Meters_per_minute_squared_2);
-	  test_conversion (Meters_per_minute_squared_1 ,Meters_per_minute_squared_3);
-	  test_conversion (Meters_per_minute_squared_2 ,Meters_per_minute_squared_1);
-	  test_conversion (Meters_per_minute_squared_2 ,Meters_per_minute_squared_3);
-	  test_conversion (Meters_per_minute_squared_3 ,Meters_per_minute_squared_1);
-	  test_conversion (Meters_per_minute_squared_3 ,Meters_per_minute_squared_2);
-
-	  delete Meters_per_minute_squared_1;
-	  delete Meters_per_minute_squared_2;
-	  delete Meters_per_minute_squared_3;
-     }
-
-     cout << endl << "Unit::getUnitName Functionality:" << endl;
-     {
-         test_number ++;
-         cout << "TEST " << test_number << ":" << endl;
-         const char *name;
-
-	  Unit *some_unit = new Unit ("m/s2");
-	  cout << "new Unit = " << some_unit << endl;
-         cout << "Get the name using the get_name method and compare it to \"m/s2\"" << endl;
-         cout << "They should match." << endl;
-         name = some_unit->getUnitName();
-
-         if ( strcmp(name, "m/s2") == 0) {
-	       cout << "RESULT: PASS" << endl;
-         } else {
-              cout << "RESULT: FAIL" << endl;
-              n_failures++ ;
-         }
-	  delete some_unit;
-     }
-
-     cout << endl << "TEST Unit::setUnitName Functionality:" << endl;
-     {
-         UCFn *cf;
-         test_number ++;
-         cout << "TEST " << test_number << ":" << endl;
-	  Unit *A_unit = new Unit ("m/s2");
-	  cout << "Unit A = " << A_unit << endl;
-	  Unit *B_unit = new Unit ();
-	  cout << "Unit B = " << B_unit << endl;
-         cout << "Set B's Unit name to m/s2 using Unit::setUnitName" << endl;
-         B_unit->setUnitName("m/s2");
-
-         cout << "A and B should be compatible." << endl;
-         try {
-             cf  = A_unit->Conversion_to(B_unit);
-             cout << "Conversion function: " << cf << endl;
-             cout << "A and B appear to be compatible." << endl;
-         } catch (Unit::CONVERSION_ERROR) {
-	      cout << "FAIL." << endl <<endl;
-             n_failures++ ;
-         }
-
-         if ( (cf->C[0] == 0.0) && (cf->C[1] == 1.0) ) {
-              cout << "The conversion from A to B is correct." << endl;
-	       cout << "RESULT: PASS" << endl;
-         } else {
-              cout << "RESULT: FAIL" << endl;
-              n_failures++ ;
-         }
-
-	  delete A_unit;
-	  delete B_unit;
-
-     }
-
-
-
-
-     cout << endl << "SYNTAX ERRORS:" << endl;
-     {
-	  test_unit_exception ("foo");
-	  test_unit_exception ("C**m");
-	  test_unit_exception ("/C");
-     }
-
-     cout << "=======================================================================" << endl;
-     cout << " END OF \"C++\" TEST SUITE" << endl;
-     cout << " Number of test failures = " << n_failures << endl << endl;
-     cout << " NOTE:" << endl;
-     cout << " Be sure to also run \"units_conv_c_test\" to complete the testing" << endl;
-     cout << " of the \"C\" interface." << endl;
-     cout << "=======================================================================" << endl;
-
-     return CONV_OK;
+int	main	(int	argc,	char	*	argv[]	)	{
+
+cout	<<	"==================================================================================."	<<	endl;
+cout	<<	"Test	Suite	for	the	\"C++\"	Language	Interface	to	the	Trick	Unit	Conversion	Package."	<<	endl;
+cout	<<	"==================================================================================."	<<	endl;
+
+					cout	<<	endl	<<	"TIME	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Second		=	new	Unit("s");
+			Unit	*Minute		=	new	Unit("min");
+			Unit	*Hour				=	new	Unit("hr");
+			Unit	*Day					=	new	Unit("day");
+
+			validate_conv_fn	(Second	,Second,																												1.0,	0.0	);
+			validate_conv_fn	(Second	,Minute,																					(1.0/60.0),	0.0	);
+			validate_conv_fn	(Second	,Hour,																(1.0/(60.0*60.0)),	0.0	);
+			validate_conv_fn	(Second	,Day,												(1.0/(60.0*60.0*24.0)),	0.0	);
+
+			validate_conv_fn	(Minute,	Second,																											60.0,	0.0	);
+			validate_conv_fn	(Hour,			Second,																									3600.0,	0.0	);
+			validate_conv_fn	(Day,				Second,																								86400.0,	0.0	);
+					}
+
+					cout	<<	endl	<<	"LENGTH	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Meter										=	new	Unit("m");
+			Unit	*Foot											=	new	Unit("ft");
+			Unit	*Inch											=	new	Unit("in");
+			Unit	*Millimeter					=	new	Unit("mm");
+			Unit	*Centimeter					=	new	Unit("cm");
+			Unit	*Kilometer						=	new	Unit("km");
+			Unit	*Yard											=	new	Unit("yd");
+			Unit	*Mile											=	new	Unit("mi");
+			Unit	*Nautical_Mile		=	new	Unit("n.m.");
+			Unit	*Kilofoot							=	new	Unit("kft");
+
+			validate_conv_fn	(Meter	,Meter,																																1.0,	0.0	);
+			validate_conv_fn	(Meter	,Foot,																													3.28084,	0.0	);
+			validate_conv_fn	(Meter	,Inch,																													39.3701,	0.0	);
+			validate_conv_fn	(Meter	,Millimeter,																								1000.0,	0.0	);
+			validate_conv_fn	(Meter	,Centimeter,																									100.0,	0.0	);
+			validate_conv_fn	(Meter	,Kilometer,																										0.001,	0.0	);
+			validate_conv_fn	(Meter	,Yard,																													1.09361,	0.0	);
+			validate_conv_fn	(Meter	,Mile,																						(1.0/1609.344),	0.0	);
+			validate_conv_fn	(Meter	,Nautical_Mile,															(1.0/1852.0),	0.0	);
+			validate_conv_fn	(Meter	,Kilofoot,																(3.28084/1000.0),	0.0	);
+
+			validate_conv_fn	(Foot	,Inch,																																		12.0,	0.0);
+			validate_conv_fn	(Yard	,Foot,																																			3.0,	0.0);
+			validate_conv_fn	(Yard	,Inch,																																		36.0,	0.0);
+			validate_conv_fn	(Mile	,Foot,																																5280.0,	0.0);
+			validate_conv_fn	(Nautical_Mile	,Foot,																			6076.11549,	0.0);
+			validate_conv_fn	(Kilofoot	,Foot,																												1000.0,	0.0);
+
+					}
+
+					cout	<<	endl	<<	"ANGLE	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Radian						=	new	Unit("r");
+			Unit	*Degree						=	new	Unit("d");
+			Unit	*ArcSecond			=	new	Unit("as");
+			Unit	*ArcMinute			=	new	Unit("am");
+			Unit	*Revolution		=	new	Unit("rev");
+			Unit	*Milliradian	=	new	Unit("mr");
+
+#define	PI	3.14159265
+
+			validate_conv_fn	(Radian,	Radian,																															1.0,	0.0);
+			validate_conv_fn	(Radian,	Degree,																								(180.0/PI),	0.0);
+			validate_conv_fn	(Radian,	ArcSecond,											(180.0*60.0*60.0/PI),	0.0);
+			validate_conv_fn	(Radian,	ArcMinute,																(180.0*60.0/PI),	0.0);
+			validate_conv_fn	(Radian,	Revolution,																(1.0/(2.0*PI)),	0.0);
+			validate_conv_fn	(Radian,	Milliradian,																							1000.0,	0.0);
+
+			validate_conv_fn	(Revolution,	Degree,																									360.0,	0.0);
+			validate_conv_fn	(Revolution,	Radian,																						(2.0*PI),	0.0);
+			validate_conv_fn	(ArcMinute,		Degree,																				(1.0/60.0),	0.0);
+			validate_conv_fn	(ArcSecond,		Degree,																		(1.0/3600.0),	0.0);
+					}
+
+					cout	<<	endl	<<	"MASS	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Kilogram						=	new	Unit("kg");
+			Unit	*Slug										=	new	Unit("sl");
+			Unit	*PoundMass					=	new	Unit("lbm");
+			Unit	*Gram										=	new	Unit("g");
+			Unit	*MetricTon					=	new	Unit("mt");
+
+			validate_conv_fn	(Kilogram,	Kilogram,																											1.0,	0.0);
+			validate_conv_fn	(Kilogram,	Slug,																			(1.0/14.593902),	0.0);
+			validate_conv_fn	(Kilogram,	PoundMass,																			2.20462262,	0.0);
+			validate_conv_fn	(Kilogram,	Gram,																												1000.0,	0.0);
+			validate_conv_fn	(Kilogram,	MetricTon,																	(1.0/1000.0),	0.0);
+
+			validate_conv_fn	(MetricTon,	Kilogram,																							1000.0,	0.0);
+					}
+
+					cout	<<	endl	<<	"FORCE	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Newton					=	new	Unit("N");
+			Unit	*KiloNewton	=	new	Unit("kN");
+			Unit	*Ounce						=	new	Unit("oz");
+			Unit	*PoundForce	=	new	Unit("lbf");
+
+			validate_conv_fn	(Newton,	Newton,																															1.0,	0.0);
+			validate_conv_fn	(Newton,	KiloNewton,																									0.001,	0.0);
+			validate_conv_fn	(Newton,	Ounce,																			(16.0/4.4482216),	0.0);
+			validate_conv_fn	(Newton,	PoundForce,																					(1/4.4482216),	0.0);
+					}
+
+					cout	<<	endl	<<	"VOLTAGE	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Volt						=	new	Unit("v");
+			Unit	*KiloVolt		=	new	Unit("kv");
+
+			validate_conv_fn	(Volt,	Volt,																																			1.0,	0.0);
+			validate_conv_fn	(Volt,	KiloVolt,																													0.001,	0.0);
+					}
+
+					cout	<<	endl	<<	"CURRENT	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Ampere							=	new	Unit("amp");
+			Unit	*MilliAmpere		=	new	Unit("mamp");
+
+			validate_conv_fn	(Ampere,	Ampere,																															1.0,	0.0);
+			validate_conv_fn	(Ampere,	MilliAmpere,																							1000.0,	0.0);
+					}
+
+					cout	<<	endl	<<	"UNITLESS	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*DoubleDash	=	new	Unit("--");
+			Unit	*Count						=	new	Unit("cnt");
+			Unit	*One								=	new	Unit("one");
+
+			validate_conv_fn	(DoubleDash,	DoubleDash,																							1.0,	0.0);
+			validate_conv_fn	(DoubleDash,	Count,																												1.0,	0.0);
+			validate_conv_fn	(DoubleDash,	One,																														1.0,	0.0);
+
+					}
+
+					cout	<<	endl	<<	"FREQUENCY	CONVERSIONS:"	<<	endl;
+					{
+									Unit	*Hz		=	new	Unit("Hz");
+			Unit	*Mhz	=	new	Unit("Mhz");
+			Unit	*Ghz	=	new	Unit("Ghz");
+
+			validate_conv_fn	(Hertz,	Hertz,						1.0,		0.0);
+			validate_conv_fn	(Hertz,	MegaHertz,							1000000,		0.0);
+			validate_conv_fn	(Hertz,	GigaHertz,							1000000000,	0.0);
+					}
+
+//	Note:	Issue	E..4-187	no	longer	allows	the	dubious	"default	units"	interpretation
+//	of	double-dash.	Yeah!
+
+					cout	<<	endl	<<	"PRIMITIVE	TEMPERATURE	CONVERSIONS:"	<<	endl;
+					{
+			double	C_val,	F_val,	K_val,	R_val;
+
+			Unit	*Deg_Celsius				=	new	Unit("C");
+			cout	<<	"new	Unit	=	"	<<	Deg_Celsius	<<	endl;
+			Unit	*Deg_Kelvin					=	new	Unit("K");
+			cout	<<	"new	Unit	=	"	<<	Deg_Kelvin	<<	endl;
+			Unit	*Deg_Fahrenheit	=	new	Unit("F");
+			cout	<<	"new	Unit	=	"	<<	Deg_Fahrenheit	<<	endl;
+			Unit	*Deg_Rankine				=	new	Unit("R");
+			cout	<<	"new	Unit	=	"	<<	Deg_Rankine	<<	endl	<<	endl;
+
+			test_conversion	(Deg_Celsius	,Deg_Kelvin	);
+			test_conversion	(Deg_Celsius	,Deg_Fahrenheit	);
+			test_conversion	(Deg_Celsius	,Deg_Rankine	);
+			test_conversion	(Deg_Kelvin		,Deg_Celsius	);
+			test_conversion	(Deg_Kelvin		,Deg_Fahrenheit	);
+			test_conversion	(Deg_Kelvin		,Deg_Rankine	);
+			test_conversion	(Deg_Rankine	,Deg_Celsius	);
+			test_conversion	(Deg_Rankine	,Deg_Kelvin	);
+			test_conversion	(Deg_Rankine	,Deg_Fahrenheit	);
+
+			cout	<<	"TEST	"	<<	test_number	<<	":		0	Celsius"	<<	endl;
+			test_number	++;
+			C_val	=	0.0;
+			F_val	=	Deg_Celsius->Convert_to(C_val,	"F");
+			K_val	=	Deg_Celsius->Convert_to(C_val,	"K");
+			R_val	=	Deg_Celsius->Convert_to(C_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	0	Kelvin"	<<	endl;
+			test_number	++;
+			K_val	=	0.0;
+			F_val	=	Deg_Kelvin->Convert_to(K_val,	"F");
+			C_val	=	Deg_Kelvin->Convert_to(K_val,	"C");
+			R_val	=	Deg_Kelvin->Convert_to(K_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	0	Fahrenheit"	<<	endl;
+			test_number	++;
+			F_val	=	0.0;
+			K_val	=	Deg_Fahrenheit->Convert_to(F_val,	"K");
+			C_val	=	Deg_Fahrenheit->Convert_to(F_val,	"C");
+			R_val	=	Deg_Fahrenheit->Convert_to(F_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	0	Rankine"	<<	endl;
+			test_number	++;
+			R_val	=	0.0;
+			K_val	=	Deg_Rankine->Convert_to(R_val,	"K");
+			C_val	=	Deg_Rankine->Convert_to(R_val,	"C");
+			F_val	=	Deg_Rankine->Convert_to(R_val,	"F");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"AVERAGE	HUMAN	BODY	TEMPERATURE"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	36.8	Celsius"	<<	endl;
+			test_number	++;
+			C_val	=	36.8;
+			F_val	=	Deg_Celsius->Convert_to(C_val,	"F");
+			K_val	=	Deg_Celsius->Convert_to(C_val,	"K");
+			R_val	=	Deg_Celsius->Convert_to(C_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	310.0	Kelvin"	<<	endl;
+			test_number	++;
+			K_val	=	310.0;
+			F_val	=	Deg_Kelvin->Convert_to(K_val,	"F");
+			C_val	=	Deg_Kelvin->Convert_to(K_val,	"C");
+			R_val	=	Deg_Kelvin->Convert_to(K_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	98.2	Fahrenheit"	<<	endl;
+			test_number	++;
+			F_val	=	98.2;
+			K_val	=	Deg_Fahrenheit->Convert_to(F_val,	"K");
+			C_val	=	Deg_Fahrenheit->Convert_to(F_val,	"C");
+			R_val	=	Deg_Fahrenheit->Convert_to(F_val,	"R");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			cout	<<	"TEST	"	<<	test_number	<<	":	557.9	Rankine"	<<	endl;
+			test_number	++;
+			R_val	=	557.9;
+			K_val	=	Deg_Rankine->Convert_to(R_val,	"K");
+			C_val	=	Deg_Rankine->Convert_to(R_val,	"C");
+			F_val	=	Deg_Rankine->Convert_to(R_val,	"F");
+			cout	<<	C_val	<<	"C	=	"	<<	F_val	<<	"F	=	"	<<	K_val	<<	"K	=	"	<<	R_val	<<	"R"	<<	endl;
+			cout	<<	endl;
+
+			delete	Deg_Celsius;
+			delete	Deg_Kelvin;
+			delete	Deg_Fahrenheit;
+			delete	Deg_Rankine;
+					}
+
+					cout	<<	endl	<<	"INVERSES:"	<<	endl;
+					{
+			Unit	*Seconds	=	new	Unit	("1/s");
+			cout	<<	"new	Unit	=	"	<<	Seconds	<<	endl;
+			Unit	*Minutes	=	new	Unit	("1/min");
+			cout	<<	"new	Unit	=	"	<<	Minutes	<<	endl	<<	endl;
+
+			test_conversion	(Seconds	,Minutes	);
+			test_conversion	(Minutes	,Seconds	);
+
+			delete	Seconds;
+			delete	Minutes;
+					}
+
+					cout	<<	endl	<<	"PRODUCTS	CONTAINING	A	TEMPERATURE	PRIMITIVE:"	<<	endl;
+					{
+			Unit	*Celsius_seconds	=	new	Unit	("C*s");
+			cout	<<	"new	Unit	=	"	<<	Celsius_seconds	<<	endl;
+			Unit	*Fahrenheit_minutes	=	new	Unit	("F*min");
+			cout	<<	"new	Unit	=	"	<<	Fahrenheit_minutes	<<	endl	<<	endl;
+
+			test_conversion	(Celsius_seconds	,Fahrenheit_minutes	);
+			test_conversion	(Fahrenheit_minutes	,Celsius_seconds	);
+
+			delete	Celsius_seconds;
+			delete	Fahrenheit_minutes;
+					}
+
+
+					cout	<<	endl	<<	"PRODUCTS	of	TEMPERATURE	PRIMITIVE:"	<<	endl;
+					{
+			Unit	*Celsius_squared	=	new	Unit	("C2");
+			cout	<<	"new	Unit	=	"	<<	Celsius_squared	<<	endl;
+			Unit	*Fahrenheit_squared	=	new	Unit	("F2");
+			cout	<<	"new	Unit	=	"	<<	Fahrenheit_squared	<<	endl;
+			Unit	*Celsius_Fahrenheit	=	new	Unit	("C*F");
+			cout	<<	"new	Unit	=	"	<<	Celsius_Fahrenheit	<<	endl	<<	endl;
+
+			test_conversion_exception	(Celsius_squared	,Fahrenheit_squared	);
+			test_conversion_exception	(Fahrenheit_squared	,Celsius_squared	);
+
+			test_conversion	(Fahrenheit_squared	,Fahrenheit_squared	);
+			test_conversion	(Celsius_Fahrenheit	,Celsius_Fahrenheit);
+
+			delete	Celsius_squared;
+			delete	Fahrenheit_squared;
+					}
+
+
+					cout	<<	endl	<<	"RATIOS	CONTAINING	A	TEMPERATURE	PRIMITIVE:"	<<	endl;
+					{
+			Unit	*Deg_Celsius_per_second=	new	Unit	("C/s");
+			cout	<<	"new	Unit	=	"	<<	Deg_Celsius_per_second	<<	endl;
+			Unit	*Deg_Fahrenheit_per_second=	new	Unit	("F/s");
+			cout	<<	"new	Unit	=	"	<<	Deg_Fahrenheit_per_second	<<	endl	<<	endl;
+
+			test_conversion	(Deg_Celsius_per_second	,Deg_Fahrenheit_per_second	);
+			test_conversion	(Deg_Fahrenheit_per_second	,Deg_Celsius_per_second	);
+
+			delete	Deg_Celsius_per_second;
+			delete	Deg_Fahrenheit_per_second;
+					}
+
+
+					cout	<<	endl	<<	"COMPLEX	CONVERSIONS:"	<<	endl;
+					{
+			Unit	*Newton	=	new	Unit("kg*m/s2");
+			cout	<<	"new	Unit	=	"	<<	Newton	<<	endl;
+			Unit	*Poundal	=	new	Unit("lbm*ft/s2");
+			cout	<<	"new	Unit	=	"	<<	Poundal	<<	endl	<<	endl;
+
+			test_conversion	(Newton	,Poundal	);
+			test_conversion	(Poundal,	Newton);
+
+			delete	Newton;
+			delete	Poundal;
+					}
+
+//	Note:	Issue	E..4-187	no	longer	allows	the	dubious	"default	units"	interpretation
+//	of	double-dash.	Yeah!
+
+					cout	<<	endl	<<	"COMMUTATIVITY	of	FACTORS:"	<<	endl;
+					{
+			Unit	*CNewton	=	new	Unit("m*kg/s2");
+			cout	<<	"new	Unit	=	"	<<	CNewton	<<	endl;
+			Unit	*CPoundal	=	new	Unit("lbm*ft/s*s");
+			cout	<<	"new	Unit	=	"	<<	CPoundal	<<	endl	<<	endl;
+
+			test_conversion	(CNewton	,CPoundal	);
+			test_conversion	(CPoundal,	CNewton);
+
+			delete	CNewton;
+			delete	CPoundal;
+					}
+
+					cout	<<	endl	<<	"TEST	COLLECTION	of	DENOMINATORS:"	<<	endl;
+					{
+			Unit	*Meters_per_minute_squared_1	=	new	Unit	("m/s2");
+			cout	<<	"new	Unit	=	"	<<	Meters_per_minute_squared_1	<<	endl;
+			Unit	*Meters_per_minute_squared_2	=	new	Unit	("m/s*s");
+			cout	<<	"new	Unit	=	"	<<	Meters_per_minute_squared_2	<<	endl;
+			Unit	*Meters_per_minute_squared_3	=	new	Unit	("m/s/s");
+			cout	<<	"new	Unit	=	"	<<	Meters_per_minute_squared_3	<<	endl	<<	endl;
+
+			test_conversion	(Meters_per_minute_squared_1	,Meters_per_minute_squared_2);
+			test_conversion	(Meters_per_minute_squared_1	,Meters_per_minute_squared_3);
+			test_conversion	(Meters_per_minute_squared_2	,Meters_per_minute_squared_1);
+			test_conversion	(Meters_per_minute_squared_2	,Meters_per_minute_squared_3);
+			test_conversion	(Meters_per_minute_squared_3	,Meters_per_minute_squared_1);
+			test_conversion	(Meters_per_minute_squared_3	,Meters_per_minute_squared_2);
+
+			delete	Meters_per_minute_squared_1;
+			delete	Meters_per_minute_squared_2;
+			delete	Meters_per_minute_squared_3;
+					}
+
+					cout	<<	endl	<<	"Unit::getUnitName	Functionality:"	<<	endl;
+					{
+									test_number	++;
+									cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+									const	char	*name;
+
+			Unit	*some_unit	=	new	Unit	("m/s2");
+			cout	<<	"new	Unit	=	"	<<	some_unit	<<	endl;
+									cout	<<	"Get	the	name	using	the	get_name	method	and	compare	it	to	\"m/s2\""	<<	endl;
+									cout	<<	"They	should	match."	<<	endl;
+									name	=	some_unit->getUnitName();
+
+									if	(	strcmp(name,	"m/s2")	==	0)	{
+								cout	<<	"RESULT:	PASS"	<<	endl;
+									}	else	{
+														cout	<<	"RESULT:	FAIL"	<<	endl;
+														n_failures++	;
+									}
+			delete	some_unit;
+					}
+
+					cout	<<	endl	<<	"TEST	Unit::setUnitName	Functionality:"	<<	endl;
+					{
+									UCFn	*cf;
+									test_number	++;
+									cout	<<	"TEST	"	<<	test_number	<<	":"	<<	endl;
+			Unit	*A_unit	=	new	Unit	("m/s2");
+			cout	<<	"Unit	A	=	"	<<	A_unit	<<	endl;
+			Unit	*B_unit	=	new	Unit	();
+			cout	<<	"Unit	B	=	"	<<	B_unit	<<	endl;
+									cout	<<	"Set	B's	Unit	name	to	m/s2	using	Unit::setUnitName"	<<	endl;
+									B_unit->setUnitName("m/s2");
+
+									cout	<<	"A	and	B	should	be	compatible."	<<	endl;
+									try	{
+													cf		=	A_unit->Conversion_to(B_unit);
+													cout	<<	"Conversion	function:	"	<<	cf	<<	endl;
+													cout	<<	"A	and	B	appear	to	be	compatible."	<<	endl;
+									}	catch	(Unit::CONVERSION_ERROR)	{
+							cout	<<	"FAIL."	<<	endl	<<endl;
+													n_failures++	;
+									}
+
+									if	(	(cf->C[0]	==	0.0)	&&	(cf->C[1]	==	1.0)	)	{
+														cout	<<	"The	conversion	from	A	to	B	is	correct."	<<	endl;
+								cout	<<	"RESULT:	PASS"	<<	endl;
+									}	else	{
+														cout	<<	"RESULT:	FAIL"	<<	endl;
+														n_failures++	;
+									}
+
+			delete	A_unit;
+			delete	B_unit;
+
+					}
+
+
+
+
+					cout	<<	endl	<<	"SYNTAX	ERRORS:"	<<	endl;
+					{
+			test_unit_exception	("foo");
+			test_unit_exception	("C**m");
+			test_unit_exception	("/C");
+					}
+
+					cout	<<	"======================================================================="	<<	endl;
+					cout	<<	"	END	OF	\"C++\"	TEST	SUITE"	<<	endl;
+					cout	<<	"	Number	of	test	failures	=	"	<<	n_failures	<<	endl	<<	endl;
+					cout	<<	"	NOTE:"	<<	endl;
+					cout	<<	"	Be	sure	to	also	run	\"units_conv_c_test\"	to	complete	the	testing"	<<	endl;
+					cout	<<	"	of	the	\"C\"	interface."	<<	endl;
+					cout	<<	"======================================================================="	<<	endl;
+
+					return	CONV_OK;
 }
diff --git a/trick_source/trick_utils/units/src/UCFn.cpp b/trick_source/trick_utils/units/src/UCFn.cpp
index 81d98e7a9..50abb4084 100644
--- a/trick_source/trick_utils/units/src/UCFn.cpp
+++ b/trick_source/trick_utils/units/src/UCFn.cpp
@@ -1,24 +1,24 @@
 /*
-PURPOSE: (Conversion Function Class for Units Conversion Package)
+PURPOSE:	(Conversion	Function	Class	for	Units	Conversion	Package)
 
 PROGRAMMERS:
-    (((John M. Penn) (L-3Com/Titan) (May 2006) (v1.0)
-      (Initial Release)))
+				(((John	M.	Penn)	(L-3Com/Titan)	(May	2006)	(v1.0)
+						(Initial	Release)))
 */
 
-#include "trick/UCFn.hh"
+#include	"trick/UCFn.hh"
 
-UCFn::UCFn(const char *in_t_name, const char *in_f_name, double C1, double C0) {
-    this->C[1]=C1;
-    this->C[0]=C0;
-    strncpy(this->t_name, in_t_name, sizeof(this->t_name)-1);
-    strncpy(this->f_name, in_f_name, sizeof(this->f_name)-1);
+UCFn::UCFn(const	char	*in_t_name,	const	char	*in_f_name,	double	C1,	double	C0)	{
+				this->C[1]=C1;
+				this->C[0]=C0;
+				strncpy(this->t_name,	in_t_name,	sizeof(this->t_name)-1);
+				strncpy(this->f_name,	in_f_name,	sizeof(this->f_name)-1);
 };
 
-double UCFn::eval( double val) {
-    return ( this->C[1]*val + this->C[0] );
+double	UCFn::eval(	double	val)	{
+				return	(	this->C[1]*val	+	this->C[0]	);
 };
 
-std::ostream& operator<< (std::ostream& s, const UCFn *p) {
-    return s << "<" << p->t_name << "> = " << p->C[1] << " * <" << p->f_name << "> + " << p->C[0];
+std::ostream&	operator<<	(std::ostream&	s,	const	UCFn	*p)	{
+				return	s	<<	"<"	<<	p->t_name	<<	">	=	"	<<	p->C[1]	<<	"	*	<"	<<	p->f_name	<<	">	+	"	<<	p->C[0];
 };
diff --git a/trick_source/trick_utils/units/src/Unit.cpp b/trick_source/trick_utils/units/src/Unit.cpp
index 7026bc3d4..59e56538e 100644
--- a/trick_source/trick_utils/units/src/Unit.cpp
+++ b/trick_source/trick_utils/units/src/Unit.cpp
@@ -1,85 +1,85 @@
 /*
-PURPOSE: (Units Conversion C++ Language Interface)
+PURPOSE:	(Units	Conversion	C++	Language	Interface)
 
 PROGRAMMERS:
-    (((John M. Penn) (L-3Com/Titan) (May 2006) (v1.0)
-      (Initial Release)))
+				(((John	M.	Penn)	(L-3Com/Titan)	(May	2006)	(v1.0)
+						(Initial	Release)))
 */
 
-#include <string>
-#include "trick/Unit.hh"
-#include "trick/units_conv.h"
+#include	<string>
+#include	"trick/Unit.hh"
+#include	"trick/units_conv.h"
 
-Unit::Unit() {
-    const char *name = "--";
-    if ((this->units = new_units(name)) == NULL) {
-        throw Unit::CONVERSION_ERROR();
-    }
-    this->units_name = name;
+Unit::Unit()	{
+				const	char	*name	=	"--";
+				if	((this->units	=	new_units(name))	==	NULL)	{
+								throw	Unit::CONVERSION_ERROR();
+				}
+				this->units_name	=	name;
 }
 
 
-Unit::Unit(const char *name) {
-    if ((this->units = new_units(name)) == NULL) {
-        throw Unit::CONVERSION_ERROR();
-    }
-    this->units_name = name;
+Unit::Unit(const	char	*name)	{
+				if	((this->units	=	new_units(name))	==	NULL)	{
+								throw	Unit::CONVERSION_ERROR();
+				}
+				this->units_name	=	name;
 }
 
 
-Unit::~Unit() {
-    CONV_FREE(this->units);
+Unit::~Unit()	{
+				CONV_FREE(this->units);
 }
 
-std::string Unit::setUnitName(const char *name) {
-    CONV_FREE(this->units);
+std::string	Unit::setUnitName(const	char	*name)	{
+				CONV_FREE(this->units);
 
-    if ((this->units = new_units(name)) == NULL) {
-        throw Unit::CONVERSION_ERROR();
-    }
-    this->units_name = name;
-    return(this->units_name);
+				if	((this->units	=	new_units(name))	==	NULL)	{
+								throw	Unit::CONVERSION_ERROR();
+				}
+				this->units_name	=	name;
+				return(this->units_name);
 }
 
-double Unit::Convert_to (double val, const Unit *other) {
-    UnitsConvFn_t conv_fn;
+double	Unit::Convert_to	(double	val,	const	Unit	*other)	{
+				UnitsConvFn_t	conv_fn;
 
-    if (conv_fn_u(this->units, other->units, &conv_fn) != CONV_OK) {
-        throw Unit::CONVERSION_ERROR();
-    }
-    return ( conv_fn.C[1]* val + conv_fn.C[0] );
+				if	(conv_fn_u(this->units,	other->units,	&conv_fn)	!=	CONV_OK)	{
+								throw	Unit::CONVERSION_ERROR();
+				}
+				return	(	conv_fn.C[1]*	val	+	conv_fn.C[0]	);
 }
 
-double Unit::Convert_to (double val, const char *in_units_name) {
-    Unit *other = new Unit(in_units_name);
-    double conv_val = this->Convert_to(val, other);
-    delete other;
-    return (conv_val);
+double	Unit::Convert_to	(double	val,	const	char	*in_units_name)	{
+				Unit	*other	=	new	Unit(in_units_name);
+				double	conv_val	=	this->Convert_to(val,	other);
+				delete	other;
+				return	(conv_val);
 }
 
-UCFn *Unit::Conversion_to (const Unit *other) {
-    UnitsConvFn_t conv_fn;
+UCFn	*Unit::Conversion_to	(const	Unit	*other)	{
+				UnitsConvFn_t	conv_fn;
 
-    if (conv_fn_u(this->units, other->units, &conv_fn) != CONV_OK) {
-        throw CONVERSION_ERROR();
-    }
-    return ( new UCFn(other->units_name.c_str(), this->units_name.c_str(), conv_fn.C[1], conv_fn.C[0]) );
+				if	(conv_fn_u(this->units,	other->units,	&conv_fn)	!=	CONV_OK)	{
+								throw	CONVERSION_ERROR();
+				}
+				return	(	new	UCFn(other->units_name.c_str(),	this->units_name.c_str(),	conv_fn.C[1],	conv_fn.C[0])	);
 }
 
 
-UCFn *Unit::Conversion_to (const char *in_units_name) {
-    UCFn *ucf;
-    Unit * other;
-    if ((other = new Unit(in_units_name))==NULL) {
-        throw CONVERSION_ERROR();
-    }
+UCFn	*Unit::Conversion_to	(const	char	*in_units_name)	{
+				UCFn	*ucf;
+				Unit	*	other;
+				if	((other	=	new	Unit(in_units_name))==NULL)	{
+								throw	CONVERSION_ERROR();
+				}
 
-    ucf = this->Conversion_to(other);
+				ucf	=	this->Conversion_to(other);
 
-    delete other;
-    return ucf;
+				delete	other;
+				return	ucf;
 }
 
-std::ostream& operator<< (std::ostream& s, const Unit *u) {
-    return s << u->units_name;
+std::ostream&	operator<<	(std::ostream&	s,	const	Unit	*u)	{
+				return	s	<<	u->units_name;
 };
diff --git a/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp b/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
index 931c2a55f..2b8bdde3f 100644
--- a/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
+++ b/trick_source/trick_utils/units/test/UnitConvTestSuite.cpp
@@ -1,74 +1,74 @@
 
-#include <gtest/gtest.h>
-#include "trick/units_conv.h"
+#include	<gtest/gtest.h>
+#include	"trick/units_conv.h"
 
-#define TOL 1e-7
+#define	TOL	1e-7
 /*
-double tolerance(int exp)
+double	tolerance(int	exp)
 {
-  return pow(10, exp);
+		return	pow(10,	exp);
 }
 */
 /*********************WARNING******************************************
- * 1. new_units allocates memory for a Units_t object using new
- * Use clean_up_Units_t() to deallocate the memory and set the pointer to NULL
- *
- * 2. Do not call clean_up_Units_t() on unitialized pointers!
- * Initialize/Define pointers at declaration
- * Declared pointers that don't point to a valid address or NULL will
- * cause an error
+	*	1.	new_units	allocates	memory	for	a	Units_t	object	using	new
+	*	Use	clean_up_Units_t()	to	deallocate	the	memory	and	set	the	pointer	to	NULL
+	*
+	*	2.	Do	not	call	clean_up_Units_t()	on	unitialized	pointers!
+	*	Initialize/Define	pointers	at	declaration
+	*	Declared	pointers	that	don't	point	to	a	valid	address	or	NULL	will
+	*	cause	an	error
 **********************************************************************/
 
-void clean_up_Units_t(Units_t** ptr)
+void	clean_up_Units_t(Units_t**	ptr)
 {
-  if(*ptr != (Units_t*) NULL)
-  {
-      delete *ptr;
-  }
-  else
-  {
-    std::cerr << "WARNING: Call to clean_up_Units_t() on a NULL pointer" << std::endl
-              << "Calling function should check for non-NULL value of pointer" << std::endl
-              << "before calling clean_up_Units_t()" << std::endl;
-  }
-  *ptr = (Units_t*) NULL;
+		if(*ptr	!=	(Units_t*)	NULL)
+		{
+						delete	*ptr;
+		}
+		else
+		{
+				std::cerr	<<	"WARNING:	Call	to	clean_up_Units_t()	on	a	NULL	pointer"	<<	std::endl
+														<<	"Calling	function	should	check	for	non-NULL	value	of	pointer"	<<	std::endl
+														<<	"before	calling	clean_up_Units_t()"	<<	std::endl;
+		}
+		*ptr	=	(Units_t*)	NULL;
 }
 
-TEST(UnitsInterface, BogusUnit)
+TEST(UnitsInterface,	BogusUnit)
 {
-  Units_t *Bogus = (Units_t*) NULL;
+		Units_t	*Bogus	=	(Units_t*)	NULL;
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
 
-  ASSERT_EQ((Units_t*) NULL, Bogus = new_units("foo"));
+		ASSERT_EQ((Units_t*)	NULL,	Bogus	=	new_units("foo"));
 }
 
-TEST(UnitsInterface, Newton_to_Pound)
+TEST(UnitsInterface,	Newton_to_Pound)
 {
-  UnitsConvFn_t Newton_to_Pound;
-  UnitsConvFn_t Newton_to_Pound2;
-  Units_t* Newton = (Units_t*) NULL;
-  Units_t* Pound = (Units_t*) NULL;
-  double pounds;
+		UnitsConvFn_t	Newton_to_Pound;
+		UnitsConvFn_t	Newton_to_Pound2;
+		Units_t*	Newton	=	(Units_t*)	NULL;
+		Units_t*	Pound	=	(Units_t*)	NULL;
+		double	pounds;
 
-  ASSERT_EQ(CONV_OK, conv_fn_s("kg*m/s2", "lbm*ft/s2", &Newton_to_Pound));
+		ASSERT_EQ(CONV_OK,	conv_fn_s("kg*m/s2",	"lbm*ft/s2",	&Newton_to_Pound));
 
-  Newton = new_units("kg*m/s2");
-  Pound = new_units("lbm*ft/s2");
+		Newton	=	new_units("kg*m/s2");
+		Pound	=	new_units("lbm*ft/s2");
 
-  ASSERT_NE((Units_t*) NULL, Newton);
-  ASSERT_NE((Units_t*) NULL, Pound);
+		ASSERT_NE((Units_t*)	NULL,	Newton);
+		ASSERT_NE((Units_t*)	NULL,	Pound);
 
-  ASSERT_EQ(CONV_OK, conv_fn_u(Newton, Pound, &Newton_to_Pound2));
+		ASSERT_EQ(CONV_OK,	conv_fn_u(Newton,	Pound,	&Newton_to_Pound2));
 
-  EXPECT_EQ(0, memcmp(&Newton_to_Pound, &Newton_to_Pound2, sizeof(UnitsConvFn_t)));
+		EXPECT_EQ(0,	memcmp(&Newton_to_Pound,	&Newton_to_Pound2,	sizeof(UnitsConvFn_t)));
 
-  pounds = convert_units(1.0, &Newton_to_Pound);
+		pounds	=	convert_units(1.0,	&Newton_to_Pound);
 
-  ASSERT_NEAR((1.0/(0.45359237*0.3048)), pounds, TOL);
+		ASSERT_NEAR((1.0/(0.45359237*0.3048)),	pounds,	TOL);
 
-  clean_up_Units_t(&Newton);
-  clean_up_Units_t(&Pound);
-  ASSERT_EQ((Units_t*) NULL, Newton);
-  ASSERT_EQ((Units_t*) NULL, Pound);
+		clean_up_Units_t(&Newton);
+		clean_up_Units_t(&Pound);
+		ASSERT_EQ((Units_t*)	NULL,	Newton);
+		ASSERT_EQ((Units_t*)	NULL,	Pound);
 }
diff --git a/trick_source/trick_utils/units/test/UnitTestSuite.cpp b/trick_source/trick_utils/units/test/UnitTestSuite.cpp
index 310184422..421e80ca9 100644
--- a/trick_source/trick_utils/units/test/UnitTestSuite.cpp
+++ b/trick_source/trick_utils/units/test/UnitTestSuite.cpp
@@ -1,831 +1,831 @@
 
-#include <gtest/gtest.h>
-#include "trick/Unit.hh"
-#include <math.h>
-//#include "trick_utils/reqs/include/RequirementScribe.hh"
+#include	<gtest/gtest.h>
+#include	"trick/Unit.hh"
+#include	<math.h>
+//#include	"trick_utils/reqs/include/RequirementScribe.hh"
 
 /*********************FIXME**********************************************************************************
- * 1. The behavior of the conversion between composite units containing
- * temperature (an offest) is defined arbitrarily in the source code, namely, that conversion
- * between units of temperature occurs first within a product containing
- * temperature, and the offset of the temperature conversion is ignored
- * within a ratio containing temperature.
- * This presents a problem for a user who wants to use a behavior which differs
- * from that described above. Realisitically, the impact of this
- * problem is minimal since the use of temperature in composite units rarely occurs
- * in application.
- *
- * 2. The use of Unit::CONVERSION_ERROR as the only exception for unit is misleading.
- * Unit::CONVERSION_ERROR is thrown during invalid unit conversions, but also when
- * initializing invalid units. Possible solutions include a broader reaching name
- * or the inclusion of another exception.
- *
- * 3. The use of multiplication in denominator of a ratio violates order of operations
- * kg*m/s*s = kg*m/s/s. It is misleading since multiplication seems to equate to division.
- * A possible solution would be to allow the multiplication in the denominator within parentheses.
- *
- * 4. Within the units_conv.c file in the table of units and conversion factors at line 463
- *    The conversion of ounces to newtons is given as 0.27801385. This conversion can be obtained with more
- *    precision by using the conversion from pound(force) to Newton and dividing by 16. That is the conversion
- *    of ounces to newtons can be written as 4.4482216152605/16 = 0.27801385095378. Note
- *    that only 14 significant figures are given in 4.4482216152605 and only 14 are used in the result.
- *    After revision of the conversion rate, the tolerance used in the test (around line 348) can
- *    be lowered to reflect the increase in precision.
- *
- * 5. Within the units_conv.c file at line 428 the conversion rate of arcseconds to radians is given as 4.848136811095362e-6
- *    The conversion rate should be pi/(180*60*60). When doing this division with 20 digits of pi, then the result
- *    is 4.8481368110953599...e-6. To double floating point precision that is 4.848136811095360e-6. After correction,
- *    then the tolerance can be lowered to reflect the increase in precision.
- *
- * --Taylor Dowlen
-* **********************************************************************************************************/
-
-
-#define TOL 1e-7
-#define PI 3.14159265358979323846
-
-namespace Trick {
-
-double tolerance(int exp)
-{
-  return pow(10, exp);
+	*	1.	The	behavior	of	the	conversion	between	composite	units	containing
+	*	temperature	(an	offest)	is	defined	arbitrarily	in	the	source	code,	namely,	that	conversion
+	*	between	units	of	temperature	occurs	first	within	a	product	containing
+	*	temperature,	and	the	offset	of	the	temperature	conversion	is	ignored
+	*	within	a	ratio	containing	temperature.
+	*	This	presents	a	problem	for	a	user	who	wants	to	use	a	behavior	which	differs
+	*	from	that	described	above.	Realisitically,	the	impact	of	this
+	*	problem	is	minimal	since	the	use	of	temperature	in	composite	units	rarely	occurs
+	*	in	application.
+	*
+	*	2.	The	use	of	Unit::CONVERSION_ERROR	as	the	only	exception	for	unit	is	misleading.
+	*	Unit::CONVERSION_ERROR	is	thrown	during	invalid	unit	conversions,	but	also	when
+	*	initializing	invalid	units.	Possible	solutions	include	a	broader	reaching	name
+	*	or	the	inclusion	of	another	exception.
+	*
+	*	3.	The	use	of	multiplication	in	denominator	of	a	ratio	violates	order	of	operations
+	*	kg*m/s*s	=	kg*m/s/s.	It	is	misleading	since	multiplication	seems	to	equate	to	division.
+	*	A	possible	solution	would	be	to	allow	the	multiplication	in	the	denominator	within	parentheses.
+	*
+	*	4.	Within	the	units_conv.c	file	in	the	table	of	units	and	conversion	factors	at	line	463
+	*				The	conversion	of	ounces	to	newtons	is	given	as	0.27801385.	This	conversion	can	be	obtained	with	more
+	*				precision	by	using	the	conversion	from	pound(force)	to	Newton	and	dividing	by	16.	That	is	the	conversion
+	*				of	ounces	to	newtons	can	be	written	as	4.4482216152605/16	=	0.27801385095378.	Note
+	*				that	only	14	significant	figures	are	given	in	4.4482216152605	and	only	14	are	used	in	the	result.
+	*				After	revision	of	the	conversion	rate,	the	tolerance	used	in	the	test	(around	line	348)	can
+	*				be	lowered	to	reflect	the	increase	in	precision.
+	*
+	*	5.	Within	the	units_conv.c	file	at	line	428	the	conversion	rate	of	arcseconds	to	radians	is	given	as	4.848136811095362e-6
+	*				The	conversion	rate	should	be	pi/(180*60*60).	When	doing	this	division	with	20	digits	of	pi,	then	the	result
+	*				is	4.8481368110953599...e-6.	To	double	floating	point	precision	that	is	4.848136811095360e-6.	After	correction,
+	*				then	the	tolerance	can	be	lowered	to	reflect	the	increase	in	precision.
+	*
+	*	--Taylor	Dowlen
+*	**********************************************************************************************************/
+
+
+#define	TOL	1e-7
+#define	PI	3.14159265358979323846
+
+namespace	Trick	{
+
+double	tolerance(int	exp)
+{
+		return	pow(10,	exp);
 }
 
 /*********************WARNING******************************************
- * 1. Conversion_to allocates memory for a UCFn object using new
- * Use clean_up_UCFn() to deallocate the memory and set the pointer to NULL
- *
- * 2. Do not call clean_up_UCFn() on unitialized pointers!
- * Initialize/Define pointers at declaration
- * Declared pointers that don't point to a valid address or NULL will
- * cause an error
+	*	1.	Conversion_to	allocates	memory	for	a	UCFn	object	using	new
+	*	Use	clean_up_UCFn()	to	deallocate	the	memory	and	set	the	pointer	to	NULL
+	*
+	*	2.	Do	not	call	clean_up_UCFn()	on	unitialized	pointers!
+	*	Initialize/Define	pointers	at	declaration
+	*	Declared	pointers	that	don't	point	to	a	valid	address	or	NULL	will
+	*	cause	an	error
 **********************************************************************/
 
-#if 0
-void units_requirements(bool isThrow) {
-  Trick::RequirementScribe req;
+#if	0
+void	units_requirements(bool	isThrow)	{
+		Trick::RequirementScribe	req;
 
-  if (isThrow) {
-    req.add_requirement("3321868560");
-  } else {
-      req.add_requirement("1724238641");
-  }
+		if	(isThrow)	{
+				req.add_requirement("3321868560");
+		}	else	{
+						req.add_requirement("1724238641");
+		}
 
 }
 #endif
 
-void clean_up_UCFn(UCFn** ptr)
+void	clean_up_UCFn(UCFn**	ptr)
 {
-  if(*ptr != (UCFn*) NULL)
-  {
-      delete *ptr;
-  }
-  else
-  {
-    std::cerr << "WARNING: Call to clean_up_UCFn() on a NULL pointer" << std::endl
-              << "Calling function should check for non-NULL value of pointer" << std::endl
-              << "before calling clean_up_UCFn()" << std::endl;
-  }
-  *ptr = (UCFn*) NULL;
+		if(*ptr	!=	(UCFn*)	NULL)
+		{
+						delete	*ptr;
+		}
+		else
+		{
+				std::cerr	<<	"WARNING:	Call	to	clean_up_UCFn()	on	a	NULL	pointer"	<<	std::endl
+														<<	"Calling	function	should	check	for	non-NULL	value	of	pointer"	<<	std::endl
+														<<	"before	calling	clean_up_UCFn()"	<<	std::endl;
+		}
+		*ptr	=	(UCFn*)	NULL;
 }
 
-void test_conversion_no_throw(std::string unitString1, std::string unitString2, double expected_offset, double expected_scale, double tolerance = TOL)
+void	test_conversion_no_throw(std::string	unitString1,	std::string	unitString2,	double	expected_offset,	double	expected_scale,	double	tolerance	=	TOL)
 {
-  ASSERT_NO_THROW(Unit unit1(unitString1.c_str()));
-  ASSERT_NO_THROW(Unit unit2(unitString2.c_str()));
+		ASSERT_NO_THROW(Unit	unit1(unitString1.c_str()));
+		ASSERT_NO_THROW(Unit	unit2(unitString2.c_str()));
 
-  Unit unit1(unitString1.c_str());
-  Unit unit2(unitString2.c_str());
-  UCFn *cf = (UCFn*) NULL;
+		Unit	unit1(unitString1.c_str());
+		Unit	unit2(unitString2.c_str());
+		UCFn	*cf	=	(UCFn*)	NULL;
 
-  ASSERT_NO_THROW(cf = unit1.Conversion_to(&unit2));
+		ASSERT_NO_THROW(cf	=	unit1.Conversion_to(&unit2));
 
-  EXPECT_NEAR(expected_offset, cf->C[0], tolerance );
-  EXPECT_NEAR(expected_scale,  cf->C[1], tolerance );
+		EXPECT_NEAR(expected_offset,	cf->C[0],	tolerance	);
+		EXPECT_NEAR(expected_scale,		cf->C[1],	tolerance	);
 
-  clean_up_UCFn(&cf);
-  ASSERT_EQ((UCFn*) NULL, cf);
+		clean_up_UCFn(&cf);
+		ASSERT_EQ((UCFn*)	NULL,	cf);
 
-  //units_requirements(false);
+		//units_requirements(false);
 
 }
 
-void test_conversion_no_expect(std::string unitString1, std::string unitString2)
+void	test_conversion_no_expect(std::string	unitString1,	std::string	unitString2)
 {
-  ASSERT_NO_THROW(Unit unit1(unitString1.c_str()));
-  ASSERT_NO_THROW(Unit unit2(unitString2.c_str()));
+		ASSERT_NO_THROW(Unit	unit1(unitString1.c_str()));
+		ASSERT_NO_THROW(Unit	unit2(unitString2.c_str()));
 
-  Unit unit1(unitString1.c_str());
-  Unit unit2(unitString2.c_str());
-  UCFn *cf = (UCFn*) NULL;
+		Unit	unit1(unitString1.c_str());
+		Unit	unit2(unitString2.c_str());
+		UCFn	*cf	=	(UCFn*)	NULL;
 
-  ASSERT_NO_THROW(cf = unit1.Conversion_to(&unit2));
+		ASSERT_NO_THROW(cf	=	unit1.Conversion_to(&unit2));
 
-  clean_up_UCFn(&cf);
-  ASSERT_EQ((UCFn*) NULL, cf);
+		clean_up_UCFn(&cf);
+		ASSERT_EQ((UCFn*)	NULL,	cf);
 }
 
-void test_temperature_conversion(std::string unitString,
-                             double temperature,
-                             double expected_Celsius = 0.0,
-                             double expected_Kelvin = 0.0,
-                             double expected_Fahrenheit = 0.0,
-                             double expected_Rankine = 0.0,
-                             double tolerance = TOL)
+void	test_temperature_conversion(std::string	unitString,
+																													double	temperature,
+																													double	expected_Celsius	=	0.0,
+																													double	expected_Kelvin	=	0.0,
+																													double	expected_Fahrenheit	=	0.0,
+																													double	expected_Rankine	=	0.0,
+																													double	tolerance	=	TOL)
 {
-  ASSERT_NO_THROW(Unit unit(unitString.c_str()));
+		ASSERT_NO_THROW(Unit	unit(unitString.c_str()));
 
-  Unit unit(unitString.c_str());
+		Unit	unit(unitString.c_str());
 
-  double temp_Celsius = unit.Convert_to(temperature, "C");
-  double temp_Fahrenheit = unit.Convert_to(temperature, "F");
-  double temp_Kelvin = unit.Convert_to(temperature, "K");
-  double temp_Rankine = unit.Convert_to(temperature, "R");
+		double	temp_Celsius	=	unit.Convert_to(temperature,	"C");
+		double	temp_Fahrenheit	=	unit.Convert_to(temperature,	"F");
+		double	temp_Kelvin	=	unit.Convert_to(temperature,	"K");
+		double	temp_Rankine	=	unit.Convert_to(temperature,	"R");
 
-  EXPECT_NEAR(expected_Celsius, temp_Celsius, tolerance);
-  EXPECT_NEAR(expected_Fahrenheit, temp_Fahrenheit, tolerance);
-  EXPECT_NEAR(expected_Kelvin, temp_Kelvin, tolerance);
-  EXPECT_NEAR(expected_Rankine, temp_Rankine, tolerance);
+		EXPECT_NEAR(expected_Celsius,	temp_Celsius,	tolerance);
+		EXPECT_NEAR(expected_Fahrenheit,	temp_Fahrenheit,	tolerance);
+		EXPECT_NEAR(expected_Kelvin,	temp_Kelvin,	tolerance);
+		EXPECT_NEAR(expected_Rankine,	temp_Rankine,	tolerance);
 }
 
-void test_conversion_throw(std::string unitString1, std::string unitString2)
+void	test_conversion_throw(std::string	unitString1,	std::string	unitString2)
 {
-  ASSERT_NO_THROW(Unit unit1(unitString1.c_str()));
-  ASSERT_NO_THROW(Unit unit2(unitString2.c_str()));
+		ASSERT_NO_THROW(Unit	unit1(unitString1.c_str()));
+		ASSERT_NO_THROW(Unit	unit2(unitString2.c_str()));
 
-  Unit unit1(unitString1.c_str());
-  Unit unit2(unitString2.c_str());
-  UCFn* cf = (UCFn*) NULL;
+		Unit	unit1(unitString1.c_str());
+		Unit	unit2(unitString2.c_str());
+		UCFn*	cf	=	(UCFn*)	NULL;
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
 
-  ASSERT_THROW(cf = unit1.Conversion_to(&unit2), Unit::CONVERSION_ERROR);
+		ASSERT_THROW(cf	=	unit1.Conversion_to(&unit2),	Unit::CONVERSION_ERROR);
 
-  if(cf!= (UCFn*) NULL)
-  {
-    clean_up_UCFn(&cf);
-  }
-  ASSERT_EQ((UCFn*) NULL, cf);
+		if(cf!=	(UCFn*)	NULL)
+		{
+				clean_up_UCFn(&cf);
+		}
+		ASSERT_EQ((UCFn*)	NULL,	cf);
 
-  //units_requirements(true);
+		//units_requirements(true);
 }
 
-class UnitConversion : public ::testing::Test {
+class	UnitConversion	:	public	::testing::Test	{
 
-    protected:
-        //Trick::RequirementScribe testReq;
+				protected:
+								//Trick::RequirementScribe	testReq;
 
-        UnitConversion() {}
-        ~UnitConversion() {}
-        virtual void SetUp() {}
-        virtual void TearDown() {}
+								UnitConversion()	{}
+								~UnitConversion()	{}
+								virtual	void	SetUp()	{}
+								virtual	void	TearDown()	{}
 
 };
 
-// Time Conversions
-TEST_F(UnitConversion, SecondToSecond)
+//	Time	Conversions
+TEST_F(UnitConversion,	SecondToSecond)
 {
-  test_conversion_no_throw("s", "s", 0.0, 1.0, TOL);
+		test_conversion_no_throw("s",	"s",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, SecondToMinute)
+TEST_F(UnitConversion,	SecondToMinute)
 {
-  test_conversion_no_throw("s", "min", 0.0, (1.0/60.0), TOL);
+		test_conversion_no_throw("s",	"min",	0.0,	(1.0/60.0),	TOL);
 }
 
-TEST_F(UnitConversion, SecondToHour)
+TEST_F(UnitConversion,	SecondToHour)
 {
-  test_conversion_no_throw("s", "hr", 0.0, (1.0/(60.0*60.0)), TOL);
+		test_conversion_no_throw("s",	"hr",	0.0,	(1.0/(60.0*60.0)),	TOL);
 }
 
-TEST_F(UnitConversion, SecondToDay)
+TEST_F(UnitConversion,	SecondToDay)
 {
-  test_conversion_no_throw("s", "day", 0.0, (1.0/(60.0*60.0*24.0)), TOL);
+		test_conversion_no_throw("s",	"day",	0.0,	(1.0/(60.0*60.0*24.0)),	TOL);
 }
 
-TEST_F(UnitConversion, MinuteToSecond)
+TEST_F(UnitConversion,	MinuteToSecond)
 {
-  test_conversion_no_throw("min", "s", 0.0, 60.0, TOL);
+		test_conversion_no_throw("min",	"s",	0.0,	60.0,	TOL);
 }
 
-TEST_F(UnitConversion, HourToSecond)
+TEST_F(UnitConversion,	HourToSecond)
 {
-  test_conversion_no_throw("hr", "s", 0.0, (60.0*60.0), TOL);
+		test_conversion_no_throw("hr",	"s",	0.0,	(60.0*60.0),	TOL);
 }
 
-TEST_F(UnitConversion, DayToSecond)
+TEST_F(UnitConversion,	DayToSecond)
 {
-  test_conversion_no_throw("day", "s", 0.0, (60.0*60.0*24.0), TOL);
+		test_conversion_no_throw("day",	"s",	0.0,	(60.0*60.0*24.0),	TOL);
 }
 
-//Length Conversion
+//Length	Conversion
 
-TEST_F(UnitConversion, MeterToMeter)
+TEST_F(UnitConversion,	MeterToMeter)
 {
-  test_conversion_no_throw("m", "m", 0.0, 1.0, TOL);
+		test_conversion_no_throw("m",	"m",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, MeterToFeet)
+TEST_F(UnitConversion,	MeterToFeet)
 {
-  test_conversion_no_throw("m", "ft", 0.0, (1.0/0.3048), TOL);
+		test_conversion_no_throw("m",	"ft",	0.0,	(1.0/0.3048),	TOL);
 }
 
-TEST_F(UnitConversion, MeterToInch)
+TEST_F(UnitConversion,	MeterToInch)
 {
-  test_conversion_no_throw("m", "in", 0.0, (12.0/0.3048), TOL);
+		test_conversion_no_throw("m",	"in",	0.0,	(12.0/0.3048),	TOL);
 }
 
 
-TEST_F(UnitConversion, MeterToMilli)
+TEST_F(UnitConversion,	MeterToMilli)
 {
-  test_conversion_no_throw("m", "mm", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("m",	"mm",	0.0,	1000.0,	TOL);
 }
 
-TEST_F(UnitConversion, MeterToCenti)
+TEST_F(UnitConversion,	MeterToCenti)
 {
-  test_conversion_no_throw("m", "cm", 0.0, 100.0, TOL);
+		test_conversion_no_throw("m",	"cm",	0.0,	100.0,	TOL);
 }
 
-TEST_F(UnitConversion, MeterToKilometer)
+TEST_F(UnitConversion,	MeterToKilometer)
 {
-  test_conversion_no_throw("m", "km", 0.0, (1.0/1000.0), TOL);
+		test_conversion_no_throw("m",	"km",	0.0,	(1.0/1000.0),	TOL);
 }
 
-TEST_F(UnitConversion, MeterToYard)
+TEST_F(UnitConversion,	MeterToYard)
 {
-  test_conversion_no_throw("m", "yd", 0.0, (1.0/(0.3048*3.0)), TOL);
+		test_conversion_no_throw("m",	"yd",	0.0,	(1.0/(0.3048*3.0)),	TOL);
 }
 
-TEST_F(UnitConversion, MeterToMile)
+TEST_F(UnitConversion,	MeterToMile)
 {
-  test_conversion_no_throw("m", "mi", 0.0, (1.0/(0.3048*5280.0)), TOL);
+		test_conversion_no_throw("m",	"mi",	0.0,	(1.0/(0.3048*5280.0)),	TOL);
 }
 
-TEST_F(UnitConversion, MeterToNautMile)
+TEST_F(UnitConversion,	MeterToNautMile)
 {
-  test_conversion_no_throw("m", "n.m.", 0.0, (1.0/1852.0), TOL);
+		test_conversion_no_throw("m",	"n.m.",	0.0,	(1.0/1852.0),	TOL);
 }
 
-TEST_F(UnitConversion, MeterToKilofoot)
+TEST_F(UnitConversion,	MeterToKilofoot)
 {
-  test_conversion_no_throw("m", "kft", 0.0, (1.0/(1000.0*0.3048)), TOL);
+		test_conversion_no_throw("m",	"kft",	0.0,	(1.0/(1000.0*0.3048)),	TOL);
 }
 
 
-TEST_F(UnitConversion, FootToInch)
+TEST_F(UnitConversion,	FootToInch)
 {
-  test_conversion_no_throw("ft", "in", 0.0, 12.0, TOL);
+		test_conversion_no_throw("ft",	"in",	0.0,	12.0,	TOL);
 }
 
-TEST_F(UnitConversion, YardToFoot)
+TEST_F(UnitConversion,	YardToFoot)
 {
-  test_conversion_no_throw("yd", "ft", 0.0, 3.0, TOL);
+		test_conversion_no_throw("yd",	"ft",	0.0,	3.0,	TOL);
 }
 
-TEST_F(UnitConversion, YardToInch)
+TEST_F(UnitConversion,	YardToInch)
 {
-  test_conversion_no_throw("yd", "in", 0.0, (3.0*12.0), TOL);
+		test_conversion_no_throw("yd",	"in",	0.0,	(3.0*12.0),	TOL);
 }
 
-TEST_F(UnitConversion, MileToFeet)
+TEST_F(UnitConversion,	MileToFeet)
 {
-  test_conversion_no_throw("mi", "ft", 0.0, 5280.0, TOL);
+		test_conversion_no_throw("mi",	"ft",	0.0,	5280.0,	TOL);
 }
 
 
-TEST_F(UnitConversion, NautMileToFeet)
+TEST_F(UnitConversion,	NautMileToFeet)
 {
-  test_conversion_no_throw("n.m.", "ft", 0.0, (1852.0/0.3048), TOL);
+		test_conversion_no_throw("n.m.",	"ft",	0.0,	(1852.0/0.3048),	TOL);
 }
 
-TEST_F(UnitConversion, KilofootToFeet)
+TEST_F(UnitConversion,	KilofootToFeet)
 {
-  test_conversion_no_throw("kft", "ft", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("kft",	"ft",	0.0,	1000.0,	TOL);
 }
 
-//Angle Conversion
+//Angle	Conversion
 
-TEST_F(UnitConversion, RadToRad)
+TEST_F(UnitConversion,	RadToRad)
 {
-  test_conversion_no_throw("r", "r", 0.0, 1.0, TOL);
+		test_conversion_no_throw("r",	"r",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, RadToDeg)
+TEST_F(UnitConversion,	RadToDeg)
 {
-  test_conversion_no_throw("r", "d", 0.0, (180.0/PI), TOL);
+		test_conversion_no_throw("r",	"d",	0.0,	(180.0/PI),	TOL);
 }
 
-TEST_F(UnitConversion, RadToArcSec)
+TEST_F(UnitConversion,	RadToArcSec)
 {
-  test_conversion_no_throw("r", "as", 0.0, (180.0*60.0*60.0/PI), tolerance(-9));
+		test_conversion_no_throw("r",	"as",	0.0,	(180.0*60.0*60.0/PI),	tolerance(-9));
 }
 
-TEST_F(UnitConversion, RadToArcMin)
+TEST_F(UnitConversion,	RadToArcMin)
 {
-  test_conversion_no_throw("r", "am", 0.0, (180.0*60.0/PI), TOL);
+		test_conversion_no_throw("r",	"am",	0.0,	(180.0*60.0/PI),	TOL);
 }
 
-TEST_F(UnitConversion, RadToRev)
+TEST_F(UnitConversion,	RadToRev)
 {
-  test_conversion_no_throw("r", "rev", 0.0, (1.0/(2.0*PI)), TOL);
+		test_conversion_no_throw("r",	"rev",	0.0,	(1.0/(2.0*PI)),	TOL);
 }
 
-TEST_F(UnitConversion, RadToMilliRad)
+TEST_F(UnitConversion,	RadToMilliRad)
 {
-  test_conversion_no_throw("r", "mr", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("r",	"mr",	0.0,	1000.0,	TOL);
 }
 
-TEST_F(UnitConversion, RevToDeg)
+TEST_F(UnitConversion,	RevToDeg)
 {
-  test_conversion_no_throw("rev", "d", 0.0, 360.0, TOL);
+		test_conversion_no_throw("rev",	"d",	0.0,	360.0,	TOL);
 }
 
-TEST_F(UnitConversion, RevToRad)
+TEST_F(UnitConversion,	RevToRad)
 {
-  test_conversion_no_throw("rev", "r", 0.0, 2*PI, TOL);
+		test_conversion_no_throw("rev",	"r",	0.0,	2*PI,	TOL);
 }
 
-TEST_F(UnitConversion, ArcMinToDeg)
+TEST_F(UnitConversion,	ArcMinToDeg)
 {
-  test_conversion_no_throw("am", "d", 0.0, (1.0/60.0), TOL);
+		test_conversion_no_throw("am",	"d",	0.0,	(1.0/60.0),	TOL);
 }
 
-TEST_F(UnitConversion, ArcSecToDeg)
+TEST_F(UnitConversion,	ArcSecToDeg)
 {
-  test_conversion_no_throw("as", "d", 0.0, (1.0/(60.0*60.0)), TOL);
+		test_conversion_no_throw("as",	"d",	0.0,	(1.0/(60.0*60.0)),	TOL);
 }
 
-//Mass Conversions
+//Mass	Conversions
 
-TEST_F(UnitConversion, KilogramToKilogram)
+TEST_F(UnitConversion,	KilogramToKilogram)
 {
-  test_conversion_no_throw("kg", "kg", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg",	"kg",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, KilogramToSlug)
+TEST_F(UnitConversion,	KilogramToSlug)
 {
-  test_conversion_no_throw("kg", "sl", 0.0, (1.0/14.59390), TOL);
+		test_conversion_no_throw("kg",	"sl",	0.0,	(1.0/14.59390),	TOL);
 }
 
-TEST_F(UnitConversion, KilogramToPoundMass)
+TEST_F(UnitConversion,	KilogramToPoundMass)
 {
-  test_conversion_no_throw("kg", "lbm", 0.0, (1.0/0.45359237), TOL);
+		test_conversion_no_throw("kg",	"lbm",	0.0,	(1.0/0.45359237),	TOL);
 }
 
-TEST_F(UnitConversion, KilogramToGram)
+TEST_F(UnitConversion,	KilogramToGram)
 {
-  test_conversion_no_throw("kg", "g", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("kg",	"g",	0.0,	1000.0,	TOL);
 }
 
-TEST_F(UnitConversion, KilogramToMetricTon)
+TEST_F(UnitConversion,	KilogramToMetricTon)
 {
-  test_conversion_no_throw("kg", "mt", 0.0, (1.0/1000.0), TOL);
+		test_conversion_no_throw("kg",	"mt",	0.0,	(1.0/1000.0),	TOL);
 }
 
-TEST_F(UnitConversion, MetricTonToKilogram)
+TEST_F(UnitConversion,	MetricTonToKilogram)
 {
-  test_conversion_no_throw("mt", "kg", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("mt",	"kg",	0.0,	1000.0,	TOL);
 }
 
-//Force Conversions
+//Force	Conversions
 
-TEST_F(UnitConversion, NewtonToNewton)
+TEST_F(UnitConversion,	NewtonToNewton)
 {
-  test_conversion_no_throw("N", "N", 0.0, 1.0, TOL);
+		test_conversion_no_throw("N",	"N",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, NewtonToKiloNewton)
+TEST_F(UnitConversion,	NewtonToKiloNewton)
 {
-  test_conversion_no_throw("N", "kN", 0.0, (1.0/1000.0), TOL);
+		test_conversion_no_throw("N",	"kN",	0.0,	(1.0/1000.0),	TOL);
 }
 
-TEST_F(UnitConversion, NewtonToOunce)
+TEST_F(UnitConversion,	NewtonToOunce)
 {
-  test_conversion_no_throw("N", "oz", 0.0, 3.596944, tolerance(-5));
+		test_conversion_no_throw("N",	"oz",	0.0,	3.596944,	tolerance(-5));
 }
 
-TEST_F(UnitConversion, NewtonToPoundForce)
+TEST_F(UnitConversion,	NewtonToPoundForce)
 {
-  test_conversion_no_throw("N", "lbf", 0.0, 0.224809, TOL);
+		test_conversion_no_throw("N",	"lbf",	0.0,	0.224809,	TOL);
 }
 
-//Voltage Conversions
+//Voltage	Conversions
 
-TEST_F(UnitConversion, VoltToVolt)
+TEST_F(UnitConversion,	VoltToVolt)
 {
-  test_conversion_no_throw("v", "v", 0.0, 1.0, TOL);
+		test_conversion_no_throw("v",	"v",	0.0,	1.0,	TOL);
 }
 
 
-TEST_F(UnitConversion, VoltToKiloVolt)
+TEST_F(UnitConversion,	VoltToKiloVolt)
 {
-  test_conversion_no_throw("v", "kv", 0.0, (1.0/1000.0), TOL);
+		test_conversion_no_throw("v",	"kv",	0.0,	(1.0/1000.0),	TOL);
 }
 
-//Current Conversions
+//Current	Conversions
 
-TEST_F(UnitConversion, AmpToAmp)
+TEST_F(UnitConversion,	AmpToAmp)
 {
-  test_conversion_no_throw("amp", "amp", 0.0, 1.0, TOL);
+		test_conversion_no_throw("amp",	"amp",	0.0,	1.0,	TOL);
 }
 
 
-TEST_F(UnitConversion, AmpToMilliAmp)
+TEST_F(UnitConversion,	AmpToMilliAmp)
 {
-  test_conversion_no_throw("amp", "mamp", 0.0, 1000.0, TOL);
+		test_conversion_no_throw("amp",	"mamp",	0.0,	1000.0,	TOL);
 }
 
-//Unitless Conversions
+//Unitless	Conversions
 
-TEST_F(UnitConversion, DoubleDashToDoubleDash)
+TEST_F(UnitConversion,	DoubleDashToDoubleDash)
 {
-  test_conversion_no_throw("--", "--", 0.0, 1.0, TOL);
+		test_conversion_no_throw("--",	"--",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, DoubleDashToCount)
+TEST_F(UnitConversion,	DoubleDashToCount)
 {
-  test_conversion_no_throw("--", "cnt", 0.0, 1.0, TOL);
+		test_conversion_no_throw("--",	"cnt",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, DoubleDashToOne)
+TEST_F(UnitConversion,	DoubleDashToOne)
 {
-  test_conversion_no_throw("--", "one", 0.0, 1.0, TOL);
+		test_conversion_no_throw("--",	"one",	0.0,	1.0,	TOL);
 }
 
-//Frequency Conversions
+//Frequency	Conversions
 
-TEST_F(UnitConversion, HertzToHertz)
+TEST_F(UnitConversion,	HertzToHertz)
 {
-  test_conversion_no_throw("Hz", "Hz", 0.0, 1.0, TOL);
+		test_conversion_no_throw("Hz",	"Hz",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, HertzToMegaHertz)
+TEST_F(UnitConversion,	HertzToMegaHertz)
 {
-  test_conversion_no_throw("Hz", "MHz", 0.0, (1.0/1000000.0), TOL);
+		test_conversion_no_throw("Hz",	"MHz",	0.0,	(1.0/1000000.0),	TOL);
 }
 
-TEST_F(UnitConversion, HertzToGigaHertz)
+TEST_F(UnitConversion,	HertzToGigaHertz)
 {
-  test_conversion_no_throw("Hz", "GHz", 0.0, (1.0/1000000000.0), TOL);
+		test_conversion_no_throw("Hz",	"GHz",	0.0,	(1.0/1000000000.0),	TOL);
 }
 
-//Temperature Conversions
+//Temperature	Conversions
 
-TEST_F(UnitConversion, CelsiusToKelvin)
+TEST_F(UnitConversion,	CelsiusToKelvin)
 {
-  test_conversion_no_throw("C", "K", 273.15, 1.0, TOL);
+		test_conversion_no_throw("C",	"K",	273.15,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, CelsiusToFahrenheit)
+TEST_F(UnitConversion,	CelsiusToFahrenheit)
 {
-  test_conversion_no_throw("C", "F", 32.0, 1.8, TOL);
+		test_conversion_no_throw("C",	"F",	32.0,	1.8,	TOL);
 }
 
-TEST_F(UnitConversion, CelsiusToRankine)
+TEST_F(UnitConversion,	CelsiusToRankine)
 {
-  test_conversion_no_throw("C", "R", (1.8*273.15), 1.8, TOL);
+		test_conversion_no_throw("C",	"R",	(1.8*273.15),	1.8,	TOL);
 }
 
-TEST_F(UnitConversion, KelvinToCelsius)
+TEST_F(UnitConversion,	KelvinToCelsius)
 {
-  test_conversion_no_throw("K", "C", -273.15, 1.0, TOL);
+		test_conversion_no_throw("K",	"C",	-273.15,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, KelvinToFahrenheit)
+TEST_F(UnitConversion,	KelvinToFahrenheit)
 {
-  test_conversion_no_throw("K", "F", (-273.15*1.8+32), 1.8, TOL);
+		test_conversion_no_throw("K",	"F",	(-273.15*1.8+32),	1.8,	TOL);
 }
 
-TEST_F(UnitConversion, KelvinToRankine)
+TEST_F(UnitConversion,	KelvinToRankine)
 {
-  test_conversion_no_throw("K", "R", 0.0, 1.8, TOL);
+		test_conversion_no_throw("K",	"R",	0.0,	1.8,	TOL);
 }
 
-TEST_F(UnitConversion, RankineToCelsius)
+TEST_F(UnitConversion,	RankineToCelsius)
 {
-  test_conversion_no_throw("R", "C", -273.15, (5.0/9.0), TOL);
+		test_conversion_no_throw("R",	"C",	-273.15,	(5.0/9.0),	TOL);
 }
 
-TEST_F(UnitConversion, RankineToKelvin)
+TEST_F(UnitConversion,	RankineToKelvin)
 {
-  test_conversion_no_throw("R", "K", 0.0, (5.0/9.0), TOL);
+		test_conversion_no_throw("R",	"K",	0.0,	(5.0/9.0),	TOL);
 }
 
-TEST_F(UnitConversion, RankineToFahrenheit)
+TEST_F(UnitConversion,	RankineToFahrenheit)
 {
-  test_conversion_no_throw("R", "F", (-273.15*1.8+32), 1.0, TOL);
+		test_conversion_no_throw("R",	"F",	(-273.15*1.8+32),	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, CelsiusZero)
+TEST_F(UnitConversion,	CelsiusZero)
 {
-  test_temperature_conversion("C", 0.0, 0.0, 273.15, 32.0, 491.67, TOL);
+		test_temperature_conversion("C",	0.0,	0.0,	273.15,	32.0,	491.67,	TOL);
 }
 
-TEST_F(UnitConversion, KelvinZero)
+TEST_F(UnitConversion,	KelvinZero)
 {
-  test_temperature_conversion("K", 0.0, -273.15, 0.0, -459.67, 0.0, TOL);
+		test_temperature_conversion("K",	0.0,	-273.15,	0.0,	-459.67,	0.0,	TOL);
 }
 
-TEST_F(UnitConversion, FahrenheitZero)
+TEST_F(UnitConversion,	FahrenheitZero)
 {
-  test_temperature_conversion("F", 0.0, (-160.0/9.0), ((-160.0/9.0)+273.15), 0.0, 459.67);
+		test_temperature_conversion("F",	0.0,	(-160.0/9.0),	((-160.0/9.0)+273.15),	0.0,	459.67);
 }
 
-TEST_F(UnitConversion, RankineZero)
+TEST_F(UnitConversion,	RankineZero)
 {
-  test_temperature_conversion("R", 0.0, -273.15, 0.0, -459.67, 0.0, TOL);
+		test_temperature_conversion("R",	0.0,	-273.15,	0.0,	-459.67,	0.0,	TOL);
 }
 
-TEST_F(UnitConversion, CelsiusBodyTemp)
+TEST_F(UnitConversion,	CelsiusBodyTemp)
 {
-  test_temperature_conversion("C", 36.8, 36.8, 309.95, 98.24, 557.91, TOL);
+		test_temperature_conversion("C",	36.8,	36.8,	309.95,	98.24,	557.91,	TOL);
 }
 
-TEST_F(UnitConversion, KelvinBodyTemp)
+TEST_F(UnitConversion,	KelvinBodyTemp)
 {
-  test_temperature_conversion("K", 310.0, 36.85, 310.0, 98.33, 558.0, TOL);
+		test_temperature_conversion("K",	310.0,	36.85,	310.0,	98.33,	558.0,	TOL);
 }
 
-TEST_F(UnitConversion, FahrenheitBodyTemp)
+TEST_F(UnitConversion,	FahrenheitBodyTemp)
 {
-  test_temperature_conversion("F", 98.2, (331.0/9.0), (2789.35/9.0), 98.2, 557.87, TOL);
+		test_temperature_conversion("F",	98.2,	(331.0/9.0),	(2789.35/9.0),	98.2,	557.87,	TOL);
 }
 
-TEST_F(UnitConversion, RankineBodyTemp)
+TEST_F(UnitConversion,	RankineBodyTemp)
 {
-  test_temperature_conversion("R", 557.9, (331.15/9.0), (2789.5/9.0), 98.23, 557.9, TOL);
+		test_temperature_conversion("R",	557.9,	(331.15/9.0),	(2789.5/9.0),	98.23,	557.9,	TOL);
 }
 
-//Inverted Units
+//Inverted	Units
 
-TEST_F(UnitConversion, InvSecondsToInvMinutes)
+TEST_F(UnitConversion,	InvSecondsToInvMinutes)
 {
-test_conversion_no_throw("1/s", "1/min", 0.0, 60.0, TOL);
+test_conversion_no_throw("1/s",	"1/min",	0.0,	60.0,	TOL);
 }
 
-TEST_F(UnitConversion, InvMinutesToInvSeconds)
+TEST_F(UnitConversion,	InvMinutesToInvSeconds)
 {
-  test_conversion_no_throw("1/min", "1/s", 0.0, (1.0/60.0), TOL);
+		test_conversion_no_throw("1/min",	"1/s",	0.0,	(1.0/60.0),	TOL);
 }
 
-//Due to the arbitrary definition of the behavior of converstions of
-//composite units with temperature, no assertions are given as to the value of
-//the conversion function for such conversions. The tests only validate that
-//conversions are valid and throw no exeption.
+//Due	to	the	arbitrary	definition	of	the	behavior	of	converstions	of
+//composite	units	with	temperature,	no	assertions	are	given	as	to	the	value	of
+//the	conversion	function	for	such	conversions.	The	tests	only	validate	that
+//conversions	are	valid	and	throw	no	exeption.
 
-//Products Containing Temperature Pimitives
+//Products	Containing	Temperature	Pimitives
 
-TEST_F(UnitConversion, CelsiusSecondToFahrenheitMinute)
+TEST_F(UnitConversion,	CelsiusSecondToFahrenheitMinute)
 {
-  test_conversion_no_expect("C*s", "F*min");
+		test_conversion_no_expect("C*s",	"F*min");
 }
 
-TEST_F(UnitConversion, FahrenheitMinuteToCelsiusSecond)
+TEST_F(UnitConversion,	FahrenheitMinuteToCelsiusSecond)
 {
-  test_conversion_no_expect("F*min", "C*s");
+		test_conversion_no_expect("F*min",	"C*s");
 }
 
-//Products of a temperature primitive
+//Products	of	a	temperature	primitive
 
-TEST_F(UnitConversion, FahrenheitSquaredToFahrenheitSquared)
+TEST_F(UnitConversion,	FahrenheitSquaredToFahrenheitSquared)
 {
-  test_conversion_no_throw("F2", "F2", 0.0, 1.0, TOL);
+		test_conversion_no_throw("F2",	"F2",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, CelsiusFahrenheitToCelsiusFahrenheit)
+TEST_F(UnitConversion,	CelsiusFahrenheitToCelsiusFahrenheit)
 {
-  test_conversion_no_throw("C*F", "C*F", 0.0, 1.0, TOL);
+		test_conversion_no_throw("C*F",	"C*F",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, FahrenheitSquaredToCelsiusSquared)
+TEST_F(UnitConversion,	FahrenheitSquaredToCelsiusSquared)
 {
-  test_conversion_throw("F2", "C2");
+		test_conversion_throw("F2",	"C2");
 }
 
-TEST_F(UnitConversion, CelsiusSquaredToFahrenheitSquared)
+TEST_F(UnitConversion,	CelsiusSquaredToFahrenheitSquared)
 {
-  test_conversion_throw("C2", "F2");
+		test_conversion_throw("C2",	"F2");
 }
 
-TEST_F(UnitConversion, FahrenheitSquaredToCelsiusFahrenheit)
+TEST_F(UnitConversion,	FahrenheitSquaredToCelsiusFahrenheit)
 {
-  test_conversion_throw("F2", "C*F");
+		test_conversion_throw("F2",	"C*F");
 }
 
 
-//Ratios containing a temperature primitive
+//Ratios	containing	a	temperature	primitive
 
-TEST_F(UnitConversion, CelsiusPerSecondToFahrenheitPerSecond)
+TEST_F(UnitConversion,	CelsiusPerSecondToFahrenheitPerSecond)
 {
-  test_conversion_no_expect("C/s", "F/s");
+		test_conversion_no_expect("C/s",	"F/s");
 }
 
-TEST_F(UnitConversion, FahrenheitPerSecondToCelsiusPerSecond)
+TEST_F(UnitConversion,	FahrenheitPerSecondToCelsiusPerSecond)
 {
-  test_conversion_no_expect("F/s", "C/s");
+		test_conversion_no_expect("F/s",	"C/s");
 }
 
-TEST_F(UnitConversion, FahrenheitPerSecondToCelsiusPerMinute)
+TEST_F(UnitConversion,	FahrenheitPerSecondToCelsiusPerMinute)
 {
-  test_conversion_no_expect("F/s", "C/min");
+		test_conversion_no_expect("F/s",	"C/min");
 }
 
-//Complex Conversions
+//Complex	Conversions
 
-TEST_F(UnitConversion, CompositeNewtonToCompositePoundForce)
+TEST_F(UnitConversion,	CompositeNewtonToCompositePoundForce)
 {
-  test_conversion_no_throw("kg*m/s2", "lbm*ft/s*s", 0.0, (1/(0.45359237*0.3048)) , TOL);
+		test_conversion_no_throw("kg*m/s2",	"lbm*ft/s*s",	0.0,	(1/(0.45359237*0.3048))	,	TOL);
 }
 
-TEST_F(UnitConversion, CompositePoundForceToCompositeNewton)
+TEST_F(UnitConversion,	CompositePoundForceToCompositeNewton)
 {
-  test_conversion_no_throw("lbm*ft/s2", "kg*m/s*s", 0.0, (0.45359237*0.3048), TOL);
+		test_conversion_no_throw("lbm*ft/s2",	"kg*m/s*s",	0.0,	(0.45359237*0.3048),	TOL);
 }
 
-TEST_F(UnitConversion, FootPoundsToNewtonMeters)
+TEST_F(UnitConversion,	FootPoundsToNewtonMeters)
 {
-  test_conversion_no_throw("lbf*ft", "N*m", 0.0, (4.4482216152605*0.3048), TOL);
+		test_conversion_no_throw("lbf*ft",	"N*m",	0.0,	(4.4482216152605*0.3048),	TOL);
 }
 
-TEST_F(UnitConversion, FootPoundsToNewtonMetersWithConvertTo)
+TEST_F(UnitConversion,	FootPoundsToNewtonMetersWithConvertTo)
 {
-  //testReq.add_requirement("2060756805");
+		//testReq.add_requirement("2060756805");
 
-  ASSERT_NO_THROW(Unit NewtonMeter("N*m"));
-  Unit NewtonMeter("N*m");
-  ASSERT_NO_THROW(NewtonMeter.Convert_to(1, "lbf*ft"));
-  double result = NewtonMeter.Convert_to(1, "lbf*ft");
-  ASSERT_NEAR(1.0/(4.4482216152605*0.3048), result, TOL);
+		ASSERT_NO_THROW(Unit	NewtonMeter("N*m"));
+		Unit	NewtonMeter("N*m");
+		ASSERT_NO_THROW(NewtonMeter.Convert_to(1,	"lbf*ft"));
+		double	result	=	NewtonMeter.Convert_to(1,	"lbf*ft");
+		ASSERT_NEAR(1.0/(4.4482216152605*0.3048),	result,	TOL);
 }
 
-//Communtativity of factors
+//Communtativity	of	factors
 
-TEST_F(UnitConversion, CompositePoundForceToCompositeNewtonCommutative)
+TEST_F(UnitConversion,	CompositePoundForceToCompositeNewtonCommutative)
 {
-  test_conversion_no_throw("lbm*ft/s*s", "m*kg/s2", 0.0, (0.45359237*0.3048), TOL);
+		test_conversion_no_throw("lbm*ft/s*s",	"m*kg/s2",	0.0,	(0.45359237*0.3048),	TOL);
 }
 
-TEST_F(UnitConversion, CompositeNewtonToCompositePoundForceCommutative)
+TEST_F(UnitConversion,	CompositeNewtonToCompositePoundForceCommutative)
 {
-  test_conversion_no_throw("m*kg/s2", "lbm*ft/s*s", 0.0, (1/(0.45359237*0.3048)), TOL);
+		test_conversion_no_throw("m*kg/s2",	"lbm*ft/s*s",	0.0,	(1/(0.45359237*0.3048)),	TOL);
 }
 
-//Collection of Denominators
+//Collection	of	Denominators
 
-TEST_F(UnitConversion, PerSecondSquaredToPerSecondTimesSecond)
+TEST_F(UnitConversion,	PerSecondSquaredToPerSecondTimesSecond)
 {
-  test_conversion_no_throw("kg*m/s2", "kg*m/s*s", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s2",	"kg*m/s*s",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, PerSecondSquaredToPerSecondPerSecond)
+TEST_F(UnitConversion,	PerSecondSquaredToPerSecondPerSecond)
 {
-  test_conversion_no_throw("kg*m/s2", "kg*m/s/s", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s2",	"kg*m/s/s",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, PerSecondTimesSecondToPerSecondPerSecond)
+TEST_F(UnitConversion,	PerSecondTimesSecondToPerSecondPerSecond)
 {
-  test_conversion_no_throw("kg*m/s*s", "kg*m/s/s", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s*s",	"kg*m/s/s",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, PerSecondTimesSecondToPerSecondSquared)
+TEST_F(UnitConversion,	PerSecondTimesSecondToPerSecondSquared)
 {
-  test_conversion_no_throw("kg*m/s*s", "kg*m/s2", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s*s",	"kg*m/s2",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, PerSecondPerSecondToPerSecondTimesSecond)
+TEST_F(UnitConversion,	PerSecondPerSecondToPerSecondTimesSecond)
 {
-  test_conversion_no_throw("kg*m/s/s", "kg*m/s*s", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s/s",	"kg*m/s*s",	0.0,	1.0,	TOL);
 }
 
-TEST_F(UnitConversion, PerSecondPerSecondToPerSecondSquared)
+TEST_F(UnitConversion,	PerSecondPerSecondToPerSecondSquared)
 {
-  test_conversion_no_throw("kg*m/s/s", "kg*m/s2", 0.0, 1.0, TOL);
+		test_conversion_no_throw("kg*m/s/s",	"kg*m/s2",	0.0,	1.0,	TOL);
 }
 
-//Test getUnitName()
+//Test	getUnitName()
 
-TEST_F(UnitConversion, GetUnitName)
+TEST_F(UnitConversion,	GetUnitName)
 {
-  //testReq.add_requirement("");
+		//testReq.add_requirement("");
 
-  Unit meter_per_second_squared("m/s2");
-  std::string unit = "m/s2";
+		Unit	meter_per_second_squared("m/s2");
+		std::string	unit	=	"m/s2";
 
-  ASSERT_STRCASEEQ(unit.c_str(), meter_per_second_squared.getUnitName());
+		ASSERT_STRCASEEQ(unit.c_str(),	meter_per_second_squared.getUnitName());
 }
 
-//Testing setUnitName()
+//Testing	setUnitName()
 
-TEST_F(UnitConversion, SetUnitName)
+TEST_F(UnitConversion,	SetUnitName)
 {
-  //testReq.add_requirement("");
+		//testReq.add_requirement("");
 
-  Unit meter_per_second_squared("m/s2");
-  Unit copy;
-  UCFn *cf = (UCFn*) NULL;
+		Unit	meter_per_second_squared("m/s2");
+		Unit	copy;
+		UCFn	*cf	=	(UCFn*)	NULL;
 
-  copy.setUnitName("m/s2");
+		copy.setUnitName("m/s2");
 
-  ASSERT_NO_THROW(cf = meter_per_second_squared.Conversion_to(&copy));
+		ASSERT_NO_THROW(cf	=	meter_per_second_squared.Conversion_to(&copy));
 
-  EXPECT_NEAR(0.0, cf->C[0], TOL);
-  EXPECT_NEAR(1.0, cf->C[1], TOL);
+		EXPECT_NEAR(0.0,	cf->C[0],	TOL);
+		EXPECT_NEAR(1.0,	cf->C[1],	TOL);
 
-  clean_up_UCFn(&cf);
-  ASSERT_EQ((UCFn*) NULL, cf);
+		clean_up_UCFn(&cf);
+		ASSERT_EQ((UCFn*)	NULL,	cf);
 }
 
-//Syntax Error
+//Syntax	Error
 
-TEST_F(UnitConversion, InvalidUnit)
+TEST_F(UnitConversion,	InvalidUnit)
 {
-  //testReq.add_requirement("2743423356");
+		//testReq.add_requirement("2743423356");
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(Unit u("foo"), Unit::CONVERSION_ERROR);
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(Unit	u("foo"),	Unit::CONVERSION_ERROR);
 }
 
-TEST_F(UnitConversion, MissingProduct)
+TEST_F(UnitConversion,	MissingProduct)
 {
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(Unit u("C**m"), Unit::CONVERSION_ERROR);
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(Unit	u("C**m"),	Unit::CONVERSION_ERROR);
 }
 
-TEST_F(UnitConversion, InvalidExponent)
+TEST_F(UnitConversion,	InvalidExponent)
 {
-  //testReq.add_requirement("2743423356");
+		//testReq.add_requirement("2743423356");
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(Unit u("m4"), Unit::CONVERSION_ERROR);
-  ASSERT_NO_THROW(Unit u("m3"));
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(Unit	u("m4"),	Unit::CONVERSION_ERROR);
+		ASSERT_NO_THROW(Unit	u("m3"));
 }
 
-TEST_F(UnitConversion, InvalidRatio)
+TEST_F(UnitConversion,	InvalidRatio)
 {
-  //testReq.add_requirement("2743423356");
+		//testReq.add_requirement("2743423356");
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(Unit u("/C"), Unit::CONVERSION_ERROR);
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(Unit	u("/C"),	Unit::CONVERSION_ERROR);
 }
 
 
-TEST_F(UnitConversion, InvalidFootPound)
+TEST_F(UnitConversion,	InvalidFootPound)
 {
-  //testReq.add_requirement("2743423356");
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(Unit u("lbfft"), Unit::CONVERSION_ERROR);
+		//testReq.add_requirement("2743423356");
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(Unit	u("lbfft"),	Unit::CONVERSION_ERROR);
 }
 
-//Invalid Conversion Tests
-//Should throw an exception (exeption = PASS)
+//Invalid	Conversion	Tests
+//Should	throw	an	exception	(exeption	=	PASS)
 
-TEST_F(UnitConversion, NewtonMeterToInvalidFootPound)
+TEST_F(UnitConversion,	NewtonMeterToInvalidFootPound)
 {
-  //testReq.add_requirement("2743423356");
-  Unit unit1("N*m");
+		//testReq.add_requirement("2743423356");
+		Unit	unit1("N*m");
 
-  std::cerr << "The purpose of this test is to throw to an exception. Error messages are expected." << std::endl;
-  ASSERT_THROW(unit1.Convert_to(1.0, "lbfft"), Unit::CONVERSION_ERROR);
+		std::cerr	<<	"The	purpose	of	this	test	is	to	throw	to	an	exception.	Error	messages	are	expected."	<<	std::endl;
+		ASSERT_THROW(unit1.Convert_to(1.0,	"lbfft"),	Unit::CONVERSION_ERROR);
 }
 
-TEST_F(UnitConversion, CelsiusToMeter)
+TEST_F(UnitConversion,	CelsiusToMeter)
 {
-  test_conversion_throw("C", "m");
+		test_conversion_throw("C",	"m");
 }
 
-TEST_F(UnitConversion, MilliAmpsToKilogram)
+TEST_F(UnitConversion,	MilliAmpsToKilogram)
 {
-  test_conversion_throw("mamp", "kg");
+		test_conversion_throw("mamp",	"kg");
 }
 
-TEST_F(UnitConversion, VoltsToMegaHertz)
+TEST_F(UnitConversion,	VoltsToMegaHertz)
 {
-  test_conversion_throw("v", "MHz");
+		test_conversion_throw("v",	"MHz");
 }
 
-TEST_F(UnitConversion, RadianToDoubleDash)
+TEST_F(UnitConversion,	RadianToDoubleDash)
 {
-  test_conversion_throw("r", "--");
+		test_conversion_throw("r",	"--");
 }
 
-TEST_F(UnitConversion, DoubleDashToMeterPerSecondSquared)
+TEST_F(UnitConversion,	DoubleDashToMeterPerSecondSquared)
 {
-  test_conversion_throw("--", "m/s2");
+		test_conversion_throw("--",	"m/s2");
 }
 
-TEST_F(UnitConversion, SecondToMeterPerSecond)
+TEST_F(UnitConversion,	SecondToMeterPerSecond)
 {
-  test_conversion_throw("s", "m/s");
+		test_conversion_throw("s",	"m/s");
 }
 
-TEST_F(UnitConversion, KilogramMeterPerSecondToCount)
+TEST_F(UnitConversion,	KilogramMeterPerSecondToCount)
 {
-  test_conversion_throw("kg*m/s", "cnt");
+		test_conversion_throw("kg*m/s",	"cnt");
 }
 
-TEST_F(UnitConversion, KilogramMeterPerSecondToMeterSquared)
+TEST_F(UnitConversion,	KilogramMeterPerSecondToMeterSquared)
 {
-  test_conversion_throw("kg*m/s", "m2");
+		test_conversion_throw("kg*m/s",	"m2");
 }
 
 }
diff --git a/trick_source/web/CivetServer/src/MyCivetServer.cpp b/trick_source/web/CivetServer/src/MyCivetServer.cpp
index daafbfaa7..752062736 100644
--- a/trick_source/web/CivetServer/src/MyCivetServer.cpp
+++ b/trick_source/web/CivetServer/src/MyCivetServer.cpp
@@ -1,394 +1,394 @@
 /************************************************************************
-PURPOSE: (Represent the state and initial conditions for my server)
+PURPOSE:	(Represent	the	state	and	initial	conditions	for	my	server)
 **************************************************************************/
-#include <sys/stat.h> // for mkdir()
-#include <unistd.h>   // for symlink(), access()
-#include <stdlib.h>   // for getenv()
-#include <dirent.h>   // for opendir(), readdir()
-#include <iostream>
-#include <fstream>
-#include <string.h>
-#include <string>
-#include <sstream>
-
-#include "trick/MyCivetServer.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
-#include "trick/input_processor_proto.h"
-#include "trick/exec_proto.h"
-#include "simpleJSON.hh"
-#include "VariableServerSession.hh"
-#include "trick/WebSocketSession.hh"
-
-#ifndef SWIG
-#include "CivetServer.h"
+#include	<sys/stat.h>	//	for	mkdir()
+#include	<unistd.h>			//	for	symlink(),	access()
+#include	<stdlib.h>			//	for	getenv()
+#include	<dirent.h>			//	for	opendir(),	readdir()
+#include	<iostream>
+#include	<fstream>
+#include	<string.h>
+#include	<string>
+#include	<sstream>
+
+#include	"trick/MyCivetServer.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
+#include	"trick/input_processor_proto.h"
+#include	"trick/exec_proto.h"
+#include	"simpleJSON.hh"
+#include	"VariableServerSession.hh"
+#include	"trick/WebSocketSession.hh"
+
+#ifndef	SWIG
+#include	"CivetServer.h"
 #endif
 
-#include "../include/http_GET_handlers.hh"
-
-void MyCivetServer::deleteWebSocketSession(struct mg_connection * nc) {
-    std::map<mg_connection*, WebSocketSession*>::iterator iter;
-    pthread_mutex_lock(&WebSocketSessionMapLock);
-    iter = webSocketSessionMap.find(nc);
-    if (iter != webSocketSessionMap.end()) {
-        WebSocketSession* session = iter->second;
-        delete session;
-        webSocketSessionMap.erase(iter);
-    }
-    pthread_mutex_unlock(&WebSocketSessionMapLock);
+#include	"../include/http_GET_handlers.hh"
+
+void	MyCivetServer::deleteWebSocketSession(struct	mg_connection	*	nc)	{
+				std::map<mg_connection*,	WebSocketSession*>::iterator	iter;
+				pthread_mutex_lock(&WebSocketSessionMapLock);
+				iter	=	webSocketSessionMap.find(nc);
+				if	(iter	!=	webSocketSessionMap.end())	{
+								WebSocketSession*	session	=	iter->second;
+								delete	session;
+								webSocketSessionMap.erase(iter);
+				}
+				pthread_mutex_unlock(&WebSocketSessionMapLock);
 }
 
-static const char * style_css =
-    "h1 {"
-        "font-family: fantasy, cursive, serif;"
-        "font-size: 32px;"
-        "margin-left: 1em;"
-    "}"
-    "h2 {"
-        "font-family: sans-serif;"
-        "font-size: 18px;"
-        "margin-left: 1em;"
-    "}"
-    "a {"
-        "font-family: sans-serif;"
-        "font-size: 16px;"
-    "}"
-    "div.header { background-image: linear-gradient(#afafff, white); }";
-
-static const char * index_html =
-    "<!DOCTYPE html>\n"
-    "<html>\n"
-    "<head>\n"
-        "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">\n"
-        "<title>Trick Simulation</title>\n"
-        "<div class=\"header\">\n"
-            "<table>\n"
-                "<th><img src=\"images/trick_icon.png\" height=\"64\" width=\"64\"></th>\n"
-                "<th><h1>Trick Simulation</h1></th>\n"
-            "</table>\n"
-        "</div>\n"
-    "</head>\n"
-    "<body>\n"
-    "<div style=\"background:#efefef\">\n"
-      "<ul>\n"
-      "<li><a href=\"http://github.com/nasa/trick\">Trick on GitHub</a></li>\n"
-      "<li><a href=\"http://github.com/nasa/trick/wiki/Tutorial\">Trick Tutorial</a></li>\n"
-      "<li><a href=\"http://github.com/nasa/trick/wiki/Documentation-Home\">Trick Documentation</a></li>\n"
-      "</ul>\n"
-    "</div>\n"
-    "<div style=\"background:#efefef\">\n"
-      "<ul>\n"
-      "<li><a href=\"/apps\">Applications</a></li>\n"
-      "</ul>\n"
-    "</div>\n"
-    "</body>\n"
-    "</html>";
-
-static int confirmDocumentRoot ( std::string documentRoot ) {
-
-    if ( access( documentRoot.c_str(), F_OK ) != -1 ) {
-        message_publish(MSG_INFO, "Trick Webserver: Document root \"%s\" exists.\n", documentRoot.c_str());
-    } else {
-        message_publish(MSG_INFO, "Trick Webserver: Document root \"%s\" doesn't exist, so we'll create it.\n", documentRoot.c_str());
-
-    	char* trick_home = getenv("TRICK_HOME");
-        std::string trickHome = std::string(trick_home);
-
-        if (trick_home != NULL) {
-            if ( mkdir( documentRoot.c_str(), 0700) == 0) {
-
-                 std::string styleFilePath = documentRoot + "/style.css";
-                 std::fstream style_fs (styleFilePath, std::fstream::out);
-                 style_fs << style_css << std::endl;
-                 style_fs.close();
-
-                 std::string appsDirPath = documentRoot + "/apps";
-                 if ( mkdir( appsDirPath.c_str(), 0700) == 0) {
-                     DIR *dr;
-                     struct dirent * dir_entry;
-                     std::string trickAppsDirPath = trickHome + "/trick_source/web/apps";
-                     if ( (dr = opendir(trickAppsDirPath.c_str())) != NULL) {
-                         while (( dir_entry = readdir(dr)) != NULL) {
-                             std::string fName = std::string( dir_entry->d_name);
-                             std::string sPath = trickAppsDirPath + '/' + fName;
-                             std::string dPath = appsDirPath + '/' + fName;
-                             symlink(sPath.c_str(), dPath.c_str());
-                         }
-                     }
-                 } else {
-                     message_publish(MSG_ERROR, "Trick Webserver: Failed to create \"%s\".\n", appsDirPath.c_str());
-                     return 1;
-                 }
-
-                 std::string imagesDirPath = documentRoot + "/images";
-                 if ( mkdir( imagesDirPath.c_str(), 0700) == 0) {
-                     DIR *dr;
-                     struct dirent * dir_entry;
-                     std::string trickImagesDirPath = trickHome + "/trick_source/web/images";
-                     if ( (dr = opendir(trickImagesDirPath.c_str())) != NULL) {
-                         while (( dir_entry = readdir(dr)) != NULL) {
-                             std::string fName = std::string( dir_entry->d_name);
-                             std::string sPath = trickImagesDirPath + '/' + fName;
-                             std::string dPath = imagesDirPath + '/' + fName;
-                             symlink(sPath.c_str(), dPath.c_str());
-                         }
-                     }
-                 } else {
-                     message_publish(MSG_ERROR, "Trick Webserver: Failed to create \"%s\".\n", imagesDirPath.c_str());
-                     return 1;
-                 }
-
-                 std::string indexFilePath = documentRoot + "/index.html";
-                 std::fstream index_fs (indexFilePath, std::fstream::out);
-                 index_fs << index_html << std::endl;
-                 index_fs.close();
-
-             } else {
-                 message_publish(MSG_ERROR, "Trick Webserver: Failed to create \"%s\".\n", documentRoot.c_str());
-                 return 1;
-             }
-        } else {
-             message_publish(MSG_ERROR, "Trick Webserver: TRICK_HOME is not set.\n");
-             return 1;
-        }
-    }
-    return 0;
+static	const	char	*	style_css	=
+				"h1	{"
+								"font-family:	fantasy,	cursive,	serif;"
+								"font-size:	32px;"
+								"margin-left:	1em;"
+				"}"
+				"h2	{"
+								"font-family:	sans-serif;"
+								"font-size:	18px;"
+								"margin-left:	1em;"
+				"}"
+				"a	{"
+								"font-family:	sans-serif;"
+								"font-size:	16px;"
+				"}"
+				"div.header	{	background-image:	linear-gradient(#afafff,	white);	}";
+
+static	const	char	*	index_html	=
+				"<!DOCTYPE	html>\n"
+				"<html>\n"
+				"<head>\n"
+								"<link	rel=\"stylesheet\"	type=\"text/css\"	href=\"style.css\">\n"
+								"<title>Trick	Simulation</title>\n"
+								"<div	class=\"header\">\n"
+												"<table>\n"
+																"<th><img	src=\"images/trick_icon.png\"	height=\"64\"	width=\"64\"></th>\n"
+																"<th><h1>Trick	Simulation</h1></th>\n"
+												"</table>\n"
+								"</div>\n"
+				"</head>\n"
+				"<body>\n"
+				"<div	style=\"background:#efefef\">\n"
+						"<ul>\n"
+						"<li><a	href=\"http://github.com/nasa/trick\">Trick	on	GitHub</a></li>\n"
+						"<li><a	href=\"http://github.com/nasa/trick/wiki/Tutorial\">Trick	Tutorial</a></li>\n"
+						"<li><a	href=\"http://github.com/nasa/trick/wiki/Documentation-Home\">Trick	Documentation</a></li>\n"
+						"</ul>\n"
+				"</div>\n"
+				"<div	style=\"background:#efefef\">\n"
+						"<ul>\n"
+						"<li><a	href=\"/apps\">Applications</a></li>\n"
+						"</ul>\n"
+				"</div>\n"
+				"</body>\n"
+				"</html>";
+
+static	int	confirmDocumentRoot	(	std::string	documentRoot	)	{
+
+				if	(	access(	documentRoot.c_str(),	F_OK	)	!=	-1	)	{
+								message_publish(MSG_INFO,	"Trick	Webserver:	Document	root	\"%s\"	exists.\n",	documentRoot.c_str());
+				}	else	{
+								message_publish(MSG_INFO,	"Trick	Webserver:	Document	root	\"%s\"	doesn't	exist,	so	we'll	create	it.\n",	documentRoot.c_str());
+
+					char*	trick_home	=	getenv("TRICK_HOME");
+								std::string	trickHome	=	std::string(trick_home);
+
+								if	(trick_home	!=	NULL)	{
+												if	(	mkdir(	documentRoot.c_str(),	0700)	==	0)	{
+
+																	std::string	styleFilePath	=	documentRoot	+	"/style.css";
+																	std::fstream	style_fs	(styleFilePath,	std::fstream::out);
+																	style_fs	<<	style_css	<<	std::endl;
+																	style_fs.close();
+
+																	std::string	appsDirPath	=	documentRoot	+	"/apps";
+																	if	(	mkdir(	appsDirPath.c_str(),	0700)	==	0)	{
+																					DIR	*dr;
+																					struct	dirent	*	dir_entry;
+																					std::string	trickAppsDirPath	=	trickHome	+	"/trick_source/web/apps";
+																					if	(	(dr	=	opendir(trickAppsDirPath.c_str()))	!=	NULL)	{
+																									while	((	dir_entry	=	readdir(dr))	!=	NULL)	{
+																													std::string	fName	=	std::string(	dir_entry->d_name);
+																													std::string	sPath	=	trickAppsDirPath	+	'/'	+	fName;
+																													std::string	dPath	=	appsDirPath	+	'/'	+	fName;
+																													symlink(sPath.c_str(),	dPath.c_str());
+																									}
+																					}
+																	}	else	{
+																					message_publish(MSG_ERROR,	"Trick	Webserver:	Failed	to	create	\"%s\".\n",	appsDirPath.c_str());
+																					return	1;
+																	}
+
+																	std::string	imagesDirPath	=	documentRoot	+	"/images";
+																	if	(	mkdir(	imagesDirPath.c_str(),	0700)	==	0)	{
+																					DIR	*dr;
+																					struct	dirent	*	dir_entry;
+																					std::string	trickImagesDirPath	=	trickHome	+	"/trick_source/web/images";
+																					if	(	(dr	=	opendir(trickImagesDirPath.c_str()))	!=	NULL)	{
+																									while	((	dir_entry	=	readdir(dr))	!=	NULL)	{
+																													std::string	fName	=	std::string(	dir_entry->d_name);
+																													std::string	sPath	=	trickImagesDirPath	+	'/'	+	fName;
+																													std::string	dPath	=	imagesDirPath	+	'/'	+	fName;
+																													symlink(sPath.c_str(),	dPath.c_str());
+																									}
+																					}
+																	}	else	{
+																					message_publish(MSG_ERROR,	"Trick	Webserver:	Failed	to	create	\"%s\".\n",	imagesDirPath.c_str());
+																					return	1;
+																	}
+
+																	std::string	indexFilePath	=	documentRoot	+	"/index.html";
+																	std::fstream	index_fs	(indexFilePath,	std::fstream::out);
+																	index_fs	<<	index_html	<<	std::endl;
+																	index_fs.close();
+
+													}	else	{
+																	message_publish(MSG_ERROR,	"Trick	Webserver:	Failed	to	create	\"%s\".\n",	documentRoot.c_str());
+																	return	1;
+													}
+								}	else	{
+													message_publish(MSG_ERROR,	"Trick	Webserver:	TRICK_HOME	is	not	set.\n");
+													return	1;
+								}
+				}
+				return	0;
 }
 
-WebSocketSession* MyCivetServer::makeWebSocketSession(mg_connection *nc, std::string name) {
-    std::map<std::string, WebSocketSessionMaker>::iterator iter;
-    iter = WebSocketSessionMakerMap.find(name);
-    if (iter != WebSocketSessionMakerMap.end()) {
-        WebSocketSessionMaker maker = iter->second;
-        return maker(nc);
-    } else {
-        return NULL;
-    }
+WebSocketSession*	MyCivetServer::makeWebSocketSession(mg_connection	*nc,	std::string	name)	{
+				std::map<std::string,	WebSocketSessionMaker>::iterator	iter;
+				iter	=	WebSocketSessionMakerMap.find(name);
+				if	(iter	!=	WebSocketSessionMakerMap.end())	{
+								WebSocketSessionMaker	maker	=	iter->second;
+								return	maker(nc);
+				}	else	{
+								return	NULL;
+				}
 }
 
-int MyCivetServer::default_data() {
-    port = 8888;
-    enable = false;
-    debug = false;
-	sessionDataMarshalled = false;
-    time_homogeneous = false;
-    document_root = "www";
-    shutting_down = false;
-    path_to_ssl_cert = "~/.ssl/server.pem"; //TODO:Make a better default path
-    ssl_enable = false;
-    error_log_file = "civet_server_error.log";
-
-    installWebSocketSessionMaker("VariableServer", makeVariableServerSession);
-    installHTTPGEThandler("vs_connections", handle_HTTP_GET_vs_connections);
-    installHTTPGEThandler("alloc_info", handle_HTTP_GET_alloc_info);
-    
-    return 0;
+int	MyCivetServer::default_data()	{
+				port	=	8888;
+				enable	=	false;
+				debug	=	false;
+	sessionDataMarshalled	=	false;
+				time_homogeneous	=	false;
+				document_root	=	"www";
+				shutting_down	=	false;
+				path_to_ssl_cert	=	"~/.ssl/server.pem";	//TODO:Make	a	better	default	path
+				ssl_enable	=	false;
+				error_log_file	=	"civet_server_error.log";
+
+				installWebSocketSessionMaker("VariableServer",	makeVariableServerSession);
+				installHTTPGEThandler("vs_connections",	handle_HTTP_GET_vs_connections);
+				installHTTPGEThandler("alloc_info",	handle_HTTP_GET_alloc_info);
+				
+				return	0;
 }
 
-void MyCivetServer::installHTTPGEThandler(std::string handlerName, httpMethodHandler handler) {
-    pthread_mutex_lock(&httpGETHandlerMapLock);
-    httpGETHandlerMap.insert(std::pair<std::string, httpMethodHandler>(handlerName, handler));
-    pthread_mutex_unlock(&httpGETHandlerMapLock);
+void	MyCivetServer::installHTTPGEThandler(std::string	handlerName,	httpMethodHandler	handler)	{
+				pthread_mutex_lock(&httpGETHandlerMapLock);
+				httpGETHandlerMap.insert(std::pair<std::string,	httpMethodHandler>(handlerName,	handler));
+				pthread_mutex_unlock(&httpGETHandlerMapLock);
 }
 
-void MyCivetServer::installWebSocketSessionMaker(std::string name, WebSocketSessionMaker maker) {
-    pthread_mutex_lock(&WebSocketSessionMakerMapLock);
-    WebSocketSessionMakerMap.insert(std::pair<std::string, WebSocketSessionMaker>(name, maker));
-    pthread_mutex_unlock(&WebSocketSessionMakerMapLock);
+void	MyCivetServer::installWebSocketSessionMaker(std::string	name,	WebSocketSessionMaker	maker)	{
+				pthread_mutex_lock(&WebSocketSessionMakerMapLock);
+				WebSocketSessionMakerMap.insert(std::pair<std::string,	WebSocketSessionMaker>(name,	maker));
+				pthread_mutex_unlock(&WebSocketSessionMakerMapLock);
 }
 
-void MyCivetServer::addWebSocketSession(struct mg_connection *nc, WebSocketSession* session) {
-    pthread_mutex_lock(&WebSocketSessionMapLock);
-    webSocketSessionMap.insert( std::pair<mg_connection*, WebSocketSession*>(nc, session) );
-    pthread_mutex_unlock(&WebSocketSessionMapLock);
+void	MyCivetServer::addWebSocketSession(struct	mg_connection	*nc,	WebSocketSession*	session)	{
+				pthread_mutex_lock(&WebSocketSessionMapLock);
+				webSocketSessionMap.insert(	std::pair<mg_connection*,	WebSocketSession*>(nc,	session)	);
+				pthread_mutex_unlock(&WebSocketSessionMapLock);
 }
 
-void* main_loop(void* S) {
-	MyCivetServer* server = (MyCivetServer*) S;
-	bool messageSent;
+void*	main_loop(void*	S)	{
+	MyCivetServer*	server	=	(MyCivetServer*)	S;
+	bool	messageSent;
 
 
-	while(1) {
-        pthread_mutex_lock(&server->lock_loop);
-        while (!server->service_connections)
-            pthread_cond_wait(&server->cond_loop, &server->lock_loop);
-        if (server->shutting_down) {
-            return NULL;
-        }
-		if (!server->sessionDataMarshalled) {
+	while(1)	{
+								pthread_mutex_lock(&server->lock_loop);
+								while	(!server->service_connections)
+												pthread_cond_wait(&server->cond_loop,	&server->lock_loop);
+								if	(server->shutting_down)	{
+												return	NULL;
+								}
+		if	(!server->sessionDataMarshalled)	{
 			server->marshallWebSocketSessionData();
 		}
 
-		std::map<mg_connection*, WebSocketSession*>::iterator iter;
-		messageSent = false;
+		std::map<mg_connection*,	WebSocketSession*>::iterator	iter;
+		messageSent	=	false;
 		pthread_mutex_lock(&server->WebSocketSessionMapLock);
-		for (iter = server->webSocketSessionMap.begin(); iter != server->webSocketSessionMap.end(); iter++ ) {
-			WebSocketSession* session = iter->second;
+		for	(iter	=	server->webSocketSessionMap.begin();	iter	!=	server->webSocketSessionMap.end();	iter++	)	{
+			WebSocketSession*	session	=	iter->second;
 			session->sendMessage();
-			messageSent = true;
+			messageSent	=	true;
 		}
-		if (messageSent) { //If any  message was sent we say the data is now not marshalled.
-			server->sessionDataMarshalled = false;
+		if	(messageSent)	{	//If	any		message	was	sent	we	say	the	data	is	now	not	marshalled.
+			server->sessionDataMarshalled	=	false;
 		}
 		pthread_mutex_unlock(&server->WebSocketSessionMapLock);
-        server->service_connections = false;
-        pthread_mutex_unlock(&server->lock_loop);
+								server->service_connections	=	false;
+								pthread_mutex_unlock(&server->lock_loop);
 	}
 }
 
 
-int MyCivetServer::init() {
-    if (enable) {
-        if (debug) { message_publish(MSG_DEBUG, "Trick Webserver: Debug logging is enabled.\n"); }
-
-        //Setting up server
-        confirmDocumentRoot( std::string(document_root) );
-        mg_init_library(0);
-
-        struct mg_callbacks callbacks;
-        memset(&callbacks, 0, sizeof(callbacks));
-        //Add callback functions here
-
-        std::string port_str; 
-        if (ssl_enable) {
-            port_str = std::to_string(port) + "s"; //s at the end of the port specifies ssl.
-            message_publish(MSG_INFO, "Trick Webserver: SSL is enabled\n");
-            message_publish(MSG_INFO, "Trick Webserver: Current path to ssl certificate is %s. To change this put \"web.server.path_to_ssl_cert = \'/path/to/cert\'\" in your input file.\n", path_to_ssl_cert);
-        } else {
-            message_publish(MSG_INFO, "Trick Webserver: SSL is not enabled. To enable put \"web.server.ssl_enable = True\" in your input file.\n");
-            port_str = std::to_string(port);
-        }
-        const char* options[] = {
-            "listening_ports", port_str.c_str(), "ssl_certificate", path_to_ssl_cert, "document_root", document_root, "enable_directory_listing", "yes"
-                , "error_log_file", error_log_file
-                , 0
-        };
-
-        if (debug) {
-            message_publish(MSG_DEBUG, "Trick Webserver: Starting webserver with the following options:\n");
-            for (int i=0; options[i] != 0; i+=2) {
-                message_publish(MSG_DEBUG, "Trick Webserver: \t%s = %s\n", options[i], options[i+1]);
-            }
-        }
-
-        ctx = mg_start(&callbacks, 0, options);
-        if (ctx == NULL) {
-            message_publish(MSG_ERROR, "Trick Webserver: Failed to create listener, exiting Simulation.\n"
-                                "Perhaps another program is already using port %i.  See %s file for more information.\n", port, error_log_file);
-            exit(-1);
-        } else {
-            message_publish(MSG_INFO, "Trick Webserver: Listening on port. %i\n", port);
-            message_publish(MSG_INFO, "Trick Webserver: Document root = \"%s.\"\n", document_root);
-        }
-
-        //Assigning general handlers.
-        mg_set_request_handler(ctx, "/api/http", parent_http_handler, (void*)this);
-        mg_set_websocket_handler(ctx, "/api/ws", ws_connect_handler, ws_ready_handler, ws_data_handler, ws_close_handler, (void*)this);
-
-        //Starting the main loop
-        int rc;
-        rc = pthread_create(&server_thread, NULL, main_loop, (void*)this);
-        if (rc) {
-            message_publish(MSG_ERROR, "Trick Webserver: Failed to create main loop.  Web socket connections will not work.");
-            exit(-1);
-        }
-    } else {
-        message_publish(MSG_INFO, "Trick Webserver: DISABLED. To enable, add "
-                                  "\"web.server.enable = True\" to your input file.\n");
-    }
-    return 0;
+int	MyCivetServer::init()	{
+				if	(enable)	{
+								if	(debug)	{	message_publish(MSG_DEBUG,	"Trick	Webserver:	Debug	logging	is	enabled.\n");	}
+
+								//Setting	up	server
+								confirmDocumentRoot(	std::string(document_root)	);
+								mg_init_library(0);
+
+								struct	mg_callbacks	callbacks;
+								memset(&callbacks,	0,	sizeof(callbacks));
+								//Add	callback	functions	here
+
+								std::string	port_str;	
+								if	(ssl_enable)	{
+												port_str	=	std::to_string(port)	+	"s";	//s	at	the	end	of	the	port	specifies	ssl.
+												message_publish(MSG_INFO,	"Trick	Webserver:	SSL	is	enabled\n");
+												message_publish(MSG_INFO,	"Trick	Webserver:	Current	path	to	ssl	certificate	is	%s.	To	change	this	put	\"web.server.path_to_ssl_cert	=	\'/path/to/cert\'\"	in	your	input	file.\n",	path_to_ssl_cert);
+								}	else	{
+												message_publish(MSG_INFO,	"Trick	Webserver:	SSL	is	not	enabled.	To	enable	put	\"web.server.ssl_enable	=	True\"	in	your	input	file.\n");
+												port_str	=	std::to_string(port);
+								}
+								const	char*	options[]	=	{
+												"listening_ports",	port_str.c_str(),	"ssl_certificate",	path_to_ssl_cert,	"document_root",	document_root,	"enable_directory_listing",	"yes"
+																,	"error_log_file",	error_log_file
+																,	0
+								};
+
+								if	(debug)	{
+												message_publish(MSG_DEBUG,	"Trick	Webserver:	Starting	webserver	with	the	following	options:\n");
+												for	(int	i=0;	options[i]	!=	0;	i+=2)	{
+																message_publish(MSG_DEBUG,	"Trick	Webserver:	\t%s	=	%s\n",	options[i],	options[i+1]);
+												}
+								}
+
+								ctx	=	mg_start(&callbacks,	0,	options);
+								if	(ctx	==	NULL)	{
+												message_publish(MSG_ERROR,	"Trick	Webserver:	Failed	to	create	listener,	exiting	Simulation.\n"
+																																"Perhaps	another	program	is	already	using	port	%i.		See	%s	file	for	more	information.\n",	port,	error_log_file);
+												exit(-1);
+								}	else	{
+												message_publish(MSG_INFO,	"Trick	Webserver:	Listening	on	port.	%i\n",	port);
+												message_publish(MSG_INFO,	"Trick	Webserver:	Document	root	=	\"%s.\"\n",	document_root);
+								}
+
+								//Assigning	general	handlers.
+								mg_set_request_handler(ctx,	"/api/http",	parent_http_handler,	(void*)this);
+								mg_set_websocket_handler(ctx,	"/api/ws",	ws_connect_handler,	ws_ready_handler,	ws_data_handler,	ws_close_handler,	(void*)this);
+
+								//Starting	the	main	loop
+								int	rc;
+								rc	=	pthread_create(&server_thread,	NULL,	main_loop,	(void*)this);
+								if	(rc)	{
+												message_publish(MSG_ERROR,	"Trick	Webserver:	Failed	to	create	main	loop.		Web	socket	connections	will	not	work.");
+												exit(-1);
+								}
+				}	else	{
+								message_publish(MSG_INFO,	"Trick	Webserver:	DISABLED.	To	enable,	add	"
+																																		"\"web.server.enable	=	True\"	to	your	input	file.\n");
+				}
+				return	0;
 }
 
-std::vector<std::string> split(std::string s, std::string delim) {
-    std::vector<std::string> values;
-    auto start = 0;
-    auto end = s.find(delim);
-    while (end != std::string::npos)
-    {
-        values.push_back(s.substr(start, end - start));
-        start = end + delim.length();
-        end = s.find(delim, start);
-    }
-    values.push_back(s.substr(start, end - start));
-    return values;
+std::vector<std::string>	split(std::string	s,	std::string	delim)	{
+				std::vector<std::string>	values;
+				auto	start	=	0;
+				auto	end	=	s.find(delim);
+				while	(end	!=	std::string::npos)
+				{
+								values.push_back(s.substr(start,	end	-	start));
+								start	=	end	+	delim.length();
+								end	=	s.find(delim,	start);
+				}
+				values.push_back(s.substr(start,	end	-	start));
+				return	values;
 }
 
-int MyCivetServer::http_top_of_frame() {
-    if (ctx != NULL) {
-        if (time_homogeneous) {
-		    marshallWebSocketSessionData();
-        }
+int	MyCivetServer::http_top_of_frame()	{
+				if	(ctx	!=	NULL)	{
+								if	(time_homogeneous)	{
+						marshallWebSocketSessionData();
+								}
 		unlockConnections();
 	}
-    return 0;
+				return	0;
 }
 
-void MyCivetServer::unlockConnections() {
-    pthread_mutex_lock(&lock_loop);
-    service_connections = true;
-    pthread_cond_signal(&cond_loop);
-    pthread_mutex_unlock(&lock_loop);
+void	MyCivetServer::unlockConnections()	{
+				pthread_mutex_lock(&lock_loop);
+				service_connections	=	true;
+				pthread_cond_signal(&cond_loop);
+				pthread_mutex_unlock(&lock_loop);
 }
 
-void MyCivetServer::sendWebSocketSessionMessages(struct mg_connection *nc) {
-
-    std::map<mg_connection*, WebSocketSession*>::iterator iter;
-    pthread_mutex_lock(&WebSocketSessionMapLock);
-    iter = webSocketSessionMap.find(nc);
-    if (iter != webSocketSessionMap.end()) {
-        WebSocketSession* session = iter->second;
-        session->sendMessage();
-    }
-    sessionDataMarshalled = false;
-    pthread_mutex_unlock(&WebSocketSessionMapLock);
+void	MyCivetServer::sendWebSocketSessionMessages(struct	mg_connection	*nc)	{
+
+				std::map<mg_connection*,	WebSocketSession*>::iterator	iter;
+				pthread_mutex_lock(&WebSocketSessionMapLock);
+				iter	=	webSocketSessionMap.find(nc);
+				if	(iter	!=	webSocketSessionMap.end())	{
+								WebSocketSession*	session	=	iter->second;
+								session->sendMessage();
+				}
+				sessionDataMarshalled	=	false;
+				pthread_mutex_unlock(&WebSocketSessionMapLock);
 }
 
-void MyCivetServer::marshallWebSocketSessionData() {
-    std::map<mg_connection*, WebSocketSession*>::iterator iter;
-    pthread_mutex_lock(&WebSocketSessionMapLock);
-    for (iter = webSocketSessionMap.begin(); iter != webSocketSessionMap.end(); iter++ ) {
-        WebSocketSession* session = iter->second;
-        session->marshallData();
-    }
-    sessionDataMarshalled = true;
-    pthread_mutex_unlock(&WebSocketSessionMapLock);
+void	MyCivetServer::marshallWebSocketSessionData()	{
+				std::map<mg_connection*,	WebSocketSession*>::iterator	iter;
+				pthread_mutex_lock(&WebSocketSessionMapLock);
+				for	(iter	=	webSocketSessionMap.begin();	iter	!=	webSocketSessionMap.end();	iter++	)	{
+								WebSocketSession*	session	=	iter->second;
+								session->marshallData();
+				}
+				sessionDataMarshalled	=	true;
+				pthread_mutex_unlock(&WebSocketSessionMapLock);
 }
 
-int MyCivetServer::shutdown() {
-    if (enable) {
-        message_publish(MSG_INFO,"Trick Webserver: Shutting down on port %i.\n", port);
-        shutting_down = true;
-        unlockConnections();
-        join();
+int	MyCivetServer::shutdown()	{
+				if	(enable)	{
+								message_publish(MSG_INFO,"Trick	Webserver:	Shutting	down	on	port	%i.\n",	port);
+								shutting_down	=	true;
+								unlockConnections();
+								join();
 		mg_stop(ctx);
 		mg_exit_library();
-    }
-    return 0;
+				}
+				return	0;
 }
 
-int MyCivetServer::join() {
-    pthread_join(server_thread, NULL);
-    return 0;
+int	MyCivetServer::join()	{
+				pthread_join(server_thread,	NULL);
+				return	0;
 }
 
-void MyCivetServer::handleWebSocketClientMessage(struct mg_connection *conn, const std::string& data) {
-    std::map<mg_connection*, WebSocketSession*>::iterator iter;
-    iter = webSocketSessionMap.find(conn);
-    if (iter != webSocketSessionMap.end()) {
-        WebSocketSession* session = iter->second;
-        session->handleMessage(data);
-    }
+void	MyCivetServer::handleWebSocketClientMessage(struct	mg_connection	*conn,	const	std::string&	data)	{
+				std::map<mg_connection*,	WebSocketSession*>::iterator	iter;
+				iter	=	webSocketSessionMap.find(conn);
+				if	(iter	!=	webSocketSessionMap.end())	{
+								WebSocketSession*	session	=	iter->second;
+								session->handleMessage(data);
+				}
 }
 
-void MyCivetServer::handleHTTPGETrequest(struct mg_connection *conn, const struct mg_request_info* ri, std::string handlerName) {
-        std::map<std::string, httpMethodHandler>::iterator iter;
-        iter = httpGETHandlerMap.find(handlerName);
-		if (iter != httpGETHandlerMap.end()) {
-			httpMethodHandler handler = iter->second;
-			handler(conn, (void*)this);
-		} else {
-            std::stringstream ss;
-            ss << "Error: http api " << handlerName << " is not implemented.";
-            http_send_error(conn, 404, ss.str().c_str(), ss.str().size(), 100);
-        }
+void	MyCivetServer::handleHTTPGETrequest(struct	mg_connection	*conn,	const	struct	mg_request_info*	ri,	std::string	handlerName)	{
+								std::map<std::string,	httpMethodHandler>::iterator	iter;
+								iter	=	httpGETHandlerMap.find(handlerName);
+		if	(iter	!=	httpGETHandlerMap.end())	{
+			httpMethodHandler	handler	=	iter->second;
+			handler(conn,	(void*)this);
+		}	else	{
+												std::stringstream	ss;
+												ss	<<	"Error:	http	api	"	<<	handlerName	<<	"	is	not	implemented.";
+												http_send_error(conn,	404,	ss.str().c_str(),	ss.str().size(),	100);
+								}
 }
diff --git a/trick_source/web/CivetServer/src/VariableServerSession.cpp b/trick_source/web/CivetServer/src/VariableServerSession.cpp
index 6a498db38..daa22172b 100644
--- a/trick_source/web/CivetServer/src/VariableServerSession.cpp
+++ b/trick_source/web/CivetServer/src/VariableServerSession.cpp
@@ -1,290 +1,290 @@
 /************************************************************************
-PURPOSE: (Represent the state and initial conditions of an http server)
-LIBRARY DEPENDENCIES:
-    ((simpleJSON.o)
-     (VariableServerVariable.o)
-    )
+PURPOSE:	(Represent	the	state	and	initial	conditions	of	an	http	server)
+LIBRARY	DEPENDENCIES:
+				((simpleJSON.o)
+					(VariableServerVariable.o)
+				)
 **************************************************************************/
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <iomanip> // for setprecision
-#include <fstream>
-#include <algorithm>
-#include <cstring>
-#include <stdarg.h>
-#include "trick/memorymanager_c_intf.h"
-#include "trick/input_processor_proto.h"
-#include "trick/exec_proto.h"
-#include "VariableServerSession.hh"
-#include "simpleJSON.hh"
+#include	<string>
+#include	<iostream>
+#include	<sstream>
+#include	<iomanip>	//	for	setprecision
+#include	<fstream>
+#include	<algorithm>
+#include	<cstring>
+#include	<stdarg.h>
+#include	"trick/memorymanager_c_intf.h"
+#include	"trick/input_processor_proto.h"
+#include	"trick/exec_proto.h"
+#include	"VariableServerSession.hh"
+#include	"simpleJSON.hh"
 
-// CONSTRUCTOR
-VariableServerSession::VariableServerSession( struct mg_connection *nc ) : WebSocketSession(nc) {
-    intervalTimeTics = exec_get_time_tic_value(); // Default time interval is one second.
-    nextTime = 0;
-    cyclicSendEnabled = false;
-    mode = Initialization;
+//	CONSTRUCTOR
+VariableServerSession::VariableServerSession(	struct	mg_connection	*nc	)	:	WebSocketSession(nc)	{
+				intervalTimeTics	=	exec_get_time_tic_value();	//	Default	time	interval	is	one	second.
+				nextTime	=	0;
+				cyclicSendEnabled	=	false;
+				mode	=	Initialization;
 }
 
-// DESTRUCTOR
-VariableServerSession::~VariableServerSession() {
-    clear();
+//	DESTRUCTOR
+VariableServerSession::~VariableServerSession()	{
+				clear();
 }
 
-void VariableServerSession::updateNextTime(long long simTimeTics) {
-        nextTime = (simTimeTics - (simTimeTics % intervalTimeTics) + intervalTimeTics);
+void	VariableServerSession::updateNextTime(long	long	simTimeTics)	{
+								nextTime	=	(simTimeTics	-	(simTimeTics	%	intervalTimeTics)	+	intervalTimeTics);
 }
 
-/* Base class virtual function: marshallData
-   When HTTP_Server::time_homogeneous is set, WebSocketSession::marshallData() is
-   called from the main sim thread in a "top_of_frame" job, to ensure that all of
-   the data is staged at the same sim-time, in other words that it's time-homogeneous.
+/*	Base	class	virtual	function:	marshallData
+			When	HTTP_Server::time_homogeneous	is	set,	WebSocketSession::marshallData()	is
+			called	from	the	main	sim	thread	in	a	"top_of_frame"	job,	to	ensure	that	all	of
+			the	data	is	staged	at	the	same	sim-time,	in	other	words	that	it's	time-homogeneous.
 */
-/* VariableServerSession::marshallData() conditionally stages message data when
-   sim_time has reached the next integer multiple of intervalTimeTics
-   (The specified period between messages).
+/*	VariableServerSession::marshallData()	conditionally	stages	message	data	when
+			sim_time	has	reached	the	next	integer	multiple	of	intervalTimeTics
+			(The	specified	period	between	messages).
 */
-void VariableServerSession::marshallData() {
-    long long simulation_time_tics = exec_get_time_tics();
-    SIM_MODE new_mode = the_exec->get_mode();
-    
-    if(new_mode == Freeze) {
-    	simulation_time_tics += exec_get_freeze_time_tics();
+void	VariableServerSession::marshallData()	{
+				long	long	simulation_time_tics	=	exec_get_time_tics();
+				SIM_MODE	new_mode	=	the_exec->get_mode();
+				
+				if(new_mode	==	Freeze)	{
+					simulation_time_tics	+=	exec_get_freeze_time_tics();
 	}
-    
-    if(new_mode != mode) {
-    	mode = new_mode;
-        updateNextTime(simulation_time_tics);
-    }
+				
+				if(new_mode	!=	mode)	{
+					mode	=	new_mode;
+								updateNextTime(simulation_time_tics);
+				}
 	
-    if ( cyclicSendEnabled && ( simulation_time_tics >= nextTime )) {
-        stageValues();
-        updateNextTime(simulation_time_tics);
-    }
-    	
+				if	(	cyclicSendEnabled	&&	(	simulation_time_tics	>=	nextTime	))	{
+								stageValues();
+								updateNextTime(simulation_time_tics);
+				}
+					
 }
 
-/* Base class virtual function: sendMessage
-   if data is staged/marshalled, then compose and send a message containing that data.
- */
-void VariableServerSession::sendMessage() {
-    std::vector<VariableServerVariable*>::iterator it;
-    std::stringstream ss;
+/*	Base	class	virtual	function:	sendMessage
+			if	data	is	staged/marshalled,	then	compose	and	send	a	message	containing	that	data.
+	*/
+void	VariableServerSession::sendMessage()	{
+				std::vector<VariableServerVariable*>::iterator	it;
+				std::stringstream	ss;
 
-    if (dataStaged) {
-        ss << "{ \"msg_type\" : \"values\",\n";
-        ss << "  \"time\" : " << std::setprecision(16) << stageTime << ",\n";
-        ss << "  \"values\" : [\n";
+				if	(dataStaged)	{
+								ss	<<	"{	\"msg_type\"	:	\"values\",\n";
+								ss	<<	"		\"time\"	:	"	<<	std::setprecision(16)	<<	stageTime	<<	",\n";
+								ss	<<	"		\"values\"	:	[\n";
 
-        for (it = sessionVariables.begin(); it != sessionVariables.end(); ++it ) {
-            if (it != sessionVariables.begin()) ss << ",\n";
-            (*it)->writeValue(ss);
-         }
-         ss << "]}" << std::endl;
-        std::string tmp = ss.str();
-        const char * message = tmp.c_str();
-        mg_websocket_write(connection, MG_WEBSOCKET_OPCODE_TEXT, message, strlen(message));
-        dataStaged = false;
-    }
+								for	(it	=	sessionVariables.begin();	it	!=	sessionVariables.end();	++it	)	{
+												if	(it	!=	sessionVariables.begin())	ss	<<	",\n";
+												(*it)->writeValue(ss);
+									}
+									ss	<<	"]}"	<<	std::endl;
+								std::string	tmp	=	ss.str();
+								const	char	*	message	=	tmp.c_str();
+								mg_websocket_write(connection,	MG_WEBSOCKET_OPCODE_TEXT,	message,	strlen(message));
+								dataStaged	=	false;
+				}
 }
 
-// Base class virtual function.
-int VariableServerSession::handleMessage(const std::string& client_msg) {
+//	Base	class	virtual	function.
+int	VariableServerSession::handleMessage(const	std::string&	client_msg)	{
 
-     int status = 0;
-     std::vector<Member*> members = parseJSON(client_msg.c_str());
-     std::vector<Member*>::iterator it;
-     std::string cmd;
-     std::string var_name;
-     std::string pycode;
-     int period;
+					int	status	=	0;
+					std::vector<Member*>	members	=	parseJSON(client_msg.c_str());
+					std::vector<Member*>::iterator	it;
+					std::string	cmd;
+					std::string	var_name;
+					std::string	pycode;
+					int	period;
 
-     for (it = members.begin(); it != members.end(); ++it ) {
-         if (strcmp((*it)->key, "cmd") == 0) {
-             cmd = (*it)->valText;
-         } else if (strcmp((*it)->key, "var_name") == 0) {
-             var_name = (*it)->valText;
-         } else if (strcmp((*it)->key, "period") == 0) {
-             period = atoi((*it)->valText);
-         } else if (strcmp((*it)->key, "pycode") == 0) {
-             pycode = (*it)->valText;
-         }
-     }
+					for	(it	=	members.begin();	it	!=	members.end();	++it	)	{
+									if	(strcmp((*it)->key,	"cmd")	==	0)	{
+													cmd	=	(*it)->valText;
+									}	else	if	(strcmp((*it)->key,	"var_name")	==	0)	{
+													var_name	=	(*it)->valText;
+									}	else	if	(strcmp((*it)->key,	"period")	==	0)	{
+													period	=	atoi((*it)->valText);
+									}	else	if	(strcmp((*it)->key,	"pycode")	==	0)	{
+													pycode	=	(*it)->valText;
+									}
+					}
 
-     if (cmd.empty()) {
-         printf ("No \"cmd\" member found in client message.\n");
-         status = 1;
-     } else if (cmd == "var_add") {
-         addVariable( strdup( var_name.c_str()));
-     } else if (cmd == "var_cycle") {
-         setTimeInterval(period);
-     } else if (cmd == "var_pause") {
-         pause();
-     } else if (cmd == "var_unpause") {
-         unpause();
-     } else if (cmd == "var_send") {
-         // var_send responses are not guarenteed to be time-consistent.
-         stageValues();
-         sendMessage();
-     } else if (cmd == "var_clear") {
-         clear();
-     } else if (cmd == "var_exit") {
-         //TODO
-         // nc->flags |= MG_F_SEND_AND_CLOSE;
-     } else if (cmd == "python") {
-         // Remove carriage-returns from pycode.
-         pycode.erase(std::remove(pycode.begin(), pycode.end(), '\r'), pycode.end());
-         // Call the Trick input processor.
-         ip_parse(pycode.c_str());
-     } else if (cmd == "sie") {
-          // send S_sie.json
-          sendSieMessage();
-     } else if (cmd == "units") {
-          // send S_sie.json
-          sendUnitsMessage(var_name.c_str());
-     } else {
-         sendErrorMessage("Unknown Command: \"%s\".\n", cmd.c_str());
-         status = 1;
-     }
-     return status;
+					if	(cmd.empty())	{
+									printf	("No	\"cmd\"	member	found	in	client	message.\n");
+									status	=	1;
+					}	else	if	(cmd	==	"var_add")	{
+									addVariable(	strdup(	var_name.c_str()));
+					}	else	if	(cmd	==	"var_cycle")	{
+									setTimeInterval(period);
+					}	else	if	(cmd	==	"var_pause")	{
+									pause();
+					}	else	if	(cmd	==	"var_unpause")	{
+									unpause();
+					}	else	if	(cmd	==	"var_send")	{
+									//	var_send	responses	are	not	guarenteed	to	be	time-consistent.
+									stageValues();
+									sendMessage();
+					}	else	if	(cmd	==	"var_clear")	{
+									clear();
+					}	else	if	(cmd	==	"var_exit")	{
+									//TODO
+									//	nc->flags	|=	MG_F_SEND_AND_CLOSE;
+					}	else	if	(cmd	==	"python")	{
+									//	Remove	carriage-returns	from	pycode.
+									pycode.erase(std::remove(pycode.begin(),	pycode.end(),	'\r'),	pycode.end());
+									//	Call	the	Trick	input	processor.
+									ip_parse(pycode.c_str());
+					}	else	if	(cmd	==	"sie")	{
+										//	send	S_sie.json
+										sendSieMessage();
+					}	else	if	(cmd	==	"units")	{
+										//	send	S_sie.json
+										sendUnitsMessage(var_name.c_str());
+					}	else	{
+									sendErrorMessage("Unknown	Command:	\"%s\".\n",	cmd.c_str());
+									status	=	1;
+					}
+					return	status;
 }
 
-void VariableServerSession::setTimeInterval(unsigned int milliseconds) {
-    // CONSIDER: should we compare this with the realtime frame, and limit accordingly.
-    intervalTimeTics = exec_get_time_tic_value() * milliseconds / 1000;
+void	VariableServerSession::setTimeInterval(unsigned	int	milliseconds)	{
+				//	CONSIDER:	should	we	compare	this	with	the	realtime	frame,	and	limit	accordingly.
+				intervalTimeTics	=	exec_get_time_tic_value()	*	milliseconds	/	1000;
 }
 
-void VariableServerSession::addVariable(char* vname){
-    REF2 * new_ref ;
-    new_ref = ref_attributes(vname);
-    if ( new_ref == NULL ) {
-        sendErrorMessage("Variable Server could not find variable %s.\n", vname);
-        new_ref = make_error_ref(vname);
-    } else if ( new_ref->attr ) {
-        if ( new_ref->attr->type == TRICK_STRUCTURED ) {
-            sendErrorMessage("Variable Server: var_add cant add \"%s\" because its a composite variable.\n", vname);
-            free(new_ref);
-            new_ref = make_error_ref(vname);
+void	VariableServerSession::addVariable(char*	vname){
+				REF2	*	new_ref	;
+				new_ref	=	ref_attributes(vname);
+				if	(	new_ref	==	NULL	)	{
+								sendErrorMessage("Variable	Server	could	not	find	variable	%s.\n",	vname);
+								new_ref	=	make_error_ref(vname);
+				}	else	if	(	new_ref->attr	)	{
+								if	(	new_ref->attr->type	==	TRICK_STRUCTURED	)	{
+												sendErrorMessage("Variable	Server:	var_add	cant	add	\"%s\"	because	its	a	composite	variable.\n",	vname);
+												free(new_ref);
+												new_ref	=	make_error_ref(vname);
 
-        } else if ( new_ref->attr->type == TRICK_STL ) {
-            sendErrorMessage("Variable Server: var_add cant add \"%s\" because its an STL variable.\n", vname);
-            free(new_ref);
-            new_ref = make_error_ref(vname);
-        }
-    } else {
-        sendErrorMessage("Variable Server: BAD MOJO - Missing ATTRIBUTES.");
-        free(new_ref);
-        new_ref = make_error_ref(vname);
-    }
+								}	else	if	(	new_ref->attr->type	==	TRICK_STL	)	{
+												sendErrorMessage("Variable	Server:	var_add	cant	add	\"%s\"	because	its	an	STL	variable.\n",	vname);
+												free(new_ref);
+												new_ref	=	make_error_ref(vname);
+								}
+				}	else	{
+								sendErrorMessage("Variable	Server:	BAD	MOJO	-	Missing	ATTRIBUTES.");
+								free(new_ref);
+								new_ref	=	make_error_ref(vname);
+				}
 
-    if ( new_ref != NULL ) {
-        // This REF2 object will "belong" to the VariableServerSessionVariable, so it has
-        // the right and responsibility to free() it in its destructor.
-        VariableServerVariable *sessionVariable = new VariableServerVariable( new_ref ) ;
-        sessionVariables.push_back( sessionVariable ) ;
-    }
+				if	(	new_ref	!=	NULL	)	{
+								//	This	REF2	object	will	"belong"	to	the	VariableServerSessionVariable,	so	it	has
+								//	the	right	and	responsibility	to	free()	it	in	its	destructor.
+								VariableServerVariable	*sessionVariable	=	new	VariableServerVariable(	new_ref	)	;
+								sessionVariables.push_back(	sessionVariable	)	;
+				}
 }
 
-void VariableServerSession::stageValues() {
-    stageTime = (double)(exec_get_time_tics()) / exec_get_time_tic_value();
-    std::vector<VariableServerVariable*>::iterator it;
-    for (it = sessionVariables.begin(); it != sessionVariables.end(); ++it ) {
-        (*it)->stageValue();
-    }
-    dataStaged = true;
+void	VariableServerSession::stageValues()	{
+				stageTime	=	(double)(exec_get_time_tics())	/	exec_get_time_tic_value();
+				std::vector<VariableServerVariable*>::iterator	it;
+				for	(it	=	sessionVariables.begin();	it	!=	sessionVariables.end();	++it	)	{
+								(*it)->stageValue();
+				}
+				dataStaged	=	true;
 }
 
-void VariableServerSession::pause()   { cyclicSendEnabled = false; }
+void	VariableServerSession::pause()			{	cyclicSendEnabled	=	false;	}
 
-void VariableServerSession::unpause() { cyclicSendEnabled = true;  }
+void	VariableServerSession::unpause()	{	cyclicSendEnabled	=	true;		}
 
-void VariableServerSession::clear() {
-        std::vector<VariableServerVariable*>::iterator it;
-        it = sessionVariables.begin();
-        while (it != sessionVariables.end()) {
-            delete *it;
-            it = sessionVariables.erase(it);
-        }
+void	VariableServerSession::clear()	{
+								std::vector<VariableServerVariable*>::iterator	it;
+								it	=	sessionVariables.begin();
+								while	(it	!=	sessionVariables.end())	{
+												delete	*it;
+												it	=	sessionVariables.erase(it);
+								}
 }
 
-void VariableServerSession::exit() {}
+void	VariableServerSession::exit()	{}
 
-int VariableServerSession::bad_ref_int = 0 ;
+int	VariableServerSession::bad_ref_int	=	0	;
 
-#define MAX_MSG_SIZE 4096
-int VariableServerSession::sendErrorMessage(const char* fmt, ... ) {
-    char errText[MAX_MSG_SIZE];
-    char msgText[MAX_MSG_SIZE];
-    va_list args;
+#define	MAX_MSG_SIZE	4096
+int	VariableServerSession::sendErrorMessage(const	char*	fmt,	...	)	{
+				char	errText[MAX_MSG_SIZE];
+				char	msgText[MAX_MSG_SIZE];
+				va_list	args;
 
-    errText[0]=0;
-    msgText[0]=0;
+				errText[0]=0;
+				msgText[0]=0;
 
-    va_start(args, fmt);
-    (void) vsnprintf(errText, MAX_MSG_SIZE, fmt, args);
-    va_end(args);
+				va_start(args,	fmt);
+				(void)	vsnprintf(errText,	MAX_MSG_SIZE,	fmt,	args);
+				va_end(args);
 
-    snprintf(msgText, sizeof(msgText), "{ \"msg_type\" : \"error\",\n"
-                     "  \"error\" : \"%s\"}\n", errText);
+				snprintf(msgText,	sizeof(msgText),	"{	\"msg_type\"	:	\"error\",\n"
+																					"		\"error\"	:	\"%s\"}\n",	errText);
 
-    mg_websocket_write(connection, MG_WEBSOCKET_OPCODE_TEXT, msgText, strlen(msgText));
-    return (0);
+				mg_websocket_write(connection,	MG_WEBSOCKET_OPCODE_TEXT,	msgText,	strlen(msgText));
+				return	(0);
 }
 
-REF2* VariableServerSession::make_error_ref(const char* in_name) {
-    REF2* new_ref;
-    new_ref = (REF2*)calloc(1, sizeof(REF2));
-    new_ref->reference = strdup(in_name) ;
-    new_ref->units = NULL ;
-    new_ref->address = (char *)&bad_ref_int ;
-    new_ref->attr = (ATTRIBUTES*)calloc(1, sizeof(ATTRIBUTES)) ;
-    new_ref->attr->type = TRICK_NUMBER_OF_TYPES ;
-    new_ref->attr->units = (char *)"--" ;
-    new_ref->attr->size = sizeof(int) ;
-    return new_ref;
+REF2*	VariableServerSession::make_error_ref(const	char*	in_name)	{
+				REF2*	new_ref;
+				new_ref	=	(REF2*)calloc(1,	sizeof(REF2));
+				new_ref->reference	=	strdup(in_name)	;
+				new_ref->units	=	NULL	;
+				new_ref->address	=	(char	*)&bad_ref_int	;
+				new_ref->attr	=	(ATTRIBUTES*)calloc(1,	sizeof(ATTRIBUTES))	;
+				new_ref->attr->type	=	TRICK_NUMBER_OF_TYPES	;
+				new_ref->attr->units	=	(char	*)"--"	;
+				new_ref->attr->size	=	sizeof(int)	;
+				return	new_ref;
 }
 
-// WebSocketSessionMaker function for a VariableServerSession.
-WebSocketSession* makeVariableServerSession( struct mg_connection *nc ) {
-    return new VariableServerSession(nc);
+//	WebSocketSessionMaker	function	for	a	VariableServerSession.
+WebSocketSession*	makeVariableServerSession(	struct	mg_connection	*nc	)	{
+				return	new	VariableServerSession(nc);
 }
 
 
-int VariableServerSession::sendSieMessage(void) {
-    std::ifstream file("./S_sie.json");
-    std::stringstream ss;
-    ss << "{ \"msg_type\": \"sie\", \"data\": ";
-    ss << file.rdbuf();
-    file.close();
-    ss << "}";
-    std::string tmp = ss.str();
-    const char* message = tmp.c_str();
-    mg_websocket_write(connection, MG_WEBSOCKET_OPCODE_TEXT, message, strlen(message));
-    return 0;
+int	VariableServerSession::sendSieMessage(void)	{
+				std::ifstream	file("./S_sie.json");
+				std::stringstream	ss;
+				ss	<<	"{	\"msg_type\":	\"sie\",	\"data\":	";
+				ss	<<	file.rdbuf();
+				file.close();
+				ss	<<	"}";
+				std::string	tmp	=	ss.str();
+				const	char*	message	=	tmp.c_str();
+				mg_websocket_write(connection,	MG_WEBSOCKET_OPCODE_TEXT,	message,	strlen(message));
+				return	0;
 }
 
-int VariableServerSession::sendUnitsMessage(const char* vname) {
-    std::vector<VariableServerVariable*>::iterator it;
-    std::stringstream ss;
-    ss << "{ \"msg_type\": \"units\", \"var_name\": \"" << vname << "\", \"data\": \"";
-    for (it = sessionVariables.begin(); it != sessionVariables.end(); ++it ) {
-        if(!strcmp((*it)->getName(), vname)) {
-            ss << (
-                (
-                    (
-                        (*it)->getUnits() != NULL
-                    ) && 
-                    (
-                        (*it)->getUnits()[0] != '\0'
-                    )
-                ) ? (*it)->getUnits() : "--") << "\"}";
-            std::string tmp = ss.str();
-            const char* message = tmp.c_str();
-            mg_websocket_write(connection, MG_WEBSOCKET_OPCODE_TEXT, message, strlen(message));
-            return 0;
-        }
-    }
-    sendErrorMessage("Variable Server: var_units cannot get units for \"%s\" because it must be added to the variable server first\n", vname);
-    return 0;
+int	VariableServerSession::sendUnitsMessage(const	char*	vname)	{
+				std::vector<VariableServerVariable*>::iterator	it;
+				std::stringstream	ss;
+				ss	<<	"{	\"msg_type\":	\"units\",	\"var_name\":	\""	<<	vname	<<	"\",	\"data\":	\"";
+				for	(it	=	sessionVariables.begin();	it	!=	sessionVariables.end();	++it	)	{
+								if(!strcmp((*it)->getName(),	vname))	{
+												ss	<<	(
+																(
+																				(
+																								(*it)->getUnits()	!=	NULL
+																				)	&&	
+																				(
+																								(*it)->getUnits()[0]	!=	'\0'
+																				)
+																)	?	(*it)->getUnits()	:	"--")	<<	"\"}";
+												std::string	tmp	=	ss.str();
+												const	char*	message	=	tmp.c_str();
+												mg_websocket_write(connection,	MG_WEBSOCKET_OPCODE_TEXT,	message,	strlen(message));
+												return	0;
+								}
+				}
+				sendErrorMessage("Variable	Server:	var_units	cannot	get	units	for	\"%s\"	because	it	must	be	added	to	the	variable	server	first\n",	vname);
+				return	0;
 }
diff --git a/trick_source/web/CivetServer/src/VariableServerVariable.cpp b/trick_source/web/CivetServer/src/VariableServerVariable.cpp
index 85b7badc6..e7696b034 100644
--- a/trick_source/web/CivetServer/src/VariableServerVariable.cpp
+++ b/trick_source/web/CivetServer/src/VariableServerVariable.cpp
@@ -1,194 +1,194 @@
-#include "trick/memorymanager_c_intf.h" // for get_size.
-#include "VariableServerVariable.hh"
-#include <math.h> // for fpclassify
-#include <iomanip> // for setprecision
-#include <stdarg.h>
-#include <cstring>
+#include	"trick/memorymanager_c_intf.h"	//	for	get_size.
+#include	"VariableServerVariable.hh"
+#include	<math.h>	//	for	fpclassify
+#include	<iomanip>	//	for	setprecision
+#include	<stdarg.h>
+#include	<cstring>
 
 
-VariableServerVariable::VariableServerVariable(REF2 * ref ) {
-    varInfo = ref;
-    address = varInfo->address;
-    size = varInfo->attr->size ;
-    deref = false;
+VariableServerVariable::VariableServerVariable(REF2	*	ref	)	{
+				varInfo	=	ref;
+				address	=	varInfo->address;
+				size	=	varInfo->attr->size	;
+				deref	=	false;
 
-    TRICK_TYPE string_type = varInfo->attr->type ;
+				TRICK_TYPE	string_type	=	varInfo->attr->type	;
 
-    if ( varInfo->num_index == varInfo->attr->num_index ) {
-        // single value
-    } else if ( varInfo->attr->index[varInfo->attr->num_index - 1].size != 0 ) {
-        // Constrained array
-        for ( int i = varInfo->attr->num_index-1;  i > varInfo->num_index-1 ; i-- ) {
-            size *= varInfo->attr->index[i].size ;
-        }
-    } else {
-        // Unconstrained array
-        if ((varInfo->attr->num_index - varInfo->num_index) > 1 ) {
-            printf("Variable Server Error: var_add(%s) requests more than one dimension of dynamic array.\n", varInfo->reference);
-            printf("Data is not contiguous so returned values are unpredictable.\n") ;
-        }
-        if ( varInfo->attr->type == TRICK_CHARACTER ) {
-            string_type = TRICK_STRING ;
-            deref = true;
-        } else if ( varInfo->attr->type == TRICK_WCHAR ) {
-            string_type = TRICK_WSTRING ;
-        } else {
-            deref = true ;
-            size *= get_size((char*)address) ;
-        }
-    }
-    // handle strings: set a max buffer size, the copy size may vary so will be set in copy_sim_data
-    if (( string_type == TRICK_STRING ) || ( string_type == TRICK_WSTRING )) {
-        size = MAX_ARRAY_LENGTH ;
-    }
-    stageBuffer = calloc(size, 1) ;
+				if	(	varInfo->num_index	==	varInfo->attr->num_index	)	{
+								//	single	value
+				}	else	if	(	varInfo->attr->index[varInfo->attr->num_index	-	1].size	!=	0	)	{
+								//	Constrained	array
+								for	(	int	i	=	varInfo->attr->num_index-1;		i	>	varInfo->num_index-1	;	i--	)	{
+												size	*=	varInfo->attr->index[i].size	;
+								}
+				}	else	{
+								//	Unconstrained	array
+								if	((varInfo->attr->num_index	-	varInfo->num_index)	>	1	)	{
+												printf("Variable	Server	Error:	var_add(%s)	requests	more	than	one	dimension	of	dynamic	array.\n",	varInfo->reference);
+												printf("Data	is	not	contiguous	so	returned	values	are	unpredictable.\n")	;
+								}
+								if	(	varInfo->attr->type	==	TRICK_CHARACTER	)	{
+												string_type	=	TRICK_STRING	;
+												deref	=	true;
+								}	else	if	(	varInfo->attr->type	==	TRICK_WCHAR	)	{
+												string_type	=	TRICK_WSTRING	;
+								}	else	{
+												deref	=	true	;
+												size	*=	get_size((char*)address)	;
+								}
+				}
+				//	handle	strings:	set	a	max	buffer	size,	the	copy	size	may	vary	so	will	be	set	in	copy_sim_data
+				if	((	string_type	==	TRICK_STRING	)	||	(	string_type	==	TRICK_WSTRING	))	{
+								size	=	MAX_ARRAY_LENGTH	;
+				}
+				stageBuffer	=	calloc(size,	1)	;
 }
 
-VariableServerVariable::~VariableServerVariable() {
-    if (varInfo != NULL) free( varInfo );
+VariableServerVariable::~VariableServerVariable()	{
+				if	(varInfo	!=	NULL)	free(	varInfo	);
 }
 
 
-const char* VariableServerVariable::getName() {
-    return varInfo->reference;
+const	char*	VariableServerVariable::getName()	{
+				return	varInfo->reference;
 }
 
-const char* VariableServerVariable::getUnits() {
-    return varInfo->attr->units;
+const	char*	VariableServerVariable::getUnits()	{
+				return	varInfo->attr->units;
 }
 
-static void write_quoted_str( std::ostream& os, const char* s) {
-    int ii;
-    int len = strlen(s);
-    os << "\"" ;
-    for (ii=0 ; ii<len ; ii++) {
-        switch ((s)[ii]) {
-        case '\n': os << "\\n"; break;
-        case '\t': os << "\\t"; break;
-        case '\b': os << "\\b"; break;
-        case '\"': os << "\\\""; break;
-        default  : os << s[ii] ; break;
-        }
-    }
-    os << "\"" ;
+static	void	write_quoted_str(	std::ostream&	os,	const	char*	s)	{
+				int	ii;
+				int	len	=	strlen(s);
+				os	<<	"\""	;
+				for	(ii=0	;	ii<len	;	ii++)	{
+								switch	((s)[ii])	{
+								case	'\n':	os	<<	"\\n";	break;
+								case	'\t':	os	<<	"\\t";	break;
+								case	'\b':	os	<<	"\\b";	break;
+								case	'\"':	os	<<	"\\\"";	break;
+								default		:	os	<<	s[ii]	;	break;
+								}
+				}
+				os	<<	"\""	;
 }
 
-void VariableServerVariable::stageValue() {
-    // Copy <size> bytes from <address> to staging_point.
+void	VariableServerVariable::stageValue()	{
+				//	Copy	<size>	bytes	from	<address>	to	staging_point.
 
-    if ( varInfo->attr->type == TRICK_STRING ) {
-        if (address == NULL) {
-            size = 0 ;
-        } else {
-            size = strlen((char*)varInfo->address) + 1 ;
-        }
-    }
+				if	(	varInfo->attr->type	==	TRICK_STRING	)	{
+								if	(address	==	NULL)	{
+												size	=	0	;
+								}	else	{
+												size	=	strlen((char*)varInfo->address)	+	1	;
+								}
+				}
 
-    if (address != NULL) {
-         memcpy(stageBuffer, address, size);
-    }
+				if	(address	!=	NULL)	{
+									memcpy(stageBuffer,	address,	size);
+				}
 }
 
-void VariableServerVariable::writeValue( std::ostream& outs ) {
+void	VariableServerVariable::writeValue(	std::ostream&	outs	)	{
 
-    switch(varInfo->attr->type) {
-        case TRICK_UNSIGNED_CHARACTER:
-            outs << std::dec << (int)*(unsigned char*)stageBuffer ;
-        break;
-        case TRICK_BOOLEAN:
-            if (*(bool*)stageBuffer) {
-                outs << "\"true\"" ;
-            } else {
-                outs << "\"false\"" ;
-            }
-        break;
-        case TRICK_CHARACTER:
-            if (isprint( *(char*)stageBuffer) ) {
-                outs << "'" << *(char*)stageBuffer << "'" ;
-            } else {
-                unsigned int ch = *(unsigned char*)stageBuffer;
-                  outs << "'\\x" << std::hex << ch << "'" ;
-            }
-        break;
-        case TRICK_WCHAR:
-            outs << std::dec << *(wchar_t*)stageBuffer;
-            break;
-        case TRICK_SHORT:
-            outs << std::dec << *(short*)stageBuffer;
-            break;
-        case TRICK_UNSIGNED_SHORT:
-            outs << std::dec << *(unsigned short*)stageBuffer;
-            break;
-        case TRICK_ENUMERATED:
-            outs << std::dec << *(int*)stageBuffer;
-            break;
-        case TRICK_INTEGER:
-            outs << std::dec << *(int*)stageBuffer;
-            break;
-        case TRICK_UNSIGNED_INTEGER:
-            outs << std::dec << *(unsigned int*)stageBuffer;
-            break;
-        case TRICK_LONG:
-            outs << std::dec << *(long*)stageBuffer;
-            break;
-        case TRICK_UNSIGNED_LONG:
-            outs << std::dec << *(unsigned long*)stageBuffer;
-            break;
-        case TRICK_FLOAT:
-            if (fpclassify( *(float*)stageBuffer) != FP_NAN) {
-                outs << std::setprecision(8) << *(float*)stageBuffer;
-            } else {
-                outs << "NAN";
-            }
-            break;
-        case TRICK_DOUBLE:
-            if (fpclassify( *(double*)stageBuffer) != FP_NAN) {
-                outs << std::setprecision(16) << *(double*)stageBuffer;
-            } else {
-                outs << "NAN";
-            }
-            break;
-//        case TRICK_BITFIELD: {
-//                int sbf = 0;
-//                src_addr = (char*)stageBuffer + offset * (size_t)attr->size;
-//                if (attr->size == sizeof(int)) {
-//                     sbf = extract_bitfield_any( *(int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else if (attr->size == sizeof(short)) {
-//                     sbf = extract_bitfield_any( *(short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else if (attr->size == sizeof(char)) {
-//                     sbf = extract_bitfield_any( *(char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else {
-//                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-//                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-//                }
-//                outs << std::dec << sbf;
-//            } break;
-//        case TRICK_UNSIGNED_BITFIELD: {
-//                int bf = 0;
-//                src_addr = (char*)stageBuffer + offset * (size_t)attr->size;
-//                if (attr->size == sizeof(int)) {
-//                     bf = extract_unsigned_bitfield_any( *(unsigned int*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else if (attr->size == sizeof(short)) {
-//                     bf = extract_unsigned_bitfield_any( *(unsigned short*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else if (attr->size == sizeof(char)) {
-//                     bf = extract_unsigned_bitfield_any( *(unsigned char*)src_addr, attr->size, attr->index[0].start, attr->index[0].size);
-//                } else {
-//                     message_publish(MSG_ERROR, "Checkpoint Agent INTERNAL ERROR:\n"
-//                                                "Unsupported bitfield size (%d) bytes.\n", attr->size) ;
-//                }
-//                outs << std::dec << bf;
-//            } break;
-        case TRICK_LONG_LONG:
-            outs << std::dec << *(long long*)stageBuffer;
-            break;
-        case TRICK_UNSIGNED_LONG_LONG:
-            outs << std::dec << *(unsigned long long*)stageBuffer;
-            break;
-        case TRICK_STRING:
-            write_quoted_str(outs, (*(std::string*)stageBuffer).c_str());
-            break;
-        default:
-            outs << "\"Error\""; // ERROR
-            break;
-    }
+				switch(varInfo->attr->type)	{
+								case	TRICK_UNSIGNED_CHARACTER:
+												outs	<<	std::dec	<<	(int)*(unsigned	char*)stageBuffer	;
+								break;
+								case	TRICK_BOOLEAN:
+												if	(*(bool*)stageBuffer)	{
+																outs	<<	"\"true\""	;
+												}	else	{
+																outs	<<	"\"false\""	;
+												}
+								break;
+								case	TRICK_CHARACTER:
+												if	(isprint(	*(char*)stageBuffer)	)	{
+																outs	<<	"'"	<<	*(char*)stageBuffer	<<	"'"	;
+												}	else	{
+																unsigned	int	ch	=	*(unsigned	char*)stageBuffer;
+																		outs	<<	"'\\x"	<<	std::hex	<<	ch	<<	"'"	;
+												}
+								break;
+								case	TRICK_WCHAR:
+												outs	<<	std::dec	<<	*(wchar_t*)stageBuffer;
+												break;
+								case	TRICK_SHORT:
+												outs	<<	std::dec	<<	*(short*)stageBuffer;
+												break;
+								case	TRICK_UNSIGNED_SHORT:
+												outs	<<	std::dec	<<	*(unsigned	short*)stageBuffer;
+												break;
+								case	TRICK_ENUMERATED:
+												outs	<<	std::dec	<<	*(int*)stageBuffer;
+												break;
+								case	TRICK_INTEGER:
+												outs	<<	std::dec	<<	*(int*)stageBuffer;
+												break;
+								case	TRICK_UNSIGNED_INTEGER:
+												outs	<<	std::dec	<<	*(unsigned	int*)stageBuffer;
+												break;
+								case	TRICK_LONG:
+												outs	<<	std::dec	<<	*(long*)stageBuffer;
+												break;
+								case	TRICK_UNSIGNED_LONG:
+												outs	<<	std::dec	<<	*(unsigned	long*)stageBuffer;
+												break;
+								case	TRICK_FLOAT:
+												if	(fpclassify(	*(float*)stageBuffer)	!=	FP_NAN)	{
+																outs	<<	std::setprecision(8)	<<	*(float*)stageBuffer;
+												}	else	{
+																outs	<<	"NAN";
+												}
+												break;
+								case	TRICK_DOUBLE:
+												if	(fpclassify(	*(double*)stageBuffer)	!=	FP_NAN)	{
+																outs	<<	std::setprecision(16)	<<	*(double*)stageBuffer;
+												}	else	{
+																outs	<<	"NAN";
+												}
+												break;
+//								case	TRICK_BITFIELD:	{
+//																int	sbf	=	0;
+//																src_addr	=	(char*)stageBuffer	+	offset	*	(size_t)attr->size;
+//																if	(attr->size	==	sizeof(int))	{
+//																					sbf	=	extract_bitfield_any(	*(int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	if	(attr->size	==	sizeof(short))	{
+//																					sbf	=	extract_bitfield_any(	*(short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	if	(attr->size	==	sizeof(char))	{
+//																					sbf	=	extract_bitfield_any(	*(char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	{
+//																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+//																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+//																}
+//																outs	<<	std::dec	<<	sbf;
+//												}	break;
+//								case	TRICK_UNSIGNED_BITFIELD:	{
+//																int	bf	=	0;
+//																src_addr	=	(char*)stageBuffer	+	offset	*	(size_t)attr->size;
+//																if	(attr->size	==	sizeof(int))	{
+//																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	int*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	if	(attr->size	==	sizeof(short))	{
+//																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	short*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	if	(attr->size	==	sizeof(char))	{
+//																					bf	=	extract_unsigned_bitfield_any(	*(unsigned	char*)src_addr,	attr->size,	attr->index[0].start,	attr->index[0].size);
+//																}	else	{
+//																					message_publish(MSG_ERROR,	"Checkpoint	Agent	INTERNAL	ERROR:\n"
+//																																																"Unsupported	bitfield	size	(%d)	bytes.\n",	attr->size)	;
+//																}
+//																outs	<<	std::dec	<<	bf;
+//												}	break;
+								case	TRICK_LONG_LONG:
+												outs	<<	std::dec	<<	*(long	long*)stageBuffer;
+												break;
+								case	TRICK_UNSIGNED_LONG_LONG:
+												outs	<<	std::dec	<<	*(unsigned	long	long*)stageBuffer;
+												break;
+								case	TRICK_STRING:
+												write_quoted_str(outs,	(*(std::string*)stageBuffer).c_str());
+												break;
+								default:
+												outs	<<	"\"Error\"";	//	ERROR
+												break;
+				}
 }
diff --git a/trick_source/web/CivetServer/src/http_GET_handlers.cpp b/trick_source/web/CivetServer/src/http_GET_handlers.cpp
index 10b637687..a62ac7883 100644
--- a/trick_source/web/CivetServer/src/http_GET_handlers.cpp
+++ b/trick_source/web/CivetServer/src/http_GET_handlers.cpp
@@ -1,196 +1,196 @@
 /*************************************************************************
-PURPOSE: ( HTTP-GET-method-handlers )
-LIBRARY DEPENDENCIES:
-    ( (../src/http_GET_handlers.o))
+PURPOSE:	(	HTTP-GET-method-handlers	)
+LIBRARY	DEPENDENCIES:
+				(	(../src/http_GET_handlers.o))
 **************************************************************************/
 
-#include "http_GET_handlers.hh"
-#include "trick/MyCivetServer.hh"
-#include "trick/message_proto.h"
-#include "trick/message_type.h"
+#include	"http_GET_handlers.hh"
+#include	"trick/MyCivetServer.hh"
+#include	"trick/message_proto.h"
+#include	"trick/message_type.h"
 
-#ifndef SWIG
-#include "CivetServer.h"
+#ifndef	SWIG
+#include	"CivetServer.h"
 #endif
 
-#include <sstream>
+#include	<sstream>
 
-#include "trick/VariableServer.hh"
-extern Trick::VariableServer * the_vs ;
+#include	"trick/VariableServer.hh"
+extern	Trick::VariableServer	*	the_vs	;
 
-#include "trick/MemoryManager.hh"
-extern Trick::MemoryManager* trick_MM;
+#include	"trick/MemoryManager.hh"
+extern	Trick::MemoryManager*	trick_MM;
 
-static const std::string ws_api_prefix = "/api/ws";
-static const std::string http_api_prefix = "/api/http";
+static	const	std::string	ws_api_prefix	=	"/api/ws";
+static	const	std::string	http_api_prefix	=	"/api/http";
 
-int http_send_error(struct mg_connection *conn, int error_code, const char* msg, int len, int chunk_size) { //TODO: Make this display correctly
-    message_publish(MSG_DEBUG, "Sending error msg: %s\n", msg);
+int	http_send_error(struct	mg_connection	*conn,	int	error_code,	const	char*	msg,	int	len,	int	chunk_size)	{	//TODO:	Make	this	display	correctly
+				message_publish(MSG_DEBUG,	"Sending	error	msg:	%s\n",	msg);
 
-    mg_printf(conn,
-		          "HTTP/1.1 %i Method Not Allowed\r\nConnection: close\r\n", error_code);
-    mg_printf(conn, "Content-Type: text/plain\r\n\r\n");
-    http_send(conn, msg, len, chunk_size);
-    return error_code;
+				mg_printf(conn,
+												"HTTP/1.1	%i	Method	Not	Allowed\r\nConnection:	close\r\n",	error_code);
+				mg_printf(conn,	"Content-Type:	text/plain\r\n\r\n");
+				http_send(conn,	msg,	len,	chunk_size);
+				return	error_code;
 }
 
-int http_send_ok(struct mg_connection *conn, const char* msg, int len, int chunk_size) {
-    message_publish(MSG_DEBUG, "Sending ok msg: %s\n", msg);
-    mg_printf(conn,
-        "HTTP/1.1 200 OK\r\nConnection: "
-        "close\r\nTransfer-Encoding: chunked\r\n");
-    mg_printf(conn, "Content-Type: text/plain\r\n\r\n");
-    http_send(conn, msg, len, chunk_size);
-    return 200;
+int	http_send_ok(struct	mg_connection	*conn,	const	char*	msg,	int	len,	int	chunk_size)	{
+				message_publish(MSG_DEBUG,	"Sending	ok	msg:	%s\n",	msg);
+				mg_printf(conn,
+								"HTTP/1.1	200	OK\r\nConnection:	"
+								"close\r\nTransfer-Encoding:	chunked\r\n");
+				mg_printf(conn,	"Content-Type:	text/plain\r\n\r\n");
+				http_send(conn,	msg,	len,	chunk_size);
+				return	200;
 }
 
-void http_send(struct mg_connection *conn, const char* msg, int len, int chunk_size) {
-    int size = len;
-    int count = 0;
-    if (chunk_size > size) {
-        chunk_size = len;
-    }
-    while (size > chunk_size) {
-        std::string buff = std::string(msg).substr(count * chunk_size, chunk_size);
-        mg_send_chunk(conn, buff.c_str(), buff.length());
-        count++;
-        size = size - chunk_size;
-    }
-    std::string buff = std::string(msg).substr(count * chunk_size, chunk_size);
-    mg_send_chunk(conn, buff.c_str(), buff.length());
-    mg_send_chunk(conn, "", 0);
+void	http_send(struct	mg_connection	*conn,	const	char*	msg,	int	len,	int	chunk_size)	{
+				int	size	=	len;
+				int	count	=	0;
+				if	(chunk_size	>	size)	{
+								chunk_size	=	len;
+				}
+				while	(size	>	chunk_size)	{
+								std::string	buff	=	std::string(msg).substr(count	*	chunk_size,	chunk_size);
+								mg_send_chunk(conn,	buff.c_str(),	buff.length());
+								count++;
+								size	=	size	-	chunk_size;
+				}
+				std::string	buff	=	std::string(msg).substr(count	*	chunk_size,	chunk_size);
+				mg_send_chunk(conn,	buff.c_str(),	buff.length());
+				mg_send_chunk(conn,	"",	0);
 }
 
-///// HTTP
-
-
-int parent_http_handler(struct mg_connection* conn, void *data) {
-
-    MyCivetServer* server = (MyCivetServer*)data;
-    const struct mg_request_info* ri = mg_get_request_info(conn);
-    std::string uri = ri->local_uri_raw;
-    if (server->debug) { message_publish(MSG_INFO, "Trick Webserver: HTTP_REQUEST: URI = \"%s\".\n", uri.c_str()); }
-    std::string httpType = "";
-    if (http_api_prefix.size() < uri.size()) {
-        httpType = uri.substr(http_api_prefix.size() + 1, uri.size());
-    }
-    if (httpType != "") {
-        if (server->debug) { message_publish(MSG_DEBUG, "HTTP_REQUEST: METHOD = \"%s\"\n", ri->request_method); }
-        std::string method = std::string(ri->request_method);
-        if (method == "GET") {
-            if (server->debug) { message_publish(MSG_DEBUG, "HTTP_REQUEST: HANDLER = \"%s\"\n", httpType.c_str()); }
-            server->handleHTTPGETrequest(conn, ri, httpType);
-            return 200;
-        } else if (method == "PUT") {
-            std::string msg = "PUT method not allowed";
-            return http_send_error(conn, 405, msg.c_str(), msg.size(), 100);
-        } else if (method == "DELETE") {
-            std::string msg = "DELETE method not allowed";
-            return http_send_error(conn, 405, msg.c_str(), msg.size(), 100);
-        } else if (method == "POST") {
-            std::string msg = "POST method not allowed";
-            return http_send_error(conn, 405, msg.c_str(), msg.size(), 100);
-        }
-    }
-    std::string msg = "No endpoint given.  To access the api use the /api/http/<endpoint>.";
-    return http_send_error(conn, 405, msg.c_str(), msg.size(), 100);
+/////	HTTP
+
+
+int	parent_http_handler(struct	mg_connection*	conn,	void	*data)	{
+
+				MyCivetServer*	server	=	(MyCivetServer*)data;
+				const	struct	mg_request_info*	ri	=	mg_get_request_info(conn);
+				std::string	uri	=	ri->local_uri_raw;
+				if	(server->debug)	{	message_publish(MSG_INFO,	"Trick	Webserver:	HTTP_REQUEST:	URI	=	\"%s\".\n",	uri.c_str());	}
+				std::string	httpType	=	"";
+				if	(http_api_prefix.size()	<	uri.size())	{
+								httpType	=	uri.substr(http_api_prefix.size()	+	1,	uri.size());
+				}
+				if	(httpType	!=	"")	{
+								if	(server->debug)	{	message_publish(MSG_DEBUG,	"HTTP_REQUEST:	METHOD	=	\"%s\"\n",	ri->request_method);	}
+								std::string	method	=	std::string(ri->request_method);
+								if	(method	==	"GET")	{
+												if	(server->debug)	{	message_publish(MSG_DEBUG,	"HTTP_REQUEST:	HANDLER	=	\"%s\"\n",	httpType.c_str());	}
+												server->handleHTTPGETrequest(conn,	ri,	httpType);
+												return	200;
+								}	else	if	(method	==	"PUT")	{
+												std::string	msg	=	"PUT	method	not	allowed";
+												return	http_send_error(conn,	405,	msg.c_str(),	msg.size(),	100);
+								}	else	if	(method	==	"DELETE")	{
+												std::string	msg	=	"DELETE	method	not	allowed";
+												return	http_send_error(conn,	405,	msg.c_str(),	msg.size(),	100);
+								}	else	if	(method	==	"POST")	{
+												std::string	msg	=	"POST	method	not	allowed";
+												return	http_send_error(conn,	405,	msg.c_str(),	msg.size(),	100);
+								}
+				}
+				std::string	msg	=	"No	endpoint	given.		To	access	the	api	use	the	/api/http/<endpoint>.";
+				return	http_send_error(conn,	405,	msg.c_str(),	msg.size(),	100);
 }
 
-void handle_HTTP_GET_vs_connections(struct mg_connection* conn, void *cbdata) {
-    std::stringstream ss;
-    ss << *the_vs << std::endl;
-    std::string someJSON = ss.str();
+void	handle_HTTP_GET_vs_connections(struct	mg_connection*	conn,	void	*cbdata)	{
+				std::stringstream	ss;
+				ss	<<	*the_vs	<<	std::endl;
+				std::string	someJSON	=	ss.str();
 
-    http_send_ok(conn, someJSON.c_str(), someJSON.length(), 100);
+				http_send_ok(conn,	someJSON.c_str(),	someJSON.length(),	100);
 }
 
-void handle_HTTP_GET_alloc_info(struct mg_connection *conn, void* ignore) {
-    mg_printf(conn,
-	          "HTTP/1.1 200 OK\r\nConnection: "
-	          "close\r\nTransfer-Encoding: chunked\r\n");
-	mg_printf(conn, "Content-Type: text/plain\r\n\r\n");
-    const struct mg_request_info* ri = mg_get_request_info(conn);
-    int max_size = 100;
-    char start_str[max_size], count_str[max_size];
-
-    int error_code1, error_code2;
-    assert(ri != NULL);
-    if (ri->query_string != NULL) {
-        std::string data = ri->query_string;
-        message_publish(MSG_DEBUG, "query_string = %s\n", data.c_str());
-        error_code1 = mg_get_var(data.c_str(), strlen(data.c_str()), "start", start_str, max_size);
-        error_code2 = mg_get_var(data.c_str(), strlen(data.c_str()), "count", count_str, max_size);
-    } else {
-        error_code1 = -1;
-        error_code2 = -1;
-    }
-    if (error_code1 < 0) {
-        message_publish(MSG_WARNING, "Could not find uri param: start. Error code: %i\n", error_code1);
-        strncpy(start_str, "0", 1);
-    }
-    if (error_code2 < 0) {
-        message_publish(MSG_WARNING, "Could not find uri param: count. Error code: %i\n", error_code2);
-        strncpy(count_str, "10", 2); //By default we show 10.
-    }
-    mg_send_http_ok(conn, "text/plain", -1);
-    int start = strtol(start_str, NULL, 0);
-    int count = strtol(count_str, NULL, 0);
-    std::stringstream ss;
-    trick_MM->write_JSON_alloc_list(ss, start, count);
-    
-    std::string someJSON = ss.str();
-    http_send(conn, someJSON.c_str(), someJSON.length(), 100);
+void	handle_HTTP_GET_alloc_info(struct	mg_connection	*conn,	void*	ignore)	{
+				mg_printf(conn,
+											"HTTP/1.1	200	OK\r\nConnection:	"
+											"close\r\nTransfer-Encoding:	chunked\r\n");
+	mg_printf(conn,	"Content-Type:	text/plain\r\n\r\n");
+				const	struct	mg_request_info*	ri	=	mg_get_request_info(conn);
+				int	max_size	=	100;
+				char	start_str[max_size],	count_str[max_size];
+
+				int	error_code1,	error_code2;
+				assert(ri	!=	NULL);
+				if	(ri->query_string	!=	NULL)	{
+								std::string	data	=	ri->query_string;
+								message_publish(MSG_DEBUG,	"query_string	=	%s\n",	data.c_str());
+								error_code1	=	mg_get_var(data.c_str(),	strlen(data.c_str()),	"start",	start_str,	max_size);
+								error_code2	=	mg_get_var(data.c_str(),	strlen(data.c_str()),	"count",	count_str,	max_size);
+				}	else	{
+								error_code1	=	-1;
+								error_code2	=	-1;
+				}
+				if	(error_code1	<	0)	{
+								message_publish(MSG_WARNING,	"Could	not	find	uri	param:	start.	Error	code:	%i\n",	error_code1);
+								strncpy(start_str,	"0",	1);
+				}
+				if	(error_code2	<	0)	{
+								message_publish(MSG_WARNING,	"Could	not	find	uri	param:	count.	Error	code:	%i\n",	error_code2);
+								strncpy(count_str,	"10",	2);	//By	default	we	show	10.
+				}
+				mg_send_http_ok(conn,	"text/plain",	-1);
+				int	start	=	strtol(start_str,	NULL,	0);
+				int	count	=	strtol(count_str,	NULL,	0);
+				std::stringstream	ss;
+				trick_MM->write_JSON_alloc_list(ss,	start,	count);
+				
+				std::string	someJSON	=	ss.str();
+				http_send(conn,	someJSON.c_str(),	someJSON.length(),	100);
 
 }
 
-///// websockets
+/////	websockets
 
-int ws_connect_handler(const struct mg_connection *conn,
-				     void *ignore)
+int	ws_connect_handler(const	struct	mg_connection	*conn,
+									void	*ignore)
 {
-	int ret_val = 0;
-	return ret_val;
+	int	ret_val	=	0;
+	return	ret_val;
 }
 
-void ws_ready_handler(struct mg_connection *conn, void *my_server)
+void	ws_ready_handler(struct	mg_connection	*conn,	void	*my_server)
 {
-	MyCivetServer* server = (MyCivetServer*) my_server;
-    const struct mg_request_info* ri = mg_get_request_info(conn);
-    std::string uri = ri->local_uri_raw;
-    if (server->debug) { message_publish(MSG_INFO,"Trick Webserver: WEBSOCKET_REQUEST: URI = \"%s\".\n", uri.c_str()); }
-    std::string wsType = "";
-    if (ws_api_prefix.size() < uri.size()) {
-        wsType = uri.substr(ws_api_prefix.size() + 1, uri.size());
-    }
-    WebSocketSession* session = server->makeWebSocketSession(conn, wsType);
-    if (session != NULL) {
-        if (server->debug) { message_publish(MSG_INFO, "Trick Webserver: WEBSOCKET[%p] OPENED. URI=\"%s\".\n", (void*)conn, uri.c_str()); }
-        server->addWebSocketSession(conn, session);
-    } else {
-        message_publish(MSG_ERROR, "Trick Webserver: No such web socket interface: \"%s\".\n", uri.c_str()); 
-        mg_websocket_write(conn, MG_WEBSOCKET_OPCODE_CONNECTION_CLOSE, NULL, 0);
-    }
+	MyCivetServer*	server	=	(MyCivetServer*)	my_server;
+				const	struct	mg_request_info*	ri	=	mg_get_request_info(conn);
+				std::string	uri	=	ri->local_uri_raw;
+				if	(server->debug)	{	message_publish(MSG_INFO,"Trick	Webserver:	WEBSOCKET_REQUEST:	URI	=	\"%s\".\n",	uri.c_str());	}
+				std::string	wsType	=	"";
+				if	(ws_api_prefix.size()	<	uri.size())	{
+								wsType	=	uri.substr(ws_api_prefix.size()	+	1,	uri.size());
+				}
+				WebSocketSession*	session	=	server->makeWebSocketSession(conn,	wsType);
+				if	(session	!=	NULL)	{
+								if	(server->debug)	{	message_publish(MSG_INFO,	"Trick	Webserver:	WEBSOCKET[%p]	OPENED.	URI=\"%s\".\n",	(void*)conn,	uri.c_str());	}
+								server->addWebSocketSession(conn,	session);
+				}	else	{
+								message_publish(MSG_ERROR,	"Trick	Webserver:	No	such	web	socket	interface:	\"%s\".\n",	uri.c_str());	
+								mg_websocket_write(conn,	MG_WEBSOCKET_OPCODE_CONNECTION_CLOSE,	NULL,	0);
+				}
 }
 
-int ws_data_handler(struct mg_connection *conn, int bits,
-				  char *data, size_t data_len, void *my_server)
+int	ws_data_handler(struct	mg_connection	*conn,	int	bits,
+						char	*data,	size_t	data_len,	void	*my_server)
 {
-	int rvalue = 1;
-    MyCivetServer* server = (MyCivetServer*) my_server;
-    std::string msg(data, data_len);
-    if (server->debug) { message_publish(MSG_INFO, "Trick Webserver: WEBSOCKET[%p] RECIEVED: \"%s\".\n", (void*)conn, msg.c_str()); }
-
-	if (data_len > 0) { 
-        std::string msg(data, data_len);
-		server->handleWebSocketClientMessage(conn, msg);
-	} 
-     return rvalue;
+	int	rvalue	=	1;
+				MyCivetServer*	server	=	(MyCivetServer*)	my_server;
+				std::string	msg(data,	data_len);
+				if	(server->debug)	{	message_publish(MSG_INFO,	"Trick	Webserver:	WEBSOCKET[%p]	RECIEVED:	\"%s\".\n",	(void*)conn,	msg.c_str());	}
+
+	if	(data_len	>	0)	{	
+								std::string	msg(data,	data_len);
+		server->handleWebSocketClientMessage(conn,	msg);
+	}	
+					return	rvalue;
 }
 
-void ws_close_handler(const struct mg_connection *conn,
-				    void *my_server)
+void	ws_close_handler(const	struct	mg_connection	*conn,
+								void	*my_server)
 {
-	MyCivetServer* server = (MyCivetServer*) my_server;
+	MyCivetServer*	server	=	(MyCivetServer*)	my_server;
 	server->deleteWebSocketSession(const_cast<mg_connection*>(conn));
-    if (server->debug) { message_publish(MSG_INFO,"Trick Webserver: WEBSOCKET[%p] CLOSED.\n", (void*)conn); }
+				if	(server->debug)	{	message_publish(MSG_INFO,"Trick	Webserver:	WEBSOCKET[%p]	CLOSED.\n",	(void*)conn);	}
 }
diff --git a/trick_source/web/CivetServer/src/simpleJSON.cpp b/trick_source/web/CivetServer/src/simpleJSON.cpp
index c04a2cbad..e902ff98e 100644
--- a/trick_source/web/CivetServer/src/simpleJSON.cpp
+++ b/trick_source/web/CivetServer/src/simpleJSON.cpp
@@ -1,216 +1,216 @@
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <iostream>
-#include "simpleJSON.hh"
+#include	<ctype.h>
+#include	<string.h>
+#include	<stdlib.h>
+#include	<iostream>
+#include	"simpleJSON.hh"
 
-class LexicalAnalyzer {
+class	LexicalAnalyzer	{
 public:
-    enum Lexeme {
-       END_OF_INPUT,
-       ERROR,
-       LEFT_BRACE,
-       RIGHT_BRACE,
-       LEFT_SQUARE_BRACKET,
-       RIGHT_SQUARE_BRACKET,
-       COLON,
-       COMMA,
-       STRING,
-       INTEGER
-    };
+				enum	Lexeme	{
+							END_OF_INPUT,
+							ERROR,
+							LEFT_BRACE,
+							RIGHT_BRACE,
+							LEFT_SQUARE_BRACKET,
+							RIGHT_SQUARE_BRACKET,
+							COLON,
+							COMMA,
+							STRING,
+							INTEGER
+				};
 
-    LexicalAnalyzer(const char*);
-    int next_lexeme();
-    char* getTokenText();
+				LexicalAnalyzer(const	char*);
+				int	next_lexeme();
+				char*	getTokenText();
 
 private:
-    const char * s;
-    const char * p;
-    const char * vs;
-    size_t vlen;
-    char getch();
-    void ungetch() ;
-    LexicalAnalyzer(){}
+				const	char	*	s;
+				const	char	*	p;
+				const	char	*	vs;
+				size_t	vlen;
+				char	getch();
+				void	ungetch()	;
+				LexicalAnalyzer(){}
 };
 
-LexicalAnalyzer::LexicalAnalyzer(const char* str) {
-    s = str;
-    p = str;
-    vs = NULL;
-    vlen = 0;
+LexicalAnalyzer::LexicalAnalyzer(const	char*	str)	{
+				s	=	str;
+				p	=	str;
+				vs	=	NULL;
+				vlen	=	0;
 }
 
-char LexicalAnalyzer::getch() {
-    char ch;
-    if ((ch = *p) != 0) { p++; }
-    return ch;
+char	LexicalAnalyzer::getch()	{
+				char	ch;
+				if	((ch	=	*p)	!=	0)	{	p++;	}
+				return	ch;
 }
 
-void LexicalAnalyzer::ungetch() {
-    if (p > s) { p--; }
+void	LexicalAnalyzer::ungetch()	{
+				if	(p	>	s)	{	p--;	}
 }
 
-char* LexicalAnalyzer::getTokenText() {
-    if (vlen > 0) {
-        return strndup(vs, vlen);
-    } else {
-        return NULL;
-    }
+char*	LexicalAnalyzer::getTokenText()	{
+				if	(vlen	>	0)	{
+								return	strndup(vs,	vlen);
+				}	else	{
+								return	NULL;
+				}
 }
 
-int LexicalAnalyzer::next_lexeme() {
-     int state = 0;
-     vlen = 0;
-     char ch;
-     while ((ch = getch()) != 0) {
-         switch (state) {
-         case 0 : { // Initial state.
-             if (ch == '{') {
-                 return LEFT_BRACE ;
-             } else if (ch == '}') {
-                 return RIGHT_BRACE ;
-             } else if (ch == '[') {
-                 return LEFT_SQUARE_BRACKET ;
-             } else if (ch == ']') {
-                 return RIGHT_SQUARE_BRACKET ;
-             } else if (ch == ':') {
-                 return COLON ;
-             } else if (ch == ',') {
-                 return COMMA ;
-             } else if ( ch == '"') {
-                 state = 1;
-                 vs = p;
-             } else if ( isdigit(ch) ) {
-                 ungetch();
-                 state = 2;
-                 vs = p;
-             } else if (isspace(ch)) {
-                state = 0;
-             }
-         } break;
-         case 1 : { // String literal accumulation state.
-             while ((ch != 0 ) && (ch != '"'))
-                ch = getch();
-             if (ch == '"') {
-                 vlen = p-vs-1 ;
-                 return STRING ;
-             } else {
-                 return ERROR ;
-             }
-         } break;
-         case 2 : { // Integer literal accumulation state.
-             while ((ch != 0 ) && (isdigit(ch)))
-                ch = getch();
-             ungetch();
-             vlen = p-vs;
-             return INTEGER ;
-         } break;
-         default:
-             return ERROR ;
-         }
-     }
-     return END_OF_INPUT;
+int	LexicalAnalyzer::next_lexeme()	{
+					int	state	=	0;
+					vlen	=	0;
+					char	ch;
+					while	((ch	=	getch())	!=	0)	{
+									switch	(state)	{
+									case	0	:	{	//	Initial	state.
+													if	(ch	==	'{')	{
+																	return	LEFT_BRACE	;
+													}	else	if	(ch	==	'}')	{
+																	return	RIGHT_BRACE	;
+													}	else	if	(ch	==	'[')	{
+																	return	LEFT_SQUARE_BRACKET	;
+													}	else	if	(ch	==	']')	{
+																	return	RIGHT_SQUARE_BRACKET	;
+													}	else	if	(ch	==	':')	{
+																	return	COLON	;
+													}	else	if	(ch	==	',')	{
+																	return	COMMA	;
+													}	else	if	(	ch	==	'"')	{
+																	state	=	1;
+																	vs	=	p;
+													}	else	if	(	isdigit(ch)	)	{
+																	ungetch();
+																	state	=	2;
+																	vs	=	p;
+													}	else	if	(isspace(ch))	{
+																state	=	0;
+													}
+									}	break;
+									case	1	:	{	//	String	literal	accumulation	state.
+													while	((ch	!=	0	)	&&	(ch	!=	'"'))
+																ch	=	getch();
+													if	(ch	==	'"')	{
+																	vlen	=	p-vs-1	;
+																	return	STRING	;
+													}	else	{
+																	return	ERROR	;
+													}
+									}	break;
+									case	2	:	{	//	Integer	literal	accumulation	state.
+													while	((ch	!=	0	)	&&	(isdigit(ch)))
+																ch	=	getch();
+													ungetch();
+													vlen	=	p-vs;
+													return	INTEGER	;
+									}	break;
+									default:
+													return	ERROR	;
+									}
+					}
+					return	END_OF_INPUT;
 }
 
-const char *token_description(int token) {
-    const char *text;
-    switch (token) {
-        case LexicalAnalyzer::END_OF_INPUT         : text = "END_OF_INPUT";         break;
-        case LexicalAnalyzer::ERROR                : text = "ERROR";                break;
-        case LexicalAnalyzer::LEFT_BRACE           : text = "LEFT_BRACE";           break;
-        case LexicalAnalyzer::RIGHT_BRACE          : text = "RIGHT_BRACE";          break;
-        case LexicalAnalyzer::LEFT_SQUARE_BRACKET  : text = "LEFT_SQUARE_BRACKET";  break;
-        case LexicalAnalyzer::RIGHT_SQUARE_BRACKET : text = "RIGHT_SQUARE_BRACKET"; break;
-        case LexicalAnalyzer::COLON                : text = "COLON";                break;
-        case LexicalAnalyzer::COMMA                : text = "COMMA";                break;
-        case LexicalAnalyzer::STRING               : text = "STRING";               break;
-        case LexicalAnalyzer::INTEGER              : text = "INTEGER";              break;
-        default                                    : text = "**UNKNOWN**";          break;
-    }
-    return text;
+const	char	*token_description(int	token)	{
+				const	char	*text;
+				switch	(token)	{
+								case	LexicalAnalyzer::END_OF_INPUT									:	text	=	"END_OF_INPUT";									break;
+								case	LexicalAnalyzer::ERROR																:	text	=	"ERROR";																break;
+								case	LexicalAnalyzer::LEFT_BRACE											:	text	=	"LEFT_BRACE";											break;
+								case	LexicalAnalyzer::RIGHT_BRACE										:	text	=	"RIGHT_BRACE";										break;
+								case	LexicalAnalyzer::LEFT_SQUARE_BRACKET		:	text	=	"LEFT_SQUARE_BRACKET";		break;
+								case	LexicalAnalyzer::RIGHT_SQUARE_BRACKET	:	text	=	"RIGHT_SQUARE_BRACKET";	break;
+								case	LexicalAnalyzer::COLON																:	text	=	"COLON";																break;
+								case	LexicalAnalyzer::COMMA																:	text	=	"COMMA";																break;
+								case	LexicalAnalyzer::STRING															:	text	=	"STRING";															break;
+								case	LexicalAnalyzer::INTEGER														:	text	=	"INTEGER";														break;
+								default																																				:	text	=	"**UNKNOWN**";										break;
+				}
+				return	text;
 }
 
-Member::Member(const char *k, const char *v, int t) {
-     key=k;
-     valText=v;
-     type=t;
+Member::Member(const	char	*k,	const	char	*v,	int	t)	{
+					key=k;
+					valText=v;
+					type=t;
 }
 
-Member* parseJSON_member(LexicalAnalyzer &lexan) {
+Member*	parseJSON_member(LexicalAnalyzer	&lexan)	{
 
-    const char* key;
-    const char* valText;
-    int type;
+				const	char*	key;
+				const	char*	valText;
+				int	type;
 
-    int token;
-    token = lexan.next_lexeme();
-    if ( token == LexicalAnalyzer::STRING ) {
-        key = lexan.getTokenText();
-    } else {
-        std::cout << "ERROR: Expected STRING. Found \"" << token_description(token) << "\"." << std::endl;
-        return NULL;
-    }
-    token = lexan.next_lexeme();
-    if ( token != LexicalAnalyzer::COLON ) {
-        std::cout << "ERROR: Expected COLON. Found \"" << token_description(token) << "\"." << std::endl;
-        token_description(token);
-        delete key;
-        return NULL;
-    }
-    token = lexan.next_lexeme();
-    if (( token == LexicalAnalyzer::STRING) || ( token == LexicalAnalyzer::INTEGER )) {
-        valText = lexan.getTokenText();
-        type = token;
-    } else {
-        std::cout << "ERROR: Expected STRING or INTEGER. Found \"" << token_description(token) << "." << std::endl;
-        token_description(token);
-        return NULL;
-    }
-    Member *member = new Member(key, valText, type);
-    return member;
+				int	token;
+				token	=	lexan.next_lexeme();
+				if	(	token	==	LexicalAnalyzer::STRING	)	{
+								key	=	lexan.getTokenText();
+				}	else	{
+								std::cout	<<	"ERROR:	Expected	STRING.	Found	\""	<<	token_description(token)	<<	"\"."	<<	std::endl;
+								return	NULL;
+				}
+				token	=	lexan.next_lexeme();
+				if	(	token	!=	LexicalAnalyzer::COLON	)	{
+								std::cout	<<	"ERROR:	Expected	COLON.	Found	\""	<<	token_description(token)	<<	"\"."	<<	std::endl;
+								token_description(token);
+								delete	key;
+								return	NULL;
+				}
+				token	=	lexan.next_lexeme();
+				if	((	token	==	LexicalAnalyzer::STRING)	||	(	token	==	LexicalAnalyzer::INTEGER	))	{
+								valText	=	lexan.getTokenText();
+								type	=	token;
+				}	else	{
+								std::cout	<<	"ERROR:	Expected	STRING	or	INTEGER.	Found	\""	<<	token_description(token)	<<	"."	<<	std::endl;
+								token_description(token);
+								return	NULL;
+				}
+				Member	*member	=	new	Member(key,	valText,	type);
+				return	member;
 }
 
-std::vector<Member*> parseJSON( const char *json_s) {
+std::vector<Member*>	parseJSON(	const	char	*json_s)	{
 
-    std::vector<Member*> members;
-    Member* member;
-    int token;
-    bool okiedokey = true;
-    LexicalAnalyzer lexan(json_s);
-    token = lexan.next_lexeme();
-    if ( token == LexicalAnalyzer::LEFT_BRACE ) {
-        member = parseJSON_member(lexan);
-        if (member != NULL) {
-            members.push_back(member);
-            token = lexan.next_lexeme();
-            while ( okiedokey && (token == LexicalAnalyzer::COMMA) ) {
-                member = parseJSON_member(lexan);
-                if (member != NULL) {
-                    members.push_back(member);
-                } else {
-                    okiedokey = false;
-                }
-                token = lexan.next_lexeme();
-            }
-        } else {
-            okiedokey = false;
-        }
-        if ( token != LexicalAnalyzer::RIGHT_BRACE ) {
-            std::cout << "ERROR: Expected RIGHT_BRACE. Found \"" << token_description(token) << "\"." << std::endl;
-            token_description(token);
-            okiedokey = false;
-        }
-    } else {
-        std::cout << "ERROR: Expected LEFT_BRACE. Found \"" << token_description(token) << "\"." << std::endl;
-        okiedokey = false;
-    }
-    if (okiedokey == false) {
-        std::vector<Member*>::iterator it;
-        it = members.begin();
-        while (it != members.end()) {
-            delete *it;
-            it = members.erase(it);
-        }
-    }
-    return members;
+				std::vector<Member*>	members;
+				Member*	member;
+				int	token;
+				bool	okiedokey	=	true;
+				LexicalAnalyzer	lexan(json_s);
+				token	=	lexan.next_lexeme();
+				if	(	token	==	LexicalAnalyzer::LEFT_BRACE	)	{
+								member	=	parseJSON_member(lexan);
+								if	(member	!=	NULL)	{
+												members.push_back(member);
+												token	=	lexan.next_lexeme();
+												while	(	okiedokey	&&	(token	==	LexicalAnalyzer::COMMA)	)	{
+																member	=	parseJSON_member(lexan);
+																if	(member	!=	NULL)	{
+																				members.push_back(member);
+																}	else	{
+																				okiedokey	=	false;
+																}
+																token	=	lexan.next_lexeme();
+												}
+								}	else	{
+												okiedokey	=	false;
+								}
+								if	(	token	!=	LexicalAnalyzer::RIGHT_BRACE	)	{
+												std::cout	<<	"ERROR:	Expected	RIGHT_BRACE.	Found	\""	<<	token_description(token)	<<	"\"."	<<	std::endl;
+												token_description(token);
+												okiedokey	=	false;
+								}
+				}	else	{
+								std::cout	<<	"ERROR:	Expected	LEFT_BRACE.	Found	\""	<<	token_description(token)	<<	"\"."	<<	std::endl;
+								okiedokey	=	false;
+				}
+				if	(okiedokey	==	false)	{
+								std::vector<Member*>::iterator	it;
+								it	=	members.begin();
+								while	(it	!=	members.end())	{
+												delete	*it;
+												it	=	members.erase(it);
+								}
+				}
+				return	members;
 }