rebase -- Merge branch 'CMSSW_7_6_X' into from-CMSSW_7_6_2_relval_rebase

cms-sw · Dec 10, 2015 · ad0e916 · ad0e916
2 parents e97e377 + 9278472
commit ad0e916
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 25 deletions.
diff --git a/Configuration/AlCa/python/autoAlca.py b/Configuration/AlCa/python/autoAlca.py
@@ -1,22 +1,31 @@
-AlCaRecoMatrix = {'ExpressCosmics' : 'SiStripCalZeroBias+TkAlCosmics0T',
-                  'StreamExpress'  : 'SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+DtCalib+Hotline',
-                  'MinimumBias'    : 'SiStripCalMinBias+TkAlMinBias',
+AlCaRecoMatrix = {'AlCaLumiPixels' : 'LumiPixels',
+                  'Charmonium'     : 'TkAlJpsiMuMu',
                   'Commissioning'  : 'HcalCalIsoTrk',
-                  'SingleMu'       : 'MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib',
-                  'DoubleMu'       : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
-                  'MuOnia'         : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
-                  'SingleElectron' : 'EcalCalWElectron+EcalUncalWElectron',
+                  'Cosmics'        : 'TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics',
+                  'DoubleEG'       : 'EcalCalZElectron+EcalUncalZElectron',
                   'DoubleElectron' : 'EcalCalZElectron+EcalUncalZElectron',
-                  'AlCaLumiPixels' : 'LumiPixels',
+                  'DoubleMu'       : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
+                  'DoubleMuon'     : 'TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib',
                   'DoubleMuParked' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
+                  'HLTPhysics'     : 'SiStripCalMinBias+TkAlMinBias',
+                  'JetHT'          : 'HcalCalDijets',
+                  'MET'            : 'HcalCalNoise',
+                  'MinimumBias'    : 'SiStripCalMinBias+TkAlMinBias',
+                  'MuOnia'         : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
                   'MuOniaParked'   : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
-                  'Cosmics'        : 'TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics',
+                  'SingleElectron' : 'EcalCalWElectron+EcalUncalWElectron+EcalCalZElectron+EcalUncalZElectron',
+                  'SingleMu'       : 'MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib+MuAlZMuMu',
+                  'SingleMuon'     : 'TkAlMuonIsolated+DtCalib+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu',
+                  'SinglePhoton'   : 'HcalCalGammaJet',
+                  'StreamExpress'  : 'SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+DtCalib+Hotline',
+                  'ExpressCosmics' : 'SiStripCalZeroBias+TkAlCosmics0T',
                   # These two cannot run on RAW, they are just meant to run on the dedicated AlcaRAW so they do not enter the allForPrompt list
                   'AlCaP0'         : '',
                   # ---------------------------------------------------------------------------------------------------------------------------
                   'HcalNZS'        : 'HcalCalMinBias'
                   # This is in the AlCaRecoMatrix, but no RelVals are produced
                   # 'TestEnablesTracker' : 'TkAlLAS'
+                  # 'TestEnablesEcalHcal' : 'HcalCalPedestal'
                   }
 
 def buildList(pdList, matrix):
@@ -35,7 +44,7 @@ def buildList(pdList, matrix):
     return stringList
 
 # Update the lists anytime a new PD is added to the matrix
-autoAlca = { 'allForPrompt'         : buildList(['MinimumBias', 'Commissioning', 'SingleMu', 'DoubleMu', 'MuOnia', 'DoubleMuParked', 'MuOniaParked', 'SingleElectron', 'DoubleElectron', 'HcalNZS'], AlCaRecoMatrix),
+autoAlca = { 'allForPrompt'         : buildList(['Charmonium', 'Commissioning', 'DoubleEG', 'DoubleElectron', 'DoubleMu', 'DoubleMuParked', 'DoubleMuon', 'HLTPhysics', 'HcalNZS', 'JetHT', 'MET', 'MinimumBias', 'MuOnia', 'MuOniaParked', 'SingleElectron', 'SingleMu', 'SingleMuon', 'SinglePhoton'], AlCaRecoMatrix),
              'allForExpress'        : buildList(['StreamExpress'], AlCaRecoMatrix),
              'allForPromptCosmics'  : buildList(['Cosmics'], AlCaRecoMatrix),
              'allForExpressCosmics' : buildList(['ExpressCosmics'], AlCaRecoMatrix) }

diff --git a/RecoBTag/SecondaryVertex/interface/CandidateBoostedDoubleSecondaryVertexComputer.h b/RecoBTag/SecondaryVertex/interface/CandidateBoostedDoubleSecondaryVertexComputer.h
@@ -15,7 +15,6 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 
 #include "fastjet/PseudoJet.hh"
-#include "fastjet/contrib/Njettiness.hh"
 
 class CandidateBoostedDoubleSecondaryVertexComputer : public JetTagComputer {
 
@@ -34,8 +33,6 @@ class CandidateBoostedDoubleSecondaryVertexComputer : public JetTagComputer {
 
     const double beta_;
     const double R0_;
-    // N-subjettiness calculator
-    fastjet::contrib::Njettiness njettiness_;
 
     const double maxSVDeltaRToJet_;
     const bool useCondDB_;

diff --git a/RecoBTag/SecondaryVertex/src/CandidateBoostedDoubleSecondaryVertexComputer.cc b/RecoBTag/SecondaryVertex/src/CandidateBoostedDoubleSecondaryVertexComputer.cc
@@ -14,11 +14,11 @@
 #include "RecoBTau/JetTagComputer/interface/JetTagComputer.h"
 #include "TrackingTools/IPTools/interface/IPTools.h"
 
+#include "fastjet/contrib/Njettiness.hh"
 
 CandidateBoostedDoubleSecondaryVertexComputer::CandidateBoostedDoubleSecondaryVertexComputer(const edm::ParameterSet & parameters) :
   beta_(parameters.getParameter<double>("beta")),
   R0_(parameters.getParameter<double>("R0")),
-  njettiness_(fastjet::contrib::OnePass_KT_Axes(), fastjet::contrib::NormalizedMeasure(beta_,R0_)),
   maxSVDeltaRToJet_(parameters.getParameter<double>("maxSVDeltaRToJet")),
   useCondDB_(parameters.getParameter<bool>("useCondDB")),
   gbrForestLabel_(parameters.existsAs<std::string>("gbrForestLabel") ? parameters.getParameter<std::string>("gbrForestLabel") : ""),
@@ -583,10 +583,13 @@ void CandidateBoostedDoubleSecondaryVertexComputer::calcNsubjettiness(const reco
       edm::LogWarning("MissingJetConstituent") << "Jet constituent required for N-subjettiness computation is missing!";
   }
 
+  // N-subjettiness calculator
+  fastjet::contrib::Njettiness njettiness(fastjet::contrib::OnePass_KT_Axes(), fastjet::contrib::NormalizedMeasure(beta_,R0_));
+
   // calculate N-subjettiness
-  tau1 = njettiness_.getTau(1, fjParticles);
-  tau2 = njettiness_.getTau(2, fjParticles);
-  currentAxes = njettiness_.currentAxes();
+  tau1 = njettiness.getTau(1, fjParticles);
+  tau2 = njettiness.getTau(2, fjParticles);
+  currentAxes = njettiness.currentAxes();
 }
 
 

diff --git a/RecoJets/JetProducers/interface/NjettinessAdder.h b/RecoJets/JetProducers/interface/NjettinessAdder.h
@@ -18,7 +18,7 @@ class NjettinessAdder : public edm::stream::EDProducer<> {
     enum MeasureDefinition_t {
         NormalizedMeasure=0,       // (beta,R0) 
         UnnormalizedMeasure,       // (beta) 
-        GeometricMeasure,          // (beta) 
+        OriginalGeometricMeasure,  // (beta) 
         NormalizedCutoffMeasure,   // (beta,R0,Rcutoff) 
         UnnormalizedCutoffMeasure, // (beta,Rcutoff) 
         GeometricCutoffMeasure,    // (beta,Rcutoff) 

diff --git a/RecoJets/JetProducers/plugins/NjettinessAdder.cc b/RecoJets/JetProducers/plugins/NjettinessAdder.cc
@@ -27,18 +27,18 @@ NjettinessAdder::NjettinessAdder(const edm::ParameterSet& iConfig) :
   // Get the measure definition
   fastjet::contrib::NormalizedMeasure          normalizedMeasure        (beta_,R0_);
   fastjet::contrib::UnnormalizedMeasure        unnormalizedMeasure      (beta_);
-  fastjet::contrib::GeometricMeasure           geometricMeasure         (beta_);
+  fastjet::contrib::OriginalGeometricMeasure   geometricMeasure         (beta_);// changed in 1.020
   fastjet::contrib::NormalizedCutoffMeasure    normalizedCutoffMeasure  (beta_,R0_,Rcutoff_);
   fastjet::contrib::UnnormalizedCutoffMeasure  unnormalizedCutoffMeasure(beta_,Rcutoff_);
-  fastjet::contrib::GeometricCutoffMeasure     geometricCutoffMeasure   (beta_,Rcutoff_);
+  //fastjet::contrib::GeometricCutoffMeasure     geometricCutoffMeasure   (beta_,Rcutoff_); // removed in 1.020
 
   fastjet::contrib::MeasureDefinition const * measureDef = 0;
   switch ( measureDefinition_ ) {
   case UnnormalizedMeasure : measureDef = &unnormalizedMeasure; break;
-  case GeometricMeasure    : measureDef = &geometricMeasure; break;
+  case OriginalGeometricMeasure    : measureDef = &geometricMeasure; break;// changed in 1.020
   case NormalizedCutoffMeasure : measureDef = &normalizedCutoffMeasure; break;
   case UnnormalizedCutoffMeasure : measureDef = &unnormalizedCutoffMeasure; break;
-  case GeometricCutoffMeasure : measureDef = &geometricCutoffMeasure; break;
+  //case GeometricCutoffMeasure : measureDef = &geometricCutoffMeasure; break; // removed in 1.020
   case NormalizedMeasure : default : measureDef = &normalizedMeasure; break;
   } 
 

diff --git a/RecoJets/JetProducers/python/nJettinessAdder_cfi.py b/RecoJets/JetProducers/python/nJettinessAdder_cfi.py
@@ -7,9 +7,9 @@
                             measureDefinition = cms.uint32( 0 ), # CMS default is normalized measure
                             beta = cms.double(1.0),              # CMS default is 1
                             R0 = cms.double( 0.8 ),              # CMS default is jet cone size
-                            Rcutoff = cms.double( -999.0),       # not used by default
+                            Rcutoff = cms.double( 999.0),        # not used by default
                             # variables for axes definition :
                             axesDefinition = cms.uint32( 6 ),    # CMS default is 1-pass KT axes
-                            nPass = cms.int32(-999),             # not used by default
-                            akAxesR0 = cms.double(-999.0)        # not used by default
+                            nPass = cms.int32(999),             # not used by default
+                            akAxesR0 = cms.double(999.0)        # not used by default
                             )