From be8c809c6a820416fe9f40815db3174efa8a012f Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Fri, 26 Apr 2019 10:58:17 +0200 Subject: [PATCH] Follow Andreas' code modernization for BNMR code and cleanup --- src/classes/PMsrHandler.cpp | 116 ++++++----------------------- src/classes/PMusrCanvas.cpp | 16 +--- src/classes/PRunListCollection.cpp | 4 +- src/include/PRunListCollection.h | 14 ++-- 4 files changed, 34 insertions(+), 116 deletions(-) diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index 5c9bdd68..d55a6138 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -641,10 +641,7 @@ Int_t PMsrHandler::WriteMsrLogFile(const Bool_t messages) fout << std::left << "fittype" << MSR_FITTYPE_MU_MINUS << " (mu minus fit)" << std::endl ; break; case MSR_FITTYPE_BNMR: - fout << left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << endl ; - break; - case MSR_FITTYPE_BNMR: - fout << left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << endl ; + fout << std::left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << std::endl ; break; case MSR_FITTYPE_NON_MUSR: fout << std::left << "fittype" << MSR_FITTYPE_NON_MUSR << " (non muSR fit)" << std::endl ; @@ -811,10 +808,7 @@ Int_t PMsrHandler::WriteMsrLogFile(const Bool_t messages) fout << std::left << "fittype" << MSR_FITTYPE_MU_MINUS << " (mu minus fit)" << std::endl ; break; case MSR_FITTYPE_BNMR: - fout << left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << endl ; - break; - case MSR_FITTYPE_BNMR: - fout << left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << endl ; + fout << std::left << "fittype" << MSR_FITTYPE_BNMR << " (beta-NMR fit)" << std::endl ; break; case MSR_FITTYPE_NON_MUSR: fout << std::left << "fittype" << MSR_FITTYPE_NON_MUSR << " (non muSR fit)" << std::endl ; @@ -1180,10 +1174,7 @@ Int_t PMsrHandler::WriteMsrLogFile(const Bool_t messages) fout << "PLOT " << fPlots[plotNo].fPlotType << " (mu minus plot)" << std::endl; break; case MSR_PLOT_BNMR: - fout << "PLOT " << fPlots[plotNo].fPlotType << " (beta-NMR asymmetry plot)" << endl; - break; - case MSR_PLOT_BNMR: - fout << "PLOT " << fPlots[plotNo].fPlotType << " (beta-NMR asymmetry plot)" << endl; + fout << "PLOT " << fPlots[plotNo].fPlotType << " (beta-NMR asymmetry plot)" << std::endl; break; case MSR_PLOT_NON_MUSR: fout << "PLOT " << fPlots[plotNo].fPlotType << " (non muSR plot)" << std::endl; @@ -1735,10 +1726,7 @@ Int_t PMsrHandler::WriteMsrFile(const Char_t *filename, std::map> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - // cerr << endl << ">> alpha parameter number missing which is needed for an asymmetry fit."; - // cerr << endl << ">> Consider to check the manual ;-)" << endl; + // std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + // std::cerr << std::endl << ">> alpha parameter number missing which is needed for an asymmetry fit."; + // std::cerr << std::endl << ">> Consider to check the manual ;-)" << std::endl; // return false; // } // check that there is a forward parameter number if (fRuns[i].GetForwardHistoNo() == -1) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> forward histogram number not defined. Necessary for asymmetry fits." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + std::cerr << std::endl << ">> forward histogram number not defined. Necessary for asymmetry fits." << std::endl; return false; } // check that there is a backward parameter number if (fRuns[i].GetBackwardHistoNo() == -1) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> backward histogram number not defined. Necessary for asymmetry fits." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + std::cerr << std::endl << ">> backward histogram number not defined. Necessary for asymmetry fits." << std::endl; return false; } // check fit range if (!fRuns[i].IsFitRangeInBin()) { // fit range given as times in usec if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) { if ((fGlobal.GetFitRange(0) == PMUSR_UNDEFINED) || (fGlobal.GetFitRange(1) == PMUSR_UNDEFINED)) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Fit range is not defined, also NOT present in the GLOBAL block. Necessary for asymmetry fits." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + std::cerr << std::endl << ">> Fit range is not defined, also NOT present in the GLOBAL block. Necessary for asymmetry fits." << std::endl; return false; } } @@ -5930,74 +5912,22 @@ Bool_t PMsrHandler::CheckRunBlockIntegrity() // check number of T0's provided if ((fRuns[i].GetT0BinSize() > 2*fRuns[i].GetForwardHistoNoSize()) && (fGlobal.GetT0BinSize() > 2*fRuns[i].GetForwardHistoNoSize())) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << " in forward. Needs to be fixed." << endl; - cerr << endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << ". Needs to be fixed." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + std::cerr << std::endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << " in forward. Needs to be fixed." << std::endl; + std::cerr << std::endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << ". Needs to be fixed." << std::endl; return false; } if ((fRuns[i].GetT0BinSize() > 2*fRuns[i].GetBackwardHistoNoSize()) && (fGlobal.GetT0BinSize() > 2*fRuns[i].GetBackwardHistoNoSize())) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << " in backward. Needs to be fixed." << endl; - cerr << endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << ". Needs to be fixed." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; + std::cerr << std::endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << " in backward. Needs to be fixed." << std::endl; + std::cerr << std::endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << ". Needs to be fixed." << std::endl; return false; } // check packing if ((fRuns[i].GetPacking() == -1) && (fGlobal.GetPacking() == -1)) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **WARNING** in RUN block number " << i+1; - cerr << endl << ">> Packing is neither defined here, nor in the GLOBAL block, will set it to 1." << endl; - fRuns[i].SetPacking(1); - } - break; - case PRUN_ASYMMETRY_BNMR: - // check alpha - // if ((fRuns[i].GetAlphaParamNo() == -1) && !fFourierOnly) { - // cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - // cerr << endl << ">> alpha parameter number missing which is needed for an asymmetry fit."; - // cerr << endl << ">> Consider to check the manual ;-)" << endl; - // return false; - // } - // check that there is a forward parameter number - if (fRuns[i].GetForwardHistoNo() == -1) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> forward histogram number not defined. Necessary for asymmetry fits." << endl; - return false; - } - // check that there is a backward parameter number - if (fRuns[i].GetBackwardHistoNo() == -1) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> backward histogram number not defined. Necessary for asymmetry fits." << endl; - return false; - } - // check fit range - if (!fRuns[i].IsFitRangeInBin()) { // fit range given as times in usec - if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) { - if ((fGlobal.GetFitRange(0) == PMUSR_UNDEFINED) || (fGlobal.GetFitRange(1) == PMUSR_UNDEFINED)) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Fit range is not defined, also NOT present in the GLOBAL block. Necessary for asymmetry fits." << endl; - return false; - } - } - } - // check number of T0's provided - if ((fRuns[i].GetT0BinSize() > 2*fRuns[i].GetForwardHistoNoSize()) && - (fGlobal.GetT0BinSize() > 2*fRuns[i].GetForwardHistoNoSize())) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << " in forward. Needs to be fixed." << endl; - cerr << endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetForwardHistoNoSize() << ". Needs to be fixed." << endl; - return false; - } - if ((fRuns[i].GetT0BinSize() > 2*fRuns[i].GetBackwardHistoNoSize()) && - (fGlobal.GetT0BinSize() > 2*fRuns[i].GetBackwardHistoNoSize())) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; - cerr << endl << ">> Found " << fRuns[i].GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << " in backward. Needs to be fixed." << endl; - cerr << endl << ">> In GLOBAL block: " << fGlobal.GetT0BinSize() << " T0 entries. Expecting only " << 2*fRuns[i].GetBackwardHistoNoSize() << ". Needs to be fixed." << endl; - return false; - } - // check packing - if ((fRuns[i].GetPacking() == -1) && (fGlobal.GetPacking() == -1)) { - cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **WARNING** in RUN block number " << i+1; - cerr << endl << ">> Packing is neither defined here, nor in the GLOBAL block, will set it to 1." << endl; + std::cerr << std::endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **WARNING** in RUN block number " << i+1; + std::cerr << std::endl << ">> Packing is neither defined here, nor in the GLOBAL block, will set it to 1." << std::endl; fRuns[i].SetPacking(1); } break; diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp index 350fa293..e3d57422 100644 --- a/src/classes/PMusrCanvas.cpp +++ b/src/classes/PMusrCanvas.cpp @@ -722,18 +722,6 @@ void PMusrCanvas::UpdateDataTheoryPad() // handle data HandleDataSet(i, runNo, data); break; - case MSR_FITTYPE_BNMR: - data = fRunList->GetAsymmetryBNMR(runNo, PRunListCollection::kRunNo); - if (!data) { // something wrong - fValid = false; - // error message - cerr << endl << ">> PMusrCanvas::UpdateDataTheoryPad(): **ERROR** couldn't obtain run no " << runNo << " for a beta-NMR asymmetry plot"; - cerr << endl; - return; - } - // handle data - HandleDataSet(i, runNo, data); - break; case MSR_FITTYPE_ASYM_RRF: data = fRunList->GetAsymmetryRRF(runNo, PRunListCollection::kRunNo); if (!data) { // something wrong @@ -751,8 +739,8 @@ void PMusrCanvas::UpdateDataTheoryPad() if (!data) { // something wrong fValid = false; // error message - cerr << endl << ">> PMusrCanvas::UpdateDataTheoryPad(): **ERROR** couldn't obtain run no " << runNo << " for a mu minus single histogram plot"; - cerr << endl; + std::cerr << std::endl << ">> PMusrCanvas::UpdateDataTheoryPad(): **ERROR** couldn't obtain run no " << runNo << " for a mu minus single histogram plot"; + std::cerr << std::endl; return; } // handle data diff --git a/src/classes/PRunListCollection.cpp b/src/classes/PRunListCollection.cpp index 868475d8..98e11c6a 100644 --- a/src/classes/PRunListCollection.cpp +++ b/src/classes/PRunListCollection.cpp @@ -988,8 +988,8 @@ PRunData* PRunListCollection::GetAsymmetryBNMR(UInt_t index, EDataSwitch tag) switch (tag) { case kIndex: // called from musrfit when dumping the data if (index > fRunAsymmetryBNMRList.size()) { - cerr << endl << ">> PRunListCollection::GetAsymmetryBNMR(): **ERROR** index = " << index << " out of bounds"; - cerr << endl; + std::cerr << std::endl << ">> PRunListCollection::GetAsymmetryBNMR(): **ERROR** index = " << index << " out of bounds"; + std::cerr << std::endl; return 0; } diff --git a/src/include/PRunListCollection.h b/src/include/PRunListCollection.h index 7d969e37..7f41c1c1 100644 --- a/src/include/PRunListCollection.h +++ b/src/include/PRunListCollection.h @@ -111,13 +111,13 @@ class PRunListCollection PMsrHandler *fMsrInfo; ///< pointer to the msr-file handler PRunDataHandler *fData; ///< pointer to the run-data handler - vector fRunSingleHistoList; ///< stores all processed single histogram data - vector fRunSingleHistoRRFList; ///< stores all processed single histogram RRF data - vector fRunAsymmetryList; ///< stores all processed asymmetry data - vector fRunAsymmetryRRFList; ///< stores all processed asymmetry RRF data - vector fRunAsymmetryBNMRList; ///< stores all processed asymmetry BNMR data - vector fRunMuMinusList; ///< stores all processed mu-minus data - vector fRunNonMusrList; ///< stores all processed non-muSR data + std::vector fRunSingleHistoList; ///< stores all processed single histogram data + std::vector fRunSingleHistoRRFList; ///< stores all processed single histogram RRF data + std::vector fRunAsymmetryList; ///< stores all processed asymmetry data + std::vector fRunAsymmetryRRFList; ///< stores all processed asymmetry RRF data + std::vector fRunAsymmetryBNMRList; ///< stores all processed asymmetry BNMR data + std::vector fRunMuMinusList; ///< stores all processed mu-minus data + std::vector fRunNonMusrList; ///< stores all processed non-muSR data }; #endif // _PRUNLISTCOLLECTION_H_