Skip to content

Commit e497d79

Browse files
committed
modify from master
1 parent 4920a5e commit e497d79

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

GeneratorInterface/Pythia8Interface/plugins/Pythia8Hadronizer.cc

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ Pythia8Hadronizer::Pythia8Hadronizer(const edm::ParameterSet &params)
282282
if (params.exists("reweightGen")) {
283283
edm::LogInfo("Pythia8Interface") << "Start setup for reweightGen";
284284
edm::ParameterSet rgParams = params.getParameter<edm::ParameterSet>("reweightGen");
285-
fReweightUserHook = std::make_shared<PtHatReweightUserHook>(rgParams.getParameter<double>("pTRef"),
286-
rgParams.getParameter<double>("power"));
285+
fReweightUserHook = std::make_shared<PtHatReweightUserHook>(
286+
rgParams.getParameter<double>("pTRef"), rgParams.getParameter<double>("power"));
287287
edm::LogInfo("Pythia8Interface") << "End setup for reweightGen";
288288
}
289289
if (params.exists("reweightGenEmp")) {
@@ -300,23 +300,22 @@ Pythia8Hadronizer::Pythia8Hadronizer(const edm::ParameterSet &params)
300300
edm::LogInfo("Pythia8Interface") << "Start setup for reweightGenRap";
301301
edm::ParameterSet rgrParams = params.getParameter<edm::ParameterSet>("reweightGenRap");
302302
fReweightRapUserHook = std::make_shared<RapReweightUserHook>(rgrParams.getParameter<std::string>("yLabSigmaFunc"),
303-
rgrParams.getParameter<double>("yLabPower"),
304-
rgrParams.getParameter<std::string>("yCMSigmaFunc"),
305-
rgrParams.getParameter<double>("yCMPower"),
306-
rgrParams.getParameter<double>("pTHatMin"),
307-
rgrParams.getParameter<double>("pTHatMax"));
303+
rgrParams.getParameter<double>("yLabPower"),
304+
rgrParams.getParameter<std::string>("yCMSigmaFunc"),
305+
rgrParams.getParameter<double>("yCMPower"),
306+
rgrParams.getParameter<double>("pTHatMin"),
307+
rgrParams.getParameter<double>("pTHatMax"));
308308
edm::LogInfo("Pythia8Interface") << "End setup for reweightGenRap";
309309
}
310310
if (params.exists("reweightGenPtHatRap")) {
311311
edm::LogInfo("Pythia8Interface") << "Start setup for reweightGenPtHatRap";
312312
edm::ParameterSet rgrParams = params.getParameter<edm::ParameterSet>("reweightGenPtHatRap");
313-
fReweightPtHatRapUserHook =
314-
std::make_shared<PtHatRapReweightUserHook>(rgrParams.getParameter<std::string>("yLabSigmaFunc"),
315-
rgrParams.getParameter<double>("yLabPower"),
316-
rgrParams.getParameter<std::string>("yCMSigmaFunc"),
317-
rgrParams.getParameter<double>("yCMPower"),
318-
rgrParams.getParameter<double>("pTHatMin"),
319-
rgrParams.getParameter<double>("pTHatMax"));
313+
fReweightPtHatRapUserHook = std::make_shared<PtHatRapReweightUserHook>(rgrParams.getParameter<std::string>("yLabSigmaFunc"),
314+
rgrParams.getParameter<double>("yLabPower"),
315+
rgrParams.getParameter<std::string>("yCMSigmaFunc"),
316+
rgrParams.getParameter<double>("yCMPower"),
317+
rgrParams.getParameter<double>("pTHatMin"),
318+
rgrParams.getParameter<double>("pTHatMax"));
320319
edm::LogInfo("Pythia8Interface") << "End setup for reweightGenPtHatRap";
321320
}
322321

@@ -370,16 +369,16 @@ Pythia8Hadronizer::Pythia8Hadronizer(const edm::ParameterSet &params)
370369
if (params.exists("EV1_nFinalMode"))
371370
EV1_nFinalMode = params.getParameter<int>("EV1_nFinalMode");
372371
fEmissionVetoHook1 = std::make_shared<EmissionVetoHook1>(EV1_nFinal,
373-
EV1_vetoOn,
374-
EV1_maxVetoCount,
375-
EV1_pThardMode,
376-
EV1_pTempMode,
377-
EV1_emittedMode,
378-
EV1_pTdefMode,
379-
EV1_MPIvetoOn,
380-
EV1_QEDvetoMode,
381-
EV1_nFinalMode,
382-
0);
372+
EV1_vetoOn,
373+
EV1_maxVetoCount,
374+
EV1_pThardMode,
375+
EV1_pTempMode,
376+
EV1_emittedMode,
377+
EV1_pTdefMode,
378+
EV1_MPIvetoOn,
379+
EV1_QEDvetoMode,
380+
EV1_nFinalMode,
381+
0);
383382
}
384383

385384
if (params.exists("UserCustomization")) {

0 commit comments

Comments
 (0)