Merge pull request #1564 from yetkinyilmaz/reco_12_03

Heavy Ion re-reco software

DQM/Physics/src/CentralityDQM.cc

@@ -15,7 +15,7 @@
 
 // Centrality
 #include "DataFormats/HeavyIonEvent/interface/Centrality.h"
-#include "DataFormats/HeavyIonEvent/interface/CentralityProvider.h"
+#include "RecoHI/HiCentralityAlgos/interface/CentralityProvider.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
 using namespace edm;

DataFormats/HeavyIonEvent/interface/Centrality.h

@@ -1,7 +1,3 @@
-//
-// $Id: Centrality.h,v 1.12 2010/08/23 16:42:01 nart Exp $
-//
-
 #ifndef DataFormats_Centrality_h
 #define DataFormats_Centrality_h
 

DataFormats/HeavyIonEvent/interface/VoronoiBackground.h

@@ -0,0 +1,45 @@
+#ifndef DataFormats_VoronoiBackground_h
+#define DataFormats_VoronoiBackground_h
+
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+
+#include <string>
+#include <vector>
+
+namespace reco { class VoronoiBackground {
+public:
+      VoronoiBackground();
+      VoronoiBackground(double pt0, double pt1, double mt0, double mt1, double v);
+      virtual ~VoronoiBackground();
+
+  double pt() const{ return pt_posteq; }
+  double pt_equalized() const{ return pt_posteq; }
+  double pt_subtracted() const{ return pt_preeq; }
+
+  double mt() const{ return mt_posteq; }
+  double mt_equalized() const{ return mt_posteq; }
+  double mt_initial() const{ return mt_preeq; }
+
+protected:
+
+  double pt_preeq;
+  double pt_posteq;
+
+  double mt_preeq;
+  double mt_posteq;
+
+  double voronoi_area;
+
+};
+
+ typedef edm::ValueMap<reco::VoronoiBackground> VoronoiMap;
+ typedef edm::Ref<reco::CandidateView> CandidateViewRef;
+
+
+}
+
+#endif 
+
+

DataFormats/HeavyIonEvent/src/VoronoiBackground.cc

@@ -0,0 +1,28 @@
+#include "DataFormats/HeavyIonEvent/interface/VoronoiBackground.h"
+using namespace reco;
+
+VoronoiBackground::VoronoiBackground()
+  : 
+pt_preeq(0),
+pt_posteq(0),
+mt_preeq(0),
+mt_posteq(0),
+voronoi_area(0)
+{
+}
+
+VoronoiBackground::VoronoiBackground(double pt0, double pt1, double mt0, double mt1, double v) 
+   :
+   pt_preeq(pt0),
+   pt_posteq(pt1),
+   mt_preeq(mt0),
+   mt_posteq(mt1),
+   voronoi_area(v)
+{
+}
+
+VoronoiBackground::~VoronoiBackground()
+{
+}
+
+

DataFormats/HeavyIonEvent/src/classes.h

@@ -1,6 +1,7 @@
 #include "DataFormats/HeavyIonEvent/interface/Centrality.h"
 #include "DataFormats/HeavyIonEvent/interface/EvtPlane.h"
 #include "DataFormats/HeavyIonEvent/interface/HeavyIon.h"
