Skip to content

Commit

Permalink
Merge pull request cms-sw#11131 from wouf/CMSSW_7_6_X
Browse files Browse the repository at this point in the history 
Update Hydjet2 and Hydjet1
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 29, 2015
2 parents fab7c87 + 62c5fae commit 139d4f6
Show file tree
Hide file tree
Showing 15 changed files with 2,396 additions and 224 deletions.
1 change: 1 addition & 0 deletions GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ namespace gen
edm::Service<TFileService> fs;

int ev, sseed, Njet, Nbcol, Npart, Ntot, Npyt, Nhyd;
double psiforv3;
float Bgen, Sigin, Sigjet;
float Px[kMax];
float Py[kMax];
Expand Down
1 change: 0 additions & 1 deletion GeneratorInterface/Hydjet2Interface/interface/Particle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ November. 2, 2005
#include "ParticlePDG.h"
#include <iostream>


class Particle {
protected:
TLorentzVector fPosition;
Expand Down
214 changes: 127 additions & 87 deletions GeneratorInterface/Hydjet2Interface/python/hydjet2DefaultParameters_cff.py
View file

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions GeneratorInterface/Hydjet2Interface/python/hydjet2Default_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
import FWCore.ParameterSet.Config as cms

source = cms.Source("EmptySource")

from GeneratorInterface.Hydjet2Interface.hydjet2DefaultParameters_cff import *

generator = cms.EDFilter("Hydjet2GeneratorFilter",
collisionParameters5100GeV,
collisionParameters5020GeV,
qgpParameters,
hydjet2Parameters,
fNhsel = cms.int32(2), # Flag to include jet (J)/jet quenching (JQ) and hydro (H) state production, fNhsel (0 H on & J off, 1 H/J on & JQ off, 2 H/J/HQ on, 3 J on & H/JQ off, 4 H off & J/JQ on)
PythiaParameters = cms.PSet(PythiaDefaultBlock,
parameterSets = cms.vstring(
#'pythiaUESettings',
'hydjet2PythiaDefault',
'ProQ2Otune',
#'pythiaJets',
#'pythiaPromptPhotons'

#'myParameters',
#'pythiaZjets',
#'pythiaBottomoniumNRQCD',
#'pythiaCharmoniumNRQCD',
#'pythiaQuarkoniaSettings',
#'pythiaWeakBosons'
'hydjet2PythiaDefault',
'pythiaJets',
'pythiaPromptPhotons',
'myParameters',
'pythiaZjets',
'pythiaBottomoniumNRQCD',
'pythiaCharmoniumNRQCD',
'pythiaQuarkoniaSettings',
'pythiaWeakBosons',
'TDB'
)
),

Expand All @@ -29,7 +31,7 @@

fIfb = cms.int32(1), # Flag of type of centrality generation, fBfix (=0 is fixed by fBfix, >0 distributed [fBfmin, fBmax])
fBmin = cms.double(0.), # Minimum impact parameter, fBmin
fBmax = cms.double(3.47500770746), # Maximum impact parameter, fBmax
fBmax = cms.double(30.), # Maximum impact parameter, fBmax
fBfix = cms.double(0.), # Fixed impact parameter, fBfix

)
Expand Down
54 changes: 36 additions & 18 deletions GeneratorInterface/Hydjet2Interface/src/Hydjet2Hadronizer.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
Hydjet2
##########################
# Hydjet2 #
# version: 2.2.0 patch1 #
##########################
Interface to the HYDJET++ generator, produces HepMC events
Author: Andrey Belyaev (Andrey.Belyaev@cern.ch)
Expand Down Expand Up @@ -89,11 +94,23 @@ TString RunInputHYDJETstr;
int Particle::fLastIndex;
bool ev=0;
namespace {
int convertStatusForComponents(int sta, int typ){

if(sta== 1 && typ==0) return 6;
if(sta== 1 && typ==1) return 7;
if(sta== 2 && typ==0) return 16;
if(sta== 2 && typ==1) return 17;

else return sta;
}

int convertStatus(int st){

if(st<= 0) return 0;
if(st<=10) return 1;
if(st<=20) return 2;
if(st<=30) return 3;

else return st;
}
}
Expand Down Expand Up @@ -530,9 +547,9 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
Particle particle(partDef, partJPos, partJMom, 0, 0, type, motherPdg, zeroVec, zeroVec);
int index = particle.SetIndex();
if(index!=i) {
LogWarning("Hydjet2Hadronizer") << " Allocated HYDJET++ index is not synchronized with the PYTHIA index!" << endl
<< " Collision history information is destroyed! It happens when a PYTHIA code is not" << endl
<< " implemented in HYDJET++ particle list particles.data! Check it out!";
// LogWarning("Hydjet2Hadronizer") << " Allocated Hydjet2 index is not synchronized with the PYTHIA index !" << endl
// << " Collision history information is destroyed! It happens when a PYTHIA code is not" << endl
// << " implemented in Hydjet2 particle list particles.data! Check it out!";
}
particle.SetPythiaStatusCode(pythiaStatus);
particle.SetMother(mother_index);
Expand All @@ -542,7 +559,7 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
allocator.AddParticle(particle, source);
}
else {
LogWarning("Hydjet2Hadronizer") << " PYTHIA particle of specie " << pdg << " is not in HYDJET++ particle list" << endl
LogWarning("Hydjet2Hadronizer") << " PYTHIA particle of specie " << pdg << " is not in Hydjet2 particle list" << endl
<<" Please define it in particles.data, otherwise the history information will be de-synchronized and lost!";
}
}
Expand All @@ -555,7 +572,7 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
double impactParameter = HYFPAR.bgen;

