From d49821658ba4385dc0c36a53b0274b70c147d594 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 23 Nov 2017 09:00:09 +0100 Subject: [PATCH 1/3] for PSI-BIN/MDU: dump all temperature available including the std devs. --- src/dump_header.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/dump_header.cpp b/src/dump_header.cpp index b68d2e9d..37f89af5 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -346,6 +346,7 @@ int dump_header_psi_bin(const string fileName, const string fileFormat) return 1; vector vstr; + vector 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 Date: Thu, 23 Nov 2017 09:22:20 +0100 Subject: [PATCH 2/3] added missing temperature unit. --- src/dump_header.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dump_header.cpp b/src/dump_header.cpp index 37f89af5..009d5295 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -385,7 +385,7 @@ int dump_header_psi_bin(const string fileName, const string fileFormat) cout << endl << "Sample Temperature : " << psiBin.get_temp(); } else { for (unsigned int i=0; i Date: Thu, 23 Nov 2017 10:10:08 +0100 Subject: [PATCH 3/3] for PSI-BIN/MDU: fixed wrong last good bin, and added number of events per histo. --- src/dump_header.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dump_header.cpp b/src/dump_header.cpp index 009d5295..aa69fafc 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -398,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;