Skip to content

Commit

Permalink
Re #7424. Tidy-ups. No functional changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RussellTaylor
RussellTaylor committed Jul 16, 2013
1 parent f38dc81 commit 37840d5
Showing 1 changed file with 12 additions and 73 deletions.
85 changes: 12 additions & 73 deletions Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ namespace MDEvents
virtual void setFileBacked();
virtual void clearFileBacked(bool loadDiskBackedData);
void clear();
void clearDataFromMemory(){/*it seems works on boxes only though recursive clearing makes sence, not yet implemented*/};
void clearDataFromMemory(){/*it seems works on boxes only though recursive clearing makes sence, not yet implemented*/}
/**Save the box at specific disk position using the class, respoinsible for the file IO. */
virtual void saveAt(API::IBoxControllerIO *const /* */, uint64_t /*position*/)const
{/*Not saveable */};
virtual void saveAt(API::IBoxControllerIO *const /* */, uint64_t /*position*/) const
{/*Not saveable */}
/**Load the box data of specified size from the disk location provided using the class, respoinsible for the file IO. */
virtual void loadAndAddFrom(API::IBoxControllerIO *const /* */, uint64_t /*position*/, size_t /* Size */)
{/*Not directly loadable */};
{/*Not directly loadable */}
//-------------------------------------------------------------------------------------------------------

/** Uses the cached value of points stored in the grid box
Expand Down Expand Up @@ -114,26 +114,18 @@ namespace MDEvents

void centerpointBin(MDBin<MDE,nd> & bin, bool * fullyContained) const;

void generalBin(MDBin<MDE,nd> & /*bin*/, Mantid::Geometry::MDImplicitFunction & /*function*/) const {};
void generalBin(MDBin<MDE,nd> & /*bin*/, Mantid::Geometry::MDImplicitFunction & /*function*/) const {}

void integrateSphere(Mantid::API::CoordTransform & radiusTransform, const coord_t radiusSquared, signal_t & signal, signal_t & errorSquared) const;

void centroidSphere(Mantid::API::CoordTransform & radiusTransform, const coord_t radiusSquared, coord_t * centroid, signal_t & signal) const;

void splitContents(size_t index, Kernel::ThreadScheduler * ts = NULL);
//void splitContentsById(size_t childId); // No definition causes a myriad of warnings on MSVC

void splitAllIfNeeded(Kernel::ThreadScheduler * ts = NULL);

//void cacheChildrenToDisk(); // No definition causes a myriad of warnings on MSVC

void refreshCache(Kernel::ThreadScheduler * ts = NULL);

//void refreshCentroid(Kernel::ThreadScheduler * ts = NULL);

// Set the box controller overrriden.
//virtual void setBoxController(Mantid::API::BoxController *controller);

virtual bool getIsMasked() const;
///Setter for masking the box
virtual void mask();
Expand All @@ -146,19 +138,19 @@ namespace MDEvents


//-------------------------------------------------------------------------
/** The function used to satisfy IMDNode interface but the physical meaning is unclear */
void calculateCentroid(coord_t * /*centroid*/) const
{
/** The function used to satisfy IMDNode interface but the physical meaning is unclear */
void calculateCentroid(coord_t * /*centroid*/) const
{
throw(std::runtime_error("This function should not be called on MDGridBox (as its meaning for MDbox is dubious too)"));
}
}

public:
/// Typedef for a shared pointer to a MDGridBox
typedef boost::shared_ptr< MDGridBox<MDE, nd> > sptr;

/// Typedef for a vector of MDBoxBase pointers
typedef std::vector<MDBoxBase<MDE, nd>*> boxVector_t;


private:
/// Each dimension is split into this many equally-sized boxes
size_t split[nd];
Expand All @@ -174,7 +166,7 @@ namespace MDEvents
* to the nd-array. */
std::vector<MDBoxBase<MDE,nd> *> m_Children;

/** Length (squared) of the diagonal through every dimension = sum( boxSize[i]^2 )
/** Length (squared) of the diagonal through every dimension = sum( boxSize[i]^2 )
* Used in some calculations like peak integration */
coord_t diagonalSquared;

Expand All @@ -190,69 +182,16 @@ namespace MDEvents
/**private default copy constructor as the only correct constructor is the one with box controller */
MDGridBox(const MDGridBox<MDE, nd> & box);
/**Private constructor as it does not work without box controller */
MDGridBox(){};
MDGridBox() {}
/// common part of MDGridBox contstructor;
void initGridBox();
public:

////===============================================================================================
////===============================================================================================
///** Task for adding events to a MDGridBox. */
//class AddEventsTask : public Mantid::Kernel::Task
//{
//public:
// /// Pointer to MDGridBox.
// MDBoxBase<MDE, nd> * box;
// /// Reference to the MD events that will be added
// const std::vector<MDE> & events;
// /// Where to start in vector
// size_t start_at;
// /// Where to stop in vector
// size_t stop_at;
// /// Progress report
// Mantid::Kernel::ProgressBase * prog;

// /** Ctor
// *
// * @param box :: Pointer to MDGridBox
// * @param events :: Reference to the MD events that will be added
// * @param start_at :: Where to start in vector
// * @param stop_at :: Where to stop in vector
// * @param prog :: ProgressReporting
// * @return
// */
// AddEventsTask(MDBoxBase<MDE, nd> * box, const std::vector<MDE> & events,
// const size_t start_at, const size_t stop_at, Mantid::Kernel::ProgressBase * prog)
// : Mantid::Kernel::Task(),
// box(box), events(events), start_at(start_at), stop_at(stop_at), prog(prog)
// {
// }

// /// Add the events in the MDGridBox.
// void run()
// {
// box->addEvents(events);
// if (prog)
// {
// std::ostringstream out;
// out << "Adding events " << start_at;
// prog->report(out.str());
// }
// }
//};



};

#ifndef __INTEL_COMPILER
#pragma pack(pop) //Return to default packing size
#endif



}//namespace MDEvents

}//namespace Mantid

#endif /* MDGRIDBOX_H_ */

0 comments on commit 37840d5

Please sign in to comment.