This reverts commit ffdc611a.

This reverts commit 069f60c1.

Add two additional ICP conditions.

refs #6760

Introduced a helper class to perform this stuff and tidy up a lot
of copied code.

A change in TimeSeriesProperty's API causes this modification.
This change in API is trivial and only affects unit test.

Eliminate constructors in Kernel tests where possible. Prevent test suites that still have them from being turned into statics. Re #2220.

Rename Framework code directory to just that. Also delete Main and VS & Eclipse project file. Re #1881.

Refs #1928: PulseTimeType and dateAndTime were combined into a single date and time class, DateAndTime (note the more pleasant capitalization). This class handles all required operators and conversions, and stores the time as the number of nanoseconds since Jan 1, 1990, as an 8-byte int. The class avoids overflows in dates.

Refs #1749: Fix logParser test. Reverted to old code but added a check in the event of a single value (return the value instead of 0).

Move the Instrument and Instrument interface classes down to Geometry. The new raytracing framework needs instrument access and it should all be in geometry. Also, given that everything else was defined in geometry it seems to make more sense to have it all in one place. Re #1212

Refs #1384: TimeSeriesProperty now uses boost::posix_time::ptime instead of time_t. Hey, nanosecond resolution! Seemingly all the code had to be fixed to get it to work.

Fix various memory leaks (mostly only in tests) and other problems flagged up by valgrind. Re #1154.