Merge pull request #2885 from davidlange6/remove_statics_v4

Remove statics v4

RecoParticleFlow/PFTracking/interface/GoodSeedProducer.h

@@ -21,6 +21,8 @@
 #include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
+#include "RecoParticleFlow/PFTracking/interface/PFGeometry.h"
+
 /// \brief Abstract
 /*!
 \author Michele Pioppi
@@ -175,6 +177,7 @@ class GoodSeedProducer : public edm::EDProducer {
 
       /// Map used to create the TrackRef, PreIdRef value map
       std::map<reco::TrackRef,unsigned> refMap_;
-
+
+      PFGeometry pfGeometry_;
 };
 #endif

RecoParticleFlow/PFTracking/interface/PFGeometry.h

@@ -53,47 +53,31 @@ class PFGeometry {
   virtual ~PFGeometry() { }
 
   /// return inner radius of a given layer
-  static const float innerRadius(PFGeometry::Layers_t layer)
+  float innerRadius(PFGeometry::Layers_t layer) const
     { return innerRadius_[layer]; }
 
   /// return outer radius of a given layer
-  static const float outerRadius(PFGeometry::Layers_t layer)
+  float outerRadius(PFGeometry::Layers_t layer) const
     { return outerRadius_[layer]; }
 
   /// return inner position along z axis of a given layer
-  static const float innerZ(PFGeometry::Layers_t layer)
+  float innerZ(PFGeometry::Layers_t layer) const
     { return innerZ_[layer]; }
 
   /// return outer position along z axis of a given layer
-  static const float outerZ(PFGeometry::Layers_t layer)
+  float outerZ(PFGeometry::Layers_t layer) const
     { return outerZ_[layer]; }
 
-  /// return cylinder used to propagate to barrel
-  static const Cylinder& barrelBound(PFGeometry::Surface_t iSurf)
-  { return *(cylinder_[unsigned(iSurf)]); }
-
-  /// return disk used to propagate to negative endcap 
-  static const Plane& negativeEndcapDisk(PFGeometry::Surface_t iSurf)
-  { return *(negativeDisk_[unsigned(iSurf)]); }
-
-  /// return disk used to propagate to positive endcap
-  static const Plane& positiveEndcapDisk(PFGeometry::Surface_t iSurf)
-  { return *(positiveDisk_[unsigned(iSurf)]); }
-
   /// return tan(theta) of the cylinder corner
-  static float tanTh(PFGeometry::Surface_t iSurf)
+  float tanTh(PFGeometry::Surface_t iSurf) const
   { return tanTh_[unsigned(iSurf)]; }
 
  private:
-  static std::vector< float > innerRadius_;
-  static std::vector< float > outerRadius_;
-  static std::vector< float > innerZ_;
-  static std::vector< float > outerZ_;
-
-  static std::vector< ReferenceCountingPointer<Cylinder> > cylinder_;
-  static std::vector< ReferenceCountingPointer<Plane> > negativeDisk_;
-  static std::vector< ReferenceCountingPointer<Plane> > positiveDisk_;
-  static std::vector< float > tanTh_;
+  std::vector< float > innerRadius_;
+  std::vector< float > outerRadius_;
+  std::vector< float > innerZ_;
+  std::vector< float > outerZ_;
+  std::vector< float > tanTh_;
 };
 
 #endif

RecoParticleFlow/PFTracking/interface/PFGsfHelper.h

@@ -1,7 +1,6 @@
 #ifndef PFGsfHelper_H
 #define PFGsfHelper_H
 
-#include "RecoParticleFlow/PFTracking/interface/PFGeometry.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EventSetup.h"

RecoParticleFlow/PFTracking/interface/PFTrackTransformer.h

@@ -67,6 +67,7 @@ class PFTrackTransformer{
   ///B field
    math::XYZVector B_;
    const MultiTrajectoryStateMode *mtsMode_;
+   PFGeometry pfGeometry_;
 };
 
 #endif

RecoParticleFlow/PFTracking/plugins/GoodSeedProducer.cc

@@ -599,9 +599,9 @@ GoodSeedProducer::PSforTMVA(const XYZTLorentzVector& mom,const XYZTLorentzVector
     //   GlobalPoint v1=ps1TSOS.globalPosition();
     math::XYZPoint v1=math::XYZPoint(OutParticle.vertex());
     if ((v1.Rho() >=
-	 PFGeometry::innerRadius(PFGeometry::PS1)) &&
+	 pfGeometry_.innerRadius(PFGeometry::PS1)) &&
 	(v1.Rho() <=
-	 PFGeometry::outerRadius(PFGeometry::PS1))) {
+	 pfGeometry_.outerRadius(PFGeometry::PS1))) {
       float enPScl1=0;
       float chi1=100;
       vector<PFCluster>::const_iterator ips;
@@ -622,9 +622,9 @@ GoodSeedProducer::PSforTMVA(const XYZTLorentzVector& mom,const XYZTLorentzVector
       if (OutParticle.getSuccess()!=0){
 	math::XYZPoint v2=math::XYZPoint(OutParticle.vertex());
 	if ((v2.Rho() >=
-	     PFGeometry::innerRadius(PFGeometry::PS2)) &&
+	     pfGeometry_.innerRadius(PFGeometry::PS2)) &&
 	    (v2.Rho() <=
-	     PFGeometry::outerRadius(PFGeometry::PS2))){
+	     pfGeometry_.outerRadius(PFGeometry::PS2))){
 	  float enPScl2=0;
 	  float chi2=100;
 	  for (ips=ps2Clus.begin(); ips!=ps2Clus.end();ips++){

RecoParticleFlow/PFTracking/src/PFGeometry.cc

@@ -4,15 +4,6 @@
 #include "DataFormats/GeometrySurface/interface/SimpleCylinderBounds.h"
 #include "DataFormats/GeometrySurface/interface/SimpleDiskBounds.h"
 
-std::vector< float > PFGeometry::innerRadius_;
-std::vector< float > PFGeometry::outerRadius_;
-std::vector< float > PFGeometry::innerZ_;
-std::vector< float > PFGeometry::outerZ_;
-std::vector< ReferenceCountingPointer<BoundCylinder> > PFGeometry::cylinder_;
-std::vector< ReferenceCountingPointer<BoundPlane> > PFGeometry::negativeDisk_;
-std::vector< ReferenceCountingPointer<BoundPlane> > PFGeometry::positiveDisk_;
-std::vector< float > PFGeometry::tanTh_;
-
 PFGeometry::PFGeometry()
 {
   if (!innerRadius_.size()) {
@@ -60,55 +51,11 @@ PFGeometry::PFGeometry()
     outerZ_.push_back(700.25);
 
     // Define reference surfaces
-    const float epsilon = 0.001; // should not matter at all
-    Surface::RotationType rot;
-    // BeamPipe
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(innerRadius_[BeamPipe], innerRadius_[BeamPipe], -outerZ_[BeamPipe], outerZ_[BeamPipe])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-outerZ_[BeamPipe]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[BeamPipe], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,outerZ_[BeamPipe]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[BeamPipe], -epsilon, epsilon)));
     tanTh_.push_back(innerRadius_[BeamPipe]/outerZ_[BeamPipe]);
-    // PS1Wall
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(outerRadius_[PS1], outerRadius_[PS1], -outerZ_[PS1], outerZ_[PS1])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-outerZ_[PS1]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[PS1], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,outerZ_[PS1]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[PS1], -epsilon, epsilon)));
     tanTh_.push_back(outerRadius_[PS1]/outerZ_[PS1]);
-    // PS2Wall
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(outerRadius_[PS2], outerRadius_[PS2], -outerZ_[PS2], outerZ_[PS2])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-outerZ_[PS2]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[PS2], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,outerZ_[PS2]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[PS2], -epsilon, epsilon)));
     tanTh_.push_back(outerRadius_[PS2]/outerZ_[PS2]);
-    // ECALInnerWall
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(innerRadius_[ECALBarrel], innerRadius_[ECALBarrel], -innerZ_[ECALEndcap], innerZ_[ECALEndcap])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-innerZ_[ECALEndcap]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[ECALBarrel], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,innerZ_[ECALEndcap]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[ECALBarrel], -epsilon, epsilon)));
     tanTh_.push_back(innerRadius_[ECALBarrel]/innerZ_[ECALEndcap]);
-    // HCALInnerWall
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(innerRadius_[HCALBarrel], innerRadius_[HCALBarrel], -innerZ_[HCALEndcap], innerZ_[HCALEndcap])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-innerZ_[HCALEndcap]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[HCALBarrel], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,innerZ_[HCALEndcap]), rot, 
-						    SimpleDiskBounds(0., innerRadius_[HCALBarrel], -epsilon, epsilon)));
     tanTh_.push_back(innerRadius_[HCALBarrel]/innerZ_[HCALEndcap]);
-    // HCALOuterWall
-    cylinder_.push_back(new BoundCylinder(Surface::PositionType(0,0,0), rot, 
-					  SimpleCylinderBounds(outerRadius_[HCALBarrel], outerRadius_[HCALBarrel], -outerZ_[HCALEndcap], outerZ_[HCALEndcap])));
-    negativeDisk_.push_back(new Disk(Surface::PositionType(0,0,-outerZ_[HCALEndcap]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[HCALBarrel], -epsilon, epsilon)));
-    positiveDisk_.push_back(new Disk(Surface::PositionType(0,0,outerZ_[HCALEndcap]), rot, 
-						    SimpleDiskBounds(0., outerRadius_[HCALBarrel], -epsilon, epsilon)));
     tanTh_.push_back(outerRadius_[HCALBarrel]/outerZ_[HCALEndcap]);
   }
 }

RecoParticleFlow/PFTracking/src/PFTrackTransformer.cc

@@ -34,7 +34,6 @@ using namespace edm;
 PFTrackTransformer::PFTrackTransformer(const math::XYZVector& B):B_(B){
   LogInfo("PFTrackTransformer")<<"PFTrackTransformer built";
 
-  PFGeometry pfGeometry;
   onlyprop_=false;
 }
 
@@ -95,8 +94,8 @@ PFTrackTransformer::addPoints( reco::PFRecTrack& pftrack,
 
 
   //BEAMPIPE
-  theParticle.setPropagationConditions(PFGeometry::outerRadius(PFGeometry::BeamPipe), 
-				       PFGeometry::outerZ(PFGeometry::BeamPipe), false);
+  theParticle.setPropagationConditions(pfGeometry_.outerRadius(PFGeometry::BeamPipe), 
+				       pfGeometry_.outerZ(PFGeometry::BeamPipe), false);
   theParticle.propagate();
   if(theParticle.getSuccess()!=0)
     pftrack.addPoint(PFTrajectoryPoint(-1,PFTrajectoryPoint::BeamPipeOrEndVertex,
@@ -287,8 +286,8 @@ PFTrackTransformer::addPointsAndBrems( reco::GsfPFRecTrack& pftrack,
       theInnerParticle.setCharge(track.charge());  
 
       //BEAMPIPE
-      theInnerParticle.setPropagationConditions(PFGeometry::outerRadius(PFGeometry::BeamPipe), 
-					   PFGeometry::outerZ(PFGeometry::BeamPipe), false);
+      theInnerParticle.setPropagationConditions(pfGeometry_.outerRadius(PFGeometry::BeamPipe), 
+					   pfGeometry_.outerZ(PFGeometry::BeamPipe), false);
       theInnerParticle.propagate();
       if(theInnerParticle.getSuccess()!=0)
 	pftrack.addPoint(PFTrajectoryPoint(-1,PFTrajectoryPoint::BeamPipeOrEndVertex,
@@ -628,8 +627,8 @@ PFTrackTransformer::addPointsAndBrems( reco::GsfPFRecTrack& pftrack,
 			    0.,0.,B_.z());
   theInnerParticle.setCharge(track.charge());   // Use the chargeMode ??   
   //BEAMPIPE
-  theInnerParticle.setPropagationConditions(PFGeometry::outerRadius(PFGeometry::BeamPipe), 
-					    PFGeometry::outerZ(PFGeometry::BeamPipe), false);
+  theInnerParticle.setPropagationConditions(pfGeometry_.outerRadius(PFGeometry::BeamPipe), 
+					    pfGeometry_.outerZ(PFGeometry::BeamPipe), false);
   theInnerParticle.propagate();
   if(theInnerParticle.getSuccess()!=0)
     pftrack.addPoint(PFTrajectoryPoint(-1,PFTrajectoryPoint::BeamPipeOrEndVertex,