Skip to content

Commit d4b1304

Browse files
authored
Merge pull request #21 from alibuild/alibot-cleanup-15093
Please consider the following formatting changes to #15093
2 parents 6e76d93 + 6bbe4b8 commit d4b1304

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Generators/src/GeneratorHepMC.cxx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -435,16 +435,10 @@ void GeneratorHepMC::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
435435
if (version == "v0") {
436436
auto hi = std::make_shared<HepMC3::GenHeavyIon>();
437437
double spectNeutrons, spectProtons, eccentricity, userCentEst;
438-
is >> hi->Ncoll_hard >> hi->Npart_proj >> hi->Npart_targ >> hi->Ncoll
439-
>> spectNeutrons >> spectProtons // deprecated v0 fields
440-
>> hi->N_Nwounded_collisions >> hi->Nwounded_N_collisions
441-
>> hi->Nwounded_Nwounded_collisions
442-
>> hi->impact_parameter >> hi->event_plane_angle
443-
>> eccentricity // deprecated v0 field
444-
>> hi->sigma_inel_NN >> hi->centrality
445-
>> userCentEst // GenHeavyIon::to_string always writes this, but GenHeavyIon::from_string skips it for v0 (HepMC3 bug to fix)
446-
>> hi->Nspec_proj_n >> hi->Nspec_targ_n
447-
>> hi->Nspec_proj_p >> hi->Nspec_targ_p;
438+
is >> hi->Ncoll_hard >> hi->Npart_proj >> hi->Npart_targ >> hi->Ncoll >> spectNeutrons >> spectProtons // deprecated v0 fields
439+
>> hi->N_Nwounded_collisions >> hi->Nwounded_N_collisions >> hi->Nwounded_Nwounded_collisions >> hi->impact_parameter >> hi->event_plane_angle >> eccentricity // deprecated v0 field
440+
>> hi->sigma_inel_NN >> hi->centrality >> userCentEst // GenHeavyIon::to_string always writes this, but GenHeavyIon::from_string skips it for v0 (HepMC3 bug to fix)
441+
>> hi->Nspec_proj_n >> hi->Nspec_targ_n >> hi->Nspec_proj_p >> hi->Nspec_targ_p;
448442
if (!is.fail()) {
449443
LOG(debug) << "GenHeavyIon: using manual v0 parser (workaround for HepMC3 from_string bug)";
450444
hiInfo = hi;
@@ -494,7 +488,7 @@ void GeneratorHepMC::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
494488
if (hiInfo) {
495489
eventHeader->SetB(hiInfo->impact_parameter); // sets the impact parameter to the FairMCEventHeader field for quick access in the AO2D
496490
eventHeader->putInfo<float>(Key::impactParameter,
497-
hiInfo->impact_parameter);
491+
hiInfo->impact_parameter);
498492
eventHeader->putInfo<int>(Key::nPart,
499493
hiInfo->Npart_proj + hiInfo->Npart_targ);
500494
eventHeader->putInfo<int>(Key::nPartProjectile, hiInfo->Npart_proj);

0 commit comments

Comments
 (0)