Skip to content

Commit eefe9b1

Browse files
bfontabfonta
committed
Code format.
1 parent 3d2e88c commit eefe9b1

File tree

2 files changed

+124
-79
lines changed

2 files changed

+124
-79
lines changed

‎DQMServices/Components/plugins/DQMGenericClient.cc‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -389,69 +389,69 @@ DQMGenericClient::DQMGenericClient(const ParameterSet& pset)
389389
// Parse resolution commands
390390
std::array<std::string, 2> optionNames = {{"resolution", "resolutionProfile"}};
391391
for (auto& optName : optionNames) {
392-
vstring resCmds;
393-
if (optName.find("Profile") != std::string::npos)
394-
resCmds = pset.getUntrackedParameter<vstring>(optName, vstring());
395-
else
396-
resCmds = pset.getParameter<vstring>(optName);
397-
398-
for (vstring::const_iterator resCmd = resCmds.begin(); resCmd != resCmds.end(); ++resCmd) {
399-
if (resCmd->empty())
400-
continue;
401-
boost::tokenizer<elsc> tokens(*resCmd, commonEscapes);
402-
403-
vector<string> args;
404-
for (boost::tokenizer<elsc>::const_iterator iToken = tokens.begin(); iToken != tokens.end(); ++iToken) {
405-
if (iToken->empty())
406-
continue;
407-
args.push_back(*iToken);
408-
}
409-
410-
if (args.size() < 3) {
411-
LogInfo("DQMGenericClient") << "Wrong input to resCmds\n";
412-
continue;
413-
}
414-
415-
ResolOption opt;
416-
opt.namePrefix = args[0];
417-
opt.titlePrefix = args[1];
418-
opt.srcName = args[2];
419-
opt.isProfile = (optName.find("Profile") != std::string::npos) ? true : false;
420-
421-
std::string typeDefault = (optName.find("Profile") != std::string::npos) ? "rms" : "fit";
422-
const string typeName = args.size() == 3 ? typeDefault : args[3];
423-
if (typeName == "fit")
424-
opt.type = ResType::fit;
425-
else if (typeName == "rms")
426-
opt.type = ResType::rms;
427-
else
428-
opt.type = ResType::none;
429-
430-
resolOptions_.push_back(opt);
431-
}
392+
vstring resCmds;
393+
if (optName.find("Profile") != std::string::npos)
394+
resCmds = pset.getUntrackedParameter<vstring>(optName, vstring());
395+
else
396+
resCmds = pset.getParameter<vstring>(optName);
397+
398+
for (vstring::const_iterator resCmd = resCmds.begin(); resCmd != resCmds.end(); ++resCmd) {
399+
if (resCmd->empty())
400+
continue;
401+
boost::tokenizer<elsc> tokens(*resCmd, commonEscapes);
402+
403+
vector<string> args;
404+
for (boost::tokenizer<elsc>::const_iterator iToken = tokens.begin(); iToken != tokens.end(); ++iToken) {
405+
if (iToken->empty())
406+
continue;
407+
args.push_back(*iToken);
408+
}
409+
410+
if (args.size() < 3) {
411+
LogInfo("DQMGenericClient") << "Wrong input to resCmds\n";
412+
continue;
413+
}
414+
415+
ResolOption opt;
416+
opt.namePrefix = args[0];
417+
opt.titlePrefix = args[1];
418+
opt.srcName = args[2];
419+
opt.isProfile = (optName.find("Profile") != std::string::npos) ? true : false;
420+
421+
std::string typeDefault = (optName.find("Profile") != std::string::npos) ? "rms" : "fit";
422+
const string typeName = args.size() == 3 ? typeDefault : args[3];
423+
if (typeName == "fit")
424+
opt.type = ResType::fit;
425+
else if (typeName == "rms")
426+
opt.type = ResType::rms;
427+
else
428+
opt.type = ResType::none;
429+
430+
resolOptions_.push_back(opt);
431+
}
432432
}
433433

