Merge pull request cms-sw#14 from cms-sw/CMSSW_7_6_X

PRToFixMess_ME0Segment_PR_v1

Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml

@@ -107,6 +107,7 @@
   <use   name="DataFormats/Alignment"/>
   <use   name="DataFormats/TrackReco"/>
   <use   name="DataFormats/TrackerRecHit2D"/>
+  <use   name="Utilities/General"/>
   <use   name="rootcore"/>
   <flags   EDM_PLUGIN="1"/>
 </library>

Alignment/HIPAlignmentAlgorithm/BuildFile.xml

@@ -9,4 +9,5 @@
 <use   name="Alignment/CommonAlignment"/>
 <use   name="Alignment/CommonAlignmentAlgorithm"/>
 <use   name="Alignment/TrackerAlignment"/>
+<use   name="Utilities/General"/>
 <flags   EDM_PLUGIN="1"/>

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_runPede_rfcp_template.sh

@@ -7,6 +7,10 @@
 #temporary fix (?):
 #unset PYTHONHOME
 
+cd $CMSSW_BASE/src
+eval `scramv1 runtime -sh`
+cd -
+
 # these defaults will be overwritten by MPS
 RUNDIR=$HOME/scratch0/some/path
 MSSDIR=/castor/cern.ch/user/u/username/another/path

Alignment/TrackerAlignment/plugins/BuildFile.xml

@@ -11,5 +11,6 @@
   <use   name="DataFormats/TrackerRecHit2D"/>
   <use   name="DataFormats/Alignment"/>
   <use   name="RecoTracker/TransientTrackingRecHit"/>
+  <use   name="Utilities/General"/>
   <flags   EDM_PLUGIN="1"/>
 </library>

Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalPedestal_cff.py

@@ -3,33 +3,55 @@
 #------------------------------------------------
 #AlCaReco filtering for HCAL minbias:
 #------------------------------------------------
+import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi
+hcalDigiAlCaPedestals = EventFilter.HcalRawToDigi.HcalRawToDigi_cfi.hcalDigis.clone()
+hcalDigiAlCaPedestals.InputLabel = 'hltHcalCalibrationRaw'
 
-from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBias_cff import *
-hcalDigiAlCaMB.InputLabel = 'hltHcalCalibrationRaw'
-#from EventFilter.HcalRawToDigi.HcalRawToDigi_cfi import *
-#hcalDigis.InputLabel = 'hltHcalCalibrationRaw'
-from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi
+hbherecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hbhe_cfi.hbheprereco.clone()
 
-hbherecoMB.firstSample = 0
-hbherecoMB.samplesToAdd = 4
-hbherecoMB.digiLabel = 'hcalDigiAlCaMB'
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
+hfrecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi.hfreco.clone()
 
-hfrecoMB.firstSample = 0
-hfrecoMB.samplesToAdd = 2
-hfrecoMB.digiLabel = 'hcalDigiAlCaMB'
+import RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_hf_cfi
+horecoPedestals = RecoLocalCalo.HcalRecProducers.HcalSimpleReconstructor_ho_cfi.horeco.clone()
 
-horecoMB.firstSample = 0
-horecoMB.samplesToAdd = 4
-horecoMB.digiLabel = 'hcalDigiAlCaMB'
+#add GT digi:
+import EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi
+gtDigisAlCaPedestals = EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi.l1GtUnpack.clone()
 
