From a621860f5983cdb10c5100203860f8262190d7cf Mon Sep 17 00:00:00 2001
From: gconesab <Gustavo.Conesa.Balbastre@cern.ch>
Date: Fri, 30 Jun 2017 16:45:11 +0200
Subject: [PATCH] new macro to generate pythia jet-jet/gamma-jet and dpmjet
 events (#38)

* fix doxygen filename

* new macro to generate pythia jet-jet/gamma-jet and dpmjet events
---
 .../PWGGA/Dpmjet_Pythia_GammaTriggerAndJet.C  | 77 +++++++++++++++++++
 .../PWGGA/Pythia_GammaTriggerAndJet.C         |  2 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 MC/CustomGenerators/PWGGA/Dpmjet_Pythia_GammaTriggerAndJet.C

diff --git a/MC/CustomGenerators/PWGGA/Dpmjet_Pythia_GammaTriggerAndJet.C b/MC/CustomGenerators/PWGGA/Dpmjet_Pythia_GammaTriggerAndJet.C
new file mode 100644
index 00000000..5df7990a
--- /dev/null
+++ b/MC/CustomGenerators/PWGGA/Dpmjet_Pythia_GammaTriggerAndJet.C
@@ -0,0 +1,77 @@
+///
+/// \file Dpmjet_Pythia_GammaTriggerAndJet.C
+/// \brief Configuration DPMjet plu a gamma-jet or jet-jet with/out decay gamma trigger
+///
+/// Generate PYTHIA8 or PYTHIA6 gamma-jet (kPyDirectGamma) or jet-jet (kPyJets), with or without 
+/// triggering the gamma in one of the calorimeter possible acceptances on top of a DPMjet event
+/// Options are:
+/// * process and trigger :
+///   * Pythia6Jets/Pythia8Jets: jet-jet events, kPyJets (optionally with jet axis restricted to some zone or not, preferred open)
+///   * Pythia6GammaJet/Pythia8GammaJet: gamma-jet events, kPyDirectGamma, with gamma restricted to a calorimeter acceptance.
+///   * Pythia6JetsTrg/Pythia8JetsGammaTrg: jet-jet events, kPyJets, with a decay gamma to a calorimeter acceptance above a given pT.
+///
+/// * acceptance of photon :
+///   * FullDetector: Minimal acceptance cuts
+///   * EMCRun1 : EMCal |eta| < 0.70,  80 < phi < 180
+///   * EMCRun2 : EMCal |eta| < 0.70,  80 < phi < 187
+///   * PHSRun1 : PHOS  |eta| < 0.13, 260 < phi < 320
+///   * PHSRun2 : PHOS  |eta| < 0.13, 250 < phi < 320
+///   * PHSDMC  : DCal+PHOS |eta| < 0.7, 250 < phi < 327
+  
+///
+/// Main configuration method 
+///
+AliGenerator * 
+GeneratorCustom
+(TString opt = "kFullDetector")
+{
+  // Init cocktail
+  AliGenCocktail *ctl   = GeneratorCocktail(Form("Dpmjet_%s",processConfig.Data()));
+  
+  //
+  // DPMjet
+  //
+  AliGenerator   *dpm   = GeneratorPhojet();
+  ctl->AddGenerator(dpm,  "Dpmjet", 1.);
+
+  //
+  // PYTHIA
+  //
+  // acceptance
+  Int_t acceptance = kCalorimeterAcceptance_FullDetector;
+  if (opt.EqualTo("FullDetector"))
+    acceptance = kCalorimeterAcceptance_FullDetector;
+  if (opt.EqualTo("EMCRun1"))
+    acceptance = kCalorimeterAcceptance_EMCRun1;
+  if (opt.EqualTo("PHSRun1"))
+    acceptance = kCalorimeterAcceptance_PHSRun1;
+  if (opt.EqualTo("EMCRun2"))
+    acceptance = kCalorimeterAcceptance_EMCRun2;
+  if (opt.EqualTo("PHSRun2"))
+    acceptance = kCalorimeterAcceptance_PHSRun2;
+  if (opt.EqualTo("PHSDMC"))
+    acceptance = kCalorimeterAcceptance_PHSDMC;
+    
+  // process
+  AliGenerator   *gammajet   = 0;
+
+  // PYTHIA6
+  if (processConfig.EqualTo("Pythia6Jets"))
+    gammajet = GeneratorPythia6Jets         (kPythia6Tune_Perugia2011, acceptance); 
+  if (processConfig.EqualTo("Pythia6GammaJet"))
+    gammajet = GeneratorPythia6GammaJet     (kPythia6Tune_Perugia2011, acceptance); 
+  if (processConfig.EqualTo("Pythia6JetsGammaTrg"))
+    gammajet = GeneratorPythia6JetsGammaTrg (kPythia6Tune_Perugia2011, acceptance); 
+  
+  // PYTHIA8
+  if (processConfig.EqualTo("Pythia8Jets"))
+    gammajet = GeneratorPythia8Jets         (kPythia8Tune_Monash2013 , acceptance); 
+  if (processConfig.EqualTo("Pythia8GammaJet"))
+    gammajet =  GeneratorPythia8GammaJet     (kPythia8Tune_Monash2013 , acceptance); 
+  if (processConfig.EqualTo("Pythia8JetsGammaTrg"))
+    gammajet = GeneratorPythia8JetsGammaTrg (kPythia8Tune_Monash2013 , acceptance); 
+  
+  ctl->AddGenerator(gammajet, processConfig, 1.);  
+  
+  return ctl;
+}
diff --git a/MC/CustomGenerators/PWGGA/Pythia_GammaTriggerAndJet.C b/MC/CustomGenerators/PWGGA/Pythia_GammaTriggerAndJet.C
index e2b41232..7ce022b3 100644
--- a/MC/CustomGenerators/PWGGA/Pythia_GammaTriggerAndJet.C
+++ b/MC/CustomGenerators/PWGGA/Pythia_GammaTriggerAndJet.C
@@ -1,5 +1,5 @@
 ///
-/// \file GeneratorGammaTriggerAndJet
+/// \file Pythia_GammaTriggerAndJet.C
 /// \brief Configuration of gamma-jet and jet-jet with/out decay gamma trigger
 ///
 /// Generate PYTHIA8 or PYTHIA6 gamma-jet (kPyDirectGamma) or jet-jet (kPyJets), with or without