434434
std::array<std::string, 2> optionSetNames = {{"resolutionProfileSets", "resolutionSets"}};
435435
for (auto& optName : optionSetNames) {
436-
VPSet resSets = pset.getUntrackedParameter<VPSet>(optName, VPSet());
437-
for (VPSet::const_iterator resSet = resSets.begin(); resSet != resSets.end(); ++resSet) {
438-
ResolOption opt;
439-
opt.namePrefix = resSet->getUntrackedParameter<string>("namePrefix");
440-
opt.titlePrefix = resSet->getUntrackedParameter<string>("titlePrefix");
441-
opt.srcName = resSet->getUntrackedParameter<string>("srcName");
442-
443-
std::string typeDefault = (optName.find("Profile") != std::string::npos) ? "rms" : "fit";
444-
const string typeName = resSet->getUntrackedParameter<string>("typeName", typeDefault);
445-
if (typeName == "fit")
446-
opt.type = ResType::fit;
447-
else if (typeName == "rms")
448-
opt.type = ResType::rms;
449-
else
450-
opt.type = ResType::none;
451-
opt.isProfile = (optName.find("Profile") != std::string::npos) ? true : false;
452-
453-
resolOptions_.push_back(opt);
454-
}
436+
VPSet resSets = pset.getUntrackedParameter<VPSet>(optName, VPSet());
437+
for (VPSet::const_iterator resSet = resSets.begin(); resSet != resSets.end(); ++resSet) {
438+
ResolOption opt;
439+
opt.namePrefix = resSet->getUntrackedParameter<string>("namePrefix");
440+
opt.titlePrefix = resSet->getUntrackedParameter<string>("titlePrefix");
441+
opt.srcName = resSet->getUntrackedParameter<string>("srcName");
442+
443+
std::string typeDefault = (optName.find("Profile") != std::string::npos) ? "rms" : "fit";
444+
const string typeName = resSet->getUntrackedParameter<string>("typeName", typeDefault);
445+
if (typeName == "fit")
446+
opt.type = ResType::fit;
447+
else if (typeName == "rms")
448+
opt.type = ResType::rms;
449+
else
450+
opt.type = ResType::none;
451+
opt.isProfile = (optName.find("Profile") != std::string::npos) ? true : false;
452+
453+
resolOptions_.push_back(opt);
454+
}
455455
}
456456

457457
// Parse profiles

‎Validation/RecoJets/plugins/JetTester.cc‎

Lines changed: 65 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -528,45 +528,90 @@ void JetTester::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun,
528528
RespRange[0],
529529
RespRange[1]);
530530

