Merge pull request #10649 from gpetruc/MiniAODSpring15pass2-from74X

MiniAOD Spring15pass2 7.4.X (collection of all PRs)
cms-sw · Sep 2, 2015 · a208761 · a208761
2 parents fb3d554 + 66c520b
commit a208761
Show file tree

Hide file tree

Showing 137 changed files with 6,938 additions and 1,932 deletions.
diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalibHI_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalibHI_cff.py
@@ -18,20 +18,6 @@
 dt4DSegmentsNoWire.Reco4DAlgoConfig.recAlgoConfig.tTrigModeConfig.doWirePropCorrection = False
 dt4DSegmentsNoWire.Reco4DAlgoConfig.Reco2DAlgoConfig.recAlgoConfig.tTrigModeConfig.doWirePropCorrection = False
 
-#this is to select collisions
-primaryVertexFilter = cms.EDFilter("VertexSelector",
-   src = cms.InputTag("hiSelectedVertex"),
-   cut = cms.string("!isFake && ndof > 4 && abs(z) <= 15 && position.Rho <= 2"),
-   filter = cms.bool(True),
-)
-
-noscraping = cms.EDFilter("FilterOutScraping",
-   applyfilter = cms.untracked.bool(True),
-   debugOn = cms.untracked.bool(False),
-   numtrack = cms.untracked.uint32(10),
-   thresh = cms.untracked.double(0.25)
-)
-
 #seqALCARECODtCalibHI = cms.Sequence(ALCARECODtCalibHIHLTFilter * primaryVertexFilter * DTCalibMuonSelection * dt4DSegmentsNoWire) 
 
 seqALCARECODtCalibHI = cms.Sequence(ALCARECODtCalibHIHLTFilter * dt4DSegmentsNoWire) 
diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py
@@ -18,17 +18,6 @@
 dt4DSegmentsNoWire.Reco4DAlgoConfig.Reco2DAlgoConfig.recAlgoConfig.tTrigModeConfig.doWirePropCorrection = False
 
 #this is to select collisions
-primaryVertexFilter = cms.EDFilter("VertexSelector",
-   src = cms.InputTag("offlinePrimaryVertices"),
-   cut = cms.string("!isFake && ndof > 4 && abs(z) <= 15 && position.Rho <= 2"), # tracksSize() > 3 for the older cut
-   filter = cms.bool(True),   # otherwise it won't filter the events, just produce an empty vertex collection.
-)
-
-noscraping = cms.EDFilter("FilterOutScraping",
-   applyfilter = cms.untracked.bool(True),
-   debugOn = cms.untracked.bool(False),
-   numtrack = cms.untracked.uint32(10),
-   thresh = cms.untracked.double(0.25)
-)
+from RecoMET.METFilters.metFilters_cff import primaryVertexFilter, noscraping
 
 seqALCARECODtCalib = cms.Sequence(primaryVertexFilter * noscraping * ALCARECODtCalibHLTFilter * DTCalibMuonSelection * dt4DSegmentsNoWire) 
diff --git a/CommonTools/ParticleFlow/python/pfTaus_cff.py b/CommonTools/ParticleFlow/python/pfTaus_cff.py
@@ -125,7 +125,6 @@
 pfTauTagInfoProducer.PFCandidateProducer = jetConfig.ak4PFJets.src
 pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
 
