Merge pull request #3021 from wmtford/newAssoc

SIM -- Substantial clean-up of TrackerHitAssociator
cms-sw · Mar 26, 2014 · 444a788 · 444a788
2 parents 7c6bde8 + ff08c8c
commit 444a788
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 318 deletions.
diff --git a/SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h b/SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h
@@ -63,68 +63,40 @@ class TrackerHitAssociator {
   virtual ~TrackerHitAssociator(){}
 
   std::vector<PSimHit> associateHit(const TrackingRecHit & thit);
-  /*  std::vector<unsigned int> associateHitId(const TrackingRecHit & thit);
-      std::vector<unsigned int> associateSimpleRecHit(const SiStripRecHit2D * simplerechit);
-      std::vector<unsigned int> associateMatchedRecHit(const SiStripMatchedRecHit2D * matchedrechit);
-      std::vector<unsigned int> associatePixelRecHit(const SiPixelRecHit * pixelrechit);
-  */
   //for PU events
   std::vector<SimHitIdpr> associateHitId(const TrackingRecHit & thit);
   void associateHitId(const TrackingRecHit & thit,std::vector<SimHitIdpr> &simhitid);
-  //  std::vector<SimHitIdpr> associateSimpleRecHit(const SiStripRecHit2D * simplerechit);
-  void associateSimpleRecHit(const SiStripRecHit2D * simplerechit,std::vector<SimHitIdpr> & simhitid);
-  void associateSiStripRecHit1D(const SiStripRecHit1D * simplerechit,std::vector<SimHitIdpr> & simhitid);
-  /*
-  void associateSimpleRecHitCluster(const SiStripCluster* clust,
-				    const uint32_t& detID,
-				    std::vector<SimHitIdpr>& theSimtrackid,
-				    std::vector<PSimHit>& clusterSimHits);
-  void associateSimpleRecHitCluster(const SiStripCluster* clust,
-				    const uint32_t& detID,
-				    std::vector<PSimHit>& clusterSimHits);
-  */
+  template<typename T>
+    void associateSiStripRecHit(const T *simplerechit, std::vector<SimHitIdpr>& simtrackid);
   void associateSimpleRecHitCluster(const SiStripCluster* clust,
 				    const uint32_t& detID,
 				    std::vector<SimHitIdpr>& simtrackid);
 
   std::vector<SimHitIdpr> associateMatchedRecHit(const SiStripMatchedRecHit2D * matchedrechit);
   std::vector<SimHitIdpr> associateProjectedRecHit(const ProjectedSiStripRecHit2D * projectedrechit);
-  //  std::vector<SimHitIdpr> associatePixelRecHit(const SiPixelRecHit * pixelrechit);
   void associatePixelRecHit(const SiPixelRecHit * pixelrechit, std::vector<SimHitIdpr> & simhitid);
   std::vector<SimHitIdpr> associateGSRecHit(const SiTrackerGSRecHit2D * gsrechit);
   std::vector<SimHitIdpr> associateMultiRecHitId(const SiTrackerMultiRecHit * multirechit);
   std::vector<PSimHit>    associateMultiRecHit(const SiTrackerMultiRecHit * multirechit);
   std::vector<SimHitIdpr> associateGSMatchedRecHit(const SiTrackerGSMatchedRecHit2D * gsmrechit);
 
-  std::vector<PSimHit> theStripHits;
   typedef std::map<unsigned int, std::vector<PSimHit> > simhit_map;
-  typedef simhit_map::iterator simhit_map_iterator;
   simhit_map SimHitMap;
-  simhit_map SimHitSubdetMap;
-  std::vector<PSimHit> thePixelHits;
 
  private:
   const edm::Event& myEvent_;
   typedef std::vector<std::string> vstring;
   vstring trackerContainers;
 
-  //ADDED NOW AS A PRIVATE MEMBER
   edm::Handle<CrossingFrame<PSimHit> > cf_simhit;
   std::vector<const CrossingFrame<PSimHit> *> cf_simhitvec;
-  /* MixCollection<PSimHit>  TrackerHits; */
 
   edm::Handle< edm::DetSetVector<StripDigiSimLink> >  stripdigisimlink;
   edm::Handle< edm::DetSetVector<PixelDigiSimLink> >  pixeldigisimlink;
   //vector with the trackIds
-  //  std::vector<unsigned int> simtrackid; 
   std::vector<SimHitIdpr> simtrackid; 
-  //vector with the simhits
-  std::vector<int> simhitCFPos;
-  std::vector<PSimHit> simhitassoc;
-  bool StripHits;
 
   bool doPixel_, doStrip_, doTrackAssoc_;
-  bool useCFpos_;
 
 };