bugfix read vector from histo and init rndSeed

Author: lubynets

PWGHF/D2H/Macros/HFInvMassFitter.cxx

@@ -62,7 +62,8 @@ HFInvMassFitter::HFInvMassFitter(TH1* histoToFit,
                                  double minValue,
                                  double maxValue,
                                  int fitTypeBkg,
-                                 int fitTypeSgn) : mHistoInvMass(nullptr),
+                                 int fitTypeSgn,
+                                 int randomSeed) : mHistoInvMass(nullptr),
                                                    mFitOption("L,E"),
                                                    mMinMass(minValue),
                                                    mMaxMass(maxValue),
@@ -149,7 +150,7 @@ HFInvMassFitter::HFInvMassFitter(TH1* histoToFit,
                                                    mHistoTemplateRefl(nullptr),
                                                    mDrawBgPrefit(false),
                                                    mHighlightPeakRegion(false),
-                                                   mRandomSeed(-1),
+                                                   mRandomSeed(randomSeed),
                                                    mRandomGen(nullptr)
 {
   // standard constructor

PWGHF/D2H/Macros/HFInvMassFitter.h

@@ -77,7 +77,7 @@ class HFInvMassFitter : public TNamed
   };
   std::array<std::string, NTypesOfReflPdf> namesOfReflPdf{"reflFuncGaus", "reflFuncDoubleGaus", "reflFuncPoly3", "reflFuncPoly6"};
   HFInvMassFitter() = delete;
-  HFInvMassFitter(TH1* histoToFit, double minValue, double maxValue, int fitTypeBkg = Expo, int fitTypeSgn = SingleGaus);
+  HFInvMassFitter(TH1* histoToFit, double minValue, double maxValue, int fitTypeBkg = Expo, int fitTypeSgn = SingleGaus, int randomSeed = -1);
   ~HFInvMassFitter() override;
   void setHistogramForFit(TH1* histoToFit);
   void setUseLikelihoodFit() { mFitOption = "L,E"; }
@@ -169,7 +169,6 @@ class HFInvMassFitter : public TNamed
   void drawResidual(TVirtualPad* c);
   void drawRatio(TVirtualPad* c);
   void drawReflection(TVirtualPad* c);
-  void setRandomSeed(int seed) { mRandomSeed = seed; }
 
  private:
   HFInvMassFitter(const HFInvMassFitter& source);

PWGHF/D2H/Macros/runMassFitter.C

@@ -431,7 +431,7 @@ void runMassFitter(const std::string& configFileName)
 
     double reflOverSgn = 0;
 
-    HFInvMassFitter* massFitter = new HFInvMassFitter(hMass[iSliceVar], massMin[iSliceVar], massMax[iSliceVar], bkgFunc[iSliceVar], sgnFunc[iSliceVar]);
+    HFInvMassFitter* massFitter = new HFInvMassFitter(hMass[iSliceVar], massMin[iSliceVar], massMax[iSliceVar], bkgFunc[iSliceVar], sgnFunc[iSliceVar], randomSeed);
     massFitter->setDrawBgPrefit(drawBgPrefit);
     massFitter->setHighlightPeakRegion(highlightPeakRegion);
     massFitter->setInitialGaussianMean(massPDG);
@@ -442,7 +442,6 @@ void runMassFitter(const std::string& configFileName)
     } else {
       massFitter->setUseChi2Fit();
     }
-    massFitter->setRandomSeed(randomSeed);
 
     auto setFixedValue = [&iSliceVar](bool const& isFix, std::vector<double> const& fixManual, const TH1* histToFix, std::function<void(double)> setFunc, std::string const& var) -> void {
       if (isFix) {
@@ -741,8 +740,8 @@ void readJsonVectorFromHisto(std::vector<double>& vec, const Document& config, c
   if (!vec.empty()) {
     throw std::runtime_error("readJsonVectorFromHisto(): vector is not empty!");
   }
-  const auto fileName = readJsonField<std::string>(config, fileNameFieldName);
-  const auto histoName = readJsonField<std::string>(config, histoNameFieldName);
+  const auto fileName = readJsonField<std::string>(config, fileNameFieldName, "");
+  const auto histoName = readJsonField<std::string>(config, histoNameFieldName, "");
   if (fileName.empty() || histoName.empty()) {
     return;
   }