Merge branch 'alisw:master' into master

alisw · Jul 25, 2024 · 974d70a · 974d70a
2 parents 3b3819d + 7c9560b
commit 974d70a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/MC/CustomGenerators/PWGGA/Hijing_Gamma002.C b/MC/CustomGenerators/PWGGA/Hijing_Gamma002.C
@@ -26,7 +26,7 @@ GeneratorCustom()
   }
 
   // PCM
-  TFormula* neutralsF  = new TFormula("neutrals",  "max(1.,470.*(x<5.)+62.*(x>7.5)*(x<12.5))");
+  TFormula* neutralsF  = new TFormula("neutrals",  "max(1.,306.*(x<5.)+62.*(x>7.5)*(x<12.5))");
   Int_t ntimes = 1;
   if ( isEmbedding )
   {
@@ -50,27 +50,5 @@ GeneratorCustom()
   ctl->AddGenerator(pi0d, "Injector (pi0d)", 1.);
   ctl->AddGenerator(etaa, "Injector (etaa)", 1.);
 
-  // EMCAL
-  AliGenerator   *pi0e = GeneratorInjector(1, 111, 0., 25., -0.7, 0.7, 80., 120.); // EMCal 1
-  AliGenerator   *pi0f = GeneratorInjector(1, 111, 0., 25., -0.7, 0.7, 120., 160.); // EMCal 2
-  AliGenerator   *pi0g = GeneratorInjector(1, 111, 0., 25., -0.7, 0.7, 160., 187.); // EMCal 3
-  AliGenerator   *pi0h = GeneratorInjector(1, 111, 0., 25., 0.22, 0.7, 260., 327.); // DCal one side PHOS
-  AliGenerator   *pi0i = GeneratorInjector(1, 111, 0., 25., -0.7, -0.22, 260., 327.); // DCal other side PHOS
-  AliGenerator   *etab = GeneratorInjector(1, 221, 0., 25.,  -0.7, 0.7, 80., 120.); // EMCal 1
-  AliGenerator   *etac = GeneratorInjector(1, 221, 0., 25.,  -0.7, 0.7, 120., 160); // EMCal 2
-  AliGenerator   *etad = GeneratorInjector(1, 221, 0., 25.,  -0.7, 0.7, 160., 187.); // EMCal 3
-  AliGenerator   *etae = GeneratorInjector(1, 221, 0., 25.,  0.22, 0.7, 260., 327.); // DCal one side PHOS
-  AliGenerator   *etaf = GeneratorInjector(1, 221, 0., 25., -0.7, -0.22, 260., 327.); // DCal other side PHOS
-  ctl->AddGenerator(pi0e, "Injector (pi0e)", 1.);
-  ctl->AddGenerator(pi0f, "Injector (pi0f)", 1.);
-  ctl->AddGenerator(pi0g, "Injector (pi0g)", 1.);
-  ctl->AddGenerator(pi0h, "Injector (pi0h)", 1.);
-  ctl->AddGenerator(pi0i, "Injector (pi0i)", 1.);
-  ctl->AddGenerator(etab, "Injector (etab)", 1.);
-  ctl->AddGenerator(etac, "Injector (etac)", 1.);
-  ctl->AddGenerator(etad, "Injector (etad)", 1.);
-  ctl->AddGenerator(etae, "Injector (etae)", 1.);
-  ctl->AddGenerator(etaf, "Injector (etaf)", 1.);
-
   return ctl;
 }
diff --git a/MC/CustomGenerators/PWGGA/Pythia8JJ_EtaPrime.C b/MC/CustomGenerators/PWGGA/Pythia8JJ_EtaPrime.C
@@ -3,9 +3,13 @@ AliGenerator* GeneratorCustom(TString opt = ""){
     // Pythia
     AliGenerator *gen    = GeneratorPythia8JetsParticleTrg(kPythia8Tune_Monash2013,kCalorimeterAcceptance_FullDetector,331,1.2);
 
-    // settings
-    ((AliGenPythia*) gen)->SetForceDecay(kEtaPrime);
-
+    // force decay: 
+    // eta prime -> pi plus pi minus eta    100%
+    // eta -> gamma gamma                   100%
+    (AliPythia8::Instance())->ReadString("331:onMode = off");
+    (AliPythia8::Instance())->ReadString("331:onIfMatch = 211 -211 221");
+    (AliPythia8::Instance())->ReadString("221:onMode = off");
+    (AliPythia8::Instance())->ReadString("221:onIfMatch = 22 22");
+
     return gen;
-
 }
diff --git a/MC/CustomGenerators/PWGLF/Hijing_Sexaquark.C b/MC/CustomGenerators/PWGLF/Hijing_Sexaquark.C
@@ -36,7 +36,7 @@ AliGenerator *GeneratorCustom(TString opt = "") {
 
     AliGenSexaquarkReaction *sr = new AliGenSexaquarkReaction(20, mass_sexaquark, reaction_channel);
     sr->SetPtRange(0., 5.);                // GeV/c
-    sr->SetPhiRange(0., 2 * TMath::Pi());  // radians
+    sr->SetPhiRange(0., 360.);  // degrees
     sr->SetYRange(-0.8, 0.8);
     sr->SetRadiusRange(5., 180.);  // cm