Tau Embedding update and integration

DataFormats/EgammaCandidates/src/classes_def.xml

@@ -239,6 +239,13 @@
    <version ClassVersion="3" checksum="3868678681"/>
   </class>
 
+  <!-- ValueMap<reco::GsfTrack> -->
+  <class name="edm::ValueMap<reco::GsfTrackRefVector>" />
+  <class name="edm::Wrapper<edm::ValueMap<reco::GsfTrackRefVector> >" />
+  <class name="std::vector<edm::RefVector<std::vector<reco::GsfTrack>,reco::GsfTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfTrack>,reco::GsfTrack> > >"/>
+  <class name="edm::Wrapper<edm::RefVector<std::vector<reco::GsfTrack>,reco::GsfTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfTrack>,reco::GsfTrack> > >"/>
+  <class name="std::vector<edm::Ref<std::vector<reco::GsfTrack>,reco::GsfTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfTrack>,reco::GsfTrack> > >"/>
+
   <class name="reco::GsfElectron" ClassVersion="20">
    <version ClassVersion="20" checksum="2375747450"/>
    <version ClassVersion="19" checksum="1682285704"/>

TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml

@@ -1,12 +1,14 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
-<use name="DataFormats/PatCandidates"/>
 <use name="pythia8"/>
 <use name="DataFormats/RPCRecHit"/>
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/HcalRecHit"/>
 <use name="TrackingTools/TrackAssociator"/>
-<use name="DataFormats/TrackReco"/>
 <use name="CondFormats/BeamSpotObjects"/>
 <use name="SimDataFormats/GeneratorProducts"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="PhysicsTools/UtilAlgos"/>
+<use name="CondFormats/JetMETObjects"/>
+<use name="JetMETCorrections/Objects"/>
+<use name="JetMETCorrections/JetCorrector"/>
+<use name="RecoMET/METAlgorithms"/>
 <flags EDM_PLUGIN="1"/>

TauAnalysis/MCEmbeddingTools/plugins/CaloCleaner.cc

@@ -5,23 +5,92 @@
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HORecHit.h"
 #include "DataFormats/HcalRecHit/interface/ZDCRecHit.h"
-#include "DataFormats/HcalRecHit/interface/CastorRecHit.h"
 
 typedef CaloCleaner<EcalRecHit> EcalRecHitColCleaner;
 typedef CaloCleaner<HBHERecHit> HBHERecHitColCleaner;
 typedef CaloCleaner<HFRecHit> HFRecHitColCleaner;
 typedef CaloCleaner<HORecHit> HORecHitColCleaner;
-typedef CaloCleaner<CastorRecHit> CastorRecHitColCleaner;
 typedef CaloCleaner<ZDCRecHit> ZDCRecHitColCleaner;
 
+template <typename T>
+CaloCleaner<T>::CaloCleaner(const edm::ParameterSet &iConfig)
+    : mu_input_(consumes<edm::View<pat::Muon>>(iConfig.getParameter<edm::InputTag>("MuonCollection"))),
+      propagatorToken_(esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))) {
+  std::vector<edm::InputTag> inCollections = iConfig.getParameter<std::vector<edm::InputTag>>("oldCollection");
+  for (const auto &inCollection : inCollections) {
+    inputs_[inCollection.instance()] = consumes<RecHitCollection>(inCollection);
+    produces<RecHitCollection>(inCollection.instance());
+  }
+
+  is_preshower_ = iConfig.getUntrackedParameter<bool>("is_preshower", false);
+  edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
+  edm::ConsumesCollector iC = consumesCollector();
+  parameters_.loadParameters(parameters, iC);
+}
+
+template <typename T>
+CaloCleaner<T>::~CaloCleaner() {
+  // nothing to be done yet...
+}
+
+template <typename T>
+void CaloCleaner<T>::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  auto const &propagator = iSetup.getData(propagatorToken_);
+  trackAssociator_.setPropagator(&propagator);
+
+  edm::Handle<edm::View<pat::Muon>> muonHandle;
+  iEvent.getByToken(mu_input_, muonHandle);
+  edm::View<pat::Muon> muons = *muonHandle;
+
+  std::map<uint32_t, float> correction_map;
+
+  // Fill the correction map
+  for (edm::View<pat::Muon>::const_iterator iMuon = muons.begin(); iMuon != muons.end(); ++iMuon) {
+    const reco::Track *track = nullptr;
+    if (iMuon->track().isNonnull())
+      track = iMuon->track().get();
+    else if (iMuon->standAloneMuon().isNonnull())
+      track = iMuon->standAloneMuon().get();
+    else
+      throw cms::Exception("FatalError")
+          << "Failed to fill muon id information for a muon with undefined references to tracks";
+    TrackDetMatchInfo info =
+        trackAssociator_.associate(iEvent, iSetup, *track, parameters_, TrackDetectorAssociator::Any);
+    fill_correction_map(&info, &correction_map);
+  }
+
+  // Copy the old collection and correct if necessary
+  for (auto input_ : inputs_) {
+    std::unique_ptr<RecHitCollection> recHitCollection_output(new RecHitCollection());
+    edm::Handle<RecHitCollection> recHitCollection;
+    iEvent.getByToken(input_.second, recHitCollection);
+    for (typename RecHitCollection::const_iterator recHit = recHitCollection->begin();
+         recHit != recHitCollection->end();
+         ++recHit) {
+      if (correction_map[recHit->detid().rawId()] > 0) {
+        float new_energy = recHit->energy() - correction_map[recHit->detid().rawId()];
+        if (new_energy <= 0)
+          continue;  // Do not save empty Hits
+        T newRecHit(*recHit);
+        newRecHit.setEnergy(new_energy);
+        recHitCollection_output->push_back(newRecHit);
+      } else {
+        recHitCollection_output->push_back(*recHit);
+      }
+    }
+    // Save the new collection
+    recHitCollection_output->sort();
+    iEvent.put(std::move(recHitCollection_output), input_.first);
+  }
+}
+
 //-------------------------------------------------------------------------------
 // define 'buildRecHit' functions used for different types of recHits
 //-------------------------------------------------------------------------------
 
 template <typename T>
 void CaloCleaner<T>::fill_correction_map(TrackDetMatchInfo *, std::map<uint32_t, float> *) {
-  assert(0);  // CV: make sure general function never gets called;
-              //     always use template specializations
+  assert(0);
 }
 
 template <>
