From 2c0f16a317b36007db73275585da68a830138202 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Thu, 18 Jun 2020 08:51:14 +0200
Subject: [PATCH] adopted for meta info in functions needed for DKS.

---
 src/classes/PRunListCollection.cpp | 17 +++++++++++++----
 src/include/PRunBase.h             |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/classes/PRunListCollection.cpp b/src/classes/PRunListCollection.cpp
index a7c52a31..d35cf55e 100644
--- a/src/classes/PRunListCollection.cpp
+++ b/src/classes/PRunListCollection.cpp
@@ -1368,6 +1368,9 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
   // get flag if scaling of N0 and Nbkg is wished
   dksp.fScaleN0AndBkg = fRunSingleHistoList[idx]->GetScaleN0AndBkg();
 
+  // get the meta data needed to calculate the functions
+  PMetaData metaData = fRunSingleHistoList[idx]->GetMetaData();
+
   // check if norm is a parameter or a function
   PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
   if (runInfo.GetNormParamNo() < MSR_PARAM_FUN_OFFSET) { // norm is a parameter
@@ -1376,7 +1379,7 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
     // get function number
     UInt_t funNo = runInfo.GetNormParamNo()-MSR_PARAM_FUN_OFFSET;
     // evaluate function
-    dksp.fN0 = fMsrInfo->EvalFunc(funNo, *runInfo.GetMap(), par);
+    dksp.fN0 = fMsrInfo->EvalFunc(funNo, *runInfo.GetMap(), par, metaData);
   }
 
   // get tau
@@ -1411,7 +1414,7 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
   Int_t funcNo = 0;
   for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
     funcNo = fMsrInfo->GetFuncNo(i);
-    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par));
+    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
   }
 
   // get map vector
@@ -1444,6 +1447,9 @@ Int_t PRunListCollection::GetAsymmetryParams(UInt_t idx, const std::vector<Doubl
   // init param
   InitDKSParams(dksp);
 
+  // get the meta data needed to calculate the functions
+  PMetaData metaData = fRunAsymmetryList[idx]->GetMetaData();
+
   // get alpha
   PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
   ival = runInfo.GetAlphaParamNo();
@@ -1470,7 +1476,7 @@ Int_t PRunListCollection::GetAsymmetryParams(UInt_t idx, const std::vector<Doubl
   Int_t funcNo = 0;
   for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
     funcNo = fMsrInfo->GetFuncNo(i);
-    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par));
+    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
   }
 
   // get map vector
@@ -1503,6 +1509,9 @@ Int_t PRunListCollection::GetMuMinusParams(UInt_t idx, const std::vector<Double_
   // get run block
   PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
 
+  // get the meta data needed to calculate the functions
+  PMetaData metaData = fRunMuMinusList[idx]->GetMetaData();
+
   // init param
   InitDKSParams(dksp);
 
@@ -1521,7 +1530,7 @@ Int_t PRunListCollection::GetMuMinusParams(UInt_t idx, const std::vector<Double_
   Int_t funcNo = 0;
   for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
     funcNo = fMsrInfo->GetFuncNo(i);
-    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par));
+    dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
   }
 
   // get map vector
diff --git a/src/include/PRunBase.h b/src/include/PRunBase.h
index febfe6a7..1cb2cb54 100644
--- a/src/include/PRunBase.h
+++ b/src/include/PRunBase.h
@@ -59,6 +59,7 @@ class PRunBase
     virtual Double_t GetTimeResolution() { return fTimeResolution; } ///< returns the native raw data time resolution
     virtual UInt_t GetRunNo() { return fRunNo; } ///< returns the number of runs of the msr-file
     virtual PRunData* GetData() { return &fData; } ///< returns the data to be fitted
+    virtual PMetaData GetMetaData() { return fMetaData; } ///< returns the meta data
     virtual void CleanUp();
     virtual Bool_t IsValid() { return fValid; } ///< returns if the state is valid