cms-sw · smuzaffar · Jun 22, 2020 · Jun 19, 2020 · Jun 18, 2020
diff --git a/Fireworks/Calo/plugins/FWMETProxyBuilder.cc b/Fireworks/Calo/plugins/FWMETProxyBuilder.cc
@@ -12,6 +12,7 @@
 
 // system include files
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveScalableStraightLineSet.h"
 #include "TGeoTube.h"
 #include "TMath.h"

diff --git a/Fireworks/Calo/src/FWTauProxyBuilderBase.cc b/Fireworks/Calo/src/FWTauProxyBuilderBase.cc
@@ -16,6 +16,7 @@
 #include "TGeoTube.h"
 #include "TEveJetCone.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveScalableStraightLineSet.h"
 #include "TEveTrack.h"
 

diff --git a/Fireworks/Core/src/BuilderUtils.cc b/Fireworks/Core/src/BuilderUtils.cc
@@ -12,6 +12,7 @@
 #include "TEveStraightLineSet.h"
 #include "TEveTrans.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 
 #include <cmath>
 #include <ctime>

diff --git a/Fireworks/Core/src/FW3DViewGeometry.cc b/Fireworks/Core/src/FW3DViewGeometry.cc
@@ -17,6 +17,7 @@
 
 #include "TEveManager.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveCompound.h"
 
 #include "Fireworks/Core/interface/FW3DViewGeometry.h"
@@ -449,4 +450,4 @@ void FW3DViewGeometry::showHGCalHSc(bool showHGCalHSc) {
     m_HGCalHScElements->SetRnrState(showHGCalHSc);
     gEve->Redraw3D();
   }
-}
+}
diff --git a/Fireworks/Core/src/FWEveOverlap.cc b/Fireworks/Core/src/FWEveOverlap.cc
@@ -1,5 +1,6 @@
 #include "Fireworks/Core/src/FWEveOverlap.h"
 #include "TGeoOverlap.h"
+#include "TEveGeoShape.h"
 #include "Fireworks/Core/src/FWOverlapTableView.h"
 #include "Fireworks/Core/src/FWOverlapTableManager.h"
 #include "Fireworks/Core/interface/FWGeometryTableViewManager.h"
@@ -114,4 +115,4 @@ void FWEveOverlap::popupMenu(int x, int y, TGLViewer* v) {
 
   if (nodePopup)
     nodePopup->Connect("Activated(Int_t)", "FWOverlapTableView", m_browser, "chosenItem(Int_t)");
-}
+}
diff --git a/Fireworks/Core/src/FWGeometry.cc b/Fireworks/Core/src/FWGeometry.cc
@@ -1,6 +1,7 @@
 #include "TFile.h"
 #include "TTree.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TPRegexp.h"
 #include "TSystem.h"
 #include "TGeoArb8.h"

diff --git a/Fireworks/Core/src/FWGlimpseView.cc b/Fireworks/Core/src/FWGlimpseView.cc
@@ -27,6 +27,7 @@
 #include "TEveTrans.h"
 #include "TGeoTube.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 
 // user include files

diff --git a/Fireworks/Core/src/FWRPZViewGeometry.cc b/Fireworks/Core/src/FWRPZViewGeometry.cc
@@ -23,6 +23,7 @@
 #include "TEvePointSet.h"
 #include "TEveStraightLineSet.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveManager.h"
 #include "TEveProjectionManager.h"
 

diff --git a/Fireworks/Core/src/FWViewGeometryList.cc b/Fireworks/Core/src/FWViewGeometryList.cc
@@ -14,7 +14,7 @@
 #include "TEveScene.h"
 #include "TEveManager.h"
 #include "TEveCompound.h"
-
+#include "TEveGeoShape.h"
 #include "Fireworks/Core/interface/FWViewGeometryList.h"
 #include "Fireworks/Core/interface/FWGeometry.h"
 #include "Fireworks/Core/interface/Context.h"

diff --git a/Fireworks/Electrons/src/makeSuperCluster.cc b/Fireworks/Electrons/src/makeSuperCluster.cc
@@ -12,6 +12,7 @@
 
 // system include files
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TGeoBBox.h"
 #include "TGeoTube.h"
 

diff --git a/Fireworks/Muons/plugins/FWCSCSegmentProxyBuilder.cc b/Fireworks/Muons/plugins/FWCSCSegmentProxyBuilder.cc
@@ -11,6 +11,7 @@
 //
 
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 #include "TGeoArb8.h"
 

diff --git a/Fireworks/Muons/plugins/FWDTSegmentProxyBuilder.cc b/Fireworks/Muons/plugins/FWDTSegmentProxyBuilder.cc
@@ -11,6 +11,7 @@
 //
 
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 #include "TEvePointSet.h"
 #include "TGeoArb8.h"

