Skip to content
Snippets Groups Projects
Commit 0b43cfd0 authored by Michael William O'Keefe's avatar Michael William O'Keefe
Browse files

Addressing whitespace change comments

parent 7275cf83
24 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!45045WIP: Include another condition for hit merging in FCS_StepInfoSD.cxx,!45043Merge branch 'Update-DAOD_IDNCB' into '21.2',!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!42171Add LAr cell DQ plots to UPC stream,!40342WIP: ATR-22546 - add missing trigger to MC16a,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!37483Fix in monitoring of Pixel FE errors,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!3473421.0 fix dq servers,!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!31887Merge 21.3.19 into 21.9,!31426Merge 21.0.110 into 21.3,!31345Add HEC sampling fractions macros,!30863Change BCID structure to trees
Hide whitespace changes
Inline Side-by-side
DataQuality/DataQualityTools/src/DQTDataFlowMonTool.cxx
+ 0
− 1
View file @ 0b43cfd0
......@@ -239,4 +239,3 @@ StatusCode DQTDataFlowMonTool::checkHists(bool /* fromFinalize */)
*/
return StatusCode::SUCCESS;
}
DataQuality/DataQualityTools/src/DQTGlobalWZFinderTool.cxx
+ 11
− 12
View file @ 0b43cfd0
......@@ -112,7 +112,7 @@ DQTGlobalWZFinderTool::DQTGlobalWZFinderTool(const std::string & type,
declareProperty("UseOwnMuonSelection", m_useOwnMuonSelection);
declareProperty("MuonMaxEta", m_muonMaxEta);
declareProperty("BCTool", m_bcTool);
declareProperty("FillBCIDTrees", m_do_BCID);
declareProperty("FillBCIDTrees", m_do_BCID = false);
m_W_mt_ele = 0;
m_W_mt_mu = 0;
......@@ -160,7 +160,7 @@ StatusCode DQTGlobalWZFinderTool::bookHistogramsRecurrent()
ATH_MSG_DEBUG("For Z->mm:");
for (auto trig : m_Z_ee_trigger){
std::cout << "ZeeTrigger: " << trig << std::endl;
ATH_MSG_DEBUG("ZeeTrigger: " + trig);
}
bool failure(false);
......@@ -178,14 +178,14 @@ StatusCode DQTGlobalWZFinderTool::bookHistogramsRecurrent()
}
if (!m_isSimulation) {
failure |= registerHist(fullPathDQTGlobalWZFinder, m_livetime_lb = new TProfile("m_livetime_lb", "Livetime", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_lblength_lb = new TProfile("m_lblength_lb", "LB length", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_mu_lb = new TProfile("m_mu_lb", "#mu", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_Z_ee_trig_ps = new TProfile("m_Z_ee_trig_ps", "Z->ee trigger PS", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_Z_mm_trig_ps = new TProfile("m_Z_mm_trig_ps", "Z->#mu#mu trigger PS", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_livetime_lb = new TProfile("m_livetime_lb", "Livetime", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_lblength_lb = new TProfile("m_lblength_lb", "LB length", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_mu_lb = new TProfile("m_mu_lb", "#mu", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_Z_ee_trig_ps = new TProfile("m_Z_ee_trig_ps", "Z->ee trigger PS", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_Z_mm_trig_ps = new TProfile("m_Z_mm_trig_ps", "Z->#mu#mu trigger PS", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_ZBosonCounter_El_os = new TH1F("m_Z_Counter_el_os","Z #rightarrow ee Count per Lumi Block", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_ZBosonCounter_El_ss = new TH1F("m_Z_Counter_el_ss","Z #rightarrow ee Count per Lumi Block", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_ZBosonCounter_Mu = new TH1F("m_Z_Counter_mu","Z #rightarrow #mu#mu Count per Lumi Block", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
failure |= registerHist(fullPathDQTGlobalWZFinder, m_ZBosonCounter_Mu = new TH1F("m_Z_Counter_mu","Z #rightarrow #mu#mu Count per Lumi Block", 1, m_this_lb-0.5, m_this_lb+0.5), lumiBlock, ATTRIB_UNMANAGED, "merge").isFailure();
if (!failure) {
m_livetime_lb->Fill(m_this_lb, lbAverageLivefraction());
......@@ -345,10 +345,8 @@ bool DQTGlobalWZFinderTool::bookDQTGlobalWZFinderTool()
setBCIDBranches(m_bcid_mu_tight_good, "mass");
setBCIDBranches(m_bcid_mu_tight_bad, "mass");
setBCIDBranches(m_bcid_mu_trigtp, "matched");
}
if (m_isSimulation) {
failure = failure | registerHist(fullPathDQTGlobalWZFinder, m_mcmatch = TH1F_LW::create("m_mcatch", "Muon matching to truth in acceptance", 2, -0.5, 1.5), lumiBlock).isFailure();
......@@ -366,7 +364,6 @@ bool DQTGlobalWZFinderTool::bookDQTGlobalWZFinderTool()
failure = failure | registerTree(fullPathDQTGlobalWZFinder, m_electron_trig_tptree = new TTree("electron_trig_tptree","electron_trig_tptree")).isFailure();
setDQTGlobalWZFinderBranches();
}
}
......@@ -925,10 +922,10 @@ StatusCode DQTGlobalWZFinderTool::procHistograms( )
{
if ( endOfLumiBlockFlag() || endOfRunFlag() ) {
MsgStream log(msgSvc(), name());
ATH_MSG_DEBUG("in finalHists()");
}
//---Filling rate monitoring histograms---//
if (endOfLumiBlockFlag()) {
m_JPsiCounterSignal[0] = m_JPsiCounterSBG[0] - m_JPsiCounter2BG[0]/2;
......@@ -993,6 +990,8 @@ StatusCode DQTGlobalWZFinderTool::procHistograms( )
return StatusCode::SUCCESS;
}
//------ Electron START ------//
void DQTGlobalWZFinderTool::doEleTriggerTP(const xAOD::Electron* el1, const xAOD::Electron* el2, bool os, bool ss) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment