wrong #ifdef removed

[u/mrichter/AliRoot.git] / EPOS / TEpos.cxx

diff --git a/EPOS/TEpos.cxx b/EPOS/TEpos.cxx
index 7d6360051400392c507c721907f3058af2b4718c..e99391343e3f53be5873f94a3eafea19754af36b 100644 (file)
--- a/EPOS/TEpos.cxx
+++ b/EPOS/TEpos.cxx
@@ -21,12 +21,14 @@
 #include <TParticle.h>
 #include <TROOT.h>
 #include <TRandom.h>
+#include <TMath.h>
 #include <iostream>
 #include <fstream>
 #include <string>
 #include <vector>
 #include "eposproc.h"
 #include "EPOScommon.h"
+#include "AliGenEposIsajetToPdgConverter.h"
 #include "TEpos.h"
 
 using namespace std;
@@ -41,15 +43,44 @@ TEpos::TEpos()  : TGenerator("EPOS", "Epos event generator"),
                fBminim(0.0),
                fBmaxim(10000.0),
                fPhimin(0.0),
-               fPhimax(2*3.1415927),
+               fPhimax(TMath::TwoPi()),
                fEcms(-1),
                fSplitting(kFALSE),
                fNoDecays(),
-               fExtraInputLines()
+               fExtraInputLines(),
+               fIdConverter()
 {
+       fIdConverter=new AliGenEposIsajetToPdgConverter();
 }
 
-TEpos::~TEpos() {}
+TEpos::TEpos(const TEpos&)  : TGenerator("EPOS", "Epos event generator"),
+               fLaproj(0),
+               fMaproj(0),
+               fLatarg(0),
+               fMatarg(0),
+               fBminim(0.0),
+               fBmaxim(10000.0),
+               fPhimin(0.0),
+               fPhimax(TMath::TwoPi()),
+               fEcms(-1),
+               fSplitting(kFALSE),
+               fNoDecays(),
+               fExtraInputLines(),
+               fIdConverter()
+{
+       fIdConverter = new AliGenEposIsajetToPdgConverter();
+}
+
+TEpos::~TEpos() {
+       delete fIdConverter;
+}
+
+TEpos& TEpos::operator=(const TEpos&) {
+       if (!fIdConverter) {
+               fIdConverter = new AliGenEposIsajetToPdgConverter();
+       }
+       return *this;
+}
 
 void TEpos::Initialize() {
        Int_t nopeno = 0;
@@ -74,11 +105,11 @@ void TEpos::Initialize() {
                IniModel(appli.model);
        ebin.nrebin = 1;
        ainit();
+       aseed(2);
 }
 
 void TEpos::GenerateEvent() {
-       cseed.seedj = gRandom->Rndm() * 1e10;
-       aseed(2);
+//     cseed.seedj = gRandom->Rndm() * 1e10;
        Int_t n = 1;
        evgen(n);
 }
@@ -97,12 +128,8 @@ Int_t TEpos::ImportParticles(TClonesArray *particles, Option_t *) {
                        if (mother->GetFirstDaughter()==-1)
                                mother->SetFirstDaughter(iPart);
                }
-               TDatabasePDG *pdgDb = TDatabasePDG::Instance();
                Int_t status = cptl.istptl[iPart] + 1;
-               Int_t pdg = pdgDb->ConvertIsajetToPdg(cptl.idptl[iPart]);
-               if (pdg == 0) {
-                       printf("TEpos: Warning, unknown particle, index: %d, ISAJET: %d\n",iPart,cptl.idptl[iPart]);
-               }
+               Int_t pdg = fIdConverter->ConvertIsajetToPdg(cptl.idptl[iPart]);
                new((*particles)[iPart]) TParticle(pdg, status,
                                 tFather, -1, -1, -1,
                                 cptl.pptl[iPart][0], cptl.pptl[iPart][1],cptl.pptl[iPart][2],cptl.pptl[iPart][3],
@@ -127,12 +154,8 @@ TObjArray*  TEpos::ImportParticles(Option_t *) {
                        if (mother->GetFirstDaughter()==-1)
                                mother->SetFirstDaughter(iPart);
                }
-               TDatabasePDG *pdgDb = TDatabasePDG::Instance();
                Int_t status = cptl.istptl[iPart] + 1;
-               Int_t pdg = pdgDb->ConvertIsajetToPdg(cptl.idptl[iPart]);
-               if (pdg == 0) {
-                       printf("TEpos: Warning, unknown particle, index: %d, ISAJET: %d\n",iPart,cptl.idptl[iPart]);
-               }
+               Int_t pdg = fIdConverter->ConvertIsajetToPdg(cptl.idptl[iPart]);
                TParticle* p = new TParticle(pdg, status,
                                 tFather, -1, -1, -1,
                                 cptl.pptl[iPart][0], cptl.pptl[iPart][1],cptl.pptl[iPart][2],cptl.pptl[iPart][3],
@@ -155,7 +178,12 @@ void TEpos::AddExtraInputLine(const char *line) {
 void TEpos::GenerateInputFile() {
        ofstream file(GetInputFileName(), ios_base::out | ios_base::trunc);
        char epo[256];
-       strcpy(epo, getenv("ALICE_ROOT"));
+       char *epoEnv = getenv("EPO");
+       if (epoEnv) {
+               strcpy(epo, epoEnv);
+       } else {
+               strcpy(epo, getenv("ALICE_ROOT"));
+       }
        strcat(epo, "/EPOS/epos167");
 
        file << "fname pathnx " << epo << "/" << endl;
@@ -163,7 +191,7 @@ void TEpos::GenerateInputFile() {
        file << "fname copy none" << endl;
        file << "fname log none" << endl;
        file << "fname check none" << endl;
-       file << "fname data /tmp/epos.out" << endl;
+//     file << "fname data /tmp/epos.out" << endl;
        file << "fname initl " << epo << "/epos.initl" << endl;
        file << "fname inidi " << epo << "/epos.inidi" << endl;
        file << "fname inidr " << epo << "/epos.inidr" << endl;
@@ -187,6 +215,10 @@ void TEpos::GenerateInputFile() {
        file << "echo on" << endl;
 
 //     .optns file
+       int precision = file.precision();
+       file.precision(15);
+       file << "set seedj " << (gRandom->Rndm() * 1e14) << endl;
+       file.precision(precision);
        file << "application hadron" << endl;
        file << "set laproj " << fLaproj << endl;
        file << "set maproj " << fMaproj << endl;
@@ -210,9 +242,9 @@ void TEpos::GenerateInputFile() {
                file << fExtraInputLines[i] << endl;
        }
 
-    file << "output epos" << endl;
-    file << "record event nevt nptl b endrecord" << endl;
-    file << "record particle i id fa mo c1 c2 st endrecord" << endl;
+//    file << "output epos" << endl;
+//    file << "record event nevt nptl b endrecord" << endl;
+//    file << "record particle i id fa mo c1 c2 st endrecord" << endl;
 
        file << "input " << epo << "/epos.param" << endl;
        file << "runprogram" << endl;