Merged Hcal25nsContrained from repository violatingcp
Loosened constraint on fitting
make it possible to turn off method 1 without pain