Remove now useless HAS_VECCORE guards

Author: xvallspl

math/mathcore/inc/Fit/Chi2FCN.h

@@ -120,21 +120,13 @@ class Chi2FCN : public BasicFCN<DerivFunType, ModelFunType, BinData> {
    /// i-th chi-square residual
    virtual double DataElement(const double *x, unsigned int i, double *g) const {
       if (i==0) this->UpdateNCalls();
-#ifdef R__HAS_VECCORE
       return FitUtil::Evaluate<T>::EvalChi2Residual(BaseFCN::ModelFunction(), BaseFCN::Data(), x, i, g);
-#else
-      return FitUtil::EvaluateChi2Residual(BaseFCN::ModelFunction(), BaseFCN::Data(), x, i, g);
-#endif
    }
 
    // need to be virtual to be instantiated
    virtual void Gradient(const double *x, double *g) const {
       // evaluate the chi2 gradient
-#ifdef R__HAS_VECCORE
       FitUtil::Evaluate<T>::EvalChi2Gradient(BaseFCN::ModelFunction(), BaseFCN::Data(), x, g, fNEffPoints);
-#else
-      FitUtil::EvaluateChi2Gradient(BaseFCN::ModelFunction(), BaseFCN::Data(), x, g, fNEffPoints);
-#endif
    }
 
    /// get type of fit method function
@@ -154,15 +146,9 @@ class Chi2FCN : public BasicFCN<DerivFunType, ModelFunType, BinData> {
    virtual double DoEval (const double * x) const {
       this->UpdateNCalls();
       if (BaseFCN::Data().HaveCoordErrors() || BaseFCN::Data().HaveAsymErrors())
-#ifdef R__HAS_VECCORE
          return FitUtil::Evaluate<T>::EvalChi2Effective(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fNEffPoints);
       else
          return FitUtil::Evaluate<T>::EvalChi2(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fNEffPoints, fExecutionPolicy);
-#else
-        return  FitUtil::EvaluateChi2Effective(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fNEffPoints);
-      else
-        return FitUtil::EvaluateChi2(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fNEffPoints, fExecutionPolicy);
-#endif
    }
 
    // for derivatives

math/mathcore/inc/Fit/LogLikelihoodFCN.h

@@ -154,12 +154,7 @@ class LogLikelihoodFCN : public BasicFCN<DerivFunType,ModelFunType,UnBinData>  {
     */
    virtual double DoEval (const double * x) const {
       this->UpdateNCalls();
-
-#ifdef R__HAS_VECCORE
       return FitUtil::Evaluate<T>::EvalLogL(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fWeight, fIsExtended, fNEffPoints, fExecutionPolicy);
-#else
-      return FitUtil::EvaluateLogL(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fWeight, fIsExtended, fNEffPoints, fExecutionPolicy);
-#endif
    }
 
    // for derivatives

math/mathcore/inc/Fit/PoissonLikelihoodFCN.h

@@ -161,13 +161,8 @@ class PoissonLikelihoodFCN : public BasicFCN<DerivFunType,ModelFunType,BinData>
     */
    virtual double DoEval (const double * x) const {
       this->UpdateNCalls();
-#ifdef R__HAS_VECCORE
       return FitUtil::Evaluate<T>::EvalPoissonLogL(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fWeight, fIsExtended,
                                                    fNEffPoints, fExecutionPolicy);
-#else
-      return FitUtil::EvaluatePoissonLogL(BaseFCN::ModelFunction(), BaseFCN::Data(), x, fWeight, fIsExtended,
-                                          fNEffPoints, fExecutionPolicy);
-#endif
    }
 
    // for derivatives