add field, temperature values from meta-data of the data-files to the runs. This will be needed if functions want to access this information (not yet implemented).

This commit is contained in:
suter_a 2020-06-13 16:13:44 +02:00
parent 32b4c89dae
commit 8acb5474a9
7 changed files with 39 additions and 0 deletions

View File

@ -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; i<runData->GetNoOfTemperatures(); i++)
fTemp.push_back(runData->GetTemperature(i));
// collect histogram numbers
PUIntVector forwardHistoNo;
PUIntVector backwardHistoNo;

View File

@ -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; i<runData->GetNoOfTemperatures(); i++)
fTemp.push_back(runData->GetTemperature(i));
// collect histogram numbers
PUIntVector forwardHistoNo;
PUIntVector backwardHistoNo;

View File

@ -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; i<runData->GetNoOfTemperatures(); i++)
fTemp.push_back(runData->GetTemperature(i));
// collect histogram numbers
PUIntVector forwardHistoNo;
PUIntVector backwardHistoNo;

View File

@ -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; i<fMsrInfo->GetNoOfFuncs(); i++)
fFuncValues.push_back(0.0);

View File

@ -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; i<runData->GetNoOfTemperatures(); i++)
fTemp.push_back(runData->GetTemperature(i));
// collect histogram numbers
PUIntVector histoNo; // histoNo = msr-file forward + redGreen_offset - 1
for (UInt_t i=0; i<fRunInfo->GetForwardHistoNoSize(); i++) {

View File

@ -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; i<runData->GetNoOfTemperatures(); i++)
fTemp.push_back(runData->GetTemperature(i));
// collect histogram numbers
PUIntVector histoNo; // histoNo = msr-file forward + redGreen_offset - 1
for (UInt_t i=0; i<fRunInfo->GetForwardHistoNoSize(); i++) {

View File

@ -74,6 +74,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<PDoubleVector> fAddT0s; ///< all t0 bins of all addrun's of a run! The derived classes will handle it.