Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert changes to HF shower libraries and Pythia8. #1339

Merged
1 commit merged into from Jan 29, 2015
Merged

Revert changes to HF shower libraries and Pythia8. #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions data-SimG4CMS-Calo.spec
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
%define base_url "http://cmsdoc.cern.ch/cms/data/CMSSW"

cat << CMS_EOF >> ./sources
SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root
SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en_v3.root
SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en.root
SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en.root
CMS_EOF

## IMPORT data-package-build
7 changes: 4 additions & 3 deletions pythia8-205-fix-gcc-options.patch → pythia8-201-fix-gcc-options.patch
View file
Open in desktop
@@ -1,6 +1,7 @@
--- ../pythia8205/configure 2015-01-24 11:55:07.649516367 +0100
+++ pythia8205/configure 2015-01-24 11:54:46.626182422 +0100
@@ -209,7 +209,8 @@
diff -ur orig/pythia8201/configure new/pythia8201/configure
--- orig/pythia8201/configure 2014-10-13 20:20:55.000000000 +0200
+++ new/pythia8201/configure 2014-11-17 20:16:44.910305252 +0100
@@ -207,7 +207,8 @@
if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi
if [ "$ARCH" = "DARWIN" ]; then
CXX_SHARED="-dynamiclib -flat_namespace"
Expand Down
14 changes: 14 additions & 0 deletions pythia8-201-fix-init.patch
View file
Open in desktop
@@ -0,0 +1,14 @@
diff -urw orig/pythia8201/src/BeamParticle.cc new/pythia8201/src/BeamParticle.cc
--- orig/pythia8201/src/BeamParticle.cc 2014-10-13 20:22:12.000000000 +0200
+++ new/pythia8201/src/BeamParticle.cc 2014-11-17 20:21:40.678702937 +0100
@@ -113,6 +113,9 @@
pBeam = Vec4( 0., 0., pzIn, eIn);
mBeam = mIn;

+ // Remove remnants?
+ clear();
+
}

//--------------------------------------------------------------------------