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

improved handling of WKM/ASCII in PRunDataHandler for any2many (MUSR-172)

Browse Source
This commit is contained in:
nemu
2011-06-28 18:06:29 +00:00
parent 79a856483b
commit 3243d26ef1
2 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@ FIXED bug reported in MUSR-183: missing background for 2nd histo in asymmetry fi
FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage
FIXED ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot FIXED ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot
FIXED bug in asymmetry fit with fixed background FIXED bug in asymmetry fit with fixed background
CHANGED improved handling of WKM/ASCII in PRunDataHandler for any2many (MUSR-172)
CHANGED the data-file-name handling (MUSR-195). CHANGED the data-file-name handling (MUSR-195).
It is now possible to specify the full file name in the RUN block (including the extension). It is now possible to specify the full file name in the RUN block (including the extension).
CHANGED cosmetics in the musrview legend concerning the units CHANGED cosmetics in the musrview legend concerning the units

91
src/classes/PRunDataHandler.cpp
View File

@ -36,6 +36,7 @@
#include <cstdio> #include <cstdio>
#include <ctime> #include <ctime>
#include <iostream> #include <iostream>
#include <iomanip>
#include <fstream> #include <fstream>
#include <string> #include <string>
using namespace std; using namespace std;
@ -1139,7 +1140,7 @@ Bool_t PRunDataHandler::ReadRootFile(UInt_t tag)
// this is not fatal... only RA-HV values are not available // this is not fatal... only RA-HV values are not available
} else { // it follows a (at least) little bit strange extraction of the RA values from Thomas' TObjArray... } else { // it follows a (at least) little bit strange extraction of the RA values from Thomas' TObjArray...
//streaming of a ASCII-file would be more easy //streaming of a ASCII-file would be more easy
TString s, tok; TString s;
TObjArrayIter summIter(runSummary); TObjArrayIter summIter(runSummary);
TObjString *os(dynamic_cast<TObjString*>(summIter.Next())); TObjString *os(dynamic_cast<TObjString*>(summIter.Next()));
TObjArray *oa(0); TObjArray *oa(0);
@ -1241,7 +1242,7 @@ Bool_t PRunDataHandler::ReadRootFile(UInt_t tag)
// keep maximum of histogram as a T0 estimate // keep maximum of histogram as a T0 estimate
runData.AppendT0Estimated(histo->GetMaximumBin()); runData.AppendT0Estimated(histo->GetMaximumBin());
// fill data // fill data
for (Int_t j=1; j<histo->GetNbinsX(); j++) { for (Int_t j=1; j<=histo->GetNbinsX(); j++) {
histoData.push_back(histo->GetBinContent(j)); histoData.push_back(histo->GetBinContent(j));
} }
// store them in runData vector // store them in runData vector
@ -1261,7 +1262,7 @@ Bool_t PRunDataHandler::ReadRootFile(UInt_t tag)
// keep maximum of histogram as a T0 estimate // keep maximum of histogram as a T0 estimate
runData.AppendT0Estimated(histo->GetMaximumBin()); runData.AppendT0Estimated(histo->GetMaximumBin());
// fill data // fill data
for (Int_t j=1; j<histo->GetNbinsX(); j++) for (Int_t j=1; j<=histo->GetNbinsX(); j++)
histoData.push_back(histo->GetBinContent(j)); histoData.push_back(histo->GetBinContent(j));
// store them in runData vector // store them in runData vector
runData.AppendDataBin(histoData); runData.AppendDataBin(histoData);
@ -1280,7 +1281,7 @@ Bool_t PRunDataHandler::ReadRootFile(UInt_t tag)
// keep maximum of histogram as a T0 estimate // keep maximum of histogram as a T0 estimate
runData.AppendT0Estimated(histo->GetMaximumBin()); runData.AppendT0Estimated(histo->GetMaximumBin());
// fill data // fill data
for (Int_t j=1; j<histo->GetNbinsX(); j++) { for (Int_t j=1; j<=histo->GetNbinsX(); j++) {
histoData.push_back(histo->GetBinContent(j)); histoData.push_back(histo->GetBinContent(j));
} }
// store them in runData vector // store them in runData vector
@ -1299,7 +1300,7 @@ Bool_t PRunDataHandler::ReadRootFile(UInt_t tag)
// keep maximum of histogram as a T0 estimate // keep maximum of histogram as a T0 estimate
runData.AppendT0Estimated(histo->GetMaximumBin()); runData.AppendT0Estimated(histo->GetMaximumBin());
// fill data // fill data
for (Int_t j=1; j<histo->GetNbinsX(); j++) for (Int_t j=1; j<=histo->GetNbinsX(); j++)
histoData.push_back(histo->GetBinContent(j)); histoData.push_back(histo->GetBinContent(j));
// store them in runData vector // store them in runData vector
runData.AppendDataBin(histoData); runData.AppendDataBin(histoData);
@ -3518,12 +3519,22 @@ Bool_t PRunDataHandler::WriteNexusFile(TString fln)
*/ */
Bool_t PRunDataHandler::WriteWkmFile(TString fln) Bool_t PRunDataHandler::WriteWkmFile(TString fln)
{ {
// check if a LEM nemu file needs to be written
bool lem_wkm_style = false;
if (!fAny2ManyInfo->inFormat.CompareTo("ROOT"))
lem_wkm_style = true;
// generate output file name // generate output file name
TString fileName("");
if (fln.Length() == 0) { if (fln.Length() == 0) {
Bool_t ok = false; Bool_t ok = false;
fln = GetFileName(".wkm", ok); if (lem_wkm_style)
fln = GetFileName(".nemu", ok);
else
fln = GetFileName(".wkm", ok);
if (!ok) if (!ok)
return false; return false;
fileName = fln;
} else { } else {
fln.Prepend(fAny2ManyInfo->outPath); fln.Prepend(fAny2ManyInfo->outPath);
} }
@ -3555,53 +3566,69 @@ Bool_t PRunDataHandler::WriteWkmFile(TString fln)
// write header // write header
cout << "- WKM data file converted with any2many"; cout << "- WKM data file converted with any2many";
cout << endl << "Run : " << fData[0].GetRunNumber(); if (lem_wkm_style) {
cout << endl << "NEMU_Run: " << fData[0].GetRunNumber();
cout << endl << "nemu_Run: " << fileName.Data();
} else {
cout << endl << "Run: " << fData[0].GetRunNumber();
}
cout << endl << "Date: " << fData[0].GetStartTime()->Data() << " " << fData[0].GetStartDate()->Data() << " / " << fData[0].GetStopTime()->Data() << " " << fData[0].GetStopDate()->Data();
if (fData[0].GetRunTitle()->Length() > 0) if (fData[0].GetRunTitle()->Length() > 0)
cout << endl << "Title : " << fData[0].GetRunTitle()->Data(); cout << endl << "Title: " << fData[0].GetRunTitle()->Data();
if (fData[0].GetNoOfTemperatures() == 1) {
cout << endl << "Temp : " << fData[0].GetTemperature(0);
} else if (fData[0].GetNoOfTemperatures() > 1) {
cout << endl << "Temp(meas1) : " << fData[0].GetTemperature(0) << " +- " << fData[0].GetTempError(0);
cout << endl << "Temp(meas2) : " << fData[0].GetTemperature(1) << " +- " << fData[0].GetTempError(1);
} else {
cout << endl << "Temp : ??";
}
if (fData[0].GetField() != PMUSR_UNDEFINED) { if (fData[0].GetField() != PMUSR_UNDEFINED) {
cout << endl << "Field : " << fData[0].GetField(); cout << endl << "Field: " << fData[0].GetField();
} else { } else {
cout << endl << "Field : ??"; cout << endl << "Field: ??";
} }
cout << endl << "Date : " << fData[0].GetStartTime()->Data() << " " << fData[0].GetStartDate()->Data() << " / " << fData[0].GetStopTime()->Data() << " " << fData[0].GetStopDate()->Data(); cout << endl << "Setup: " << fData[0].GetSetup()->Data();
cout << endl << "Setup : " << fData[0].GetSetup()->Data(); if (fData[0].GetNoOfTemperatures() == 1) {
cout << endl << "Groups : " << fData[0].GetNoOfHistos(); cout << endl << "Temp: " << fData[0].GetTemperature(0);
cout << endl << "Channels : " << static_cast<UInt_t>(fData[0].GetDataBin(0)->size()/fAny2ManyInfo->rebin); } else if (fData[0].GetNoOfTemperatures() > 1) {
cout << endl << "Temp(meas1): " << fData[0].GetTemperature(0) << " +- " << fData[0].GetTempError(0);
cout << endl << "Temp(meas2): " << fData[0].GetTemperature(1) << " +- " << fData[0].GetTempError(1);
} else {
cout << endl << "Temp: ??";
}
if (lem_wkm_style)
cout << endl << "TOF(M3S1): nocut";
cout << endl << "Groups: " << fData[0].GetNoOfHistos();
cout << endl << "Channels: " << static_cast<UInt_t>(fData[0].GetDataBin(0)->size()/fAny2ManyInfo->rebin);
cout.precision(10); cout.precision(10);
cout << endl << "Resolution : " << fData[0].GetTimeResolution()*fAny2ManyInfo->rebin/1.0e3; // ns->us cout << endl << "Resolution: " << fData[0].GetTimeResolution()*fAny2ManyInfo->rebin/1.0e3; // ns->us
cout.setf(ios::fixed,ios::floatfield); // floatfield set to fixed cout.setf(ios::fixed,ios::floatfield); // floatfield set to fixed
// write data // write data
UInt_t no_of_bins_per_line = 16;
if (lem_wkm_style)
no_of_bins_per_line = 10;
if (fAny2ManyInfo->rebin == 1) { if (fAny2ManyInfo->rebin == 1) {
for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++) { for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++) {
cout << endl << endl; cout << endl << endl;
for (UInt_t j=0; j<fData[0].GetDataBin(i)->size(); j++) { for (UInt_t j=0; j<fData[0].GetDataBin(i)->size(); j++) {
if ((j > 0) && (j % 16 == 0)) if ((j > 0) && (j % no_of_bins_per_line == 0))
cout << endl; cout << endl;
cout << static_cast<Int_t>(fData[0].GetDataBin(i)->at(j)) << " "; if (lem_wkm_style)
cout << setw(8) << static_cast<Int_t>(fData[0].GetDataBin(i)->at(j));
else
cout << static_cast<Int_t>(fData[0].GetDataBin(i)->at(j)) << " ";
} }
} }
} else { // rebin > 1 } else { // rebin > 1
Int_t dataRebin = 0; Int_t dataRebin = 0;
Int_t count = 0; UInt_t count = 0;
for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++) { for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++) {
cout << endl << endl; cout << endl << endl;
count = 0; count = 0;
dataRebin = 0; // reset rebin dataRebin = 0; // reset rebin
for (UInt_t j=0; j<fData[0].GetDataBin(i)->size(); j++) { for (UInt_t j=0; j<fData[0].GetDataBin(i)->size(); j++) {
if ((j > 0) && (j % fAny2ManyInfo->rebin == 0)) { if ((j > 0) && (j % fAny2ManyInfo->rebin == 0)) {
cout << dataRebin << " "; if (lem_wkm_style)
cout << setw(8) << dataRebin;
else
cout << dataRebin << " ";
count++; count++;
dataRebin = 0; dataRebin = 0;
if ((count > 0) && (count % 16 == 0)) if ((count > 0) && (count % no_of_bins_per_line == 0))
cout << endl; cout << endl;
} else { } else {
dataRebin += static_cast<Int_t>(fData[0].GetDataBin(i)->at(j)); dataRebin += static_cast<Int_t>(fData[0].GetDataBin(i)->at(j));
@ -3982,11 +4009,13 @@ Bool_t PRunDataHandler::WriteMudFile(TString fln)
Bool_t PRunDataHandler::WriteAsciiFile(TString fln) Bool_t PRunDataHandler::WriteAsciiFile(TString fln)
{ {
// generate output file name // generate output file name
TString fileName("");
if (fln.Length() == 0) { if (fln.Length() == 0) {
Bool_t ok = false; Bool_t ok = false;
fln = GetFileName(".ascii", ok); fln = GetFileName(".ascii", ok);
if (!ok) if (!ok)
return false; return false;
fileName = fln;
} else { } else {
fln.Prepend(fAny2ManyInfo->outPath); fln.Prepend(fAny2ManyInfo->outPath);
} }
@ -4018,7 +4047,7 @@ Bool_t PRunDataHandler::WriteAsciiFile(TString fln)
// write header // write header
cout << "%*************************************************************************"; cout << "%*************************************************************************";
cout << endl << "% file name : " << fln.Data(); cout << endl << "% file name : " << fileName.Data();
if (fData[0].GetRunTitle()->Length() > 0) if (fData[0].GetRunTitle()->Length() > 0)
cout << endl << "% title : " << fData[0].GetRunTitle()->Data(); cout << endl << "% title : " << fData[0].GetRunTitle()->Data();
if (fData[0].GetRunNumber() >= 0) if (fData[0].GetRunNumber() >= 0)
@ -4058,7 +4087,7 @@ Bool_t PRunDataHandler::WriteAsciiFile(TString fln)
// write data // write data
if (fAny2ManyInfo->rebin == 1) { if (fAny2ManyInfo->rebin == 1) {
UInt_t length = fData[0].GetDataBin(0)->size(); UInt_t length = fData[0].GetDataBin(0)->size();
for (UInt_t i=1; i<length; i++) { for (UInt_t i=0; i<length; i++) {
cout << endl; cout << endl;
for (UInt_t j=0; j<fData[0].GetNoOfHistos(); j++) { for (UInt_t j=0; j<fData[0].GetNoOfHistos(); j++) {
cout.width(8); cout.width(8);
@ -4073,7 +4102,7 @@ Bool_t PRunDataHandler::WriteAsciiFile(TString fln)
for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++) for (UInt_t i=0; i<fData[0].GetNoOfHistos(); i++)
dataRebin[i] = static_cast<UInt_t>(fData[0].GetDataBin(i)->at(0)); dataRebin[i] = static_cast<UInt_t>(fData[0].GetDataBin(i)->at(0));
for (UInt_t i=1; i<length; i++) { for (UInt_t i=0; i<length; i++) {
if ((i % fAny2ManyInfo->rebin) == 0) { if ((i % fAny2ManyInfo->rebin) == 0) {
cout << endl; cout << endl;
for (UInt_t j=0; j<fData[0].GetNoOfHistos(); j++) { for (UInt_t j=0; j<fData[0].GetNoOfHistos(); j++) {