Merge pull request #1670 from mkirsano/Pythia8Int_fix2

Pythia8 int fix2
cms-sw · Dec 6, 2013 · 408c9fd · 408c9fd
2 parents b41c2d8 + 78dc054
commit 408c9fd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/GeneratorInterface/Pythia8Interface/plugins/Py8EGun.cc b/GeneratorInterface/Pythia8Interface/plugins/Py8EGun.cc
@@ -64,8 +64,7 @@ bool Py8EGun::generatePartonsAndHadronize()
       double eta  = (fMaxEta-fMinEta) * randomEngine->flat() + fMinEta;                                                      
       double the  = 2.*atan(exp(-eta));                                                                          
 
-      double mass = (fMasterGen->particleData).mass( particleID );
-//      double mass = (pythia->particleData).m0( particleID );
+      double mass = (fMasterGen->particleData).m0( particleID );
 
       double pp = sqrt( ee*ee - mass*mass );
       double px = pp * sin(the) * cos(phi);

diff --git a/GeneratorInterface/Pythia8Interface/plugins/Py8JetGun.cc b/GeneratorInterface/Pythia8Interface/plugins/Py8JetGun.cc
@@ -75,8 +75,7 @@ bool Py8JetGun::generatePartonsAndHadronize()
       //
       ee   = (fMaxE-fMinE)*randomEngine->flat() + fMinE;
 
-      double mass = (fMasterGen->particleData).mass( particleID );
-//      double mass = (pythia->particleData).m0( particleID );
+      double mass = (fMasterGen->particleData).m0( particleID );
 
       pp = sqrt( ee*ee - mass*mass );
 

diff --git a/GeneratorInterface/Pythia8Interface/plugins/Py8PtGun.cc b/GeneratorInterface/Pythia8Interface/plugins/Py8PtGun.cc
@@ -65,8 +65,7 @@ bool Py8PtGun::generatePartonsAndHadronize()
 
       double pt   = (fMaxPt-fMinPt) * randomEngine->flat() + fMinPt;
 
-      double mass = (fMasterGen->particleData).mass( particleID );
-//      double mass = (pythia->particleData).m0( particleID );
+      double mass = (fMasterGen->particleData).m0( particleID );
 
       double pp = pt / sin(the); // sqrt( ee*ee - mass*mass );
       double ee = sqrt( pp*pp + mass*mass );

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/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;}
         }
       }