From: cvetan Date: Fri, 25 Jul 2008 12:12:04 +0000 (+0000) Subject: Filling the GRP entry inside ALiSimulation. Can be swtiched off/on via SetWriteGRPEnt... X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=fc7e1b1c2cd284f8bc092d58ebb422f69892289e;hp=fcaff63d9152ca65644d54674f5c33061d1a861e Filling the GRP entry inside ALiSimulation. Can be swtiched off/on via SetWriteGRPEntry() method. All the information filled in the GRP is taken directly from the objects (generator,field,detector list etc) in gAlice. To be extended if needed by filling luminocity/intensity in case of pileup simulations. For the moment the cocktail,box,cosmic generators will produce an unknown beam energy and type. --- diff --git a/EVGEN/AliGenMC.h b/EVGEN/AliGenMC.h index f537cf334f1..da4af9244b4 100644 --- a/EVGEN/AliGenMC.h +++ b/EVGEN/AliGenMC.h @@ -60,6 +60,12 @@ class AliGenMC : public AliGenerator virtual void SetCrossingAngle(Float_t phiX, Float_t phiY) {fXingAngleX = phiX; fXingAngleY = phiY;} virtual void Boost(); virtual void AddHeader(AliGenEventHeader* header); + virtual void GetProjectile(TString& tar, Int_t& a, Int_t& z) const + {tar = fProjectile; a = fAProjectile; z = fZProjectile;} + virtual void GetTarget(TString& tar, Int_t& a, Int_t& z) const + {tar = fTarget; a = fATarget; z = fZTarget;} + virtual Float_t GetEnergyCMS() const {return fEnergyCMS;} + protected: // check if particle is selected as parent particle Bool_t ParentSelected(Int_t ip) const; @@ -99,12 +105,12 @@ class AliGenMC : public AliGenerator Int_t fPdgCodeParticleforAcceptanceCut; // Abs(PDG Code) of the particle to which the GeometryAcceptance must be applied Int_t fNumberOfAcceptedParticles; // Number of accepted particles in GeometryAcceptance with the right Abs(PdgCode) Int_t fNprimaries; // Number of produced and stored particles - + Float_t fEnergyCMS; //Centre of mass energy private: AliGenMC(const AliGenMC &MC); AliGenMC & operator=(const AliGenMC & rhs); - ClassDef(AliGenMC,5) // AliGenerator implementation for generators using MC methods + ClassDef(AliGenMC,6) // AliGenerator implementation for generators using MC methods }; #endif diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx index 97159fcb492..89872b79fcd 100644 --- a/PYTHIA6/AliGenPythia.cxx +++ b/PYTHIA6/AliGenPythia.cxx @@ -51,7 +51,6 @@ AliGenPythia::AliGenPythia(): AliGenMC(), fProcess(kPyCharm), fStrucFunc(kCTEQ5L), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fTrialsRun(0), @@ -131,6 +130,7 @@ AliGenPythia::AliGenPythia(): { // Default Constructor + SetEnergyCMS(5500.); SetNuclei(0,0); if (!AliPythiaRndm::GetPythiaRandom()) AliPythiaRndm::SetPythiaRandom(GetRandom()); @@ -140,7 +140,6 @@ AliGenPythia::AliGenPythia(Int_t npart) :AliGenMC(npart), fProcess(kPyCharm), fStrucFunc(kCTEQ5L), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fTrialsRun(0), @@ -222,6 +221,7 @@ AliGenPythia::AliGenPythia(Int_t npart) // semimuonic decay // structure function GRVHO // + SetEnergyCMS(5500.); fName = "Pythia"; fTitle= "Particle Generator using PYTHIA"; SetForceDecay(); diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h index 41e08c5f3c1..26d0782dc2f 100644 --- a/PYTHIA6/AliGenPythia.h +++ b/PYTHIA6/AliGenPythia.h @@ -158,7 +158,6 @@ class AliGenPythia : public AliGenMC virtual StrucFunc_t GetStrucFunc() const {return fStrucFunc;} virtual void GetPtHard(Float_t& ptmin, Float_t& ptmax) const {ptmin = fPtHardMin; ptmax = fPtHardMax;} - virtual Float_t GetEnergyCMS() const {return fEnergyCMS;} virtual void GetNuclei(Int_t& a1, Int_t& a2) const {a1 = fAProjectile; a2 = fATarget;} virtual void GetJetEtRange(Float_t& etamin, Float_t& etamax) const @@ -187,7 +186,6 @@ class AliGenPythia : public AliGenMC void GeneratePileup(); Process_t fProcess; //Process type StrucFunc_t fStrucFunc; //Structure Function - Float_t fEnergyCMS; //Centre of mass energy Float_t fKineBias; //!Bias from kinematic selection Int_t fTrials; //!Number of trials for current event Int_t fTrialsRun; //!Number of trials for run @@ -283,7 +281,7 @@ class AliGenPythia : public AliGenMC AliGenPythia(const AliGenPythia &Pythia); AliGenPythia & operator=(const AliGenPythia & rhs); - ClassDef(AliGenPythia,7) // AliGenerator interface to Pythia + ClassDef(AliGenPythia,8) // AliGenerator interface to Pythia }; #endif diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx index 90e275e0579..dcecd7b4261 100644 --- a/PYTHIA6/AliGenPythiaPlus.cxx +++ b/PYTHIA6/AliGenPythiaPlus.cxx @@ -52,7 +52,6 @@ AliGenPythiaPlus::AliGenPythiaPlus(): fPythia(0), fProcess(kPyCharm), fStrucFunc(kCTEQ5L), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fTrialsRun(0), @@ -129,6 +128,7 @@ AliGenPythiaPlus::AliGenPythiaPlus(): { // Default Constructor + SetEnergyCMS(5500.); SetNuclei(0,0); if (!AliPythiaRndm::GetPythiaRandom()) AliPythiaRndm::SetPythiaRandom(GetRandom()); @@ -139,7 +139,6 @@ AliGenPythiaPlus::AliGenPythiaPlus(AliPythiaBase* pythia) fPythia(pythia), fProcess(kPyCharm), fStrucFunc(kCTEQ5L), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fTrialsRun(0), @@ -218,6 +217,7 @@ AliGenPythiaPlus::AliGenPythiaPlus(AliPythiaBase* pythia) // semimuonic decay // structure function GRVHO // + SetEnergyCMS(5500.); fName = "Pythia"; fTitle= "Particle Generator using PYTHIA"; SetForceDecay(); diff --git a/PYTHIA6/AliGenPythiaPlus.h b/PYTHIA6/AliGenPythiaPlus.h index 366e96bd7c1..44d79c4eb8c 100644 --- a/PYTHIA6/AliGenPythiaPlus.h +++ b/PYTHIA6/AliGenPythiaPlus.h @@ -153,7 +153,6 @@ class AliGenPythiaPlus : public AliGenMC virtual StrucFunc_t GetStrucFunc() const {return fStrucFunc;} virtual void GetPtHard(Float_t& ptmin, Float_t& ptmax) const {ptmin = fPtHardMin; ptmax = fPtHardMax;} - virtual Float_t GetEnergyCMS() const {return fEnergyCMS;} virtual void GetNuclei(Int_t& a1, Int_t& a2) const {a1 = fAProjectile; a2 = fATarget;} virtual void GetJetEtRange(Float_t& etamin, Float_t& etamax) const @@ -183,7 +182,6 @@ class AliGenPythiaPlus : public AliGenMC AliPythiaBase *fPythia; //!Pythia Process_t fProcess; //Process type StrucFunc_t fStrucFunc; //Structure Function - Float_t fEnergyCMS; //Centre of mass energy Float_t fKineBias; //!Bias from kinematic selection Int_t fTrials; //!Number of trials for current event Int_t fTrialsRun; //!Number of trials for run @@ -276,7 +274,7 @@ class AliGenPythiaPlus : public AliGenMC AliGenPythiaPlus(const AliGenPythiaPlus &Pythia); AliGenPythiaPlus & operator=(const AliGenPythiaPlus & rhs); - ClassDef(AliGenPythiaPlus, 1) // AliGenerator interface to Pythia + ClassDef(AliGenPythiaPlus, 2) // AliGenerator interface to Pythia }; #endif diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx index 0887a7bb363..1f51211aed2 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -110,6 +110,7 @@ #include #include #include +#include #include "AliCodeTimer.h" #include "AliCDBStorage.h" @@ -140,6 +141,8 @@ #include "AliHLTSimulation.h" #include "AliQADataMakerSteer.h" #include "AliSysInfo.h" +#include "AliGenMC.h" +#include "AliMagF.h" ClassImp(AliSimulation) @@ -184,7 +187,8 @@ AliSimulation::AliSimulation(const char* configFileName, fQADetectors("ALL"), fQATasks("ALL"), fRunQA(kTRUE), - fRunHLT("default") + fRunHLT("default"), + fWriteGRPEntry(kTRUE) { // create simulation object with default parameters fgInstance = this; @@ -232,7 +236,8 @@ AliSimulation::AliSimulation(const AliSimulation& sim) : fQADetectors(sim.fQADetectors), fQATasks(sim.fQATasks), fRunQA(sim.fRunQA), - fRunHLT(sim.fRunHLT) + fRunHLT(sim.fRunHLT), + fWriteGRPEntry(sim.fWriteGRPEntry) { // copy constructor @@ -884,6 +889,11 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) "Check your config file: %s", fConfigFileName.Data())); return kFALSE; } + + // Write GRP entry corresponding to the setting found in Cofig.C + if (fWriteGRPEntry) + WriteGRPEntry(); + if (nEvents <= 0) nEvents = fNEvents; // get vertex from background file in case of merging @@ -1862,4 +1872,93 @@ void AliSimulation::ProcessEnvironmentVars() AliInfo(Form("Run number = %d", fRun)); } +//_____________________________________________________________________________ +void AliSimulation::WriteGRPEntry() +{ + // Get the necessary information from galice (generator, trigger etc) and + // write a GRP entry corresponding to the settings in the Config.C used + AliInfo("Writing global run parameters entry into the OCDB"); + + TMap *grpMap = new TMap(); + grpMap->SetName("MONTECARLO"); + + grpMap->Add(new TObjString("fRunType"),new TObjString("PHYSICS")); + grpMap->Add(new TObjString("fAliceStartTime"),new TObjString("0")); + grpMap->Add(new TObjString("fAliceStopTime"),new TObjString("9999")); + + AliGenMC *gen = dynamic_cast(gAlice->Generator()); + if (gen) { + grpMap->Add(new TObjString("fAliceBeamEnergy"),new TObjString(Form("%f",gen->GetEnergyCMS()))); + TString projectile; + Int_t a,z; + gen->GetProjectile(projectile,a,z); + TString target; + gen->GetTarget(target,a,z); + TString beamType = projectile + "-" + target; + grpMap->Add(new TObjString("fAliceBeamType"),new TObjString(beamType.Data())); + } + else { + AliWarning("Unknown beam type and energy!"); + grpMap->Add(new TObjString("fAliceBeamEnergy"),new TObjString("UNKNOWN")); + grpMap->Add(new TObjString("fAliceBeamType"),new TObjString("UNKNOWN")); + } + + UInt_t detectorPattern = 0; + Int_t nDets = 0; + TObjArray *detArray = gAlice->Detectors(); + for (Int_t iDet = 0; iDet < AliDAQ::kNDetectors-1; iDet++) { + if (detArray->FindObject(AliDAQ::OfflineModuleName(iDet))) { + detectorPattern |= (1 << iDet); + nDets++; + } + } + // HLT + if (!fRunHLT.IsNull()) + detectorPattern |= (1 << AliDAQ::kHLTId); + grpMap->Add(new TObjString("fNumberOfDetectors"),new TObjString(Form("%d",nDets))); + grpMap->Add(new TObjString("fDetectorMask"),new TObjString(Form("%u",detectorPattern))); + + grpMap->Add(new TObjString("fLHCPeriod"),new TObjString("LHC08c")); + + grpMap->Add(new TObjString("fLHCState"),new TObjString("STABLE BEAMS")); + grpMap->Add(new TObjString("fLHCCondition"),new TObjString("0")); + grpMap->Add(new TObjString("fLHCLuminosity"),new TObjString("0")); + grpMap->Add(new TObjString("fBeamIntensity"),new TObjString("0")); + + AliMagF *field = gAlice->Field(); + Float_t solenoidField = TMath::Abs(field->SolenoidField()); + Float_t factor = field->Factor(); + Float_t l3current = TMath::Abs(factor)*solenoidField*30000./5.; + grpMap->Add(new TObjString("fL3Current"),new TObjString(Form("%f",l3current))); + + if (factor > 0) { + grpMap->Add(new TObjString("fL3Polarity"),new TObjString("0")); + grpMap->Add(new TObjString("fDipolePolarity"),new TObjString("0")); + } + else { + grpMap->Add(new TObjString("fL3Polarity"),new TObjString("1")); + grpMap->Add(new TObjString("fDipolePolarity"),new TObjString("1")); + } + + if (TMath::Abs(factor) != 0) + grpMap->Add(new TObjString("fDipoleCurrent"),new TObjString("6000")); + else + grpMap->Add(new TObjString("fDipoleCurrent"),new TObjString("0")); + + grpMap->Add(new TObjString("fCavernTemperature"),new TObjString("0")); + grpMap->Add(new TObjString("fCavernPressure"),new TObjString("0")); + + // Now store the entry in OCDB + AliCDBManager* man = AliCDBManager::Instance(); + + AliCDBId id("GRP/GRP/Data", man->GetRun(), man->GetRun()); + AliCDBMetaData *metadata= new AliCDBMetaData(); + + // Get root version + const char* rootv = gROOT->GetVersion(); + metadata->SetResponsible("alice-off@cern.ch"); + metadata->SetComment("Automatically produced GRP entry for Monte Carlo"); + + man->Put(grpMap,id,metadata); +} diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h index fc8ba3a5d34..ba3839d0bf3 100644 --- a/STEER/AliSimulation.h +++ b/STEER/AliSimulation.h @@ -109,7 +109,10 @@ public: void SetQACycles(const char * detector, const Int_t cycles) { fQACycles[GetDetIndex(detector)] = cycles ; } Bool_t RunQA() ; Bool_t SetRunQA(TString detAndAction="ALL:ALL") ; - + + void SetWriteGRPEntry(Bool_t flag = kTRUE) { fWriteGRPEntry = flag; } + void WriteGRPEntry(); + private: void InitCDB(); void InitRunNumber(); @@ -166,6 +169,8 @@ private: //HLT TString fRunHLT; // HLT options, HLT is disabled if empty, default='default' + Bool_t fWriteGRPEntry; // Write or not GRP entry corresponding to the settings in Config.C + ClassDef(AliSimulation, 8) // class for running generation, simulation and digitization }; diff --git a/TDPMjet/AliGenDPMjet.cxx b/TDPMjet/AliGenDPMjet.cxx index 93d1784ac49..5f0fba8a9db 100644 --- a/TDPMjet/AliGenDPMjet.cxx +++ b/TDPMjet/AliGenDPMjet.cxx @@ -44,7 +44,6 @@ ClassImp(AliGenDPMjet) AliGenDPMjet::AliGenDPMjet() :AliGenMC(), fBeamEn(2750.), - fEnergyCMS(5500.), fMinImpactParam(0.), fMaxImpactParam(5.), fICentr(0), @@ -62,6 +61,7 @@ AliGenDPMjet::AliGenDPMjet() fProcess(kDpmMb) { // Constructor + SetEnergyCMS(5500.); AliDpmJetRndm::SetDpmJetRandom(GetRandom()); } @@ -70,7 +70,6 @@ AliGenDPMjet::AliGenDPMjet() AliGenDPMjet::AliGenDPMjet(Int_t npart) :AliGenMC(npart), fBeamEn(2750.), - fEnergyCMS(5500.), fMinImpactParam(0.), fMaxImpactParam(5.), fICentr(0), @@ -89,6 +88,7 @@ AliGenDPMjet::AliGenDPMjet(Int_t npart) { // Default PbPb collisions at 5. 5 TeV // + SetEnergyCMS(5500.); fName = "DPMJET"; fTitle= "Particle Generator using DPMJET"; SetTarget(); @@ -100,7 +100,6 @@ AliGenDPMjet::AliGenDPMjet(Int_t npart) AliGenDPMjet::AliGenDPMjet(const AliGenDPMjet &/*Dpmjet*/) :AliGenMC(), fBeamEn(2750.), - fEnergyCMS(5500.), fMinImpactParam(0.), fMaxImpactParam(5.), fICentr(0), @@ -118,6 +117,7 @@ AliGenDPMjet::AliGenDPMjet(const AliGenDPMjet &/*Dpmjet*/) fProcess(kDpmMb) { // Dummy copy constructor + SetEnergyCMS(5500.); } //______________________________________________________________________________ diff --git a/TDPMjet/AliGenDPMjet.h b/TDPMjet/AliGenDPMjet.h index 2d7f6fabc75..588da78bf6f 100644 --- a/TDPMjet/AliGenDPMjet.h +++ b/TDPMjet/AliGenDPMjet.h @@ -44,11 +44,6 @@ class AliGenDPMjet : public AliGenMC virtual void SetSpectators(Int_t spects=1) {fSpectators = spects;} virtual void SetBoostLHC(Int_t flag=0) {fLHC = flag;} virtual void SetPi0Decay(Int_t iPi0) {fPi0Decay = iPi0;} - virtual Float_t GetEnergyCMS() {return fEnergyCMS;} - virtual void GetProjectile(Int_t& a, Int_t& z) - {a = fAProjectile; z = fZProjectile;} - virtual void GetTarget(Int_t& a, Int_t& z) - {a = fATarget; z = fZTarget;} virtual void GetImpactParameterRange(Float_t& bmin, Float_t& bmax) {bmin = fMinImpactParam; bmax = fMaxImpactParam;} virtual Int_t GetSpectators() {return fSpectators;} @@ -66,7 +61,6 @@ class AliGenDPMjet : public AliGenMC protected: Float_t fBeamEn; // beam energy - Float_t fEnergyCMS; // Centre of mass energy Float_t fMinImpactParam; // minimum impact parameter Float_t fMaxImpactParam; // maximum impact parameter Int_t fICentr; // Flag to force central production @@ -91,7 +85,7 @@ class AliGenDPMjet : public AliGenMC // check if stable Bool_t Stable(TParticle* particle); - ClassDef(AliGenDPMjet,1) // AliGenerator interface to DPMJET + ClassDef(AliGenDPMjet,2) // AliGenerator interface to DPMJET }; #endif diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx index 0e8b5cb1616..9578c55ab6a 100644 --- a/THerwig/AliGenHerwig.cxx +++ b/THerwig/AliGenHerwig.cxx @@ -46,7 +46,6 @@ ClassImp(AliGenHerwig) fTrigger(0), fSelectAll(0), fFlavor(0), - fEnergyCMS(14000), fMomentum1(7000), fMomentum2(7000), fKineBias(1), @@ -64,6 +63,7 @@ ClassImp(AliGenHerwig) fFileName(0) { // Constructor + fEnergyCMS = 14000; } AliGenHerwig::AliGenHerwig(Int_t npart) @@ -76,7 +76,6 @@ AliGenHerwig::AliGenHerwig(Int_t npart) fTrigger(0), fSelectAll(0), fFlavor(0), - fEnergyCMS(14000), fMomentum1(7000), fMomentum2(7000), fKineBias(1), @@ -93,6 +92,7 @@ AliGenHerwig::AliGenHerwig(Int_t npart) fEv2Pr(0), fFileName(0) { + fEnergyCMS = 14000; SetTarget(); SetProjectile(); // Set random number generator diff --git a/THerwig/AliGenHerwig.h b/THerwig/AliGenHerwig.h index 829a7e2d594..2e4206a9e78 100644 --- a/THerwig/AliGenHerwig.h +++ b/THerwig/AliGenHerwig.h @@ -68,7 +68,6 @@ class AliGenHerwig : public AliGenMC Int_t fTrigger; // Trigger type Int_t fSelectAll; // Flag to write the full event Int_t fFlavor; // Selected particle flavor 4: charm+beauty 5: beauty - Float_t fEnergyCMS; // Centre of mass energy Float_t fMomentum1; // Momentum of projectile Float_t fMomentum2; // Momentum of target Float_t fKineBias; // Bias from kinematic selection @@ -102,7 +101,7 @@ class AliGenHerwig : public AliGenMC void InitPDF(); - ClassDef(AliGenHerwig,1) // AliGenerator interface to Herwig + ClassDef(AliGenHerwig,2) // AliGenerator interface to Herwig }; #endif diff --git a/THijing/AliGenHijing.cxx b/THijing/AliGenHijing.cxx index 331987ec0e0..a6797c7b56f 100644 --- a/THijing/AliGenHijing.cxx +++ b/THijing/AliGenHijing.cxx @@ -49,7 +49,6 @@ AliGenHijing::AliGenHijing() fEvaluate(0), fSelectAll(0), fFlavor(0), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fXsection(0.), @@ -75,8 +74,9 @@ AliGenHijing::AliGenHijing() fRandomPz(kFALSE), fNoHeavyQuarks(kFALSE) { -// Constructor - AliHijingRndm::SetHijingRandom(GetRandom()); + // Constructor + SetEnergyCMS(5500.); + AliHijingRndm::SetHijingRandom(GetRandom()); } AliGenHijing::AliGenHijing(Int_t npart) @@ -92,7 +92,6 @@ AliGenHijing::AliGenHijing(Int_t npart) fEvaluate(0), fSelectAll(0), fFlavor(0), - fEnergyCMS(5500.), fKineBias(0.), fTrials(0), fXsection(0.), @@ -120,6 +119,7 @@ AliGenHijing::AliGenHijing(Int_t npart) { // Default PbPb collisions at 5. 5 TeV // + SetEnergyCMS(5500.); fName = "Hijing"; fTitle= "Particle Generator using HIJING"; // diff --git a/THijing/AliGenHijing.h b/THijing/AliGenHijing.h index b70a15de8b9..1945bfd5423 100644 --- a/THijing/AliGenHijing.h +++ b/THijing/AliGenHijing.h @@ -58,12 +58,7 @@ class AliGenHijing : public AliGenMC // Getters - virtual Float_t GetEnergyCMS() const {return fEnergyCMS;} virtual TString GetReferenceFrame() const {return fFrame;} - virtual void GetProjectile(TString& tar, Int_t& a, Int_t& z) const - {tar = fProjectile; a = fAProjectile; z = fZProjectile;} - virtual void GetTarget(TString& tar, Int_t& a, Int_t& z) const - {tar = fTarget; a = fATarget; z = fZTarget;} virtual void GetImpactParameterRange(Float_t& bmin, Float_t& bmax) const {bmin = fMinImpactParam; bmax = fMaxImpactParam;} virtual Int_t GetJetQuenching() const {return fQuench;} @@ -101,7 +96,6 @@ class AliGenHijing : public AliGenMC Int_t fEvaluate; // Evaluate total and partial cross-sections Int_t fSelectAll; // Flag to write the full event Int_t fFlavor; // Selected particle flavor 4: charm+beauty 5: beauty - Float_t fEnergyCMS; // Centre of mass energy Float_t fKineBias; // Bias from kinematic selection Int_t fTrials; // Number of trials Float_t fXsection; // Cross-section @@ -139,7 +133,7 @@ class AliGenHijing : public AliGenMC // check if stable Bool_t Stable(TParticle* particle) const; - ClassDef(AliGenHijing, 6) // AliGenerator interface to Hijing + ClassDef(AliGenHijing, 7) // AliGenerator interface to Hijing }; #endif diff --git a/THydjet/AliGenHydjet.h b/THydjet/AliGenHydjet.h index 7f04e6df413..53ca0b2db23 100755 --- a/THydjet/AliGenHydjet.h +++ b/THydjet/AliGenHydjet.h @@ -50,7 +50,6 @@ class AliGenHydjet : public AliGenMC virtual void AddHeader(AliGenEventHeader* header); // Getters - // virtual Float_t GetEnergyCMS() const {return fEnergyCMS;} // virtual TString GetReferenceFrame() const {return fFrame;} // @@ -60,7 +59,6 @@ class AliGenHydjet : public AliGenMC void MakeHeader(); protected: //initial parameters - Float_t fEnergyCMS; //Energy cms TString fFrame; // Reference frame Float_t fAtomicWeigth; // Projectile-Target atomic weight Int_t fIfbtype; // centrality type