update rapidity range settings (for b\bar{b} simulations in Muon Spectrometer)

ffionda · gconesab · commit f4ae7b552399 · 2021-07-05T12:21:55.000+02:00
diff --git a/MC/config/PWGHF/external/generator/GeneratorHF.C b/MC/config/PWGHF/external/generator/GeneratorHF.C
@@ -76,20 +76,20 @@ public:
   int findAncestor(Pythia8::Event& event) {
     for (int ipa = 0; ipa < event.size(); ++ipa) {
       auto daughterList = event[ipa].daughterList();
-      bool hasq = false, hasqbar = false, atmidy = false;
+      bool hasq = false, hasqbar = false, atSelectedY = false;
       for (auto ida : daughterList) {
 	if (event[ida].id() == mPDG) hasq = true;
 	if (event[ida].id() == -mPDG) hasqbar = true;
-	if (fabs(event[ida].y()) < mRapidity) atmidy = true;
+	if ( (event[ida].y() > mRapidityMin) && (event[ida].y() < mRapidityMax) ) atSelectedY = true;
       }
-      if (hasc && hascbar && atmidy)
+      if (hasq && hasqbar && atSelectedY)
 	return ipa;
     }
     return -1;
   };
   
-  int setPDG(int val) { mPDG = val; };
-  void setRapidity(double val) { mRapidity = val; };
+  void setPDG(int val) { mPDG = val; };
+  void setRapidity(double valMin, double valMax) { mRapidityMin = valMin; mRapidityMax = valMax; };
   void setVerbose(bool val) { mVerbose = val; };
   void setFormula(std::string val) { mFormula.Compile(val.c_str()); };
   
@@ -99,7 +99,8 @@ private:
   int mEvents = 1;
   Pythia8::Event mOutputEvent;
   int mPDG = 4;
-  double mRapidity = 1.5;
+  double mRapidityMin = -1.5;
+  double mRapidityMax = 1.5;
   bool mVerbose = false;
   
 };
@@ -109,37 +110,37 @@ private:
 /** generator instance and settings **/
 
 FairGenerator*
-GeneratorHF(double rapidity = 1.5, bool verbose = false)
+GeneratorHF(double rapidityMin = -1.5, double rapidityMax = 1.5, bool verbose = false)
 {
   auto gen = new o2::eventgen::GeneratorHF();
-  gen->setRapidity(rapidity);
+  gen->setRapidity(rapidityMin,rapidityMax);
   gen->setVerbose(verbose);
   gen->setFormula("max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.))");
   
   return gen;
 }
 
 FairGenerator*
-GeneratorHF_ccbar(double rapidity = 1.5, bool verbose = false)
+GeneratorHF_ccbar(double rapidityMin = -1.5, double rapidityMax = 1.5, bool verbose = false)
 {
   auto gen = new o2::eventgen::GeneratorHF();
   gen->setPDG(4);
-  gen->setRapidity(rapidity);
+  gen->setRapidity(rapidityMin,rapidityMax);
   gen->setVerbose(verbose);
   gen->setFormula("max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.))");
   
   return gen;
 }
 
 FairGenerator*
-GeneratorHF_bbbar(double rapidity = 1.5, bool verbose = false)
+GeneratorHF_bbbar(double rapidityMin = -1.5, double rapidityMax = 1.5, bool verbose = false)
 {
   auto gen = new o2::eventgen::GeneratorHF();
   gen->setPDG(5);
-  gen->setRapidity(rapidity);
+  gen->setRapidity(rapidityMin,rapidityMax);
   gen->setVerbose(verbose);
   gen->setFormula("max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.))");
-  
+
   return gen;
 }
 
diff --git a/MC/config/PWGHF/ini/GeneratorHF.ini b/MC/config/PWGHF/ini/GeneratorHF.ini
@@ -9,9 +9,9 @@ funcName = GeneratorHF()
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8.cfg
+config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
 hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
-hooksFuncName = pythia8_userhooks_ccbar(1.5)
+hooksFuncName = pythia8_userhooks_ccbar(-1.5,1.5)
 
 ### The setup uses the base configuration of the decayer which is loaded from the file specified by config[0].
 ### On top of the base configuration, two more sets of settings are loaded sequentially from config[1] and [2].
