Skip to content

Commit

Permalink
Re #10698. clang-format on the modified files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterfpeterson
peterfpeterson committed Dec 17, 2014
1 parent 6b5dff7 commit 88df701
Show file tree
Hide file tree
Showing 6 changed files with 2,201 additions and 2,256 deletions.
206 changes: 105 additions & 101 deletions Code/Mantid/Framework/API/inc/MantidAPI/Run.h
View file
Expand Up @@ -9,107 +9,111 @@
#include <nexus/NeXusFile.hpp>
#include <vector>

namespace Mantid
{


namespace API
{

/**
This class stores information regarding an experimental run as a series
of log entries
@author Martyn Gigg, Tessella plc
@date 22/07/2010
Copyright &copy; 2010 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 Run : public LogManager
{
public:
/// Default constructor
Run();
/// Destructor. Doesn't need to be virtual as long as nothing inherits from this class.
~Run();
/// Copy constructor
Run(const Run& copy);
/// Assignment operator
const Run& operator=(const Run& rhs);
/// Addition
Run& operator+=(const Run& rhs);


/// Filter the logs by time
void filterByTime(const Kernel::DateAndTime start, const Kernel::DateAndTime stop);
/// Split the logs based on the given intervals
void splitByTime(Kernel::TimeSplitterType& splitter, std::vector< LogManager * > outputs) const;

/// Return an approximate memory size for the object in bytes
size_t getMemorySize() const;

/// Set the proton charge
void setProtonCharge( const double charge);
/// Get the proton charge
double getProtonCharge() const;
/// Integrate the proton charge over the whole run time
double integrateProtonCharge();

/// Store the given values as a set of histogram bin boundaries
void storeHistogramBinBoundaries(const std::vector<double> & energyBins);
/// Returns the bin boundaries for a given value
std::pair<double, double> histogramBinBoundaries(const double energyValue) const;
///Returns the vector of bin boundaries
std::vector<double> getBinBoundaries() const;

/// Set the gonoimeter & read the values from the logs if told to do so
void setGoniometer(const Geometry::Goniometer & goniometer, const bool useLogValues);
/** @return A reference to the const Goniometer object for this run */
inline const Geometry::Goniometer & getGoniometer() const { return m_goniometer; }
/** @return A reference to the non-const Goniometer object for this run */
inline Geometry::Goniometer & mutableGoniometer() { return m_goniometer; }

// Retrieve the goniometer rotation matrix
const Kernel::DblMatrix & getGoniometerMatrix() const;

/// Save the run to a NeXus file with a given group name
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
void loadNexus(::NeXus::File * file, const std::string & group, bool keepOpen=false);

private:
/// Calculate the gonoimeter matrix
void calculateGoniometerMatrix();

/// Goniometer for this run
Mantid::Geometry::Goniometer m_goniometer;
/// A set of histograms that can be stored here for future reference
std::vector<double> m_histoBins;

/// Adds all the time series in from one property manager into another
void mergeMergables(Mantid::Kernel::PropertyManager & sum, const Mantid::Kernel::PropertyManager & toAdd);

};

namespace Mantid {

namespace API {

/**
This class stores information regarding an experimental run as a series
of log entries
@author Martyn Gigg, Tessella plc
@date 22/07/2010
Copyright &copy; 2010 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 Run : public LogManager {
public:
/// Default constructor
Run();
/// Destructor. Doesn't need to be virtual as long as nothing inherits from
/// this class.
~Run();
/// Copy constructor
Run(const Run &copy);
/// Assignment operator
const Run &operator=(const Run &rhs);
/// Addition
Run &operator+=(const Run &rhs);

/// Filter the logs by time
void filterByTime(const Kernel::DateAndTime start,
const Kernel::DateAndTime stop);
/// Split the logs based on the given intervals
void splitByTime(Kernel::TimeSplitterType &splitter,
std::vector<LogManager *> outputs) const;

/// Return an approximate memory size for the object in bytes
size_t getMemorySize() const;

/// Set the proton charge
void setProtonCharge(const double charge);
/// Get the proton charge
double getProtonCharge() const;
/// Integrate the proton charge over the whole run time
double integrateProtonCharge();

/// Store the given values as a set of histogram bin boundaries
void storeHistogramBinBoundaries(const std::vector<double> &energyBins);
/// Returns the bin boundaries for a given value
std::pair<double, double>
histogramBinBoundaries(const double energyValue) const;
/// Returns the vector of bin boundaries
std::vector<double> getBinBoundaries() const;

/// Set the gonoimeter & read the values from the logs if told to do so
void setGoniometer(const Geometry::Goniometer &goniometer,
const bool useLogValues);
/** @return A reference to the const Goniometer object for this run */
inline const Geometry::Goniometer &getGoniometer() const {
return m_goniometer;
}
/** @return A reference to the non-const Goniometer object for this run */
inline Geometry::Goniometer &mutableGoniometer() { return m_goniometer; }

// Retrieve the goniometer rotation matrix
const Kernel::DblMatrix &getGoniometerMatrix() const;

/// Save the run to a NeXus file with a given group name
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
void loadNexus(::NeXus::File *file, const std::string &group,
bool keepOpen = false);

private:
/// Calculate the gonoimeter matrix
void calculateGoniometerMatrix();

/// Goniometer for this run
Mantid::Geometry::Goniometer m_goniometer;
/// A set of histograms that can be stored here for future reference
std::vector<double> m_histoBins;

/// Adds all the time series in from one property manager into another
void mergeMergables(Mantid::Kernel::PropertyManager &sum,
const Mantid::Kernel::PropertyManager &toAdd);
};
}
}

#endif //MANTIDAPI_RUN_H_
#endif // MANTIDAPI_RUN_H_

0 comments on commit 88df701

Please sign in to comment.