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

added to possibilty to use a parameter rather than a number in the phase Fourier block: now all what is needed. Elimated debug flag from the Makefiles

Browse Source
This commit is contained in:
nemu
2009-04-24 15:07:54 +00:00
parent f22ac96fe7
commit 8e4ee09aee
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/classes/PMsrHandler.cpp
View File

@ -758,9 +758,14 @@ int PMsrHandler::WriteMsrLogFile(TString ext)
}
// write 'phase' if present
if (fFourier.fPhase != -999.0) {
f << endl << "phase " << fFourier.fPhase;
if (fFourier.fPhaseParamNo > 0) {
f << endl << "phase par" << fFourier.fPhaseParamNo;
CheckAndWriteComment(f, ++lineNo);
} else {
if (fFourier.fPhase != -999.0) {
f << endl << "phase " << fFourier.fPhase;
CheckAndWriteComment(f, ++lineNo);
}
}
// write 'range_for_phase_correction' if present
@ -1937,6 +1942,7 @@ void PMsrHandler::InitFourierParameterStructure(PMsrFourierStructure &fourier)
fourier.fFourierPower = -1; // zero padding, default: -1 = NOT GIVEN
fourier.fApodization = FOURIER_APOD_NOT_GIVEN; // apodization, default: NOT GIVEN
fourier.fPlotTag = FOURIER_PLOT_NOT_GIVEN; // initial plot tag, default: NOT GIVEN
fourier.fPhaseParamNo = 0; // initial parameter no = 0 means not a parameter
fourier.fPhase = -999.0; // fourier phase: -999 = NOT GIVEN
for (unsigned int i=0; i<2; i++) {
fourier.fRangeForPhaseCorrection[i] = -1.0; // frequency range for phase correction, default: {-1, -1} = NOT GIVEN
@ -2095,6 +2101,8 @@ bool PMsrHandler::HandleFourierEntry(PMsrLines &lines)
error = true;
continue;
}
// keep the parameter number
fourier.fPhaseParamNo = no;
// get parameter value
fourier.fPhase = fParam[no-1].fValue;
} else {