Skip to content

Commit

Permalink
Add the support of region of interest file. Refs #3622.
Browse files Browse the repository at this point in the history
  • Loading branch information
@wdzhou
wdzhou committed Nov 7, 2011
1 parent 2a56eed commit 82f3729
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 23 deletions.
3 changes: 2 additions & 1 deletion Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMaskingFile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace DataHandling
/// Parse XML
void parseXML();
/// Convert value to data
void parseBank(std::string valuetext, bool tomask);
void parseComponent(std::string valuetext, bool tomask);
/// Convert value to detector ids
void parseDetectorIDs(std::string inputstr, bool tomask);
/// Convert value to spectrum ids
Expand All @@ -85,6 +85,7 @@ namespace DataHandling
std::vector<int32_t>& detectors, std::vector<int32_t>& detectorpairslow, std::vector<int32_t>& detectorpairsup);
void processMaskOnDetectors(bool tomask, std::vector<int32_t> singledetids, std::vector<int32_t> pairdetids_low,
std::vector<int32_t> pairdetids_up);
void initDetectors();

/// Mask Workspace
API::MatrixWorkspace_sptr mMaskWS;
Expand Down
58 changes: 36 additions & 22 deletions Code/Mantid/Framework/DataHandling/src/LoadMaskingFile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ namespace DataHandling
std::vector<int32_t> maskdetidpairsL;
std::vector<int32_t> maskdetidpairsU;

this->bankToDetectors(mask_bankid_single, maskdetids, maskdetidpairsL, maskdetidpairsU);
// this->bankToDetectors(mask_bankid_single, maskdetids, maskdetidpairsL, maskdetidpairsU); use generalized componentToDetectors()
this->componentToDetectors(mask_bankid_single, maskdetids);
this->spectrumToDetectors(mask_specid_single, mask_specid_pair_low, mask_specid_pair_up, maskdetids, maskdetidpairsL, maskdetidpairsU);
this->detectorToDetectors(mask_detid_single, mask_detid_pair_low, mask_detid_pair_up, maskdetids, maskdetidpairsL, maskdetidpairsU);
Expand All @@ -140,34 +140,46 @@ namespace DataHandling
this->detectorToDetectors(unmask_detid_single, unmask_detid_pair_low, unmask_detid_pair_up, unmaskdetids, unmaskdetidpairsL, unmaskdetidpairsU);

// 4. Apply

this->initDetectors();
this->processMaskOnDetectors(true, maskdetids, maskdetidpairsL, maskdetidpairsU);
this->processMaskOnDetectors(false, unmaskdetids, unmaskdetidpairsL, unmaskdetidpairsU);

return;
}