// Sergey psiforv3
double psiforv3 = 0.; //AS-ML Nov2012 epsilon3 //
psiforv3 = 0.; //AS-ML Nov2012 epsilon3 //
double e3 = (0.2/5.5)*TMath::Power(impactParameter,1./3.);
psiforv3 = TMath::TwoPi() * (-0.5 + CLHEP::RandFlat::shoot(hjRandomEngine)) / 3.;
SERVICEEV.psiv3 = -psiforv3;
Expand Down Expand Up @@ -787,10 +804,10 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
Njet = (int)HYJPAR.njet;
Nbcol = (int)HYFPAR.nbcol;

if(source.empty()) {
LogError("Hydjet2Hadronizer") << "Source is not initialized!!";
//if(source.empty()) {
// LogError("Hydjet2Hadronizer") << "Source is not initialized!! Trying again...";
//return ;
}
//}
//Run the decays
if(RunDecays()) Evolve(source, allocator, GetWeakDecayLimit());

Expand All @@ -814,7 +831,7 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
Z[Ntot] = pos[2];
T[Ntot] = it->T();
type[Ntot] = it->GetType();
pythiaStatus[Ntot] = it->GetPythiaStatusCode();
pythiaStatus[Ntot] = convertStatus(it->GetPythiaStatusCode());
Index[Ntot] = it->GetIndex();
MotherIndex[Ntot] = it->GetMother();
NDaughters[Ntot] = it->GetNDaughters();
Expand All @@ -824,16 +841,17 @@ bool Hydjet2Hadronizer::generatePartonsAndHadronize(){
//index of last daughter
LastDaughterIndex[Ntot] = it->GetLastDaughterIndex();
if(type[Ntot]==1) { // jets
if(pythiaStatus[Ntot]==1 && NDaughters[Ntot]==0) // code for final state particle in pythia
if(pythiaStatus[Ntot]==1 && NDaughters[Ntot]==0){ // code for final state particle in pythia
final[Ntot]=1;
else
final[Ntot]=0;
}else{
final[Ntot]=pythiaStatus[Ntot];
}
}
if(type[Ntot]==0) { // hydro
if(NDaughters[Ntot]==0)
final[Ntot]=1;
else
final[Ntot]=0;
final[Ntot]=2;
}

if(type[Ntot]==0)Nhyd++;
Expand Down Expand Up @@ -1068,7 +1086,7 @@ bool Hydjet2Hadronizer::get_particles(HepMC::GenEvent *evt )
for(int isub=0;isub<nsub_;isub++){
LogDebug("SubEvent") <<"Sub Event ID : "<<isub;

int sub_up = (isub+1)*50000; // Upper limit in mother index, determining the range of Sub-Event
int sub_up = (isub+1)*150000; // Upper limit in mother index, determining the range of Sub-Event
vector<HepMC::GenParticle*> particles;
vector<int> mother_ids;
vector<HepMC::GenVertex*> prods;
Expand All @@ -1094,7 +1112,7 @@ bool Hydjet2Hadronizer::get_particles(HepMC::GenEvent *evt )
HepMC::GenParticle* part = particles[i];
//The Fortran code is modified to preserve mother id info, by seperating the beginning
//mother indices of successive subevents by 5000
int mid = mother_ids[i]-isub*50000-1;
int mid = mother_ids[i]-isub*150000-1;
LogDebug("DecayChain")<<"Particle "<<i;
LogDebug("DecayChain")<<"Mother's ID "<<mid;
LogDebug("DecayChain")<<"Particle's PDG ID "<<part->pdg_id();
Expand Down Expand Up @@ -1141,15 +1159,15 @@ HepMC::GenParticle* Hydjet2Hadronizer::build_hyjet2(int index, int barcode)

double px = px0*cosphi0_-py0*sinphi0_;
double py = py0*cosphi0_+px0*sinphi0_;
// cout<< "status: "<<convertStatus(final[index], type[index])<<endl;
HepMC::GenParticle* p = new HepMC::GenParticle(
HepMC::FourVector(
px, // px
py, // py
Pz[index], // pz
E[index]), // E
pdg[index], // id
convertStatus(final[index]) // status
convertStatusForComponents(final[index], type[index])// status

);

Expand Down
Loading

0 comments on commit 139d4f6

Please sign in to comment.