Skip to content

Commit

Permalink
Merge pull request cms-sw#128 from ttrk/forest_CMSSW_8_0_28_rechitana…
Browse files Browse the repository at this point in the history 
…lyzer_remove_VS

remove VS block from rechitanalyzer
  • Loading branch information
@kurtejung
kurtejung committed Sep 13, 2017
2 parents db308fd + 5a0a1a2 commit f2b4df2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 89 deletions.
9 changes: 1 addition & 8 deletions HeavyIonsAnalysis/JetAnalysis/python/rechitanalyzer_cfi.py
View file
Expand Up @@ -20,13 +20,7 @@
doEbyEonly = cms.untracked.bool(False),
HFtowerMin = cms.untracked.double(3),
HFlongMin = cms.untracked.double(0.5),
HFshortMin = cms.untracked.double(0.85),
doVS = cms.untracked.bool(True),
bkg = cms.InputTag("voronoiBackgroundCalo"),
etaBins = cms.int32(15),
fourierOrder = cms.int32(5),
doUEraw_ = cms.untracked.bool(False),

HFshortMin = cms.untracked.double(0.85),
)

pfTowers = rechitanalyzer.clone(
Expand All @@ -36,7 +30,6 @@
doFastJet = cms.untracked.bool(False),
towersSrc = cms.untracked.InputTag("PFTowers"),
TowerTreePtMin = cms.untracked.double(-99),
doVS = cms.untracked.bool(False),
)


Expand Down
81 changes: 0 additions & 81 deletions HeavyIonsAnalysis/JetAnalysis/src/RecHitTreeProducer.cc
View file
Expand Up @@ -72,9 +72,6 @@
#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"

#include "DataFormats/HeavyIonEvent/interface/VoronoiBackground.h"
#include "RecoHI/HiJetAlgos/interface/UEParameters.h"


#include "TNtuple.h"

Expand Down Expand Up @@ -120,16 +117,6 @@ struct MyRecHit{
float jtpt;
float jteta;
float jtphi;

Float_t vsPt[MAXHITS];
Float_t vsPtInitial[MAXHITS];
Float_t vsArea[MAXHITS];

Float_t sumpt[20];
Float_t vn[200];
Float_t psin[200];
Float_t ueraw[1200];

};


