Merge branch 'gcc7.CalibrationDataInterface-20170425' into 'master'

CalibrationDataInterface: Fix apparent typo in conditions.

See merge request !1169

PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataInterfaceROOT.cxx

@@ -1626,7 +1626,7 @@ Analysis::CalibrationDataInterfaceROOT::getWeightScaleFactor (const CalibrationD
       return Analysis::kError;
     }
     // the 'extrapolation' uncertainty (always a named one) needs a somewhat special treatment
-    bool extrapolate = SFNamed ? eigenVariation->isExtrapolationVariation(numVariation) : false;
+    bool extrapolate = (unc==SFNamed) ? eigenVariation->isExtrapolationVariation(numVariation) : false;
     
     double valueUp;
     double valueDown;