Merge pull request #1573 from mkirsano/pythia8int_fix1

Pythia8int fix1
cms-sw · Dec 4, 2013 · 454157c · 454157c
2 parents e3222c8 + de24167
commit 454157c
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 12 deletions.
diff --git a/GeneratorInterface/Pythia8Interface/test/Py8Had_MGFastJet_cfg.py b/GeneratorInterface/Pythia8Interface/test/Py8Had_MGFastJet_cfg.py
@@ -67,11 +67,9 @@
 #)
 
 process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
-    moduleSeeds = cms.PSet(
-        generator = cms.untracked.uint32(123456),
-        g4SimHits = cms.untracked.uint32(123456788),
-        VtxSmeared = cms.untracked.uint32(123456789)
-    ),
+    generator = cms.PSet(
+        initialSeed = cms.untracked.uint32(123456789),
+    )
 )
 
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000) )

diff --git a/GeneratorInterface/Pythia8Interface/test/Py8Had_mgmatching_cfg.py b/GeneratorInterface/Pythia8Interface/test/Py8Had_mgmatching_cfg.py
@@ -68,11 +68,9 @@
 #)
 
 process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
-    moduleSeeds = cms.PSet(
-        generator = cms.untracked.uint32(123456),
-        g4SimHits = cms.untracked.uint32(123456788),
-        VtxSmeared = cms.untracked.uint32(123456789)
-    ),
+    generator = cms.PSet(
+        initialSeed = cms.untracked.uint32(123456789),
+    )
 )
 
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1000) )

diff --git a/GeneratorInterface/Pythia8Interface/test/Py8_Z2tautau_tauola_cfg.py b/GeneratorInterface/Pythia8Interface/test/Py8_Z2tautau_tauola_cfg.py
@@ -0,0 +1,81 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST")
+
+process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
+process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
+process.load("PhysicsTools.HepMCCandAlgos.genParticles_cfi")
+
+process.source = cms.Source("EmptySource",
+     firstLuminosityBlock = cms.untracked.uint32(1),
+#     numberEventsInLuminosityBlock = cms.untracked.uint32(200),
+     firstEvent = cms.untracked.uint32(1),
+     firstRun = cms.untracked.uint32(1),
+     numberEventsInRun = cms.untracked.uint32(100)
+
+)
+
+from GeneratorInterface.ExternalDecays.TauolaSettings_cff import *
+
+process.generator = cms.EDFilter("Pythia8GeneratorFilter",
+    maxEventsToPrint = cms.untracked.int32(1),
+    pythiaPylistVerbosity = cms.untracked.int32(1),
+    filterEfficiency = cms.untracked.double(1.0),
+    pythiaHepMCVerbosity = cms.untracked.bool(False),
+    comEnergy = cms.double(8000.),
+    ExternalDecays = cms.PSet(
+        Tauola = cms.untracked.PSet(
+            TauolaPolar,
+	    TauolaDefaultInputCards
+        ),
+        parameterSets = cms.vstring('Tauola')
+    ),								 
+
+    PythiaParameters = cms.PSet(
+        py8ProcessSettings = cms.vstring( 'StringZ:usePetersonB = on', # these 2 together ==
+	                                  'StringZ:usePetersonC = on', # mstj(11)=3
+					  'WeakSingleBoson:ffbar2gmZ = on' # msel=11
+					  # what about choice of structure function ??? (mstp(51)=7)
+	),
+	py8ZDecaySettings = cms.vstring(  '23:onMode = off', # turn OFF all Z decays
+					  '23:onIfAny = 15'  # turn ON Z->tautau
+	),
+	py8TauDecaySettings = cms.vstring('15:onMode = off', # turn OFF all tau decays
+	),
+        parameterSets = cms.vstring(
+	                            'py8ProcessSettings',
+				    'py8ZDecaySettings')
+    )
+)
+
+# The following three lines reduce the clutter of repeated printouts
+# of the same exception message.
+process.load("FWCore.MessageLogger.MessageLogger_cfi")
+process.MessageLogger.destinations = ['cerr']
+process.MessageLogger.statistics = []
+process.MessageLogger.fwkJobReports = []
+
+process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
+    generator = cms.PSet(
+        initialSeed = cms.untracked.uint32(123456789),
+        engineName = cms.untracked.string('HepJamesRandom')
+    )
+)
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(100)
+)
+
+process.GEN = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('Py8_Z2tautau_tauola.root')
+)
+
+process.printGenParticles = cms.EDAnalyzer("ParticleListDrawer",
+                                           src = cms.InputTag("genParticles"),
+                                           maxEventsToPrint = cms.untracked.int32(3) )
+
+process.p = cms.Path(process.generator*process.genParticles*process.printGenParticles)
+process.outpath = cms.EndPath(process.GEN)
+
+process.schedule = cms.Schedule(process.p, process.outpath)
+
diff --git a/GeneratorInterface/Pythia8Interface/test/analyserhepmc/LeptonAnalyserHepMC.cc b/GeneratorInterface/Pythia8Interface/test/analyserhepmc/LeptonAnalyserHepMC.cc
@@ -30,7 +30,7 @@ std::vector<HepMC::GenParticle>
 
       double eta0 = (*part)->momentum().eta();
       double phi0 = (*part)->momentum().phi();
-      double pti, dist, etai, phii;
+      double pti, dist, etai, phii, dphi;
       bool isol = true;
       for(part1 = pEv->particles_begin();
           part1 != part && part1 != pEv->particles_end();
@@ -39,7 +39,10 @@ std::vector<HepMC::GenParticle>
           pti = (*part1)->momentum().perp();
           etai = (*part1)->momentum().eta();
           phii = (*part1)->momentum().phi();
-          dist = sqrt( (eta0-etai)*(eta0-etai) + (phi0-phii)*(phi0-phii) );
+          dphi = phi0-phii;
+          if(fabs(phi0-phii-6.2832) < fabs(dphi)) dphi = phi0-phii-6.2832;
+          if(fabs(phi0-phii+6.2832) < fabs(dphi)) dphi = phi0-phii+6.2832;
+          dist = sqrt( (eta0-etai)*(eta0-etai) + dphi*dphi );
           if(dist < RConeIsol && pti > MaxPtIsol ) { isol = false; break;}
         }
       }