refs #10088 Failing attempt to change loading

(does not work correctly)
mantidproject · Aug 8, 2014 · f17db4d · f17db4d
1 parent b17d97b
commit f17db4d
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 61 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
@@ -89,7 +89,7 @@ namespace Mantid
       /// Spectra block descriptor
       struct SpectraBlock
       {
-        /// Constructor - initialise the block
+        /// Constructor - initialize the block
         SpectraBlock(int64_t f,int64_t l,bool m):first(f),last(l),isMonitor(m){}
         int64_t first; ///< first spectrum number of the block
         int64_t last; ///< last spectrum number of the block
@@ -101,8 +101,8 @@ namespace Mantid
       /// Overwrites Algorithm method
       void exec();
       // Validate the optional input properties
-      void checkOptionalProperties();
-      /// Prepare a vector of SpectraBlock structs to simplify loading
+      bool checkOptionalProperties();
+      /// Prepare a vector of SpectraBlock structures to simplify loading
       size_t prepareSpectraBlocks();
       /// Run LoadInstrument as a ChildAlgorithm
       void runLoadInstrument(DataObjects::Workspace2D_sptr);
@@ -122,8 +122,11 @@ namespace Mantid
 
       // Create period logs
       void createPeriodLogs(int64_t period, DataObjects::Workspace2D_sptr local_workspace);
-      // Validate multiperiod logs
+      // Validate multi-period logs
       void validateMultiPeriodLogs(Mantid::API::MatrixWorkspace_sptr);
+      // build the list of spectra numbers to load and include in the spectra list
+      std:: vector<specid_t>  buildSpectra2LoadList();
+
 
       /// The name and path of the input file
       std::string m_filename;
@@ -140,13 +143,16 @@ namespace Mantid
       int m_numberOfPeriods;
       /// The number of periods in the raw file
       int m_numberOfPeriodsInFile;
-      /// The nuber of time chanels per spectrum
+      /// The number of time channels per spectrum
       std::size_t m_numberOfChannels;
-      /// The nuber of time chanels per spectrum in the raw file
+      /// The number of time channels per spectrum in the raw file
       std::size_t m_numberOfChannelsInFile;
       /// Is there a detector block
       bool m_have_detector;
 
+
+      /// Have the spectrum_min/max properties been set?
+      bool m_range_supplied;
       /// The value of the SpectrumMin property
       int64_t m_spec_min;
       /// The value of the SpectrumMax property
@@ -159,8 +165,6 @@ namespace Mantid
       /// List of disjoint data blocks to load
       std::vector<SpectraBlock> m_spectraBlocks;
 
-      /// Have the spectrum_min/max properties been set?
-      bool m_range_supplied;
       /// Time channels
       boost::shared_ptr<MantidVec> m_tof_data;
       /// Proton charge
@@ -172,7 +176,7 @@ namespace Mantid
       /// Monitors, map spectrum index to monitor group name
       std::map<int64_t,std::string> m_monitors;
 
-      /// A pointer to the ISISRunLogs creater
+      /// A pointer to the ISISRunLogs creator
       boost::scoped_ptr<ISISRunLogs> m_logCreator;
 
       ///Progress reporting object