Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove HF/Voronoi subtraction for jets in heavy ions and disable centrality bin producer #18684

Merged
merged 5 commits into from
May 20, 2017
Merged

Remove HF/Voronoi subtraction for jets in heavy ions and disable centrality bin producer #18684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a91c641
Remove HF-Voronoi subtraction for jets in heavy ions and disable cent…
mandrenguyen May 10, 2017
44fb147
Update CentralityDQM.cc
mandrenguyen May 17, 2017
dd7574a
Update JetAnalyzer_HeavyIons.cc
mandrenguyen May 17, 2017
8cbb255
Update JetTester_HeavyIons.cc
mandrenguyen May 17, 2017
4b28124
cleanup of externals and logs
mandrenguyen May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions DQM/Physics/src/CentralityDQM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,10 @@ void CentralityDQM::analyze(const edm::Event& iEvent,

// if (!cent.isValid()) return;
if(cent.isValid()){
int hibin = *cbin;

int hibin = -999;
if(cbin.isValid()) hibin = *cbin;
else edm::LogWarning("CentralityDQM") << "invalid collection: centralityBin " << std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason to pollute the logs with this message by default?
The same question applies to other cases.

If the goal is to keep a reminder where it should be added again, perhaps add these printouts with a compile flag e.g. #ifdef CENTRALITY_WARNING


// std::cout<< " ------------------------------------- " << hibin << std::endl;

h_cent_bin->Fill(hibin);
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Ecal/python/ecal_dqm_source_offline_HI_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

ecalMultiftAnalyzer = cms.EDAnalyzer('ECALMultifitAnalyzer_HI',
recoPhotonSrc = cms.InputTag('photons'),
recoJetSrc = cms.InputTag('akVs4CaloJets'),
recoJetSrc = cms.InputTag('akPu4CaloJets'),
RecHitCollection_EB = cms.InputTag('ecalRecHit:EcalRecHitsEB'),
RecHitCollection_EE = cms.InputTag('ecalRecHit:EcalRecHitsEE'),
rechitEnergyThreshold = cms.double(5.0),
Expand Down
34 changes: 1 addition & 33 deletions DQMOffline/JetMET/python/jetAnalyzer_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,48 +14,16 @@
jetDQMAnalyzerSequenceMiniAOD = cms.Sequence(jetDQMAnalyzerAk4PFCHSUncleanedMiniAOD*jetDQMAnalyzerAk4PFCHSCleanedMiniAOD*jetDQMAnalyzerAk8PFPUPPICleanedMiniAOD*jetDQMAnalyzerAk4PFCHSPuppiCleanedMiniAOD)

jetDQMAnalyzerSequenceHI = cms.Sequence(jetDQMAnalyzerIC5CaloHIUncleaned
* jetDQMMatchAkPu3CaloAkVs3Calo
* jetDQMMatchAkPu3PFAkVs3PF
* jetDQMMatchAkPu3CaloAkPu3PF
* jetDQMMatchAkVs3CaloAkVs3PF

* jetDQMMatchAkPu4CaloAkVs4Calo
* jetDQMMatchAkPu4PFAkVs4PF
* jetDQMMatchAkPu4CaloAkPu4PF
* jetDQMMatchAkVs4CaloAkVs4PF

* jetDQMMatchAkPu5CaloAkVs5Calo
* jetDQMMatchAkPu5PFAkVs5PF
* jetDQMMatchAkPu5CaloAkPu5PF
* jetDQMMatchAkVs5CaloAkVs5PF


* jetDQMAnalyzerAkPU3Calo
* jetDQMAnalyzerAkPU4Calo
* jetDQMAnalyzerAkPU5Calo

* jetDQMAnalyzerAkPU3PF
* jetDQMAnalyzerAkPU4PF
* jetDQMAnalyzerAkPU5PF

#* jetDQMAnalyzerAkVs2Calo
* jetDQMAnalyzerAkVs3Calo
* jetDQMAnalyzerAkVs4Calo
* jetDQMAnalyzerAkVs5Calo
#* jetDQMAnalyzerAkVs6Calo
#* jetDQMAnalyzerAkVs7Calo

#* jetDQMAnalyzerAkVs2PF
* jetDQMAnalyzerAkVs3PF
* jetDQMAnalyzerAkVs4PF
* jetDQMAnalyzerAkVs5PF
#* jetDQMAnalyzerAkVs6PF
#* jetDQMAnalyzerAkVs7PF

#* jetDQMAnalyzerAk3CaloCleaned
#* jetDQMAnalyzerAk4CaloCleaned
#* jetDQMAnalyzerAk5CaloCleaned
#* jetDQMAnalyzerAk3PFCleaned
#* jetDQMAnalyzerAk4PFCleaned
#* jetDQMAnalyzerAk5PFCleaned
)

10 changes: 7 additions & 3 deletions DQMOffline/JetMET/src/JetAnalyzer_HeavyIons.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,11 +795,15 @@ void JetAnalyzer_HeavyIons::analyze(const edm::Event& mEvent, const edm::EventSe
edm::Handle<int> cbin;
mEvent.getByToken(centralityBinToken, cbin);

if (!cent.isValid()) return;
if (!cent.isValid()){
edm::LogError("JetAnalyzer_HeavyIons") << "invalid collection: centrality " << std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is a real problem, better throw an exception (or let the framework throw it).
Since a while now, it can take a long time until a LogError is noticed.

return;
}
int hibin = -999;
if(cent.isValid())
if(cbin.isValid()){
hibin = *cbin;

}
else edm::LogWarning("JetAnalyzer_HeavyIons") << "invalid collection: centralityBin " << std::endl;

const reco::PFCandidateCollection *pfCandidateColl = pfCandidates.product();

Expand Down
4 changes: 2 additions & 2 deletions RecoHI/Configuration/python/Reconstruction_HI_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* hiEgammaSequence
* hiParticleFlowReco
* hiCentrality
* centralityBin
#* centralityBin # temporarily removed
* hiClusterCompatibility
* hiEvtPlane
* hcalnoise
Expand All @@ -59,7 +59,7 @@
* hiEgammaSequence
* hiParticleFlowReco
* hiCentrality
* centralityBin
#* centralityBin # temporarily removed
* hiClusterCompatibility
* hiEvtPlane
* hcalnoise
Expand Down
36 changes: 0 additions & 36 deletions RecoHI/HiJetAlgos/interface/VoronoiSubtractor.h
View file
Open in desktop

This file was deleted.

Loading