From 3f7a17bb0cd0e255d7755706c00999bd9e676f2d Mon Sep 17 00:00:00 2001
From: hristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 13 Feb 2004 14:09:06 +0000
Subject: [PATCH] Rename to AliESDComparison.C (Yu.Belikov)

---
 EVGEN/TestPrimaries.C                         |  3 +-
 ...{AliESDcomparison.C => AliESDComparison.C} |  5 ++-
 TOF/AliTOFComparison.C                        |  4 ++
 build/Makefile.icc                            |  4 +-
 macros/ConfigPPR.C                            | 41 ++++++++++++++++++-
 5 files changed, 51 insertions(+), 6 deletions(-)
 rename STEER/{AliESDcomparison.C => AliESDComparison.C} (97%)

diff --git a/EVGEN/TestPrimaries.C b/EVGEN/TestPrimaries.C
index 0e6689711ea..be9ad1e7d69 100644
--- a/EVGEN/TestPrimaries.C
+++ b/EVGEN/TestPrimaries.C
@@ -60,7 +60,8 @@ void TestPrimaries(Int_t evNumber1=0, Int_t evNumber2=0)
 	    Float_t eta   = -TMath::Log(TMath::Tan(theta/2.));
 	    Float_t y     = 0.5*TMath::Log((E+Pz+1.e-13)/(E-Pz+1.e-13));
 	    
-	    if (child1 >= 0) continue;
+	    //	    if (child1 >= 0) continue;
+	    if (mother > 0) continue;
 	    if (DataBase->GetParticle(mpart)->Charge() == 0) continue;
 	    Float_t wgt = 1./(Float_t ((evNumber2-evNumber1)+1.));
 	    thetaH->Fill(theta*180./TMath::Pi(),wgt);
diff --git a/STEER/AliESDcomparison.C b/STEER/AliESDComparison.C
similarity index 97%
rename from STEER/AliESDcomparison.C
rename to STEER/AliESDComparison.C
index aed736a34bb..f0a59f6a185 100644
--- a/STEER/AliESDcomparison.C
+++ b/STEER/AliESDComparison.C
@@ -26,7 +26,7 @@
 extern AliRun *gAlice;
 extern TROOT *gROOT;
 
-Int_t AliESDcomparison(const Char_t *dir=".") { 
+Int_t AliESDComparison(const Char_t *dir=".") { 
    Double_t pi=0.2,pa=2;
 
    TH2F *tpcHist=(TH2F*)gROOT->FindObject("tpcHist");
@@ -227,6 +227,9 @@ Int_t AliESDcomparison(const Char_t *dir=".") {
    prFake->Draw("same");
 
    ef->Close();
+   TFile fc("AliESDComparison.root","RECREATE");
+   c1->Write();
+   fc.Close();
 
    delete rl;
 
diff --git a/TOF/AliTOFComparison.C b/TOF/AliTOFComparison.C
index dce18904c95..0ba60c9467a 100644
--- a/TOF/AliTOFComparison.C
+++ b/TOF/AliTOFComparison.C
@@ -245,6 +245,10 @@ Int_t AliTOFComparison() {
      break;
    }
 
+   TFile fc("AliTOFComparison.root","RECREATE");
+   c1->Write();
+   fc.Close();
+
    return 0;
 }
 
diff --git a/build/Makefile.icc b/build/Makefile.icc
index fe05d8f1451..54fecb084ba 100644
--- a/build/Makefile.icc
+++ b/build/Makefile.icc
@@ -2,7 +2,7 @@ PLATFORM:=linuxicc
 
 # The compilers
 CXX           = icc 
-F77	      = ifc
+F77	      = ifort
 CC	      = icc
 
 # Global optimisation
@@ -52,7 +52,7 @@ GLIBS         = $(LIBNOVER)
 #System libraries
 SYSLIBS =
 
-EXEFLAGS+= -L/usr/local/lib -lXt -lCEPCF90 -lF90 -lPEPCF90 -lintrins
+EXEFLAGS+= -L/usr/local/lib -lXt -L/opt/intel_fc_80/lib -lifport -lifcore
 
 
 
diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index d2cd9e85d5f..bdac0d367c8 100644
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -55,7 +55,22 @@ enum PprRun_t
     kHijing_jj25,  kHijing_jj50, kHijing_jj75, kHijing_jj100, kHijing_jj200, 
     kHijing_gj25,  kHijing_gj50, kHijing_gj75, kHijing_gj100, kHijing_gj200,
     kHijing_pA, kPythia6, kPythia6Jets, kD0PbPb5500, kD_TRD, kB_TRD, kJpsi_TRD,
-    kU_TRD, kPyJJ, kPyGJ
+    kU_TRD, kPyJJ, kPyGJ, kRunMax
+};
+
+const char* pprRunName[kRunMax] = {
+    "test50",
+    "kParam_8000",   "kParam_4000",  "kParam_2000", 
+    "kHijing_cent1", "kHijing_cent2", 
+    "kHijing_per1",  "kHijing_per2", "kHijing_per3", "kHijing_per4",  
+    "kHijing_per5",
+    "kHijing_jj25",  "kHijing_jj50", "kHijing_jj75", "kHijing_jj100", 
+    "kHijing_jj200", 
+    "kHijing_gj25",  "kHijing_gj50", "kHijing_gj75", "kHijing_gj100", 
+    "kHijing_gj200",
+    "kHijing_pA", "kPythia6", "kPythia6Jets", "kD0PbPb5500", "kD_TRD", 
+    "kB_TRD", "kJpsi_TRD",
+    "kU_TRD", "kPyJJ", "kPyGJ"
 };
 
 enum PprGeo_t 
@@ -80,6 +95,7 @@ static PprRun_t srun = kPythia6;
 static PprGeo_t sgeo = kHoles;
 static PprRad_t srad = kGluonRadiation;
 static PprMag_t smag = k5kG;
+static Int_t    sseed = 12345; //Set 0 to use the current time
 
 // Comment line 
 static TString  comment;
@@ -88,14 +104,18 @@ static TString  comment;
 Float_t EtaToTheta(Float_t arg);
 AliGenerator* GeneratorFactory(PprRun_t srun);
 AliGenHijing* HijingStandard();
+void ProcessEnvironmentVars();
 
 void Config()
 {
     // ThetaRange is (0., 180.). It was (0.28,179.72) 7/12/00 09:00
     // Theta range given through pseudorapidity limits 22/6/2001
 
+    // Get settings from environment variables
+    ProcessEnvironmentVars();
+
     // Set Random Number seed
-  gRandom->SetSeed(12345); //Set 0 to use the current time
+    gRandom->SetSeed(sseed);
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
@@ -946,6 +966,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
 	gGener=gener;
       }
       break;
+    default: break;
     }
     return gGener;
 }
@@ -976,4 +997,20 @@ AliGenHijing* HijingStandard()
 }
 
 
+void ProcessEnvironmentVars()
+{
+    // Run type
+    if (gSystem->Getenv("CONFIG_RUN_TYPE")) {
+      for (Int_t iRun = 0; iRun < kRunMax; iRun++) {
+	if (strcmp(gSystem->Getenv("CONFIG_RUN_TYPE"), pprRunName[iRun])==0) {
+	  srun = (PprRun_t)iRun;
+	  cout<<"Run type set to "<<pprRunName[iRun]<<endl;
+	}
+      }
+    }
 
+    // Random Number seed
+    if (gSystem->Getenv("CONFIG_SEED")) {
+      sseed = atoi(gSystem->Getenv("CONFIG_SEED"));
+    }
+}
-- 
2.39.3