Skip to content

Fix in Propagator::initFieldFromGRP #15637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahor02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+43 −36
Open

Fix in Propagator::initFieldFromGRP #15637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Detectors/Base/include/DetectorsBase/Propagator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ class PropagatorImpl
return &instance;
}
static int initFieldFromGRP(const o2::parameters::GRPMagField* grp, bool verbose = false);

static int initFieldFromGRP(const o2::parameters::GRPObject* grp, bool verbose = false);
static int initFieldFromGRP(const std::string grpFileName = "", bool verbose = false);
static int initFieldFromGRP(float currL3, float currDip, bool uniform, bool verbose = false);
#endif

GPUd() MatBudget getMatBudget(MatCorrType corrType, const o2::math_utils::Point3D<value_type>& p0, const o2::math_utils::Point3D<value_type>& p1) const;
Expand Down
77 changes: 42 additions & 35 deletions Detectors/Base/src/Propagator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,61 +84,68 @@ int PropagatorImpl<value_T>::initFieldFromGRP(const std::string grpFileName, boo
if (verbose) {
grp->print();
}

return initFieldFromGRP(grp);
}

//____________________________________________________________
template <typename value_T>
int PropagatorImpl<value_T>::initFieldFromGRP(const o2::parameters::GRPObject* grp, bool verbose)
{
/// init mag field from GRP data and attach it to TGeoGlobalMagField

if (TGeoGlobalMagField::Instance()->IsLocked()) {
if (TGeoGlobalMagField::Instance()->GetField()->TestBit(o2::field::MagneticField::kOverrideGRP)) {
LOG(warning) << "ExpertMode!!! GRP information will be ignored";
LOG(warning) << "ExpertMode!!! Running with the externally locked B field";
return 0;
} else {
LOG(info) << "Destroying existing B field instance";
delete TGeoGlobalMagField::Instance();
}
}
auto fld = o2::field::MagneticField::createFieldMap(grp->getL3Current(), grp->getDipoleCurrent(), o2::field::MagneticField::kConvLHC, grp->getFieldUniformity());
TGeoGlobalMagField::Instance()->SetField(fld);
TGeoGlobalMagField::Instance()->Lock();
if (verbose) {
LOG(info) << "Running with the B field constructed out of GRP";
LOG(info) << "Access field via TGeoGlobalMagField::Instance()->Field(xyz,bxyz) or via";
LOG(info) << "auto o2field = static_cast<o2::field::MagneticField*>( TGeoGlobalMagField::Instance()->GetField() )";
}
return 0;
return initFieldFromGRP(grp->getL3Current(), grp->getDipoleCurrent(), grp->getFieldUniformity(), verbose);
}

//____________________________________________________________
template <typename value_T>
int PropagatorImpl<value_T>::initFieldFromGRP(const o2::parameters::GRPMagField* grp, bool verbose)
{
/// init mag field from GRP data and attach it to TGeoGlobalMagField
return initFieldFromGRP(grp->getL3Current(), grp->getDipoleCurrent(), grp->getFieldUniformity(), verbose);
}

if (TGeoGlobalMagField::Instance()->IsLocked()) {
if (TGeoGlobalMagField::Instance()->GetField()->TestBit(o2::field::MagneticField::kOverrideGRP)) {
LOG(warning) << "ExpertMode!!! GRP information will be ignored";
LOG(warning) << "ExpertMode!!! Running with the externally locked B field";
return 0;
//____________________________________________________________
template <typename value_T>
int PropagatorImpl<value_T>::initFieldFromGRP(float currL3, float currDip, bool uniform, bool verbose)
{
/// init mag field from GRP data and attach it to TGeoGlobalMagField or rescale already updated field
auto fldGlo = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
if (fldGlo) { // global field object was already initialized, reuse it if it is locked (as it normally should be)
float _currL3(currL3), _currDip(currDip);
auto newFieldType = fldGlo->getFieldMapScale(_currL3, _currDip, uniform);
bool sameFieldType = newFieldType == fldGlo->getMapType();
if (!sameFieldType) {
LOGP(warn, "Existing B-field type {} cannot be rescaled to type {} requested by the GRP", int(fldGlo->getMapType()), int(newFieldType));
}
if (TGeoGlobalMagField::Instance()->IsLocked() && sameFieldType) {
if (Instance()->mField && Instance()->mField != fldGlo) { // just make sure that cached field is the same as the global one
std::string name{"PropagatorF"};
if constexpr (std::is_same_v<value_T, double>) {
std::string name{"PropagatorD"};
}
LOGP(fatal, "Magnetic field pointer cached in the {} instance differs from the gloabal field pointer", name);
}
if (verbose) {
LOGP(info, "Rescaling magnetic field to currents L3: {}, Dipole: {}, UniformityFlag: {}", currL3, currDip, uniform);
}
fldGlo->rescaleField(currL3, currDip, uniform);
} else {
LOG(info) << "Destroying existing B field instance";
LOGP(warn, "Destroying existing B field instance. This may invalidate field pointer cached in other objects");
delete TGeoGlobalMagField::Instance();
Instance()->mField = nullptr;
Instance()->mFieldFast = nullptr;
fldGlo = nullptr;
}
}
auto fld = o2::field::MagneticField::createFieldMap(grp->getL3Current(), grp->getDipoleCurrent(), o2::field::MagneticField::kConvLHC, grp->getFieldUniformity());
TGeoGlobalMagField::Instance()->SetField(fld);
TGeoGlobalMagField::Instance()->Lock();
if (verbose) {
LOG(info) << "Running with the B field constructed out of GRP";
LOG(info) << "Access field via TGeoGlobalMagField::Instance()->Field(xyz,bxyz) or via";
LOG(info) << "auto o2field = static_cast<o2::field::MagneticField*>( TGeoGlobalMagField::Instance()->GetField() )";
if (!fldGlo) {
fldGlo = o2::field::MagneticField::createFieldMap(currL3, currDip, o2::field::MagneticField::kConvLHC, uniform);
TGeoGlobalMagField::Instance()->SetField(fldGlo);
TGeoGlobalMagField::Instance()->Lock();
if (verbose) {
LOG(info) << "Running with the B field constructed out of GRP";
LOG(info) << "Access field via TGeoGlobalMagField::Instance()->Field(xyz,bxyz) or via";
LOG(info) << "auto o2field = static_cast<o2::field::MagneticField*>( TGeoGlobalMagField::Instance()->GetField() )";
}
}
Instance()->updateField();
return 0;
}

Expand Down