Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/10385 loadnexus speed #56

Merged
merged 17 commits into from
Nov 20, 2014
Merged

Feature/10385 loadnexus speed #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1978e14
refs #10385. Extract spectrum info to object.
OwenArnold Oct 23, 2014
fdf6281
refs #10385. Naming issue root problem.
OwenArnold Oct 23, 2014
d0ba5d5
refs #10385. Query default property.
OwenArnold Oct 23, 2014
8a0c599
refs #10385. Multiperiod query.
OwenArnold Oct 23, 2014
61959e5
refs #10385. Reuse the SpecInfo on multiperiod groups.
OwenArnold Oct 23, 2014
9a67731
refs #10385. Try to use clone and write technique.
OwenArnold Oct 29, 2014
ccc1c23
refs #10385. Test file is twice as fast now.
OwenArnold Oct 29, 2014
757b004
refs #10385. Add failing test.
OwenArnold Oct 29, 2014
ab1da07
refs #10385. Remove log values
OwenArnold Oct 30, 2014
8e03062
refs #10385. Reporting added and extra property.
OwenArnold Oct 31, 2014
aba603d
refs #10385 Refactor new functionality to method.
OwenArnold Oct 31, 2014
d88bbe4
refs #10385. Remove instrument info caching
OwenArnold Oct 31, 2014
5b18d28
refs #10385. Minor changes.
OwenArnold Oct 31, 2014
fb70f73
refs #10385. Put error identifer code in place.
OwenArnold Oct 31, 2014
ce10e43
refs #10385 Extend tests.
OwenArnold Oct 31, 2014
e084e3b
refs #10385. Fix warnings.
OwenArnold Oct 31, 2014
679c839
refs #10385. Fix cpp check issue.
OwenArnold Nov 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Code/Mantid/Framework/API/inc/MantidAPI/LogManager.h
View file
Open in desktop
Expand Up @@ -150,6 +150,8 @@ namespace Mantid
virtual void saveNexus(::NeXus::File * file, const std::string & group,bool keepOpen=false) const;
/// Load the run from a NeXus file with a given group name
virtual void loadNexus(::NeXus::File * file, const std::string & group,bool keepOpen=false);
/// Clear the logs
void clearLogs();

protected:
/// A pointer to a property manager
Expand Down
11 changes: 10 additions & 1 deletion Code/Mantid/Framework/API/src/LogManager.cpp
View file
Open in desktop
Expand Up @@ -434,13 +434,22 @@ using namespace Kernel;
if (prop)
{
if (m_manager.existsProperty(prop->name() ))
{
m_manager.removeProperty(prop->name() );
}
m_manager.declareProperty(prop);
}
}
}
if (!(group.empty()||keepOpen))file->closeGroup();

}

/**
* Clear the logs.
*/
void LogManager::clearLogs()
{
m_manager.clear();
}

//-----------------------------------------------------------------------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
//----------------------------------------------------------------------
#include "MantidAPI/IFileLoader.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/MatrixWorkspace.h"

#include "MantidNexus/NexusClasses.h"
#include <nexus/NeXusFile.hpp>
Expand All @@ -15,6 +16,7 @@ namespace Mantid

namespace DataHandling
{

/**

Loads a workspace from a NeXus Processed entry in a NeXus file.
Expand Down Expand Up @@ -155,6 +157,9 @@ namespace Mantid

/// calculates the workspace size
std::size_t calculateWorkspacesize(const std::size_t numberofspectra);

/// Accellerated multiperiod loading
Mantid::API::Workspace_sptr doAccelleratedMultiPeriodLoading(Mantid::NeXus::NXRoot & root, const std::string & entryName, Mantid::API::MatrixWorkspace_sptr& tempMatrixWorkspace, const int64_t nWorkspaceEntries, const int64_t i);

/// Does the current workspace have uniform binning
bool m_shared_bins;
Expand Down