+hbherecoPedestals.firstSample = 0
+hbherecoPedestals.samplesToAdd = 4
+hbherecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+hfrecoPedestals.firstSample = 0
+hfrecoPedestals.samplesToAdd = 2
+hfrecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+horecoPedestals.firstSample = 0
+horecoPedestals.samplesToAdd = 4
+horecoPedestals.digiLabel = 'hcalDigiAlCaPedestals'
+
+# switch off "Hcal ZS in reco":
+hbherecoPedestals.dropZSmarkedPassed = cms.bool(False)
+hfrecoPedestals.dropZSmarkedPassed = cms.bool(False)
+horecoPedestals.dropZSmarkedPassed = cms.bool(False)
+
+hcalLocalRecoSequencePedestals = cms.Sequence(hbherecoPedestals*hfrecoPedestals*horecoPedestals) 
 
 import EventFilter.HcalRawToDigi.HcalCalibTypeFilter_cfi
 hcalCalibPedestal = EventFilter.HcalRawToDigi.HcalCalibTypeFilter_cfi.hcalCalibTypeFilter.clone(
-#  InputLabel = cms.string('rawDataCollector'), 
-  InputLabel = cms.string('hltHcalCalibrationRaw::HLT'),
-#  InputLabel = cms.InputTag("hltEcalCalibrationRaw","","HLT"),
-  CalibTypes    = cms.vint32( 1 ),
-  FilterSummary = cms.untracked.bool( False )
-)
-
-seqALCARECOHcalCalPedestal = cms.Sequence(hcalCalibPedestal*hcalDigiAlCaMB*gtDigisAlCaMB*hcalLocalRecoSequenceNZS*hbherecoNoise*hfrecoNoise*horecoNoise)
+    #  InputLabel = cms.string('rawDataCollector'), 
+    InputLabel = cms.string('hltHcalCalibrationRaw::HLT'),
+    #  InputLabel = cms.InputTag("hltEcalCalibrationRaw","","HLT"),
+    CalibTypes    = cms.vint32( 1 ),
+    FilterSummary = cms.untracked.bool( False )
+    )
+
+seqALCARECOHcalCalPedestal = cms.Sequence(hcalCalibPedestal*
+                                          hcalDigiAlCaPedestals*
+                                          gtDigisAlCaPedestals*
+                                          hcalLocalRecoSequencePedestals*
+                                          hbherecoPedestals*
+                                          hfrecoPedestals*
+                                          horecoPedestals)

Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h

@@ -66,9 +66,9 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
   virtual ~HITRegionalPixelSeedGenerator() {}
 
 
-  virtual std::vector<TrackingRegion* > regions(const edm::Event& e, const edm::EventSetup& es) const 
+  virtual std::vector<std::unique_ptr<TrackingRegion> > regions(const edm::Event& e, const edm::EventSetup& es) const override
     {
-      std::vector<TrackingRegion* > result;
+      std::vector<std::unique_ptr<TrackingRegion> > result;
       float originz =0.;
 
       double deltaZVertex =  halflength;
@@ -105,15 +105,13 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
 	      globalVector = ptrVec;
 
 
-	      RectangularEtaPhiTrackingRegion* etaphiRegion = new  RectangularEtaPhiTrackingRegion(globalVector,
-												   GlobalPoint(0,0,originz), 
-												   ptmin,
-												   originradius,
-												   deltaZVertex,
-												   deltaTrackEta,
-												   deltaTrackPhi);
-	      result.push_back(etaphiRegion);
-
+	      result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(globalVector,
+                                                                                 GlobalPoint(0,0,originz),
+                                                                                 ptmin,
+                                                                                 originradius,
+                                                                                 deltaZVertex,
+                                                                                 deltaTrackEta,
+                                                                                 deltaTrackPhi));
 	    }
 	}
 
@@ -148,14 +146,13 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
               GlobalVector ptrVec((isoPixTrackRefs[p]->track())->px(),(isoPixTrackRefs[p]->track())->py(),(isoPixTrackRefs[p]->track())->pz());
               globalVector = ptrVec;
 
