Refs #4024. Attempt to fix Win32 build

mantidproject · Nov 23, 2011 · 87d8cc4 · 87d8cc4
1 parent 7b2e307
commit 87d8cc4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/EditInstrumentGeometry.cpp b/Code/Mantid/Framework/Algorithms/src/EditInstrumentGeometry.cpp
@@ -260,7 +260,7 @@ namespace Algorithms
           g_log.error() << g_log.error() << "Spectrum ID " << specids[i] << " does not exist!  Skip setting detector parameters to this spectrum" << std::endl;
           continue;
         } else {
-          g_log.notice() << "Raw: Spectrum " << specids[i] << ": # Detectors =  " << spectrum->getDetectorIDs().size() << std::endl;
+          g_log.notice() << "Raw: Spectrum " << spectrum->getSpectrumNo() << ": # Detectors =  " << spectrum->getDetectorIDs().size() << std::endl;
         }
 
         spectrum->clearDetectorIDs();

diff --git a/Code/Mantid/Framework/Algorithms/test/EditInstrumentGeometryTest.h b/Code/Mantid/Framework/Algorithms/test/EditInstrumentGeometryTest.h
@@ -3,7 +3,6 @@
 
 #include <cxxtest/TestSuite.h>
 #include "MantidAlgorithms/EditInstrumentGeometry.h"
-#include "MantidDataHandling/LoadNexusProcessed.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidAPI/ISpectrum.h"
 #include "MantidGeometry/IDetector.h"
@@ -38,19 +37,9 @@ class EditInstrumentGeometryTest : public CxxTest::TestSuite
     editdetector.initialize();
 
     // 2. Load Data
-    /*
-    Mantid::DataHandling::LoadNexusProcessed loader;
-    loader.initialize();
-    loader.setProperty("Filename","PG3_2583.nxs");
-    const std::string inputWS = "inputWS";
-    loader.setPropertyValue("OutputWorkspace",inputWS);
-    loader.execute();
-    */
     DataObjects::Workspace2D_sptr workspace2d = WorkspaceCreationHelper::create2DWorkspaceWithFullInstrument(1, 100, false);
     API::AnalysisDataService::Instance().add("inputWS", workspace2d);
 
-    //  Workspace2D_sptr create2DWorkspaceWithFullInstrument(int nhist, int nbins, bool includeMonitors)
-
     // 3. Set Property
     TS_ASSERT_THROWS_NOTHING( editdetector.setPropertyValue("Workspace", "inputWS") );
     TS_ASSERT_THROWS_NOTHING( editdetector.setPropertyValue("SpectrumIDs","1") );
@@ -120,15 +109,6 @@ class EditInstrumentGeometryTest : public CxxTest::TestSuite
     editdetector.initialize();
 
     // 2. Load Data
-    /*
-    Mantid::DataHandling::LoadNexusProcessed loader;
-    loader.initialize();
-    loader.setProperty("Filename","NOM_1818Matrix.nxs");
-    const std::string inputWS = "inputWS";
-    loader.setPropertyValue("OutputWorkspace",inputWS);
-    loader.execute();
-    */
-
     DataObjects::Workspace2D_sptr workspace2d = WorkspaceCreationHelper::create2DWorkspaceWithFullInstrument(6, 100, false);
     API::AnalysisDataService::Instance().add("inputWS2", workspace2d);
 
@@ -170,14 +150,6 @@ class EditInstrumentGeometryTest : public CxxTest::TestSuite
     editdetector.initialize();
 
     // 2. Load Data
-    /*
-    Mantid::DataHandling::LoadNexusProcessed loader;
-    loader.initialize();
-    loader.setProperty("Filename","NOM_1818Matrix.nxs");
-    const std::string inputWS = "inputWS";
-    loader.setPropertyValue("OutputWorkspace",inputWS);
-    loader.execute();
-    */
 
     DataObjects::Workspace2D_sptr workspace2d = WorkspaceCreationHelper::create2DWorkspaceWithFullInstrument(6, 100, false);
     API::AnalysisDataService::Instance().add("inputWS3", workspace2d);