From 7b0496f60eea79f8b0118ade0fd06ff0445eb629 Mon Sep 17 00:00:00 2001 From: Matthias Schroeder Date: Fri, 19 Jun 2015 18:34:29 +0200 Subject: [PATCH] Set hierarchy constraints as default. Previous problems were found to be due to numerical effects in pede. These are solved in >=rev137, which uses 'elimination' instead of lagrangian multipliers. --- .../python/AlignmentParameterStore_cfi.py | 2 +- .../src/AlignmentParameterStore.cc | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Alignment/CommonAlignmentAlgorithm/python/AlignmentParameterStore_cfi.py b/Alignment/CommonAlignmentAlgorithm/python/AlignmentParameterStore_cfi.py index c8a148531dceb..d7285ad8d4ba6 100644 --- a/Alignment/CommonAlignmentAlgorithm/python/AlignmentParameterStore_cfi.py +++ b/Alignment/CommonAlignmentAlgorithm/python/AlignmentParameterStore_cfi.py @@ -8,7 +8,7 @@ MaxUpdates = cms.int32(5000) ), UseExtendedCorrelations = cms.untracked.bool(False), - TypeOfConstraints = cms.string('approximate_averaging'), + TypeOfConstraints = cms.string('hierarchy'), ) ) diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc index a7f128e05385c..11aca49a5b154 100644 --- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc +++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc @@ -42,16 +42,14 @@ AlignmentParameterStore::AlignmentParameterStore( const align::Alignables &alis, const std::string cfgStrTypeOfConstraints(config.getParameter("TypeOfConstraints")); if( cfgStrTypeOfConstraints == "hierarchy" ) { theTypeOfConstraints = HIERARCHY_CONSTRAINTS; - edm::LogWarning("Alignment") << "@SUB=AlignmentParameterStore" - << "\n\n\n******* WARNING ******************************************\n" - << "Using hierarchy constraints that have a not-understood bug.\n" - << "It is strongly recommended to use averaging constraints for\n" - << "the time being!\n\n\n"; - } else if( cfgStrTypeOfConstraints == "approximate_averaging" ) { theTypeOfConstraints = APPROX_AVERAGING_CONSTRAINTS; edm::LogWarning("Alignment") << "@SUB=AlignmentParameterStore" - << "Using approximate implementation of averaging constraints"; + << "\n\n\n******* WARNING ******************************************\n" + << "Using approximate implementation of averaging constraints." + << "This is not recommended." + << "Consider to use 'hierarchy' constraints:" + << " AlignmentProducer.ParameterStore.TypeOfConstraints = cms.string('hierarchy')\n\n\n"; } else { edm::LogError("BadArgument") << "@SUB=AlignmentParameterStore" << "Unknown type of hierarchy constraints '" << cfgStrTypeOfConstraints << "'";