-              RectangularEtaPhiTrackingRegion* etaphiRegion = new  RectangularEtaPhiTrackingRegion(globalVector,
-                                                                                                   GlobalPoint(0,0,originz),
-                                                                                                   ptmin,
-                                                                                                   originradius,
-                                                                                                   deltaZVertex,
-                                                                                                   deltaTrackEta,
-                                                                                                   deltaTrackPhi);
-              result.push_back(etaphiRegion);
+              result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(globalVector,
+                                                                                 GlobalPoint(0,0,originz),
+                                                                                 ptmin,
+                                                                                 originradius,
+                                                                                 deltaZVertex,
+                                                                                 deltaTrackEta,
+                                                                                 deltaTrackPhi));
 	    }
 	}
 
@@ -185,14 +182,13 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
 	      GlobalVector jetVector(iJet->p4().x(), iJet->p4().y(), iJet->p4().z());
 	      GlobalPoint  vertex(0, 0, originz);
 
-	      RectangularEtaPhiTrackingRegion* etaphiRegion = new RectangularEtaPhiTrackingRegion( jetVector,
-												   vertex,
-												   ptmin,
-												   originradius,
-												   deltaZVertex,
-												   deltaL1JetEta,
-												   deltaL1JetPhi );
-	      result.push_back(etaphiRegion);
+	      result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>( jetVector,
+                                                                                  vertex,
+                                                                                  ptmin,
+                                                                                  originradius,
+                                                                                  deltaZVertex,
+                                                                                  deltaL1JetEta,
+                                                                                  deltaL1JetPhi ));
 	    }
 	}
       if (fixedReg_)
@@ -213,14 +209,13 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
 	      deltaZVertex = 15.;
 	    }
 
-	  RectangularEtaPhiTrackingRegion* etaphiRegion = new RectangularEtaPhiTrackingRegion( fixedVector,
-											       vertex,
-											       ptmin,
-											       originradius,
-											       deltaZVertex,
-											       deltaL1JetEta,
-											       deltaL1JetPhi );
-	  result.push_back(etaphiRegion);
+	  result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>( fixedVector,
+                                                                              vertex,
+                                                                              ptmin,
+                                                                              originradius,
+                                                                              deltaZVertex,
+                                                                              deltaL1JetEta,
+                                                                              deltaL1JetPhi ));
 	}
 
       return result;

CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc

@@ -0,0 +1,13 @@
+#include "CommonTools/RecoAlgos/src/RecoChargedRefCandidateToTrackRef.h"
+#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+typedef CandidateProducer<
+  edm::View<reco::RecoChargedRefCandidate>,
+  reco::TrackRefVector,
+  AnySelector,
+  converter::RecoChargedRefCandidateToTrackRef
+  > RecoChargedRefCandidateToTrackRefProducer;
+
+DEFINE_FWK_MODULE(RecoChargedRefCandidateToTrackRefProducer);

CommonTools/RecoAlgos/python/recoChargedRefCandidateToTrackRefProducer_cfi.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+recoChargedRefCandidateToTrackRefProducer = cms.EDProducer("RecoChargedRefCandidateToTrackRefProducer",
+    src = cms.InputTag('trackRefsForJets')
+)

CommonTools/RecoAlgos/src/PrimaryVertexSorting.cc