@@ -36,7 +105,6 @@ void CaloCleaner<EcalRecHit>::fill_correction_map(TrackDetMatchInfo *info, std::
     for (std::vector<const EcalRecHit *>::const_iterator hit = info->crossedEcalRecHits.begin();
          hit != info->crossedEcalRecHits.end();
          hit++) {
-      //    (*cor_map) [(*hit)->detid().rawId()] +=(*hit)->energy();
       (*cor_map)[(*hit)->detid().rawId()] = (*hit)->energy();
     }
   }
@@ -65,20 +133,14 @@ void CaloCleaner<HFRecHit>::fill_correction_map(TrackDetMatchInfo *info, std::ma
   return;  // No corrections for HF
 }
 
-template <>
-void CaloCleaner<CastorRecHit>::fill_correction_map(TrackDetMatchInfo *info, std::map<uint32_t, float> *cor_map) {
-  return;  // No corrections for Castor
-}
-
 template <>
 void CaloCleaner<ZDCRecHit>::fill_correction_map(TrackDetMatchInfo *info, std::map<uint32_t, float> *cor_map) {
-  return;  // No corrections for Castor
+  return;  // No corrections for ZDC
 }
 
 DEFINE_FWK_MODULE(EcalRecHitColCleaner);
 DEFINE_FWK_MODULE(HBHERecHitColCleaner);
 DEFINE_FWK_MODULE(HORecHitColCleaner);
 // no  need for cleaning outside of tracker, so just a copy of the old collection
 DEFINE_FWK_MODULE(HFRecHitColCleaner);
-DEFINE_FWK_MODULE(CastorRecHitColCleaner);
 DEFINE_FWK_MODULE(ZDCRecHitColCleaner);

TauAnalysis/MCEmbeddingTools/plugins/CaloCleaner.h

@@ -1,141 +1,55 @@
 /** \class CaloCleaner
  *
  * Clean collections of calorimeter recHits
- * (detectors supported at the moment: EB/EE, HB/HE and HO)
- * 
+ * (detectors supported: EB/EE, HB/HE and HO)
+ *
  * \author Tomasz Maciej Frueboes;
  *         Christian Veelken, LLR
- *
- * 
- *
  *  Clean Up from STefan Wayand, KIT
+ *  Clean Up from Christian Winter & Sebastian Brommer, KIT
  */
 #ifndef TauAnalysis_MCEmbeddingTools_CaloCleaner_H
 #define TauAnalysis_MCEmbeddingTools_CaloCleaner_H
 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/PatCandidates/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonEnergy.h"
+#include "DataFormats/PatCandidates/interface/Muon.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 #include "TrackingTools/TrackAssociator/interface/TrackAssociatorParameters.h"
 #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
-#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
-#include <string>
 #include <iostream>
 #include <map>
