From 507c36b4d8b86a5b861198971f501c245c0020bf Mon Sep 17 00:00:00 2001 From: nemu Date: Mon, 7 Feb 2011 16:59:42 +0000 Subject: [PATCH] corrected time resolution for WKM from (ns) -> (us) --- ChangeLog | 1 + src/classes/PRunDataHandler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 546a08f0..bde8abee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ NEW any2many: an attempt to write the universial musr-data-file converter. Just NEW musrt0: added the possibility to show the t0 saved in the data file 's'. Furthermore added the option --getT0FromPromptPeak, -g with : will, in non-interactive mode estimate the t0's from the prompt peak and write it into the msr-file (MUSR-133). +FIXED corrected time resolution for WKM from (ns) -> (us) FIXED the formating of fixed parameters (step=0) where wrongly formatted (connected to MUSR-167). This should be done correctly now. FIXED for single histogram fits, the chisq given was wrong (not the fit-result though). I missed some needed scaling diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index 3008d623..7bdc832e 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -1360,7 +1360,7 @@ Bool_t PRunDataHandler::ReadWkmFile() StripWhitespace(line); dval = ToDouble(line, ok); if (ok) - runData.SetTimeResolution(dval); + runData.SetTimeResolution(dval*1.0e3); // us -> ns } } @@ -3271,7 +3271,7 @@ Bool_t PRunDataHandler::WriteWkmFile(TString fln) cout << endl << "Groups : " << fData[0].GetNoOfHistos(); cout << endl << "Channels : " << static_cast(fData[0].GetDataBin(0)->size()/fAny2ManyInfo->rebin); cout.precision(10); - cout << endl << "Resolution : " << fData[0].GetTimeResolution()*fAny2ManyInfo->rebin; + cout << endl << "Resolution : " << fData[0].GetTimeResolution()*fAny2ManyInfo->rebin/1.0e3; // ns->us cout.setf(ios::fixed,ios::floatfield); // floatfield set to fixed // write data