Merge branch 'IB/CMSSW_10_5_X/gcc700' into smuzaffar-patch-6

cms-sw · Jan 10, 2019 · 27b9aad · 27b9aad
2 parents b00a0b8 + 29c1905
commit 27b9aad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt
@@ -5,6 +5,7 @@
 [default]
 FWCore-Modules=V00-01-00
 IOPool-Input=V00-01-00
+RecoEgamma-ElectronIdentification=V01-01-01
 RecoCTPPS-TotemRPLocal=V00-02-00
 
 ########################################################################################
@@ -81,7 +82,6 @@ RecoTracker-FinalTrackSelectors=V01-00-01
 SimTracker-SiStripDigitizer=V01-00-00
 SimTransport-HectorProducer=V01-00-01
 SLHCUpgradeSimulations-Geometry=V01-00-09
-RecoEgamma-ElectronIdentification=V01-01-00
 
 #Never update any package here. Always move it to default section.
 [data-cmssw-package-build]

diff --git a/vecgeom-uninit-fix.patch b/vecgeom-uninit-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/volumes/UnplacedPolycone.h b/volumes/UnplacedPolycone.h
+index 607c4d8..526b7c5 100644
+--- a/volumes/UnplacedPolycone.h
++++ b/volumes/UnplacedPolycone.h
+@@ -36,6 +36,7 @@ public:
+     // init internal members
+     fPolycone.fContinuityOverAll = true;
+     fPolycone.fConvexityPossible = true;
++    fPolycone.fEqualRmax         = true;
+     fPolycone.Init(phistart, deltaphi, Nz, z, rmin, rmax);
+     DetectConvexity();
+   }
diff --git a/vecgeom.spec b/vecgeom.spec
@@ -7,11 +7,13 @@ BuildRequires: cmake gmake
 %define isaarch64 %(case %{cmsplatf} in (*_aarch64_*) echo 1 ;; (*) echo 0 ;; esac)
 
 Patch0: vecgeom-fix-for-arm64
+Patch1: vecgeom-uninit-fix
 
 %prep
 %setup -n %{n}-%{realversion}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -rf ../build