Filename consistency and other minor changes to complete TICL->PF wor…

…kflow
cms-sw · Sep 19, 2019 · ab24ac4 · ab24ac4
1 parent cd2e586
commit ab24ac4
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/RecoHGCal/TICL/interface/TICLCandidateBuilderPlugins.h b/RecoHGCal/TICL/interface/TICLCandidateBuilderPlugins.h
@@ -1,5 +1,5 @@
-#ifndef RecoHGCal_TICL_TICLCandidateBuilderPlugins_H__
-#define RecoHGCal_TICL_TICLCandidateBuilderPlugins_H__
+#ifndef RecoHGCal_TICL_TracksterMomentumPluginBase_H__
+#define RecoHGCal_TICL_TracksterMomentumPluginBase_H__
 
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"

diff --git a/RecoHGCal/TICL/interface/TracksterMomentumPluginBase.h b/RecoHGCal/TICL/interface/TracksterMomentumPluginBase.h
@@ -0,0 +1,36 @@
+#ifndef RecoHGCal_TICL_TracksterMomentumPluginBase_H__
+#define RecoHGCal_TICL_TracksterMomentumPluginBase_H__
+
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
+#include "DataFormats/HGCalReco/interface/Trackster.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/PluginManager/interface/PluginFactory.h"
+
+namespace ticl {
+  class TracksterMomentumPluginBase {
+  public:
+    // TracksterMomentumPluginBase() {}
+    TracksterMomentumPluginBase(const edm::ParameterSet&, edm::ConsumesCollector&& iC) {}
+    typedef reco::Candidate::LorentzVector LorentzVector;
+    virtual ~TracksterMomentumPluginBase(){};
+    virtual LorentzVector calcP4(const ticl::Trackster& trackster) const = 0;
+
+    edm::Event& evt() { return *evt_; }
+
+    // To be 
+    void beginEvent(edm::Event& evt) {
+       evt_ = &evt;
+       this->beginEvt();
+     }
+  private:
+    virtual void beginEvt() = 0;
+    edm::Event* evt_;
+  };
+} // namespace
+
+typedef edmplugin::PluginFactory<ticl::TracksterMomentumPluginBase*(const edm::ParameterSet&, edm::ConsumesCollector&& iC)> TracksterMomentumPluginFactory;
+
+#endif
diff --git a/RecoHGCal/TICL/plugins/PFTICLProducer.cc b/RecoHGCal/TICL/plugins/PFTICLProducer.cc
@@ -6,25 +6,12 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
 #include "DataFormats/Common/interface/View.h"
 
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-
-#include "DataFormats/HGCalReco/interface/TICLCandidate.h"
-
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
 
-#include <unordered_map>
-#include <memory>
-
-#include "CLHEP/Units/SystemOfUnits.h"
-#include "FWCore/Utilities/interface/isFinite.h"
-
-#include "FWCore/Utilities/interface/transform.h"
+#include "DataFormats/HGCalReco/interface/TICLCandidate.h"
 
 class PFTICLProducer : public edm::global::EDProducer<> {
 public:

diff --git a/RecoHGCal/TICL/plugins/TICLCandidateFromTrackstersProducer.cc b/RecoHGCal/TICL/plugins/TICLCandidateFromTrackstersProducer.cc
@@ -16,7 +16,7 @@
 
 #include "DataFormats/HGCalReco/interface/TICLCandidate.h"
 #include "DataFormats/HGCalReco/interface/Trackster.h"
-#include "RecoHGCal/TICL/interface/TICLCandidateBuilderPlugins.h"
+#include "RecoHGCal/TICL/interface/TracksterMomentumPluginBase.h"
 
 using namespace ticl;
 

diff --git a/RecoHGCal/TICL/plugins/TracksterP4FromEnergySumPlugin.cc b/RecoHGCal/TICL/plugins/TracksterP4FromEnergySumPlugin.cc
@@ -1,7 +1,7 @@
 #include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "RecoHGCal/TICL/interface/TICLCandidateBuilderPlugins.h"
+#include "RecoHGCal/TICL/interface/TracksterMomentumPluginBase.h"
 
 namespace ticl {
   class TracksterP4FromEnergySum final : public TracksterMomentumPluginBase {

diff --git a/RecoHGCal/TICL/src/TracksterMomentumPluginBase.cc b/RecoHGCal/TICL/src/TracksterMomentumPluginBase.cc
@@ -0,0 +1,4 @@
+#include "RecoHGCal/TICL/interface/TracksterMomentumPluginBase.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+EDM_REGISTER_PLUGINFACTORY(TracksterMomentumPluginFactory, "TracksterMomentumPluginFactory");