X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FConfig.C;h=89e0853231a8b90edccf2780e46e540f5cf193fa;hb=f2dc6b203dafff1d59db7ad6693f83c1924e6d65;hp=50d38119ac0992c1c69417ea5d105087b78d08e0;hpb=d19030edcf49652b8a2f286cb0130348ecb69ae6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/Config.C b/EMCAL/Config.C
index 50d38119ac0..89e0853231a 100644
--- a/EMCAL/Config.C
+++ b/EMCAL/Config.C
@@ -8,7 +8,9 @@ enum PprRun_t
     kHijing_gj25,  kHijing_gj50, kHijing_gj75, kHijing_gj100, kHijing_gj125, 
     kJetPlusBg,    kGammaPlusBg, 
     kParam_8000_Ecal, kParam_4000_Ecal, 
-    kJets_100,
+    kJets_50,       kJets_75,      kJets_100,      kJets_200,
+    kGammaJets_50,  kGammaJets_75, kGammaJets_100, kGammaJets_200,
+    kGammaJets_250, kGammaJets_300,
     kGammaGun, kGammaBox
 };
 
@@ -23,10 +25,18 @@ enum PprRad_t
 };
 
 // This part for configuration    
-//static PprRun_t run = kParam_8000_Ecal;
-static PprRun_t run = kHijing_jj100;
-static PprGeo_t geo = kHoles;
-static PprRad_t rad = kGluonRadiation;
+static PprRun_t run          = kHijing_jj75;
+//static PprRun_t run = kJets_100;
+static PprGeo_t geo          = kHoles;
+static PprRad_t rad          = kGluonRadiation;
+static Int_t    eventsPerRun = 100;
+static Int_t    simpleJet    = 1;
+if (rad == kGluonRadiation) 
+{
+    simpleJet = 0;
+}
+
+
 // Comment line 
 static TString  comment;
 
@@ -104,6 +114,7 @@ void Config()
     gAlice->SetDebug(1);
 
     AliGenerator*  gener = GeneratorFactory(run);
+    gener->SetPtRange(0.,1.e10);
     gener->Init();
     gener->SetTrackingFlag(1);
     
@@ -465,7 +476,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	gener->SetMomentum(100.);
 	gener->SetPhi(240.);
 	gener->SetTheta(91.);
-	gener->SetPart(kElectron);
+	gener->SetPart(kGamma);
      break;
 
     case kGammaBox:
@@ -473,7 +484,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	gener->SetMomentumRange(100., 100.1);
 	gener->SetPhiRange(0,360);
 	gener->SetThetaRange(45., 135.);
-	gener->SetPart(kElectron);
+	gener->SetPart(kGamma);
 	break;
 	
     case kTest50:
@@ -598,7 +609,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(1);
 	gener->SetPtJet(25.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -612,7 +623,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(1);
 	gener->SetPtJet(50.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -626,7 +637,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(1);
 	gener->SetPtJet(75.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -636,11 +647,11 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	//coment= comment.Append("HIJING Jet 100 GeV");
 	AliGenHijing *gener = HijingStandard();
 // impact parameter range
-	gener->SetImpactParameterRange(10., 10.1);
+	gener->SetImpactParameterRange(0., 5.);
 	// trigger
 	gener->SetTrigger(1);
 	gener->SetPtJet(100.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -654,7 +665,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(1);
 	gener->SetPtJet(125.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -670,7 +681,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(2);
 	gener->SetPtJet(25.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -684,7 +695,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(2);
 	gener->SetPtJet(50.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -698,7 +709,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(2);
 	gener->SetPtJet(75.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -712,7 +723,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(2);
 	gener->SetPtJet(100.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -726,7 +737,7 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	// trigger
 	gener->SetTrigger(2);
 	gener->SetPtJet(125.);
-	gener->SetSimpleJets(1);
+	gener->SetSimpleJets(simpleJet);
 	gener->SetRadiation(isw);
 	gener->SetJetEtaRange(-0.3,0.3);
 	gener->SetJetPhiRange(15.,105.);   
@@ -810,10 +821,100 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
 	gener->AddGenerator(bg,"Underlying Event", 1);
 
 	break;
+    case kJets_50:
+//  50 GeV Jets
+        AliGenPythia *gener = PythiaJets(50.);
+        break; 
+    case kJets_75:
+//  75 GeV Jets
+        AliGenPythia *gener = PythiaJets(75.);
+        break; 
     case kJets_100:
 //  100 GeV Jets  
 	AliGenPythia *gener = PythiaJets(100.);
-	break;
+	break; 
+    case kJets_200:
+//  200 GeV Jets
+        AliGenPythia *gener = PythiaJets(200.);
+        break;
+    case kGammaJets_50:
+//  50 GeV Jets + Gamma
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(50.,50.001);
+        gener->SetForceDecay(kAll);
+        break;
+    case kGammaJets_75:
+//  75 GeV Jets + Gamma 
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(75.,75.001);
+        gener->SetForceDecay(kAll);
+        break; 
+    case kGammaJets_100:
+// 100 GeV Jets + Gamma
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(100.,100.001);
+        gener->SetForceDecay(kAll);
+        break; 
+    case kGammaJets_200:
+//  200 GeV Jets + Gamma
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(200.,200.001);
+        gener->SetForceDecay(kAll);
+        break; 
+    case kGammaJets_250:
+//  250 GeV Jets + Gamma
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(250.,250.001);
+        gener->SetForceDecay(kAll);
+        break; 
+    case kGammaJets_300:
+//  300 GeV Jets + Gamma
+        AliGenPythia *gener = PythiaJets(-1);
+        gener->SetEnergyCMS(5500.);
+        gener->SetProcess(kPyDirectGamma);
+        gener->SetJetEtaRange(-0.3,+0.3);
+        gener->SetJetPhiRange(15.,105.);
+        gener->SetGammaEtaRange(-0.12, 0.12);
+        gener->SetGammaPhiRange(220., 320.);
+        gener->SetStrucFunc(kGRV_LO_98);
+        gener->SetPtHard(300.,300.001);
+        gener->SetForceDecay(kAll);
+        break;
     }
 
     return gener;