perform Fourier phase checks only if a Fourier block is present and not set to power spectra.
This commit is contained in:
@@ -6735,7 +6735,11 @@ Bool_t PMsrHandler::CheckRRFSettings()
|
|||||||
*/
|
*/
|
||||||
Bool_t PMsrHandler::CheckRealFFT()
|
Bool_t PMsrHandler::CheckRealFFT()
|
||||||
{
|
{
|
||||||
// check
|
// if no Fourier block is present, nothing needs to be checked
|
||||||
|
if (!fFourier.fFourierBlockPresent)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// if Fourier is set to power spectra, no phase checks are needed
|
||||||
if (fFourier.fPlotTag == FOURIER_PLOT_POWER)
|
if (fFourier.fPlotTag == FOURIER_PLOT_POWER)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@@ -6756,15 +6760,15 @@ Bool_t PMsrHandler::CheckRealFFT()
|
|||||||
|
|
||||||
// make sure that FOURIER phases are defined
|
// make sure that FOURIER phases are defined
|
||||||
if ((fFourier.fPhase.size() == 0) && (fFourier.fPhaseParamNo.size() == 0)) {
|
if ((fFourier.fPhase.size() == 0) && (fFourier.fPhaseParamNo.size() == 0)) {
|
||||||
fLastErrorMsg.str("");
|
fLastErrorMsg.str("");
|
||||||
fLastErrorMsg.clear();
|
fLastErrorMsg.clear();
|
||||||
fLastErrorMsg << ">> PMsrHandler::ReadMsrFile: **ERROR** for FOURIER plot != POWER,\n";
|
fLastErrorMsg << ">> PMsrHandler::ReadMsrFile: **ERROR** for FOURIER plot != POWER,\n";
|
||||||
fLastErrorMsg << ">> phases need to be defined in the FOURIER block!\n";
|
fLastErrorMsg << ">> phases need to be defined in the FOURIER block!\n";
|
||||||
fLastErrorMsg << ">> Examples:\n";
|
fLastErrorMsg << ">> Examples:\n";
|
||||||
fLastErrorMsg << ">> phase parR7 par9 par13 par16\n";
|
fLastErrorMsg << ">> phase parR7 par9 par13 par16\n";
|
||||||
fLastErrorMsg << ">> where parR7 is the reference phase, and the others the relative phases.\n";
|
fLastErrorMsg << ">> where parR7 is the reference phase, and the others the relative phases.\n";
|
||||||
fLastErrorMsg << ">> I.e. phase of run 2: parR7 + par9, etc.\n";
|
fLastErrorMsg << ">> I.e. phase of run 2: parR7 + par9, etc.\n";
|
||||||
fLastErrorMsg << ">> For further details see the docu.\n";
|
fLastErrorMsg << ">> For further details see the docu.\n";
|
||||||
std::cerr << std::endl << fLastErrorMsg.str();
|
std::cerr << std::endl << fLastErrorMsg.str();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user