My cmssw 7 2 0 including new muon validation scripts

CondFormats/JetMETObjects/interface/JetCorrectorParameters.h

@@ -14,6 +14,7 @@
 #include <algorithm>
 #include <iostream>
 #include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 class JetCorrectorParameters 
 {

CondFormats/JetMETObjects/interface/Utilities.h

@@ -4,7 +4,7 @@
 #ifdef STANDALONE
 #include <stdexcept>
 #else
-#include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #endif
 
 #include <cstdlib>
@@ -22,7 +22,7 @@ namespace
     sserr<<fClass<<" ERROR: "<<fMessage;
     throw std::runtime_error(sserr.str());
 #else
-    throw cms::Exception(fClass)<<fMessage;
+    edm::LogError(fClass) << fMessage;
 #endif
   }
   //----------------------------------------------------------------------

CondFormats/JetMETObjects/src/JetCorrectionUncertainty.cc

@@ -1,7 +1,7 @@
 #include "CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h"
 #include "CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h"
 #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Math/PtEtaPhiE4D.h"
 #include "Math/Vector3D.h"
 #include "Math/LorentzVector.h"
@@ -114,54 +114,81 @@ std::vector<float> JetCorrectionUncertainty::fillVector(const std::vector<std::s
     {
       if (fNames[i] == "JetEta")
         {
-          if (!mIsJetEtaset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" jet eta is not set";
-          result.push_back(mJetEta);
+          if (!mIsJetEtaset) {
+	    edm::LogError("JetCorrectionUncertainty::")<<" jet eta is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mJetEta);
+	  }
         }
       else if (fNames[i] == "JetPt")
         {
-          if (!mIsJetPtset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" jet pt is not set";  
-          result.push_back(mJetPt);
+          if (!mIsJetPtset){
+	    edm::LogError("JetCorrectionUncertainty::")<<" jet pt is not set";  
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mJetPt);
+	  }
         }
       else if (fNames[i] == "JetPhi")
         {
-          if (!mIsJetPhiset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" jet phi is not set";  
-          result.push_back(mJetPt);
+          if (!mIsJetPhiset) {
+	    edm::LogError("JetCorrectionUncertainty::")<<" jet phi is not set";  
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mJetPt);
+	  }
         }
       else if (fNames[i] == "JetE")
         {
-          if (!mIsJetEset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" jet energy is not set";
-          result.push_back(mJetE);
+          if (!mIsJetEset) {
+	    edm::LogError("JetCorrectionUncertainty::")<<" jet energy is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mJetE);
+	  }
         }
       else if (fNames[i] == "JetEMF")
         {
-          if (!mIsJetEMFset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" jet emf is not set";
-          result.push_back(mJetEMF);
+          if (!mIsJetEMFset) {
+	    edm::LogError("JetCorrectionUncertainty::")<<" jet emf is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mJetEMF);
+	  }
         } 
       else if (fNames[i] == "LepPx")
         {
-          if (!mIsLepPxset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" lepton px is not set";  
-          result.push_back(mLepPx);
+          if (!mIsLepPxset){
+	    edm::LogError("JetCorrectionUncertainty::")<<" lepton px is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mLepPx);
+	  }
         }
       else if (fNames[i] == "LepPy")
         {
-          if (!mIsLepPyset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" lepton py is not set";  
-          result.push_back(mLepPy);
+          if (!mIsLepPyset){
+	    edm::LogError("JetCorrectionUncertainty::")<<" lepton py is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mLepPy);
+	  }
         }
       else if (fNames[i] == "LepPz")
         {
-          if (!mIsLepPzset)
-            throw cms::Exception("JetCorrectionUncertainty::")<<" lepton pz is not set";  
-          result.push_back(mLepPz);
+          if (!mIsLepPzset){
+	    edm::LogError("JetCorrectionUncertainty::")<<" lepton pz is not set";
+	    result.push_back(-999.0);
+	  } else {
+	    result.push_back(mLepPz);
+	  }
         }
-      else
-        throw cms::Exception("JetCorrectionUncertainty::")<<" unknown parameter "<<fNames[i];
+
+      else {
+	edm::LogError("JetCorrectionUncertainty::")<<" unknown parameter "<<fNames[i];
+	result.push_back(-999.0);
+      }
     }     
   return result;      
 }
@@ -184,15 +211,17 @@ float JetCorrectionUncertainty::getPtRel()
   float lj_z = (mAddLepToJet) ? lep.Z()+jet.Pz() : jet.Pz();
   // absolute values squared
   float lj2  = lj_x*lj_x+lj_y*lj_y+lj_z*lj_z;
-  if (!(lj2 > 0))
-    throw cms::Exception("JetCorrectionUncertainty")<<" not positive lepton-jet momentum: "<<lj2;
-  float lep2 = lep.X()*lep.X()+lep.Y()*lep.Y()+lep.Z()*lep.Z();
-  // projection vec(mu) to lepjet axis
-  float lepXlj = lep.X()*lj_x+lep.Y()*lj_y+lep.Z()*lj_z;
-  // absolute value squared and normalized
-  float pLrel2 = lepXlj*lepXlj/lj2;
-  // lep2 = pTrel2 + pLrel2
-  float pTrel2 = lep2-pLrel2;
+  float pTrel2 = -999.0;
+  if (lj2 > 0) {
+    float lep2 = lep.X()*lep.X()+lep.Y()*lep.Y()+lep.Z()*lep.Z();
+    // projection vec(mu) to lepjet axis
+    float lepXlj = lep.X()*lj_x+lep.Y()*lj_y+lep.Z()*lj_z;
+    // absolute value squared and normalized
+    float pLrel2 = lepXlj*lepXlj/lj2;
+    // lep2 = pTrel2 + pLrel2
+    pTrel2 = lep2-pLrel2;
+  } else
+    edm::LogError("JetCorrectionUncertainty")<<" not positive lepton-jet momentum: "<<lj2;
   return (pTrel2 > 0) ? std::sqrt(pTrel2) : 0.0;
 }
 //------------------------------------------------------------------------ 

CondFormats/JetMETObjects/src/SimpleJetCorrectionUncertainty.cc

@@ -1,6 +1,6 @@
 #include "CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h"
 #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <vector>
 #include <string>
 
@@ -29,16 +29,20 @@ float SimpleJetCorrectionUncertainty::uncertainty(const std::vector<float>& fX,
 {
   float result = 1.;
   int bin = mParameters->binIndex(fX);
-  if (bin<0) 
-    throw cms::Exception("SimpleJetCorrectionUncertainty")<<" bin variables out of range";
-  result = uncertaintyBin((unsigned)bin,fY,fDirection);
+  if (bin<0) {
+    edm::LogError("SimpleJetCorrectionUncertainty")<<" bin variables out of range";
+    result = -999.0;
+  } else 
+    result = uncertaintyBin((unsigned)bin,fY,fDirection);
   return result;
 }
 /////////////////////////////////////////////////////////////////////////
 float SimpleJetCorrectionUncertainty::uncertaintyBin(unsigned fBin, float fY, bool fDirection) const 
 {
-  if (fBin >= mParameters->size()) 
-    throw cms::Exception("SimpleJetCorrectionUncertainty")<<" wrong bin: "<<fBin<<": only "<<mParameters->size()<<" are available";
+  if (fBin >= mParameters->size()) { 
+    edm::LogError("SimpleJetCorrectionUncertainty")<<" wrong bin: "<<fBin<<": only "<<mParameters->size()<<" are available";
+    return -999.0;
+  }
   const std::vector<float>& p = mParameters->record(fBin).parameters();
   if ((p.size() % 3) != 0)
     throw cms::Exception ("SimpleJetCorrectionUncertainty")<<"wrong # of parameters: multiple of 3 expected, "<<p.size()<< " got";
@@ -81,8 +85,10 @@ float SimpleJetCorrectionUncertainty::linearInterpolation(float fZ, const float
     {
       if (fY[0] == fY[1])
         r = fY[0];
-      else
-        throw cms::Exception("SimpleJetCorrectionUncertainty")<<" interpolation error";
+      else {
+	edm::LogError("SimpleJetCorrectionUncertainty")<<" interpolation error";
+	return -999.0;
+      }
     } 
   else   
     {

Configuration/EventContent/python/EventContent_cff.py

@@ -718,6 +718,7 @@
       'drop *_kt6GenJets_*_*',
       'drop *_iterativeCone5GenJets_*_*',
       'drop *_ak4GenJets_*_*',
+      'drop *_ak5GenJets_*_*',
       'drop *_ak7GenJets_*_*',
       'drop *_genCandidatesForMET_*_*',
       'drop *_genParticlesForMETAllVisible_*_*',

DQM/EcalCommon/interface/DQWorker.h

@@ -57,7 +57,6 @@ namespace ecaldqm{
     virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
     virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
 
-    virtual void bookMEs(DQMStore&);
     virtual void bookMEs(DQMStore::IBooker&);
     virtual void releaseMEs();
 
@@ -74,6 +73,7 @@ namespace ecaldqm{
 
     std::string name_;
     MESetCollection MEs_;
+    bool booked_;
 
     Timestamp timestamp_;
     int verbosity_;

DQM/EcalCommon/interface/EcalDQMonitor.h

@@ -7,6 +7,7 @@
 #include "DQWorker.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 namespace edm
 {
@@ -27,8 +28,6 @@ namespace ecaldqm
 
   protected:
     void ecaldqmGetSetupObjects(edm::EventSetup const&);
-    template<typename Booker> void ecaldqmBookHistograms(Booker&);
-    void ecaldqmReleaseHistograms();
     void ecaldqmBeginRun(edm::Run const&, edm::EventSetup const&);
     void ecaldqmEndRun(edm::Run const&, edm::EventSetup const&);
     void ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
@@ -41,16 +40,6 @@ namespace ecaldqm
     int const verbosity_;
   };
 
-  template<typename Booker>
-    void
-    EcalDQMonitor::ecaldqmBookHistograms(Booker& _booker)
-    {
-      executeOnWorkers_([&_booker](ecaldqm::DQWorker* worker){
-          worker->releaseMEs();
-          worker->bookMEs(_booker);
-        }, "bookMEs", "Booking MEs");
-    }
-
   template<typename FuncOnWorker>
     void
     EcalDQMonitor::executeOnWorkers_(FuncOnWorker _func, std::string const& _context, std::string const& _message/* = ""*/, int _verbThreshold/* = 1*/)

DQM/EcalCommon/interface/EcalMEFormatter.h

@@ -1,24 +1,23 @@
 #ifndef EcalMEFormatter_H
 #define EcalMEFormatter_H
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 
 #include "DQM/EcalCommon/interface/DQWorker.h"
 #include "DQM/EcalCommon/interface/MESet.h"
 
-class EcalMEFormatter : public edm::EDAnalyzer, public ecaldqm::DQWorker {
+class EcalMEFormatter : public DQMEDHarvester, public ecaldqm::DQWorker {
  public:
   EcalMEFormatter(edm::ParameterSet const&);
   ~EcalMEFormatter() {};
 
   static void fillDescriptions(edm::ConfigurationDescriptions&);
 
  private:
-  void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
-  void analyze(edm::Event const&, edm::EventSetup const&) override {}
+  void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
 
-  void format_(bool);
+  void format_(DQMStore::IGetter&, bool);
   void formatDet2D_(ecaldqm::MESet&);
 };
 

DQM/EcalCommon/interface/MESet.h

@@ -39,9 +39,8 @@ namespace ecaldqm
 
     virtual MESet* clone(std::string const& = "") const;
 
-    virtual void book(DQMStore&) {}
     virtual void book(DQMStore::IBooker&) {}
-    virtual bool retrieve(DQMStore const&, std::string* = 0) const { return false; }
+    virtual bool retrieve(DQMStore::IGetter&, std::string* = 0) const { return false; }
     virtual void clear() const;
 
     virtual void fill(DetId const&, double = 1., double = 1., double = 1.) {}

DQM/EcalCommon/interface/MESetBinningUtils.h

@@ -72,16 +72,16 @@ namespace ecaldqm
 
     struct AxisSpecs {
       int nbins;
-      double low, high;
-      double* edges;
+      float low, high;
+      float* edges;
       std::string* labels;
       std::string title;
       AxisSpecs() : nbins(0), low(0.), high(0.), edges(0), labels(0), title("") {}
       AxisSpecs(AxisSpecs const& _specs) :
         nbins(_specs.nbins), low(_specs.low), high(_specs.high), edges(0), labels(0), title(_specs.title)
       {
         if(_specs.edges){
-          edges = new double[nbins + 1];
+          edges = new float[nbins + 1];
           for(int i(0); i <= nbins; i++) edges[i] = _specs.edges[i];
         }
         if(_specs.labels){
@@ -95,7 +95,7 @@ namespace ecaldqm
         if(labels){ delete [] labels; labels = 0; }
         nbins = _rhs.nbins; low = _rhs.low; high = _rhs.high; title = _rhs.title;
         if(_rhs.edges){
-          edges = new double[nbins + 1];
+          edges = new float[nbins + 1];
           for(int i(0); i <= nbins; i++) edges[i] = _rhs.edges[i];
         }
         if(_rhs.labels){

DQM/EcalCommon/interface/MESetChannel.h

@@ -27,9 +27,8 @@ namespace ecaldqm
 
     MESet* clone(std::string const& = "") const override;
 
-    void book(DQMStore&) override;
     void book(DQMStore::IBooker&) override;
-    bool retrieve(DQMStore const&, std::string* = 0) const override;
+    bool retrieve(DQMStore::IGetter&, std::string* = 0) const override;
     void clear() const override;
 
     void fill(DetId const&, double = 1., double = 0., double = 0.) override;

DQM/EcalCommon/interface/MESetDet1D.h

@@ -20,7 +20,6 @@ namespace ecaldqm
 
     MESet* clone(std::string const& = "") const override;
 
-    void book(DQMStore&) override;
     void book(DQMStore::IBooker&) override;
 
     void fill(DetId const&, double = 1., double = 1., double = 0.) override;
@@ -68,9 +67,6 @@ namespace ecaldqm
     int findBin(int, double, double = 0.) const override;
 
     void reset(double = 0., double = 0., double = 0.) override;
-
-  private:
-    template<class Bookable> void doBook_(Bookable&);
   };
 }
 

DQM/EcalCommon/interface/MESetDet2D.h

@@ -18,7 +18,6 @@ namespace ecaldqm
 
     MESet* clone(std::string const& = "") const override;
 
-    void book(DQMStore&) override;
     void book(DQMStore::IBooker&) override;
 
     void fill(DetId const&, double = 1., double = 0., double = 0.) override;
@@ -60,9 +59,6 @@ namespace ecaldqm
     void fill_(unsigned, int, double) override;
     void fill_(unsigned, int, double, double) override;
     void fill_(unsigned, double, double, double) override;
-
-  private:
-    template<class Bookable> void doBook_(Bookable&);
   };
 }