/*
* Mask detectors or Unmask detectors
* params:
* @ tomask: true to mask, false to unmask
*/
void LoadMaskingFile::processMaskOnDetectors(bool tomask, std::vector<int32_t> singledetids, std::vector<int32_t> pairdetids_low,
std::vector<int32_t> pairdetids_up){
void LoadMaskingFile::initDetectors(){

UNUSED_ARG(pairdetids_up)
// 1. Initialize
if (tomask){
if (mDefaultToUse){
// Default is to use all detectors
for (size_t i = 0; i < mMaskWS->getNumberHistograms(); i ++){
mMaskWS->dataY(i)[0] = 1;
}
} else {
// Default not to use any detectors
for (size_t i = 0; i < mMaskWS->getNumberHistograms(); i ++){
mMaskWS->dataY(i)[0] = 0;
}
}

// 2. Mask
return;
}

/*
* Mask detectors or Unmask detectors
* params:
* @ tomask: true to mask, false to unmask
*/
void LoadMaskingFile::processMaskOnDetectors(bool tomask, std::vector<int32_t> singledetids, std::vector<int32_t> pairdetids_low,
std::vector<int32_t> pairdetids_up){

// 1. Get index map
detid2index_map* indexmap = mMaskWS->getDetectorIDToWorkspaceIndexMap(true);

// 2. Mask
g_log.debug() << "Mask = " << tomask << " Final Single IDs Size = " << singledetids.size() << std::endl;

for (size_t i = 0; i < singledetids.size(); i ++){
detid_t detid = singledetids[i];
detid2index_map::iterator it;
Expand All @@ -183,10 +195,12 @@ namespace DataHandling
}
}

// 3. Mask pairs
for (size_t i = 0; i < pairdetids_low.size(); i ++){
g_log.error() << "To Be Implemented Soon!" << std::endl;
g_log.error() << "To Be Implemented Soon For Pair (" << pairdetids_low[i] << ", " << pairdetids_up[i] << "!" << std::endl;
}

return;
}


Expand All @@ -202,7 +216,7 @@ namespace DataHandling

for (size_t i = 0; i < componentnames.size(); i ++){

g_log.notice() << "Component name = " << componentnames[i] << std::endl;
g_log.debug() << "Component name = " << componentnames[i] << std::endl;

// a) get componenet
Geometry::IComponent_const_sptr component = minstrument->getComponentByName(componentnames[i]);
Expand All @@ -213,7 +227,7 @@ namespace DataHandling
std::vector<Geometry::IComponent_const_sptr> children;
asmb->getChildren(children, true);

g_log.notice() << "Number of Children = " << children.size() << std::endl;
g_log.debug() << "Number of Children = " << children.size() << std::endl;

int32_t numdets = 0;
int32_t id_min = 1000000;
Expand All @@ -235,10 +249,8 @@ namespace DataHandling
}
}

g_log.notice() << "Number of Detectors in Children = " << numdets << " Range = " << id_min << ", " << id_max << std::endl;

return;
}
g_log.debug() << "Number of Detectors in Children = " << numdets << " Range = " << id_min << ", " << id_max << std::endl;
} // for component

return;
}
Expand All @@ -261,7 +273,7 @@ namespace DataHandling
std::vector<Geometry::IDetector_const_sptr> idetectors;

minstrument->getDetectorsInBank(idetectors, singlebanks[ib]);
g_log.notice() << "Bank: " << singlebanks[ib] << " has " << idetectors.size() << " detectors" << std::endl;
g_log.debug() << "Bank: " << singlebanks[ib] << " has " << idetectors.size() << " detectors" << std::endl;

// a) get information
size_t numdets = idetectors.size();
Expand All @@ -277,7 +289,7 @@ namespace DataHandling
detectorpairsup.push_back(detid_last);

} else {
g_log.notice() << "Apply 1 by 1 " << "DetID: " << detid_first << ", " << detid_last << std::endl;
g_log.debug() << "Apply 1 by 1 " << "DetID: " << detid_first << ", " << detid_last << std::endl;

for (size_t i = 0; i < idetectors.size(); i ++){
Geometry::IDetector_const_sptr det = idetectors[i];
Expand Down Expand Up @@ -417,7 +429,7 @@ namespace DataHandling
} else if (pNode->nodeName().compare("component") == 0){
// Node "component"
if (ingroup){
this->parseBank(value, tomask);
this->parseComponent(value, tomask);
} else {
g_log.error() << "XML File heirachial (component) error!" << std::endl;
}
Expand Down Expand Up @@ -467,15 +479,17 @@ namespace DataHandling
* params:
* @valutext: must be bank name
*/
void LoadMaskingFile::parseBank(std::string valuetext, bool tomask){
void LoadMaskingFile::parseComponent(std::string valuetext, bool tomask){

// 1. Parse bank out
/*
std::vector<std::string> values;
this->splitString(valuetext, values, "bank");
if (values.size() <= 1){
g_log.error() << "Bank information format error!" << std::endl;
return;
}
*/

if (tomask){
mask_bankid_single.push_back(valuetext);
Expand Down

0 comments on commit 82f3729

Please sign in to comment.