Skip to content

Commit bab3265

Browse files
authored
Update CollisionTypeHelper.cxx
1 parent 24aa6e9 commit bab3265

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

Common/Core/CollisionTypeHelper.cxx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,10 @@ std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collTy
5050

5151
int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
5252
{
53-
const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
54-
const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);
55-
const int ABeamA = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamA);
56-
const int ABeamC = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamC);
57-
LOG(debug) << "Collision system Z: " << ZBeamA << " * " << ZBeamC << " detected = " << ZBeamA * ZBeamC;
58-
LOG(debug) << "Collision system A: " << ABeamA << " * " << ABeamC << " detected = " << ABeamA * ABeamC;
59-
switch (ZBeamA * ZBeamC) {
53+
const int zBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
54+
const int zBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);
55+
LOG(debug) << "Collision system Z: " << zBeamA << " * " << zBeamC << " detected = " << zBeamA * zBeamC;
56+
switch (zBeamA * zBeamC) {
6057
case 1: // pp 1*1
6158
return kCollSyspp;
6259
case 6724: // Pb-Pb 82*82
@@ -72,7 +69,7 @@ int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameter
7269
case 100: // Ne-Ne 10*10
7370
return kCollSysNeNe;
7471
default:
75-
LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << ZBeamA << " and Z of BeamC = " << ZBeamC << "; A of BeamA = " << ABeamA << " and A of BeamC = " << ABeamC;
72+
LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << zBeamA << " and Z of BeamC = " << zBeamC;
7673
return kCollSysUndef;
7774
}
7875
return kCollSysUndef;

0 commit comments

Comments
 (0)