+#include "DataFormats/HeavyIonEvent/interface/VoronoiBackground.h"
 #include "DataFormats/Common/interface/Wrapper.h"
 
 namespace { 
@@ -18,6 +19,15 @@ namespace {
      reco::EvtPlaneCollection evcol;
      edm::Wrapper<reco::EvtPlaneCollection> wevcol;
 
+     reco::VoronoiBackground vor;
+     edm::Wrapper<reco::VoronoiBackground> wvor;
+
+     reco::VoronoiMap pfvorvmap;
+     edm::Wrapper<reco::VoronoiMap> pfwvorvmap;
+
+     std::vector<reco::VoronoiBackground> vecvor;
+     edm::Wrapper<std::vector<reco::VoronoiBackground> > vecwvor;
+
      edm::Wrapper<pat::HeavyIon >              w_v_p_hi;
 
   };

DataFormats/HeavyIonEvent/src/classes_def.xml

@@ -14,5 +14,11 @@
 <class name="pat::HeavyIon"  ClassVersion="10">
  <version ClassVersion="10" checksum="934677092"/>
 </class>
+<class name="reco::VoronoiBackground" />
+<class name="edm::Wrapper<reco::VoronoiBackground>"/>
+<class name="edm::ValueMap<reco::VoronoiBackground>" />
+<class name="edm::Wrapper<edm::ValueMap<reco::VoronoiBackground> >" />
+<class name="std::vector<reco::VoronoiBackground>" />
+<class name="edm::Wrapper<std::vector<reco::VoronoiBackground> >" />
 <class name="edm::Wrapper<pat::HeavyIon >" />
 </lcgdict>

RecoHI/Configuration/python/RecoHI_EventContent_cff.py

@@ -8,7 +8,6 @@
 from RecoHI.HiEvtPlaneAlgos.RecoHiEvtPlane_EventContent_cff import *
 from RecoHI.HiMuonAlgos.RecoHiMuon_EventContent_cff import *
 
-
 # combine RECO, AOD, FEVT content from all RecoHI packages
 # RecoHI event contents to be included by Configuration.EventContent.EventContentHeavyIons_cff
 

RecoHI/Configuration/python/Reconstruction_HI_cff.py

@@ -4,32 +4,51 @@
 # HIGH LEVEL RECO
 
 # Tracking
-#from RecoHI.HiTracking.HighPtTracking_PbPb_cff import *  # above 1.5 GeV
-from RecoHI.HiTracking.LowPtTracking_PbPb_cff import *    # above 0.9 GeV
+from RecoHI.HiTracking.HiTracking_cff import *    # two additional steps
 
 # Egamma
 from RecoHI.HiEgammaAlgos.HiEgamma_cff import *
+from RecoHI.HiEgammaAlgos.HiElectronSequence_cff import *
 
 # Jet Reconstruction
 from RecoHI.HiJetAlgos.HiRecoJets_cff import *
 
 # Muon Reco
 from RecoHI.HiMuonAlgos.HiRecoMuon_cff import * 
+# keep regit seperate for the moment
+from RecoHI.HiMuonAlgos.HiRegionalRecoMuon_cff import *
+
+from RecoHI.Configuration.Reconstruction_hiPF_cff import *
 
 # Heavy Ion Event Characterization
 from RecoHI.HiCentralityAlgos.HiCentrality_cfi import *
 from RecoHI.HiEvtPlaneAlgos.HiEvtPlane_cfi import *
 
 # HCAL noise producer
 from RecoMET.METProducers.hcalnoiseinfoproducer_cfi import *
-hcalnoise.trackCollName = 'hiSelectedTracks'
+hcalnoise.trackCollName = 'hiGeneralTracks'
 
 # Global + High-Level Reco Sequence
-globalRecoPbPb = cms.Sequence(heavyIonTracking
+globalRecoPbPb = cms.Sequence(hiTracking
+                              * hiEcalClusters
+                              * hiRecoJets
+                              * muonRecoPbPb
+                              * hiElectronSequence
+                              * hiEgammaSequence
+                              * HiParticleFlowReco
+                              * hiCentrality
+                              * hiEvtPlane
+                              * hcalnoise
+                              )
+
+globalRecoPbPb_wConformalPixel = cms.Sequence(hiTracking_wConformalPixel
                               * hiEcalClusters
                               * hiRecoJets
                               * muonRecoPbPb
+                              * hiElectronSequence
+                              * HiParticleFlowLocalReco
                               * hiEgammaSequence
+                              * HiParticleFlowReco
                               * hiCentrality
                               * hiEvtPlane
                               * hcalnoise

RecoHI/Configuration/python/Reconstruction_hiPF_cff.py

@@ -2,12 +2,12 @@
 
 # include  particle flow local reconstruction
 from RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff import *
-particleFlowClusterPS.thresh_Pt_Seed_Endcap = cms.double(99999.)
+#particleFlowClusterPS.thresh_Pt_Seed_Endcap = cms.double(99999.)
 
 from RecoParticleFlow.PFTracking.pfTrack_cfi import *
 pfTrack.UseQuality = cms.bool(True)
 pfTrack.TrackQuality = cms.string('highPurity')
-pfTrack.TkColList = cms.VInputTag("hiSelectedTracks")
+pfTrack.TkColList = cms.VInputTag("hiGeneralTracks")
 pfTrack.PrimaryVertexLabel = cms.InputTag("hiSelectedVertex")
 pfTrack.MuColl = cms.InputTag("muons")
 
@@ -31,6 +31,8 @@
 
 mvaElectrons.vertexTag = cms.InputTag("hiSelectedVertex")
 
+from RecoHI.HiJetAlgos.HiRecoPFJets_cff import *
+
 # local reco must run before electrons (RecoHI/HiEgammaAlgos), due to PF integration
 HiParticleFlowLocalReco = cms.Sequence(particleFlowCluster
                                        * pfTrack
@@ -41,4 +43,5 @@
 HiParticleFlowReco = cms.Sequence(pfGsfElectronMVASelectionSequence
                                   * particleFlowBlock
                                   * particleFlowTmp
+                                  * hiRecoPFJets
                                   )

RecoHI/HiCentralityAlgos/BuildFile.xml

@@ -12,12 +12,17 @@
 <use   name="DataFormats/TrackingRecHit"/>
 <use   name="DataFormats/TrackerRecHit2D"/>
 <use   name="DataFormats/TrackReco"/>
+<use   name="DataFormats/VertexReco"/>
 <use   name="CondFormats/HIObjects"/>
 <use   name="CondFormats/DataRecord"/>
 <use   name="CondCore/DBCommon"/>
 <use   name="CondCore/DBOutputService"/>
 <use   name="CondCore/PopCon"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/TrackerGeometryBuilder"/>
-<flags   EDM_PLUGIN="1"/>
+<export>
+  <lib   name="1"/>
+  <use   name="DataFormats/HeavyIonEvent"/>
+</export>
+
 

DataFormats/HeavyIonEvent/interface/CentralityProvider.h → RecoHI/HiCentralityAlgos/interface/CentralityProvider.h

@@ -15,7 +15,7 @@ class CentralityProvider : public CentralityBins {
   CentralityProvider(const edm::EventSetup& iSetup);
   ~CentralityProvider(){;}
 
-  enum VariableType {HFtowers,HFhits,PixelHits,PixelTracks,Tracks,EB,EE,Missing};
+  enum VariableType {HFtowers, HFtowersPlus, HFtowersMinus, HFtowersTrunc, HFtowersPlusTrunc, HFtowersMinusTrunc, HFhits, PixelHits, PixelTracks, Tracks, EB, EE, Missing};
 
   int getNbins() const {return table_.size();}
   double centralityValue() const;
@@ -43,6 +43,7 @@ class CentralityProvider : public CentralityBins {
   unsigned int prevRun_;
   mutable edm::Handle<reco::Centrality> chandle_;
   VariableType varType_;
+  unsigned int pPbRunFlip_;
 };
 
 #endif