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

check that FOURIER block phase parameter as parX is not leading to an error message.

Browse Source
This commit is contained in:
suter_a 2015-02-28 11:30:09 +01:00
parent 8cc07318eb
commit 6ce19bcf26
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/classes/PMsrHandler.cpp
View File

@ -3698,20 +3698,26 @@ Bool_t PMsrHandler::HandleFourierEntry(PMsrLines &lines)
ostr = dynamic_cast<TObjString*>(tokens->At(1)); ostr = dynamic_cast<TObjString*>(tokens->At(1));
str = ostr->GetString(); str = ostr->GetString();
if (str.BeginsWith("par", TString::kIgnoreCase)) { // parameter value if (str.BeginsWith("par", TString::kIgnoreCase)) { // parameter value
Int_t no = 0; if (fFourierOnly) {
if (FilterNumber(str, "par", 0, no)) { cerr << endl << ">> PMsrHandler::HandleFourierEntry: **WARNING** Found phase parameter for Fourier only.";
// check that the parameter is in range cerr << endl << ">> This is currently not supported. Will set the phase to 0." << endl;
if ((Int_t)fParam.size() < no) { fourier.fPhase = 0.0;
} else {
Int_t no = 0;
if (FilterNumber(str, "par", 0, no)) {
// check that the parameter is in range
if ((Int_t)fParam.size() < no) {
error = true;
continue;
}
// keep the parameter number
fourier.fPhaseParamNo = no;
// get parameter value
fourier.fPhase = fParam[no-1].fValue;
} else {
error = true; error = true;
continue; continue;
} }
// keep the parameter number
fourier.fPhaseParamNo = no;
// get parameter value
fourier.fPhase = fParam[no-1].fValue;
} else {
error = true;
continue;
} }
} else if (str.IsFloat()) { // phase value } else if (str.IsFloat()) { // phase value
fourier.fPhase = str.Atof(); fourier.fPhase = str.Atof();