diff --git a/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h b/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h index 58aa42d27fc6d67d4fafede1ff2c51c899c5bb80..a0a751911c46b03a154841cf35909c5c0c9ff214 100644 --- a/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h +++ b/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h @@ -760,37 +760,7 @@ public: AnalysisDataService::Instance().remove(wsName); } - void testNeutronicPositions() - { - // Make sure the IDS is empty - InstrumentDataServiceImpl& IDS = InstrumentDataService::Instance(); - IDS.clear(); - LoadInstrument loader; - loader.initialize(); - loader.setPropertyValue("Filename", "IDFs_for_UNIT_TESTING/INDIRECT_Definition.xml"); - MatrixWorkspace_sptr ws = WorkspaceFactory::Instance().create("Workspace2D",1,1,1); - loader.setProperty("Workspace", ws ); - TS_ASSERT( loader.execute() ); - - // This kind of IDF should lead to 2 instrument definitions - the physical and the neutronic - //TS_ASSERT_EQUALS( IDS.size(), 2 ); - TS_ASSERT( IDS.doesExist("INDIRECT_Definition.xml2011-08-25T12:00:00") ); - //TS_ASSERT( IDS.doesExist("other name") ); - - Instrument_const_sptr physicalInst = IDS.retrieve("INDIRECT_Definition.xml2011-08-25T12:00:00"); - TS_ASSERT_EQUALS( physicalInst.get(), ws->getBaseInstrument().get() ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1000)->getPos(), V3D(0,0,0) ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1001)->getPos(), V3D(0,1,0) ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1002)->getPos(), V3D(1,0,0) ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1003)->getPos(), V3D(1,1,0) ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1004)->getPos(), V3D(2,0,0) ); - TS_ASSERT_EQUALS( physicalInst->getDetector(1005)->getPos(), V3D(2,1,0) ); - -// TS_FAIL(""); - // Clean up - IDS.clear(); - } //