Skip to content

Commit

Permalink
Remove DOS line endings. Re #4201.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RussellTaylor
RussellTaylor committed Jan 10, 2012
1 parent 842925f commit 1377411
Show file tree
Hide file tree
Showing 2 changed files with 240 additions and 240 deletions.
362 changes: 181 additions & 181 deletions .../Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsEventWSAutoRebin.h
View file
Original file line number Diff line number Diff line change
@@ -1,182 +1,182 @@
#ifndef H_CONVERTTO_MDEVENTS_EVENTWS_AUTOREBIN
#define H_CONVERTTO_MDEVENTS_EVENTWS_AUTOREBIN
//
#include "MantidKernel/System.h"
#include "MantidKernel/Exception.h"
#include "MantidAPI/Algorithm.h"

#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"

#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/Progress.h"
#include "MantidKernel/PhysicalConstants.h"


#include "MantidMDEvents/MDEventWSWrapper.h"
#include "MantidMDEvents/MDEvent.h"

#include "MantidMDAlgorithms/IConvertToMDEventsMethods.h"
#include "MantidMDAlgorithms/ConvertToMDEventsDetInfo.h"
#include "MantidMDAlgorithms/ConvertToMDEventsCoordTransf.h"
#include <vector>

namespace Mantid
{
namespace MDAlgorithms
{
/** The macrodefinitions for ConvertToMDEvents function, making the conversion from into the MD events
*
* @date 11-10-2011
Copyright &copy; 2010 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
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://svn.mantidproject.org/mantid/trunk/Code/Mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/

// service variable used for efficient filling of the MD event WS -> should be moved to configuration;
#define SPLIT_LEVEL 2048

//-----------------------------------------------
//// Class to process event workspace by rebinning
template<Q_state Q, AnalMode MODE>
class ConvertToMDEvensEventWSAutoRebin: public IConvertToMDEventsMethods
{
/// shalow class which is invoked from processQND procedure and describes the transformation from workspace coordinates to target coordinates
/// presumably will be completely inlined
template<Q_state QX, AnalMode MODEX, CnvrtUnits CONVX,XCoordType XTYPE>
friend struct COORD_TRANSFORMER;
// the instanciation of the class which does the transformation itself
COORD_TRANSFORMER<Q,MODE,ConvFromTOF,Histohram> trn;
// the pointer to underlying event workspace
DataObjects::EventWorkspace_const_sptr pEventWS;
//
virtual size_t conversionChunk(size_t){return 0;}
public:
size_t setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const PreprocessedDetectors &detLoc,
const MDEvents::MDWSDescription &WSD, boost::shared_ptr<MDEvents::MDEventWSWrapper> inWSWrapper)
{
size_t numSpec=IConvertToMDEventsMethods::setUPConversion(pWS2D,detLoc,WSD,inWSWrapper);

// initiate the templated class which does the conversion of workspace data into MD WS coordinates;
trn.setUP(this);

pEventWS = boost::static_pointer_cast<const DataObjects::EventWorkspace>(inWS2D);
if(!pEventWS.get()){
throw(std::logic_error(" ConvertToMDEvensEventWSAutoRebin should work with defined event workspace"));
}

return numSpec;
}

void runConversion(API::Progress *pProg)
{

// get box controller which will deal with box splitting
Mantid::API::BoxController_sptr bc = pWSWrapper->pWorkspace()->getBoxController();
size_t lastNumBoxes = bc->getTotalNumMDBoxes();

// counder for the number of events
size_t n_added_events(0);


const size_t specSize = this->inWS2D->blocksize();
size_t nValidSpectra = pDetLoc->det_id.size();
// copy experiment info into target workspace
API::ExperimentInfo_sptr ExperimentInfo(inWS2D->cloneExperimentInfo());
// run index;
uint16_t runIndex = this->pWSWrapper->pWorkspace()->addExperimentInfo(ExperimentInfo);
// number of dimesnions
std::vector<coord_t> Coord(n_dims); // coordinates for single event
// if any property dimension is outside of the data range requested, the job is done;
if(!trn.calcGenericVariables(Coord,n_dims))return;

// take at least bufSize amout of data in one run for efficiency
size_t buf_size = ((specSize>SPLIT_LEVEL)?specSize:SPLIT_LEVEL);
// allocate temporary buffer for MD Events data
std::vector<coord_t> allCoord(0); // MD events coordinates buffer
allCoord.reserve(n_dims*buf_size);

std::vector<float> sig_err(2*buf_size); // array for signal and error.
std::vector<uint16_t> run_index(buf_size); // Buffer run index for each event
std::vector<uint32_t> det_ids(buf_size); // Buffer of det Id-s for each event

for (size_t wi=0; wi < nValidSpectra; wi++)
{
size_t iSpec = pDetLoc->detIDMap[wi];
int32_t det_id = pDetLoc->det_id[wi];

const DataObjects::EventList & el = pEventWS->getEventList(iSpec);
//size_t numEvents = el.getNumberEvents();


const MantidVec& X = el.dataX();
const MantidVec& Signal = el.dataY();
const MantidVec& Error = el.dataE();

// calculate the coordinatew which depend on detector position only
if(!trn.calcYDepCoordinates(Coord,wi))continue; // skip y outsize of the range;

//=> START INTERNAL LOOP OVER THE "TIME"
for (size_t j = 0; j < Signal.size(); ++j)
{
// drop emtpy histohrams
if(Signal[j]<FLT_EPSILON)continue;


if(!trn.calcMatrixCoord(X,wi,j,Coord))continue; // skip ND outside the range
// ADD RESULTING EVENTS TO THE WORKSPACE
float ErrSq = float(Error[j]*Error[j]);

// coppy all data into data buffer for future transformation into events;
sig_err[2*n_added_events+0]=float(Signal[j]);
sig_err[2*n_added_events+1]=ErrSq;
run_index[n_added_events] = runIndex;
det_ids[n_added_events] = det_id;
allCoord.insert(allCoord.end(),Coord.begin(),Coord.end());

n_added_events++;
if(n_added_events>=buf_size){
pWSWrapper->addMDData(sig_err,run_index,det_ids,allCoord,n_added_events);
pWSWrapper->pWorkspace()->splitAllIfNeeded(NULL);

n_added_events=0;
pProg->report(wi);
}
} // end spectra loop

} // end detectors loop;

if(n_added_events>0){
pWSWrapper->addMDData(sig_err,run_index,det_ids,allCoord,n_added_events);
pWSWrapper->pWorkspace()->splitAllIfNeeded(NULL);

n_added_events=0;
}

pWSWrapper->pWorkspace()->refreshCache();
pWSWrapper->refreshCentroid();
pProg->report();
}

};

} // endNamespace MDAlgorighms
}
#ifndef H_CONVERTTO_MDEVENTS_EVENTWS_AUTOREBIN
#define H_CONVERTTO_MDEVENTS_EVENTWS_AUTOREBIN
//
#include "MantidKernel/System.h"
#include "MantidKernel/Exception.h"
#include "MantidAPI/Algorithm.h"

#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"

#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/Progress.h"
#include "MantidKernel/PhysicalConstants.h"


#include "MantidMDEvents/MDEventWSWrapper.h"
#include "MantidMDEvents/MDEvent.h"

#include "MantidMDAlgorithms/IConvertToMDEventsMethods.h"
#include "MantidMDAlgorithms/ConvertToMDEventsDetInfo.h"
#include "MantidMDAlgorithms/ConvertToMDEventsCoordTransf.h"
#include <vector>

namespace Mantid
{
namespace MDAlgorithms
{
/** The macrodefinitions for ConvertToMDEvents function, making the conversion from into the MD events
*
* @date 11-10-2011
Copyright &copy; 2010 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
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://svn.mantidproject.org/mantid/trunk/Code/Mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/

// service variable used for efficient filling of the MD event WS -> should be moved to configuration;
#define SPLIT_LEVEL 2048

//-----------------------------------------------
//// Class to process event workspace by rebinning
template<Q_state Q, AnalMode MODE>
class ConvertToMDEvensEventWSAutoRebin: public IConvertToMDEventsMethods
{
/// shalow class which is invoked from processQND procedure and describes the transformation from workspace coordinates to target coordinates
/// presumably will be completely inlined
template<Q_state QX, AnalMode MODEX, CnvrtUnits CONVX,XCoordType XTYPE>
friend struct COORD_TRANSFORMER;
// the instanciation of the class which does the transformation itself
COORD_TRANSFORMER<Q,MODE,ConvFromTOF,Histohram> trn;
// the pointer to underlying event workspace
DataObjects::EventWorkspace_const_sptr pEventWS;
//
virtual size_t conversionChunk(size_t){return 0;}
public:
size_t setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const PreprocessedDetectors &detLoc,
const MDEvents::MDWSDescription &WSD, boost::shared_ptr<MDEvents::MDEventWSWrapper> inWSWrapper)
{
size_t numSpec=IConvertToMDEventsMethods::setUPConversion(pWS2D,detLoc,WSD,inWSWrapper);

// initiate the templated class which does the conversion of workspace data into MD WS coordinates;
trn.setUP(this);

pEventWS = boost::static_pointer_cast<const DataObjects::EventWorkspace>(inWS2D);
if(!pEventWS.get()){
throw(std::logic_error(" ConvertToMDEvensEventWSAutoRebin should work with defined event workspace"));
}

return numSpec;
}

void runConversion(API::Progress *pProg)
{

// get box controller which will deal with box splitting
Mantid::API::BoxController_sptr bc = pWSWrapper->pWorkspace()->getBoxController();
size_t lastNumBoxes = bc->getTotalNumMDBoxes();

// counder for the number of events
size_t n_added_events(0);


const size_t specSize = this->inWS2D->blocksize();
size_t nValidSpectra = pDetLoc->det_id.size();
// copy experiment info into target workspace
API::ExperimentInfo_sptr ExperimentInfo(inWS2D->cloneExperimentInfo());
// run index;
uint16_t runIndex = this->pWSWrapper->pWorkspace()->addExperimentInfo(ExperimentInfo);
// number of dimesnions
std::vector<coord_t> Coord(n_dims); // coordinates for single event
// if any property dimension is outside of the data range requested, the job is done;
if(!trn.calcGenericVariables(Coord,n_dims))return;

// take at least bufSize amout of data in one run for efficiency
size_t buf_size = ((specSize>SPLIT_LEVEL)?specSize:SPLIT_LEVEL);
// allocate temporary buffer for MD Events data
std::vector<coord_t> allCoord(0); // MD events coordinates buffer
allCoord.reserve(n_dims*buf_size);

std::vector<float> sig_err(2*buf_size); // array for signal and error.
std::vector<uint16_t> run_index(buf_size); // Buffer run index for each event
std::vector<uint32_t> det_ids(buf_size); // Buffer of det Id-s for each event

for (size_t wi=0; wi < nValidSpectra; wi++)
{
size_t iSpec = pDetLoc->detIDMap[wi];
int32_t det_id = pDetLoc->det_id[wi];

const DataObjects::EventList & el = pEventWS->getEventList(iSpec);
//size_t numEvents = el.getNumberEvents();


const MantidVec& X = el.dataX();
const MantidVec& Signal = el.dataY();
const MantidVec& Error = el.dataE();

// calculate the coordinatew which depend on detector position only
if(!trn.calcYDepCoordinates(Coord,wi))continue; // skip y outsize of the range;

//=> START INTERNAL LOOP OVER THE "TIME"
for (size_t j = 0; j < Signal.size(); ++j)
{
// drop emtpy histohrams
if(Signal[j]<FLT_EPSILON)continue;


if(!trn.calcMatrixCoord(X,wi,j,Coord))continue; // skip ND outside the range
// ADD RESULTING EVENTS TO THE WORKSPACE
float ErrSq = float(Error[j]*Error[j]);

// coppy all data into data buffer for future transformation into events;
sig_err[2*n_added_events+0]=float(Signal[j]);
sig_err[2*n_added_events+1]=ErrSq;
run_index[n_added_events] = runIndex;
det_ids[n_added_events] = det_id;
allCoord.insert(allCoord.end(),Coord.begin(),Coord.end());

n_added_events++;
if(n_added_events>=buf_size){
pWSWrapper->addMDData(sig_err,run_index,det_ids,allCoord,n_added_events);
pWSWrapper->pWorkspace()->splitAllIfNeeded(NULL);

n_added_events=0;
pProg->report(wi);
}
} // end spectra loop

} // end detectors loop;

if(n_added_events>0){
pWSWrapper->addMDData(sig_err,run_index,det_ids,allCoord,n_added_events);
pWSWrapper->pWorkspace()->splitAllIfNeeded(NULL);

n_added_events=0;
}

pWSWrapper->pWorkspace()->refreshCache();
pWSWrapper->refreshCentroid();
pProg->report();
}

};

} // endNamespace MDAlgorighms
}
#endif

4 comments on commit 1377411

@martyngigg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we have another commit hook for banning dos line endings from the repository?

@NickDraper
Copy link
Contributor

@NickDraper NickDraper commented on 1377411 Jan 10, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@martyngigg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't suggestion for right now, just a comment while I was thinking about it

@ricleal
Copy link
Contributor

@ricleal ricleal commented on 1377411 Jul 10, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.