Merge pull request #26226 from wouf/from-CMSSW_10_6_0_pre2

Interface for external Pyquen #4790
cms-sw · Apr 2, 2019 · 1152681 · 1152681
2 parents 7f386d4 + 8874a40
commit 1152681
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 1,536 deletions.
diff --git a/GeneratorInterface/PyquenInterface/BuildFile.xml b/GeneratorInterface/PyquenInterface/BuildFile.xml
@@ -8,6 +8,7 @@
 <use   name="f77compiler"/>
 <use   name="GeneratorInterface/Pythia6Interface"/>
 <use   name="GeneratorInterface/ExternalDecays"/>
+<use   name="pyquen"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/GeneratorInterface/PyquenInterface/interface/PyquenWrapper.h b/GeneratorInterface/PyquenInterface/interface/PyquenWrapper.h
@@ -16,6 +16,11 @@ extern "C" {
 }
 #define PYQUEN pyquen_ 
 
+extern "C" {
+  void pyqver_(int& ,int& ,int& ,int&);
+}
+#define PYQVER pyqver_
+
 extern "C" {
   extern struct{
     double bgen;

diff --git a/GeneratorInterface/PyquenInterface/python/pyquenPythiaDefault_cff.py b/GeneratorInterface/PyquenInterface/python/pyquenPythiaDefault_cff.py
@@ -28,7 +28,9 @@
                                       'MSTJ(22)=2'
                                       ),
 
-    ppJets = cms.vstring('MSEL=1   ! QCD hight pT processes'),
+    ppJets = cms.vstring('MSEL=1   ! QCD hight pT processes',
+			 'MSTP(122)=0' # ! no printout of Pythia initialization information hereinafter
+			),
     pythiaJets = cms.vstring('MSUB(11)=1', # q+q->q+q
                              'MSUB(12)=1', # q+qbar->q+qbar
                              'MSUB(13)=1', # q+qbar->g+g

diff --git a/GeneratorInterface/PyquenInterface/src/HepEvt.F b/GeneratorInterface/PyquenInterface/src/HepEvt.F
diff --git a/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc b/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc
@@ -78,6 +78,9 @@ filterType_(pset.getUntrackedParameter<string>("filterType","None"))
   }
   selector_ = HiGenEvtSelectorFactory::get(filterType_,pset);
 
+  int cm=1, va, vb, vc;
+  PYQVER(cm,va,vb,vc);
+
 }
 
 
@@ -183,7 +186,10 @@ bool PyquenHadronizer::generatePartonsAndHadronize()
 
    if(embedding_) rotateEvtPlane(evt,evtPlane_);
    add_heavy_ion_rec(evt);
-
+
+   HepMC::HEPEVT_Wrapper::check_hepevt_consistency();
+   //std::cout<<"Entries number: "<<HepMC::HEPEVT_Wrapper::number_entries() <<" Max. entries "<<HepMC::HEPEVT_Wrapper::max_number_entries()<<std::endl;
+
    event().reset(evt);
 
   return true;

diff --git a/GeneratorInterface/PyquenInterface/src/hepevt.inc b/GeneratorInterface/PyquenInterface/src/hepevt.inc