LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

adopted to comment MUSR-99

Browse Source
This commit is contained in:
nemu
2009-11-09 07:20:16 +00:00
parent a63868369a
commit 4bb5b7e979
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/classes/PMsrHandler.cpp
View File

@ -1110,8 +1110,8 @@ void PMsrHandler::SetMsrDataRangeEntry(UInt_t runNo, UInt_t idx, Int_t bin)
return; return;
} }
if ((idx < 0) || (idx > fRuns[runNo].GetDataRangeSize())) { // error if (idx < 0) { // error
cerr << endl << "PMsrHandler::SetMsrDataRangeEntry: **ERROR** idx = " << idx << ", is out of valid range 0.." << fRuns[runNo].GetDataRangeSize(); cerr << endl << "PMsrHandler::SetMsrDataRangeEntry: **ERROR** idx = " << idx << ", is out of valid range, i.e. idx >= 0 needed.";
cerr << endl; cerr << endl;
return; return;
} }
@ -1137,8 +1137,8 @@ void PMsrHandler::SetMsrBkgRangeEntry(UInt_t runNo, UInt_t idx, Int_t bin)
return; return;
} }
if ((idx < 0) || (idx > fRuns[runNo].GetBkgRangeSize())) { // error if (idx < 0) { // error
cerr << endl << "PMsrHandler::SetMsrBkgRangeEntry: idx = " << idx << ", is out of valid range 0.." << fRuns[runNo].GetBkgRangeSize(); cerr << endl << "PMsrHandler::SetMsrBkgRangeEntry: idx = " << idx << ", is out of valid range, i.e. idx >= 0 needed.";
cerr << endl; cerr << endl;
return; return;
} }

6
src/classes/PMusr.cpp
View File

@ -773,8 +773,7 @@ void PMsrRunBlock::SetBkgFix(Double_t dval, UInt_t idx)
Int_t PMsrRunBlock::GetBkgRange(UInt_t i) Int_t PMsrRunBlock::GetBkgRange(UInt_t i)
{ {
if (i > fBkgRange.size()) { if (i > fBkgRange.size()) {
cerr << endl << ">> PMsrRunBlock::GetBkgRange: **ERROR** index i=" << i << " out of range, fatal." << endl; return -1;
assert(0);
} }
return fBkgRange[i]; return fBkgRange[i];
@ -807,8 +806,7 @@ void PMsrRunBlock::SetBkgRange(Int_t ival, UInt_t idx)
Int_t PMsrRunBlock::GetDataRange(UInt_t i) Int_t PMsrRunBlock::GetDataRange(UInt_t i)
{ {
if (i > fDataRange.size()) { if (i > fDataRange.size()) {
cerr << endl << ">> PMsrRunBlock::GetDataRange: **ERROR** index i=" << i << " out of range, fatal." << endl; return -1;
assert(0);
} }
return fDataRange[i]; return fDataRange[i];