Expand Down Expand Up @@ -208,7 +195,6 @@ class RecHitTreeProducer : public edm::EDAnalyzer {
edm::Handle<std::vector<double> > rhos;
edm::Handle<std::vector<double> > sigmas;

edm::Handle<reco::VoronoiMap> backgrounds_;
edm::Handle<std::vector<float> > vn_;

MyRecHit hbheRecHit;
Expand Down Expand Up @@ -274,12 +260,6 @@ class RecHitTreeProducer : public edm::EDAnalyzer {
edm::EDGetTokenT<std::vector<double>> FastJetTag_rhos_;
edm::EDGetTokenT<std::vector<double>> FastJetTag_sigmas_;

edm::EDGetTokenT<reco::VoronoiMap> srcVor_backgrounds_;
edm::EDGetTokenT<std::vector<float>> srcVor_vn_;
int fourierOrder_;
int etaBins_;
bool doUEraw_;


bool useJets_;
bool doBasicClusters_;
Expand All @@ -291,8 +271,6 @@ class RecHitTreeProducer : public edm::EDAnalyzer {
bool doZDCRecHit_;
bool doZDCDigi_;

bool doVS_;

bool hasVtx_;
bool saveBothVtx_;

Expand Down Expand Up @@ -340,15 +318,6 @@ RecHitTreeProducer::RecHitTreeProducer(const edm::ParameterSet& iConfig) :
doCastor_ = iConfig.getUntrackedParameter<bool>("doCASTOR",true);
doZDCRecHit_ = iConfig.getUntrackedParameter<bool>("doZDCRecHit",true);
doZDCDigi_ = iConfig.getUntrackedParameter<bool>("doZDCDigi",true);
doVS_ = iConfig.getUntrackedParameter<bool>("doVS",true);

doUEraw_ = iConfig.getUntrackedParameter<bool>("doUEraw",0);

etaBins_ = iConfig.getParameter<int>("etaBins");
fourierOrder_ = iConfig.getParameter<int>("fourierOrder");

srcVor_backgrounds_ = consumes<reco::VoronoiMap> (iConfig.getParameter<edm::InputTag>("bkg"));
srcVor_vn_ = consumes<std::vector<float>> (iConfig.getParameter<edm::InputTag>("bkg"));

hasVtx_ = iConfig.getUntrackedParameter<bool>("hasVtx",true);
saveBothVtx_ = iConfig.getUntrackedParameter<bool>("saveBothVtx",false);
Expand Down Expand Up @@ -425,28 +394,6 @@ RecHitTreeProducer::analyze(const edm::Event& ev, const edm::EventSetup& iSetup)

}

if (doTowers_ && doVS_) {
ev.getByToken(TowerSrc_Candidates_,candidates_);
ev.getByToken(srcVor_backgrounds_,backgrounds_);
ev.getByToken(srcVor_vn_,vn_);

UEParameters vnUE(vn_.product(),fourierOrder_,etaBins_);
const std::vector<float>& vue = vnUE.get_raw();
for(int ieta = 0; ieta < etaBins_; ++ieta){
myTowers.sumpt[ieta] = vnUE.get_sum_pt(ieta);
for(int ifour = 0; ifour < fourierOrder_; ++ifour){
myTowers.vn[ifour * etaBins_ + ieta] = vnUE.get_vn(ifour,ieta);
myTowers.psin[ifour * etaBins_ + ieta] = vnUE.get_psin(ifour,ieta);
}
}


for(int iue = 0; iue < etaBins_*fourierOrder_*2*3; ++iue){
myTowers.ueraw[iue] = vue[iue];
}

}

if(doFastJet_){
ev.getByToken(FastJetTag_rhos_,rhos);
ev.getByToken(FastJetTag_sigmas_,sigmas);
Expand Down Expand Up @@ -673,20 +620,6 @@ RecHitTreeProducer::analyze(const edm::Event& ev, const edm::EventSetup& iSetup)
const CaloTower & hit= (*towers)[i];
if (getEt(hit.id(),hit.energy())<towerPtMin_) continue;

if (doVS_) {

reco::CandidateViewRef ref(candidates_,i);
double vsPtInitial=-999, vsPt=-999, vsArea = -999;

const reco::VoronoiBackground& voronoi = (*backgrounds_)[ref];
vsPt = voronoi.pt();
vsPtInitial = voronoi.pt_subtracted();
vsArea = voronoi.area();
myTowers.vsPt[myTowers.n] = vsPt;
myTowers.vsPtInitial[myTowers.n] = vsPtInitial;
myTowers.vsArea[myTowers.n] = vsArea;

}
const CaloTowerDetId & id = hit.id();
myTowers.rawId[myTowers.n] = id.rawId();
myTowers.ieta[myTowers.n] = id.ieta();
Expand Down Expand Up @@ -992,20 +925,6 @@ RecHitTreeProducer::beginJob()
towerTree->Branch("ieta",myTowers.ieta,"ieta[n]/I");
towerTree->Branch("iphi",myTowers.iphi,"iphi[n]/I");

if(doVS_){

towerTree->Branch("vsPt",myTowers.vsPt,"vsPt[n]/F");
towerTree->Branch("vsPtInitial",myTowers.vsPtInitial,"vsPtInitial[n]/F");
towerTree->Branch("vsArea",myTowers.vsArea,"vsArea[n]/F");

towerTree->Branch("vn",myTowers.vn,Form("vn[%d][%d]/F",fourierOrder_,etaBins_));
towerTree->Branch("psin",myTowers.psin,Form("vpsi[%d][%d]/F",fourierOrder_,etaBins_));
towerTree->Branch("sumpt",myTowers.sumpt,Form("sumpt[%d]/F",etaBins_));
if(doUEraw_){
towerTree->Branch("ueraw",myTowers.ueraw,Form("ueraw[%d]/F",(fourierOrder_*etaBins_*2*3)));
}
}


}

Expand Down

0 comments on commit f2b4df2

Please sign in to comment.