Merge remote-tracking branch 'origin/feature/8330_icp_events'

mantidproject · Nov 1, 2013 · 2e63753 · 2e63753
2 parents 940e3ec + 34e8835
commit 2e63753
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadISISNexusTest.h b/Code/Mantid/Framework/DataHandling/test/LoadISISNexusTest.h
@@ -120,7 +120,7 @@ class LoadISISNexusTest : public CxxTest::TestSuite
 
         blog = dynamic_cast<TimeSeriesProperty<bool>*>(ws->run().getLogData("running"));
         TS_ASSERT(blog);
-        TS_ASSERT_EQUALS(blog->size(),2);
+        TS_ASSERT_EQUALS(blog->size(),5);
 
         TS_ASSERT_EQUALS(ws->sample().getName(),"PMMA_SAN25_1.5%_TRANS_150");
 

diff --git a/Code/Mantid/Framework/Kernel/src/LogParser.cpp b/Code/Mantid/Framework/Kernel/src/LogParser.cpp
@@ -140,11 +140,13 @@ namespace Mantid
       command_map["BEGIN"] = BEGIN;
       command_map["RESUME"] = BEGIN;
       command_map["END_SE_WAIT"] = BEGIN;
+      command_map["START_COLLECTION"] = BEGIN;
       command_map["PAUSE"] = END;
       command_map["END"] = END;
       command_map["ABORT"] = END;
       command_map["UPDATE"] = END;
       command_map["START_SE_WAIT"] = END;
+      command_map["STOP_COLLECTION"] = END; 
       command_map["CHANGE"] = CHANGE_PERIOD;
       command_map["CHANGE_PERIOD"] = CHANGE_PERIOD;
       return command_map;

diff --git a/Code/Mantid/Framework/Kernel/test/LogParserTest.h b/Code/Mantid/Framework/Kernel/test/LogParserTest.h
@@ -9,6 +9,7 @@
 #include "MantidKernel/LogParser.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/TimeSeriesProperty.h"
+#include <boost/scoped_ptr.hpp>
 
 #include <Poco/File.h>
 
@@ -303,6 +304,86 @@ class LogParserTest : public CxxTest::TestSuite
 
       delete log;
     }
+
+    void test_begin_end_treated_same_as_start_collection_stop_collection()
+    {
+      boost::scoped_ptr<TimeSeriesProperty<std::string> > logICPBeginEnd(new TimeSeriesProperty<std::string>("ICPLog1"));
+      TS_ASSERT_THROWS_NOTHING( logICPBeginEnd->addValue("2000-01-01T00:00:00", "BEGIN") );
+      TS_ASSERT_THROWS_NOTHING( logICPBeginEnd->addValue("2000-01-01T01:00:00", "END") );
+
+      boost::scoped_ptr<TimeSeriesProperty<std::string> > logICPCollectStartStop(new TimeSeriesProperty<std::string>("ICPLog2"));
+      TS_ASSERT_THROWS_NOTHING( logICPCollectStartStop->addValue("2000-01-01T00:00:00", "START_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICPCollectStartStop->addValue("2000-01-01T01:00:00", "STOP_COLLECTION") );
+
+      LogParser logParserBeginEnd(logICPBeginEnd.get());
+      TimeSeriesProperty<bool>* maskBeginEnd = logParserBeginEnd.createRunningLog();
+
+      LogParser logParserCollectStartStop(logICPCollectStartStop.get());
+      TimeSeriesProperty<bool>* maskCollectStartStop = logParserCollectStartStop.createRunningLog();
+
+      TSM_ASSERT_EQUALS("Should have 2 entries", 2, maskCollectStartStop->size());
+      TSM_ASSERT_EQUALS("Masks should be equal length", maskBeginEnd->size(), maskCollectStartStop->size());
+
+      TSM_ASSERT("Mask should NOT applied Due to start marker", maskCollectStartStop->nthValue(0)) // Mask OFF
+      TSM_ASSERT("Mask SHOULD applied Due to stop marker", !maskCollectStartStop->nthValue(1)) // Mask ON
+      // Compare for consistency.
+      for(int i = 0; i < maskBeginEnd->size(); ++i)
+      {
+        TS_ASSERT_EQUALS(maskBeginEnd->nthTime(i), maskCollectStartStop->nthTime(i));
+        TS_ASSERT_EQUALS(maskBeginEnd->nthValue(i), maskCollectStartStop->nthValue(i));
+      }
+    }
+
+    void test_mixed_start_stop_begin_end()
+    {
+      boost::scoped_ptr<TimeSeriesProperty<std::string> > logICP(new TimeSeriesProperty<std::string>("ICPLog"));
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:00:00", "BEGIN") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:00:00", "START_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:10:00", "STOP_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:20:00", "START_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T01:30:00", "STOP_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T01:30:00", "END") );
+
+      LogParser logParser(logICP.get());
+      TimeSeriesProperty<bool>* mask = logParser.createRunningLog();
+
+      TSM_ASSERT_EQUALS("Should have 4 entries, 2 of the 6 are duplicates", 4, mask->size()); 
+      int increment = 0;
+      TSM_ASSERT("Mask OFF", mask->nthValue(increment++));
+      TSM_ASSERT("Mask ON", !mask->nthValue(increment++));
+      TSM_ASSERT("Mask OFF", mask->nthValue(increment++));
+      TSM_ASSERT("Mask ON", !mask->nthValue(increment));
+    }
+
+    void test_multiple_starts_ok()
+    {
+      boost::scoped_ptr<TimeSeriesProperty<std::string> > logICP(new TimeSeriesProperty<std::string>("ICPLog"));
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:00:00", "BEGIN") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:10:00", "START_COLLECTION") );
+
+      LogParser logParser(logICP.get());
+      TimeSeriesProperty<bool>* mask = logParser.createRunningLog();
+
+      TSM_ASSERT_EQUALS("Should have 2 entries", 2, mask->size()); 
+      int increment = 0;
+      TSM_ASSERT("Mask OFF", mask->nthValue(increment++)); // BEGIN
+      TSM_ASSERT("Mask should still be OFF", mask->nthValue(increment++)); // START COLLECT
+    }
+
+    void test_multiple_ends_ok()
+    {
+      boost::scoped_ptr<TimeSeriesProperty<std::string> > logICP(new TimeSeriesProperty<std::string>("ICPLog"));
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:00:00", "STOP_COLLECTION") );
+      TS_ASSERT_THROWS_NOTHING( logICP->addValue("2000-01-01T00:10:00", "END") );
+
+      LogParser logParser(logICP.get());
+      TimeSeriesProperty<bool>* mask = logParser.createRunningLog();
+
+      TSM_ASSERT_EQUALS("Should have 2 entries", 2, mask->size()); 
+      int increment = 0;
+      TSM_ASSERT("Mask ON", !mask->nthValue(increment++)); // STOP COLLECT
+      TSM_ASSERT("Mask should still be ON", !mask->nthValue(increment++)); // END
+    }
 
     void testCreatesCurrentPeriodLog()
     {