Skip to content

Commit

Permalink
refs #6449 More warnings and small error in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@abuts
abuts committed Apr 6, 2013
1 parent f48530a commit 6c151c3
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/API/inc/MantidAPI/IMDNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ class IMDNode
virtual void setEventsData(const std::vector<coord_t> &coordTable)=0;

/// Add a single event defined by its components
virtual void addEvent(const signal_t Signal, const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId) = 0;
virtual void buildAndAddEvent(const signal_t Signal, const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId) = 0;
/// add a single event and set pointer to the box which needs splitting (if one actually need)
virtual void addAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index) = 0;
virtual void buildAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index) = 0;
/// Add a single event, with no mutex locking
virtual void addEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId) = 0;
virtual void buildAndAddEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId) = 0;
/// Add several events from the vector of event parameters
virtual size_t addEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)=0;
virtual size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)=0;


// -------------------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ namespace MDEvents


/*---------------> EVENTS from event data <-------------------------------------------------------------*/
virtual void addEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual void addAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index);
virtual void addEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual size_t addEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId);
virtual void buildAndAddEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual void buildAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index);
virtual void buildAndAddEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId);

//---------------------------------------------------------------------------------------------------------------------------------
void centerpointBin(MDBin<MDE,nd> & bin, bool * fullyContained) const;
Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ namespace MDEvents


/*---------------> EVENTS from event data <-------------------------------------------------------------*/
virtual void addEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual void addAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index);
virtual void addEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual size_t addEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId);
virtual void buildAndAddEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual void buildAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index);
virtual void buildAndAddEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);
virtual size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId);
//----------------------------------------------------------------------------------------------------------------------

void centerpointBin(MDBin<MDE,nd> & bin, bool * fullyContained) const;
Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/src/MDBox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ namespace MDEvents
*@return number of events rejected (0 as nothing is rejected here)
*/
TMDE(
size_t MDBox)::addEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)
size_t MDBox)::buildAndAddEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)
{

size_t nEvents = sigErrSq.size()/2;
Expand All @@ -700,7 +700,7 @@ namespace MDEvents
* @param index detector's ID
* */
TMDE(
void MDBox)::addEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
void MDBox)::buildAndAddEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
{
this->m_dataMutex.lock();
this->data.push_back(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0],runIndex, detectorId));
Expand All @@ -714,7 +714,7 @@ namespace MDEvents
* @param index :: current index for box
*/
TMDE(
void MDBox)::addAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index)
void MDBox)::buildAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index)
{
this->addAndTraceEvent(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0], runIndex, detectorId),index);
}
Expand All @@ -727,7 +727,7 @@ namespace MDEvents
* @param Evnt :: reference to a MDEvent to add.
* */
TMDE(
void MDBox)::addEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
void MDBox)::buildAndAddEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
{
this->data.push_back(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0], runIndex, detectorId));
}
Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ namespace MDEvents
*@return number of events rejected (0 as nothing is rejected here)
*/
TMDE(
size_t MDGridBox)::addEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)
size_t MDGridBox)::buildAndAddEvents(const std::vector<signal_t> &sigErrSq,const std::vector<coord_t> &Coord,const std::vector<uint16_t> &runIndex,const std::vector<uint32_t> &detectorId)
{

size_t nEvents = sigErrSq.size()/2;
Expand All @@ -1433,7 +1433,7 @@ namespace MDEvents
* @param index detector's ID
* */
TMDE(
void MDGridBox)::addEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
void MDGridBox)::buildAndAddEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
{
this->addEvent(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0],runIndex, detectorId));
}
Expand All @@ -1445,7 +1445,7 @@ namespace MDEvents
* @param index :: current index for box
*/
TMDE(
void MDGridBox)::addAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index)
void MDGridBox)::buildAndTraceEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId,size_t index)
{
this->addAndTraceEvent(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0], runIndex, detectorId),index);
}
Expand All @@ -1458,7 +1458,7 @@ namespace MDEvents
* @param Evnt :: reference to a MDEvent to add.
* */
TMDE(
void MDGridBox)::addEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
void MDGridBox)::buildAndAddEventUnsafe(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId)
{
this->addEventUnsafe(IF<MDE,nd>::BUILD_EVENT(Signal, errorSq, &point[0], runIndex, detectorId));
}
Expand Down
12 changes: 6 additions & 6 deletions Code/Mantid/Framework/MDEvents/test/MDBoxBaseTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class MDBoxBaseTester : public MDBoxBase<MDE,nd>
: MDBoxBase<MDE,nd>()
{
}
MDBoxBaseTester(const MDBoxBaseTester &source):
MDBoxBase(source,source.getBoxController())
MDBoxBaseTester(const MDBoxBaseTester &source)
: MDBoxBase<MDE,nd>(source,source.getBoxController())
{
}

