Merge branch 'master' into root6

This commit is contained in:
suter_a 2016-02-23 17:37:52 +01:00
commit f3542337fc
7 changed files with 1108 additions and 1118 deletions

View File

@ -4,7 +4,7 @@
changes since 0.17.0 changes since 0.17.0
=================================== ===================================
NEW 2016-02-23 It is now possible to export the averaged data/Fourier
changes since 0.16.0 changes since 0.16.0
=================================== ===================================

View File

@ -1516,7 +1516,6 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
Int_t xmaxBin; Int_t xmaxBin;
Double_t xmin; Double_t xmin;
Double_t xmax; Double_t xmax;
Double_t time, freq;
Double_t xval, yval; Double_t xval, yval;
switch (fPlotType) { switch (fPlotType) {
@ -1533,30 +1532,13 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fHistoFrame->GetXaxis()->GetBinCenter(xmaxBin); xmax = fHistoFrame->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
if (fAveragedView) {
GetExportDataSet(fDataAvg.diff, xmin, xmax, dumpVector);
} else { // go through all the histogramms
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms
// clean up dump GetExportDataSet(fData[i].diff, xmin, xmax, dumpVector);
dump.dataX.clear();
dump.data.clear();
dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all difference data bins
for (Int_t j=1; j<fData[i].diff->GetNbinsX(); j++) {
// get time
time = fData[i].diff->GetBinCenter(j);
// check if time is in the current range
if ((time >= xmin) && (time <= xmax)) {
dump.dataX.push_back(time);
dump.data.push_back(fData[i].diff->GetBinContent(j));
dump.dataErr.push_back(fData[i].diff->GetBinError(j));
} }
} }
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_REAL: case PV_FOURIER_REAL:
// get current x-range // get current x-range
@ -1566,29 +1548,13 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].diffFourierRe->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].diffFourierRe->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
if (fAveragedView) {
GetExportDataSet(fDataAvg.diffFourierRe, xmin, xmax, dumpVector, false);
} else { // go through all the histogramms
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms
// clean up dump GetExportDataSet(fData[i].diffFourierRe, xmin, xmax, dumpVector, false);
dump.dataX.clear();
dump.data.clear();
dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].diffFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierRe->GetBinContent(j));
} }
} }
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_IMAG: case PV_FOURIER_IMAG:
// get current x-range // get current x-range
@ -1598,29 +1564,13 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].diffFourierIm->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].diffFourierIm->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
if (fAveragedView) {
GetExportDataSet(fDataAvg.diffFourierIm, xmin, xmax, dumpVector, false);
} else { // go through all the histogramms
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms
// clean up dump GetExportDataSet(fData[i].diffFourierIm, xmin, xmax, dumpVector, false);
dump.dataX.clear();
dump.data.clear();
dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].diffFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierIm->GetBinContent(j));
} }
} }
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_REAL_AND_IMAG: case PV_FOURIER_REAL_AND_IMAG:
// get current x-range // get current x-range
@ -1630,38 +1580,15 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].diffFourierRe->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].diffFourierRe->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
if (fAveragedView) {
GetExportDataSet(fDataAvg.diffFourierRe, xmin, xmax, dumpVector, false);
GetExportDataSet(fDataAvg.diffFourierIm, xmin, xmax, dumpVector, false);
} else { // go through all the histogramms
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms
// clean up dump GetExportDataSet(fData[i].diffFourierRe, xmin, xmax, dumpVector, false);
dump.dataX.clear(); GetExportDataSet(fData[i].diffFourierIm, xmin, xmax, dumpVector, false);
dump.data.clear();
dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].diffFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierRe->GetBinContent(j));
} }
} }
for (Int_t j=1; j<fData[i].diffFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierIm->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_PWR: case PV_FOURIER_PWR:
// get current x-range // get current x-range
@ -1671,29 +1598,13 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].diffFourierPwr->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].diffFourierPwr->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.diffFourierPwr, xmin, xmax, dumpVector, false);
dump.dataX.clear(); } else { // go through all the histogramms
dump.data.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.dataErr.clear(); GetExportDataSet(fData[i].diffFourierPwr, xmin, xmax, dumpVector, false);
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].diffFourierPwr->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierPwr->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierPwr->GetBinContent(j));
} }
} }
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_PHASE: case PV_FOURIER_PHASE:
// get current x-range // get current x-range
@ -1703,29 +1614,13 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].diffFourierPhase->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].diffFourierPhase->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.diffFourierPhase, xmin, xmax, dumpVector, false);
dump.dataX.clear(); } else { // go through all the histogramms
dump.data.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.dataErr.clear(); GetExportDataSet(fData[i].diffFourierPhase, xmin, xmax, dumpVector, false);
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].diffFourierPhase->GetNbinsX(); j++) {
// get frequency
freq = fData[i].diffFourierPhase->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].diffFourierPhase->GetBinContent(j));
} }
} }
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
default: default:
break; break;
@ -1740,42 +1635,16 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fHistoFrame->GetXaxis()->GetBinCenter(xmaxBin); xmax = fHistoFrame->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.data, xmin, xmax, dumpVector);
dump.dataX.clear(); GetExportDataSet(fDataAvg.theory, xmin, xmax, dumpVector, false);
dump.data.clear(); } else { // go through all the histogramms
dump.dataErr.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.theoryX.clear(); GetExportDataSet(fData[i].data, xmin, xmax, dumpVector);
dump.theory.clear(); GetExportDataSet(fData[i].theory, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].data->GetNbinsX(); j++) {
// get time
time = fData[i].data->GetBinCenter(j);
// check if time is in the current range
if ((time >= xmin) && (time <= xmax)) {
dump.dataX.push_back(time);
dump.data.push_back(fData[i].data->GetBinContent(j));
dump.dataErr.push_back(fData[i].data->GetBinError(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theory->GetNbinsX(); j++) {
// get time
time = fData[i].theory->GetBinCenter(j);
// check if time is in the current range
if ((time >= xmin) && (time <= xmax)) {
dump.theoryX.push_back(time);
dump.theory.push_back(fData[i].theory->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_REAL: case PV_FOURIER_REAL:
// get current x-range // get current x-range
@ -1785,40 +1654,15 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.dataFourierRe, xmin, xmax, dumpVector, false);
dump.dataX.clear(); GetExportDataSet(fDataAvg.theoryFourierRe, xmin, xmax, dumpVector, false);
dump.data.clear(); } else { // go through all the histogramms
dump.dataErr.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.theoryX.clear(); GetExportDataSet(fData[i].dataFourierRe, xmin, xmax, dumpVector, false);
dump.theory.clear(); GetExportDataSet(fData[i].theoryFourierRe, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierRe->GetBinContent(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierRe->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_IMAG: case PV_FOURIER_IMAG:
// get current x-range // get current x-range
@ -1828,40 +1672,15 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].dataFourierIm->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].dataFourierIm->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.dataFourierIm, xmin, xmax, dumpVector, false);
dump.dataX.clear(); GetExportDataSet(fDataAvg.theoryFourierIm, xmin, xmax, dumpVector, false);
dump.data.clear(); } else { // go through all the histogramms
dump.dataErr.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.theoryX.clear(); GetExportDataSet(fData[i].dataFourierIm, xmin, xmax, dumpVector, false);
dump.theory.clear(); GetExportDataSet(fData[i].theoryFourierIm, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierIm->GetBinContent(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierIm->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_REAL_AND_IMAG: case PV_FOURIER_REAL_AND_IMAG:
// get current x-range // get current x-range
@ -1870,81 +1689,19 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmin = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xminBin); xmin = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xminBin);
xmax = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].dataFourierRe->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data if (fAveragedView) {
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms GetExportDataSet(fDataAvg.dataFourierRe, xmin, xmax, dumpVector, false);
//----------------------------- GetExportDataSet(fDataAvg.theoryFourierRe, xmin, xmax, dumpVector, false);
// Re GetExportDataSet(fDataAvg.dataFourierIm, xmin, xmax, dumpVector, false);
//----------------------------- GetExportDataSet(fDataAvg.theoryFourierIm, xmin, xmax, dumpVector, false);
// clean up dump } else { // go through all the histogramms
dump.dataX.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.data.clear(); GetExportDataSet(fData[i].dataFourierRe, xmin, xmax, dumpVector, false);
dump.dataErr.clear(); GetExportDataSet(fData[i].theoryFourierRe, xmin, xmax, dumpVector, false);
dump.theoryX.clear(); GetExportDataSet(fData[i].dataFourierIm, xmin, xmax, dumpVector, false);
dump.theory.clear(); GetExportDataSet(fData[i].theoryFourierIm, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierRe->GetBinContent(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierRe->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierRe->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierRe->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
//-----------------------------
// Im
//-----------------------------
// clean up dump
dump.dataX.clear();
dump.data.clear();
dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierIm->GetBinContent(j));
}
}
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierIm->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierIm->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierIm->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_PWR: case PV_FOURIER_PWR:
// get current x-range // get current x-range
@ -1954,40 +1711,15 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].dataFourierPwr->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].dataFourierPwr->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.dataFourierPwr, xmin, xmax, dumpVector, false);
dump.dataX.clear(); GetExportDataSet(fDataAvg.theoryFourierPwr, xmin, xmax, dumpVector, false);
dump.data.clear(); } else { // go through all the histogramms
dump.dataErr.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.theoryX.clear(); GetExportDataSet(fData[i].dataFourierPwr, xmin, xmax, dumpVector, false);
dump.theory.clear(); GetExportDataSet(fData[i].theoryFourierPwr, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierPwr->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierPwr->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierPwr->GetBinContent(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierPwr->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierPwr->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierPwr->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
case PV_FOURIER_PHASE: case PV_FOURIER_PHASE:
// get current x-range // get current x-range
@ -1997,40 +1729,15 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
xmax = fData[0].dataFourierPhase->GetXaxis()->GetBinCenter(xmaxBin); xmax = fData[0].dataFourierPhase->GetXaxis()->GetBinCenter(xmaxBin);
// fill ascii dump data // fill ascii dump data
for (UInt_t i=0; i<fData.size(); i++) { // go through all the histogramms if (fAveragedView) {
// clean up dump GetExportDataSet(fDataAvg.dataFourierPhase, xmin, xmax, dumpVector, false);
dump.dataX.clear(); GetExportDataSet(fDataAvg.theoryFourierPhase, xmin, xmax, dumpVector, false);
dump.data.clear(); } else { // go through all the histogramms
dump.dataErr.clear(); for (UInt_t i=0; i<fData.size(); i++) {
dump.theoryX.clear(); GetExportDataSet(fData[i].dataFourierPhase, xmin, xmax, dumpVector, false);
dump.theory.clear(); GetExportDataSet(fData[i].theoryFourierPhase, xmin, xmax, dumpVector, false);
// go through all data bins
for (Int_t j=1; j<fData[i].dataFourierPhase->GetNbinsX(); j++) {
// get frequency
freq = fData[i].dataFourierPhase->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.dataX.push_back(freq);
dump.data.push_back(fData[i].dataFourierPhase->GetBinContent(j));
} }
} }
// go through all theory bins
for (Int_t j=1; j<fData[i].theoryFourierPhase->GetNbinsX(); j++) {
// get frequency
freq = fData[i].theoryFourierPhase->GetBinCenter(j);
// check if time is in the current range
if ((freq >= xmin) && (freq <= xmax)) {
dump.theoryX.push_back(freq);
dump.theory.push_back(fData[i].theoryFourierPhase->GetBinContent(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpVector.push_back(dump);
}
break; break;
default: default:
break; break;
@ -2053,8 +1760,6 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
dump.dataX.clear(); dump.dataX.clear();
dump.data.clear(); dump.data.clear();
dump.dataErr.clear(); dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins // go through all data bins
for (Int_t j=0; j<fNonMusrData[i].diff->GetN(); j++) { for (Int_t j=0; j<fNonMusrData[i].diff->GetN(); j++) {
@ -2102,8 +1807,6 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
dump.dataX.clear(); dump.dataX.clear();
dump.data.clear(); dump.data.clear();
dump.dataErr.clear(); dump.dataErr.clear();
dump.theoryX.clear();
dump.theory.clear();
// go through all data bins // go through all data bins
for (Int_t j=0; j<fNonMusrData[i].data->GetN(); j++) { for (Int_t j=0; j<fNonMusrData[i].data->GetN(); j++) {
@ -2123,8 +1826,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
fNonMusrData[i].theory->GetPoint(j,xval,yval); fNonMusrData[i].theory->GetPoint(j,xval,yval);
// check if time is in the current range // check if time is in the current range
if ((xval >= xmin) && (xval <= xmax)) { if ((xval >= xmin) && (xval <= xmax)) {
dump.theoryX.push_back(xval); dump.dataX.push_back(xval);
dump.theory.push_back(yval); dump.data.push_back(yval);
} }
} }
@ -2164,43 +1867,57 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
} }
// find out what is the longest data/theory vector // find out what is the longest data/theory vector
UInt_t maxDataLength = 0; UInt_t maxLength = 0;
UInt_t maxTheoryLength = 0;
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
if (maxDataLength < dumpVector[i].dataX.size()) if (maxLength < dumpVector[i].dataX.size())
maxDataLength = dumpVector[i].dataX.size(); maxLength = dumpVector[i].dataX.size();
if (maxTheoryLength < dumpVector[i].theoryX.size())
maxTheoryLength = dumpVector[i].theoryX.size();
} }
// write data to file // write data to file
UInt_t maxLength = 0;
if (fDifferenceView) { // difference view if (fDifferenceView) { // difference view
// write header // write header
switch (fCurrentPlotView) { switch (fCurrentPlotView) {
case PV_DATA: case PV_DATA:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, diff, errDiff" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()-1; i++) { for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "x" << i << " , diff" << i << ", errDiff" << i << ", "; fout << "x" << i << " , diff" << i << ", errDiff" << i << ", ";
} }
fout << "x" << dumpVector.size()-1 << " , diff" << dumpVector.size()-1 << ", errDiff" << dumpVector.size()-1 << endl; fout << "x" << dumpVector.size()-1 << " , diff" << dumpVector.size()-1 << ", errDiff" << dumpVector.size()-1 << endl;
}
break; break;
case PV_FOURIER_REAL: case PV_FOURIER_REAL:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, F_diffRe" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()-1; i++) { for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freq" << i << ", F_diffRe" << i << ", "; fout << "freq" << i << ", F_diffRe" << i << ", ";
} }
fout << "freq" << dumpVector.size()-1 << ", F_diffRe" << dumpVector.size()-1 << endl; fout << "freq" << dumpVector.size()-1 << ", F_diffRe" << dumpVector.size()-1 << endl;
}
break; break;
case PV_FOURIER_IMAG: case PV_FOURIER_IMAG:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, F_diffIm" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()-1; i++) { for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freq" << i << ", F_diffIm" << i << ", "; fout << "freq" << i << ", F_diffIm" << i << ", ";
} }
fout << "freq" << dumpVector.size()-1 << ", F_diffIm" << dumpVector.size()-1 << endl; fout << "freq" << dumpVector.size()-1 << ", F_diffIm" << dumpVector.size()-1 << endl;
}
break; break;
case PV_FOURIER_REAL_AND_IMAG: case PV_FOURIER_REAL_AND_IMAG:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, F_diffRe, F_diffIm" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()/2; i++) { for (UInt_t i=0; i<dumpVector.size()/2; i++) {
fout << "freq" << i << ", F_diffRe" << i << ", "; fout << "freq" << i << ", F_diffRe" << i << ", ";
@ -2209,27 +1926,36 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
fout << "freq" << i << ", F_diffIm" << i << ", "; fout << "freq" << i << ", F_diffIm" << i << ", ";
} }
fout << "freq" << dumpVector.size()/2-1 << ", F_diffIm" << dumpVector.size()/2-1 << endl; fout << "freq" << dumpVector.size()/2-1 << ", F_diffIm" << dumpVector.size()/2-1 << endl;
}
break; break;
case PV_FOURIER_PWR: case PV_FOURIER_PWR:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, F_diffPwr" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()-1; i++) { for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freq" << i << ", F_diffPwr" << i << ", "; fout << "freq" << i << ", F_diffPwr" << i << ", ";
} }
fout << "freq" << dumpVector.size()-1 << ", F_diffPwr" << dumpVector.size()-1 << endl; fout << "freq" << dumpVector.size()-1 << ", F_diffPwr" << dumpVector.size()-1 << endl;
}
break; break;
case PV_FOURIER_PHASE: case PV_FOURIER_PHASE:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% x, F_diffPhase" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()-1; i++) { for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freq" << i << ", F_diffPhase" << i << ", "; fout << "freq" << i << ", F_diffPhase" << i << ", ";
} }
fout << "freq" << dumpVector.size()-1 << ", F_diffPhase" << dumpVector.size()-1 << endl; fout << "freq" << dumpVector.size()-1 << ", F_diffPhase" << dumpVector.size()-1 << endl;
}
break; break;
default: default:
break; break;
} }
maxLength = maxDataLength;
// write difference data // write difference data
for (UInt_t i=0; i<maxLength; i++) { for (UInt_t i=0; i<maxLength; i++) {
// write difference data // write difference data
@ -2264,84 +1990,119 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
// write header // write header
switch (fCurrentPlotView) { switch (fCurrentPlotView) {
case PV_DATA: case PV_DATA:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% xData, data, errData, xTheory, theory" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "xData" << i << " , data" << i << ", errData" << i << ", "; if (i % 2 == 0)
fout << "xData" << i/2 << " , data" << i/2 << ", errData" << i/2 << ", ";
else
if (i == dumpVector.size()-1)
fout << "xTheory" << (i-1)/2 << " , theory" << (i-1)/2 << endl;
else
fout << "xTheory" << (i-1)/2 << " , theory" << (i-1)/2 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "xTheory" << i << " , theory" << i << ", ";
} }
fout << "xTheory" << dumpVector.size()-1 << " , theory" << dumpVector.size()-1 << endl;
break; break;
case PV_FOURIER_REAL: case PV_FOURIER_REAL:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% freq, F_Re, freqTheo, F_theoRe" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "freq" << i << ", F_Re" << i << ", "; if (i % 2 == 0)
fout << "freq" << i/2 << ", F_Re" << i/2 << ", ";
else
if (i == dumpVector.size()-1)
fout << "freqTheo" << (i-1)/2 << ", F_theoRe" << (i-1)/2 << endl;
else
fout << "freqTheo" << (i-1)/2 << ", F_theoRe" << (i-1)/2 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freqTheo" << i << ", F_theo" << i << ", ";
} }
fout << "freqTheo" << dumpVector.size()-1 << ", F_theo" << dumpVector.size()-1 << endl;
break; break;
case PV_FOURIER_IMAG: case PV_FOURIER_IMAG:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% freq, F_Im, freqTheo, F_theoIm" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "freq" << i << ", F_Im" << i << ", "; if (i % 2 == 0)
fout << "freq" << i/2 << ", F_Im" << i/2 << ", ";
else
if (i == dumpVector.size()-1)
fout << "freqTheo" << (i-1)/2 << ", F_theoIm" << (i-1)/2 << endl;
else
fout << "freqTheo" << (i-1)/2 << ", F_theoIm" << (i-1)/2 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freqTheo" << i << ", F_theo" << i << ", ";
} }
fout << "freqTheo" << dumpVector.size()-1 << ", F_theo" << dumpVector.size()-1 << endl;
break; break;
case PV_FOURIER_REAL_AND_IMAG: case PV_FOURIER_REAL_AND_IMAG:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% freq, F_Re, freqTheo, F_theoRe, freq, F_Im, freqTheo, F_theoIm" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size()/2; i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "freq" << i << ", F_Re" << i << ", "; if (i % 4 == 0)
fout << "freq" << i/4 << ", F_Re" << i/4 << ", ";
else if (i % 4 == 1)
fout << "freqTheo" << (i-1)/4 << ", F_theoRe" << (i-1)/4 << ", ";
else if (i % 4 == 2)
fout << "freq" << (i-2)/4 << ", F_Im" << (i-2)/4 << ", ";
else
if (i == dumpVector.size()-1)
fout << "freqTheo" << (i-3)/4 << ", F_theoIm" << (i-3)/4 << endl;
else
fout << "freqTheo" << (i-3)/4 << ", F_theoIm" << (i-3)/4 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()/2; i++) {
fout << "freq" << i << ", F_Im" << i << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()/2; i++) {
fout << "freqTheo" << i << ", F_theoRe" << i << ", ";
}
for (UInt_t i=0; i<(dumpVector.size()-1)/2; i++) {
fout << "freqTheo" << i << ", F_theoIm" << i << ", ";
}
fout << "freqTheo" << (dumpVector.size()-1)/2 << ", F_theoIm" << (dumpVector.size()-1)/2 << endl;
break; break;
case PV_FOURIER_PWR: case PV_FOURIER_PWR:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% freq, F_Pwr, freqTheo, F_theoPwr" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "freq" << i << ", F_Pwr" << i << ", "; if (i % 2 == 0)
fout << "freq" << i/2 << ", F_Pwr" << i/2 << ", ";
else
if (i == dumpVector.size()-1)
fout << "freqTheo" << (i-1)/2 << ", F_theoPwr" << (i-1)/2 << endl;
else
fout << "freqTheo" << (i-1)/2 << ", F_theoPwr" << (i-1)/2 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freqTheo" << i << ", F_theo" << i << ", ";
} }
fout << "freqTheo" << dumpVector.size()-1 << ", F_theo" << dumpVector.size()-1 << endl;
break; break;
case PV_FOURIER_PHASE: case PV_FOURIER_PHASE:
if (fAveragedView) {
fout << "% from averaged view" << endl;
fout << "% freq, F_Phase, freqTheo, F_theoPhase" << endl;
} else {
fout << "% "; fout << "% ";
for (UInt_t i=0; i<dumpVector.size(); i++) { for (UInt_t i=0; i<dumpVector.size(); i++) {
fout << "freq" << i << ", F_Phase" << i << ", "; if (i % 2 == 0)
fout << "freq" << i/2 << ", F_Phase" << i/2 << ", ";
else
if (i == dumpVector.size()-1)
fout << "freqTheo" << (i-1)/2 << ", F_theoPhase" << (i-1)/2 << endl;
else
fout << "freqTheo" << (i-1)/2 << ", F_theoPhase" << (i-1)/2 << ", ";
} }
for (UInt_t i=0; i<dumpVector.size()-1; i++) {
fout << "freqTheo" << i << ", F_theo" << i << ", ";
} }
fout << "freqTheo" << dumpVector.size()-1 << ", F_theo" << dumpVector.size()-1 << endl;
break; break;
default: default:
break; break;
} }
if (maxDataLength > maxTheoryLength)
maxLength = maxDataLength;
else
maxLength = maxTheoryLength;
// write data and theory // write data and theory
for (UInt_t i=0; i<maxLength; i++) { for (UInt_t i=0; i<maxLength; i++) {
// write data // write data/theory
for (UInt_t j=0; j<dumpVector.size(); j++) { for (UInt_t j=0; j<dumpVector.size()-1; j++) {
if (i<dumpVector[j].dataX.size()) { if (i<dumpVector[j].dataX.size()) {
fout << dumpVector[j].dataX[i] << ", "; fout << dumpVector[j].dataX[i] << ", ";
fout << dumpVector[j].data[i] << ", "; fout << dumpVector[j].data[i] << ", ";
@ -2354,19 +2115,10 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
fout << " , , "; fout << " , , ";
} }
} }
// write theory // write last data/theory entry
for (UInt_t j=0; j<dumpVector.size()-1; j++) { if (i<dumpVector[dumpVector.size()-1].dataX.size()) {
if (i<dumpVector[j].theoryX.size()) { fout << dumpVector[dumpVector.size()-1].dataX[i] << ", ";
fout << dumpVector[j].theoryX[i] << ", "; fout << dumpVector[dumpVector.size()-1].data[i];
fout << dumpVector[j].theory[i] << ", ";
} else {
fout << " , , ";
}
}
// write last theory entry
if (i<dumpVector[dumpVector.size()-1].theoryX.size()) {
fout << dumpVector[dumpVector.size()-1].theoryX[i] << ", ";
fout << dumpVector[dumpVector.size()-1].theory[i];
} else { } else {
fout << " , "; fout << " , ";
} }
@ -2382,8 +2134,6 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
dumpVector[i].dataX.clear(); dumpVector[i].dataX.clear();
dumpVector[i].data.clear(); dumpVector[i].data.clear();
dumpVector[i].dataErr.clear(); dumpVector[i].dataErr.clear();
dumpVector[i].theoryX.clear();
dumpVector[i].theory.clear();
} }
dumpVector.clear(); dumpVector.clear();
@ -2394,6 +2144,42 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
// } // }
} }
//--------------------------------------------------------------------------
// GetExportDataSet (private)
//--------------------------------------------------------------------------
/**
* <p> extract data for export.
*
* \param data
* \param xmin
* \param xmax
* \param dumpData
* \param hasError
*/
void PMusrCanvas::GetExportDataSet(const TH1F *data, const Double_t xmin, const Double_t xmax,
PMusrCanvasAsciiDumpVector &dumpData, const Bool_t hasError)
{
PMusrCanvasAsciiDump dump;
Double_t x=0.0;
// go through all difference data bins
for (Int_t j=1; j<data->GetNbinsX(); j++) {
// get time/freq
x = data->GetBinCenter(j);
// check if x is in the current range
if ((x >= xmin) && (x <= xmax)) {
dump.dataX.push_back(x);
dump.data.push_back(data->GetBinContent(j));
if (hasError)
dump.dataErr.push_back(data->GetBinError(j));
}
}
// if anything found keep it
if (dump.dataX.size() > 0)
dumpData.push_back(dump);
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CreateStyle (private) // CreateStyle (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------

View File

@ -181,8 +181,6 @@ typedef struct {
PDoubleVector dataX; ///< x-axis data set PDoubleVector dataX; ///< x-axis data set
PDoubleVector data; ///< y-axis data set PDoubleVector data; ///< y-axis data set
PDoubleVector dataErr; ///< error of the y-axis data set PDoubleVector dataErr; ///< error of the y-axis data set
PDoubleVector theoryX; ///< x-axis theory set
PDoubleVector theory; ///< y-axis theory set
} PMusrCanvasAsciiDump; } PMusrCanvasAsciiDump;
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -333,6 +331,9 @@ class PMusrCanvas : public TObject, public TQObject
virtual Double_t GetInterpolatedValue(TH1F* histo, Double_t xVal); virtual Double_t GetInterpolatedValue(TH1F* histo, Double_t xVal);
virtual void GetExportDataSet(const TH1F *data, const Double_t xmin, const Double_t xmax,
PMusrCanvasAsciiDumpVector &dumpData, const Bool_t hasError=true);
ClassDef(PMusrCanvas, 1) ClassDef(PMusrCanvas, 1)
}; };

