Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Refs #5102 commenting out idea that will be left for later

  • Loading branch information...
commit 1211627886fca758d26b18e7fd0da276ea359a88 1 parent e9eed57
Janik Zikovsky authored
View
72 Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h
@@ -396,37 +396,37 @@ namespace API
m_bytesPerEvent = bytesPerEvent;
}
- //-----------------------------------------------------------------------------------
- /** Add a MDBox pointer to the list of boxes to split.
- * Thread-safe for adding.
- * No duplicate checking is done!
- *
- * @param ptr :: void ptr that casts to a particular MDBox<> * type.
- */
- void addBoxToSplit(void * ptr)
- {
- m_boxesToSplitMutex.lock();
- m_boxesToSplit.push_back(ptr);
- m_boxesToSplitMutex.unlock();
- }
-
- //-----------------------------------------------------------------------------------
- /** Get a reference to the vector of boxes that must be split.
- * Not thread safe!
- */
- std::vector<void *> & getBoxesToSplit()
- {
- return m_boxesToSplit;
- }
-
- //-----------------------------------------------------------------------------------
- /** Clears the list of boxes that are big enough to split */
- void clearBoxesToSplit()
- {
- m_boxesToSplitMutex.lock();
- m_boxesToSplit.clear();
- m_boxesToSplitMutex.unlock();
- }
+// //-----------------------------------------------------------------------------------
+// /** Add a MDBox pointer to the list of boxes to split.
+// * Thread-safe for adding.
+// * No duplicate checking is done!
+// *
+// * @param ptr :: void ptr that casts to a particular MDBox<> * type.
+// */
+// void addBoxToSplit(void * ptr)
+// {
+// m_boxesToSplitMutex.lock();
+// m_boxesToSplit.push_back(ptr);
+// m_boxesToSplitMutex.unlock();
+// }
+//
+// //-----------------------------------------------------------------------------------
+// /** Get a reference to the vector of boxes that must be split.
+// * Not thread safe!
+// */
+// std::vector<void *> & getBoxesToSplit()
+// {
+// return m_boxesToSplit;
+// }
+//
+// //-----------------------------------------------------------------------------------
+// /** Clears the list of boxes that are big enough to split */
+// void clearBoxesToSplit()
+// {
+// m_boxesToSplitMutex.lock();
+// m_boxesToSplit.clear();
+// m_boxesToSplitMutex.unlock();
+// }
//-----------------------------------------------------------------------------------
private:
@@ -507,11 +507,11 @@ namespace API
/// Do we use the DiskBuffer at all?
bool m_useWriteBuffer;
- /// Vector of pointers to MDBoxes that have grown large enough to split them
- std::vector<void *> m_boxesToSplit;
-
- /// Mutex for modifying the m_boxesToSplit member
- Mantid::Kernel::Mutex m_boxesToSplitMutex;
+// /// Vector of pointers to MDBoxes that have grown large enough to split them
+// std::vector<void *> m_boxesToSplit;
+//
+// /// Mutex for modifying the m_boxesToSplit member
+// Mantid::Kernel::Mutex m_boxesToSplitMutex;
private:
/// Number of bytes in a single MDLeanEvent<> of the workspace.
View
47 Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h
@@ -153,30 +153,29 @@ class MDEventWorkspaceTest : public CxxTest::TestSuite
* */
void test_splitTrackedBoxes()
{
- return; //FIXME
- MDEventWorkspace1Lean::sptr ew = MDEventsTestHelper::makeMDEW<1>(2, 0.0, 1.0, 0);
- BoxController_sptr bc = ew->getBoxController();
- bc->setSplitInto(2);
- bc->setSplitThreshold(100);
- ew->splitBox();
-
- typedef MDGridBox<MDLeanEvent<1>,1> gbox_t;
- typedef MDBox<MDLeanEvent<1>,1> box_t;
- typedef MDBoxBase<MDLeanEvent<1>,1> ibox_t;
-
- // Make 99 events
- coord_t centers[1] = {0};
- for (size_t i=0; i<99; i++)
- {
- centers[0] = coord_t(i)*0.001;
- ew->addEvent(MDEvent<1>(1.0, 1.0, centers) );
- }
- TS_ASSERT_EQUALS( bc->getBoxesToSplit().size(), 0);
-
- // The 100th event triggers the adding to the list
- ew->addEvent(MDEvent<1>(1.0, 1.0, centers) );
- TS_ASSERT_EQUALS( bc->getBoxesToSplit().size(), 1);
-
+ return; //FIXME with ticket 5102, if/when it is complete
+// MDEventWorkspace1Lean::sptr ew = MDEventsTestHelper::makeMDEW<1>(2, 0.0, 1.0, 0);
+// BoxController_sptr bc = ew->getBoxController();
+// bc->setSplitInto(2);
+// bc->setSplitThreshold(100);
+// ew->splitBox();
+//
+// typedef MDGridBox<MDLeanEvent<1>,1> gbox_t;
+// typedef MDBox<MDLeanEvent<1>,1> box_t;
+// typedef MDBoxBase<MDLeanEvent<1>,1> ibox_t;
+//
+// // Make 99 events
+// coord_t centers[1] = {0};
+// for (size_t i=0; i<99; i++)
+// {
+// centers[0] = coord_t(i)*0.001;
+// ew->addEvent(MDEvent<1>(1.0, 1.0, centers) );
+// }
+// TS_ASSERT_EQUALS( bc->getBoxesToSplit().size(), 0);
+//
+// // The 100th event triggers the adding to the list
+// ew->addEvent(MDEvent<1>(1.0, 1.0, centers) );
+// TS_ASSERT_EQUALS( bc->getBoxesToSplit().size(), 1);
}
//-------------------------------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.