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

Commiting a Fix to set currenttype_ and commenting out l1gtEvmDigis #7539

Merged
merged 2 commits into from
Feb 5, 2015
Merged

Commiting a Fix to set currenttype_ and commenting out l1gtEvmDigis #7539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088e194
Commiting a Fix to set currenttype_ and commenting out l1gtEvmDigis
vkhristenko Feb 3, 2015
8307753
Introducing a Fix for HcalDeadCellMonitor to correct for the absence …
vkhristenko Feb 5, 2015
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
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalBeamMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ void HcalBeamMonitor::bookHistograms(DQMStore::IBooker &ib, const edm::Run& run,

void HcalBeamMonitor::analyze(const edm::Event& e, const edm::EventSetup& c)
{
HcalBaseDQMonitor::analyze(e,c);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand Down Expand Up @@ -495,7 +496,7 @@ void HcalBeamMonitor::analyze(const edm::Event& e, const edm::EventSetup& c)
}

//good event; increment counters and process
HcalBaseDQMonitor::analyze(e,c);
// HcalBaseDQMonitor::analyze(e,c);
processEvent(*hbhe_rechit, *ho_rechit, *hf_rechit, *hf_digi, e.bunchCrossing());

} //void HcalBeamMonitor::analyze(const edm::Event& e, const edm::EventSetup& c)
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalCoarsePedestalMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ void HcalCoarsePedestalMonitor::bookHistograms(DQMStore::IBooker &ib, const edm:

void HcalCoarsePedestalMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
{
HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand Down Expand Up @@ -138,7 +139,7 @@ void HcalCoarsePedestalMonitor::analyze(edm::Event const&e, edm::EventSetup cons
// all objects grabbed; event is good
if (debug_>1) std::cout <<"\t<HcalCoarsePedestalMonitor::analyze> Processing good event! event # = "<<ievt_<<std::endl;

HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters
// HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters

// Digi collection was grabbed successfully; process the Event
processEvent(*hbhe_digi, *ho_digi, *hf_digi, *report);
Expand Down
24 changes: 12 additions & 12 deletions DQM/HcalMonitorTasks/src/HcalDeadCellMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ void HcalDeadCellMonitor::endJob()

void HcalDeadCellMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
{
HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
endLumiProcessed_=false;

Expand Down Expand Up @@ -687,17 +688,10 @@ void HcalDeadCellMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
edm::LogWarning("HcalDeadCellMonitor")<< hoRechitLabel_<<" ho_rechit not available";
return;
}
if (!(e.getByToken(tok_gtEvm_, gtEvm_handle)))
{
edm::LogWarning("HcalDeadCellMonitor")<< "gtEvmDigis"<<" gtEvmDigis not available";
return;
}
L1GtfeExtWord gtfeEvmExtWord = gtEvm_handle.product()->gtfeWord();

if (debug_>1) std::cout <<"\t<HcalDeadCellMonitor::analyze> Processing good event! event # = "<<ievt_<<std::endl;
// Good event found; increment counter (via base class analyze method)
// This also runs the allowed calibration /lumi in order tests again; remove?
HcalBaseDQMonitor::analyze(e,s);

++deadevt_; //increment local counter

Expand Down Expand Up @@ -731,13 +725,19 @@ void HcalDeadCellMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
rbxlost[i] = 1;
}

int intensity1_ = gtfeEvmExtWord.totalIntensityBeam1();
int intensity2_ = gtfeEvmExtWord.totalIntensityBeam2();

is_stable_beam = gtfeEvmExtWord.beamMode() == 11 ? true : false;
//
// Modified: not to use gtfeEvmExtWord
// is_stable_beam = false for now!
// Set beamMode to NOBEAM
// TODO: Obtain these values from TCDS Record
//
int intensity1_ = 101;
int intensity2_ = 101;
is_stable_beam = false;
int beamMode = 21;

for (unsigned int i=132;i<156;++i)
if(occupancy_RBX[i] == 0 && gtfeEvmExtWord.beamMode() == 11)
if(occupancy_RBX[i] == 0 && beamMode == 11)
if(intensity1_>100 && intensity2_>100) // only in stable beam mode (11) and with circulating beams, otherwise
{ // this check is too sensitive in HF
is_RBX_loss_ = 1;
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalDetDiagNoiseMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,10 @@ void HcalDetDiagNoiseMonitor::setup(DQMStore::IBooker &ib){

void HcalDetDiagNoiseMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup){
getLogicalMap(iSetup);
HcalBaseDQMonitor::analyze(iEvent, iSetup);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(iEvent.luminosityBlock())==false) return;
HcalBaseDQMonitor::analyze(iEvent, iSetup);
// HcalBaseDQMonitor::analyze(iEvent, iSetup);
bool isNoiseEvent=false;
int orbit=-1111;
int bx=-1111;
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalDetDiagTimingMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ void HcalDetDiagTimingMonitor::setup(DQMStore::IBooker &ib)

void HcalDetDiagTimingMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
{
HcalBaseDQMonitor::analyze(iEvent, iSetup);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(iEvent.luminosityBlock())==false) return;
HcalBaseDQMonitor::analyze(iEvent, iSetup);
// HcalBaseDQMonitor::analyze(iEvent, iSetup);

int eta,phi,depth,nTS,BXinEVENT=1,TRIGGER=0;

Expand Down
4 changes: 3 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalDigiMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,8 @@ void HcalDigiMonitor::setupSubdetHists(DQMStore::IBooker &ib, DigiHists& hist, s

void HcalDigiMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
{
HcalBaseDQMonitor::analyze(e, s);

if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand Down Expand Up @@ -598,7 +600,7 @@ void HcalDigiMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
// all objects grabbed; event is good
if (debug_>1) std::cout <<"\t<HcalDigiMonitor::analyze> Processing good event! event # = "<<ievt_<<std::endl;

HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters
// HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters

// Digi collection was grabbed successfully; process the Event
processEvent(*hbhe_digi, *ho_digi, *hf_digi, *conditions_,
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalMonitorTasks/src/HcalHotCellMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ void HcalHotCellMonitor::done()

void HcalHotCellMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
{

HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand Down Expand Up @@ -403,7 +403,7 @@ void HcalHotCellMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)

// Good event found; increment counter (via base class analyze method)

HcalBaseDQMonitor::analyze(e,s);
// HcalBaseDQMonitor::analyze(e,s);
if (debug_>1) std::cout <<"\t<HcalHotCellMonitor::analyze> Processing good event! event # = "<<ievt_<<std::endl;

processEvent(*hbhe_rechit, *ho_rechit, *hf_rechit);
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalNZSMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ void HcalNZSMonitor::setup(DQMStore::IBooker &ib)

void HcalNZSMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
{
HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand All @@ -143,7 +144,7 @@ void HcalNZSMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)

const edm::TriggerNames & triggerNames = e.triggerNames(*hltRes);
// Collections were found; increment counters
HcalBaseDQMonitor::analyze(e,s);
// HcalBaseDQMonitor::analyze(e,s);

processEvent(*rawraw, *hltRes, e.bunchCrossing(), triggerNames);

Expand Down
6 changes: 4 additions & 2 deletions DQM/HcalMonitorTasks/src/HcalRawDataMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,13 @@ void HcalRawDataMonitor::setup(DQMStore::IBooker &ib){
}

// Analyze
void HcalRawDataMonitor::analyze(const edm::Event& e, const edm::EventSetup& s){
void HcalRawDataMonitor::analyze(const edm::Event& e, const edm::EventSetup& s)
{
HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters
// HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters

// try to get die Data
edm::Handle<FEDRawDataCollection> rawraw;
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalMonitorTasks/src/HcalRecHitMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ void HcalRecHitMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
getLogicalMap(s);
if (debug_>0) std::cout <<"HcalRecHitMonitor::analyze; debug = "<<debug_<<std::endl;

HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand Down Expand Up @@ -732,7 +733,7 @@ void HcalRecHitMonitor::analyze(edm::Event const&e, edm::EventSetup const&s)
h_LumiPlot_BX_allevents->Fill(e.bunchCrossing());
processEvent(*hbhe_rechit, *ho_rechit, *hf_rechit, e.bunchCrossing(), e);

HcalBaseDQMonitor::analyze(e,s);
// HcalBaseDQMonitor::analyze(e,s);
} // void HcalRecHitMonitor::analyze()


Expand Down
6 changes: 4 additions & 2 deletions DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ void HcalTrigPrimMonitor::bookHistograms(DQMStore::IBooker &ib, const edm::Run&
} // void HcalTrigPrimMonitor::bookHistograms()

void
HcalTrigPrimMonitor::analyze (edm::Event const &e, edm::EventSetup const &s) {
HcalTrigPrimMonitor::analyze (edm::Event const &e, edm::EventSetup const &s)
{
HcalBaseDQMonitor::analyze(e,s);
if (!IsAllowedCalibType()) return;
if (LumiInOrder(e.luminosityBlock())==false) return;

Expand All @@ -186,7 +188,7 @@ HcalTrigPrimMonitor::analyze (edm::Event const &e, edm::EventSetup const &s) {
return;
}

HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters
// HcalBaseDQMonitor::analyze(e,s); // base class increments ievt_, etc. counters
processEvent(data_tp_col, emul_tp_col);
}

Expand Down
2 changes: 1 addition & 1 deletion DQM/Integration/python/test/hcal_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@

process.p = cms.Path(process.hcalDigis
*process.valHcalTriggerPrimitiveDigis
*process.gtEvmDigis#to unpack l1gtEvm
#*process.gtEvmDigis#to unpack l1gtEvm
*process.l1GtUnpack
*process.horeco
*process.hfreco
Expand Down