Change JetCorrector::correction(jet,event,setup) to JetCorrector::cor…

…rection(jet,jetRef,event,setup), see ChangeLog for details.

JetMETCorrections/Objects/ChangeLog

@@ -0,0 +1,17 @@
+2009-11-10  Philipp SCHIEFERDECKER  <[email protected]>
+
+	* change JetCorrector::correction(jet,evt,setup) interface to also
+	contain an edm::RefToBase<reco::Jet> fJetRef.
+	* this is useful because extra information about a given jet in
+	the event is typically keyed by such a reference
+	* note that the reference is always w.r.t. the original
+	uncorrected jet, not the jet from the last correction level (as
+	the information would have been lost by creating a new jet object)
+	* this should not impact any existing correctors, as non was
+	implementing this particular interface so far
+	* the motivation is the introduction of the new L6SLBCorrector in
+	JetMETCorrections/Algorithms, which corrects for leptonic decays
+	within a jet and therefore needs to access tagging information for
+	each jet in order to determine if a reconstructed muon could be
+	matched and if yes, to get to it kinematics
+

JetMETCorrections/Objects/interface/ChainedJetCorrector.h

@@ -1,6 +1,6 @@
 //
 // Original Author:  Fedor Ratnikov Dec 27, 2006
-// $Id: JetCorrector.h,v 1.4 2007/11/01 21:54:48 fedor Exp $
+// $Id: ChainedJetCorrector.h,v 1.1 2008/02/29 23:00:36 fedor Exp $
 //
 // Correction which chains other corrections
 //
@@ -13,21 +13,25 @@
 #include "JetMETCorrections/Objects/interface/JetCorrector.h"
 
 
-class ChainedJetCorrector : public JetCorrector {
- public:
+class ChainedJetCorrector : public JetCorrector
+{
+public:
   ChainedJetCorrector (){}
-  virtual ~ChainedJetCorrector (){}
+  virtual ~ChainedJetCorrector () {}
 
   virtual double correction (const JetCorrector::LorentzVector& fJet) const;
   virtual double correction (const reco::Jet& fJet) const;
-  virtual double correction (const reco::Jet& fJet, const edm::Event& fEvent, const edm::EventSetup& fSetup) const;
-
+  virtual double correction (const reco::Jet& fJet,
+			     const edm::RefToBase<reco::Jet>& fJetRef,
+			     const edm::Event& fEvent,
+			     const edm::EventSetup& fSetup) const;
+
   virtual bool eventRequired () const;
-	  
+
   void push_back (const JetCorrector* fCorrector) {mCorrectors.push_back (fCorrector);}
   void clear () {mCorrectors.clear ();}
-	  
- private:
+
+private:
   std::vector <const JetCorrector*> mCorrectors;
 };
 

JetMETCorrections/Objects/interface/JetCorrector.h

@@ -1,6 +1,6 @@
 //
 // Original Author:  Fedor Ratnikov Dec 27, 2006
-// $Id: JetCorrector.h,v 1.4 2007/11/01 21:54:48 fedor Exp $
+// $Id: JetCorrector.h,v 1.5 2009/09/24 13:08:31 bainbrid Exp $
 //
 // Generic interface for JetCorrection services
 //
@@ -32,7 +32,8 @@ class JetCorrector
   virtual double correction (const reco::Jet& fJet) const = 0;
 
   /// apply correction using all event information
-  virtual double correction (const reco::Jet& fJet, 
+  virtual double correction (const reco::Jet& fJet,
+			     const edm::RefToBase<reco::Jet>& fJetRef,
 			     const edm::Event& fEvent, 
 			     const edm::EventSetup& fSetup) const;
 

JetMETCorrections/Objects/src/ChainedJetCorrector.cc

@@ -1,14 +1,15 @@
 //
 // Original Author:  Fedor Ratnikov Feb. 16, 2007
-// $Id: SimpleJetCorrector.cc,v 1.1 2007/02/16 23:32:16 fedor Exp $
+// $Id: ChainedJetCorrector.cc,v 1.1 2008/02/29 23:00:36 fedor Exp $
 //
 // Correction which chains other corrections
 //
 
 #include "JetMETCorrections/Objects/interface/ChainedJetCorrector.h"
 
 /// get correction using Jet information only
-double ChainedJetCorrector::correction (const LorentzVector& fJet) const {
+double ChainedJetCorrector::correction (const LorentzVector& fJet) const
+{
   LorentzVector jet = fJet;
   double result = 1;
   for (size_t i = 0; i < mCorrectors.size (); ++i) {
@@ -20,7 +21,8 @@ double ChainedJetCorrector::correction (const LorentzVector& fJet) const {
 }
 
 /// apply correction using Jet information only
-double ChainedJetCorrector::correction (const reco::Jet& fJet) const {
+double ChainedJetCorrector::correction (const reco::Jet& fJet) const
+{
   std::auto_ptr<reco::Jet> jet (dynamic_cast<reco::Jet*> (fJet.clone ()));
   double result = 1;
   for (size_t i = 0; i < mCorrectors.size (); ++i) {
@@ -32,19 +34,24 @@ double ChainedJetCorrector::correction (const reco::Jet& fJet) const {
 }
 
 /// apply correction using all event information
-double ChainedJetCorrector::correction (const reco::Jet& fJet, const edm::Event& fEvent, const edm::EventSetup& fSetup) const {
+double ChainedJetCorrector::correction (const reco::Jet& fJet,
+					const edm::RefToBase<reco::Jet>& fJetRef,
+					const edm::Event& fEvent,
+					const edm::EventSetup& fSetup) const
+{
   std::auto_ptr<reco::Jet> jet (dynamic_cast<reco::Jet*> (fJet.clone ()));
   double result = 1;
   for (size_t i = 0; i < mCorrectors.size (); ++i) {
-    double scale = mCorrectors[i]->correction (*jet, fEvent, fSetup);
+    double scale = mCorrectors[i]->correction (*jet, fJetRef, fEvent, fSetup);
     jet->scaleEnergy (scale);
     result *= scale;
   }
   return result;
 }
 
 /// if correction needs event information
-bool ChainedJetCorrector::eventRequired () const {
+bool ChainedJetCorrector::eventRequired () const
+{
   for (size_t i = 0; i < mCorrectors.size (); ++i) {
     if (mCorrectors[i]->eventRequired ()) return true;
   }

JetMETCorrections/Objects/src/JetCorrector.cc

@@ -1,6 +1,6 @@
 //
 // Original Author:  Fedor Ratnikov Dec 27, 2006
-// $Id: JetCorrector.cc,v 1.4 2007/11/01 21:56:37 fedor Exp $
+// $Id: JetCorrector.cc,v 1.5 2009/09/24 13:08:28 bainbrid Exp $
 //
 // Generic interface for JetCorrection services
 //
@@ -13,7 +13,8 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 double JetCorrector::correction (const reco::Jet& fJet, 
-				 const edm::Event& fEvent, 
+				 const edm::RefToBase<reco::Jet>& fJetRef,
+				 const edm::Event& fEvent,
 				 const edm::EventSetup& fSetup) const {
   if (eventRequired ()) {
     edm::LogError ("Missing Jet Correction Method")