Skip to content

Commit

Permalink
Enable LoadFullprofResolution to read a file without a CWL re #7617
Browse files Browse the repository at this point in the history
Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
  • Loading branch information
KarlPalmen committed Sep 4, 2013
1 parent 168bbba commit 03bdf2a
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Code/Mantid/Framework/DataHandling/src/LoadFullprofResolution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,20 @@ namespace DataHandling
double cwl;
int tmpbankid;
parseBankLine(bankline, cwl, tmpbankid);
g_log.debug() << "Found CWL = " << cwl << ", Bank ID = " << tmpbankid << "\n";
if(tmpbankid != -1)
{
g_log.debug() << "Found CWL = " << cwl << ", Bank ID = " << tmpbankid << "\n";
}
else
{
g_log.warning() << "No CWL found for bank " << bankid;
tmpbankid = bankid;
}
if (bankid != tmpbankid)
{
stringstream errss;
errss << "Input bank ID (" << bankid << ") is not same as the bank ID (" << tmpbankid
<< ") found in the specified region from input. ";
<< ") found in the specified region from input. ";
throw runtime_error(errss.str());
}

Expand Down

0 comments on commit 03bdf2a

Please sign in to comment.