531-
h2d_chHadMult_vs_pt[j] = ibooker.book2D(
531+
h2d_chHadMult_vs_pt[j] = ibooker.book2D(
532532
fmt::format("h2d_chHadMult_pt_{}", etaRegion),
533533
fmt::format("Profiled charged HAD multiplicity - {};p_{{T}}^{{reco}};charged HAD multiplicity", etaLabel),
534-
n_PtBins, PtRange[0], PtRange[1], 50, 0, 50);
535-
h2d_neHadMult_vs_pt[j] = ibooker.book2D(
534+
n_PtBins,
535+
PtRange[0],
536+
PtRange[1],
537+
50,
538+
0,
539+
50);
540+
h2d_neHadMult_vs_pt[j] = ibooker.book2D(
536541
fmt::format("h2d_neHadMult_pt_{}", etaRegion),
537542
fmt::format("Profiled neutral HAD multiplicity - {};p_{{T}}^{{reco}};neutral HAD multiplicity", etaLabel),
538-
n_PtBins, PtRange[0], PtRange[1], 50, 0, 50);
539-
h2d_chMult_vs_pt[j] = ibooker.book2D(
543+
n_PtBins,
544+
PtRange[0],
545+
PtRange[1],
546+
50,
547+
0,
548+
50);
549+
h2d_chMult_vs_pt[j] = ibooker.book2D(
540550
fmt::format("h2d_chMult_pt_{}", etaRegion),
541551
fmt::format("Profiled charged multiplicity - {};p_{{T}}^{{reco}};charged multiplicity", etaLabel),
542-
n_PtBins, PtRange[0], PtRange[1], 50, 0, 50);
543-
h2d_neMult_vs_pt[j] = ibooker.book2D(
552+
n_PtBins,
553+
PtRange[0],
554+
PtRange[1],
555+
50,
556+
0,
557+
50);
558+
h2d_neMult_vs_pt[j] = ibooker.book2D(
544559
fmt::format("h2d_neMult_pt_{}", etaRegion),
545560
fmt::format("Profiled neutral multiplicity - {};p_{{T}}^{{reco}};neutral EM multiplicity", etaLabel),
546-
n_PtBins, PtRange[0], PtRange[1], 50, 0, 50);
547-
h2d_phoMult_vs_pt[j] = ibooker.book2D(
548-
fmt::format("h2d_phoMult_pt_{}", etaRegion),
549-
fmt::format("Profiled photon multiplicity - {};p_{{T}}^{{reco}};photon multiplicity", etaLabel),
550-
n_PtBins, PtRange[0], PtRange[1], 15, 0, 15);
551-
561+
n_PtBins,
562+
PtRange[0],
563+
PtRange[1],
564+
50,
565+
0,
566+
50);
567+
h2d_phoMult_vs_pt[j] =
568+
ibooker.book2D(fmt::format("h2d_phoMult_pt_{}", etaRegion),
569+
fmt::format("Profiled photon multiplicity - {};p_{{T}}^{{reco}};photon multiplicity", etaLabel),
570+
n_PtBins,
571+
PtRange[0],
572+
PtRange[1],
573+
15,
574+
0,
575+
15);
576+
552577
h2d_chHad_vs_pt[j] = ibooker.book2D(
553578
fmt::format("h2d_chHad_pt_{}", etaRegion),
554579
fmt::format("Profiled charged HAD energy fraction - {};p_{{T}}^{{reco}};charged HAD energy fraction", etaLabel),
555-
n_PtBins, PtRange[0], PtRange[1], 40, 0, 1);
580+
n_PtBins,
581+
PtRange[0],
582+
PtRange[1],
583+
40,
584+
0,
585+
1);
556586
h2d_neHad_vs_pt[j] = ibooker.book2D(
557587
fmt::format("h2d_neHad_pt_{}", etaRegion),
558588
fmt::format("Profiled neutral HAD energy fraction - {};p_{{T}}^{{reco}};neutral HAD energy fraction", etaLabel),
559-
n_PtBins, PtRange[0], PtRange[1], 40, 0, 1);
589+
n_PtBins,
590+
PtRange[0],
591+
PtRange[1],
592+
40,
593+
0,
594+
1);
560595
h2d_chEm_vs_pt[j] = ibooker.book2D(
561596
fmt::format("h2d_chEm_pt_{}", etaRegion),
562597
fmt::format("Profiled charged EM energy fraction - {};p_{{T}}^{{reco}};charged EM energy fraction", etaLabel),
563-
n_PtBins, PtRange[0], PtRange[1], 40, 0, 1);
598+
n_PtBins,
599+
PtRange[0],
600+
PtRange[1],
601+
40,
602+
0,
603+
1);
564604
h2d_neEm_vs_pt[j] = ibooker.book2D(
565605
fmt::format("h2d_neEm_pt_{}", etaRegion),
566606
fmt::format("Profiled neutral EM energy fraction - {};p_{{T}}^{{reco}};neutral EM energy fraction", etaLabel),
567-
n_PtBins, PtRange[0], PtRange[1], 40, 0, 1);
607+
n_PtBins,
608+
PtRange[0],
609+
PtRange[1],
610+
40,
611+
0,
612+
1);
568613

569-
h2d_JetPtRecoOverGen_vs_chHad[j] = ibooker.book2D(
614+
h2d_JetPtRecoOverGen_vs_chHad[j] = ibooker.book2D(
570615
fmt::format("h2d_PtRecoOverGen_chHad_{}", etaRegion),
571616
fmt::format("Response Reco Jets - {};charged HAD energy Fraction;p_{{T}}^{{reco}}/p_{{T}}^{{gen}}", etaLabel),
572617
30,
@@ -1191,11 +1236,11 @@ void JetTester::analyze(const edm::Event& mEvent, const edm::EventSetup& mSetup)
11911236
chargedHadronMultiplicity_EtaBins[j]->Fill((*pfJets)[ijet].chargedHadronMultiplicity());
11921237
chargedMultiplicity_EtaBins[j]->Fill((*pfJets)[ijet].chargedMultiplicity());
11931238

1194-
h2d_chHadMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].chargedHadronMultiplicity());
1239+
h2d_chHadMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].chargedHadronMultiplicity());
11951240
h2d_neHadMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].neutralHadronMultiplicity());
11961241
h2d_chMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].chargedMultiplicity());
11971242
h2d_neMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].neutralMultiplicity());
1198-
h2d_phoMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].photonMultiplicity());
1243+
h2d_phoMult_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].photonMultiplicity());
11991244

12001245
h2d_chHad_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].chargedHadronEnergyFraction());
12011246
h2d_neHad_vs_pt[j]->Fill(recoJets[ijet].pt(), (*pfJets)[ijet].neutralHadronEnergyFraction());

0 commit comments

Comments
 (0)