---

yaml
---
r: 23583
b: "refs/heads/CMSSW_7_0_X"
c: 7e1d86d
h: "refs/heads/CMSSW_7_0_X"
i:
  23581: 054a255
  23579: 1bdb0e9
  23575: 3f05107
  23567: 4c1a571
  23551: 847f8e2

[refs]

@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_7_0_X": dccdd7b5984666ed22c55eb8aeddad1b40453bed
+"refs/heads/CMSSW_7_0_X": 7e1d86d1401d5b2f8356ac67adb2310c2a3dfca9

trunk/RecoParticleFlow/PFBlockProducer/interface/PFBlockProducer.h

@@ -45,7 +45,7 @@ class PFBlockProducer : public edm::EDProducer {
  private:
 
 
-  /// module label for retrieving input rec tracks, see PFTrackProducer
+  /// module label for retrieving input rec tracks, see PFSimParticleProducer
   std::string recTrackModuleLabel_;
 
   /// module label for retrieving PFClusters

trunk/RecoParticleFlow/PFBlockProducer/interface/PFSimParticleProducer.h

@@ -0,0 +1,104 @@
+#ifndef RecoParticleFlow_PFSimParticleProducer_h_
+#define RecoParticleFlow_PFSimParticleProducer_h_
+
+// system include files
+#include <memory>
+#include <string>
+
+// user include files
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+#include "RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "RecoParticleFlow/PFBlockAlgo/interface/PFGeometry.h"
+
+#include "DataFormats/ParticleFlowReco/interface/PFRecTrackFwd.h"
+
+#include "RecoParticleFlow/PFBlockAlgo/interface/PFBlockAlgo.h"
+
+
+/**\class PFSimParticleProducer 
+\brief Producer for PFRecTracks and PFSimParticles
+
+\todo Remove the PFRecTrack part, which is now handled by PFTracking
+\author Colin Bernet
+\date   April 2007
+*/
+
+class FSimEvent;
+
+
+
+class PFSimParticleProducer : public edm::EDProducer {
+ public:
+
+  explicit PFSimParticleProducer(const edm::ParameterSet&);
+
+  ~PFSimParticleProducer();
+
+  virtual void produce(edm::Event&, const edm::EventSetup&);
+
+  virtual void beginJob(const edm::EventSetup & c);
+
+ private:
+
+  /// process reconstructed tracks 
+  void processRecTracks(std::auto_ptr< reco::PFRecTrackCollection >&
+			trackCollection,
+			edm::Event& iEvent,
+			const edm::EventSetup& iSetup);
+
+
+  /// Get position of track on a given surface
+  TrajectoryStateOnSurface 
+    getStateOnSurface(PFGeometry::Surface_t iSurf, 
+		      const TrajectoryStateOnSurface& tsos, 
+		      const Propagator& propagator, 
+		      int& side);
+
+  /// module label for retrieving input rec tracks 
+  std::string recTrackModuleLabel_;
+
+  /// module label for retrieving input simtrack and simvertex
+  std::string simModuleLabel_;  
+
+  // parameters used for track reconstruction --------------
+
+  TrackProducerAlgorithm trackAlgo_;
+  std::string            fitterName_;
+  std::string            propagatorName_;
+  std::string            builderName_;
+
+
+
+  // geometry, for track and particle extrapolation --------
+
+  //Renaud: Surfaces are now accessed from PFAlgo/interface/PFGeometry.h
+/*   ReferenceCountingPointer<Surface> beamPipe_; */
+/*   ReferenceCountingPointer<Surface> ps1Wall_; */
+/*   ReferenceCountingPointer<Surface> ps2Wall_; */
+/*   ReferenceCountingPointer<Surface> ecalInnerWall_; */
+/*   ReferenceCountingPointer<Surface> hcalInnerWall_; */
+
+  // parameters for retrieving true particles information --
+
+  edm::ParameterSet vertexGenerator_;
+  edm::ParameterSet particleFilter_;
+  FSimEvent* mySimEvent;
+
+  // flags for the various tasks ---------------------------
+
+  /// process RecTracks on/off
+  bool   processRecTracks_;
+
+  /// process particles on/off
+  bool   processParticles_;
+};
+
+#endif

trunk/RecoParticleFlow/PFBlockProducer/src/SealModule.cc

@@ -2,7 +2,7 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/InputSourceMacros.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "RecoParticleFlow/PFBlockProducer/interface/PFTrackProducer.h"
+#include "RecoParticleFlow/PFBlockProducer/interface/PFSimParticleProducer.h"
 #include "RecoParticleFlow/PFBlockProducer/interface/PFBlockProducer.h"
 #include "RecoParticleFlow/PFBlockProducer/interface/TauHadronDecayFilter.h"
 #include "RecoParticleFlow/PFBlockProducer/interface/EFilter.h"
@@ -11,7 +11,7 @@
 DEFINE_SEAL_MODULE();
 
 DEFINE_ANOTHER_FWK_MODULE(PFBlockProducer);
-DEFINE_ANOTHER_FWK_MODULE(PFTrackProducer);
+DEFINE_ANOTHER_FWK_MODULE(PFSimParticleProducer);
 DEFINE_ANOTHER_FWK_MODULE(TauHadronDecayFilter);
 DEFINE_ANOTHER_FWK_MODULE(EFilter);
 // DEFINE_ANOTHER_FWK_MODULE(PFJetCandidateCreator);