Commit cdb6e093 authored by R D Schaffer's avatar R D Schaffer
Browse files

fix for change of interface for AtlasFieldCacheCondObj::initialize used in some tests

parent 630c64cf
......@@ -321,7 +321,7 @@ void createAtlasFieldCacheCondObj(SGTest::TestStore &store) {
SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
......
......@@ -93,7 +93,7 @@ int main()
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
// initialize cond obj with current scale factors and the field svc (needed to setup cache)
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.get()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.get());
Trk::SolenoidParametrization sol (*fieldCondObj);
test1 (sol, *fieldCondObj);
......
......@@ -341,7 +341,7 @@ void createSolenoidParametrizationCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
parm_ptr = std::make_unique<Trk::SolenoidParametrization>(*fieldCondObj);
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
......
......@@ -157,7 +157,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
......
......@@ -133,7 +133,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
......
......@@ -140,7 +140,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
......
......@@ -146,7 +146,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
......
......@@ -165,7 +165,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment