Skip to content

Commit

Permalink
[TOF] update configuration of merged task (AliceO2Group#7643)
Browse files Browse the repository at this point in the history
- allow for time shift
- fix configuration on merged PID task
- streamlining of the configuration with inheritance
  • Loading branch information
njacazio authored Sep 11, 2024
1 parent cc84abf commit e536119
Show file tree
Hide file tree
Showing 2 changed files with 183 additions and 91 deletions.
4 changes: 2 additions & 2 deletions Common/Core/CollisionTypeHelper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ std::string CollisionSystemType::getCollisionSystemName(collType collSys)
case kCollSyspPb:
return "pPb";
default:
LOG(fatal) << "Undefined collision system";
return "Undefined";
}
}
Expand All @@ -41,6 +40,7 @@ int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* g
{
const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);
LOG(debug) << "Collision system: " << ZBeamA << " * " << ZBeamC << " detected";
switch (ZBeamA * ZBeamC) {
case 1: // pp 1*1
return kCollSyspp;
Expand All @@ -51,7 +51,7 @@ int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* g
case 82: // p-Pb 82*1
return kCollSyspPb;
default:
LOG(fatal) << "Undefined collision system";
LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with BeamA = " << ZBeamA << " and BeamC = " << ZBeamC;
return kCollSysUndef;
}
return kCollSysUndef;
Expand Down
Loading

0 comments on commit e536119

Please sign in to comment.