Expand Down Expand Up @@ -99,13 +99,13 @@ class MDBoxBaseTester : public MDBoxBase<MDE,nd>
/// Add a single event
virtual void addEventUnsafe(const MDE & /*point*/)
{}
virtual size_t addEvents(const std::vector<signal_t> & /*sigErrSq*/,const std::vector<coord_t> & /*Coord*/,const std::vector<uint16_t> & /*runIndex*/,const std::vector<uint32_t> & /*detectorId*/)
virtual size_t buildAndAddEvents(const std::vector<signal_t> & /*sigErrSq*/,const std::vector<coord_t> & /*Coord*/,const std::vector<uint16_t> & /*runIndex*/,const std::vector<uint32_t> & /*detectorId*/)
{return 0;}
virtual void addEvent(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t)
virtual void buildAndAddEvent(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t)
{};
virtual void addAndTraceEvent(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t,size_t)
virtual void buildAndTraceEvent(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t,size_t)
{};
virtual void addEventUnsafe(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t)
virtual void buildAndAddEventUnsafe(const Mantid::signal_t,const Mantid::signal_t,const std::vector<coord_t> &,uint16_t,uint32_t)
{};


Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/test/MDBoxTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static void destroySuite(MDBoxTest * suite) { delete suite; }
std::vector<coord_t> coord(2,2.);
coord[1]=3;

b.addEvent(1.2,3.4,coord,0,0);
b.buildAndAddEvent(1.2,3.4,coord,0,0);
TS_ASSERT_EQUALS( b.getNPoints(), 1)

b.refreshCache();
Expand Down Expand Up @@ -196,7 +196,7 @@ static void destroySuite(MDBoxTest * suite) { delete suite; }
SigErrSq[1]=SigErrSq[3]=SigErrSq[5]=3.4;
Coord[1]=Coord[3]=Coord[5] = 3.0;

b.addEvents(SigErrSq,Coord,ind,RunID);
b.buildAndAddEvents(SigErrSq,Coord,ind,RunID);

b.refreshCache();

Expand All @@ -219,7 +219,7 @@ static void destroySuite(MDBoxTest * suite) { delete suite; }
SigErrSq[1]=SigErrSq[3]=SigErrSq[5]=3.4;
Coord[1]=Coord[3]=Coord[5] = 3.0;

b.addEvents(SigErrSq,Coord,ind,RunID);
b.buildAndAddEvents(SigErrSq,Coord,ind,RunID);

b.refreshCache();

Expand Down Expand Up @@ -298,7 +298,7 @@ static void destroySuite(MDBoxTest * suite) { delete suite; }
PARALLEL_FOR_NO_WSP_CHECK()
for (int i=0; i < num; i++)
{
b.addEvent(1.2,3.4,Coord,1,10);
b.buildAndAddEvent(1.2,3.4,Coord,1,10);
}

b.refreshCache();
Expand Down
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDEvents/test/MDGridBoxTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class MDGridBoxTest : public CxxTest::TestSuite
coord[i] = events[i].getCenter(0);
}

g->addEvents(sigErr,coord,runIndex,detID);
g->buildAndAddEvents(sigErr,coord,runIndex,detID);

for (size_t i=0; i<10; i++)
{
Expand Down Expand Up @@ -459,16 +459,16 @@ class MDGridBoxTest : public CxxTest::TestSuite

{ // One event in 0th box of the 0th box.
std::vector<coord_t> centers(2,0.05f) ;
superbox->addEvent(2.,2.,centers,0,0);
superbox->buildAndAddEvent(2.,2.,centers,0,0);
}
{ // One event in 1st box of the 0th box.
std::vector<coord_t> centers(2,0.05f);
centers[0]=0.15f;
superbox->addEvent(2.,2., centers,0,0 );
superbox->buildAndAddEvent(2.,2., centers,0,0 );
}
{ // One event in 99th box.
std::vector<coord_t> centers(2,9.5);
superbox->addEvent(2.0, 2.0, centers,0,0 );
superbox->buildAndAddEvent(2.0, 2.0, centers,0,0 );
}
TS_ASSERT_EQUALS( superbox->getNPoints(), 3 );

Expand Down

0 comments on commit 6c151c3

Please sign in to comment.