diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index d4fa8e91..c21577d1 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -559,6 +559,13 @@ Bool_t PRunAsymmetry::PrepareData() return false; } + // keep the field from the meta-data from the data-file + fField = runData->GetField(); + + // keep the temperature(s) from the meta-data from the data-file + for (unsigned int i=0; iGetNoOfTemperatures(); i++) + fTemp.push_back(runData->GetTemperature(i)); + // collect histogram numbers PUIntVector forwardHistoNo; PUIntVector backwardHistoNo; diff --git a/src/classes/PRunAsymmetryBNMR.cpp b/src/classes/PRunAsymmetryBNMR.cpp index 66b7626c..bab19fe5 100644 --- a/src/classes/PRunAsymmetryBNMR.cpp +++ b/src/classes/PRunAsymmetryBNMR.cpp @@ -597,6 +597,13 @@ Bool_t PRunAsymmetryBNMR::PrepareData() return false; } + // keep the field from the meta-data from the data-file + fField = runData->GetField(); + + // keep the temperature(s) from the meta-data from the data-file + for (unsigned int i=0; iGetNoOfTemperatures(); i++) + fTemp.push_back(runData->GetTemperature(i)); + // collect histogram numbers PUIntVector forwardHistoNo; PUIntVector backwardHistoNo; diff --git a/src/classes/PRunAsymmetryRRF.cpp b/src/classes/PRunAsymmetryRRF.cpp index 4c15952b..ace43f52 100644 --- a/src/classes/PRunAsymmetryRRF.cpp +++ b/src/classes/PRunAsymmetryRRF.cpp @@ -541,6 +541,13 @@ Bool_t PRunAsymmetryRRF::PrepareData() return false; } + // keep the field from the meta-data from the data-file + fField = runData->GetField(); + + // keep the temperature(s) from the meta-data from the data-file + for (unsigned int i=0; iGetNoOfTemperatures(); i++) + fTemp.push_back(runData->GetTemperature(i)); + // collect histogram numbers PUIntVector forwardHistoNo; PUIntVector backwardHistoNo; diff --git a/src/classes/PRunBase.cpp b/src/classes/PRunBase.cpp index 278632a0..a55707d2 100644 --- a/src/classes/PRunBase.cpp +++ b/src/classes/PRunBase.cpp @@ -49,6 +49,7 @@ PRunBase::PRunBase() fRunNo = -1; fRunInfo = nullptr; fRawData = nullptr; + fField = -1.0; fTimeResolution = -1.0; fFitStartTime = PMUSR_UNDEFINED; @@ -90,6 +91,7 @@ PRunBase::PRunBase(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, } // init private variables + fField = -1.0; fTimeResolution = -1.0; for (Int_t i=0; iGetNoOfFuncs(); i++) fFuncValues.push_back(0.0); diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp index a7f72b1b..17b852b3 100644 --- a/src/classes/PRunSingleHisto.cpp +++ b/src/classes/PRunSingleHisto.cpp @@ -709,6 +709,13 @@ Bool_t PRunSingleHisto::PrepareData() return false; } + // keep the field from the meta-data from the data-file + fField = runData->GetField(); + + // keep the temperature(s) from the meta-data from the data-file + for (unsigned int i=0; iGetNoOfTemperatures(); i++) + fTemp.push_back(runData->GetTemperature(i)); + // collect histogram numbers PUIntVector histoNo; // histoNo = msr-file forward + redGreen_offset - 1 for (UInt_t i=0; iGetForwardHistoNoSize(); i++) { diff --git a/src/classes/PRunSingleHistoRRF.cpp b/src/classes/PRunSingleHistoRRF.cpp index cf83c936..ebf3cdc0 100644 --- a/src/classes/PRunSingleHistoRRF.cpp +++ b/src/classes/PRunSingleHistoRRF.cpp @@ -440,6 +440,13 @@ Bool_t PRunSingleHistoRRF::PrepareData() return false; } + // keep the field from the meta-data from the data-file + fField = runData->GetField(); + + // keep the temperature(s) from the meta-data from the data-file + for (unsigned int i=0; iGetNoOfTemperatures(); i++) + fTemp.push_back(runData->GetTemperature(i)); + // collect histogram numbers PUIntVector histoNo; // histoNo = msr-file forward + redGreen_offset - 1 for (UInt_t i=0; iGetForwardHistoNoSize(); i++) { diff --git a/src/include/PRunBase.h b/src/include/PRunBase.h index 5a12976f..8068026a 100644 --- a/src/include/PRunBase.h +++ b/src/include/PRunBase.h @@ -73,6 +73,8 @@ class PRunBase PRunData fData; ///< data to be fitted, viewed, i.e. binned data Double_t fTimeResolution; ///< time resolution in (us) + Double_t fField; ///< field from the meta-data of the data file + PDoubleVector fTemp; ///< temperature(s) from the meta-data of the data file : first = temp, second = std. dev. of the temperature PDoubleVector fT0s; ///< all t0 bins of a run! The derived classes will handle it. std::vector fAddT0s; ///< all t0 bins of all addrun's of a run! The derived classes will handle it.