Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into 11131_peak_centre_h…
…eight_width Conflicts: Code/Mantid/Framework/CurveFitting/CMakeLists.txt Re #11131.
- Loading branch information
Showing
1,051 changed files
with
42,811 additions
and
7,977 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /* Coverity Scan model | ||
| * | ||
| * This is a modeling file for Coverity Scan. Modeling helps to avoid false | ||
| * positives. | ||
| * | ||
| * - A model file can't import any header files. | ||
| * - Therefore only some built-in primitives like int, char and void are | ||
| * available but not wchar_t, NULL etc. | ||
| * - Modeling doesn't need full structs and typedefs. Rudimentary structs | ||
| * and similar types are sufficient. | ||
| * - An uninitialized local pointer is not an error. It signifies that the | ||
| * variable could be either NULL or have some data. | ||
| * | ||
| * Coverity Scan doesn't pick up modifications automatically. The model file | ||
| * must be uploaded by an admin in the analysis settings of | ||
| * http://scan.coverity.com/projects/2832 | ||
| */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
Code/Mantid/Framework/API/inc/MantidAPI/FileBackedExperimentInfo.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| #ifndef MANTID_API_FILEBACKEDEXPERIMENTINFO_H_ | ||
| #define MANTID_API_FILEBACKEDEXPERIMENTINFO_H_ | ||
| //----------------------------------------------------------------------------- | ||
| // Includes | ||
| //----------------------------------------------------------------------------- | ||
| #include "MantidAPI/DllConfig.h" | ||
| #include "MantidAPI/ExperimentInfo.h" | ||
|
|
||
| namespace Mantid { | ||
| namespace API { | ||
|
|
||
| /** | ||
| Implements a lazy-loading mechanism for the experimental information | ||
| stored in a NeXus file. | ||
| Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge | ||
| National Laboratory & European Spallation Source | ||
| This file is part of Mantid. | ||
| Mantid is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 3 of the License, or | ||
| (at your option) any later version. | ||
| Mantid is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| File change history is stored at: <https://github.com/mantidproject/mantid> | ||
| Code Documentation is available at: <http://doxygen.mantidproject.org> | ||
| */ | ||
| class MANTID_API_DLL FileBackedExperimentInfo : public ExperimentInfo { | ||
| public: | ||
| /// Constructor | ||
| FileBackedExperimentInfo(const std::string & filename, const std::string &path); | ||
|
|
||
| ExperimentInfo *cloneExperimentInfo() const; | ||
|
|
||
| const std::string toString() const; | ||
|
|
||
| Geometry::Instrument_const_sptr getInstrument() const; | ||
|
|
||
| const Geometry::ParameterMap &instrumentParameters() const; | ||
|
|
||
| Geometry::ParameterMap &instrumentParameters(); | ||
|
|
||
| const Geometry::ParameterMap &constInstrumentParameters() const; | ||
|
|
||
| void populateInstrumentParameters(); | ||
|
|
||
| void replaceInstrumentParameters(const Geometry::ParameterMap &pmap); | ||
|
|
||
| void swapInstrumentParameters(Geometry::ParameterMap &pmap); | ||
|
|
||
| void cacheDetectorGroupings(const det2group_map &mapping); | ||
|
|
||
| const std::vector<detid_t> &getGroupMembers(const detid_t detID) const; | ||
|
|
||
| Geometry::IDetector_const_sptr getDetectorByID(const detid_t detID) const; | ||
|
|
||
| void setModeratorModel(ModeratorModel *source); | ||
|
|
||
| ModeratorModel &moderatorModel() const; | ||
|
|
||
| void setChopperModel(ChopperModel *chopper, const size_t index = 0); | ||
|
|
||
| ChopperModel &chopperModel(const size_t index = 0) const; | ||
|
|
||
| const Sample &sample() const; | ||
|
|
||
| Sample &mutableSample(); | ||
|
|
||
| const Run &run() const; | ||
|
|
||
| Run &mutableRun(); | ||
|
|
||
| Kernel::Property *getLog(const std::string &log) const; | ||
|
|
||
| double getLogAsSingleValue(const std::string &log) const; | ||
|
|
||
| int getRunNumber() const; | ||
|
|
||
| Kernel::DeltaEMode::Type getEMode() const; | ||
|
|
||
| double getEFixed(const detid_t detID) const; | ||
|
|
||
| double getEFixed(const Geometry::IDetector_const_sptr detector = | ||
| Geometry::IDetector_const_sptr()) const; | ||
|
|
||
| void setEFixed(const detid_t detID, const double value); | ||
|
|
||
| private: | ||
| void populateIfNotLoaded() const; | ||
| void populateFromFile() const; | ||
|
|
||
| mutable bool m_loaded; | ||
| std::string m_filename; | ||
| std::string m_nxpath; | ||
| }; | ||
|
|
||
| } // namespace API | ||
| } // namespace Mantid | ||
|
|
||
| #endif /* MANTID_API_FILEBACKEDEXPERIMENTINFO_H_ */ |
Oops, something went wrong.