+#include <string>
 
 template <typename T>
 class CaloCleaner : public edm::stream::EDProducer<> {
 public:
-  explicit CaloCleaner(const edm::ParameterSet&);
+  explicit CaloCleaner(const edm::ParameterSet &);
   ~CaloCleaner() override;
 
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
   typedef edm::SortedCollection<T> RecHitCollection;
 
-  const edm::EDGetTokenT<edm::View<pat::Muon> > mu_input_;
+  const edm::EDGetTokenT<edm::View<pat::Muon>> mu_input_;
 
-  std::map<std::string, edm::EDGetTokenT<RecHitCollection> > inputs_;
+  std::map<std::string, edm::EDGetTokenT<RecHitCollection>> inputs_;
   edm::ESGetToken<Propagator, TrackingComponentsRecord> propagatorToken_;
 
   TrackDetectorAssociator trackAssociator_;
   TrackAssociatorParameters parameters_;
 
   bool is_preshower_;
-  void fill_correction_map(TrackDetMatchInfo*, std::map<uint32_t, float>*);
+  void fill_correction_map(TrackDetMatchInfo *, std::map<uint32_t, float> *);
 };
-
-template <typename T>
-CaloCleaner<T>::CaloCleaner(const edm::ParameterSet& iConfig)
-    : mu_input_(consumes<edm::View<pat::Muon> >(iConfig.getParameter<edm::InputTag>("MuonCollection"))),
-      propagatorToken_(esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))) {
-  std::vector<edm::InputTag> inCollections = iConfig.getParameter<std::vector<edm::InputTag> >("oldCollection");
-  for (const auto& inCollection : inCollections) {
-    inputs_[inCollection.instance()] = consumes<RecHitCollection>(inCollection);
-    produces<RecHitCollection>(inCollection.instance());
-  }
-
-  is_preshower_ = iConfig.getUntrackedParameter<bool>("is_preshower", false);
-  edm::ParameterSet parameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
-  edm::ConsumesCollector iC = consumesCollector();
-  parameters_.loadParameters(parameters, iC);
-  //trackAssociator_.useDefaultPropagator();
-}
-
-template <typename T>
-CaloCleaner<T>::~CaloCleaner() {
-  // nothing to be done yet...
-}
-
-template <typename T>
-void CaloCleaner<T>::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  auto const& propagator = iSetup.getData(propagatorToken_);
-  trackAssociator_.setPropagator(&propagator);
-
-  edm::Handle<edm::View<pat::Muon> > muonHandle;
-  iEvent.getByToken(mu_input_, muonHandle);
-  edm::View<pat::Muon> muons = *muonHandle;
-
-  std::map<uint32_t, float> correction_map;
-
-  // Fill the correction map
-  for (edm::View<pat::Muon>::const_iterator iMuon = muons.begin(); iMuon != muons.end(); ++iMuon) {
-    // get the basic informaiton like fill reco mouon does
-    //     RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc
-    const reco::Track* track = nullptr;
-    if (iMuon->track().isNonnull())
-      track = iMuon->track().get();
-    else if (iMuon->standAloneMuon().isNonnull())
-      track = iMuon->standAloneMuon().get();
-    else
-      throw cms::Exception("FatalError")
-          << "Failed to fill muon id information for a muon with undefined references to tracks";
-    TrackDetMatchInfo info =
-        trackAssociator_.associate(iEvent, iSetup, *track, parameters_, TrackDetectorAssociator::Any);
-    fill_correction_map(&info, &correction_map);
-  }
-
-  // Copy the old collection and correct if necessary
-  for (auto input_ : inputs_) {
-    std::unique_ptr<RecHitCollection> recHitCollection_output(new RecHitCollection());
-    edm::Handle<RecHitCollection> recHitCollection;
-    // iEvent.getByToken(input_.second[0], recHitCollection);
-    iEvent.getByToken(input_.second, recHitCollection);
-    for (typename RecHitCollection::const_iterator recHit = recHitCollection->begin();
-         recHit != recHitCollection->end();
-         ++recHit) {
-      if (correction_map[recHit->detid().rawId()] > 0) {
-        float new_energy = recHit->energy() - correction_map[recHit->detid().rawId()];
-        if (new_energy <= 0)
-          continue;  // Do not save empty Hits
-        T newRecHit(*recHit);
-        newRecHit.setEnergy(new_energy);
-        recHitCollection_output->push_back(newRecHit);
-      } else {
-        recHitCollection_output->push_back(*recHit);
-      }
-      /* For the inveted collection   
-     if (correction_map[recHit->detid().rawId()] > 0){
-	float new_energy =   correction_map[recHit->detid().rawId()];
-	if (new_energy < 0) new_energy =0;
-	T newRecHit(*recHit);
-	newRecHit.setEnergy(new_energy); 
-	recHitCollection_output->push_back(newRecHit);
-      }*/
-    }
-    // Save the new collection
-    recHitCollection_output->sort();
-    iEvent.put(std::move(recHitCollection_output), input_.first);
-  }
-}
-#endif
+#endif