Apply other minor fixes

Author: fgrosa

MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_PbPb_replaced.ini

@@ -1,3 +1,4 @@
+#NEV_TEST> 10
 ### The external generator derives from GeneratorPythia8.
 [GeneratorExternal]
 fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator/generator_pythia8_embed_hf.C

MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap5_DResoTrigger.ini

@@ -1,4 +1,4 @@
-#NEV_TEST> 20
+#NEV_TEST> 40
 ### The external generator derives from GeneratorPythia8.
 [GeneratorExternal]
 fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator/generator_pythia8_gaptriggered_hf.C

MC/config/PWGHF/ini/GeneratorHF_D2H_ccbar_and_bbbar_gap5_Mode2_corrBkgSigmaC.ini

@@ -1,4 +1,4 @@
-#NEV_TEST> 20
+#NEV_TEST> 40
 ### The external generator derives from GeneratorPythia8.
 [GeneratorExternal]
 fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/external/generator/generator_pythia8_gaptriggered_hf.C

MC/config/PWGHF/ini/tests/GeneratorHFTrigger_Bforced.C

@@ -92,7 +92,7 @@ int External()
 
     float fracForcedDecays = nSignals ? float(nSignalGoodDecay) / nSignals : 0.0f;
     float uncFracForcedDecays = nSignals ? std::sqrt(fracForcedDecays * (1 - fracForcedDecays) / nSignals) : 1.0f;
-    if (1 - fracForcedDecays > 0.15 + uncFracForcedDecays) // we put some tolerance (e.g. due to oscillations which might change the final state)
+    if (1 - fracForcedDecays > 0.3 + uncFracForcedDecays) // we put some tolerance (e.g. due to oscillations which might change the final state)
     {
         std::cerr << "Fraction of signals decaying into the correct channel " << fracForcedDecays << " lower than expected\n";
         return 1;

MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_PbPb_replaced.C

@@ -198,7 +198,7 @@ int External() {
     for (int iRepl{0}; iRepl<6; ++iRepl) {
         float numPart = sumOrigReplacedParticles[pdgReplParticles[iRepl][0]];
         float fracMeas = numPart ? float(pdgReplPartCounters[iRepl][1]) / numPart : 0.0f;
-        float fracMeasUnc = (numPart > 0 && fracMeas > 0) ? std::sqrt(fracMeas * (1 - fracMeas) / numPart) : 1.0f;
+        float fracMeasUnc = fracMeas ? std::sqrt(pdgReplPartCounters[iRepl][1]) / numPart : 1.0f;
 
         if (std::abs(fracMeas - freqRepl[iRepl]) > fracMeasUnc) {
             std::cerr << "Fraction of replaced " << pdgReplParticles[iRepl][0] << " into " << pdgReplParticles[iRepl][1] << " is " << fracMeas <<" (expected "<< freqRepl[iRepl] << ")\n";

MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap5_DResoTrigger.C

@@ -134,7 +134,7 @@ int External() {
     for (int iRepl{0}; iRepl<6; ++iRepl) {
         float numPart = sumOrigReplacedParticles[pdgReplParticles[iRepl][0]];
         float fracMeas = numPart ? float(pdgReplPartCounters[iRepl][1]) / numPart : 0.0f;
-        float fracMeasUnc = (numPart > 0 && fracMeas > 0) ? std::sqrt(fracMeas * (1 - fracMeas) / numPart) : 1.0f;
+        float fracMeasUnc = fracMeas ? std::sqrt(pdgReplPartCounters[iRepl][1]) / numPart : 1.0f;
 
         if (std::abs(fracMeas - freqRepl[iRepl]) > fracMeasUnc) {
             std::cerr << "Fraction of replaced " << pdgReplParticles[iRepl][0] << " into " << pdgReplParticles[iRepl][1] << " is " << fracMeas <<" (expected "<< freqRepl[iRepl] << ")\n";

MC/config/PWGHF/ini/tests/GeneratorHF_D2H_ccbar_and_bbbar_gap5_Mode2_corrBkgSigmaC.C

@@ -210,7 +210,7 @@ int External() {
     for (int iRepl{0}; iRepl < 3; ++iRepl) {
         float numPart = sumOrigReplacedParticles[pdgReplParticles[iRepl][0]];
         float fracMeas = numPart ? float(pdgReplPartCounters[iRepl][1]) / numPart : 0.0f;
-        float fracMeasUnc = (numPart > 0 && fracMeas > 0) ? std::sqrt(fracMeas * (1 - fracMeas) / numPart) : 1.0f;
+        float fracMeasUnc = fracMeas ? std::sqrt(pdgReplPartCounters[iRepl][1]) / numPart : 1.0f;
 
         if (std::abs(fracMeas - freqRepl[iRepl]) > fracMeasUnc) {
             std::cerr << "Fraction of replaced " << pdgReplParticles[iRepl][0] << " into " << pdgReplParticles[iRepl][1] << " is " << fracMeas <<" (expected "<< freqRepl[iRepl] << ")\n";