Merge pull request cms-sw#121 from mverwe/SDBetaPos

Jet updates + PF analyzer
cfmcginn · Jun 9, 2017 · db990a3 · db990a3
2 parents d280a20 + e84e8e3
commit db990a3
Show file tree

Hide file tree

Showing 900 changed files with 16,414 additions and 171,586 deletions.
diff --git a/HeavyIonsAnalysis/JetAnalysis/interface/HiInclusiveJetAnalyzer.h b/HeavyIonsAnalysis/JetAnalysis/interface/HiInclusiveJetAnalyzer.h
@@ -106,31 +106,30 @@ class HiInclusiveJetAnalyzer : public edm::EDAnalyzer {
 
   // edm::InputTag   jetTag_, vtxTag_, genjetTag_, eventInfoTag_, L1gtReadout_, pfCandidateLabel_, trackTag_, matchTag_;
   edm::InputTag   jetTagLabel_;
-  edm::EDGetTokenT<std::vector<reco::Vertex> >         vtxTag_;
-  edm::EDGetTokenT<reco::JetView>              jetTag_;
-  edm::EDGetTokenT<pat::JetCollection>         jetTagPat_;
-  edm::EDGetTokenT<reco::JetView>              matchTag_;
-  edm::EDGetTokenT<pat::JetCollection>         matchTagPat_;
-  edm::EDGetTokenT<reco::JetView>              subjetGenTag_;
-  edm::EDGetTokenT<reco::PFCandidateCollection>         pfCandidateLabel_;
-  edm::EDGetTokenT<reco::TrackCollection>         trackTag_;
-  edm::EDGetTokenT<reco::GenParticleCollection>         genParticleSrc_;
-  edm::EDGetTokenT<std::vector<reco::GenJet> >         genjetTag_;
-  //edm::EDGetTokenT<edm::View<reco::Jet>>         genjetTag_;
-  edm::EDGetTokenT<edm::HepMCProduct>         eventInfoTag_;
-  edm::EDGetTokenT<GenEventInfoProduct>  eventGenInfoTag_;
-  edm::EDGetTokenT< L1GlobalTriggerReadoutRecord >         L1gtReadout_;
-  // edm::InputTag HcalRecHitHFSrc_;
-  // edm::InputTag HcalRecHitHBHESrc_;
-  // edm::InputTag EBSrc_;
-  // edm::InputTag EESrc_;
-  // edm::InputTag genParticleSrc_;
-
-  std::string jetName_; //used as prefix for jet structures
-  edm::Handle<reco::JetView> gensubjets_;
-  /* edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau1_; */
-  /* edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau2_; */
-  /* edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau3_; */
+  edm::EDGetTokenT<std::vector<reco::Vertex> >       vtxTag_;
+  edm::EDGetTokenT<reco::JetView>                    jetTag_;
+  edm::EDGetTokenT<pat::JetCollection>               jetTagPat_;
+  edm::EDGetTokenT<reco::JetView>                    matchTag_;
+  edm::EDGetTokenT<pat::JetCollection>               matchTagPat_;
+  edm::EDGetTokenT<reco::PFCandidateCollection>      pfCandidateLabel_;
+  edm::EDGetTokenT<reco::TrackCollection>            trackTag_;
+  edm::EDGetTokenT<reco::GenParticleCollection>      genParticleSrc_;
+  //edm::EDGetTokenT<std::vector<reco::GenJet> >         genjetTag_;
+  edm::EDGetTokenT<edm::View<reco::GenJet>>          genjetTag_;
+  edm::EDGetTokenT<edm::HepMCProduct>                eventInfoTag_;
+  edm::EDGetTokenT<GenEventInfoProduct>              eventGenInfoTag_;
+  edm::EDGetTokenT< L1GlobalTriggerReadoutRecord >   L1gtReadout_;
+
+  std::string                              jetName_; //used as prefix for jet structures
+  edm::EDGetTokenT<edm::View<reco::Jet>>   subjetGenTag_;
+  edm::Handle<reco::JetView>               gensubjets_;
+  edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau1_;
+  edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau2_;
+  edm::EDGetTokenT< edm::ValueMap<float> > tokenGenTau3_;
+  edm::EDGetTokenT< edm::ValueMap<float> > tokenGenSym_;
+  edm::Handle<edm::ValueMap<float> >       genSymVM_;
+  edm::EDGetTokenT< edm::ValueMap<int> >   tokenGenDroppedBranches_;
+  edm::Handle<edm::ValueMap<int> >         genDroppedBranchesVM_;
 
   // towers
   edm::EDGetTokenT<CaloTowerCollection> TowerSrc_;
@@ -170,6 +169,7 @@ class HiInclusiveJetAnalyzer : public edm::EDAnalyzer {
   double hardPtMin_;
   double jetPtMin_;
   bool doGenTaus_;
+  bool doGenSym_;
   bool doSubJets_;
   bool doJetConstituents_;
   bool doNewJetVars_;
@@ -325,6 +325,9 @@ class HiInclusiveJetAnalyzer : public edm::EDAnalyzer {
     float jttau2[MAXJETS];
     float jttau3[MAXJETS];
 
+    float jtsym[MAXJETS];
+    int   jtdroppedBranches[MAXJETS];
+
     std::vector<std::vector<float>> jtSubJetPt;
     std::vector<std::vector<float>> jtSubJetEta;
     std::vector<std::vector<float>> jtSubJetPhi;
@@ -513,6 +516,8 @@ class HiInclusiveJetAnalyzer : public edm::EDAnalyzer {
     float reftau1[MAXJETS];
     float reftau2[MAXJETS];
     float reftau3[MAXJETS];
+    float refsym[MAXJETS];
+    int   refdroppedBranches[MAXJETS];
     float refdphijt[MAXJETS];
     float refdrjt[MAXJETS];
     float refparton_pt[MAXJETS];
@@ -711,7 +716,9 @@ class HiInclusiveJetAnalyzer : public edm::EDAnalyzer {
     std::vector<std::vector<float>> genSubJetPhi;
     std::vector<std::vector<float>> genSubJetM;
     std::vector<std::vector<float>> genSubJetArea;
-
+    float gensym[MAXJETS];
+    int   gendroppedBranches[MAXJETS];
+
     std::vector<std::vector<int>> genConstituentsId;
     std::vector<std::vector<float>> genConstituentsE;
     std::vector<std::vector<float>> genConstituentsPt;

diff --git a/HeavyIonsAnalysis/JetAnalysis/interface/HiPFCandAnalyzer.h b/HeavyIonsAnalysis/JetAnalysis/interface/HiPFCandAnalyzer.h
@@ -64,6 +64,7 @@ class TreePFCandEventData
   std::vector<Float_t>         pfPt_, genPt_,  jetPt_;
   std::vector<Float_t>         pfEta_, genEta_,  jetEta_;
   std::vector<Float_t>         pfPhi_, genPhi_,  jetPhi_;
+  std::vector<Float_t>         pfM_;
   std::vector<Float_t>         pfVsPt_;
   std::vector<Float_t>         pfVsPtInitial_;
   std::vector<Float_t>         pfVsPtEqualized_;

diff --git a/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_cleanedPbPb.py b/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_cleanedPbPb.py
@@ -1,44 +1,25 @@
 import FWCore.ParameterSet.Config as cms
 
-from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_HI_cff import *
-from Configuration.StandardSequences.ReconstructionHeavyIons_cff import voronoiBackgroundPF, voronoiBackgroundCalo
+from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_HI_cff import PFTowers, kt4PFJets, hiFJRhoProducer, hiFJGridEmptyAreaCalculator, akPu2CaloJets, akPu2PFJets, akCs2PFJets, akPu3CaloJets, akPu3PFJets, akCs3PFJets, akPu4CaloJets, akPu4PFJets, akCs4PFJets, akCsSoftDrop4PFJets, akCsSoftDropZ05B154PFJets
 from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
 from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
 from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
 kt4PFJets.src = cms.InputTag('particleFlowTmp')
 kt4PFJets.doAreaFastjet = True
 kt4PFJets.jetPtMin      = cms.double(0.0)
 kt4PFJets.GhostArea     = cms.double(0.005)
-kt2PFJets = kt4PFJets.clone(rParam       = cms.double(0.2))
-
 
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu2CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs2CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs2PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu2PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akCs2PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu3CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs3CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs3PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu3PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akCs3PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu4CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs4CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs4PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu4PFJetSequence_PbPb_mb_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akCs4PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akPu5CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs5CaloJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs5PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akPu5PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akCs5PFJetSequence_PbPb_mb_cff import *
-
-from HeavyIonsAnalysis.JetAnalysis.jets.akCsFilter4PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akCsFilter5PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akCsFilter6PFJetSequence_PbPb_mb_cff import *
+
 from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop4PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop5PFJetSequence_PbPb_mb_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop6PFJetSequence_PbPb_mb_cff import *
 
 highPurityTracks = cms.EDFilter("TrackSelector",
                                 src = cms.InputTag("hiGeneralTracks"),
@@ -47,72 +28,48 @@
 from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import *
 offlinePrimaryVertices.TrackLabel = 'highPurityTracks'
 
+#the following lines are in the wrong python config
+#they should be in a python config handling reco, not analyzers. To be fixed
+akPu3PFJets.minimumTowersFraction = cms.double(0.5)
+akPu4PFJets.minimumTowersFraction = cms.double(0.5)
+
+akPu3CaloJets.minimumTowersFraction = cms.double(0.)
+akPu4CaloJets.minimumTowersFraction = cms.double(0.)
+
 jetSequences = cms.Sequence(
-    voronoiBackgroundPF+
-    voronoiBackgroundCalo+
-    kt2PFJets +
+    PFTowers +
     kt4PFJets +
     hiFJRhoProducer +
     hiFJGridEmptyAreaCalculator +
 
     akPu2CaloJets +
     akPu2PFJets +
-    akVs2CaloJets +
-    akVs2PFJets +
     akCs2PFJets +
 
-    #akPu3CaloJets +
-    #akPu3PFJets +
-    akVs3CaloJets +
-    akVs3PFJets +
+    akPu3CaloJets +
+    akPu3PFJets +
     akCs3PFJets +
 
-    #akPu4CaloJets +
-    #akPu4PFJets +
-    akVs4CaloJets +
-    akVs4PFJets +
+    akPu4CaloJets +
+    akPu4PFJets +
     akCs4PFJets +
 
-    akPu5CaloJets +
-    akPu5PFJets +
-    akVs5CaloJets +
-    akVs5PFJets +
-    akCs5PFJets +
-
-    akCsFilter4PFJets +
-    akCsFilter5PFJets +
     akCsSoftDrop4PFJets +
-    akCsSoftDrop5PFJets +
-
+
     highPurityTracks +
     offlinePrimaryVertices +
 
     akPu2CaloJetSequence +
-    akVs2CaloJetSequence +
-    akVs2PFJetSequence +
     akPu2PFJetSequence +
     akCs2PFJetSequence +
 
     akPu3CaloJetSequence +
-    akVs3CaloJetSequence +
-    akVs3PFJetSequence +
     akPu3PFJetSequence +
     akCs3PFJetSequence +
 
     akPu4CaloJetSequence +
-    akVs4CaloJetSequence +
-    akVs4PFJetSequence +
     akPu4PFJetSequence +
     akCs4PFJetSequence +
 
-    akPu5CaloJetSequence +
-    akVs5CaloJetSequence +
-    akVs5PFJetSequence +
-    akPu5PFJetSequence +
-    akCs5PFJetSequence +
-
-    akCsFilter4PFJetSequence +
-    akCsFilter5PFJetSequence +
-    akCsSoftDrop4PFJetSequence +
-    akCsSoftDrop5PFJetSequence
+    akCsSoftDrop4PFJetSequence
 )
diff --git a/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_puLimitedDataPbPb.py b/HeavyIonsAnalysis/JetAnalysis/python/FullJetSequence_puLimitedDataPbPb.py
@@ -1,41 +1,21 @@
 import FWCore.ParameterSet.Config as cms
 
-from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_HI_cff import *
-from Configuration.StandardSequences.ReconstructionHeavyIons_cff import voronoiBackgroundPF, voronoiBackgroundCalo
-from RecoJets.JetProducers.kt4PFJets_cfi import kt4PFJets
-from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
-from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
-kt4PFJets.src = cms.InputTag('particleFlowTmp')
-kt4PFJets.doAreaFastjet = True
-kt4PFJets.jetPtMin      = cms.double(0.0)
-kt4PFJets.GhostArea     = cms.double(0.005)
-kt2PFJets = kt4PFJets.clone(rParam       = cms.double(0.2))
-
-#from HeavyIonsAnalysis.JetAnalysis.jets.akPu2CaloJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akVs2CaloJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akVs2PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akPu2PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCs2PFJetSequence_PbPb_data_cff import *
+from HeavyIonsAnalysis.JetAnalysis.jets.HiReRecoJets_HI_cff import PFTowers, kt4PFJets, hiFJRhoProducer, hiFJGridEmptyAreaCalculator, akPu2CaloJets, akPu2PFJets, akCs2PFJets, akPu3CaloJets, akPu3PFJets, akCs3PFJets, akPu4CaloJets, akPu4PFJets, akCs4PFJets, akCsSoftDrop4PFJets, akCsSoftDropZ05B154PFJets
+
+#jet analyzers
+from HeavyIonsAnalysis.JetAnalysis.jets.akPu2CaloJetSequence_PbPb_data_cff import *
+from HeavyIonsAnalysis.JetAnalysis.jets.akPu2PFJetSequence_PbPb_data_cff import *
+from HeavyIonsAnalysis.JetAnalysis.jets.akCs2PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu3CaloJetSequence_PbPb_data_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs3CaloJetSequence_PbPb_data_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs3PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu3PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akCs3PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu4CaloJetSequence_PbPb_data_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs4CaloJetSequence_PbPb_data_cff import *
-from HeavyIonsAnalysis.JetAnalysis.jets.akVs4PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akPu4PFJetSequence_PbPb_data_cff import *
 from HeavyIonsAnalysis.JetAnalysis.jets.akCs4PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akPu5CaloJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akVs5CaloJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akVs5PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akPu5PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCs5PFJetSequence_PbPb_data_cff import *
 
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCsFilter4PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCsFilter5PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop4PFJetSequence_PbPb_data_cff import *
-#from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop5PFJetSequence_PbPb_data_cff import *
+#SoftDrop analyzers
+from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDrop4PFJetSequence_PbPb_data_cff import *
+from HeavyIonsAnalysis.JetAnalysis.jets.akCsSoftDropZ05B154PFJetSequence_PbPb_data_cff import *
 
 highPurityTracks = cms.EDFilter("TrackSelector",
                                 src = cms.InputTag("hiGeneralTracks"),
@@ -44,91 +24,51 @@
 from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import *
 offlinePrimaryVertices.TrackLabel = 'highPurityTracks'
 
-
-akPu4PFJetsNoLimits = akPu4PFJets.clone(
-    minimumTowersFraction = cms.double(0.)
-)
-
-
+#the following lines are in the wrong python config
+#they should be in a python config handling reco, not analyzers. To be fixed
 akPu3PFJets.minimumTowersFraction = cms.double(0.5)
 akPu4PFJets.minimumTowersFraction = cms.double(0.5)
-akPu5PFJets.minimumTowersFraction = cms.double(0.5)
 
 akPu3CaloJets.minimumTowersFraction = cms.double(0.)
 akPu4CaloJets.minimumTowersFraction = cms.double(0.)
-akPu5CaloJets.minimumTowersFraction = cms.double(0.)
 
 
 jetSequences = cms.Sequence(
     PFTowers + 
-    #voronoiBackgroundPF+
-    #voronoiBackgroundCalo+
-    kt2PFJets +
     kt4PFJets +
     hiFJRhoProducer +
     hiFJGridEmptyAreaCalculator + 
 
-
-    akPu4PFJetsNoLimits +
-
-    #akPu2CaloJets +
-    #akPu2PFJets +
-    #akVs2CaloJets +
-    #akVs2PFJets +
-    #akCs2PFJets +
+    akPu2CaloJets +
+    akPu2PFJets +
+    akCs2PFJets +
 
     akPu3CaloJets +
     akPu3PFJets +
-    #akVs3CaloJets +
-    #akVs3PFJets +
     akCs3PFJets +
 
     akPu4CaloJets +
     akPu4PFJets +
-    #akVs4CaloJets +
-    #akVs4PFJets +
     akCs4PFJets +
 
-    #akPu5CaloJets +
-    #akPu5PFJets +
-    #akVs5CaloJets +
-    #akVs5PFJets +
-    #akCs5PFJets +
-
-    #akCsFilter4PFJets +
-    #akCsFilter5PFJets +
-    #akCsSoftDrop4PFJets +
-    #akCsSoftDrop5PFJets +
-
+    akCsSoftDrop4PFJets +
+    akCsSoftDropZ05B154PFJets +
+
     highPurityTracks +
     offlinePrimaryVertices +
 
-    #akPu2CaloJetSequence +
-    #akVs2CaloJetSequence +
-    #akVs2PFJetSequence +
-    #akPu2PFJetSequence +
-    #akCs2PFJetSequence +
+    akPu2CaloJetSequence +
+    akPu2PFJetSequence +
+    akCs2PFJetSequence +
 
     akPu3CaloJetSequence +
-    #akVs3CaloJetSequence +
-    #akVs3PFJetSequence +
     akPu3PFJetSequence +
     akCs3PFJetSequence +
 
     akPu4CaloJetSequence +
-    #akVs4CaloJetSequence +
-    #akVs4PFJetSequence +
     akPu4PFJetSequence +
-    akCs4PFJetSequence #+
-
-    #akPu5CaloJetSequence +
-    #akVs5CaloJetSequence +
-    #akVs5PFJetSequence +
-    #akPu5PFJetSequence +
-    #akCs5PFJetSequence +
-
-    #akCsFilter4PFJetSequence +
-    #akCsFilter5PFJetSequence +
-    #akCsSoftDrop4PFJetSequence #+
-    #akCsSoftDrop5PFJetSequence
+    akCs4PFJetSequence +
+
+    akCsSoftDrop4PFJetSequence +
+    akCsSoftDropZ05B154PFJetSequence
 )