diff --git a/Fireworks/Muons/plugins/FWGEMRecHitProxyBuilder.cc b/Fireworks/Muons/plugins/FWGEMRecHitProxyBuilder.cc
@@ -11,6 +11,7 @@
 //
 
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 
 #include "Fireworks/Core/interface/FWSimpleProxyBuilderTemplate.h"

diff --git a/Fireworks/Muons/plugins/FWGEMSegmentProxyBuilder.cc b/Fireworks/Muons/plugins/FWGEMSegmentProxyBuilder.cc
@@ -1,4 +1,5 @@
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 #include "TGeoArb8.h"
 

diff --git a/Fireworks/Muons/plugins/FWME0RecHitProxyBuilder.cc b/Fireworks/Muons/plugins/FWME0RecHitProxyBuilder.cc
@@ -1,4 +1,5 @@
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 
 #include "Fireworks/Core/interface/FWSimpleProxyBuilderTemplate.h"

diff --git a/Fireworks/Muons/plugins/FWME0SegmentProxyBuilder.cc b/Fireworks/Muons/plugins/FWME0SegmentProxyBuilder.cc
@@ -1,4 +1,5 @@
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 #include "TGeoArb8.h"
 #include "TEvePointSet.h"

diff --git a/Fireworks/Muons/plugins/FWRPCRecHitProxyBuilder.cc b/Fireworks/Muons/plugins/FWRPCRecHitProxyBuilder.cc
@@ -9,6 +9,7 @@
 //
 
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveStraightLineSet.h"
 
 #include "Fireworks/Core/interface/FWSimpleProxyBuilderTemplate.h"

diff --git a/Fireworks/Muons/src/FWMuonBuilder.cc b/Fireworks/Muons/src/FWMuonBuilder.cc
@@ -8,6 +8,7 @@
 #include "TEveTrack.h"
 #include "TEveStraightLineSet.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TGeoArb8.h"
 
 #include "Fireworks/Core/interface/FWEventItem.h"

diff --git a/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DDetProxyBuilder.cc b/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DDetProxyBuilder.cc
@@ -6,7 +6,7 @@
 //
 
 #include "TEveGeoNode.h"
-
+#include "TEveGeoShape.h"
 #include "Fireworks/Core/interface/FWProxyBuilderBase.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 #include "Fireworks/Core/interface/FWGeometry.h"

diff --git a/Fireworks/Tracks/plugins/FWSiPixelClusterDetProxyBuilder.cc b/Fireworks/Tracks/plugins/FWSiPixelClusterDetProxyBuilder.cc
@@ -9,7 +9,7 @@
 //
 
 #include "TEveGeoNode.h"
-
+#include "TEveGeoShape.h"
 #include "Fireworks/Core/interface/FWProxyBuilderBase.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 #include "Fireworks/Core/interface/FWGeometry.h"

diff --git a/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc b/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc
@@ -4,6 +4,7 @@
 #include "TEveGeoNode.h"
 #include "TEveLine.h"
 #include "TEveCompound.h"
+#include "TEveGeoShape.h"
 
 #include "Fireworks/Core/interface/fwLog.h"
 #include "Fireworks/Core/interface/FWSimpleProxyBuilderTemplate.h"

diff --git a/Fireworks/Vertices/plugins/FWSecVertexCandidateProxyBuilder.cc b/Fireworks/Vertices/plugins/FWSecVertexCandidateProxyBuilder.cc
@@ -10,6 +10,7 @@
 #include "TGeoSphere.h"
 #include "TGeoMatrix.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveVSDStructs.h"
 
 #include "Fireworks/Candidates/interface/CandidateUtils.h"

diff --git a/Fireworks/Vertices/plugins/FWSecVertexProxyBuilder.cc b/Fireworks/Vertices/plugins/FWSecVertexProxyBuilder.cc
@@ -10,6 +10,7 @@
 #include "TGeoSphere.h"
 #include "TGeoMatrix.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveVSDStructs.h"
 
 // include files

diff --git a/Fireworks/Vertices/plugins/FWVertexCandidateProxyBuilder.cc b/Fireworks/Vertices/plugins/FWVertexCandidateProxyBuilder.cc
@@ -35,6 +35,7 @@
 #include "TEveBoxSet.h"
 #include "TGeoSphere.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveVSDStructs.h"
 
 class FWVertexCandidateProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::VertexCompositePtrCandidate> {

diff --git a/Fireworks/Vertices/plugins/FWVertexProxyBuilder.cc b/Fireworks/Vertices/plugins/FWVertexProxyBuilder.cc
@@ -35,6 +35,7 @@
 #include "TEveBoxSet.h"
 #include "TGeoSphere.h"
 #include "TEveGeoNode.h"
+#include "TEveGeoShape.h"
 #include "TEveVSDStructs.h"
 
 class FWVertexProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Vertex> {

diff --git a/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h b/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <algorithm>
+#include <vector>
 #include <boost/range.hpp>
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 #include <cstdint>