-
 pfTausPreSequence = cms.Sequence(
     pfJetTracksAssociatorAtVertex +
     pfTauPFJets08Region +

diff --git a/CommonTools/PileupAlgos/interface/PuppiAlgo.h b/CommonTools/PileupAlgos/interface/PuppiAlgo.h
@@ -16,6 +16,7 @@ class PuppiAlgo{
   void   computeMedRMS(const unsigned int &iAlgo,const double &iPVFrac);
   //Get the Weight
   double compute(std::vector<double> const &iVals,double iChi2) const;
+  const std::vector<float> & alphas(){ return fPups; }
   //Helpers
   inline double ptMin() const { return fPtMin; }
   inline double etaMin() const { return fEtaMin; }
@@ -26,13 +27,24 @@ class PuppiAlgo{
   inline double coneSize  ( unsigned int iAlgo) const { return fConeSize.at(iAlgo); }
   inline double neutralPt  (int iNPV) const { return fNeutralPtMin + iNPV * fNeutralPtSlope; }
 
+  inline double rms( unsigned int i ) const {return fRMS[i];}
+  inline double median( unsigned int i ) const {return fMedian[i];}
+
 private:  
   unsigned int   fNAlgos;
   float  fEtaMax;
   float  fEtaMin;
   float  fPtMin ;
   double fNeutralPtMin;
   double fNeutralPtSlope;
+
+  double fRMSEtaSF;
+  double fMedEtaSF;
+  double fEtaMaxExtrap;
+
+  std::vector<double> fRMS;
+  std::vector<double> fMedian;
+
   std::vector<float>  fPups;
   std::vector<float>  fPupsPV;
   std::vector<int>    fAlgoId;
@@ -42,8 +54,6 @@ class PuppiAlgo{
   std::vector<double> fConeSize;
   std::vector<double> fRMSPtMin;
   std::vector<double> fRMSScaleFactor;
-  std::vector<double> fRMS;
-  std::vector<double> fMedian;
   std::vector<double> fMean;
   std::vector<int>    fNCount;
 };

diff --git a/CommonTools/PileupAlgos/interface/PuppiContainer.h b/CommonTools/PileupAlgos/interface/PuppiContainer.h
@@ -37,25 +37,41 @@ class PuppiContainer{
     PuppiContainer(const edm::ParameterSet &iConfig);
     ~PuppiContainer(); 
     void initialize(const std::vector<RecoObj> &iRecoObjects);
+    void setNPV(int iNPV){ fNPV = iNPV; }
+
     std::vector<fastjet::PseudoJet> const & pfParticles() const { return fPFParticles; }    
     std::vector<fastjet::PseudoJet> const & pvParticles() const { return fChargedPV; }        
-    std::vector<double> const & puppiWeights() ;
+    std::vector<double> const & puppiWeights();
+    const std::vector<double> & puppiRawAlphas(){ return fRawAlphas; }
+    const std::vector<double> & puppiAlphas(){ return fVals; }
+    // const std::vector<double> puppiAlpha   () {return fAlpha;}
+    const std::vector<double> & puppiAlphasMed() {return fAlphaMed;}
+    const std::vector<double> & puppiAlphasRMS() {return fAlphaRMS;}
+
+    int puppiNAlgos(){ return fNAlgos; }
     std::vector<fastjet::PseudoJet> const & puppiParticles() const { return fPupParticles;}
 
 protected:
     double  goodVar      (fastjet::PseudoJet const &iPart,std::vector<fastjet::PseudoJet> const &iParts, int iOpt,double iRCone);
     void    getRMSAvg    (int iOpt,std::vector<fastjet::PseudoJet> const &iConstits,std::vector<fastjet::PseudoJet> const &iParticles,std::vector<fastjet::PseudoJet> const &iChargeParticles);
+    void    getRawAlphas    (int iOpt,std::vector<fastjet::PseudoJet> const &iConstits,std::vector<fastjet::PseudoJet> const &iParticles,std::vector<fastjet::PseudoJet> const &iChargeParticles);
     double  getChi2FromdZ(double iDZ);
     int     getPuppiId   ( float iPt, float iEta);
     double  var_within_R (int iId, const std::vector<fastjet::PseudoJet> & particles, const fastjet::PseudoJet& centre, double R);  
 
+    bool      fPuppiDiagnostics;
     std::vector<RecoObj>   fRecoParticles;
     std::vector<fastjet::PseudoJet> fPFParticles;
     std::vector<fastjet::PseudoJet> fChargedPV;
     std::vector<fastjet::PseudoJet> fPupParticles;
     std::vector<double>    fWeights;
     std::vector<double>    fVals;
+    std::vector<double>    fRawAlphas;
+    std::vector<double>    fAlphaMed;
+    std::vector<double>    fAlphaRMS;
+
     bool   fApplyCHS;
+    bool   fInvert;
     bool   fUseExp;
     double fNeutralMinPt;
     double fNeutralSlope;

diff --git a/CommonTools/PileupAlgos/interface/RecoObj.h b/CommonTools/PileupAlgos/interface/RecoObj.h
@@ -14,7 +14,7 @@ class RecoObj
     {}
     ~RecoObj(){}
 
-    float         pt, eta, phi, m;  // kinematics
+    float         pt, eta, phi, m, rapidity;  // kinematics
     int           id;
     int           pfType;
     int           vtxId;               // Vertex Id from Vertex Collection