Merged muonspin/musrfit/root6 into master

This commit is contained in:
Zaher Salman 2017-11-28 12:28:07 +01:00
commit 56e88d329e

View File

@ -346,6 +346,7 @@ int dump_header_psi_bin(const string fileName, const string fileFormat)
return 1;
vector<string> vstr;
vector<double> dVal, dErrVal;
cout << endl << "-------------------";
cout << endl << "fileName = " << fileName << ", fileFormat = " << fileFormat;
cout << endl << "-------------------";
@ -378,7 +379,15 @@ int dump_header_psi_bin(const string fileName, const string fileFormat)
cout << endl << "Comment : n/a";
cout << endl << "Sample Name : " << psiBin.get_sample();
cout << endl << "Sample Orientation : " << psiBin.get_orient();
cout << endl << "Sample Temperature : " << psiBin.get_temp();
dVal = psiBin.get_temperatures_vector();
dErrVal = psiBin.get_devTemperatures_vector();
if (dVal.size() != dErrVal.size()) {
cout << endl << "Sample Temperature : " << psiBin.get_temp();
} else {
for (unsigned int i=0; i<dVal.size(); i++) {
cout << endl << "Sample Temp. " << i+1 << " : " << dVal[i] << " (" << dErrVal[i] << ") K";
}
}
cout << endl << "Sample Mag. Field : " << psiBin.get_field();
cout << endl << "No of Histos : " << psiBin.get_numberHisto_int();
cout << endl << "Time Resolution : " << psiBin.get_binWidth_ns() << " ns";
@ -389,7 +398,8 @@ int dump_header_psi_bin(const string fileName, const string fileFormat)
cout << endl << "Histo Length : " << psiBin.get_histoLength_bin();
cout << endl << "Time Zero Bin : " << psiBin.get_t0_int(i);
cout << endl << "First Good Bin : " << psiBin.get_firstGood_int(i);
cout << endl << "Last Good Bin : " << psiBin.get_firstGood_int(i);
cout << endl << "Last Good Bin : " << psiBin.get_lastGood_int(i);
cout << endl << "No of Events : " << psiBin.get_eventsHisto_long(i);
}
cout << endl << "-------------------" << endl << endl;