diff --git a/MC/config/PWGHF/ini/GeneratorHF_bbbar.ini b/MC/config/PWGHF/ini/GeneratorHF_bbbar.ini
@@ -3,15 +3,15 @@
 
 [GeneratorExternal]
 fileName = ${O2DPG_ROOT}/MC/config/PWGHF/external/generator/GeneratorHF.C
-funcName = GeneratorHF_bbar()
+funcName = GeneratorHF_bbbar()
 
 ### The external generator derives from GeneratorPythia8.
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8.cfg
+config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
 hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
-hooksFuncName = pythia8_userhooks_bbbar(1.5)
+hooksFuncName = pythia8_userhooks_bbbar(-1.5,1.5)
 
 ### The setup uses the base configuration of the decayer which is loaded from the file specified by config[0].
 ### On top of the base configuration, two more sets of settings are loaded sequentially from config[1] and [2].
diff --git a/MC/config/PWGHF/ini/GeneratorHF_ccbar.ini b/MC/config/PWGHF/ini/GeneratorHF_ccbar.ini
@@ -9,9 +9,9 @@ funcName = GeneratorHF_ccbar()
 ### This part configures the bits of the interface: configuration and user hooks
 
 [GeneratorPythia8]
-config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8.cfg
+config = ${O2DPG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
 hooksFileName = ${O2DPG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
-hooksFuncName = pythia8_userhooks_ccbar(1.5)
+hooksFuncName = pythia8_userhooks_ccbar(-1.5,1.5)
 
 ### The setup uses the base configuration of the decayer which is loaded from the file specified by config[0].
 ### On top of the base configuration, two more sets of settings are loaded sequentially from config[1] and [2].
diff --git a/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C b/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
@@ -18,43 +18,44 @@ class UserHooks_qqbar : public Pythia8::UserHooks
     // search for c-cbar mother with at least one c at midrapidity
     for (int ipa = 0; ipa < event.size(); ++ipa) {
       auto daughterList = event[ipa].daughterList();
-      bool hasc = false, hascbar = false, atmidy = false;
+      bool hasc = false, hascbar = false, atSelectedY = false;
       for (auto ida : daughterList) {
 	if (event[ida].id() == mPDG) hasc = true;
 	if (event[ida].id() == -mPDG) hascbar = true;
-	if (fabs(event[ida].y()) < mRapidity) atmidy = true;
+	if ( (event[ida].y() > mRapidityMin) && (event[ida].y() < mRapidityMax) ) atSelectedY = true;
       }
-      if (hasc && hascbar && atmidy)
+      if (hasc && hascbar && atSelectedY)
 	return false; // found it, do not veto event
     }
     return true; // did not find it, veto event
   };
 
   void setPDG(int val) { mPDG = val; };
-  void setRapidity(double val) { mRapidity = val; };
+  void setRapidity(double valMin, double valMax) { mRapidityMin = valMin; mRapidityMax = valMax; };
   
 private:
 
   int mPDG = 4;
-  double mRapidity = 1.5;
+  double mRapidityMin = -1.5;
+  double mRapidityMax = 1.5;
   
 };
 
 Pythia8::UserHooks*
-  pythia8_userhooks_ccbar(double rapidity = 1.5)
+  pythia8_userhooks_ccbar(double rapidityMin = -1.5, double rapidityMax=1.5)
 {
   auto hooks = new UserHooks_qqbar();
   hooks->setPDG(4);
-  hooks->setRapidity(rapidity);
+  hooks->setRapidity(rapidityMin,rapidityMax);
   return hooks;
 }
 
 Pythia8::UserHooks*
-  pythia8_userhooks_bbbar(double rapidity = 1.5)
+  pythia8_userhooks_bbbar(double rapidityMin = -1.5, double rapidityMax = 1.5)
 {
   auto hooks = new UserHooks_qqbar();
   hooks->setPDG(5);
-  hooks->setRapidity(rapidity);
+  hooks->setRapidity(rapidityMin,rapidityMax);
   return hooks;
 }
 
diff --git a/MC/config/common/pythia8/decayer/base.cfg b/MC/config/common/pythia8/decayer/base.cfg
@@ -32,3 +32,6 @@ Init:showChangedParticleData off
 4232:mayDecay off	# Xi_c+
 4332:mayDecay off	# Omega_c0
 5122:mayDecay off	# Lambda_b0
+5132:mayDecay off	# Xi_b-
+5232:mayDecay off	# Xi_b0
+5332:mayDecay off	# Omega_b-
