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

Added some minor extensions to PMsrHandler and PMsrRunBlock

Browse Source
This commit is contained in:
Bastian M. Wojek
2010-06-08 21:35:19 +00:00
parent c385618291
commit 52d91435c1
3 changed files with 105 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/classes/PMsrHandler.cpp
View File

@ -1258,7 +1258,8 @@ Int_t PMsrHandler::WriteMsrFile(const Char_t *filename, map<UInt_t, TString> *co
if (commentsRUN) {
iter = commentsRUN->find(i + 1);
if (iter != commentsRUN->end()) {
fout << endl;
if (!i)
fout << endl;
fout << "# " << iter->second.Data() << endl;
fout << endl;
commentsRUN->erase(iter);
@ -1614,10 +1615,10 @@ Int_t PMsrHandler::WriteMsrFile(const Char_t *filename, map<UInt_t, TString> *co
fout << "range " << fFourier.fPlotRange[0] << " " << fFourier.fPlotRange[1] << endl;
}
// phase_increment -- seems to be not used... write it anyway for completeness
if (fFourier.fPhaseIncrement) {
fout << "phase_increment " << fFourier.fPhaseIncrement << endl;
}
// // phase_increment -- not used in msr-files at the moment (can only be set through the xml-file)
// if (fFourier.fPhaseIncrement) {
// fout << "phase_increment " << fFourier.fPhaseIncrement << endl;
// }
fout << endl;
fout << hline.Data() << endl;
@ -1719,7 +1720,9 @@ Int_t PMsrHandler::WriteMsrFile(const Char_t *filename, map<UInt_t, TString> *co
}
// rrf_phase
if (fPlots[i].fRRFPhase) {
if (fPlots[i].fRRFPhaseParamNo > 0) {
fout << "rrf_phase par" << fPlots[i].fRRFPhaseParamNo << endl;
} else if (fPlots[i].fRRFPhase) {
fout << "rrf_phase " << fPlots[i].fRRFPhase << endl;
}
@ -3205,6 +3208,7 @@ Bool_t PMsrHandler::HandlePlotEntry(PMsrLines &lines)
param.fRRFPacking = 0; // i.e. if not overwritten it will not be a valid RRF
param.fRRFFreq = 0.0; // i.e. no RRF whished
param.fRRFUnit = RRF_UNIT_MHz;
param.fRRFPhaseParamNo = 0; // initial parameter no = 0 means not a parameter
param.fRRFPhase = 0.0;
// find next plot if any is present
@ -3538,6 +3542,9 @@ Bool_t PMsrHandler::HandlePlotEntry(PMsrLines &lines)
if ((Int_t)fParam.size() < no) {
error = true;
} else {
// keep the parameter number in case parX was used
param.fRRFPhaseParamNo = no;
// get parameter value
param.fRRFPhase = fParam[no-1].fValue;
}
}

39
src/classes/PMusr.cpp
View File

@ -599,6 +599,8 @@ PMsrRunBlock::~PMsrRunBlock()
fBackwardHistoNo.clear();
fMap.clear();
fT0.clear();
fParGlobal.clear();
fMapGlobal.clear();
}
//--------------------------------------------------------------------------
@ -641,6 +643,9 @@ void PMsrRunBlock::CleanUp()
for (UInt_t i=0; i<fAddT0.size(); i++)
fAddT0[i].clear();
fAddT0.clear();
fParGlobal.clear();
fMapGlobal.clear();
}
//--------------------------------------------------------------------------
@ -1217,3 +1222,37 @@ void PMsrRunBlock::SetFitRange(Double_t dval, UInt_t idx)
fFitRange[idx] = dval;
}
//--------------------------------------------------------------------------
// SetParGlobal
//--------------------------------------------------------------------------
/**
* <p> store the information that a certain parameter used in the block is global
*
* \param str key (label) telling how the parameter is addressed
* \param ival value to be set (global == 1, run specific == 0, tag not present == -1)
*/
void PMsrRunBlock::SetParGlobal(const TString &str, Int_t ival)
{
fParGlobal[str] = ival; // will either create a new entry or overwrite an old one if the key "str" is present
return;
}
//--------------------------------------------------------------------------
// SetMapGlobal
//--------------------------------------------------------------------------
/**
* <p> store the information that a certain mapped parameter in the block is global
*
* \param idx map-index (0, 1, 2, 3, ...)
* \param ival value to be set (global == 1, run specific == 0, tag not present == -1)
*/
void PMsrRunBlock::SetMapGlobal(UInt_t idx, Int_t ival)
{
if (fMapGlobal.empty())
fMapGlobal.resize(fMap.size(), -1);
if (idx < fMap.size() && fMap[idx] > 0)
fMapGlobal[idx] = ival;
// else do nothing at the moment
return;
}