@@ -23,31 +23,29 @@ float PrimaryVertexSorting::score(const reco::Vertex & pv,const  std::vector<con
   fjInputs_.clear();
   for (size_t i = 0 ; i < cands.size(); i++) {
     const reco::Candidate * c= cands[i];
+    float scale=1.;
+    if(c->bestTrack() != 0)
+      {
+        scale=(c->pt()-c->bestTrack()->ptError())/c->pt();
+        if(scale<0) scale=0;
+      }
+
     int absId=abs(c->pdgId());
     if(absId==13 or absId == 11) {
-      float pt =c->pt();
-      float ptErr = (c->bestTrack() != 0)?c->bestTrack()->ptError() :0;
-      if(pt > ptErr) pt-=ptErr; else pt=0;
+      float pt =c->pt()*scale;
       sumPt2+=pt*pt;
-      met+=c->p4();
-      sumEt+=c->pt();
+      met+=c->p4()*scale;
+      sumEt+=c->pt()*scale;
     } else {
-      fjInputs_.push_back(fastjet::PseudoJet(c->px(),c->py(),c->pz(),c->p4().E()));
-      fjInputs_.back().set_user_index(i);
+      fjInputs_.push_back(fastjet::PseudoJet(c->px()*scale,c->py()*scale,c->pz()*scale,c->p4().E()*scale));
+//      fjInputs_.back().set_user_index(i);
     }
   }
   fastjet::ClusterSequence sequence( fjInputs_, JetDefinition(antikt_algorithm, 0.4));
   auto jets = fastjet::sorted_by_pt(sequence.inclusive_jets(0));
   for (const auto & pj : jets) {
-    float sumPtErr2=0;
-    std::vector<fastjet::PseudoJet> constituents = pj.constituents();
-    for (unsigned j = 0; j < constituents.size(); j++) {
-	const reco::Candidate * c = cands[constituents[j].user_index()];
-        float ptErr = (c->bestTrack() != 0)?c->bestTrack()->ptError() :0;
-	sumPtErr2+=ptErr*ptErr;
-    }
     auto p4 = LorentzVector( pj.px(), pj.py(), pj.pz(), pj.e() ) ;
-    if(p4.pt()*p4.pt() > sumPtErr2) sumPt2+=(p4.pt()*p4.pt()-sumPtErr2)*0.8*0.8;
+    sumPt2+=(p4.pt()*p4.pt())*0.8*0.8;
     met+=p4;
     sumEt+=p4.pt();
   }

CommonTools/RecoAlgos/src/RecoChargedRefCandidateToTrackRef.h

@@ -0,0 +1,23 @@
+#ifndef CommonTools_RecoAlgos_TrackToRefCandidate_h
+#define CommonTools_RecoAlgos_TrackToRefCandidate_h
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidateFwd.h"
+
+namespace edm { class EventSetup; class ParameterSet; }
+
+namespace converter {
+  struct RecoChargedRefCandidateToTrackRef {
+    typedef reco::RecoChargedRefCandidate value_type;
+    typedef reco::RecoChargedRefCandidateCollection Components;
+    typedef reco::TrackRef Candidate;
+    RecoChargedRefCandidateToTrackRef(const edm::ParameterSet & cfg) {}
+    void beginFirstRun(const edm::EventSetup&) {}
+    void convert(const reco::RecoChargedRefCandidateRef& c, reco::TrackRef& trkRef) const {
+      trkRef = c->track();
+    }  
+  };
+}
+
+#endif

CommonTools/RecoAlgos/test/pvSorting.py

@@ -5,18 +5,21 @@
 process.load("Configuration.Geometry.GeometryIdeal_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 process.load("Configuration.StandardSequences.Reconstruction_cff")
-process.GlobalTag.globaltag = 'POSTLS172_V4::All'
-
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
 
 process.source = cms.Source("PoolSource",
+#   skipEvents=cms.untracked.uint32(0),
     fileNames = cms.untracked.vstring(
-     'file:8A676D55-1186-E411-921D-02163E0104B8.root'
+#'root://xrootd.ba.infn.it//store/mc/RunIISpring15DR74/WprimeToWZToLLQQ_M-4000_TuneCUETP8M1_13TeV-pythia8/AODSIM/Asympt25ns_MCRUN2_74_V9-v1/10000/126A3AFB-9607-E511-A527-90B11C12EA74.root'
+    'root://xrootd.ba.infn.it//store/mc/RunIISpring15DR74/WprimeToMuNu_M-5800_TuneCUETP8M1_13TeV-pythia8/AODSIM/Asympt50ns_MCRUN2_74_V9A-v2/10000/580F0D5E-760C-E511-A9D6-047D7B881D62.root'
+#     'file:../../../00387B2C-4A1C-E511-A4E0-0026189438B3.root'
     )
 )
 
 
 process.options   = cms.untracked.PSet( wantSummary = cms.untracked.bool(True))
-process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) )
+process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(500) )
 process.load("Configuration.EventContent.EventContent_cff")
 process.out = cms.OutputModule(
     "PoolOutputModule",
@@ -31,9 +34,22 @@
 process.load("CommonTools.RecoAlgos.sortedPFPrimaryVertices_cfi")
 
 process.sortedPrimaryVertices.jets = "ak4CaloJets"
-process.sortedPFPrimaryVerticesNoMET = process.sortedPFPrimaryVertices.clone(usePVMET=False)
-process.sortedPrimaryVerticesNoMET = process.sortedPrimaryVertices.clone(usePVMET=False,jets="ak4CaloJets")
-process.p = cms.Path(process.sortedPFPrimaryVertices*process.sortedPrimaryVertices*process.sortedPFPrimaryVerticesNoMET*process.sortedPrimaryVerticesNoMET)
+#process.sortedPFPrimaryVerticesNoMET = process.sortedPFPrimaryVertices.clone(usePVMET=False)
+#process.sortedPrimaryVerticesNoMET = process.sortedPrimaryVertices.clone(usePVMET=False,jets="ak4CaloJets")
+#process.p = cms.Path(process.sortedPFPrimaryVertices*process.sortedPrimaryVertices*process.sortedPFPrimaryVerticesNoMET*process.sortedPrimaryVerticesNoMET)
+
+from CommonTools.RecoAlgos.TrackWithVertexRefSelector_cfi import *
+from RecoJets.JetProducers.TracksForJets_cff import *
+from CommonTools.RecoAlgos.sortedPrimaryVertices_cfi import *
+from RecoJets.JetProducers.caloJetsForTrk_cff import *
+
+process.trackWithVertexRefSelectorBeforeSorting = trackWithVertexRefSelector.clone(vertexTag="offlinePrimaryVertices")
+process.trackWithVertexRefSelectorBeforeSorting.ptMax=9e99
+process.trackWithVertexRefSelectorBeforeSorting.ptErrorCut=9e99
+process.trackRefsForJetsBeforeSorting = trackRefsForJets.clone(src="trackWithVertexRefSelectorBeforeSorting")
+process.sortedPrimaryVertices.particles="trackRefsForJetsBeforeSorting"
+
+process.p = cms.Path(process.trackWithVertexRefSelectorBeforeSorting+process.trackRefsForJetsBeforeSorting+process.sortedPrimaryVertices)
 
 process.endpath = cms.EndPath(
     process.out

CommonTools/UtilAlgos/interface/ProductFromFwdPtrProducer.h

@@ -11,7 +11,7 @@
 */
 
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -25,7 +25,7 @@ namespace edm {
 
 
   template < class T, class H = ProductFromFwdPtrFactory<T> >
-  class ProductFromFwdPtrProducer : public edm::EDProducer {
+    class ProductFromFwdPtrProducer : public edm::global::EDProducer<> {
   public :
     explicit ProductFromFwdPtrProducer( edm::ParameterSet const & params ) :
       srcToken_   ( consumes< std::vector<edm::FwdPtr<T> > >( params.getParameter<edm::InputTag>("src") ) )
@@ -35,7 +35,7 @@ namespace edm {
 
     ~ProductFromFwdPtrProducer() {}
 
-    virtual void produce(edm::Event & iEvent, const edm::EventSetup& iSetup) override {
+  virtual void produce(edm::StreamID, edm::Event & iEvent, const edm::EventSetup& iSetup) const override {
 
       edm::Handle< std::vector<edm::FwdPtr<T> > > hSrc;
       iEvent.getByToken( srcToken_, hSrc );
@@ -55,7 +55,7 @@ namespace edm {
     }
 
   protected :
-    edm::EDGetTokenT< std::vector<edm::FwdPtr<T> > > srcToken_;
+    const edm::EDGetTokenT< std::vector<edm::FwdPtr<T> > > srcToken_;
   };
 }