View File

@ -0,0 +1,67 @@
09900- Mu-frac 1.00, Mu12 134.86 MHz(0.27), Mu23 143.71 MHz(0.23), ionRate 608086.30 MHz, capRate 1.00 MHz, SF rate 0.00, 100 G
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 alpha 1.0008 -0.0021 0.0021 0 none
2 asy 0.2717 -0.0014 0.0014 0 0.33
3 phase 1.78 -0.46 0.46
4 field 100.418 -0.035 0.035 0 none
5 rate 0.0000000072 -0.0000000072 0.0013386264 0 100
6 asyMu 0 0 none
7 phaseMu 0 0 none
8 freqMu 35 0 none
9 rateMu 0 0 none
###############################################################
THEORY
asymmetry 2
TFieldCos 3 fun1 (phase frequency)
simplExpo 5 (rate)
+
asymmetry 6
TFieldCos 7 8 (phase frequency)
simplExpo 9 (rate)
###############################################################
FUNCTIONS
fun1 = par4 * gamma_mu
###############################################################
RUN 09900 MUE4 PSI MUSR-ROOT (name beamline institute data-file-format)
fittype 2 (asymmetry fit)
alpha 1
map 0 0 0 0 0 0 0 0 0 0
forward 1
backward 2
backgr.fix 0 0
data 1 12000 1 12000
t0 0.0 0.0
fit 0 8
packing 5
###############################################################
COMMANDS
SET BATCH
MINIMIZE
MINOS
SAVE
END RETURN
###############################################################
FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
phase 8
#range_for_phase_correction 50.0 70.0
range 0 200
###############################################################
PLOT 2 (asymmetry plot)
runs 1
range 0 8 -0.35 0.35
###############################################################
STATISTIC --- 2016-02-17 20:38:53
chisq = 1457.5, NDF = 1595, chisq/NDF = 0.913780

View File

@ -73,6 +73,7 @@
using namespace std; using namespace std;
#include <TMath.h> #include <TMath.h>
#include <TComplex.h>
#include "PSimulateMuTransition.h" #include "PSimulateMuTransition.h"
@ -104,6 +105,7 @@ PSimulateMuTransition::PSimulateMuTransition(UInt_t seed)
fBfield = 0.01; // magnetic field (T) fBfield = 0.01; // magnetic field (T)
fCaptureRate = 0.01; // Mu+ capture rate (MHz) fCaptureRate = 0.01; // Mu+ capture rate (MHz)
fIonizationRate = 10.; // Mu0 ionization rate (MHz) fIonizationRate = 10.; // Mu0 ionization rate (MHz)
fSpinFlipRate = 0.001; // Mu0 spin flip rate (MHz)
fInitialPhase = 0.; fInitialPhase = 0.;
fMuonPhase = fInitialPhase; fMuonPhase = fInitialPhase;
fMuonDecayTime = 0.; fMuonDecayTime = 0.;
@ -142,7 +144,9 @@ void PSimulateMuTransition::PrintSettings() const
cout << endl << "Mu precession frequency 14 (MHz) = " << fMuPrecFreq14; cout << endl << "Mu precession frequency 14 (MHz) = " << fMuPrecFreq14;
cout << endl << "B field (T) = " << fBfield; cout << endl << "B field (T) = " << fBfield;
cout << endl << "Mu+ electron capture rate (MHz) = " << fCaptureRate; cout << endl << "Mu+ electron capture rate (MHz) = " << fCaptureRate;
cout << endl << "Mu ionizatioan rate (MHz) = " << fIonizationRate; cout << endl << "Mu0 ionizatioan rate (MHz) = " << fIonizationRate;
cout << endl << "Mu0 spin-flip rate (MHz) = " << fSpinFlipRate;
cout << endl << "!!! Note: if spin-flip rate > 0.001 only spin-flip process is considered!!!";
cout << endl << "Decay asymmetry = " << fAsymmetry; cout << endl << "Decay asymmetry = " << fAsymmetry;
cout << endl << "Muonium fraction = " << fMuFraction; cout << endl << "Muonium fraction = " << fMuFraction;
cout << endl << "Muonium fraction state12 = " << fMuFractionState12; cout << endl << "Muonium fraction state12 = " << fMuFractionState12;
@ -184,12 +188,17 @@ void PSimulateMuTransition::Run(TH1F *histoForward, TH1F *histoBackward)
for (i = 0; i<fNmuons; i++){ for (i = 0; i<fNmuons; i++){
fMuonPhase = TMath::TwoPi() * fInitialPhase/360.; // transform to radians fMuonPhase = TMath::TwoPi() * fInitialPhase/360.; // transform to radians
fMuonDecayTime = NextEventTime(fMuonDecayRate); fMuonDecayTime = NextEventTime(fMuonDecayRate);
if (fSpinFlipRate > 0.001){// consider only Mu0 spin-flip in this case
fMuonPhase = TMath::ACos(GTSpinFlip(fMuonDecayTime));
}
else{
// initial muon state Mu+ or Mu0? // initial muon state Mu+ or Mu0?
if (fRandom->Rndm() <= 1.-fMuFraction) if (fRandom->Rndm() <= 1.-fMuFraction)
Event("Mu+"); Event("Mu+");
else else
Event(""); Event("");
}
// fill 50% in "forward", and 50% in "backward" detector to get independent // fill 50% in "forward", and 50% in "backward" detector to get independent
// events in "forward" and "backward" histograms. This allows "normal" uSR // events in "forward" and "backward" histograms. This allows "normal" uSR
// analysis of the data // analysis of the data
@ -228,7 +237,7 @@ Double_t PSimulateMuTransition::NextEventTime(const Double_t &EventRate)
* <p>Determines phase of the muon spin * <p>Determines phase of the muon spin
* *
* \param time duration of precession (us); * \param time duration of precession (us);
* \param frequency muon spin precession frequency (MHz); * \param chargeState charge state of Mu ("Mu+" or "Mu0")
*/ */
Double_t PSimulateMuTransition::PrecessionPhase(const Double_t &time, const TString chargeState) Double_t PSimulateMuTransition::PrecessionPhase(const Double_t &time, const TString chargeState)
{ {
@ -238,9 +247,7 @@ Double_t PSimulateMuTransition::PrecessionPhase(const Double_t &time, const TStr
if (chargeState == "Mu+") if (chargeState == "Mu+")
muonPhaseX = TMath::TwoPi()*fMuonPrecFreq*time; muonPhaseX = TMath::TwoPi()*fMuonPrecFreq*time;
else if (chargeState == "Mu0"){ else if (chargeState == "Mu0"){
muoniumPolX = 0.5 * muoniumPolX = GTFunction(time).Re();
(fMuFractionState12 * (TMath::Cos(TMath::TwoPi()*fMuPrecFreq12*time) + TMath::Cos(TMath::TwoPi()*fMuPrecFreq34*time)) +
fMuFractionState23 * (TMath::Cos(TMath::TwoPi()*fMuPrecFreq23*time) + TMath::Cos(TMath::TwoPi()*fMuPrecFreq14*time)));
muonPhaseX = TMath::ACos(muoniumPolX); muonPhaseX = TMath::ACos(muoniumPolX);
} }
else else
@ -249,6 +256,76 @@ Double_t PSimulateMuTransition::PrecessionPhase(const Double_t &time, const TStr
return muonPhaseX; return muonPhaseX;
} }
//--------------------------------------------------------------------------
// Mu0 transverse field polarization function (private)
//--------------------------------------------------------------------------
/**
* <p>Calculates Mu0 polarization in x direction by superposition of four Mu0 frequencies
*
* \param time (us);
*/
TComplex PSimulateMuTransition::GTFunction(const Double_t &time)
{
Double_t twoPi = TMath::TwoPi();
TComplex complexPol = 0;
complexPol =
0.5 * fMuFractionState12 *
(TComplex::Exp(TComplex::I()*twoPi*fMuPrecFreq12*time) +
TComplex::Exp(-TComplex::I()*twoPi*fMuPrecFreq34*time))
+
0.5 * fMuFractionState23 *
(TComplex::Exp(TComplex::I()*twoPi*fMuPrecFreq23*time) +
TComplex::Exp(TComplex::I()*twoPi*fMuPrecFreq14*time));
return complexPol;
// Double_t muoniumPolX = 0;
// muoniumPolX = 0.5 *
// (fMuFractionState12 * (TMath::Cos(twoPi*fMuPrecFreq12*time) + TMath::Cos(twoPi*fMuPrecFreq34*time)) +
// fMuFractionState23 * (TMath::Cos(twoPi*fMuPrecFreq23*time) + TMath::Cos(twoPi*fMuPrecFreq14*time)));
//
// return muoniumPolX;
}
//--------------------------------------------------------------------------
// Mu0 transverse field polarization function after n spin-flip collisions (private)
//--------------------------------------------------------------------------
/**
* <p>Calculates Mu0 polarization in x direction after n spin flip collisions.
* See M. Senba, J.Phys. B24, 3531 (1991), equation (17)
*
* \param time (us);
*/
Double_t PSimulateMuTransition::GTSpinFlip(const Double_t &time)
{
TComplex complexPolX = 1.0;
Double_t muoniumPolX = 1.0; //initial polarization in x direction
Double_t eventTime = 0;
Double_t eventDiffTime = 0;
Double_t lastEventTime = 0;
eventTime += NextEventTime(fSpinFlipRate);
if (eventTime >= time){
muoniumPolX = GTFunction(time).Re();
}
else{
while (eventTime < time){
eventDiffTime = eventTime - lastEventTime;
complexPolX = complexPolX * GTFunction(eventDiffTime);
lastEventTime = eventTime;
eventTime += NextEventTime(fSpinFlipRate);
}
// calculate for the last collision
eventDiffTime = time - lastEventTime;
complexPolX = complexPolX * GTFunction(eventDiffTime);
muoniumPolX = complexPolX.Re();
}
return muoniumPolX;
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// Event (private) // Event (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------

View File

@ -34,6 +34,7 @@
#include <TObject.h> #include <TObject.h>
#include <TH1F.h> #include <TH1F.h>
#include <TRandom2.h> #include <TRandom2.h>
#include <TComplex.h>
// global constants // global constants
const Double_t fMuonGyroRatio = 135.54; //!< muon gyromagnetic ratio (MHz/T) const Double_t fMuonGyroRatio = 135.54; //!< muon gyromagnetic ratio (MHz/T)
@ -55,6 +56,7 @@ class PSimulateMuTransition : public TObject
virtual void SetMuPrecFreq14(Double_t value) { fMuPrecFreq14 = value; } //!< sets Mu transition frequency (MHz) virtual void SetMuPrecFreq14(Double_t value) { fMuPrecFreq14 = value; } //!< sets Mu transition frequency (MHz)
virtual void SetCaptureRate(Double_t value){ fCaptureRate = value; } //!< sets Mu+ electron capture rate (MHz) virtual void SetCaptureRate(Double_t value){ fCaptureRate = value; } //!< sets Mu+ electron capture rate (MHz)
virtual void SetIonizationRate(Double_t value){ fIonizationRate = value; } //!< sets Mu0 ionization rate (MHz) virtual void SetIonizationRate(Double_t value){ fIonizationRate = value; } //!< sets Mu0 ionization rate (MHz)
virtual void SetSpinFlipRate(Double_t value){ fSpinFlipRate = value; } //!< sets Mu0 spin flip rate (MHz)
virtual void SetDecayAsymmetry(Double_t value){ fAsymmetry = value; } //!< muon decay asymmetry virtual void SetDecayAsymmetry(Double_t value){ fAsymmetry = value; } //!< muon decay asymmetry
virtual void SetMuFraction(Double_t value){ fMuFraction = value; } //!< Muonium fraction virtual void SetMuFraction(Double_t value){ fMuFraction = value; } //!< Muonium fraction
virtual void SetMuFractionState12(Double_t value){ fMuFractionState12 = value; } virtual void SetMuFractionState12(Double_t value){ fMuFractionState12 = value; }
@ -80,6 +82,7 @@ class PSimulateMuTransition : public TObject
Double_t fMuonPrecFreq; //!< muon precession frequency (MHz) Double_t fMuonPrecFreq; //!< muon precession frequency (MHz)
Double_t fCaptureRate; //!< Mu+ electron capture rate (MHz) Double_t fCaptureRate; //!< Mu+ electron capture rate (MHz)
Double_t fIonizationRate; //!< Mu0 ionization rate (MHz) Double_t fIonizationRate; //!< Mu0 ionization rate (MHz)
Double_t fSpinFlipRate; //!< Mu0 spin-flip rate (MHz)
Double_t fInitialPhase; //!< initial muon spin phase Double_t fInitialPhase; //!< initial muon spin phase
Double_t fMuonDecayTime; //!< muon decay time (us) Double_t fMuonDecayTime; //!< muon decay time (us)
Double_t fMuonPhase; //!< phase of muon spin Double_t fMuonPhase; //!< phase of muon spin
@ -93,6 +96,8 @@ class PSimulateMuTransition : public TObject
virtual Double_t NextEventTime(const Double_t &EventRate); virtual Double_t NextEventTime(const Double_t &EventRate);
// virtual Double_t PrecessionPhase(const Double_t &time, const Double_t &frequency); // virtual Double_t PrecessionPhase(const Double_t &time, const Double_t &frequency);
virtual Double_t PrecessionPhase(const Double_t &time, const TString chargeState); virtual Double_t PrecessionPhase(const Double_t &time, const TString chargeState);
virtual TComplex GTFunction(const Double_t &time); //!< transverse field polarization function of Mu0
virtual Double_t GTSpinFlip(const Double_t &time); //!< transverse field polarization function after spin-flip collisions
virtual void Event(const TString muonString); virtual void Event(const TString muonString);
ClassDef(PSimulateMuTransition, 0) ClassDef(PSimulateMuTransition, 0)

View File

@ -28,83 +28,62 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "/apps/cern/root-git/include/TMusrRunHeader.h"
#define NDECAYHISTS 2
void runMuSimulation() void runMuSimulation()
{ {
// load library // load library
gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition"); gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition");
// generate data // load TMusrRunHeader class if not already done during root startup
if (!TClass::GetDict("TMusrRunHeader")) {
gROOT->LoadMacro("$(ROOTSYS)/lib/libTMusrRunHeader.so");
}
char titleStr[256];
TFolder *histosFolder; TFolder *histosFolder;
TFolder *decayAnaModule; TFolder *decayAnaModule;
TFolder *runInfo; TFolder *gRunHeader;
TString runTitle;
histosFolder = gROOT->GetRootFolder()->AddFolder("histos", "Histograms"); TString histogramFileName;
gROOT->GetListOfBrowsables()->Add(histosFolder, "histos"); TObjArray Slist(0);
decayAnaModule = histosFolder->AddFolder("DecayAnaModule", "muSR decay histograms"); TMusrRunPhysicalQuantity prop;
//prepare to run simulation; here: isotropic Mu in Germanium //prepare to run simulation; here: isotropic Mu in Germanium
UInt_t runNo = 9903; UInt_t runNo = 9900;
Double_t T = 300.; //temperature Double_t T = 300.; //temperature
Double_t capRate = 1.0;//*sqrt(T/200.); Double_t spinFlipRate = 0.001; //if spinFlipRate > 0.001 only spin-flip processes will be simulated
//assume that capture rate varies as sqrt(T), capRate = sigma*v*p , v ~ sqrt(T) Double_t capRate = 1.0;//*sqrt(T/200.); //assume that capture rate varies as sqrt(T), capRate = sigma*v*p , v ~ sqrt(T)
Double_t ionRate; //assume Arrhenius behaviour ionRate = preFac*exp(-EA/kT) Double_t ionRate; //assume Arrhenius behaviour ionRate = preFac*exp(-EA/kT)
Double_t EA = 100.; //activation energy (meV) Double_t EA = 100.; //activation energy (meV)
ionRate = 2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV ionRate = 2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV
Double_t B = 100.; //field in G Double_t B = 100.; //field in G
Double_t Freq12 = 4463; //Mu freq of the 12 transition Double_t Bvar = 0.; //field variance
Double_t Freq34 = 4463; //Mu freq of the 34 transition Double_t Freq12 = 134.858; //Mu freq of the 12 transition
Double_t Freq23 = 4463; //Mu freq of the 23 transition Double_t Freq34 = 4328.142; //Mu freq of the 34 transition
Double_t Freq14 = 4463; //Mu freq of the 14 transition Double_t Freq23 = 143.713; //Mu freq of the 23 transition
Double_t Freq14 = 4606.713; //Mu freq of the 14 transition
Double_t MuFrac = 1.0; //total Mu fraction Double_t MuFrac = 1.0; //total Mu fraction
Double_t MuFrac12 = 0.5; //Mu in states 12 and 34 Double_t MuFrac12 = 2*0.266; //Mu in states 12 and 34
Double_t MuFrac23 = 0.5; //Mu in states 23 and 14 Double_t MuFrac23 = 2*0.234; //Mu in states 23 and 14
Int_t Nmuons = 1e7; //number of muons Int_t Nmuons = 1e6; //number of muons
Double_t Asym = 0.27; //muon decay asymmetry Double_t Asym = 0.27; //muon decay asymmetry
// feed run info header histogramFileName = TString("0");
TString tstr; histogramFileName += runNo;
runInfo = gROOT->GetRootFolder()->AddFolder("RunInfo", "LEM RunInfo"); histogramFileName += TString(".root");
gROOT->GetListOfBrowsables()->Add(runInfo, "RunInfo");
header = new TLemRunHeader();
tstr = TString("0");
tstr += runNo;
tstr += TString(" - Mu-frac 1.0, Mu12 -4463MHz (0.5), Mu34 -4463MHz(0.5), T=300K/EA=100meV, Cap. 1.0MHz, 10mT");
header->SetRunTitle(tstr.Data()); sprintf(titleStr,"- Mu-frac %3.2f, Mu12 %6.2f MHz(%3.2f), Mu23 %6.2f MHz(%3.2f), ionRate %8.2f MHz, capRate %6.2f MHz, SF rate %6.2f MHz, %5.0f G", MuFrac, Freq12, MuFrac12/2, Freq23, MuFrac23/2, ionRate, capRate, spinFlipRate, B);
header->SetLemSetup("trivial"); runTitle = TString("0");
header->SetRunNumber(runNo); runTitle += runNo;
header->SetStartTime(0); runTitle += TString(titleStr);
header->SetStopTime(1);
header->SetModeratorHV(32.0, 0.01);
header->SetSampleHV(0.0, 0.01);
header->SetImpEnergy(31.8);
header->SetSampleTemperature(T, 0.001);
header->SetSampleBField(B, 0.1);
header->SetTimeResolution(1.);
header->SetNChannels(12001);
header->SetNHist(2);
header->SetOffsetPPCHistograms(20);
header->SetCuts("none");
header->SetModerator("none");
Double_t tt0[2] = {0., 0.};
header->SetTimeZero(tt0);
runInfo->Add(header); //add header to RunInfo folder
TH1F *histo[4];
char str[128];
for (UInt_t i=0; i<2; i++) {
sprintf(str, "hDecay0%d", (Int_t)i);
histo[i] = new TH1F(str, str, 12001, -0.5, 12000.5);
sprintf(str, "hDecay2%d", (Int_t)i);
histo[i+2] = new TH1F(str, str, 12001, -0.5, 12000.5);
}
PSimulateMuTransition *simulateMuTransition = new PSimulateMuTransition(); PSimulateMuTransition *simulateMuTransition = new PSimulateMuTransition();
if (!simulateMuTransition->IsValid()) { if (!simulateMuTransition->IsValid()){
cerr << endl << "**ERROR** while invoking PSimulateTransition" << endl; cerr << endl << "**ERROR** while invoking PSimulateTransition" << endl;
return; return;
} }
simulateMuTransition->SetMuPrecFreq12(Freq12); // MHz simulateMuTransition->SetMuPrecFreq12(Freq12); // MHz
simulateMuTransition->SetMuPrecFreq34(Freq34); // MHz simulateMuTransition->SetMuPrecFreq34(Freq34); // MHz
simulateMuTransition->SetMuPrecFreq23(Freq23); // MHz simulateMuTransition->SetMuPrecFreq23(Freq23); // MHz
@ -115,22 +94,96 @@ void runMuSimulation()
simulateMuTransition->SetBfield(B/10000.); // Tesla simulateMuTransition->SetBfield(B/10000.); // Tesla
simulateMuTransition->SetCaptureRate(capRate); // MHz simulateMuTransition->SetCaptureRate(capRate); // MHz
simulateMuTransition->SetIonizationRate(ionRate); // MHz simulateMuTransition->SetIonizationRate(ionRate); // MHz
simulateMuTransition->SetSpinFlipRate(spinFlipRate); // MHz
simulateMuTransition->SetNmuons(Nmuons); simulateMuTransition->SetNmuons(Nmuons);
simulateMuTransition->SetDecayAsymmetry(Asym); simulateMuTransition->SetDecayAsymmetry(Asym);
simulateMuTransition->SetDebugFlag(kFALSE); // to print time and phase during charge-changing cycle simulateMuTransition->SetDebugFlag(kFALSE); // to print time and phase during charge-changing cycle
simulateMuTransition->PrintSettings(); // feed run info header
gRunHeader = gROOT->GetRootFolder()->AddFolder("RunHeader", "MuTransition Simulation Header Info");
gROOT->GetListOfBrowsables()->Add(gRunHeader, "RunHeader");
// header = new TLemRunHeader();
header = new TMusrRunHeader(true);
header->FillFolder(gRunHeader);
gRunHeader->Add(&Slist);
Slist.SetName("RunSummary");
simulateMuTransition->Run(histo[0], histo[1]); header->Set("RunInfo/Generic Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRoot.xsd");
header->Set("RunInfo/Specific Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRootLEM.xsd");
header->Set("RunInfo/Generator", "runMuSimulation");
for (UInt_t i=0; i<4; i++)
header->Set("RunInfo/File Name", histogramFileName.Data());
header->Set("RunInfo/Run Title", runTitle.Data());
header->Set("RunInfo/Run Number", (Int_t) runNo);
header->Set("RunInfo/Run Start Time", "0");
header->Set("RunInfo/Run Stop Time", "1");
prop.Set("Run Duration", 1.0, "sec");
header->Set("RunInfo/Run Duration", prop);
header->Set("RunInfo/Laboratory", "PSI");
header->Set("RunInfo/Instrument", "MC-Simulation");
prop.Set("Muon Beam Momentum", 0.0, "MeV/c");
header->Set("RunInfo/Muon Beam Momentum", prop);
header->Set("RunInfo/Muon Species", "positive muon and muonium");
header->Set("RunInfo/Muon Source", "Simulation");
header->Set("RunInfo/Setup", "Monte-Carlo setup");
header->Set("RunInfo/Comment", "Testing effect of charge-exchange or Mu0 spin flip processes on uSR signal");
header->Set("RunInfo/Sample Name", "Monte-Carlo");
header->Set("RunInfo/Sample Temperature", 300);
prop.Set("Sample Magnetic Field", MRH_UNDEFINED, B, Bvar, "G");
header->Set("RunInfo/Sample Magnetic Field", prop);
header->Set("RunInfo/No of Histos", 2);
prop.Set("Time Resolution", 1.0, "ns", "Simulation");
header->Set("RunInfo/Time Resolution", prop);
header->Set("DetectorInfo/Detector001/Name", "hDecay001");
header->Set("DetectorInfo/Detector001/Histo Number", 1);
header->Set("DetectorInfo/Detector001/Histo Length", 12001);
header->Set("DetectorInfo/Detector001/Time Zero Bin", 0);
header->Set("DetectorInfo/Detector001/First Good Bin", 1);
header->Set("DetectorInfo/Detector001/Last Good Bin", 12001);
header->Set("DetectorInfo/Detector002/Name", "hDecay002");
header->Set("DetectorInfo/Detector002/Histo Number", 1);
header->Set("DetectorInfo/Detector002/Histo Length", 12001);
header->Set("DetectorInfo/Detector002/Time Zero Bin", 0);
header->Set("DetectorInfo/Detector002/First Good Bin", 1);
header->Set("DetectorInfo/Detector002/Last Good Bin", 12001);
// simulation parameters
header->Set("Simulation/Mu Precession frequency 12", Freq12);
header->Set("Simulation/Mu Precession frequency 34", Freq34);
header->Set("Simulation/Mu Precession frequency 23", Freq23);
header->Set("Simulation/Mu Precession frequency 14", Freq14);
header->Set("Simulation/Mu Fraction", MuFrac);
header->Set("Simulation/Mu Fraction 12", MuFrac12);
header->Set("Simulation/Mu Fraction 23", MuFrac23);
header->Set("Simulation/Mu+ Capture Rate", capRate);
header->Set("Simulation/Mu0 Ionization Rate", ionRate);
header->Set("Simulation/Mu0 Spin Flip Rate", spinFlipRate);
header->Set("Simulation/Number of Muons", Nmuons);
header->Set("Simulation/Decay Asymmetry", Asym);
histosFolder = gROOT->GetRootFolder()->AddFolder("histos", "Histograms");
gROOT->GetListOfBrowsables()->Add(histosFolder, "histos");
decayAnaModule = histosFolder->AddFolder("DecayAnaModule", "muSR decay histograms");
TH1F *histo[NDECAYHISTS];
char str[128];
for (UInt_t i=0; i<NDECAYHISTS; i++) {
sprintf(str, "hDecay00%d", (Int_t)i+1);
histo[i] = new TH1F(str, str, 12001, -0.5, 12000.5);
}
for (i=0; i<NDECAYHISTS; i++)
decayAnaModule->Add(histo[i]); decayAnaModule->Add(histo[i]);
// run simulation
simulateMuTransition->PrintSettings();
simulateMuTransition->Run(histo[0], histo[1]);
// write file // write file
tstr = TString("0"); TFile *fout = new TFile(histogramFileName.Data(), "RECREATE", "Midas MC Histograms");
tstr += runNo;
tstr += TString(".root");
TFile *fout = new TFile(tstr.Data(), "RECREATE", "Midas Fake Histograms");
if (fout == 0) { if (fout == 0) {
cout << endl << "**ERROR** Couldn't create ROOT file"; cout << endl << "**ERROR** Couldn't create ROOT file";
cout << endl << endl; cout << endl << endl;
@ -138,10 +191,11 @@ void runMuSimulation()
} }
fout->cd(); fout->cd();
runInfo->Write(); header->FillFolder(gRunHeader);
gRunHeader->Write();
histosFolder->Write(); histosFolder->Write();
fout->Close(); fout->Close();
cout << "Histograms written to " << tstr.Data() << endl; cout << "Histograms written to " << histogramFileName.Data() << endl;
delete fout; delete fout;
delete [] histo; delete [] histo;